From 77918e9b9eb63ece4614e741249afcae4f95e812 Mon Sep 17 00:00:00 2001
From: laurence <laurence>
Date: Tue, 6 Mar 2012 16:50:26 +0000
Subject: [PATCH 001/317] ENH: edgeMesh: swap out code to use invertManyToMany

---
 src/edgeMesh/edgeMesh.C | 31 ++-----------------------------
 1 file changed, 2 insertions(+), 29 deletions(-)

diff --git a/src/edgeMesh/edgeMesh.C b/src/edgeMesh/edgeMesh.C
index 4e5d50ed45..113112fa28 100644
--- a/src/edgeMesh/edgeMesh.C
+++ b/src/edgeMesh/edgeMesh.C
@@ -27,6 +27,7 @@ License
 #include "mergePoints.H"
 #include "addToRunTimeSelectionTable.H"
 #include "addToMemberFunctionSelectionTable.H"
+#include "ListOps.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
@@ -112,35 +113,7 @@ void Foam::edgeMesh::calcPointEdges() const
     pointEdgesPtr_.reset(new labelListList(points_.size()));
     labelListList& pointEdges = pointEdgesPtr_();
 
-    // Count
-    labelList nEdgesPerPoint(points_.size(), 0);
-
-    forAll(edges_, edgeI)
-    {
-        const edge& e = edges_[edgeI];
-
-        nEdgesPerPoint[e[0]]++;
-        nEdgesPerPoint[e[1]]++;
-    }
-
-    // Size
-    forAll(pointEdges, pointI)
-    {
-        pointEdges[pointI].setSize(nEdgesPerPoint[pointI]);
-    }
-
-    // Fill
-    nEdgesPerPoint = 0;
-
-    forAll(edges_, edgeI)
-    {
-        const edge& e = edges_[edgeI];
-        const label p0 = e[0];
-        const label p1 = e[1];
-
-        pointEdges[p0][nEdgesPerPoint[p0]++] = edgeI;
-        pointEdges[p1][nEdgesPerPoint[p1]++] = edgeI;
-    }
+    invertManyToMany(pointEdges.size(), edges_, pointEdges);
 }
 
 

From 16660a95b03f06685398a06181db4f373f008c1f Mon Sep 17 00:00:00 2001
From: laurence <laurence>
Date: Fri, 9 Mar 2012 16:13:07 +0000
Subject: [PATCH 002/317] ENH: PrimitivePatchInterpolation: Change faceList to
 List<typename Patch::FaceType>

---
 .../PrimitivePatchInterpolation.C                           | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/OpenFOAM/interpolations/primitivePatchInterpolation/PrimitivePatchInterpolation.C b/src/OpenFOAM/interpolations/primitivePatchInterpolation/PrimitivePatchInterpolation.C
index 190ddd07d4..6f09c755d0 100644
--- a/src/OpenFOAM/interpolations/primitivePatchInterpolation/PrimitivePatchInterpolation.C
+++ b/src/OpenFOAM/interpolations/primitivePatchInterpolation/PrimitivePatchInterpolation.C
@@ -60,7 +60,7 @@ void PrimitivePatchInterpolation<Patch>::makeFaceToPointWeights() const
     }
 
     const pointField& points = patch_.localPoints();
-    const faceList& faces = patch_.localFaces();
+    const List<typename Patch::FaceType>& faces = patch_.localFaces();
 
     faceToPointWeightsPtr_ = new scalarListList(points.size());
     scalarListList& weights = *faceToPointWeightsPtr_;
@@ -118,7 +118,7 @@ void PrimitivePatchInterpolation<Patch>::makeFaceToEdgeWeights() const
     }
 
     const pointField& points = patch_.localPoints();
-    const faceList& faces = patch_.localFaces();
+    const List<typename Patch::FaceType>& faces = patch_.localFaces();
     const edgeList& edges = patch_.edges();
     const labelListList& edgeFaces = patch_.edgeFaces();
 
@@ -261,7 +261,7 @@ tmp<Field<Type> > PrimitivePatchInterpolation<Patch>::pointToFaceInterpolate
 
     Field<Type>& result = tresult();
 
-    const faceList& localFaces = patch_.localFaces();
+    const List<typename Patch::FaceType>& localFaces = patch_.localFaces();
 
     forAll(result, facei)
     {

From 6a177418a0a2dc1d9c1edbd9a69353c0ebf675b6 Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Wed, 14 Mar 2012 12:27:50 +0000
Subject: [PATCH 003/317] ENH: Added output of front/rear lift coeffs to
 forceCoeffs function object

---
 .../functionObjects/forces/forceCoeffs/forceCoeffs.C      | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/postProcessing/functionObjects/forces/forceCoeffs/forceCoeffs.C b/src/postProcessing/functionObjects/forces/forceCoeffs/forceCoeffs.C
index 3ce1fd2f11..d01d17e986 100644
--- a/src/postProcessing/functionObjects/forces/forceCoeffs/forceCoeffs.C
+++ b/src/postProcessing/functionObjects/forces/forceCoeffs/forceCoeffs.C
@@ -137,9 +137,11 @@ void Foam::forceCoeffs::write()
             if (log_)
             {
                 Info<< "forceCoeffs output:" << nl
-                    << "    Cd = " << Cd << nl
-                    << "    Cl = " << Cl << nl
-                    << "    Cm = " << Cm << nl
+                    << "    Cm    = " << Cm << nl
+                    << "    Cd    = " << Cd << nl
+                    << "    Cl    = " << Cl << nl
+                    << "    Cl(f) = " << Cl/2.0 - Cm << nl
+                    << "    Cl(r) = " << Cl/2.0 + Cm << nl
                     << endl;
             }
         }

From 3fd792b2aee39e79d426691f700b16a44be0f7e6 Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Wed, 14 Mar 2012 15:12:42 +0000
Subject: [PATCH 004/317] ENH: Removed unnecessary #include

---
 src/combustionModels/psiCombustionModel/psiCombustionModels.C | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/combustionModels/psiCombustionModel/psiCombustionModels.C b/src/combustionModels/psiCombustionModel/psiCombustionModels.C
index 925dd612cd..e8d96e9b63 100644
--- a/src/combustionModels/psiCombustionModel/psiCombustionModels.C
+++ b/src/combustionModels/psiCombustionModel/psiCombustionModels.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -24,9 +24,7 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "makeCombustionTypes.H"
-
 #include "psiCombustionModel.H"
-#include "PaSR.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 

From c24b218f8e75ce2a3093d0ff4da758284011029d Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Wed, 14 Mar 2012 17:29:44 +0000
Subject: [PATCH 005/317] BUG: Removed non-existent massInjected() function

---
 src/lagrangian/dsmc/clouds/Templates/DsmcCloud/DsmcCloud.H     | 3 ---
 .../clouds/Templates/KinematicCloud/KinematicCloud.H           | 3 ---
 2 files changed, 6 deletions(-)

diff --git a/src/lagrangian/dsmc/clouds/Templates/DsmcCloud/DsmcCloud.H b/src/lagrangian/dsmc/clouds/Templates/DsmcCloud/DsmcCloud.H
index 7526271e45..5f0730b299 100644
--- a/src/lagrangian/dsmc/clouds/Templates/DsmcCloud/DsmcCloud.H
+++ b/src/lagrangian/dsmc/clouds/Templates/DsmcCloud/DsmcCloud.H
@@ -424,9 +424,6 @@ public:
 
         // Check
 
-            //- Total mass injected
-            inline scalar massInjected() const;
-
             //- Total mass in system
             inline scalar massInSystem() const;
 
diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H
index fd32ff790c..798bccd97d 100644
--- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H
+++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H
@@ -456,9 +456,6 @@ public:
 
         // Check
 
-            //- Total mass injected
-            inline scalar massInjected() const;
-
             //- Total mass in system
             inline scalar massInSystem() const;
 

From b23142935fd0442d2641eee58e481678ac8cac00 Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Wed, 14 Mar 2012 17:41:31 +0000
Subject: [PATCH 006/317] STYLE: Updated copyright year

---
 src/lagrangian/dsmc/clouds/Templates/DsmcCloud/DsmcCloud.H      | 2 +-
 .../clouds/Templates/KinematicCloud/KinematicCloud.H            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/lagrangian/dsmc/clouds/Templates/DsmcCloud/DsmcCloud.H b/src/lagrangian/dsmc/clouds/Templates/DsmcCloud/DsmcCloud.H
index 5f0730b299..423bd87160 100644
--- a/src/lagrangian/dsmc/clouds/Templates/DsmcCloud/DsmcCloud.H
+++ b/src/lagrangian/dsmc/clouds/Templates/DsmcCloud/DsmcCloud.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H
index 798bccd97d..8ac910e301 100644
--- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H
+++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

From 657d7d6d85061f8c999a4f1a22fc61cb01642610 Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Wed, 14 Mar 2012 17:47:41 +0000
Subject: [PATCH 007/317] ENH: Added virtual functions to base kinematicCloud
 API

---
 .../kinematicCloud/kinematicCloud.H           | 46 ++++++++++++++++++-
 1 file changed, 45 insertions(+), 1 deletion(-)

diff --git a/src/lagrangian/intermediate/clouds/baseClasses/kinematicCloud/kinematicCloud.H b/src/lagrangian/intermediate/clouds/baseClasses/kinematicCloud/kinematicCloud.H
index 3f5bd469d1..7f72eae98f 100644
--- a/src/lagrangian/intermediate/clouds/baseClasses/kinematicCloud/kinematicCloud.H
+++ b/src/lagrangian/intermediate/clouds/baseClasses/kinematicCloud/kinematicCloud.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -68,6 +68,50 @@ public:
         kinematicCloud();
 
 
+    // Member functions
+
+        // Check
+
+            //-  Number of parcels
+            virtual label nParcels() const = 0;
+
+            //- Total mass in system
+            virtual scalar massInSystem() const = 0;
+
+            //- Total linear momentum of the system
+            virtual vector linearMomentumOfSystem() const = 0;
+
+            //- Total linear kinetic energy in the system
+            virtual scalar linearKineticEnergyOfSystem() const = 0;
+
+            //- Total rotational kinetic energy in the system
+            virtual scalar rotationalKineticEnergyOfSystem() const = 0;
+
+            //- Penetration for percentage of the current total mass
+//            virtual scalar penetration(const scalar& prc) const = 0;
+
+            //- Mean diameter Dij
+            virtual scalar Dij(const label i, const label j) const = 0;
+
+            //- Max diameter
+            virtual scalar Dmax() const = 0;
+
+
+            // Fields
+
+                //- Return the particle volume fraction field
+                //  Note: for particles belonging to this cloud only
+                virtual const tmp<volScalarField> theta() const = 0;
+
+                //- Return the particle mass fraction field
+                //  Note: for particles belonging to this cloud only
+                virtual const tmp<volScalarField> alpha() const = 0;
+
+                //- Return the particle effective density field
+                //  Note: for particles belonging to this cloud only
+                virtual const tmp<volScalarField> rhoEff() const = 0;
+
+
     //- Destructor
     virtual ~kinematicCloud();
 };

From f3fac5bbffd61c75431cba372da029ac776685d1 Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Wed, 14 Mar 2012 18:18:48 +0000
Subject: [PATCH 008/317] multiphaseEulerFoam: Improved consistency between
 implicit and explicit parts of the virtual mass

---
 .../solvers/multiphase/multiphaseEulerFoam/UEqns.H  | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/UEqns.H b/applications/solvers/multiphase/multiphaseEulerFoam/UEqns.H
index bce95f7d5a..b612e6b5d9 100644
--- a/applications/solvers/multiphase/multiphaseEulerFoam/UEqns.H
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/UEqns.H
@@ -15,12 +15,17 @@ forAllIter(PtrDictionary<phaseModel>, fluid.phases(), iter)
         phasei,
         new fvVectorMatrix
         (
-            (scalar(1) + fluid.Cvm(phase)/phase.rho())*
+            fvm::ddt(alpha, U)
+          + fvm::div(phase.phiAlpha(), U)
+          - fvm::Sp(fvc::ddt(alpha) + fvc::div(phase.phiAlpha()), U)
+
+          + (alpha/phase.rho())*fluid.Cvm(phase)*
             (
-                fvm::ddt(alpha, U)
-              + fvm::div(phase.phiAlpha(), U)
-              - fvm::Sp(fvc::ddt(alpha) + fvc::div(phase.phiAlpha()), U)
+                fvm::ddt(U)
+              + fvm::div(phase.phi(), U)
+              - fvm::Sp(fvc::div(phase.phi()), U)
             )
+
           - fvm::laplacian(alpha*nuEff, U)
           - fvc::div
             (

From 0d0dfbafe3b9e2fa7acfefa3e2127a66c2e72777 Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Wed, 14 Mar 2012 18:19:18 +0000
Subject: [PATCH 009/317] multiphaseEulerFoam: Corrected the handling of drag
 for more than 2 phases

---
 .../solvers/multiphase/multiphaseEulerFoam/pEqn.H  | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/pEqn.H b/applications/solvers/multiphase/multiphaseEulerFoam/pEqn.H
index 4a817a1001..822e60d19a 100644
--- a/applications/solvers/multiphase/multiphaseEulerFoam/pEqn.H
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/pEqn.H
@@ -76,6 +76,7 @@
           + fvc::ddtPhiCorr(rAUs[phasei], alpha, phase.U(), phase.phi())
           + rAlphaAUfs[phasei]*(g & mesh.Sf())
         );
+
         mrfZones.relativeFlux(phiHbyAs[phasei]);
 
         multiphaseSystem::dragModelTable::const_iterator dmIter =
@@ -89,11 +90,20 @@
             ++dmIter, ++dcIter
         )
         {
-            const phaseModel *phase2Ptr = &dmIter()->phase2();
-            if (phase2Ptr == &phase)
+            const phaseModel *phase2Ptr = NULL;
+
+            if (&phase == &dmIter()->phase1())
+            {
+                phase2Ptr = &dmIter()->phase2();
+            }
+            else if (&phase == &dmIter()->phase2())
             {
                 phase2Ptr = &dmIter()->phase1();
             }
+            else
+            {
+                continue;
+            }
 
             phiHbyAs[phasei] +=
                 fvc::interpolate

From 346ad0eba8a402a47228d797a3badf8119499da2 Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Thu, 15 Mar 2012 09:20:42 +0000
Subject: [PATCH 010/317] ENH: Used writeEntryIfDifferent in write function for
 advective BC

---
 .../derived/advective/advectiveFvPatchField.C    | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/src/finiteVolume/fields/fvPatchFields/derived/advective/advectiveFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/advective/advectiveFvPatchField.C
index 5a81174d84..8de92629c1 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/advective/advectiveFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/advective/advectiveFvPatchField.C
@@ -304,21 +304,13 @@ void Foam::advectiveFvPatchField<Type>::write(Ostream& os) const
 {
     fvPatchField<Type>::write(os);
 
-    if (phiName_ != "phi")
-    {
-        os.writeKeyword("phi") << phiName_ << token::END_STATEMENT << nl;
-    }
-    if (rhoName_ != "rho")
-    {
-        os.writeKeyword("rho") << rhoName_ << token::END_STATEMENT << nl;
-    }
+    this->template writeEntryIfDifferent<word>(os, "phi", "phi", phiName_);
+    this->template writeEntryIfDifferent<word>(os, "rho", "rho", rhoName_);
 
     if (lInf_ > SMALL)
     {
-        os.writeKeyword("fieldInf") << fieldInf_
-            << token::END_STATEMENT << nl;
-        os.writeKeyword("lInf") << lInf_
-            << token::END_STATEMENT << nl;
+        os.writeKeyword("fieldInf") << fieldInf_ << token::END_STATEMENT << nl;
+        os.writeKeyword("lInf") << lInf_ << token::END_STATEMENT << nl;
     }
 
     this->writeEntry("value", os);

From e887b572e92ad2b5fd22209baca132c0755b150d Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Thu, 15 Mar 2012 10:03:46 +0000
Subject: [PATCH 011/317] ENH: better treatment of lInf in advective BC

---
 .../derived/advective/advectiveFvPatchField.C | 26 ++++++++++---------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/finiteVolume/fields/fvPatchFields/derived/advective/advectiveFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/advective/advectiveFvPatchField.C
index 8de92629c1..5764676b2a 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/advective/advectiveFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/advective/advectiveFvPatchField.C
@@ -45,7 +45,7 @@ Foam::advectiveFvPatchField<Type>::advectiveFvPatchField
     phiName_("phi"),
     rhoName_("rho"),
     fieldInf_(pTraits<Type>::zero),
-    lInf_(0.0)
+    lInf_(-GREAT)
 {
     this->refValue() = pTraits<Type>::zero;
     this->refGrad() = pTraits<Type>::zero;
@@ -82,7 +82,7 @@ Foam::advectiveFvPatchField<Type>::advectiveFvPatchField
     phiName_(dict.lookupOrDefault<word>("phi", "phi")),
     rhoName_(dict.lookupOrDefault<word>("rho", "rho")),
     fieldInf_(pTraits<Type>::zero),
-    lInf_(0.0)
+    lInf_(-GREAT)
 {
     if (dict.found("value"))
     {
@@ -110,9 +110,13 @@ Foam::advectiveFvPatchField<Type>::advectiveFvPatchField
             (
                 "advectiveFvPatchField<Type>::"
                 "advectiveFvPatchField"
-                "(const fvPatch&, const Field<Type>&, const dictionary&)",
+                "("
+                    "const fvPatch&, "
+                    "const DimensionedField<Type, volMesh>&, "
+                    "const dictionary&"
+                ")",
                 dict
-            )   << "unphysical lInf specified (lInf < 0)\n"
+            )   << "unphysical lInf specified (lInf < 0)" << nl
                 << "    on patch " << this->patch().name()
                 << " of field " << this->dimensionedInternalField().name()
                 << " in file " << this->dimensionedInternalField().objectPath()
@@ -217,7 +221,7 @@ void Foam::advectiveFvPatchField<Type>::updateCoeffs()
 
     // Non-reflecting outflow boundary
     // If lInf_ defined setup relaxation to the value fieldInf_.
-    if (lInf_ > SMALL)
+    if (lInf_ > 0)
     {
         // Calculate the field relaxation coefficient k (See notes)
         const scalarField k(w*deltaT/lInf_);
@@ -248,12 +252,10 @@ void Foam::advectiveFvPatchField<Type>::updateCoeffs()
         }
         else
         {
-            FatalErrorIn
-            (
-                "advectiveFvPatchField<Type>::updateCoeffs()"
-            )   << "    Unsupported temporal differencing scheme : "
-                << ddtScheme
-                << "\n    on patch " << this->patch().name()
+            FatalErrorIn("advectiveFvPatchField<Type>::updateCoeffs()")
+                << "    Unsupported temporal differencing scheme : "
+                << ddtScheme << nl
+                << "    on patch " << this->patch().name()
                 << " of field " << this->dimensionedInternalField().name()
                 << " in file " << this->dimensionedInternalField().objectPath()
                 << exit(FatalError);
@@ -307,7 +309,7 @@ void Foam::advectiveFvPatchField<Type>::write(Ostream& os) const
     this->template writeEntryIfDifferent<word>(os, "phi", "phi", phiName_);
     this->template writeEntryIfDifferent<word>(os, "rho", "rho", rhoName_);
 
-    if (lInf_ > SMALL)
+    if (lInf_ > 0)
     {
         os.writeKeyword("fieldInf") << fieldInf_ << token::END_STATEMENT << nl;
         os.writeKeyword("lInf") << lInf_ << token::END_STATEMENT << nl;

From 4c6d6a5731021d502faf510e70bea44a2cfc8272 Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Thu, 15 Mar 2012 10:05:41 +0000
Subject: [PATCH 012/317] ENH: Updates to the kinematic cloud API

---
 .../clouds/Templates/KinematicCloud/KinematicCloud.H     | 3 +++
 .../clouds/Templates/KinematicCloud/KinematicCloudI.H    | 9 ++++++++-
 .../clouds/baseClasses/kinematicCloud/kinematicCloud.H   | 1 +
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H
index 8ac910e301..7225347e60 100644
--- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H
+++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H
@@ -456,6 +456,9 @@ public:
 
         // Check
 
+            //- Total number of parcels
+            inline label nParcels() const;
+
             //- Total mass in system
             inline scalar massInSystem() const;
 
diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H
index 94b95168a5..ab0e7ed940 100644
--- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H
+++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -227,6 +227,13 @@ Foam::KinematicCloud<CloudType>::UIntegrator() const
 }
 
 
+template<class CloudType>
+inline Foam::label Foam::KinematicCloud<CloudType>::nParcels() const
+{
+    return this->size();
+}
+
+
 template<class CloudType>
 inline Foam::scalar Foam::KinematicCloud<CloudType>::massInSystem() const
 {
diff --git a/src/lagrangian/intermediate/clouds/baseClasses/kinematicCloud/kinematicCloud.H b/src/lagrangian/intermediate/clouds/baseClasses/kinematicCloud/kinematicCloud.H
index 7f72eae98f..01c80c16e2 100644
--- a/src/lagrangian/intermediate/clouds/baseClasses/kinematicCloud/kinematicCloud.H
+++ b/src/lagrangian/intermediate/clouds/baseClasses/kinematicCloud/kinematicCloud.H
@@ -36,6 +36,7 @@ SourceFiles
 #define kinematicCloud_H
 
 #include "typeInfo.H"
+#include "volFieldsFwd.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 

From db3e9c00d294c070c92eb2d402afa82851b6c04d Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Thu, 15 Mar 2012 11:55:03 +0000
Subject: [PATCH 013/317] compressibleTwoPhaseEulerFoam: Updated virtual-mass
 formulation

---
 .../compressibleTwoPhaseEulerFoam/UEqns.H     | 26 +++++++++++++------
 .../compressibleTwoPhaseEulerFoam/pEqn.H      |  7 +++--
 2 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/UEqns.H b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/UEqns.H
index ed150abb88..ca2a5bf265 100644
--- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/UEqns.H
+++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/UEqns.H
@@ -28,12 +28,17 @@ fvVectorMatrix U2Eqn(U2, U2.dimensions()*dimVol/dimTime);
 
         U1Eqn =
         (
-            (scalar(1) + Cvm*rho2*alpha2/rho1)*
+            fvm::ddt(alpha1, U1)
+          + fvm::div(alphaPhi1, U1)
+          - fvm::Sp(fvc::ddt(alpha1) + fvc::div(alphaPhi1), U1)
+
+          + Cvm*rho2*alpha1*alpha2/rho1*
             (
-                fvm::ddt(alpha1, U1)
-              + fvm::div(alphaPhi1, U1)
-              - fvm::Sp(fvc::ddt(alpha1) + fvc::div(alphaPhi1), U1)
+                fvm::ddt(U1)
+              + fvm::div(phi1, U1)
+              - fvm::Sp(fvc::div(phi1), U1)
             )
+
           - fvm::laplacian(alpha1*nuEff1, U1)
           + fvc::div(alpha1*Rc1)
          ==
@@ -54,12 +59,17 @@ fvVectorMatrix U2Eqn(U2, U2.dimensions()*dimVol/dimTime);
 
         U2Eqn =
         (
-            (scalar(1) + Cvm*rho2*alpha1/rho2)*
+            fvm::ddt(alpha2, U2)
+          + fvm::div(alphaPhi2, U2)
+          - fvm::Sp(fvc::ddt(alpha2) + fvc::div(alphaPhi2), U2)
+
+          + Cvm*rho2*alpha1*alpha2/rho2*
             (
-                fvm::ddt(alpha2, U2)
-              + fvm::div(alphaPhi2, U2)
-              - fvm::Sp(fvc::ddt(alpha2) + fvc::div(alphaPhi2), U2)
+                fvm::ddt(U2)
+              + fvm::div(phi2, U2)
+              - fvm::Sp(fvc::div(phi2), U2)
             )
+
           - fvm::laplacian(alpha2*nuEff2, U2)
           + fvc::div(alpha2*Rc2)
          ==
diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/pEqn.H b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/pEqn.H
index d2ef15776d..6c0d1e50f2 100644
--- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/pEqn.H
+++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/pEqn.H
@@ -37,6 +37,9 @@
 
     surfaceScalarField phiHbyA("phiHbyA", alpha1f*phiHbyA1 + alpha2f*phiHbyA2);
 
+    HbyA1 += (1.0/rho1)*rAU1*dragCoeff*U2;
+    HbyA2 += (1.0/rho2)*rAU2*dragCoeff*U1;
+
     surfaceScalarField Dp
     (
         "Dp",
@@ -110,10 +113,7 @@
             p.relax();
             mSfGradp = pEqnIncomp.flux()/Dp;
 
-            volVectorField U10 = U1;
-
             U1 = HbyA1
-               + (1.0/rho1)*rAU1*dragCoeff*U2
                + fvc::reconstruct
                  (
                      rAlphaAU1f*(g & mesh.Sf())
@@ -122,7 +122,6 @@
             U1.correctBoundaryConditions();
 
             U2 = HbyA2
-               + (1.0/rho2)*rAU2*dragCoeff*U10
                + fvc::reconstruct
                  (
                      rAlphaAU2f*(g & mesh.Sf())

From 2a81bbca22ffa5ab519569dc94e69656e9c27462 Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Thu, 15 Mar 2012 11:55:37 +0000
Subject: [PATCH 014/317] multiphaseEulerFoam: Added comment about drag
 formulations

---
 applications/solvers/multiphase/multiphaseEulerFoam/pEqn.H | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/pEqn.H b/applications/solvers/multiphase/multiphaseEulerFoam/pEqn.H
index 822e60d19a..f31717d379 100644
--- a/applications/solvers/multiphase/multiphaseEulerFoam/pEqn.H
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/pEqn.H
@@ -115,6 +115,8 @@
                 (1.0/phase.rho())*rAUs[phasei]*(*dcIter())
                *phase2Ptr->U();
 
+            // Alternative flux-pressure consistent drag but not momentum conservative
+            //
             // HbyAs[phasei] += fvc::reconstruct
             // (
             //     fvc::interpolate

From b8c9a087333d90c67c68df217367d307fe65c0a9 Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Thu, 15 Mar 2012 11:56:21 +0000
Subject: [PATCH 015/317] compressibleTwoPhaseEulerFoam/bubbleColumn tutorial:
 changed liquid height to be consistent

---
 .../bubbleColumn/0/alpha1                     | 752 +++++++++---------
 .../bubbleColumn/system/setFieldsDict         |   2 +-
 2 files changed, 377 insertions(+), 377 deletions(-)

diff --git a/tutorials/multiphase/compressibleTwoPhaseEulerFoam/bubbleColumn/0/alpha1 b/tutorials/multiphase/compressibleTwoPhaseEulerFoam/bubbleColumn/0/alpha1
index 4d25044844..eda1e32100 100644
--- a/tutorials/multiphase/compressibleTwoPhaseEulerFoam/bubbleColumn/0/alpha1
+++ b/tutorials/multiphase/compressibleTwoPhaseEulerFoam/bubbleColumn/0/alpha1
@@ -17,7 +17,7 @@ FoamFile
 
 dimensions      [0 0 0 0 0 0 0];
 
-internalField   nonuniform List<scalar>
+internalField   nonuniform List<scalar> 
 1875
 (
 0
@@ -970,381 +970,381 @@ internalField   nonuniform List<scalar>
 0
 0
 0
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
 1
 1
 1
diff --git a/tutorials/multiphase/compressibleTwoPhaseEulerFoam/bubbleColumn/system/setFieldsDict b/tutorials/multiphase/compressibleTwoPhaseEulerFoam/bubbleColumn/system/setFieldsDict
index 84545091c6..5b6d65bbec 100644
--- a/tutorials/multiphase/compressibleTwoPhaseEulerFoam/bubbleColumn/system/setFieldsDict
+++ b/tutorials/multiphase/compressibleTwoPhaseEulerFoam/bubbleColumn/system/setFieldsDict
@@ -24,7 +24,7 @@ regions
 (
     boxToCell
     {
-        box (0 0 -0.1) (0.15 0.501 0.1);
+        box (0 0 -0.1) (0.15 0.701 0.1);
         fieldValues
         (
             volScalarFieldValue alpha1 0

From 1fdd95d1b451b0ddd91363f66fdc9d98b64a26f7 Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Thu, 15 Mar 2012 11:56:47 +0000
Subject: [PATCH 016/317] compressibleTwoPhaseEulerFoam/bubbleColumn: changed
 liquid height

---
 .../compressibleTwoPhaseEulerFoam/bubbleColumn/0/alpha1         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tutorials/multiphase/compressibleTwoPhaseEulerFoam/bubbleColumn/0/alpha1 b/tutorials/multiphase/compressibleTwoPhaseEulerFoam/bubbleColumn/0/alpha1
index eda1e32100..9a514b7807 100644
--- a/tutorials/multiphase/compressibleTwoPhaseEulerFoam/bubbleColumn/0/alpha1
+++ b/tutorials/multiphase/compressibleTwoPhaseEulerFoam/bubbleColumn/0/alpha1
@@ -17,7 +17,7 @@ FoamFile
 
 dimensions      [0 0 0 0 0 0 0];
 
-internalField   nonuniform List<scalar> 
+internalField   nonuniform List<scalar>
 1875
 (
 0

From a70398ae2c6ed31eff8cdc4a53e89b66e071a993 Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Thu, 15 Mar 2012 11:57:55 +0000
Subject: [PATCH 017/317] Corrected line length

---
 applications/solvers/multiphase/multiphaseEulerFoam/pEqn.H | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/pEqn.H b/applications/solvers/multiphase/multiphaseEulerFoam/pEqn.H
index f31717d379..1c42c7b91a 100644
--- a/applications/solvers/multiphase/multiphaseEulerFoam/pEqn.H
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/pEqn.H
@@ -115,7 +115,8 @@
                 (1.0/phase.rho())*rAUs[phasei]*(*dcIter())
                *phase2Ptr->U();
 
-            // Alternative flux-pressure consistent drag but not momentum conservative
+            // Alternative flux-pressure consistent drag
+            // but not momentum conservative
             //
             // HbyAs[phasei] += fvc::reconstruct
             // (

From 0a21d025309ca7a4e95936f95de773fa6edc8156 Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Thu, 15 Mar 2012 13:15:55 +0000
Subject: [PATCH 018/317] ENH: Added new cloudInfo function object

---
 src/postProcessing/functionObjects/Allwmake   |   3 +-
 .../functionObjects/cloud/Make/files          |   4 +
 .../functionObjects/cloud/Make/options        |   9 +
 .../cloud/cloudInfo/IOcloudInfo.H             |  49 +++++
 .../cloud/cloudInfo/cloudInfo.C               | 183 ++++++++++++++++++
 .../cloud/cloudInfo/cloudInfo.H               | 157 +++++++++++++++
 .../cloud/cloudInfo/cloudInfoFunctionObject.C |  42 ++++
 .../cloud/cloudInfo/cloudInfoFunctionObject.H |  54 ++++++
 .../cloud/cloudInfo/postProcessingDict        |  31 +++
 9 files changed, 531 insertions(+), 1 deletion(-)
 create mode 100644 src/postProcessing/functionObjects/cloud/Make/files
 create mode 100644 src/postProcessing/functionObjects/cloud/Make/options
 create mode 100644 src/postProcessing/functionObjects/cloud/cloudInfo/IOcloudInfo.H
 create mode 100644 src/postProcessing/functionObjects/cloud/cloudInfo/cloudInfo.C
 create mode 100644 src/postProcessing/functionObjects/cloud/cloudInfo/cloudInfo.H
 create mode 100644 src/postProcessing/functionObjects/cloud/cloudInfo/cloudInfoFunctionObject.C
 create mode 100644 src/postProcessing/functionObjects/cloud/cloudInfo/cloudInfoFunctionObject.H
 create mode 100644 src/postProcessing/functionObjects/cloud/cloudInfo/postProcessingDict

diff --git a/src/postProcessing/functionObjects/Allwmake b/src/postProcessing/functionObjects/Allwmake
index e62cdf86c7..343d2bafc4 100755
--- a/src/postProcessing/functionObjects/Allwmake
+++ b/src/postProcessing/functionObjects/Allwmake
@@ -3,11 +3,12 @@ cd ${0%/*} || exit 1    # run from this directory
 makeType=${1:-libso}
 set -x
 
+wmake $makeType cloud
 wmake $makeType field
 wmake $makeType forces
 wmake $makeType IO
-wmake $makeType utilities
 wmake $makeType jobControl
 wmake $makeType systemCall
+wmake $makeType utilities
 
 # ----------------------------------------------------------------- end-of-file
diff --git a/src/postProcessing/functionObjects/cloud/Make/files b/src/postProcessing/functionObjects/cloud/Make/files
new file mode 100644
index 0000000000..e8515a0937
--- /dev/null
+++ b/src/postProcessing/functionObjects/cloud/Make/files
@@ -0,0 +1,4 @@
+cloudInfo/cloudInfo.C
+cloudInfo/cloudInfoFunctionObject.C
+
+LIB = $(FOAM_LIBBIN)/libcloudFunctionObjects
diff --git a/src/postProcessing/functionObjects/cloud/Make/options b/src/postProcessing/functionObjects/cloud/Make/options
new file mode 100644
index 0000000000..7699961acc
--- /dev/null
+++ b/src/postProcessing/functionObjects/cloud/Make/options
@@ -0,0 +1,9 @@
+EXE_INC = \
+    -I$(LIB_SRC)/finiteVolume/lnInclude \
+    -I$(LIB_SRC)/lagrangian/basic/lnInclude \
+    -I$(LIB_SRC)/lagrangian/intermediate/lnInclude
+
+LIB_LIBS = \
+    -lfiniteVolume \
+    -llagrangian \
+    -llagrangianIntermediate
diff --git a/src/postProcessing/functionObjects/cloud/cloudInfo/IOcloudInfo.H b/src/postProcessing/functionObjects/cloud/cloudInfo/IOcloudInfo.H
new file mode 100644
index 0000000000..6e0eda072a
--- /dev/null
+++ b/src/postProcessing/functionObjects/cloud/cloudInfo/IOcloudInfo.H
@@ -0,0 +1,49 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Typedef
+    Foam::IOcloudInfo
+
+Description
+    Instance of the generic IOOutputFilter for cloudInfo.
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef IOcloudInfo_H
+#define IOcloudInfo_H
+
+#include "cloudInfo.H"
+#include "IOOutputFilter.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    typedef IOOutputFilter<cloudInfo> IOcloudInfo;
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/postProcessing/functionObjects/cloud/cloudInfo/cloudInfo.C b/src/postProcessing/functionObjects/cloud/cloudInfo/cloudInfo.C
new file mode 100644
index 0000000000..6c5c6c5af4
--- /dev/null
+++ b/src/postProcessing/functionObjects/cloud/cloudInfo/cloudInfo.C
@@ -0,0 +1,183 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "cloudInfo.H"
+#include "dictionary.H"
+#include "kinematicCloud.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+defineTypeNameAndDebug(Foam::cloudInfo, 0);
+
+
+// * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
+
+void Foam::cloudInfo::makeFiles()
+{
+    if (debug)
+    {
+        Info<< "Creating cloudInfo output files." << endl;
+    }
+
+    outputFilePtr_.clear();
+    outputFilePtr_.setSize(cloudSet_.size());
+
+    if (Pstream::master())
+    {
+        label i = 0;
+        forAllConstIter(wordHashSet, cloudSet_, iter)
+        {
+            const word& cloudName = iter.key();
+            fileName cloudInfoDir(obr_.time().path());
+            word timeName = Foam::name(obr_.time().startTime().value());
+
+            if (Pstream::parRun())
+            {
+                // Put in undecomposed case (Note: gives problems for
+                // distributed data running)
+                cloudInfoDir = cloudInfoDir/".."/name_/timeName;
+            }
+            else
+            {
+                cloudInfoDir = cloudInfoDir/name_/timeName;
+            }
+
+            // Create directory if does not exist
+            mkDir(cloudInfoDir);
+
+            // Open new files at start up
+            outputFilePtr_.set
+            (
+                i,
+                new OFstream(cloudInfoDir/(cloudName + ".dat"))
+            );
+
+            // Add headers
+            outputFilePtr_[i]
+                << "# Time" << tab << "nParcels" << tab << "mass" << endl;
+
+            i++;
+        }
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::cloudInfo::cloudInfo
+(
+    const word& name,
+    const objectRegistry& obr,
+    const dictionary& dict,
+    const bool loadFromFiles
+)
+:
+    name_(name),
+    obr_(obr),
+    active_(true),
+    cloudSet_(),
+    outputFilePtr_()
+{
+    read(dict);
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::cloudInfo::~cloudInfo()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::cloudInfo::read(const dictionary& dict)
+{
+    if (active_)
+    {
+        cloudSet_.insert(wordList(dict.lookup("clouds")));
+
+        Info<< type() << ": ";
+        if (cloudSet_.size())
+        {
+            Info<< "applying to clouds:" << nl;
+            forAllConstIter(wordHashSet, cloudSet_, iter)
+            {
+                Info<< "    " << iter.key() << nl;
+            }
+            Info<< endl;
+
+            makeFiles();
+        }
+        else
+        {
+            Info<< "no clouds to be processed" << nl << endl;
+        }
+    }
+}
+
+
+void Foam::cloudInfo::execute()
+{
+    // Do nothing
+}
+
+
+void Foam::cloudInfo::end()
+{
+    // Do nothing
+}
+
+
+void Foam::cloudInfo::write()
+{
+    if (active_)
+    {
+        label i = 0;
+        forAllConstIter(wordHashSet, cloudSet_, iter)
+        {
+            const word& cloudName = iter.key();
+
+            const kinematicCloud& cloud =
+                obr_.lookupObject<kinematicCloud>(cloudName);
+
+            label nParcels = returnReduce(cloud.nParcels(), sumOp<label>());
+            scalar massInSystem =
+                returnReduce(cloud.massInSystem(), sumOp<scalar>());
+
+            if (Pstream::master())
+            {
+                outputFilePtr_[i]
+                    << obr_.time().value() << token::TAB
+                    << nParcels << token::TAB
+                    << massInSystem << endl;
+            }
+
+            i++;
+        }
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/src/postProcessing/functionObjects/cloud/cloudInfo/cloudInfo.H b/src/postProcessing/functionObjects/cloud/cloudInfo/cloudInfo.H
new file mode 100644
index 0000000000..04e6468d68
--- /dev/null
+++ b/src/postProcessing/functionObjects/cloud/cloudInfo/cloudInfo.H
@@ -0,0 +1,157 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::cloudInfo
+
+Description
+    Outputs cloud information to file
+
+    Currently outputs:
+        - total current number of parcels
+        - total current mass of parcels
+
+SourceFiles
+    cloudInfo.C
+    IOcloudInfo.H
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef cloudInfo_H
+#define cloudInfo_H
+
+#include "OFstream.H"
+#include "PtrList.H"
+#include "pointFieldFwd.H"
+#include "volFields.H"
+#include "surfaceFields.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// Forward declaration of classes
+class objectRegistry;
+class dictionary;
+class mapPolyMesh;
+
+/*---------------------------------------------------------------------------*\
+                         Class cloudInfo Declaration
+\*---------------------------------------------------------------------------*/
+
+class cloudInfo
+{
+protected:
+
+    // Protected data
+
+        //- Name of this set of cloudInfo object
+        word name_;
+
+        const objectRegistry& obr_;
+
+        //- on/off switch
+        bool active_;
+
+        //- Clouds to process
+        wordHashSet cloudSet_;
+
+        //- Output file pointers
+        PtrList<OFstream> outputFilePtr_;
+
+
+    // Protected Member Functions
+
+        //- If the output file has not been created create it
+        void makeFiles();
+
+        //- Disallow default bitwise copy construct
+        cloudInfo(const cloudInfo&);
+
+        //- Disallow default bitwise assignment
+        void operator=(const cloudInfo&);
+
+
+public:
+
+    //- Runtime type information
+    TypeName("cloudInfo");
+
+
+    // Constructors
+
+        //- Construct for given objectRegistry and dictionary.
+        //  Allow the possibility to load fields from files
+        cloudInfo
+        (
+            const word& name,
+            const objectRegistry&,
+            const dictionary&,
+            const bool loadFromFiles = false
+        );
+
+
+    //- Destructor
+    virtual ~cloudInfo();
+
+
+    // Member Functions
+
+        //- Return name of the cloudInfo object
+        virtual const word& name() const
+        {
+            return name_;
+        }
+
+        //- Read the field min/max data
+        virtual void read(const dictionary&);
+
+        //- Execute, currently does nothing
+        virtual void execute();
+
+        //- Execute at the final time-loop, currently does nothing
+        virtual void end();
+
+        //- Write
+        virtual void write();
+
+        //- Update for changes of mesh
+        virtual void updateMesh(const mapPolyMesh&)
+        {}
+
+        //- Update for changes of mesh
+        virtual void movePoints(const pointField&)
+        {}
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/postProcessing/functionObjects/cloud/cloudInfo/cloudInfoFunctionObject.C b/src/postProcessing/functionObjects/cloud/cloudInfo/cloudInfoFunctionObject.C
new file mode 100644
index 0000000000..8197da4ec8
--- /dev/null
+++ b/src/postProcessing/functionObjects/cloud/cloudInfo/cloudInfoFunctionObject.C
@@ -0,0 +1,42 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "cloudInfoFunctionObject.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    defineNamedTemplateTypeNameAndDebug(cloudInfoFunctionObject, 0);
+
+    addToRunTimeSelectionTable
+    (
+        functionObject,
+        cloudInfoFunctionObject,
+        dictionary
+    );
+}
+
+// ************************************************************************* //
diff --git a/src/postProcessing/functionObjects/cloud/cloudInfo/cloudInfoFunctionObject.H b/src/postProcessing/functionObjects/cloud/cloudInfo/cloudInfoFunctionObject.H
new file mode 100644
index 0000000000..3d85754fce
--- /dev/null
+++ b/src/postProcessing/functionObjects/cloud/cloudInfo/cloudInfoFunctionObject.H
@@ -0,0 +1,54 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Typedef
+    Foam::cloudInfoFunctionObject
+
+Description
+    FunctionObject wrapper around cloudInfo to allow them to be created via
+    the functions entry within controlDict.
+
+SourceFiles
+    cloudInfoFunctionObject.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef cloudInfoFunctionObject_H
+#define cloudInfoFunctionObject_H
+
+#include "cloudInfo.H"
+#include "OutputFilterFunctionObject.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    typedef OutputFilterFunctionObject<cloudInfo>
+        cloudInfoFunctionObject;
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/postProcessing/functionObjects/cloud/cloudInfo/postProcessingDict b/src/postProcessing/functionObjects/cloud/cloudInfo/postProcessingDict
new file mode 100644
index 0000000000..da6d02204c
--- /dev/null
+++ b/src/postProcessing/functionObjects/cloud/cloudInfo/postProcessingDict
@@ -0,0 +1,31 @@
+/*--------------------------------*- 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;
+    object      postProcessingDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+functions
+{
+    cloudInfo1
+    {
+        type            cloudInfo;
+        functionObjectLibs ("libcloudFunctionObjects.so");
+        enabled         true;
+        outputControl   timeStep;
+        outputInterval  1;
+
+        clouds          (myCloud1);
+    }
+}
+
+// ************************************************************************* //

From 12f2f0c09b927229e4cf61dba2c228992c351644 Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Thu, 15 Mar 2012 15:10:14 +0000
Subject: [PATCH 019/317] compressibleTwoPhaseEulerFoam: removed k contribution
 from the stress

---
 .../multiphase/compressibleTwoPhaseEulerFoam/UEqns.H      | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/UEqns.H b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/UEqns.H
index ca2a5bf265..fe40ce2f49 100644
--- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/UEqns.H
+++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/UEqns.H
@@ -18,7 +18,7 @@ fvVectorMatrix U2Eqn(U2, U2.dimensions()*dimVol/dimTime);
         volTensorField Rc1
         (
             "Rc1",
-            ((2.0/3.0)*I)*(sqr(Ct)*k + nuEff1*tr(gradU1T)) - nuEff1*gradU1T
+            (((2.0/3.0)*I)*nuEff1)*tr(gradU1T) - nuEff1*gradU1T
         );
 
         if (kineticTheory.on())
@@ -45,7 +45,7 @@ fvVectorMatrix U2Eqn(U2, U2.dimensions()*dimVol/dimTime);
           - fvm::Sp(dragCoeff/rho1, U1)
           - alpha1*alpha2/rho1*(liftForce - Cvm*rho2*DDtU2)
         );
-
+        mrfZones.addCoriolis(alpha1, U1Eqn);
         U1Eqn.relax();
     }
 
@@ -54,7 +54,7 @@ fvVectorMatrix U2Eqn(U2, U2.dimensions()*dimVol/dimTime);
         volTensorField Rc2
         (
             "Rc2",
-            ((2.0/3.0)*I)*(k + nuEff2*tr(gradU2T)) - nuEff2*gradU2T
+            (((2.0/3.0)*I)*nuEff2)*tr(gradU2T) - nuEff2*gradU2T
         );
 
         U2Eqn =
@@ -76,7 +76,7 @@ fvVectorMatrix U2Eqn(U2, U2.dimensions()*dimVol/dimTime);
           - fvm::Sp(dragCoeff/rho2, U2)
           + alpha1*alpha2/rho2*(liftForce + Cvm*rho2*DDtU1)
         );
-
+        mrfZones.addCoriolis(alpha2, U2Eqn);
         U2Eqn.relax();
     }
 }

From 3417551c2de5ff62382b14f5f831322dd0ed1e90 Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Thu, 15 Mar 2012 15:10:42 +0000
Subject: [PATCH 020/317] compressibleTwoPhaseEulerFoam: added MRF support

---
 .../compressibleTwoPhaseEulerFoam.C                      | 3 +++
 .../compressibleTwoPhaseEulerFoam/createMRFZones.H       | 4 ++++
 .../multiphase/compressibleTwoPhaseEulerFoam/pEqn.H      | 9 +++++++++
 3 files changed, 16 insertions(+)
 create mode 100644 applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/createMRFZones.H

diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/compressibleTwoPhaseEulerFoam.C b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/compressibleTwoPhaseEulerFoam.C
index d29da482ba..78d70a1537 100644
--- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/compressibleTwoPhaseEulerFoam.C
+++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/compressibleTwoPhaseEulerFoam.C
@@ -45,6 +45,8 @@ Description
 
 #include "pimpleControl.H"
 
+#include "MRFZones.H"
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 int main(int argc, char *argv[])
@@ -55,6 +57,7 @@ int main(int argc, char *argv[])
     #include "createMesh.H"
     #include "readGravitationalAcceleration.H"
     #include "createFields.H"
+    #include "createMRFZones.H"
     #include "readPPProperties.H"
     #include "initContinuityErrs.H"
     #include "readTimeControls.H"
diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/createMRFZones.H b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/createMRFZones.H
new file mode 100644
index 0000000000..4d5c2bab72
--- /dev/null
+++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/createMRFZones.H
@@ -0,0 +1,4 @@
+    MRFZones mrfZones(mesh);
+    mrfZones.correctBoundaryVelocity(U1);
+    mrfZones.correctBoundaryVelocity(U2);
+    mrfZones.correctBoundaryVelocity(U);
diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/pEqn.H b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/pEqn.H
index 6c0d1e50f2..aabbc6d4c2 100644
--- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/pEqn.H
+++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/pEqn.H
@@ -2,6 +2,11 @@
     rho1 = rho10 + psi1*p;
     rho2 = rho20 + psi2*p;
 
+    mrfZones.absoluteFlux(phi1.oldTime());
+    mrfZones.absoluteFlux(phi1);
+    mrfZones.absoluteFlux(phi2.oldTime());
+    mrfZones.absoluteFlux(phi2);
+
     surfaceScalarField alpha1f(fvc::interpolate(alpha1));
     surfaceScalarField alpha2f(scalar(1) - alpha1f);
 
@@ -25,6 +30,7 @@
       + fvc::interpolate((1.0/rho1)*rAU1*dragCoeff)*phi2
       + rAlphaAU1f*(g & mesh.Sf())
     );
+    mrfZones.relativeFlux(phiHbyA1);
 
     surfaceScalarField phiHbyA2
     (
@@ -34,6 +40,7 @@
       + fvc::interpolate((1.0/rho2)*rAU2*dragCoeff)*phi1
       + rAlphaAU2f*(g & mesh.Sf())
     );
+    mrfZones.relativeFlux(phiHbyA2);
 
     surfaceScalarField phiHbyA("phiHbyA", alpha1f*phiHbyA1 + alpha2f*phiHbyA2);
 
@@ -97,10 +104,12 @@
             phi1.boundaryField() ==
                 (fvc::interpolate(U1) & mesh.Sf())().boundaryField();
             phi1 = phiHbyA1 + rAlphaAU1f*mSfGradp/fvc::interpolate(rho1);
+            mrfZones.relativeFlux(phi1.oldTime());
 
             phi2.boundaryField() ==
                 (fvc::interpolate(U2) & mesh.Sf())().boundaryField();
             phi2 = phiHbyA2 + rAlphaAU2f*mSfGradp/fvc::interpolate(rho2);
+            mrfZones.relativeFlux(phi2.oldTime());
 
             phi = alpha1f*phi1 + alpha2f*phi2;
 

From 0a50fdabe0313abc475f792cddccfc63b4b4d09b Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Thu, 15 Mar 2012 15:11:05 +0000
Subject: [PATCH 021/317] MRFtwoPhaseEulerFoam: update MRF handling of U

---
 .../twoPhaseEulerFoam/MRFtwoPhaseEulerFoam/createMRFZones.H      | 1 +
 1 file changed, 1 insertion(+)

diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/MRFtwoPhaseEulerFoam/createMRFZones.H b/applications/solvers/multiphase/twoPhaseEulerFoam/MRFtwoPhaseEulerFoam/createMRFZones.H
index 2fc0eff9eb..4d5c2bab72 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/MRFtwoPhaseEulerFoam/createMRFZones.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/MRFtwoPhaseEulerFoam/createMRFZones.H
@@ -1,3 +1,4 @@
     MRFZones mrfZones(mesh);
     mrfZones.correctBoundaryVelocity(U1);
     mrfZones.correctBoundaryVelocity(U2);
+    mrfZones.correctBoundaryVelocity(U);

From 7b5fec33616f5fb4f7abb14dd8ae4e714fd0643a Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Thu, 15 Mar 2012 15:41:05 +0000
Subject: [PATCH 022/317] BUG: extrudeToRegionMesh: extruding cyclics

---
 .../createShellMesh/createShellMesh.C         |  25 ++-
 .../createShellMesh/createShellMesh.H         |   7 +-
 .../extrudeToRegionMesh/extrudeToRegionMesh.C | 157 ++++++++++++++----
 3 files changed, 145 insertions(+), 44 deletions(-)

diff --git a/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/createShellMesh/createShellMesh.C b/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/createShellMesh/createShellMesh.C
index 13aefeac10..7da1a844b7 100644
--- a/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/createShellMesh/createShellMesh.C
+++ b/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/createShellMesh/createShellMesh.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -67,6 +67,7 @@ void Foam::createShellMesh::syncEdges
     const labelList& patchEdges,
     const labelList& coupledEdges,
     const PackedBoolList& sameEdgeOrientation,
+    const bool syncNonCollocated,
 
     PackedBoolList& isChangedEdge,
     DynamicList<label>& changedEdges,
@@ -111,7 +112,11 @@ void Foam::createShellMesh::syncEdges
     (
         cppEdgeData,
         globalData.globalEdgeSlaves(),
-        globalData.globalEdgeTransformedSlaves(),
+        (
+            syncNonCollocated
+          ? globalData.globalEdgeTransformedSlaves()    // transformed elems
+          : labelListList(globalData.globalEdgeSlaves().size()) //no transformed
+        ),
         map,
         minEqOp<labelPair>()
     );
@@ -150,6 +155,7 @@ void Foam::createShellMesh::calcPointRegions
     const globalMeshData& globalData,
     const primitiveFacePatch& patch,
     const PackedBoolList& nonManifoldEdge,
+    const bool syncNonCollocated,
 
     faceList& pointGlobalRegions,
     faceList& pointLocalRegions,
@@ -243,6 +249,7 @@ void Foam::createShellMesh::calcPointRegions
         patchEdges,
         coupledEdges,
         sameEdgeOrientation,
+        syncNonCollocated,
 
         isChangedEdge,
         changedEdges,
@@ -356,6 +363,7 @@ void Foam::createShellMesh::calcPointRegions
             patchEdges,
             coupledEdges,
             sameEdgeOrientation,
+            syncNonCollocated,
 
             isChangedEdge,
             changedEdges,
@@ -509,6 +517,7 @@ void Foam::createShellMesh::setRefinement
         }
     }
 
+
     // Introduce original points
     // ~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -525,12 +534,13 @@ void Foam::createShellMesh::setRefinement
         );
         pointToPointMap.append(pointI);
 
-//        Pout<< "Added bottom point " << pointToPointMap[pointI]
-//            << " at " << patch_.localPoints()[pointI]
-//            << "  from point " << pointI
-//            << endl;
+        //Pout<< "Added bottom point " << addedPointI
+        //    << " at " << patch_.localPoints()[pointI]
+        //    << "  from point " << pointI
+        //    << endl;
     }
 
+
     // Introduce new points (one for every region)
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -541,7 +551,6 @@ void Foam::createShellMesh::setRefinement
 
         point pt = patch_.localPoints()[pointI];
         point disp = firstLayerDisp[regionI];
-
         for (label layerI = 0; layerI < nLayers; layerI++)
         {
             pt += disp;
@@ -675,7 +684,7 @@ void Foam::createShellMesh::setRefinement
             {
                 FatalErrorIn("createShellMesh::setRefinement(..)")
                     << "external/feature edge:" << edgeI
-                    << " has " << eFaces.size() << " connected extruded faces"
+                    << " has " << eFaces.size() << " connected extruded faces "
                     << " but only " << ePatches.size()
                     << " boundary faces defined." << exit(FatalError);
             }
diff --git a/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/createShellMesh/createShellMesh.H b/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/createShellMesh/createShellMesh.H
index 7517a956df..df1e000be8 100644
--- a/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/createShellMesh/createShellMesh.H
+++ b/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/createShellMesh/createShellMesh.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -88,6 +88,8 @@ class createShellMesh
             const labelList&,
             const labelList&,
             const PackedBoolList& sameEdgeOrientation,
+            const bool syncNonCollocated,
+
             PackedBoolList& isChangedEdge,
             DynamicList<label>& changedEdges,
             labelPairList& allEdgeData
@@ -160,6 +162,8 @@ public:
             //  same on all faces connected to a point if they can be
             //  reached through a face-edge-face walk without crossing
             //  the nonManifoldEdge.
+            //  syncNonCollocated = true: edges connected through cyclic become
+            //  single region. false: kept separate.
             //  pointGlobalRegions : non-compact. Guaranteed to be the same
             //  across processors.
             //  pointLocalRegions : compact.
@@ -169,6 +173,7 @@ public:
                 const globalMeshData& globalData,
                 const primitiveFacePatch& patch,
                 const PackedBoolList& nonManifoldEdge,
+                const bool syncNonCollocated,
                 faceList& pointGlobalRegions,
                 faceList& pointLocalRegions,
                 labelList& localToGlobalRegion
diff --git a/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C b/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C
index b32c249e7c..ff4780b65b 100644
--- a/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C
+++ b/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -102,6 +102,13 @@ becomes
     BBB=mapped between original mesh and new extrusion
     CCC=polypatch
 
+
+Notes:
+    - when extruding cyclics with only one cell inbetween it does not
+      detect this as a cyclic since the face is the same face. It will
+      only work if the coupled edge extrudes a different face so if there
+      are more than 1 cell inbetween.
+
 \*---------------------------------------------------------------------------*/
 
 #include "argList.H"
@@ -1032,6 +1039,42 @@ label findUncoveredPatchFace
 }
 
 
+// Same as findUncoveredPatchFace, except explicitly checks for cyclic faces
+label findUncoveredCyclicPatchFace
+(
+    const fvMesh& mesh,
+    const UIndirectList<label>& extrudeMeshFaces,// mesh faces that are extruded
+    const label meshEdgeI                       // mesh edge
+)
+{
+    // Make set of extruded faces.
+    labelHashSet extrudeFaceSet(extrudeMeshFaces.size());
+    forAll(extrudeMeshFaces, i)
+    {
+        extrudeFaceSet.insert(extrudeMeshFaces[i]);
+    }
+
+    const polyBoundaryMesh& pbm = mesh.boundaryMesh();
+    const labelList& eFaces = mesh.edgeFaces()[meshEdgeI];
+    forAll(eFaces, i)
+    {
+        label faceI = eFaces[i];
+        label patchI = pbm.whichPatch(faceI);
+
+        if
+        (
+            patchI != -1
+        &&  isA<cyclicPolyPatch>(pbm[patchI])
+        && !extrudeFaceSet.found(faceI)
+        )
+        {
+            return faceI;
+        }
+    }
+    return -1;
+}
+
+
 // Calculate per edge min and max zone
 void calcEdgeMinMaxZone
 (
@@ -1288,12 +1331,13 @@ void addCouplingPatches
 }
 
 
-// Sets sidePatch[edgeI] to interprocessor patch. Adds any
-// interprocessor patches if necessary.
-void addProcPatches
+// Sets sidePatch[edgeI] to interprocessor or cyclic patch. Adds any
+// coupled patches if necessary.
+void addCoupledPatches
 (
     const fvMesh& mesh,
     const primitiveFacePatch& extrudePatch,
+    const labelList& extrudeMeshFaces,
     const labelList& extrudeMeshEdges,
     const mapDistribute& extrudeEdgeFacesMap,
     const labelListList& extrudeEdgeGlobalFaces,
@@ -1342,7 +1386,7 @@ void addProcPatches
         labelMin        // null value
     );
 
-    Pout<< "Adding inter-processor patches:" << nl << nl
+    Pout<< "Adding processor or cyclic patches:" << nl << nl
         << "patchID\tpatch" << nl
         << "-------\t-----"
         << endl;
@@ -1367,35 +1411,84 @@ void addProcPatches
                 nbrProcI = maxProcID[edgeI];
             }
 
-            word name =
-                "procBoundary"
-              + Foam::name(Pstream::myProcNo())
-              + "to"
-              + Foam::name(nbrProcI);
 
-            sidePatchID[edgeI] = findPatchID(newPatches, name);
-
-            if (sidePatchID[edgeI] == -1)
+            if (nbrProcI == Pstream::myProcNo())
             {
-                dictionary patchDict;
-                patchDict.add("myProcNo", Pstream::myProcNo());
-                patchDict.add("neighbProcNo", nbrProcI);
+                // Cyclic patch since both procs the same. This cyclic should
+                // already exist in newPatches so no adding necessary.
 
-                sidePatchID[edgeI] = addPatch<processorPolyPatch>
+                label faceI = findUncoveredCyclicPatchFace
                 (
-                    mesh.boundaryMesh(),
-                    name,
-                    patchDict,
-                    newPatches
+                    mesh,
+                    UIndirectList<label>(extrudeMeshFaces, eFaces),
+                    extrudeMeshEdges[edgeI]
                 );
 
-                Pout<< sidePatchID[edgeI] << '\t' << name
-                    << nl;
+                if (faceI != -1)
+                {
+                    const polyBoundaryMesh& patches = mesh.boundaryMesh();
+
+                    label newPatchI = findPatchID
+                    (
+                        newPatches,
+                        patches[patches.whichPatch(faceI)].name()
+                    );
+
+                    sidePatchID[edgeI] = newPatchI;
+                }
+                else
+                {
+                    FatalErrorIn
+                    (
+                        "void addCoupledPatches"
+                        "("
+                            "const fvMesh&, "
+                            "const primitiveFacePatch&, "
+                            "const labelList&, "
+                            "const labelList&, "
+                            "const mapDistribute&, "
+                            "const labelListList&, "
+                            "labelList&, "
+                            "DynamicList<polyPatch*>&"
+                        ")"
+                    )   << "Unable to determine coupled patch addressing"
+                        << abort(FatalError);
+                }
+            }
+            else
+            {
+                // Rrocessor patch
+
+                word name =
+                    "procBoundary"
+                  + Foam::name(Pstream::myProcNo())
+                  + "to"
+                  + Foam::name(nbrProcI);
+
+                sidePatchID[edgeI] = findPatchID(newPatches, name);
+
+                if (sidePatchID[edgeI] == -1)
+                {
+                    dictionary patchDict;
+                    patchDict.add("myProcNo", Pstream::myProcNo());
+                    patchDict.add("neighbProcNo", nbrProcI);
+
+                    sidePatchID[edgeI] = addPatch<processorPolyPatch>
+                    (
+                        mesh.boundaryMesh(),
+                        name,
+                        patchDict,
+                        newPatches
+                    );
+
+                    Pout<< sidePatchID[edgeI] << '\t' << name
+                        << nl;
+                }
             }
         }
     }
     Pout<< "Added " << newPatches.size()-nOldPatches
-        << " inter-processor patches." << nl
+        << " coupled patches." << nl
         << endl;
 }
 
@@ -2251,12 +2344,13 @@ int main(int argc, char *argv[])
 
 
     // Sets sidePatchID[edgeI] to interprocessor patch. Adds any
-    // interprocessor patches if necessary.
+    // interprocessor or cyclic patches if necessary.
     labelList sidePatchID;
-    addProcPatches
+    addCoupledPatches
     (
         mesh,
         extrudePatch,
+        extrudeMeshFaces,
         extrudeMeshEdges,
         extrudeEdgeFacesMap,
         extrudeEdgeGlobalFaces,
@@ -2409,6 +2503,7 @@ int main(int argc, char *argv[])
         mesh.globalData(),
         extrudePatch,
         nonManifoldEdge,
+        false,              // keep cyclic separated regions apart
 
         pointGlobalRegions,
         pointLocalRegions,
@@ -2431,7 +2526,6 @@ int main(int argc, char *argv[])
     pointField localRegionNormals(localToGlobalRegion.size());
     {
         pointField localSum(localToGlobalRegion.size(), vector::zero);
-        labelList localNum(localToGlobalRegion.size(), 0);
 
         forAll(pointLocalRegions, faceI)
         {
@@ -2440,32 +2534,25 @@ int main(int argc, char *argv[])
             {
                 label localRegionI = pRegions[fp];
                 localSum[localRegionI] += extrudePatch.faceNormals()[faceI];
-                localNum[localRegionI]++;
             }
         }
 
         Map<point> globalSum(2*localToGlobalRegion.size());
-        Map<label> globalNum(2*localToGlobalRegion.size());
 
         forAll(localSum, localRegionI)
         {
             label globalRegionI = localToGlobalRegion[localRegionI];
             globalSum.insert(globalRegionI, localSum[localRegionI]);
-            globalNum.insert(globalRegionI, localNum[localRegionI]);
         }
 
         // Reduce
         Pstream::mapCombineGather(globalSum, plusEqOp<point>());
         Pstream::mapCombineScatter(globalSum);
-        Pstream::mapCombineGather(globalNum, plusEqOp<label>());
-        Pstream::mapCombineScatter(globalNum);
 
         forAll(localToGlobalRegion, localRegionI)
         {
             label globalRegionI = localToGlobalRegion[localRegionI];
-            localRegionNormals[localRegionI] =
-                globalSum[globalRegionI]
-              / globalNum[globalRegionI];
+            localRegionNormals[localRegionI] = globalSum[globalRegionI];
         }
         localRegionNormals /= mag(localRegionNormals);
     }

From 66a64af359268194c27663b7cfc4615342720003 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Thu, 15 Mar 2012 15:42:07 +0000
Subject: [PATCH 023/317] BUG: foamCleanPath: incorrect test for single
 argument

---
 bin/foamCleanPath | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/bin/foamCleanPath b/bin/foamCleanPath
index 6bae9ca55e..85b93f8f57 100755
--- a/bin/foamCleanPath
+++ b/bin/foamCleanPath
@@ -3,7 +3,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+#   \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
 #    \\/     M anipulation  |
 #-------------------------------------------------------------------------------
 # License
@@ -50,7 +50,7 @@ options:
   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 (at your option)
+    - inaccessible directories (with the -strip option)
 
   Exit status
       0  on success
@@ -86,7 +86,7 @@ done
 dirList="$1"
 shift
 
-[ -n "$1" ] || exit 2    # quick exit on empty 'dirList'
+[ -n "$dirList" ] || exit 2    # quick exit on empty 'dirList'
 
 
 ##DEBUG echo "input>$dirList<" 1>&2

From 2ce9d80e90e27ae02f4529675f3a35440535658a Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Thu, 15 Mar 2012 15:43:09 +0000
Subject: [PATCH 024/317] ENH: globalMeshData: allow call with empty
 transformed elements list

---
 .../polyMesh/globalMeshData/globalMeshData.C  |  6 ++---
 .../globalMeshData/globalMeshDataTemplates.C  | 24 +++++++++++++++----
 2 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C
index d1b4926e76..3ccbdd4043 100644
--- a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C
+++ b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -2403,7 +2403,7 @@ Foam::autoPtr<Foam::globalIndex> Foam::globalMeshData::mergePoints
     (
         masterGlobalPoint,
         pointSlaves,
-        labelListList(cpp.nPoints()),   // no transforms
+        labelListList(0),   // no transforms
         pointSlavesMap,
         maxEqOp<label>()
     );
@@ -2684,7 +2684,7 @@ Foam::autoPtr<Foam::globalIndex> Foam::globalMeshData::mergePoints
     (
         globalMaster,
         pointSlaves,
-        labelListList(cpp.nPoints()),   // no transforms
+        labelListList(0),   // no transforms
         pointSlavesMap,
         maxEqOp<label>()
     );
diff --git a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshDataTemplates.C b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshDataTemplates.C
index 22428ace15..b5d18c2cd8 100644
--- a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshDataTemplates.C
+++ b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshDataTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -50,10 +50,17 @@ void Foam::globalMeshData::syncData
         Type& elem = elems[i];
 
         const labelList& slavePoints = slaves[i];
-        const labelList& transformSlavePoints = transformedSlaves[i];
+        label nTransformSlavePoints =
+        (
+            transformedSlaves.size() == 0
+          ? 0
+          : transformedSlaves[i].size()
+        );
 
-        if (slavePoints.size()+transformSlavePoints.size() > 0)
+        if (slavePoints.size()+nTransformSlavePoints > 0)
         {
+            const labelList& transformSlavePoints = transformedSlaves[i];
+
             // Combine master with untransformed slave data
             forAll(slavePoints, j)
             {
@@ -109,10 +116,17 @@ void Foam::globalMeshData::syncData
         Type& elem = elems[i];
 
         const labelList& slavePoints = slaves[i];
-        const labelList& transformSlavePoints = transformedSlaves[i];
+        label nTransformSlavePoints =
+        (
+            transformedSlaves.size() == 0
+          ? 0
+          : transformedSlaves[i].size()
+        );
 
-        if (slavePoints.size()+transformSlavePoints.size() > 0)
+        if (slavePoints.size()+nTransformSlavePoints > 0)
         {
+            const labelList& transformSlavePoints = transformedSlaves[i];
+
             // Combine master with untransformed slave data
             forAll(slavePoints, j)
             {

From 6bec64c6882461f6c3a25b056ff2b72df9b18a38 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Thu, 15 Mar 2012 15:44:05 +0000
Subject: [PATCH 025/317] ENH: vtkUnstructuredReader: early check for binary
 files

---
 src/fileFormats/vtk/vtkUnstructuredReader.C | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/fileFormats/vtk/vtkUnstructuredReader.C b/src/fileFormats/vtk/vtkUnstructuredReader.C
index 26ecf9a0ad..3d80e1ccec 100644
--- a/src/fileFormats/vtk/vtkUnstructuredReader.C
+++ b/src/fileFormats/vtk/vtkUnstructuredReader.C
@@ -578,6 +578,12 @@ void Foam::vtkUnstructuredReader::read(ISstream& inFile)
         Info<< "dataType : " << dataType_ << endl;
     }
 
+    if (dataType_ == "BINARY")
+    {
+        FatalIOErrorIn("vtkUnstructuredReader::read(ISstream&)", inFile)
+            << "Binary reading not supported " << exit(FatalIOError);
+    }
+
     parseMode readMode = NOMODE;
     label wantedSize = -1;
 

From 221f50566c7dbd70ad0aa67563d8a46a810951b2 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Thu, 15 Mar 2012 15:45:29 +0000
Subject: [PATCH 026/317] ENH: AMIInterpolation: have access to non-overlapping
 faces

---
 .../AMIInterpolation/AMIInterpolation.C       | 40 +++++++++++++++++--
 .../AMIInterpolation/AMIInterpolation.H       | 39 +++++-------------
 .../AMIInterpolation/AMIInterpolationI.H      | 10 ++++-
 3 files changed, 56 insertions(+), 33 deletions(-)

diff --git a/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolation.C b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolation.C
index 2b37a3137a..1739f7c907 100644
--- a/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolation.C
+++ b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolation.C
@@ -32,6 +32,32 @@ License
 
 namespace Foam
 {
+    //- Helper class for list
+    template<class T>
+    class ListPlusEqOp
+    {
+        public:
+        void operator()(List<T>& x, const List<T> y) const
+        {
+            if (y.size())
+            {
+                if (x.size())
+                {
+                    label sz = x.size();
+                    x.setSize(sz + y.size());
+                    forAll(y, i)
+                    {
+                        x[sz++] = y[i];
+                    }
+                }
+                else
+                {
+                    x = y;
+                }
+            }
+        }
+    };
+
     //- Combine operator for interpolateToSource/Target
     template<class Type, class BinaryOp>
     class combineBinaryOp
@@ -1044,7 +1070,7 @@ void Foam::AMIInterpolation<SourcePatch, TargetPatch>::calcAddressing
     // reset starting seed
     label startSeedI = 0;
 
-    label nNonOverlap = 0;
+    DynamicList<label> nonOverlapFaces;
     do
     {
         nbrFaces.clear();
@@ -1085,7 +1111,7 @@ void Foam::AMIInterpolation<SourcePatch, TargetPatch>::calcAddressing
 
         if (!faceProcessed)
         {
-            nNonOverlap++;
+            nonOverlapFaces.append(srcFaceI);
         }
 
         // choose new src face from current src face neighbour
@@ -1105,10 +1131,13 @@ void Foam::AMIInterpolation<SourcePatch, TargetPatch>::calcAddressing
         }
     } while (nFacesRemaining > 0);
 
-    if (nNonOverlap != 0)
+    if (nonOverlapFaces.size() != 0)
     {
-        Pout<< "AMI: " << nNonOverlap << " non-overlap faces identified"
+        Pout<< "AMI: " << nonOverlapFaces.size()
+            << " non-overlap faces identified"
             << endl;
+
+        srcNonOverlap_.transfer(nonOverlapFaces);
     }
 
     // transfer data to persistent storage
@@ -1461,6 +1490,7 @@ Foam::AMIInterpolation<SourcePatch, TargetPatch>::AMIInterpolation
     singlePatchProc_(-999),
     srcAddress_(),
     srcWeights_(),
+    srcNonOverlap_(),
     tgtAddress_(),
     tgtWeights_(),
     treePtr_(NULL),
@@ -1493,6 +1523,7 @@ Foam::AMIInterpolation<SourcePatch, TargetPatch>::AMIInterpolation
     singlePatchProc_(-999),
     srcAddress_(),
     srcWeights_(),
+    srcNonOverlap_(),
     tgtAddress_(),
     tgtWeights_(),
     treePtr_(NULL),
@@ -1580,6 +1611,7 @@ Foam::AMIInterpolation<SourcePatch, TargetPatch>::AMIInterpolation
     singlePatchProc_(fineAMI.singlePatchProc_),
     srcAddress_(),
     srcWeights_(),
+    srcNonOverlap_(),
     tgtAddress_(),
     tgtWeights_(),
     treePtr_(NULL),
diff --git a/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolation.H b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolation.H
index 7f0237dac4..a342d65e3a 100644
--- a/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolation.H
+++ b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolation.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -84,32 +84,6 @@ class AMIInterpolation
     //- local typedef to octree tree-type
     typedef treeDataPrimitivePatch<face, SubList, const pointField&> treeType;
 
-    //- Helper class for list
-    template<class T>
-    class ListPlusEqOp
-    {
-        public:
-        void operator()(List<T>& x, const List<T> y) const
-        {
-            if (y.size())
-            {
-                if (x.size())
-                {
-                    label sz = x.size();
-                    x.setSize(sz + y.size());
-                    forAll(y, i)
-                    {
-                        x[sz++] = y[i];
-                    }
-                }
-                else
-                {
-                    x = y;
-                }
-            }
-        }
-    };
-
 
     // Private data
 
@@ -132,6 +106,10 @@ class AMIInterpolation
             //- Weights of target faces per source face
             scalarListList srcWeights_;
 
+            //- Labels of faces that are not overlapped by any target faces
+            //  (should be empty for correct functioning)
+            labelList srcNonOverlap_;
+
 
         // Target patch
 
@@ -141,7 +119,7 @@ class AMIInterpolation
             //- Addresses of source faces per target face
             labelListList tgtAddress_;
 
-            //- Weights of wource faces per target face
+            //- Weights of source faces per target face
             scalarListList tgtWeights_;
 
 
@@ -387,6 +365,11 @@ public:
                 //- Return const access to source patch weights
                 inline const scalarListList& srcWeights() const;
 
+                //- Labels of faces that are not overlapped by any target faces
+                //  (should be empty for correct functioning)
+                inline const labelList& srcNonOverlap() const;
+
+
                 //- Source map pointer - valid only if singlePatchProc = -1
                 //  This gets source data into a form to be consumed by
                 //  tgtAddress, tgtWeights
diff --git a/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolationI.H b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolationI.H
index 0907ee494c..3dd21b5aa3 100644
--- a/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolationI.H
+++ b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolationI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -55,6 +55,14 @@ Foam::AMIInterpolation<SourcePatch, TargetPatch>::srcWeights() const
 }
 
 
+template<class SourcePatch, class TargetPatch>
+inline const Foam::labelList&
+Foam::AMIInterpolation<SourcePatch, TargetPatch>::srcNonOverlap() const
+{
+    return srcNonOverlap_;
+}
+
+
 template<class SourcePatch, class TargetPatch>
 inline const Foam::mapDistribute&
 Foam::AMIInterpolation<SourcePatch, TargetPatch>::srcMap() const

From 4156ecac37905788e904ad7a347fad6282622d4f Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Thu, 15 Mar 2012 16:12:09 +0000
Subject: [PATCH 027/317] ENH: OBJedgeFormat: read multiple edges per line

---
 src/edgeMesh/edgeFormats/obj/OBJedgeFormat.C | 107 +++++++++++--------
 src/edgeMesh/edgeFormats/obj/OBJedgeFormat.H |   9 +-
 2 files changed, 70 insertions(+), 46 deletions(-)

diff --git a/src/edgeMesh/edgeFormats/obj/OBJedgeFormat.C b/src/edgeMesh/edgeFormats/obj/OBJedgeFormat.C
index 3086c3555d..5be68757dc 100644
--- a/src/edgeMesh/edgeFormats/obj/OBJedgeFormat.C
+++ b/src/edgeMesh/edgeFormats/obj/OBJedgeFormat.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -44,10 +44,57 @@ Foam::fileFormats::OBJedgeFormat::OBJedgeFormat
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-bool Foam::fileFormats::OBJedgeFormat::read
+void Foam::fileFormats::OBJedgeFormat::readVertices
 (
-    const fileName& filename
+    const string& line,
+    string::size_type& endNum,
+    DynamicList<label>& dynVertices
 )
+{
+    dynVertices.clear();
+    while (true)
+    {
+        string::size_type startNum =
+            line.find_first_not_of(' ', endNum);
+
+        if (startNum == string::npos)
+        {
+            break;
+        }
+
+        endNum = line.find(' ', startNum);
+
+        string vertexSpec;
+        if (endNum != string::npos)
+        {
+            vertexSpec = line.substr(startNum, endNum-startNum);
+        }
+        else
+        {
+            vertexSpec = line.substr(startNum, line.size() - startNum);
+        }
+
+        string::size_type slashPos = vertexSpec.find('/');
+
+        label vertI = 0;
+        if (slashPos != string::npos)
+        {
+            IStringStream intStream(vertexSpec.substr(0, slashPos));
+
+            intStream >> vertI;
+        }
+        else
+        {
+            IStringStream intStream(vertexSpec);
+
+            intStream >> vertI;
+        }
+        dynVertices.append(vertI - 1);
+    }
+}
+
+
+bool Foam::fileFormats::OBJedgeFormat::read(const fileName& filename)
 {
     clear();
 
@@ -66,6 +113,8 @@ bool Foam::fileFormats::OBJedgeFormat::read
     DynamicList<edge> dynEdges;
     DynamicList<label> dynUsedPoints;
 
+    DynamicList<label> dynVertices;
+
     while (is.good())
     {
         string line = this->getLineNoComment(is);
@@ -97,50 +146,18 @@ bool Foam::fileFormats::OBJedgeFormat::read
             // Assume 'l' is followed by space.
             string::size_type endNum = 1;
 
-            int nVerts = 0;
-            for (int count = 0; count < 2; ++count)
+            readVertices
+            (
+                line,
+                endNum,
+                dynVertices
+            );
+
+
+            for (label i = 1; i < dynVertices.size(); i++)
             {
-                string::size_type startNum =
-                    line.find_first_not_of(' ', endNum);
+                edge edgeRead(dynVertices[i-1], dynVertices[i]);
 
-                if (startNum == string::npos)
-                {
-                    break;
-                }
-
-                endNum = line.find(' ', startNum);
-
-                string vertexSpec;
-                if (endNum != string::npos)
-                {
-                    vertexSpec = line.substr(startNum, endNum-startNum);
-                }
-                else
-                {
-                    vertexSpec = line.substr(startNum, line.size() - startNum);
-                }
-
-                string::size_type slashPos = vertexSpec.find('/');
-
-                label vertI = 0;
-                if (slashPos != string::npos)
-                {
-                    IStringStream intStream(vertexSpec.substr(0, slashPos));
-
-                    intStream >> vertI;
-                }
-                else
-                {
-                    IStringStream intStream(vertexSpec);
-
-                    intStream >> vertI;
-                }
-
-                edgeRead[nVerts++] = (vertI - 1); // change to zero-offset
-            }
-
-            if (nVerts >= 2)
-            {
                 dynUsedPoints[edgeRead[0]] = edgeRead[0];
                 dynUsedPoints[edgeRead[1]] = edgeRead[1];
 
diff --git a/src/edgeMesh/edgeFormats/obj/OBJedgeFormat.H b/src/edgeMesh/edgeFormats/obj/OBJedgeFormat.H
index 6ba025aa50..11affeddb0 100644
--- a/src/edgeMesh/edgeFormats/obj/OBJedgeFormat.H
+++ b/src/edgeMesh/edgeFormats/obj/OBJedgeFormat.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -59,6 +59,13 @@ class OBJedgeFormat
 {
     // Private Member Functions
 
+        void readVertices
+        (
+            const string& line,
+            string::size_type& endNum,
+            DynamicList<label>& dynVertices
+        );
+
         //- Disallow default bitwise copy construct
         OBJedgeFormat(const OBJedgeFormat&);
 

From eff835ffee2b241d4506d06667468ae17e8fb1b8 Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Thu, 15 Mar 2012 18:05:40 +0000
Subject: [PATCH 028/317] ENH: switch to ptscotch instead of scotch
 automatically for parallel runs

---
 .../decompositionMethod/decompositionMethod.C             | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/parallel/decompose/decompositionMethods/decompositionMethod/decompositionMethod.C b/src/parallel/decompose/decompositionMethods/decompositionMethod/decompositionMethod.C
index ab18fad6e2..27f1c4fbc0 100644
--- a/src/parallel/decompose/decompositionMethods/decompositionMethod/decompositionMethod.C
+++ b/src/parallel/decompose/decompositionMethods/decompositionMethod/decompositionMethod.C
@@ -46,7 +46,13 @@ Foam::autoPtr<Foam::decompositionMethod> Foam::decompositionMethod::New
     const dictionary& decompositionDict
 )
 {
-    const word methodType(decompositionDict.lookup("method"));
+    word methodType(decompositionDict.lookup("method"));
+
+    if (methodType == "scotch" && Pstream::parRun())
+    {
+        methodType = "ptscotch";
+    }
+
 
     Info<< "Selecting decompositionMethod " << methodType << endl;
 

From 7f2ff7c8ff56cbc24a6e3e41d7db43ad6c52ff86 Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Thu, 15 Mar 2012 20:01:49 +0000
Subject: [PATCH 029/317] compressibleTwoPhaseEulerFoam: Corrected boundary
 relative fluxes for MRF

---
 .../multiphase/compressibleTwoPhaseEulerFoam/pEqn.H | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/pEqn.H b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/pEqn.H
index aabbc6d4c2..1f1b308715 100644
--- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/pEqn.H
+++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/pEqn.H
@@ -42,6 +42,11 @@
     );
     mrfZones.relativeFlux(phiHbyA2);
 
+    mrfZones.relativeFlux(phi1.oldTime());
+    mrfZones.relativeFlux(phi1);
+    mrfZones.relativeFlux(phi2.oldTime());
+    mrfZones.relativeFlux(phi2);
+
     surfaceScalarField phiHbyA("phiHbyA", alpha1f*phiHbyA1 + alpha2f*phiHbyA2);
 
     HbyA1 += (1.0/rho1)*rAU1*dragCoeff*U2;
@@ -101,16 +106,8 @@
         {
             surfaceScalarField mSfGradp = pEqnIncomp.flux()/Dp;
 
-            phi1.boundaryField() ==
-                (fvc::interpolate(U1) & mesh.Sf())().boundaryField();
             phi1 = phiHbyA1 + rAlphaAU1f*mSfGradp/fvc::interpolate(rho1);
-            mrfZones.relativeFlux(phi1.oldTime());
-
-            phi2.boundaryField() ==
-                (fvc::interpolate(U2) & mesh.Sf())().boundaryField();
             phi2 = phiHbyA2 + rAlphaAU2f*mSfGradp/fvc::interpolate(rho2);
-            mrfZones.relativeFlux(phi2.oldTime());
-
             phi = alpha1f*phi1 + alpha2f*phi2;
 
             dgdt =

From 7f6527130b4fb6c9b4fe7c1e1bd04b0e5ab1747d Mon Sep 17 00:00:00 2001
From: laurence <laurence>
Date: Fri, 16 Mar 2012 10:11:24 +0000
Subject: [PATCH 030/317] STYLE: Update headers

---
 .../backgroundMeshDecomposition/backgroundMeshDecomposition.C | 2 +-
 .../backgroundMeshDecomposition/backgroundMeshDecomposition.H | 2 +-
 .../backgroundMeshDecompositionI.H                            | 2 +-
 .../conformalVoronoiMesh/CGALTriangulation3Ddefs.H            | 2 +-
 .../conformalVoronoiMesh/conformalVoronoiMesh.C               | 4 +++-
 .../conformalVoronoiMeshFeaturePointSpecialisations.C         | 2 +-
 .../conformalVoronoiMesh/conformalVoronoiMeshFeaturePoints.C  | 2 +-
 .../conformalVoronoiMesh/conformalVoronoiMesh/indexedCell.C   | 2 +-
 .../conformalVoronoiMesh/conformalVoronoiMesh/indexedCell.H   | 2 +-
 .../conformalVoronoiMesh/conformalVoronoiMesh/indexedCellI.H  | 2 +-
 .../conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex.C | 2 +-
 .../conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex.H | 2 +-
 .../conformalVoronoiMesh/indexedVertexI.H                     | 2 +-
 .../conformalVoronoiMesh/pointFeatureEdgesTypes.H             | 2 +-
 .../conformationSurfaces/conformationSurfaces.C               | 2 +-
 .../conformationSurfaces/conformationSurfaces.H               | 2 +-
 .../conformationSurfaces/conformationSurfacesI.H              | 2 +-
 .../cvMesh/conformalVoronoiMesh/cvControls/cvControls.C       | 2 +-
 .../cvMesh/conformalVoronoiMesh/cvControls/cvControls.H       | 2 +-
 .../cvMesh/conformalVoronoiMesh/cvControls/cvControlsI.H      | 2 +-
 .../faceAreaWeightModel/faceAreaWeightModel.C                 | 2 +-
 .../faceAreaWeightModel/faceAreaWeightModel.H                 | 2 +-
 .../piecewiseLinearRamp/piecewiseLinearRamp.C                 | 2 +-
 .../piecewiseLinearRamp/piecewiseLinearRamp.H                 | 2 +-
 .../initialPointsMethod/autoDensity/autoDensity.C             | 2 +-
 .../initialPointsMethod/autoDensity/autoDensity.H             | 2 +-
 .../initialPointsMethod/bodyCentredCubic/bodyCentredCubic.C   | 2 +-
 .../initialPointsMethod/bodyCentredCubic/bodyCentredCubic.H   | 2 +-
 .../initialPointsMethod/faceCentredCubic/faceCentredCubic.C   | 2 +-
 .../initialPointsMethod/faceCentredCubic/faceCentredCubic.H   | 2 +-
 .../initialPointsMethod/initialPointsMethod.C                 | 2 +-
 .../initialPointsMethod/initialPointsMethod.H                 | 2 +-
 .../initialPointsMethod/pointFile/pointFile.C                 | 2 +-
 .../initialPointsMethod/pointFile/pointFile.H                 | 2 +-
 .../initialPointsMethod/uniformGrid/uniformGrid.C             | 2 +-
 .../initialPointsMethod/uniformGrid/uniformGrid.H             | 2 +-
 .../relaxationModel/adaptiveLinear/adaptiveLinear.C           | 2 +-
 .../relaxationModel/adaptiveLinear/adaptiveLinear.H           | 2 +-
 .../relaxationModel/rampHoldFall/rampHoldFall.C               | 2 +-
 .../relaxationModel/rampHoldFall/rampHoldFall.H               | 2 +-
 .../relaxationModel/relaxationModel/relaxationModel.C         | 2 +-
 .../relaxationModel/relaxationModel/relaxationModel.H         | 2 +-
 42 files changed, 44 insertions(+), 42 deletions(-)

diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.C b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.C
index a2d44f0ee1..395b6c78b2 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.C
+++ b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.H b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.H
index d8e6388cfb..01572a48f9 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.H
+++ b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecompositionI.H b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecompositionI.H
index 2897d3fc58..94a05c4134 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecompositionI.H
+++ b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecompositionI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/CGALTriangulation3Ddefs.H b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/CGALTriangulation3Ddefs.H
index 3176e4dec4..72d44618a2 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/CGALTriangulation3Ddefs.H
+++ b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/CGALTriangulation3Ddefs.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C
index 958fcf6763..09d27dfa36 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C
+++ b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -817,6 +817,8 @@ void Foam::conformalVoronoiMesh::storeSizesAndAlignments
 
     label i = 0;
 
+    checkCellSizing();
+
     for
     (
         List<Point>::const_iterator pit = storePts.begin();
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshFeaturePointSpecialisations.C b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshFeaturePointSpecialisations.C
index 4fee4a36e5..2882be0c6f 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshFeaturePointSpecialisations.C
+++ b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshFeaturePointSpecialisations.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshFeaturePoints.C b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshFeaturePoints.C
index a9b2c6c1cd..06e93e4901 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshFeaturePoints.C
+++ b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshFeaturePoints.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell.C b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell.C
index 50f86c95bb..06b2c4d400 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell.C
+++ b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell.H b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell.H
index 5fc7e970b1..eab096819a 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell.H
+++ b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCellI.H b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCellI.H
index 6450b01908..eb5e0b44bd 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCellI.H
+++ b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCellI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex.C b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex.C
index 2173e7f5fa..2f1fa3c5bb 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex.C
+++ b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex.H b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex.H
index 525c2156e8..c3d13ab05e 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex.H
+++ b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertexI.H b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertexI.H
index 1e225eaa2e..f427316fc5 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertexI.H
+++ b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertexI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/pointFeatureEdgesTypes.H b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/pointFeatureEdgesTypes.H
index 3009f385b2..8838487f1e 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/pointFeatureEdgesTypes.H
+++ b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/pointFeatureEdgesTypes.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformationSurfaces/conformationSurfaces.C b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformationSurfaces/conformationSurfaces.C
index 8212688165..e012b1fa44 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformationSurfaces/conformationSurfaces.C
+++ b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformationSurfaces/conformationSurfaces.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformationSurfaces/conformationSurfaces.H b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformationSurfaces/conformationSurfaces.H
index ce56a977aa..9387f2e0f3 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformationSurfaces/conformationSurfaces.H
+++ b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformationSurfaces/conformationSurfaces.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformationSurfaces/conformationSurfacesI.H b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformationSurfaces/conformationSurfacesI.H
index 016a848802..c773d21b46 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformationSurfaces/conformationSurfacesI.H
+++ b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformationSurfaces/conformationSurfacesI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cvControls/cvControls.C b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cvControls/cvControls.C
index 9b59ce9b9b..c99f9324ff 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cvControls/cvControls.C
+++ b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cvControls/cvControls.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cvControls/cvControls.H b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cvControls/cvControls.H
index f6bdb75559..dae83ed06d 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cvControls/cvControls.H
+++ b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cvControls/cvControls.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cvControls/cvControlsI.H b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cvControls/cvControlsI.H
index dc3f391100..ce45e5f522 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cvControls/cvControlsI.H
+++ b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cvControls/cvControlsI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/faceAreaWeightModel/faceAreaWeightModel/faceAreaWeightModel.C b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/faceAreaWeightModel/faceAreaWeightModel/faceAreaWeightModel.C
index 76d68aa073..88c1e0bef4 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/faceAreaWeightModel/faceAreaWeightModel/faceAreaWeightModel.C
+++ b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/faceAreaWeightModel/faceAreaWeightModel/faceAreaWeightModel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/faceAreaWeightModel/faceAreaWeightModel/faceAreaWeightModel.H b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/faceAreaWeightModel/faceAreaWeightModel/faceAreaWeightModel.H
index 3e88f5bb74..d7afd964a6 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/faceAreaWeightModel/faceAreaWeightModel/faceAreaWeightModel.H
+++ b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/faceAreaWeightModel/faceAreaWeightModel/faceAreaWeightModel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/faceAreaWeightModel/piecewiseLinearRamp/piecewiseLinearRamp.C b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/faceAreaWeightModel/piecewiseLinearRamp/piecewiseLinearRamp.C
index 0fa6025c99..07496e3517 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/faceAreaWeightModel/piecewiseLinearRamp/piecewiseLinearRamp.C
+++ b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/faceAreaWeightModel/piecewiseLinearRamp/piecewiseLinearRamp.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/faceAreaWeightModel/piecewiseLinearRamp/piecewiseLinearRamp.H b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/faceAreaWeightModel/piecewiseLinearRamp/piecewiseLinearRamp.H
index 14f6a929bb..58fd55da03 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/faceAreaWeightModel/piecewiseLinearRamp/piecewiseLinearRamp.H
+++ b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/faceAreaWeightModel/piecewiseLinearRamp/piecewiseLinearRamp.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/initialPointsMethod/autoDensity/autoDensity.C b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/initialPointsMethod/autoDensity/autoDensity.C
index 33de87c5bc..2b7d83f2b2 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/initialPointsMethod/autoDensity/autoDensity.C
+++ b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/initialPointsMethod/autoDensity/autoDensity.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/initialPointsMethod/autoDensity/autoDensity.H b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/initialPointsMethod/autoDensity/autoDensity.H
index 4b9063c5cc..2ef7cb00b0 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/initialPointsMethod/autoDensity/autoDensity.H
+++ b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/initialPointsMethod/autoDensity/autoDensity.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/initialPointsMethod/bodyCentredCubic/bodyCentredCubic.C b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/initialPointsMethod/bodyCentredCubic/bodyCentredCubic.C
index f41760311f..751a743e6d 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/initialPointsMethod/bodyCentredCubic/bodyCentredCubic.C
+++ b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/initialPointsMethod/bodyCentredCubic/bodyCentredCubic.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/initialPointsMethod/bodyCentredCubic/bodyCentredCubic.H b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/initialPointsMethod/bodyCentredCubic/bodyCentredCubic.H
index c3d1217d6b..f75fa599d3 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/initialPointsMethod/bodyCentredCubic/bodyCentredCubic.H
+++ b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/initialPointsMethod/bodyCentredCubic/bodyCentredCubic.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/initialPointsMethod/faceCentredCubic/faceCentredCubic.C b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/initialPointsMethod/faceCentredCubic/faceCentredCubic.C
index cafccb5574..a1c1f383b0 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/initialPointsMethod/faceCentredCubic/faceCentredCubic.C
+++ b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/initialPointsMethod/faceCentredCubic/faceCentredCubic.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/initialPointsMethod/faceCentredCubic/faceCentredCubic.H b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/initialPointsMethod/faceCentredCubic/faceCentredCubic.H
index b7660d023b..3444b386c3 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/initialPointsMethod/faceCentredCubic/faceCentredCubic.H
+++ b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/initialPointsMethod/faceCentredCubic/faceCentredCubic.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/initialPointsMethod/initialPointsMethod/initialPointsMethod.C b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/initialPointsMethod/initialPointsMethod/initialPointsMethod.C
index 8203e6e7a6..bd0e6d732f 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/initialPointsMethod/initialPointsMethod/initialPointsMethod.C
+++ b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/initialPointsMethod/initialPointsMethod/initialPointsMethod.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/initialPointsMethod/initialPointsMethod/initialPointsMethod.H b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/initialPointsMethod/initialPointsMethod/initialPointsMethod.H
index d4334ddf98..8c8df91c92 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/initialPointsMethod/initialPointsMethod/initialPointsMethod.H
+++ b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/initialPointsMethod/initialPointsMethod/initialPointsMethod.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/initialPointsMethod/pointFile/pointFile.C b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/initialPointsMethod/pointFile/pointFile.C
index f037435af1..eb67cf60e2 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/initialPointsMethod/pointFile/pointFile.C
+++ b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/initialPointsMethod/pointFile/pointFile.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/initialPointsMethod/pointFile/pointFile.H b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/initialPointsMethod/pointFile/pointFile.H
index a60e23e67a..bcb898bac6 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/initialPointsMethod/pointFile/pointFile.H
+++ b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/initialPointsMethod/pointFile/pointFile.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/initialPointsMethod/uniformGrid/uniformGrid.C b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/initialPointsMethod/uniformGrid/uniformGrid.C
index c440f4cdc9..3bc914ea43 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/initialPointsMethod/uniformGrid/uniformGrid.C
+++ b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/initialPointsMethod/uniformGrid/uniformGrid.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/initialPointsMethod/uniformGrid/uniformGrid.H b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/initialPointsMethod/uniformGrid/uniformGrid.H
index 158a49b59e..913d2a5a98 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/initialPointsMethod/uniformGrid/uniformGrid.H
+++ b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/initialPointsMethod/uniformGrid/uniformGrid.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/relaxationModel/adaptiveLinear/adaptiveLinear.C b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/relaxationModel/adaptiveLinear/adaptiveLinear.C
index a1967da49d..3e33715cb5 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/relaxationModel/adaptiveLinear/adaptiveLinear.C
+++ b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/relaxationModel/adaptiveLinear/adaptiveLinear.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/relaxationModel/adaptiveLinear/adaptiveLinear.H b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/relaxationModel/adaptiveLinear/adaptiveLinear.H
index ecb4c32d4d..02aa61256a 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/relaxationModel/adaptiveLinear/adaptiveLinear.H
+++ b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/relaxationModel/adaptiveLinear/adaptiveLinear.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/relaxationModel/rampHoldFall/rampHoldFall.C b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/relaxationModel/rampHoldFall/rampHoldFall.C
index 92b42313de..be9b2537b3 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/relaxationModel/rampHoldFall/rampHoldFall.C
+++ b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/relaxationModel/rampHoldFall/rampHoldFall.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/relaxationModel/rampHoldFall/rampHoldFall.H b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/relaxationModel/rampHoldFall/rampHoldFall.H
index db814749f1..3c156c1971 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/relaxationModel/rampHoldFall/rampHoldFall.H
+++ b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/relaxationModel/rampHoldFall/rampHoldFall.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/relaxationModel/relaxationModel/relaxationModel.C b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/relaxationModel/relaxationModel/relaxationModel.C
index 91daf73f35..7649339055 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/relaxationModel/relaxationModel/relaxationModel.C
+++ b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/relaxationModel/relaxationModel/relaxationModel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/relaxationModel/relaxationModel/relaxationModel.H b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/relaxationModel/relaxationModel/relaxationModel.H
index 5517098f05..433a5d38e1 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/relaxationModel/relaxationModel/relaxationModel.H
+++ b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/relaxationModel/relaxationModel/relaxationModel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

From 644a76b40c4132bd2e2ff8fe3b5010533e4dd5a7 Mon Sep 17 00:00:00 2001
From: laurence <laurence>
Date: Fri, 16 Mar 2012 10:17:24 +0000
Subject: [PATCH 031/317] ENH: Add time selection to checkCvMesh

---
 .../generation/cvMesh/checkCvMesh/checkCvMesh.C  | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/applications/utilities/mesh/generation/cvMesh/checkCvMesh/checkCvMesh.C b/applications/utilities/mesh/generation/cvMesh/checkCvMesh/checkCvMesh.C
index df2a3b90f8..88695dbd39 100644
--- a/applications/utilities/mesh/generation/cvMesh/checkCvMesh/checkCvMesh.C
+++ b/applications/utilities/mesh/generation/cvMesh/checkCvMesh/checkCvMesh.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -42,6 +42,8 @@ using namespace Foam;
 
 int main(int argc, char *argv[])
 {
+    timeSelector::addOptions();
+
 #   include "addOverwriteOption.H"
 
 #   include "setRootCase.H"
@@ -49,7 +51,7 @@ int main(int argc, char *argv[])
 
     instantList timeDirs = timeSelector::select0(runTime, args);
 
-#   include "createMesh.H"
+#   include "createNamedPolyMesh.H"
 
     runTime.functionObjects().off();
 
@@ -57,14 +59,11 @@ int main(int argc, char *argv[])
     {
         runTime.setTime(timeDirs[timeI], timeI);
 
-        Info<< "Create mesh for time = " << runTime.timeName()
+        Info<< "Time = " << runTime.timeName()
             << nl << endl;
 
         mesh.readUpdate();
 
-        Info<< "Read mesh in = "
-            << runTime.cpuTimeIncrement() << " s" << endl;
-
         // Check patches and faceZones are synchronised
         mesh.boundaryMesh().checkParallelSync(true);
         meshRefinement::checkCoupledFaceZones(mesh);
@@ -87,8 +86,10 @@ int main(int argc, char *argv[])
             = cvMeshDict.subDict("meshQualityControls");
 
 
-        Info<< "Checking initial mesh ..." << endl;
+        Info<< "Checking mesh ..." << endl;
+
         faceSet wrongFaces(mesh, "wrongFaces", mesh.nFaces()/100);
+
         motionSmoother::checkMesh(false, mesh, meshQualityDict, wrongFaces);
 
         const label nInitErrors = returnReduce
@@ -117,6 +118,5 @@ int main(int argc, char *argv[])
     Info<< "End\n" << endl;
 
     return 0;
-
 }
 

From 23470c19aef4a4cb72edc69a56c9569f524bbb76 Mon Sep 17 00:00:00 2001
From: laurence <laurence>
Date: Fri, 16 Mar 2012 10:16:19 +0000
Subject: [PATCH 032/317] ENH: Add automatic, fieldFromFile and uniformValue
 cell sizing for surfaces

---
 .../cvMesh/conformalVoronoiMesh/Make/files    |  24 +-
 .../cellSizeControlSurfaces.C                 |  18 +-
 .../cellSizeControlSurfaces.H                 |   7 +-
 .../cellSizeControlSurfacesI.H                |   2 +-
 .../cellSizeFunction/cellSizeFunction.C       |  31 +--
 .../cellSizeFunction/cellSizeFunction.H       |  20 +-
 .../linearDistance/linearDistance.C           |  89 ++++++--
 .../linearDistance/linearDistance.H           |  16 +-
 .../linearSpatial/linearSpatial.C             |   2 +-
 .../linearSpatial/linearSpatial.H             |   2 +-
 .../surfaceOffsetLinearDistance.C             |  46 ++--
 .../surfaceOffsetLinearDistance.H             |  13 +-
 .../cellSizeFunction/uniform/uniform.C        | 136 +++++++----
 .../cellSizeFunction/uniform/uniform.H        |  11 +-
 .../uniformDistance/uniformDistance.C         |  44 +++-
 .../uniformDistance/uniformDistance.H         |  11 +-
 .../automatic/automatic.C                     | 213 ++++++++++++++++++
 .../automatic/automatic.H                     | 124 ++++++++++
 .../cellSizeCalculationType.C                 |  97 ++++++++
 .../cellSizeCalculationType.H                 | 134 +++++++++++
 .../fieldFromFile/fieldFromFile.C             |  88 ++++++++
 .../fieldFromFile/fieldFromFile.H             | 105 +++++++++
 .../nonUniformField/nonUniformField.C         | 167 ++++++++++++++
 .../nonUniformField/nonUniformField.H         | 123 ++++++++++
 .../surfaceCellSizeFunction.C                 |  99 ++++++++
 .../surfaceCellSizeFunction.H                 | 159 +++++++++++++
 .../uniformValue/uniformValue.C               |  86 +++++++
 .../uniformValue/uniformValue.H               | 105 +++++++++
 28 files changed, 1834 insertions(+), 138 deletions(-)
 create mode 100644 applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/cellSizeCalculationType/automatic/automatic.C
 create mode 100644 applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/cellSizeCalculationType/automatic/automatic.H
 create mode 100644 applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/cellSizeCalculationType/cellSizeCalculationType/cellSizeCalculationType.C
 create mode 100644 applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/cellSizeCalculationType/cellSizeCalculationType/cellSizeCalculationType.H
 create mode 100644 applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/cellSizeCalculationType/fieldFromFile/fieldFromFile.C
 create mode 100644 applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/cellSizeCalculationType/fieldFromFile/fieldFromFile.H
 create mode 100644 applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/nonUniformField/nonUniformField.C
 create mode 100644 applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/nonUniformField/nonUniformField.H
 create mode 100644 applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/surfaceCellSizeFunction/surfaceCellSizeFunction.C
 create mode 100644 applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/surfaceCellSizeFunction/surfaceCellSizeFunction.H
 create mode 100644 applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/uniformValue/uniformValue.C
 create mode 100644 applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/uniformValue/uniformValue.H

diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/Make/files b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/Make/files
index 217ec9d12e..3974c7df75 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/Make/files
+++ b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/Make/files
@@ -15,13 +15,23 @@ backgroundMeshDecomposition/backgroundMeshDecomposition.C
 
 cellSizeControlSurfaces/cellSizeControlSurfaces.C
 
-cellSiseFunctions = cellSizeControlSurfaces/cellSizeFunction
-$(cellSiseFunctions)/cellSizeFunction/cellSizeFunction.C
-$(cellSiseFunctions)/uniform/uniform.C
-$(cellSiseFunctions)/uniformDistance/uniformDistance.C
-$(cellSiseFunctions)/linearDistance/linearDistance.C
-$(cellSiseFunctions)/surfaceOffsetLinearDistance/surfaceOffsetLinearDistance.C
-$(cellSiseFunctions)/linearSpatial/linearSpatial.C
+cellSizeFunctions = cellSizeControlSurfaces/cellSizeFunction
+$(cellSizeFunctions)/cellSizeFunction/cellSizeFunction.C
+$(cellSizeFunctions)/uniform/uniform.C
+$(cellSizeFunctions)/uniformDistance/uniformDistance.C
+$(cellSizeFunctions)/linearDistance/linearDistance.C
+$(cellSizeFunctions)/surfaceOffsetLinearDistance/surfaceOffsetLinearDistance.C
+$(cellSizeFunctions)/linearSpatial/linearSpatial.C
+
+surfaceCellSizeFunctions = cellSizeControlSurfaces/surfaceCellSizeFunction
+$(surfaceCellSizeFunctions)/surfaceCellSizeFunction/surfaceCellSizeFunction.C
+$(surfaceCellSizeFunctions)/uniformValue/uniformValue.C
+$(surfaceCellSizeFunctions)/nonUniformField/nonUniformField.C
+
+cellSizeCalculationType = $(surfaceCellSizeFunctions)/cellSizeCalculationType
+$(cellSizeCalculationType)/cellSizeCalculationType/cellSizeCalculationType.C
+$(cellSizeCalculationType)/fieldFromFile/fieldFromFile.C
+$(cellSizeCalculationType)/automatic/automatic.C
 
 initialPointsMethod/initialPointsMethod/initialPointsMethod.C
 initialPointsMethod/uniformGrid/uniformGrid.C
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeControlSurfaces.C b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeControlSurfaces.C
index 0fa17fc86a..92cf26b0c4 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeControlSurfaces.C
+++ b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeControlSurfaces.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -337,5 +337,21 @@ Foam::scalarField Foam::cellSizeControlSurfaces::cellSize
 }
 
 
+void Foam::cellSizeControlSurfaces::setCellSizes
+(
+    const pointField& pts
+)
+{
+    if (cellSizeFunctions_.size())
+    {
+        forAll(cellSizeFunctions_, i)
+        {
+            cellSizeFunction& cSF = cellSizeFunctions_[i];
+
+            cSF.setCellSize(pts);
+        }
+    }
+}
+
 
 // ************************************************************************* //
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeControlSurfaces.H b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeControlSurfaces.H
index c813b9fe51..9f522f0dfc 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeControlSurfaces.H
+++ b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeControlSurfaces.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -133,6 +133,11 @@ public:
 
             //- Return the cell size at the given locations
             scalarField cellSize(const pointField& pts) const;
+
+        // Edit
+
+            //- Set the cell sizes for each point
+            void setCellSizes(const pointField& pts);
 };
 
 
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeControlSurfacesI.H b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeControlSurfacesI.H
index 973638d003..f59a9cbdc0 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeControlSurfacesI.H
+++ b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeControlSurfacesI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/cellSizeFunction/cellSizeFunction.C b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/cellSizeFunction/cellSizeFunction.C
index 37d6c7825a..1276133623 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/cellSizeFunction/cellSizeFunction.C
+++ b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/cellSizeFunction/cellSizeFunction.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -30,18 +30,15 @@ License
 
 namespace Foam
 {
+    defineTypeNameAndDebug(cellSizeFunction, 0);
+    defineRunTimeSelectionTable(cellSizeFunction, dictionary);
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-defineTypeNameAndDebug(cellSizeFunction, 0);
-defineRunTimeSelectionTable(cellSizeFunction, dictionary);
-
-scalar cellSizeFunction::snapToSurfaceTol_ = 1e-10;
-
+    scalar cellSizeFunction::snapToSurfaceTol_ = 1e-10;
+}
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-cellSizeFunction::cellSizeFunction
+Foam::cellSizeFunction::cellSizeFunction
 (
     const word& type,
     const dictionary& cellSizeFunctionDict,
@@ -50,6 +47,14 @@ cellSizeFunction::cellSizeFunction
 :
     dictionary(cellSizeFunctionDict),
     surface_(surface),
+    surfaceCellSizeFunction_
+    (
+        surfaceCellSizeFunction::New
+        (
+            cellSizeFunctionDict,
+            surface
+        )
+    ),
     coeffsDict_(subDict(type + "Coeffs")),
     sideMode_(),
     priority_(readLabel(cellSizeFunctionDict.lookup("priority")))
@@ -94,7 +99,7 @@ cellSizeFunction::cellSizeFunction
 
 // * * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * //
 
-autoPtr<cellSizeFunction> cellSizeFunction::New
+Foam::autoPtr<Foam::cellSizeFunction> Foam::cellSizeFunction::New
 (
     const dictionary& cellSizeFunctionDict,
     const searchableSurface& surface
@@ -134,12 +139,8 @@ autoPtr<cellSizeFunction> cellSizeFunction::New
 
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
-cellSizeFunction::~cellSizeFunction()
+Foam::cellSizeFunction::~cellSizeFunction()
 {}
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/cellSizeFunction/cellSizeFunction.H b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/cellSizeFunction/cellSizeFunction.H
index 6b33ec7ca7..209140ecad 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/cellSizeFunction/cellSizeFunction.H
+++ b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/cellSizeFunction/cellSizeFunction.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -41,6 +41,7 @@ SourceFiles
 #include "dictionary.H"
 #include "autoPtr.H"
 #include "runTimeSelectionTables.H"
+#include "surfaceCellSizeFunction.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -85,6 +86,11 @@ protected:
         //  relates to
         const searchableSurface& surface_;
 
+        //- Cell size at the surface
+        scalarField surfaceCellSize_;
+
+        autoPtr<surfaceCellSizeFunction> surfaceCellSizeFunction_;
+
         //- Method details dictionary
         dictionary coeffsDict_;
 
@@ -170,6 +176,18 @@ public:
             const point& pt,
             scalar& size
         ) const = 0;
+
+
+        virtual bool setCellSize
+        (
+            const pointField& pts
+        )
+        {
+            WarningIn("cellSizeFunction::setCellSize(const point&, const scalar)")
+                << "Not overloaded."
+                << endl;
+            return false;
+        }
 };
 
 
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/linearDistance/linearDistance.C b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/linearDistance/linearDistance.C
index 0874d9fc82..fc4c4223ef 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/linearDistance/linearDistance.C
+++ b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/linearDistance/linearDistance.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -25,6 +25,8 @@ License
 
 #include "linearDistance.H"
 #include "addToRunTimeSelectionTable.H"
+#include "triSurfaceMesh.H"
+#include "triSurfaceFields.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -46,29 +48,37 @@ linearDistance::linearDistance
 )
 :
     cellSizeFunction(typeName, initialPointsDict, surface),
-    surfaceCellSize_(readScalar(coeffsDict().lookup("surfaceCellSize"))),
     distanceCellSize_(readScalar(coeffsDict().lookup("distanceCellSize"))),
     distance_(readScalar(coeffsDict().lookup("distance"))),
-    distanceSqr_(sqr(distance_)),
-    gradient_((distanceCellSize_ - surfaceCellSize_)/distance_)
+    distanceSqr_(sqr(distance_))
 {}
 
 
 // * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * * //
 
-scalar linearDistance::sizeFunction(scalar d) const
+scalar linearDistance::sizeFunction
+(
+    const point& pt,
+    scalar d,
+    label index
+) const
 {
-    return gradient_*d + surfaceCellSize_;
+    const scalar interpolatedSize
+        = surfaceCellSizeFunction_().interpolate(pt, index);
+
+    scalar gradient
+        = (distanceCellSize_ - interpolatedSize)
+          /distance_;
+
+    scalar size = gradient*d + interpolatedSize;
+
+    return size;
 }
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-bool linearDistance::cellSize
-(
-    const point& pt,
-    scalar& size
-) const
+bool linearDistance::cellSize(const point& pt, scalar& size) const
 {
     size = 0;
 
@@ -85,18 +95,23 @@ bool linearDistance::cellSize
 
     if (hitInfo.hit())
     {
+        const point& hitPt = hitInfo.hitPoint();
+        const label hitIndex = hitInfo.index();
+
+        const scalar dist = mag(pt - hitPt);
+
         if (sideMode_ == rmBothsides)
         {
-            size = sizeFunction(mag(pt - hitInfo.hitPoint()));
+            size = sizeFunction(hitPt, dist, hitIndex);
 
             return true;
         }
 
         // If the nearest point is essentially on the surface, do not do a
         // getVolumeType calculation, as it will be prone to error.
-        if (mag(pt  - hitInfo.hitPoint()) < snapToSurfaceTol_)
+        if (dist < snapToSurfaceTol_)
         {
-            size = sizeFunction(0);
+            size = sizeFunction(hitPt, 0, hitIndex);
 
             return true;
         }
@@ -114,7 +129,7 @@ bool linearDistance::cellSize
          && vTL[0] == searchableSurface::INSIDE
         )
         {
-            size = sizeFunction(mag(pt - hitInfo.hitPoint()));
+            size = sizeFunction(hitPt, dist, hitIndex);
 
             functionApplied = true;
         }
@@ -124,7 +139,7 @@ bool linearDistance::cellSize
          && vTL[0] == searchableSurface::OUTSIDE
         )
         {
-            size = sizeFunction(mag(pt - hitInfo.hitPoint()));
+            size = sizeFunction(hitPt, dist, hitIndex);
 
             functionApplied = true;
         }
@@ -136,6 +151,48 @@ bool linearDistance::cellSize
 }
 
 
+bool linearDistance::setCellSize(const pointField& pts)
+{
+    labelHashSet surfaceAlreadyHit(surfaceCellSize_.size());
+
+    forAll(pts, ptI)
+    {
+        const Foam::point& pt = pts[ptI];
+
+        List<pointIndexHit> hits;
+
+        surface_.findNearest
+        (
+            pointField(1, pt),
+            scalarField(1, distanceSqr_),
+            hits
+        );
+
+        const label surfHitI = hits[0].index();
+
+        if
+        (
+            hits[0].hit()
+         && !surfaceAlreadyHit.found(surfHitI)
+        )
+        {
+            // Halving cell size is arbitrary
+            surfaceCellSizeFunction_().refineSurfaceSize(surfHitI);
+
+            surfaceAlreadyHit.insert(surfHitI);
+        }
+    }
+
+    // Force recalculation of the interpolation
+    if (!pts.empty())
+    {
+        surfaceCellSizeFunction_().recalculateInterpolation();
+    }
+
+    return true;
+}
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/linearDistance/linearDistance.H b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/linearDistance/linearDistance.H
index 0906680150..d30a6a8045 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/linearDistance/linearDistance.H
+++ b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/linearDistance/linearDistance.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -54,9 +54,6 @@ private:
 
     // Private data
 
-        //- cell size at the surface
-        scalar surfaceCellSize_;
-
         //- cell size at distance_ from the surface
         scalar distanceCellSize_;
 
@@ -66,14 +63,11 @@ private:
         //- distance squared
         scalar distanceSqr_;
 
-        //- storing gradient for linear function
-        scalar gradient_;
-
 
     // Private Member Functions
 
         //- Calculate the cell size as a function of the given distance
-        scalar sizeFunction(scalar d) const;
+        scalar sizeFunction(const point& pt, scalar d, label index) const;
 
 
 public:
@@ -107,6 +101,12 @@ public:
             const point& pt,
             scalar& size
         ) const;
+
+        //- Adapt local cell size. Return true if anything changed.
+        virtual bool setCellSize
+        (
+            const pointField& pts
+        );
 };
 
 
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/linearSpatial/linearSpatial.C b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/linearSpatial/linearSpatial.C
index d877ffee64..5f41979bc7 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/linearSpatial/linearSpatial.C
+++ b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/linearSpatial/linearSpatial.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/linearSpatial/linearSpatial.H b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/linearSpatial/linearSpatial.H
index faf4d52359..0f413b289a 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/linearSpatial/linearSpatial.H
+++ b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/linearSpatial/linearSpatial.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/surfaceOffsetLinearDistance/surfaceOffsetLinearDistance.C b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/surfaceOffsetLinearDistance/surfaceOffsetLinearDistance.C
index bb7ffa6a9a..2a711f3e0b 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/surfaceOffsetLinearDistance/surfaceOffsetLinearDistance.C
+++ b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/surfaceOffsetLinearDistance/surfaceOffsetLinearDistance.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -50,13 +50,10 @@ surfaceOffsetLinearDistance::surfaceOffsetLinearDistance
 )
 :
     cellSizeFunction(typeName, initialPointsDict, surface),
-    surfaceCellSize_(readScalar(coeffsDict().lookup("surfaceCellSize"))),
     distanceCellSize_(readScalar(coeffsDict().lookup("distanceCellSize"))),
     surfaceOffset_(readScalar(coeffsDict().lookup("surfaceOffset"))),
     totalDistance_(),
-    totalDistanceSqr_(),
-    gradient_(),
-    intercept_()
+    totalDistanceSqr_()
 {
     if
     (
@@ -111,25 +108,33 @@ surfaceOffsetLinearDistance::surfaceOffsetLinearDistance
     }
 
     totalDistanceSqr_ = sqr(totalDistance_);
-
-    gradient_ =
-        (distanceCellSize_ - surfaceCellSize_)
-       /(totalDistance_ - surfaceOffset_);
-
-    intercept_ = surfaceCellSize_ - gradient_*surfaceOffset_;
 }
 
 
 // * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * * //
 
-scalar surfaceOffsetLinearDistance::sizeFunction(scalar d) const
+scalar surfaceOffsetLinearDistance::sizeFunction
+(
+    const point& pt,
+    scalar d,
+    label index
+) const
 {
+    const scalar interpolatedSize
+        = surfaceCellSizeFunction_().interpolate(pt, index);
+
     if (d <= surfaceOffset_)
     {
-        return surfaceCellSize_;
+        return interpolatedSize;
     }
 
-    return gradient_*d + intercept_;
+    scalar gradient =
+        (distanceCellSize_ - interpolatedSize)
+       /(totalDistance_ - surfaceOffset_);
+
+    scalar intercept = interpolatedSize - gradient*surfaceOffset_;
+
+    return gradient*d + intercept;
 }
 
 
@@ -156,9 +161,14 @@ bool surfaceOffsetLinearDistance::cellSize
 
     if (hitInfo.hit())
     {
+        const point& hitPt = hitInfo.hitPoint();
+        const label hitIndex = hitInfo.index();
+
+        const scalar dist = mag(pt - hitPt);
+
         if (sideMode_ == rmBothsides)
         {
-            size = sizeFunction(mag(pt - hitInfo.hitPoint()));
+            size = sizeFunction(hitPt, dist, hitIndex);
 
             return true;
         }
@@ -167,7 +177,7 @@ bool surfaceOffsetLinearDistance::cellSize
         // getVolumeType calculation, as it will be prone to error.
         if (mag(pt  - hitInfo.hitPoint()) < snapToSurfaceTol_)
         {
-            size = sizeFunction(0);
+            size = sizeFunction(hitPt, 0, hitIndex);
 
             return true;
         }
@@ -185,7 +195,7 @@ bool surfaceOffsetLinearDistance::cellSize
          && vTL[0] == searchableSurface::INSIDE
         )
         {
-            size = sizeFunction(mag(pt - hitInfo.hitPoint()));
+            size = sizeFunction(hitPt, dist, hitIndex);
 
             functionApplied = true;
         }
@@ -195,7 +205,7 @@ bool surfaceOffsetLinearDistance::cellSize
          && vTL[0] == searchableSurface::OUTSIDE
         )
         {
-            size = sizeFunction(mag(pt - hitInfo.hitPoint()));
+            size = sizeFunction(hitPt, dist, hitIndex);
 
             functionApplied = true;
         }
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/surfaceOffsetLinearDistance/surfaceOffsetLinearDistance.H b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/surfaceOffsetLinearDistance/surfaceOffsetLinearDistance.H
index 2b1d3a6f0e..520435237f 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/surfaceOffsetLinearDistance/surfaceOffsetLinearDistance.H
+++ b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/surfaceOffsetLinearDistance/surfaceOffsetLinearDistance.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -54,9 +54,6 @@ private:
 
     // Private data
 
-        //- cell size at the surface
-        scalar surfaceCellSize_;
-
         //- cell size at distance_ from the surface
         scalar distanceCellSize_;
 
@@ -70,17 +67,11 @@ private:
         //- totalDistance squared
         scalar totalDistanceSqr_;
 
-        //- storing gradient for linear function
-        scalar gradient_;
-
-        //- storing intercept for linear function
-        scalar intercept_;
-
 
     // Private Member Functions
 
         //- Calculate the cell size as a function of the given distance
-        scalar sizeFunction(scalar d) const;
+        scalar sizeFunction(const point& pt, scalar d, label index) const;
 
 
 public:
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/uniform/uniform.C b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/uniform/uniform.C
index e9a06786b4..e2744eeb2f 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/uniform/uniform.C
+++ b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/uniform/uniform.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -44,8 +44,7 @@ uniform::uniform
     const searchableSurface& surface
 )
 :
-    cellSizeFunction(typeName, initialPointsDict, surface),
-    cellSize_(readScalar(coeffsDict().lookup("cellSize")))
+    cellSizeFunction(typeName, initialPointsDict, surface)
 {}
 
 
@@ -57,64 +56,115 @@ bool uniform::cellSize
     scalar& size
 ) const
 {
-    if (sideMode_ == rmBothsides)
-    {
-        size = cellSize_;
-
-        return true;
-    }
-
-    size = 0;
-
     List<pointIndexHit> hits;
 
     surface_.findNearest
     (
         pointField(1, pt),
-        scalarField(1, sqr(snapToSurfaceTol_)),
+        scalarField(1, sqr(GREAT)),
         hits
     );
 
     const pointIndexHit& hitInfo = hits[0];
 
-    // If the nearest point is essentially on the surface, do not do a
-    // getVolumeType calculation, as it will be prone to error.
     if (hitInfo.hit())
     {
-        size = cellSize_;
+        const point& hitPt = hitInfo.hitPoint();
+        const label index = hitInfo.index();
 
-        return true;
+        if (sideMode_ == rmBothsides)
+        {
+            size = surfaceCellSizeFunction_().interpolate(hitPt, index);
+
+            return true;
+        }
+
+        size = 0;
+
+        List<pointIndexHit> closeToSurfaceHits;
+
+        surface_.findNearest
+        (
+            pointField(1, pt),
+            scalarField(1, sqr(snapToSurfaceTol_)),
+            closeToSurfaceHits
+        );
+
+        const pointIndexHit& closeToSurface = closeToSurfaceHits[0];
+
+        // If the nearest point is essentially on the surface, do not do a
+        // getVolumeType calculation, as it will be prone to error.
+        if (closeToSurface.hit())
+        {
+            size = surfaceCellSizeFunction_().interpolate(hitPt, index);
+
+            return true;
+        }
+
+        pointField ptF(1, pt);
+        List<searchableSurface::volumeType> vTL(1);
+
+        surface_.getVolumeType(ptF, vTL);
+
+        bool functionApplied = false;
+
+        if
+        (
+            sideMode_ == smInside
+         && vTL[0] == searchableSurface::INSIDE
+        )
+        {
+            size = surfaceCellSizeFunction_().interpolate(hitPt, index);
+
+            functionApplied = true;
+        }
+        else if
+        (
+            sideMode_ == smOutside
+         && vTL[0] == searchableSurface::OUTSIDE
+        )
+        {
+            size = surfaceCellSizeFunction_().interpolate(hitPt, index);
+
+            functionApplied = true;
+        }
+
+        return functionApplied;
     }
 
-    pointField ptF(1, pt);
-    List<searchableSurface::volumeType> vTL(1);
+    return false;
+}
 
-    surface_.getVolumeType(ptF, vTL);
 
-    bool functionApplied = false;
+bool uniform::setCellSize
+(
+    const pointField& pts
+)
+{
+//    labelHashSet surfaceAlreadyHit(cellSize_.size());
+//
+//    forAll(pts, ptI)
+//    {
+//        const Foam::point& pt = pts[ptI];
+//
+//        List<pointIndexHit> hits;
+//
+//        surface_.findNearest
+//        (
+//            pointField(1, pt),
+//            scalarField(1, sqr(GREAT)),
+//            hits
+//        );
+//
+//        if (hits[0].hit() && !surfaceAlreadyHit.found(hits[0].index()))
+//        {
+//            surfaceCellSizeFunction_().refineCellSize(hits[0].index());
+//
+//            surfaceAlreadyHit.insert(hits[0].index());
+//        }
+//    }
 
-    if
-    (
-        sideMode_ == smInside
-     && vTL[0] == searchableSurface::INSIDE
-    )
-    {
-        size = cellSize_;
-
-        functionApplied = true;
-    }
-    else if
-    (
-        sideMode_ == smOutside
-     && vTL[0] == searchableSurface::OUTSIDE
-    )
-    {
-        size = cellSize_;
-
-        functionApplied = true;
-    }
-
-    return functionApplied;
+    return true;
 }
 
 
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/uniform/uniform.H b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/uniform/uniform.H
index ea3031aad1..726d506992 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/uniform/uniform.H
+++ b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/uniform/uniform.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -54,9 +54,6 @@ private:
 
     // Private data
 
-        //- Cell size
-        scalar cellSize_;
-
 
 public:
 
@@ -89,6 +86,12 @@ public:
             const point& pt,
             scalar& size
         ) const;
+
+        //- Adapt local cell size. Return true if anything changed.
+        virtual bool setCellSize
+        (
+            const pointField& pts
+        );
 };
 
 
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/uniformDistance/uniformDistance.C b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/uniformDistance/uniformDistance.C
index e67eceaa8c..47e8ecfe43 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/uniformDistance/uniformDistance.C
+++ b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/uniformDistance/uniformDistance.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -25,6 +25,7 @@ License
 
 #include "uniformDistance.H"
 #include "addToRunTimeSelectionTable.H"
+#include "dimensionSet.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -45,7 +46,6 @@ uniformDistance::uniformDistance
 )
 :
     cellSizeFunction(typeName, initialPointsDict, surface),
-    cellSize_(readScalar(coeffsDict().lookup("cellSize"))),
     distance_(readScalar(coeffsDict().lookup("distance"))),
     distanceSqr_(sqr(distance_))
 {}
@@ -76,7 +76,7 @@ bool uniformDistance::cellSize
     {
         if (sideMode_ == rmBothsides)
         {
-            size = cellSize_;
+            size = surfaceCellSizeFunction_().surfaceSize(hitInfo.index());
 
             return true;
         }
@@ -85,7 +85,7 @@ bool uniformDistance::cellSize
         // getVolumeType calculation, as it will be prone to error.
         if (mag(pt  - hitInfo.hitPoint()) < snapToSurfaceTol_)
         {
-            size = cellSize_;
+            size = surfaceCellSizeFunction_().surfaceSize(hitInfo.index());
 
             return true;
         }
@@ -103,7 +103,7 @@ bool uniformDistance::cellSize
          && vTL[0] == searchableSurface::INSIDE
         )
         {
-            size = cellSize_;
+            size = surfaceCellSizeFunction_().surfaceSize(hitInfo.index());
 
             functionApplied = true;
         }
@@ -113,7 +113,7 @@ bool uniformDistance::cellSize
          && vTL[0] == searchableSurface::OUTSIDE
         )
         {
-            size = cellSize_;
+            size = surfaceCellSizeFunction_().surfaceSize(hitInfo.index());
 
             functionApplied = true;
         }
@@ -125,6 +125,38 @@ bool uniformDistance::cellSize
 }
 
 
+bool uniformDistance::setCellSize
+(
+    const pointField& pts
+)
+{
+    labelHashSet surfaceAlreadyHit(surface_.size());
+
+    forAll(pts, ptI)
+    {
+        const Foam::point& pt = pts[ptI];
+
+        List<pointIndexHit> hits;
+
+        surface_.findNearest
+        (
+            pointField(1, pt),
+            scalarField(1, distanceSqr_),
+            hits
+        );
+
+        if (hits[0].hit() && !surfaceAlreadyHit.found(hits[0].index()))
+        {
+            surfaceCellSizeFunction_().refineSurfaceSize(hits[0].index());
+
+            surfaceAlreadyHit.insert(hits[0].index());
+        }
+    }
+
+    return true;
+}
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/uniformDistance/uniformDistance.H b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/uniformDistance/uniformDistance.H
index bbd87fd548..0ffe679e1b 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/uniformDistance/uniformDistance.H
+++ b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/uniformDistance/uniformDistance.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -54,9 +54,6 @@ private:
 
     // Private data
 
-        //- Cell size
-        scalar cellSize_;
-
         //- Distance
         scalar distance_;
 
@@ -95,6 +92,12 @@ public:
             const point& pt,
             scalar& size
         ) const;
+
+        //- Adapt local cell size. Return true if anything changed.
+        virtual bool setCellSize
+        (
+            const pointField& pts
+        );
 };
 
 
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/cellSizeCalculationType/automatic/automatic.C b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/cellSizeCalculationType/automatic/automatic.C
new file mode 100644
index 0000000000..d30cc2a5ff
--- /dev/null
+++ b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/cellSizeCalculationType/automatic/automatic.C
@@ -0,0 +1,213 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "automatic.H"
+#include "addToRunTimeSelectionTable.H"
+#include "triSurfaceMesh.H"
+#include "Time.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    defineTypeNameAndDebug(automatic, 0);
+    addToRunTimeSelectionTable(cellSizeCalculationType, automatic, dictionary);
+}
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::automatic::automatic
+(
+    const dictionary& cellSizeCalcTypeDict,
+    const triSurfaceMesh& surface
+)
+:
+    cellSizeCalculationType(typeName, cellSizeCalcTypeDict, surface),
+    coeffsDict_(cellSizeCalcTypeDict.subDict(typeName + "Coeffs")),
+    surface_(surface),
+    surfaceName_(surface.searchableSurface::name()),
+    readCurvature_(Switch(coeffsDict_.lookup("curvature"))),
+    curvatureFile_(coeffsDict_.lookup("curvatureFile")),
+    readFeatureProximity_(Switch(coeffsDict_.lookup("featureProximity"))),
+    featureProximityFile_(coeffsDict_.lookup("featureProximityFile")),
+    readInternalCloseness_(Switch(coeffsDict_.lookup("internalCloseness"))),
+    internalClosenessFile_(coeffsDict_.lookup("internalClosenessFile")),
+    curvatureCellSizeFactor_
+    (
+        readScalar(coeffsDict_.lookup("curvatureCellSizeFactor"))
+    ),
+    maximumCellSize_
+    (
+        readScalar(coeffsDict_.lookup("maximumCellSize"))
+    )
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+Foam::triSurfaceScalarField Foam::automatic::load()
+{
+    Info<< indent << "Calculating cell size on surface: "
+        << surfaceName_ << endl;
+
+    triSurfaceScalarField surfaceCellSize
+    (
+        IOobject
+        (
+            surfaceName_ + ".cellSize",
+            surface_.searchableSurface::time().constant(),
+            "triSurface",
+            surface_.searchableSurface::time(),
+            IOobject::NO_READ,
+            IOobject::NO_WRITE
+        ),
+        surface_,
+        dimLength,
+        scalarField(surface_.size(), maximumCellSize_)
+    );
+
+    if (readCurvature_)
+    {
+        Info<< indent << "Reading curvature: " << curvatureFile_ << endl;
+
+        triSurfacePointScalarField curvature
+        (
+            IOobject
+            (
+                curvatureFile_,
+                surface_.searchableSurface::time().constant(),
+                "triSurface",
+                surface_.searchableSurface::time(),
+                IOobject::MUST_READ,
+                IOobject::NO_WRITE
+            ),
+            surface_,
+            dimLength,
+            true
+        );
+
+        const List<labelledTri>& localFaces = surface_.localFaces();
+        const labelList& meshPoints = surface_.meshPoints();
+
+        forAll(surfaceCellSize, fI)
+        {
+            const labelList& facePoints = localFaces[fI].triFaceFace();
+
+            scalar interpolatedCurvatureToFace = 0.0;
+
+            forAll(facePoints, fpI)
+            {
+                interpolatedCurvatureToFace
+                    += curvature[meshPoints[facePoints[fpI]]];
+            }
+
+            interpolatedCurvatureToFace /= facePoints.size();
+
+            surfaceCellSize[fI] =
+                min
+                (
+                    1.0
+                   /max
+                    (
+                        (1.0/curvatureCellSizeFactor_)
+                       *interpolatedCurvatureToFace,
+                        1.0/maximumCellSize_
+                    ),
+                    surfaceCellSize[fI]
+                );
+        }
+    }
+
+    if (readInternalCloseness_)
+    {
+        Info<< indent << "Reading internal closeness: "
+            << internalClosenessFile_ << endl;
+
+        triSurfaceScalarField internalCloseness
+        (
+            IOobject
+            (
+                internalClosenessFile_,
+                surface_.searchableSurface::time().constant(),
+                "triSurface",
+                surface_.searchableSurface::time(),
+                IOobject::MUST_READ,
+                IOobject::NO_WRITE
+            ),
+            surface_,
+            dimLength,
+            true
+        );
+
+        forAll(surfaceCellSize, fI)
+        {
+            surfaceCellSize[fI] =
+                min
+                (
+                    internalCloseness[fI],
+                    surfaceCellSize[fI]
+                );
+        }
+    }
+
+    if (readFeatureProximity_)
+    {
+        Info<< indent << "Reading feature proximity: "
+            << featureProximityFile_ << endl;
+
+        triSurfaceScalarField featureProximity
+        (
+            IOobject
+            (
+                featureProximityFile_,
+                surface_.searchableSurface::time().constant(),
+                "triSurface",
+                surface_.searchableSurface::time(),
+                IOobject::MUST_READ,
+                IOobject::NO_WRITE
+            ),
+            surface_,
+            dimLength,
+            true
+        );
+
+        forAll(surfaceCellSize, fI)
+        {
+            surfaceCellSize[fI] =
+                min
+                (
+                    featureProximity[fI],
+                    surfaceCellSize[fI]
+                );
+        }
+    }
+
+    surfaceCellSize.write();
+
+    return surfaceCellSize;
+}
+
+
+// ************************************************************************* //
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/cellSizeCalculationType/automatic/automatic.H b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/cellSizeCalculationType/automatic/automatic.H
new file mode 100644
index 0000000000..04d8ed7ddb
--- /dev/null
+++ b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/cellSizeCalculationType/automatic/automatic.H
@@ -0,0 +1,124 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::automatic
+
+Description
+
+SourceFiles
+    automatic.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef automatic_H
+#define automatic_H
+
+#include "cellSizeCalculationType.H"
+#include "triSurfaceFields.H"
+#include "PrimitivePatchInterpolation.H"
+#include "Switch.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+class triSurfaceMesh;
+
+/*---------------------------------------------------------------------------*\
+                         Class automatic Declaration
+\*---------------------------------------------------------------------------*/
+
+class automatic
+:
+    public cellSizeCalculationType
+{
+
+private:
+
+    // Private data
+
+        //- Dictionary of coefficients for automatic cell sizing
+        const dictionary& coeffsDict_;
+
+        //- Reference to the triSurfaceMesh
+        const triSurfaceMesh& surface_;
+
+        //- Name of the surface. Used to write the cell size field
+        const word surfaceName_;
+
+        const Switch readCurvature_;
+        const word curvatureFile_;
+
+        const Switch readFeatureProximity_;
+        const word featureProximityFile_;
+
+        const Switch readInternalCloseness_;
+        const word internalClosenessFile_;
+
+        //- The curvature values are multiplied by the inverse of this value to
+        //  get the cell size
+        const scalar curvatureCellSizeFactor_;
+
+        //- The maximum allowable sell size
+        const scalar maximumCellSize_;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("automatic");
+
+
+    // Constructors
+
+        //- Construct from components
+        automatic
+        (
+            const dictionary& cellSizeCalcTypeDict,
+            const triSurfaceMesh& surface
+        );
+
+
+    //- Destructor
+    virtual ~automatic()
+    {}
+
+
+    // Member Functions
+
+        //- Load the cell size field
+        virtual triSurfaceScalarField load();
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/cellSizeCalculationType/cellSizeCalculationType/cellSizeCalculationType.C b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/cellSizeCalculationType/cellSizeCalculationType/cellSizeCalculationType.C
new file mode 100644
index 0000000000..b449d46fc6
--- /dev/null
+++ b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/cellSizeCalculationType/cellSizeCalculationType/cellSizeCalculationType.C
@@ -0,0 +1,97 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "cellSizeCalculationType.H"
+#include "addToRunTimeSelectionTable.H"
+#include "triSurfaceMesh.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    defineTypeNameAndDebug(cellSizeCalculationType, 0);
+    defineRunTimeSelectionTable(cellSizeCalculationType, dictionary);
+}
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::cellSizeCalculationType::cellSizeCalculationType
+(
+    const word& type,
+    const dictionary& cellSizeCalculationTypeDict,
+    const triSurfaceMesh& surface
+)
+:
+    cellSizeCalculationTypeDict_(cellSizeCalculationTypeDict)
+{}
+
+
+// * * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * //
+
+Foam::autoPtr<Foam::cellSizeCalculationType> Foam::cellSizeCalculationType::New
+(
+    const dictionary& cellSizeCalculationTypeDict,
+    const triSurfaceMesh& surface
+)
+{
+    word cellSizeCalculationTypeTypeName
+    (
+        cellSizeCalculationTypeDict.lookup("cellSizeCalculationType")
+    );
+
+    Info<< "    Selecting cellSizeCalculationType "
+        << cellSizeCalculationTypeTypeName << endl;
+
+    dictionaryConstructorTable::iterator cstrIter =
+        dictionaryConstructorTablePtr_->find(cellSizeCalculationTypeTypeName);
+
+    if (cstrIter == dictionaryConstructorTablePtr_->end())
+    {
+        FatalErrorIn
+        (
+            "cellSizeCalculationType::New(dictionary&, "
+            "const conformalVoronoiMesh&, const searchableSurface&)"
+        )   << "Unknown cellSizeCalculationType type "
+            << cellSizeCalculationTypeTypeName
+            << endl << endl
+            << "Valid cellSizeCalculationType types are :" << endl
+            << dictionaryConstructorTablePtr_->toc()
+            << exit(FatalError);
+    }
+
+    return autoPtr<cellSizeCalculationType>
+    (
+        cstrIter()(cellSizeCalculationTypeDict, surface)
+    );
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::cellSizeCalculationType::~cellSizeCalculationType()
+{}
+
+
+// ************************************************************************* //
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/cellSizeCalculationType/cellSizeCalculationType/cellSizeCalculationType.H b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/cellSizeCalculationType/cellSizeCalculationType/cellSizeCalculationType.H
new file mode 100644
index 0000000000..4d59f5c718
--- /dev/null
+++ b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/cellSizeCalculationType/cellSizeCalculationType/cellSizeCalculationType.H
@@ -0,0 +1,134 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::cellSizeCalculationType
+
+Description
+    Abstract base class for specifying target cell sizes
+
+SourceFiles
+    cellSizeCalculationType.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef cellSizeCalculationType_H
+#define cellSizeCalculationType_H
+
+#include "searchableSurface.H"
+#include "autoPtr.H"
+#include "runTimeSelectionTables.H"
+#include "triSurfaceFields.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+class triSurfaceMesh;
+
+/*---------------------------------------------------------------------------*\
+                     Class cellSizeCalculationType Declaration
+\*---------------------------------------------------------------------------*/
+
+class cellSizeCalculationType
+{
+
+protected:
+
+        const dictionary& cellSizeCalculationTypeDict_;
+
+
+private:
+
+    // Private Member Functions
+
+        //- Disallow default bitwise copy construct
+        cellSizeCalculationType(const cellSizeCalculationType&);
+
+        //- Disallow default bitwise assignment
+        void operator=(const cellSizeCalculationType&);
+
+
+public:
+
+    //- Runtime type information
+    TypeName("cellSizeCalculationType");
+
+
+    // Declare run-time constructor selection table
+
+        declareRunTimeSelectionTable
+        (
+            autoPtr,
+            cellSizeCalculationType,
+            dictionary,
+            (
+                const dictionary& cellSizeCalculationTypeDict,
+                const triSurfaceMesh& surface
+            ),
+            (cellSizeCalculationTypeDict, surface)
+        );
+
+
+    // Constructors
+
+        //- Construct from components
+        cellSizeCalculationType
+        (
+            const word& type,
+            const dictionary& cellSizeCalculationTypeDict,
+            const triSurfaceMesh& surface
+        );
+
+
+    // Selectors
+
+        //- Return a reference to the selected cellSizeCalculationType
+        static autoPtr<cellSizeCalculationType> New
+        (
+            const dictionary& cellSizeCalculationTypeDict,
+            const triSurfaceMesh& surface
+        );
+
+
+    //- Destructor
+    virtual ~cellSizeCalculationType();
+
+
+    // Member Functions
+
+        //- Load the cell size
+        virtual triSurfaceScalarField load() = 0;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/cellSizeCalculationType/fieldFromFile/fieldFromFile.C b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/cellSizeCalculationType/fieldFromFile/fieldFromFile.C
new file mode 100644
index 0000000000..d40427abf7
--- /dev/null
+++ b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/cellSizeCalculationType/fieldFromFile/fieldFromFile.C
@@ -0,0 +1,88 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "fieldFromFile.H"
+#include "addToRunTimeSelectionTable.H"
+#include "triSurfaceMesh.H"
+#include "triSurfaceFields.H"
+#include "Time.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    defineTypeNameAndDebug(fieldFromFile, 0);
+    addToRunTimeSelectionTable
+    (
+        cellSizeCalculationType,
+        fieldFromFile,
+        dictionary
+    );
+}
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::fieldFromFile::fieldFromFile
+(
+    const dictionary& cellSizeCalcTypeDict,
+    const triSurfaceMesh& surface
+)
+:
+    cellSizeCalculationType(typeName, cellSizeCalcTypeDict, surface),
+    surface_(surface),
+    fileName_
+    (
+        cellSizeCalcTypeDict.subDict(typeName + "Coeffs").lookup("fieldFile")
+    )
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+Foam::triSurfaceScalarField Foam::fieldFromFile::load()
+{
+    Info<< "Loading: " << fileName_ << endl;
+
+    triSurfaceScalarField surfaceCellSize
+    (
+        IOobject
+        (
+            fileName_,
+            surface_.searchableSurface::time().constant(),
+            "triSurface",
+            surface_.searchableSurface::time(),
+            IOobject::MUST_READ,
+            IOobject::NO_WRITE
+        ),
+        surface_,
+        dimLength,
+        true
+    );
+
+    return surfaceCellSize;
+}
+
+
+// ************************************************************************* //
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/cellSizeCalculationType/fieldFromFile/fieldFromFile.H b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/cellSizeCalculationType/fieldFromFile/fieldFromFile.H
new file mode 100644
index 0000000000..ed99b5edd0
--- /dev/null
+++ b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/cellSizeCalculationType/fieldFromFile/fieldFromFile.H
@@ -0,0 +1,105 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::fieldFromFile
+
+Description
+
+SourceFiles
+    fieldFromFile.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef fieldFromFile_H
+#define fieldFromFile_H
+
+#include "cellSizeCalculationType.H"
+#include "triSurfaceFields.H"
+#include "PrimitivePatchInterpolation.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+class triSurfaceMesh;
+
+/*---------------------------------------------------------------------------*\
+                       Class fieldFromFile Declaration
+\*---------------------------------------------------------------------------*/
+
+class fieldFromFile
+:
+    public cellSizeCalculationType
+{
+
+private:
+
+    // Private data
+
+        //- Reference to the triSurfaceMesh
+        const triSurfaceMesh& surface_;
+
+        //- Name of the triSurfaceScalarField file to load in. Must be in
+        //  constant/triSurface
+        const word fileName_;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("fieldFromFile");
+
+
+    // Constructors
+
+        //- Construct from components
+        fieldFromFile
+        (
+            const dictionary& cellSizeCalcTypeDict,
+            const triSurfaceMesh& surface
+        );
+
+
+    //- Destructor
+    virtual ~fieldFromFile()
+    {}
+
+
+    // Member Functions
+
+        //- Load the cell size field
+        virtual triSurfaceScalarField load();
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/nonUniformField/nonUniformField.C b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/nonUniformField/nonUniformField.C
new file mode 100644
index 0000000000..5e2d032d91
--- /dev/null
+++ b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/nonUniformField/nonUniformField.C
@@ -0,0 +1,167 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "nonUniformField.H"
+#include "triSurfaceMesh.H"
+#include "searchableSurface.H"
+#include "addToRunTimeSelectionTable.H"
+#include "Time.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    defineTypeNameAndDebug(nonUniformField, 0);
+    addToRunTimeSelectionTable
+    (
+        surfaceCellSizeFunction,
+        nonUniformField,
+        dictionary
+    );
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::nonUniformField::nonUniformField
+(
+    const dictionary& cellSizeFunctionDict,
+    const searchableSurface& surface
+)
+:
+    surfaceCellSizeFunction(typeName, cellSizeFunctionDict, surface),
+    surfaceTriMesh_(refCast<const triSurfaceMesh>(surface)),
+    surfaceCellSize_
+    (
+        IOobject
+        (
+            "surfaceCellSize.cellSize",
+            surface.time().constant(),
+            "triSurface",
+            surface.time(),
+            IOobject::NO_READ,
+            IOobject::NO_WRITE
+        ),
+        surfaceTriMesh_,
+        dimLength,
+        false
+    ),
+    cellSizeCalculationType_
+    (
+        cellSizeCalculationType::New(coeffsDict(), surfaceTriMesh_)
+    ),
+    pointCellSize_(),
+    patch_()
+{
+    Info<< incrIndent << incrIndent;
+
+    surfaceCellSize_ = cellSizeCalculationType_().load();
+
+    Info<< decrIndent;
+
+    Info<< indent << "Cell size field statistics:" << nl
+        << indent << "   Minimum: " << min(surfaceCellSize_).value() << nl
+        << indent << "   Average: " << average(surfaceCellSize_).value() << nl
+        << indent << "   Maximum: " << max(surfaceCellSize_).value() << endl;
+
+    Info<< decrIndent;
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+const Foam::scalar& Foam::nonUniformField::surfaceSize(const label index) const
+{
+    return surfaceCellSize_[index];
+}
+
+
+const Foam::scalar& Foam::nonUniformField::refineSurfaceSize(const label index)
+{
+    surfaceCellSize_[index] *= refinementFactor_;
+
+    return surfaceCellSize_[index];
+}
+
+
+Foam::scalar Foam::nonUniformField::interpolate
+(
+    const point& pt,
+    const label index
+) const
+{
+    if (patch_.empty())
+    {
+        recalculateInterpolation();
+    }
+
+    const face& faceHitByPt = surfaceTriMesh_.triSurface::operator[](index);
+
+    const pointField& pts = surfaceTriMesh_.points();
+    const Map<label>& pMap = surfaceTriMesh_.meshPointMap();
+
+    triPointRef tri
+    (
+        pts[faceHitByPt[0]],
+        pts[faceHitByPt[1]],
+        pts[faceHitByPt[2]]
+    );
+
+    scalarList bary(3, 0.0);
+
+    tri.barycentric(pt, bary);
+
+    return pointCellSize_()[pMap[faceHitByPt[0]]]*bary[0]
+         + pointCellSize_()[pMap[faceHitByPt[1]]]*bary[1]
+         + pointCellSize_()[pMap[faceHitByPt[2]]]*bary[2];
+}
+
+
+void Foam::nonUniformField::recalculateInterpolation() const
+{
+    patch_.reset(new primitivePatchInterpolation(surfaceTriMesh_));
+
+    pointCellSize_.reset
+    (
+        new triSurfacePointScalarField
+        (
+            IOobject
+            (
+                "pointCellSize.cellSize",
+                surfaceTriMesh_.searchableSurface::time().constant(),
+                "triSurface",
+                surfaceTriMesh_.searchableSurface::time(),
+                IOobject::NO_READ,
+                IOobject::NO_WRITE
+            ),
+            surfaceTriMesh_,
+            dimLength,
+            patch_().faceToPointInterpolate(surfaceCellSize_)
+        )
+    );
+}
+
+
+// ************************************************************************* //
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/nonUniformField/nonUniformField.H b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/nonUniformField/nonUniformField.H
new file mode 100644
index 0000000000..039fd0fedb
--- /dev/null
+++ b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/nonUniformField/nonUniformField.H
@@ -0,0 +1,123 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::nonUniformField
+
+Description
+
+SourceFiles
+    nonUniformField.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef nonUniformField_H
+#define nonUniformField_H
+
+#include "triSurfaceFields.H"
+#include "PrimitivePatchInterpolation.H"
+#include "surfaceCellSizeFunction.H"
+#include "cellSizeCalculationType.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+class triSurfaceMesh;
+class searchableSurface;
+
+/*---------------------------------------------------------------------------*\
+                           Class nonUniformField Declaration
+\*---------------------------------------------------------------------------*/
+
+class nonUniformField
+:
+    public surfaceCellSizeFunction
+{
+
+protected:
+
+    // Private typedef
+
+        typedef PrimitivePatchInterpolation
+        <
+            PrimitivePatch<labelledTri, List, pointField, point>
+        >   primitivePatchInterpolation;
+
+
+    // Private data
+
+        const triSurfaceMesh& surfaceTriMesh_;
+
+        triSurfaceScalarField surfaceCellSize_;
+
+        autoPtr<cellSizeCalculationType> cellSizeCalculationType_;
+
+        mutable autoPtr<triSurfacePointScalarField> pointCellSize_;
+
+        mutable autoPtr<primitivePatchInterpolation> patch_;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("nonUniformField");
+
+
+    // Constructors
+
+        //- Construct from components
+        nonUniformField
+        (
+            const dictionary& cellSizeFunctionDict,
+            const searchableSurface& surface
+        );
+
+
+    //- Destructor
+    virtual ~nonUniformField()
+    {}
+
+
+    // Member Functions
+
+        virtual const scalar& surfaceSize(const label index) const;
+
+        virtual const scalar& refineSurfaceSize(const label index);
+
+        virtual scalar interpolate(const point& pt, const label index) const;
+
+        virtual void recalculateInterpolation() const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/surfaceCellSizeFunction/surfaceCellSizeFunction.C b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/surfaceCellSizeFunction/surfaceCellSizeFunction.C
new file mode 100644
index 0000000000..7022511c4c
--- /dev/null
+++ b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/surfaceCellSizeFunction/surfaceCellSizeFunction.C
@@ -0,0 +1,99 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "surfaceCellSizeFunction.H"
+#include "addToRunTimeSelectionTable.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    defineTypeNameAndDebug(surfaceCellSizeFunction, 0);
+    defineRunTimeSelectionTable(surfaceCellSizeFunction, dictionary);
+}
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::surfaceCellSizeFunction::surfaceCellSizeFunction
+(
+    const word& type,
+    const dictionary& surfaceCellSizeFunctionDict,
+    const searchableSurface& surface
+)
+:
+    dictionary(surfaceCellSizeFunctionDict),
+    surface_(surface),
+    coeffsDict_(subDict(type + "Coeffs")),
+    refinementFactor_(readScalar(lookup("refinementFactor")))
+{}
+
+
+// * * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * //
+
+Foam::autoPtr<Foam::surfaceCellSizeFunction> Foam::surfaceCellSizeFunction::New
+(
+    const dictionary& surfaceCellSizeFunctionDict,
+    const searchableSurface& surface
+)
+{
+    word surfaceCellSizeFunctionTypeName
+    (
+        surfaceCellSizeFunctionDict.lookup("surfaceCellSizeFunction")
+    );
+
+    Info<< "    Selecting surfaceCellSizeFunction "
+        << surfaceCellSizeFunctionTypeName << endl;
+
+    dictionaryConstructorTable::iterator cstrIter =
+        dictionaryConstructorTablePtr_->find(surfaceCellSizeFunctionTypeName);
+
+    if (cstrIter == dictionaryConstructorTablePtr_->end())
+    {
+        FatalErrorIn
+        (
+            "surfaceCellSizeFunction::New(dictionary&, "
+            "const conformalVoronoiMesh&, const searchableSurface&)"
+        )   << "Unknown surfaceCellSizeFunction type "
+            << surfaceCellSizeFunctionTypeName
+            << endl << endl
+            << "Valid surfaceCellSizeFunction types are :" << endl
+            << dictionaryConstructorTablePtr_->toc()
+            << exit(FatalError);
+    }
+
+    return autoPtr<surfaceCellSizeFunction>
+    (
+        cstrIter()(surfaceCellSizeFunctionDict, surface)
+    );
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::surfaceCellSizeFunction::~surfaceCellSizeFunction()
+{}
+
+
+// ************************************************************************* //
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/surfaceCellSizeFunction/surfaceCellSizeFunction.H b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/surfaceCellSizeFunction/surfaceCellSizeFunction.H
new file mode 100644
index 0000000000..5c798c3be1
--- /dev/null
+++ b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/surfaceCellSizeFunction/surfaceCellSizeFunction.H
@@ -0,0 +1,159 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::surfaceCellSizeFunction
+
+Description
+    Abstract base class for specifying target cell sizes
+
+SourceFiles
+    surfaceCellSizeFunction.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef surfaceCellSizeFunction_H
+#define surfaceCellSizeFunction_H
+
+#include "searchableSurface.H"
+#include "dictionary.H"
+#include "autoPtr.H"
+#include "runTimeSelectionTables.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                     Class surfaceCellSizeFunction Declaration
+\*---------------------------------------------------------------------------*/
+
+class surfaceCellSizeFunction
+:
+    public dictionary
+{
+
+protected:
+
+    // Protected data
+
+        //- Reference to the searchableSurface that surfaceCellSizeFunction
+        //  relates to
+        const searchableSurface& surface_;
+
+        const dictionary coeffsDict_;
+
+        //- If cell resizing is allowed, this is the factor of the old cell size
+        //  to get the new cell size
+        scalar refinementFactor_;
+
+
+private:
+
+    // Private Member Functions
+
+        //- Disallow default bitwise copy construct
+        surfaceCellSizeFunction(const surfaceCellSizeFunction&);
+
+        //- Disallow default bitwise assignment
+        void operator=(const surfaceCellSizeFunction&);
+
+
+public:
+
+    //- Runtime type information
+    TypeName("surfaceCellSizeFunction");
+
+
+    // Declare run-time constructor selection table
+
+        declareRunTimeSelectionTable
+        (
+            autoPtr,
+            surfaceCellSizeFunction,
+            dictionary,
+            (
+                const dictionary& surfaceCellSizeFunctionDict,
+                const searchableSurface& surface
+            ),
+            (surfaceCellSizeFunctionDict, surface)
+        );
+
+
+    // Constructors
+
+        //- Construct from components
+        surfaceCellSizeFunction
+        (
+            const word& type,
+            const dictionary& surfaceCellSizeFunctionDict,
+            const searchableSurface& surface
+        );
+
+
+    // Selectors
+
+        //- Return a reference to the selected surfaceCellSizeFunction
+        static autoPtr<surfaceCellSizeFunction> New
+        (
+            const dictionary& surfaceCellSizeFunctionDict,
+            const searchableSurface& surface
+        );
+
+
+    //- Destructor
+    virtual ~surfaceCellSizeFunction();
+
+
+    // Member Functions
+
+        //- Const access to the details dictionary
+        inline const dictionary& coeffsDict() const
+        {
+            return coeffsDict_;
+        }
+
+        virtual const scalar& surfaceSize(const label index) const = 0;
+
+        virtual const scalar& refineSurfaceSize(const label index) = 0;
+
+        virtual scalar interpolate
+        (
+            const point& pt,
+            const label index
+        ) const = 0;
+
+        virtual void recalculateInterpolation() const = 0;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/uniformValue/uniformValue.C b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/uniformValue/uniformValue.C
new file mode 100644
index 0000000000..e68a5ab3ca
--- /dev/null
+++ b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/uniformValue/uniformValue.C
@@ -0,0 +1,86 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "uniformValue.H"
+#include "addToRunTimeSelectionTable.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    defineTypeNameAndDebug(uniformValue, 0);
+    addToRunTimeSelectionTable
+    (
+        surfaceCellSizeFunction,
+        uniformValue,
+        dictionary
+    );
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::uniformValue::uniformValue
+(
+    const dictionary& cellSizeFunctionDict,
+    const searchableSurface& surface
+)
+:
+    surfaceCellSizeFunction(typeName, cellSizeFunctionDict, surface),
+    surfaceCellSize_(readScalar(coeffsDict().lookup("surfaceCellSize")))
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+const Foam::scalar& Foam::uniformValue::surfaceSize(const label index) const
+{
+    return surfaceCellSize_;
+}
+
+
+const Foam::scalar& Foam::uniformValue::refineSurfaceSize(const label index)
+{
+    surfaceCellSize_ *= refinementFactor_;
+
+    return surfaceCellSize_;
+}
+
+
+Foam::scalar Foam::uniformValue::interpolate
+(
+    const point& pt,
+    const label index
+) const
+{
+    return surfaceCellSize_;
+}
+
+
+void Foam::uniformValue::recalculateInterpolation() const
+{}
+
+
+// ************************************************************************* //
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/uniformValue/uniformValue.H b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/uniformValue/uniformValue.H
new file mode 100644
index 0000000000..9e54e86b48
--- /dev/null
+++ b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/uniformValue/uniformValue.H
@@ -0,0 +1,105 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation 
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::uniformValue
+
+Description
+
+SourceFiles
+    uniformValue.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef uniformValue_H
+#define uniformValue_H
+
+#include "surfaceCellSizeFunction.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                           Class uniformValue Declaration
+\*---------------------------------------------------------------------------*/
+
+class uniformValue
+:
+    public surfaceCellSizeFunction
+{
+
+private:
+
+    // Private data
+
+        scalar surfaceCellSize_;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("uniformValue");
+
+
+    // Constructors
+
+        //- Construct from components
+        uniformValue
+        (
+            const dictionary& cellSizeFunctionDict,
+            const searchableSurface& surface
+        );
+
+
+    //- Destructor
+    virtual ~uniformValue()
+    {}
+
+
+    // Member Functions
+
+        virtual const scalar& surfaceSize(const label index) const;
+
+        virtual const scalar& refineSurfaceSize(const label index);
+
+        virtual scalar interpolate
+        (
+            const point& pt,
+            const label index
+        ) const;
+
+        virtual void recalculateInterpolation() const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //

From 30529400be9637af1a2ccc9a826b65676de6a6d8 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Fri, 16 Mar 2012 11:13:22 +0000
Subject: [PATCH 033/317] STYLE: tetrahedronI.H: unused variables

---
 .../primitiveShapes/tetrahedron/tetrahedronI.H      | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/src/OpenFOAM/meshes/primitiveShapes/tetrahedron/tetrahedronI.H b/src/OpenFOAM/meshes/primitiveShapes/tetrahedron/tetrahedronI.H
index bc1791a946..5a6787be83 100644
--- a/src/OpenFOAM/meshes/primitiveShapes/tetrahedron/tetrahedronI.H
+++ b/src/OpenFOAM/meshes/primitiveShapes/tetrahedron/tetrahedronI.H
@@ -704,8 +704,6 @@ tetSliceWithPlane
         // Tet cut into two prisms. Determine the positive one.
         label pos0 = -1;
         label pos1 = -1;
-        label neg0 = -1;
-        label neg1 = -1;
         forAll(d, i)
         {
             if (d[i] > 0)
@@ -719,17 +717,6 @@ tetSliceWithPlane
                     pos1 = i;
                 }
             }
-            else
-            {
-                if (neg0 == -1)
-                {
-                    neg0 = i;
-                }
-                else
-                {
-                    neg1 = i;
-                }
-            }
         }
 
         //Pout<< "Split 2pos tet " << tet << " d:" << d

From dbc7526abb0a453e7c1f0a6fe40d19290cfe1588 Mon Sep 17 00:00:00 2001
From: laurence <laurence>
Date: Fri, 16 Mar 2012 11:21:43 +0000
Subject: [PATCH 034/317] ENH: surfaceFeatureExtract now builds with CGAL
 support for curvature

extendedFeatureEdgeMesh: Add function to find all feature points within a sphere
treeDataPoint: Add support for point overlap test
---
 .../surface/surfaceFeatureExtract/Allwmake    |  33 +
 .../CGALPolyhedron/CGALPolyhedronRings.H      | 228 +++++
 .../CGALPolyhedron/buildCGALPolyhedron.C      |  89 ++
 .../CGALPolyhedron/buildCGALPolyhedron.H      | 106 +++
 .../surfaceFeatureExtract/MakeWithCGAL/files  |   4 +
 .../MakeWithCGAL/options                      |  29 +
 .../MakeWithoutCGAL/files                     |   3 +
 .../MakeWithoutCGAL/options                   |  13 +
 .../surfaceFeatureExtract.C                   | 800 ++++++++++++------
 .../extendedFeatureEdgeMesh.C                 |  33 +
 .../extendedFeatureEdgeMesh.H                 |   9 +
 src/meshTools/indexedOctree/treeDataPoint.C   |  19 +
 src/meshTools/indexedOctree/treeDataPoint.H   |   8 +
 13 files changed, 1138 insertions(+), 236 deletions(-)
 create mode 100755 applications/utilities/surface/surfaceFeatureExtract/Allwmake
 create mode 100644 applications/utilities/surface/surfaceFeatureExtract/CGALPolyhedron/CGALPolyhedronRings.H
 create mode 100644 applications/utilities/surface/surfaceFeatureExtract/CGALPolyhedron/buildCGALPolyhedron.C
 create mode 100644 applications/utilities/surface/surfaceFeatureExtract/CGALPolyhedron/buildCGALPolyhedron.H
 create mode 100644 applications/utilities/surface/surfaceFeatureExtract/MakeWithCGAL/files
 create mode 100644 applications/utilities/surface/surfaceFeatureExtract/MakeWithCGAL/options
 create mode 100644 applications/utilities/surface/surfaceFeatureExtract/MakeWithoutCGAL/files
 create mode 100644 applications/utilities/surface/surfaceFeatureExtract/MakeWithoutCGAL/options

diff --git a/applications/utilities/surface/surfaceFeatureExtract/Allwmake b/applications/utilities/surface/surfaceFeatureExtract/Allwmake
new file mode 100755
index 0000000000..e54f15ae28
--- /dev/null
+++ b/applications/utilities/surface/surfaceFeatureExtract/Allwmake
@@ -0,0 +1,33 @@
+#!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
+
+set -x
+
+if [ ! -e "Make/files" ] || [ ! -e "Make/options" ]
+then
+    mkdir -p Make
+
+    if [ -n "$CGAL_ARCH_PATH" ]
+    then
+        cp -r MakeWithCGAL/* Make
+
+        echo
+        echo Compiling surfaceFeatureExtract with CGAL support for curvature
+        echo
+
+        wmake
+    else
+        cp -r MakeWithoutCGAL/* Make
+
+        echo
+        echo Compiling surfaceFeatureExtract without CGAL support for curvature
+        echo
+
+        wmake
+    fi
+else
+    echo surfaceFeatureExtract already has a Make folder
+fi
+
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/applications/utilities/surface/surfaceFeatureExtract/CGALPolyhedron/CGALPolyhedronRings.H b/applications/utilities/surface/surfaceFeatureExtract/CGALPolyhedron/CGALPolyhedronRings.H
new file mode 100644
index 0000000000..f5186c3a25
--- /dev/null
+++ b/applications/utilities/surface/surfaceFeatureExtract/CGALPolyhedron/CGALPolyhedronRings.H
@@ -0,0 +1,228 @@
+#ifndef CGAL_PSURF_RINGS_H_
+#define CGAL_PSURF_RINGS_H_
+
+// This file adapted from
+//     CGAL-3.7/examples/Jet_fitting_3//PolyhedralSurf_rings.h
+// Licensed under CGAL-3.7/LICENSE.FREE_USE
+
+// Copyright (c) 1996,1997,1998,1999,2000,2001,2002,2003,2004,2005,2006,2007
+// Utrecht University (The Netherlands), ETH Zurich (Switzerland), Freie
+// Universitaet Berlin (Germany), INRIA Sophia-Antipolis (France),
+// Martin-Luther-University Halle-Wittenberg (Germany), Max-Planck-Institute
+// Saarbruecken (Germany), RISC Linz (Austria), and Tel-Aviv University
+// (Israel).  All rights reserved.
+
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+// SOFTWARE.
+
+
+#include <cassert>
+
+using namespace std;
+
+template
+<
+    class TPoly,
+    class VertexPropertyMap
+>
+
+class T_PolyhedralSurf_rings
+{
+
+protected:
+
+    // Polyhedron
+    typedef typename TPoly::Vertex Vertex;
+    typedef typename TPoly::Halfedge Halfedge;
+    typedef typename TPoly::Facet Facet;
+    typedef typename TPoly::Halfedge_around_vertex_circulator
+        Halfedge_around_vertex_circulator;
+    typedef typename TPoly::Vertex_iterator Vertex_iterator;
+
+    // vertex indices are initialised to -1
+    static void reset_ring_indices
+    (
+        std::vector< Vertex* >& vces,
+        VertexPropertyMap& vpm
+    );
+
+    // i >= 1; from a start vertex on the current i-1 ring, push non-visited
+    // neighbors of start in the nextRing and set indices to i. Also add these
+    // vertices in all.
+    static void push_neighbours_of
+    (
+        Vertex* start,
+        int ith,
+        std::vector< Vertex* >& nextRing,
+        std::vector< Vertex* >& all,
+        VertexPropertyMap& vpm
+    );
+
+    // i >= 1, from a currentRing i-1, collect all neighbors, set indices
+    // to i and store them in nextRing and all.
+    static void collect_ith_ring
+    (
+        int ith,
+        std::vector< Vertex* >& currentRing,
+        std::vector< Vertex* >& nextRing,
+        std::vector< Vertex* >& all,
+        VertexPropertyMap& vpm
+    );
+
+
+public:
+
+    // collect i>=1 rings : all neighbours up to the ith ring,
+    static void collect_i_rings
+    (
+        Vertex* v,
+        int ring_i,
+        std::vector< Vertex* >& all,
+        VertexPropertyMap& vpm
+    );
+
+    //collect enough rings (at least 1), to get at least min_nb of neighbors
+    static void collect_enough_rings
+    (
+        Vertex* v,
+        unsigned int min_nb,
+        std::vector< Vertex* >& all,
+        VertexPropertyMap& vpm
+    );
+};
+
+
+////IMPLEMENTATION////////////////////////////////////////////////////
+
+template < class TPoly , class VertexPropertyMap>
+void T_PolyhedralSurf_rings <TPoly, VertexPropertyMap>::
+push_neighbours_of(Vertex* start, int ith,
+                   std::vector< Vertex* >& nextRing,
+                   std::vector< Vertex* >& all,
+                   VertexPropertyMap& vpm)
+{
+    Vertex *v;
+    Halfedge_around_vertex_circulator
+        hedgeb = start->vertex_begin(), hedgee = hedgeb;
+
+    CGAL_For_all(hedgeb, hedgee)
+    {
+        v = &*(hedgeb->opposite()->vertex());
+        if (get(vpm, v) != -1) continue; //if visited: next
+
+        put(vpm, v, ith);
+        nextRing.push_back(v);
+        all.push_back(v);
+    }
+}
+
+
+template <class TPoly, class VertexPropertyMap>
+void T_PolyhedralSurf_rings <TPoly, VertexPropertyMap>::
+collect_ith_ring(int ith, std::vector< Vertex* >& currentRing,
+                 std::vector< Vertex* >& nextRing,
+                 std::vector< Vertex* >& all,
+                 VertexPropertyMap& vpm)
+{
+    typename std::vector< Vertex* >::iterator
+        itb = currentRing.begin(), ite = currentRing.end();
+
+    CGAL_For_all(itb, ite)
+    {
+        push_neighbours_of(*itb, ith, nextRing, all, vpm);
+    }
+}
+
+
+template <class TPoly, class VertexPropertyMap>
+void T_PolyhedralSurf_rings <TPoly, VertexPropertyMap>::
+reset_ring_indices(std::vector< Vertex* >& vces,
+                   VertexPropertyMap& vpm)
+{
+    typename std::vector< Vertex* >::iterator
+        itb = vces.begin(), ite = vces.end();
+
+    CGAL_For_all(itb, ite)
+    {
+        put(vpm, *itb, -1);
+    }
+}
+
+
+template <class TPoly, class VertexPropertyMap>
+void T_PolyhedralSurf_rings <TPoly, VertexPropertyMap>::
+collect_i_rings(Vertex* v,
+                int ring_i,
+                std::vector< Vertex* >& all,
+                VertexPropertyMap& vpm)
+{
+    std::vector<Vertex*> current_ring, next_ring;
+    std::vector<Vertex*> *p_current_ring, *p_next_ring;
+    assert(ring_i >= 1);
+
+    //initialize
+    p_current_ring = &current_ring;
+    p_next_ring = &next_ring;
+    put(vpm, v, 0);
+    current_ring.push_back(v);
+    all.push_back(v);
+
+    for (int i=1; i<=ring_i; i++)
+    {
+      collect_ith_ring(i, *p_current_ring, *p_next_ring, all, vpm);
+      //next round must be launched from p_nextRing...
+      p_current_ring->clear();
+      std::swap(p_current_ring, p_next_ring);
+    }
+
+    //clean up
+    reset_ring_indices(all, vpm);
+}
+
+
+template <class TPoly, class VertexPropertyMap>
+void T_PolyhedralSurf_rings <TPoly, VertexPropertyMap>::
+collect_enough_rings(Vertex* v,
+                     unsigned int min_nb,
+                     std::vector< Vertex* >& all,
+                     VertexPropertyMap& vpm)
+{
+    std::vector<Vertex*> current_ring, next_ring;
+    std::vector<Vertex*> *p_current_ring, *p_next_ring;
+
+    //initialize
+    p_current_ring = &current_ring;
+    p_next_ring = &next_ring;
+    put(vpm, v, 0);
+    current_ring.push_back(v);
+    all.push_back(v);
+
+    int i = 1;
+
+    while ( (all.size() < min_nb) &&  (p_current_ring->size() != 0) )
+    {
+        collect_ith_ring(i, *p_current_ring, *p_next_ring, all, vpm);
+        //next round must be launched from p_nextRing...
+        p_current_ring->clear();
+        std::swap(p_current_ring, p_next_ring);
+        i++;
+    }
+
+    //clean up
+    reset_ring_indices(all, vpm);
+}
+
+
+#endif
diff --git a/applications/utilities/surface/surfaceFeatureExtract/CGALPolyhedron/buildCGALPolyhedron.C b/applications/utilities/surface/surfaceFeatureExtract/CGALPolyhedron/buildCGALPolyhedron.C
new file mode 100644
index 0000000000..63e2b904bf
--- /dev/null
+++ b/applications/utilities/surface/surfaceFeatureExtract/CGALPolyhedron/buildCGALPolyhedron.C
@@ -0,0 +1,89 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "buildCGALPolyhedron.H"
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::buildCGALPolyhedron::buildCGALPolyhedron
+(
+    const Foam::triSurface& surf
+)
+:
+    CGAL::Modifier_base<HalfedgeDS>(),
+    surf_(surf)
+{}
+
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::buildCGALPolyhedron::~buildCGALPolyhedron()
+{}
+
+
+// * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * * //
+
+void Foam::buildCGALPolyhedron::operator()
+(
+    HalfedgeDS& hds
+)
+{
+    typedef HalfedgeDS::Traits     Traits;
+    typedef Traits::Point_3        Point;
+
+    // Postcondition: `hds' is a valid polyhedral surface.
+    CGAL::Polyhedron_incremental_builder_3<HalfedgeDS> B(hds, false);
+
+    B.begin_surface
+    (
+        surf_.points().size(),      // n points
+        surf_.size(),               // n facets
+        2*surf_.edges().size()      // n halfedges
+    );
+
+    forAll(surf_.points(), pI)
+    {
+        const Foam::point& p = surf_.points()[pI];
+
+        B.add_vertex(Point(p.x(), p.y(), p.z()));
+    }
+
+    forAll(surf_, fI)
+    {
+        B.begin_facet();
+
+        B.add_vertex_to_facet(surf_[fI][0]);
+        B.add_vertex_to_facet(surf_[fI][1]);
+        B.add_vertex_to_facet(surf_[fI][2]);
+
+        B.end_facet();
+    }
+
+    B.end_surface();
+}
+
+
+// ************************************************************************* //
diff --git a/applications/utilities/surface/surfaceFeatureExtract/CGALPolyhedron/buildCGALPolyhedron.H b/applications/utilities/surface/surfaceFeatureExtract/CGALPolyhedron/buildCGALPolyhedron.H
new file mode 100644
index 0000000000..3001a247d3
--- /dev/null
+++ b/applications/utilities/surface/surfaceFeatureExtract/CGALPolyhedron/buildCGALPolyhedron.H
@@ -0,0 +1,106 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::buildCGALPolyhedron
+
+Description
+    Convert a triSurface into a CGAL Polyhedron
+
+SourceFiles
+    buildCGALPolyhedron.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef buildCGALPolyhedron_H
+#define buildCGALPolyhedron_H
+
+#include "triSurface.H"
+#include <CGAL/Simple_cartesian.h>
+#include <CGAL/Polyhedron_incremental_builder_3.h>
+#include <CGAL/Polyhedron_3.h>
+
+typedef CGAL::Simple_cartesian<double>               Kernel;
+typedef CGAL::Polyhedron_3<Kernel>                   Polyhedron;
+typedef Polyhedron::HalfedgeDS                       HalfedgeDS;
+typedef Polyhedron::Vertex                           Vertex;
+typedef Polyhedron::Vertex_iterator                  Vertex_iterator;
+typedef Kernel::Point_3                              Point_3;
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                     Class buildCGALPolyhedron Declaration
+\*---------------------------------------------------------------------------*/
+
+class buildCGALPolyhedron
+:
+    public CGAL::Modifier_base<HalfedgeDS>
+{
+    // Private data
+
+        //- Reference to triSurface to convert
+        const Foam::triSurface& surf_;
+
+
+    // Private Member Functions
+
+        //- Disallow default bitwise copy construct
+        buildCGALPolyhedron(const buildCGALPolyhedron&);
+
+        //- Disallow default bitwise assignment
+        void operator=(const buildCGALPolyhedron&);
+
+
+public:
+
+    // Constructors
+
+        //- Construct with reference to triSurface
+        buildCGALPolyhedron(const triSurface& surf);
+
+
+    //- Destructor
+    ~buildCGALPolyhedron();
+
+
+    // Member Operators
+
+        //- operator() of this `modifier' called by delegate function of
+        //  Polyhedron
+        void operator()(HalfedgeDS& hds);
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/applications/utilities/surface/surfaceFeatureExtract/MakeWithCGAL/files b/applications/utilities/surface/surfaceFeatureExtract/MakeWithCGAL/files
new file mode 100644
index 0000000000..0c0f6f7966
--- /dev/null
+++ b/applications/utilities/surface/surfaceFeatureExtract/MakeWithCGAL/files
@@ -0,0 +1,4 @@
+surfaceFeatureExtract.C
+CGALPolyhedron/buildCGALPolyhedron.C
+
+EXE = $(FOAM_APPBIN)/surfaceFeatureExtract
diff --git a/applications/utilities/surface/surfaceFeatureExtract/MakeWithCGAL/options b/applications/utilities/surface/surfaceFeatureExtract/MakeWithCGAL/options
new file mode 100644
index 0000000000..60833572b7
--- /dev/null
+++ b/applications/utilities/surface/surfaceFeatureExtract/MakeWithCGAL/options
@@ -0,0 +1,29 @@
+EXE_FROUNDING_MATH = -frounding-math
+EXE_NDEBUG = -DNDEBUG
+USE_F2C = -DCGAL_USE_F2C
+include $(GENERAL_RULES)/CGAL
+
+EXE_INC = \
+    -DENABLE_CURVATURE \
+    ${EXE_FROUNDING_MATH} \
+    ${EXE_NDEBUG} \
+    ${USE_F2C} \
+    ${CGAL_INC} \
+    -ICGALPolyhedron \
+    -I$(LIB_SRC)/finiteVolume/lnInclude \
+    -I$(LIB_SRC)/meshTools/lnInclude \
+    -I$(LIB_SRC)/edgeMesh/lnInclude \
+    -I$(LIB_SRC)/triSurface/lnInclude \
+    -I$(LIB_SRC)/surfMesh/lnInclude \
+    -I$(LIB_SRC)/sampling/lnInclude
+
+EXE_LIBS = \
+    $(CGAL_LIBS) \
+    -L$(CGAL_ARCH_PATH)/lib \
+    -llapack \
+    -lblas \
+    -lCGAL \
+    -lmeshTools \
+    -ledgeMesh \
+    -ltriSurface \
+    -lsampling
diff --git a/applications/utilities/surface/surfaceFeatureExtract/MakeWithoutCGAL/files b/applications/utilities/surface/surfaceFeatureExtract/MakeWithoutCGAL/files
new file mode 100644
index 0000000000..a57125cd6a
--- /dev/null
+++ b/applications/utilities/surface/surfaceFeatureExtract/MakeWithoutCGAL/files
@@ -0,0 +1,3 @@
+surfaceFeatureExtract.C
+
+EXE = $(FOAM_APPBIN)/surfaceFeatureExtract
diff --git a/applications/utilities/surface/surfaceFeatureExtract/MakeWithoutCGAL/options b/applications/utilities/surface/surfaceFeatureExtract/MakeWithoutCGAL/options
new file mode 100644
index 0000000000..b733d5fde9
--- /dev/null
+++ b/applications/utilities/surface/surfaceFeatureExtract/MakeWithoutCGAL/options
@@ -0,0 +1,13 @@
+EXE_INC = \
+    -I$(LIB_SRC)/finiteVolume/lnInclude \
+    -I$(LIB_SRC)/meshTools/lnInclude \
+    -I$(LIB_SRC)/edgeMesh/lnInclude \
+    -I$(LIB_SRC)/triSurface/lnInclude \
+    -I$(LIB_SRC)/surfMesh/lnInclude \
+    -I$(LIB_SRC)/sampling/lnInclude
+
+EXE_LIBS = \
+    -lmeshTools \
+    -ledgeMesh \
+    -ltriSurface \
+    -lsampling
diff --git a/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtract.C b/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtract.C
index 5f6ee05fb1..c2baec519e 100644
--- a/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtract.C
+++ b/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtract.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -46,10 +46,263 @@ Description
 #include "unitConversion.H"
 #include "plane.H"
 
+#ifdef ENABLE_CURVATURE
+#include "buildCGALPolyhedron.H"
+#include "CGALPolyhedronRings.H"
+#include <CGAL/Monge_via_jet_fitting.h>
+#include <CGAL/Lapack/Linear_algebra_lapack.h>
+#include <CGAL/property_map.h>
+#endif
+
 using namespace Foam;
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+#ifdef ENABLE_CURVATURE
+scalarField calcCurvature(const triSurface& surf)
+{
+    scalarField k(surf.points().size(), 0);
+
+    Polyhedron P;
+
+    buildCGALPolyhedron convert(surf);
+    P.delegate(convert);
+
+    // Info<< "Created CGAL Polyhedron with " << label(P.size_of_vertices())
+    //     << " vertices and " << label(P.size_of_facets())
+    //     << " facets. " << endl;
+
+    // The rest of this function adapted from
+    //     CGAL-3.7/examples/Jet_fitting_3/Mesh_estimation.cpp
+    // Licensed under CGAL-3.7/LICENSE.FREE_USE
+
+    // Copyright (c) 1996,1997,1998,1999,2000,2001,2002,2003,2004,2005,2006,2007
+    // Utrecht University (The Netherlands), ETH Zurich (Switzerland), Freie
+    // Universitaet Berlin (Germany), INRIA Sophia-Antipolis (France),
+    // Martin-Luther-University Halle-Wittenberg (Germany), Max-Planck-Institute
+    // Saarbruecken (Germany), RISC Linz (Austria), and Tel-Aviv University
+    // (Israel).  All rights reserved.
+
+    // Permission is hereby granted, free of charge, to any person obtaining a
+    // copy of this software and associated documentation files (the
+    // "Software"), to deal in the Software without restriction, including
+    // without limitation the rights to use, copy, modify, merge, publish,
+    // distribute, sublicense, and/or sell copies of the Software, and to permit
+    // persons to whom the Software is furnished to do so, subject to the
+    // following conditions:
+
+    // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+    // OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+    // MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+    // IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+    // CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT
+    // OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
+    // THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+     //Vertex property map, with std::map
+    typedef std::map<Vertex*, int> Vertex2int_map_type;
+    typedef boost::associative_property_map< Vertex2int_map_type >
+        Vertex_PM_type;
+    typedef T_PolyhedralSurf_rings<Polyhedron, Vertex_PM_type > Poly_rings;
+
+    typedef CGAL::Monge_via_jet_fitting<Kernel>         Monge_via_jet_fitting;
+    typedef Monge_via_jet_fitting::Monge_form           Monge_form;
+
+    std::vector<Point_3> in_points;  //container for data points
+
+    // default parameter values and global variables
+    unsigned int d_fitting = 2;
+    unsigned int d_monge = 2;
+    unsigned int min_nb_points = (d_fitting + 1)*(d_fitting + 2)/2;
+
+    //initialize the tag of all vertices to -1
+    Vertex_iterator vitb = P.vertices_begin();
+    Vertex_iterator vite = P.vertices_end();
+
+    Vertex2int_map_type vertex2props;
+    Vertex_PM_type vpm(vertex2props);
+
+    CGAL_For_all(vitb, vite)
+    {
+        put(vpm, &(*vitb), -1);
+    }
+
+    vite = P.vertices_end();
+
+    label vertI = 0;
+
+    for (vitb = P.vertices_begin(); vitb != vite; vitb++)
+    {
+        //initialize
+        Vertex* v = &(*vitb);
+
+        //gather points around the vertex using rings
+        // From: gather_fitting_points(v, in_points, vpm);
+        {
+            std::vector<Vertex*> gathered;
+            in_points.clear();
+
+            Poly_rings::collect_enough_rings(v, min_nb_points, gathered, vpm);
+
+            //store the gathered points
+            std::vector<Vertex*>::iterator itb = gathered.begin();
+            std::vector<Vertex*>::iterator ite = gathered.end();
+
+            CGAL_For_all(itb, ite)
+            {
+                in_points.push_back((*itb)->point());
+            }
+        }
+
+        //skip if the nb of points is to small
+        if ( in_points.size() < min_nb_points )
+        {
+            std::cerr
+                << "not enough pts for fitting this vertex"
+                << in_points.size()
+                << std::endl;
+
+            continue;
+        }
+
+        // perform the fitting
+        Monge_via_jet_fitting monge_fit;
+
+        Monge_form monge_form = monge_fit
+        (
+            in_points.begin(),
+            in_points.end(),
+            d_fitting,
+            d_monge
+        );
+
+//        std::cout<< monge_form;;
+//        std::cout<< "condition number : "
+//                 << monge_fit.condition_number() << nl << std::endl;
+
+        // Use the maximum curvature to give smaller cell sizes later.
+        k[vertI++]
+            = max
+              (
+                   mag(monge_form.principal_curvatures(0)),
+                   mag(monge_form.principal_curvatures(1))
+              );
+    }
+
+    return k;
+}
+#endif
+
+
+bool edgesConnected(const edge& e1, const edge& e2)
+{
+    if
+    (
+        e1.start() == e2.start() || e1.start() == e2.end()
+     || e1.end() == e2.start() || e1.end() == e2.end()
+    )
+    {
+        return true;
+    }
+
+    return false;
+}
+
+
+scalar calcProximityOfFeaturePoints
+(
+    const List<pointIndexHit>& hitList,
+    const scalar defaultCellSize
+)
+{
+    scalar minDist = defaultCellSize;
+
+    for
+    (
+        label hI1 = 0;
+        hI1 < hitList.size() - 1;
+        ++hI1
+    )
+    {
+        const pointIndexHit& pHit1 = hitList[hI1];
+
+        if (pHit1.hit())
+        {
+            for
+            (
+                label hI2 = hI1 + 1;
+                hI2 < hitList.size();
+                ++hI2
+            )
+            {
+                const pointIndexHit& pHit2 = hitList[hI2];
+
+                if (pHit2.hit())
+                {
+                    scalar curDist = mag(pHit1.hitPoint() - pHit2.hitPoint());
+
+                    minDist = min(curDist, minDist);
+                }
+            }
+        }
+    }
+
+    return minDist;
+}
+
+
+scalar calcProximityOfFeatureEdges
+(
+    const extendedFeatureEdgeMesh& efem,
+    const List<pointIndexHit>& hitList,
+    const scalar defaultCellSize
+)
+{
+    scalar minDist = defaultCellSize;
+
+    for
+    (
+        label hI1 = 0;
+        hI1 < hitList.size() - 1;
+        ++hI1
+    )
+    {
+        const pointIndexHit& pHit1 = hitList[hI1];
+
+        if (pHit1.hit())
+        {
+            const edge& e1 = efem.edges()[pHit1.index()];
+
+            for
+            (
+                label hI2 = hI1 + 1;
+                hI2 < hitList.size();
+                ++hI2
+            )
+            {
+                const pointIndexHit& pHit2 = hitList[hI2];
+
+                if (pHit2.hit())
+                {
+                    const edge& e2 = efem.edges()[pHit2.index()];
+
+                    // Don't refine if the edges are connected to each other
+                    if (!edgesConnected(e1, e2))
+                    {
+                        scalar curDist
+                            = mag(pHit1.hitPoint() - pHit2.hitPoint());
+
+                        minDist = min(curDist, minDist);
+                    }
+                }
+            }
+        }
+    }
+
+    return minDist;
+}
+
+
 void dumpBox(const treeBoundBox& bb, const fileName& fName)
 {
     OFstream str(fName);
@@ -299,10 +552,9 @@ int main(int argc, char *argv[])
         "writeVTK",
         "write extendedFeatureEdgeMesh vtk files"
     );
-    argList::addOption
+    argList::addBoolOption
     (
         "closeness",
-        "scalar",
         "span to look for surface closeness"
     );
     argList::addOption
@@ -331,7 +583,7 @@ int main(int argc, char *argv[])
 #   ifdef ENABLE_CURVATURE
     argList::addBoolOption
     (
-        "calcCurvature",
+        "curvature",
         "calculate curvature and closeness fields"
     );
 #   endif
@@ -527,6 +779,7 @@ int main(int argc, char *argv[])
             << " will be included as feature edges."<< endl;
     }
 
+
     surfaceFeatures newSet(surf);
     newSet.setFromStatus(edgeStat);
 
@@ -564,7 +817,6 @@ int main(int argc, char *argv[])
 
     feMesh.write();
 
-
     // Write a featureEdgeMesh for backwards compatibility
     {
         featureEdgeMesh bfeMesh
@@ -595,7 +847,7 @@ int main(int argc, char *argv[])
         (
             sFeatFileName + ".closeness",
             runTime.constant(),
-            "extendedFeatureEdgeMesh",
+            "triSurface",
             runTime,
             IOobject::NO_READ,
             IOobject::NO_WRITE
@@ -603,13 +855,6 @@ int main(int argc, char *argv[])
         surf
     );
 
-    if (!curvature)
-    {
-        Info<< "End\n" << endl;
-
-        return 0;
-    }
-
     // Find close features
 
     // // Dummy trim operation to mark features
@@ -677,70 +922,56 @@ int main(int argc, char *argv[])
     //     )
     // );
 
-    Info<< "Examine curvature, feature proximity and internal and "
-        << "external closeness." << endl;
-
-    // Internal and external closeness
-
-    // Prepare start and end points for intersection tests
-
-    const vectorField& normals = searchSurf.faceNormals();
-
-    scalar span = searchSurf.bounds().mag();
-
-    args.optionReadIfPresent("closeness", span);
-
-    scalar externalAngleTolerance = 10;
-    scalar externalToleranceCosAngle = Foam::cos
-    (
-        degToRad(180 - externalAngleTolerance)
-    );
-
-    scalar internalAngleTolerance = 45;
-    scalar internalToleranceCosAngle = Foam::cos
-    (
-        degToRad(180 - internalAngleTolerance)
-    );
-
-    Info<< "externalToleranceCosAngle: " << externalToleranceCosAngle << nl
-        << "internalToleranceCosAngle: " << internalToleranceCosAngle
-        << endl;
-
-    // Info<< "span " << span << endl;
-
-    pointField start = searchSurf.faceCentres() - span*normals;
-    pointField end = searchSurf.faceCentres() + span*normals;
-    const pointField& faceCentres = searchSurf.faceCentres();
-
-    List<List<pointIndexHit> > allHitInfo;
-
-    // Find all intersections (in order)
-    searchSurf.findLineAll(start, end, allHitInfo);
-
-    scalarField internalCloseness(start.size(), GREAT);
-    scalarField externalCloseness(start.size(), GREAT);
-
-    forAll(allHitInfo, fI)
+    if (args.optionFound("closeness"))
     {
-        const List<pointIndexHit>& hitInfo = allHitInfo[fI];
+        Info<< nl << "Extracting internal and external closeness of surface."
+            << endl;
 
-        if (hitInfo.size() < 1)
-        {
-            drawHitProblem(fI, surf, start, faceCentres, end, hitInfo);
+        // Internal and external closeness
 
-            // FatalErrorIn(args.executable())
-            //     << "findLineAll did not hit its own face."
-            //     << exit(FatalError);
-        }
-        else if (hitInfo.size() == 1)
+        // Prepare start and end points for intersection tests
+
+        const vectorField& normals = searchSurf.faceNormals();
+
+        scalar span = searchSurf.bounds().mag();
+
+        //args.optionReadIfPresent("closeness", span);
+
+        scalar externalAngleTolerance = 10;
+        scalar externalToleranceCosAngle = Foam::cos
+        (
+            degToRad(180 - externalAngleTolerance)
+        );
+
+        scalar internalAngleTolerance = 45;
+        scalar internalToleranceCosAngle = Foam::cos
+        (
+            degToRad(180 - internalAngleTolerance)
+        );
+
+        Info<< "externalToleranceCosAngle: " << externalToleranceCosAngle << nl
+            << "internalToleranceCosAngle: " << internalToleranceCosAngle
+            << endl;
+
+        // Info<< "span " << span << endl;
+
+        pointField start = searchSurf.faceCentres() - span*normals;
+        pointField end = searchSurf.faceCentres() + span*normals;
+        const pointField& faceCentres = searchSurf.faceCentres();
+
+        List<List<pointIndexHit> > allHitInfo;
+
+        // Find all intersections (in order)
+        searchSurf.findLineAll(start, end, allHitInfo);
+
+        scalarField internalCloseness(start.size(), GREAT);
+        scalarField externalCloseness(start.size(), GREAT);
+
+        forAll(allHitInfo, fI)
         {
-            if (!hitInfo[0].hit())
-            {
-                // FatalErrorIn(args.executable())
-                //     << "findLineAll did not hit any face."
-                //     << exit(FatalError);
-            }
-            else if (hitInfo[0].index() != fI)
+            const List<pointIndexHit>& hitInfo = allHitInfo[fI];
+
+            if (hitInfo.size() < 1)
             {
                 drawHitProblem(fI, surf, start, faceCentres, end, hitInfo);
 
@@ -748,202 +979,299 @@ int main(int argc, char *argv[])
                 //     << "findLineAll did not hit its own face."
                 //     << exit(FatalError);
             }
-        }
-        else
-        {
-            label ownHitI = -1;
-
-            forAll(hitInfo, hI)
+            else if (hitInfo.size() == 1)
             {
-                // Find the hit on the triangle that launched the ray
-
-                if (hitInfo[hI].index() == fI)
+                if (!hitInfo[0].hit())
                 {
-                    ownHitI = hI;
-
-                    break;
+                    // FatalErrorIn(args.executable())
+                    //     << "findLineAll did not hit any face."
+                    //     << exit(FatalError);
                 }
-            }
-
-            if (ownHitI < 0)
-            {
-                drawHitProblem(fI, surf, start, faceCentres, end, hitInfo);
-
-                // FatalErrorIn(args.executable())
-                //     << "findLineAll did not hit its own face."
-                //     << exit(FatalError);
-            }
-            else if (ownHitI == 0)
-            {
-                // There are no internal hits, the first hit is the closest
-                // external hit
-
-                if
-                (
-                    (normals[fI] & normals[hitInfo[ownHitI + 1].index()])
-                  < externalToleranceCosAngle
-                )
+                else if (hitInfo[0].index() != fI)
                 {
-                    externalCloseness[fI] = mag
-                    (
-                        faceCentres[fI] - hitInfo[ownHitI + 1].hitPoint()
-                    );
-                }
-            }
-            else if (ownHitI == hitInfo.size() - 1)
-            {
-                // There are no external hits, the last but one hit is the
-                // closest internal hit
+                    drawHitProblem(fI, surf, start, faceCentres, end, hitInfo);
 
-                if
-                (
-                    (normals[fI] & normals[hitInfo[ownHitI - 1].index()])
-                  < internalToleranceCosAngle
-                )
-                {
-                    internalCloseness[fI] = mag
-                    (
-                        faceCentres[fI] - hitInfo[ownHitI - 1].hitPoint()
-                    );
+                    // FatalErrorIn(args.executable())
+                    //     << "findLineAll did not hit its own face."
+                    //     << exit(FatalError);
                 }
             }
             else
             {
-                if
-                (
-                    (normals[fI] & normals[hitInfo[ownHitI + 1].index()])
-                  < externalToleranceCosAngle
-                )
+                label ownHitI = -1;
+
+                forAll(hitInfo, hI)
                 {
-                    externalCloseness[fI] = mag
-                    (
-                        faceCentres[fI] - hitInfo[ownHitI + 1].hitPoint()
-                    );
+                    // Find the hit on the triangle that launched the ray
+
+                    if (hitInfo[hI].index() == fI)
+                    {
+                        ownHitI = hI;
+
+                        break;
+                    }
                 }
 
-                if
-                (
-                    (normals[fI] & normals[hitInfo[ownHitI - 1].index()])
-                  < internalToleranceCosAngle
-                )
+                if (ownHitI < 0)
                 {
-                    internalCloseness[fI] = mag
+                    drawHitProblem(fI, surf, start, faceCentres, end, hitInfo);
+
+                    // FatalErrorIn(args.executable())
+                    //     << "findLineAll did not hit its own face."
+                    //     << exit(FatalError);
+                }
+                else if (ownHitI == 0)
+                {
+                    // There are no internal hits, the first hit is the closest
+                    // external hit
+
+                    if
                     (
-                        faceCentres[fI] - hitInfo[ownHitI - 1].hitPoint()
-                    );
+                        (normals[fI] & normals[hitInfo[ownHitI + 1].index()])
+                      < externalToleranceCosAngle
+                    )
+                    {
+                        externalCloseness[fI] = mag
+                        (
+                            faceCentres[fI] - hitInfo[ownHitI + 1].hitPoint()
+                        );
+                    }
+                }
+                else if (ownHitI == hitInfo.size() - 1)
+                {
+                    // There are no external hits, the last but one hit is the
+                    // closest internal hit
+
+                    if
+                    (
+                        (normals[fI] & normals[hitInfo[ownHitI - 1].index()])
+                      < internalToleranceCosAngle
+                    )
+                    {
+                        internalCloseness[fI] = mag
+                        (
+                            faceCentres[fI] - hitInfo[ownHitI - 1].hitPoint()
+                        );
+                    }
+                }
+                else
+                {
+                    if
+                    (
+                        (normals[fI] & normals[hitInfo[ownHitI + 1].index()])
+                      < externalToleranceCosAngle
+                    )
+                    {
+                        externalCloseness[fI] = mag
+                        (
+                            faceCentres[fI] - hitInfo[ownHitI + 1].hitPoint()
+                        );
+                    }
+
+                    if
+                    (
+                        (normals[fI] & normals[hitInfo[ownHitI - 1].index()])
+                      < internalToleranceCosAngle
+                    )
+                    {
+                        internalCloseness[fI] = mag
+                        (
+                            faceCentres[fI] - hitInfo[ownHitI - 1].hitPoint()
+                        );
+                    }
                 }
             }
         }
+
+        triSurfaceScalarField internalClosenessField
+        (
+            IOobject
+            (
+                sFeatFileName + ".internalCloseness",
+                runTime.constant(),
+                "triSurface",
+                runTime,
+                IOobject::NO_READ,
+                IOobject::NO_WRITE
+            ),
+            surf,
+            dimLength,
+            internalCloseness
+        );
+
+        internalClosenessField.write();
+
+        triSurfaceScalarField externalClosenessField
+        (
+            IOobject
+            (
+                sFeatFileName + ".externalCloseness",
+                runTime.constant(),
+                "triSurface",
+                runTime,
+                IOobject::NO_READ,
+                IOobject::NO_WRITE
+            ),
+            surf,
+            dimLength,
+            externalCloseness
+        );
+
+        externalClosenessField.write();
+
+        if (writeVTK)
+        {
+            vtkSurfaceWriter().write
+            (
+                runTime.constant()/"triSurface",    // outputDir
+                sFeatFileName,                      // surfaceName
+                surf.points(),
+                faces,
+                "internalCloseness",                // fieldName
+                internalCloseness,
+                false,                              // isNodeValues
+                true                                // verbose
+            );
+
+            vtkSurfaceWriter().write
+            (
+                runTime.constant()/"triSurface",    // outputDir
+                sFeatFileName,                      // surfaceName
+                surf.points(),
+                faces,
+                "externalCloseness",                // fieldName
+                externalCloseness,
+                false,                              // isNodeValues
+                true                                // verbose
+            );
+        }
     }
 
-    triSurfaceScalarField internalClosenessField
-    (
-        IOobject
-        (
-            sFeatFileName + ".internalCloseness",
-            runTime.constant(),
-            "extendedFeatureEdgeMesh",
-            runTime,
-            IOobject::NO_READ,
-            IOobject::NO_WRITE
-        ),
-        surf,
-        dimLength,
-        internalCloseness
-    );
-
-    internalClosenessField.write();
-
-    triSurfaceScalarField externalClosenessField
-    (
-        IOobject
-        (
-            sFeatFileName + ".externalCloseness",
-            runTime.constant(),
-            "extendedFeatureEdgeMesh",
-            runTime,
-            IOobject::NO_READ,
-            IOobject::NO_WRITE
-        ),
-        surf,
-        dimLength,
-        externalCloseness
-    );
-
-    externalClosenessField.write();
-
 
 #ifdef ENABLE_CURVATURE
-    scalarField k = calcCurvature(surf);
-
-    // Modify the curvature values on feature edges and points to be zero.
-
-    forAll(newSet.featureEdges(), fEI)
+    if (args.optionFound("curvature"))
     {
-        const edge& e = surf.edges()[newSet.featureEdges()[fEI]];
+        Info<< nl << "Extracting curvature of surface at the points." << endl;
 
-        k[surf.meshPoints()[e.start()]] = 0.0;
-        k[surf.meshPoints()[e.end()]] = 0.0;
-    }
+        scalarField k = calcCurvature(surf);
 
-    triSurfacePointScalarField kField
-    (
-        IOobject
+        // Modify the curvature values on feature edges and points to be zero.
+
+    //    forAll(newSet.featureEdges(), fEI)
+    //    {
+    //        const edge& e = surf.edges()[newSet.featureEdges()[fEI]];
+    //
+    //        k[surf.meshPoints()[e.start()]] = 0.0;
+    //        k[surf.meshPoints()[e.end()]] = 0.0;
+    //    }
+
+        triSurfacePointScalarField kField
         (
-            sFeatFileName + ".curvature",
-            runTime.constant(),
-            "extendedFeatureEdgeMesh",
-            runTime,
-            IOobject::NO_READ,
-            IOobject::NO_WRITE
-        ),
-        surf,
-        dimLength,
-        k
-    );
+            IOobject
+            (
+                sFeatFileName + ".curvature",
+                runTime.constant(),
+                "triSurface",
+                runTime,
+                IOobject::NO_READ,
+                IOobject::NO_WRITE
+            ),
+            surf,
+            dimLength,
+            k
+        );
 
-    kField.write();
+        kField.write();
+
+        if (writeVTK)
+        {
+            vtkSurfaceWriter().write
+            (
+                runTime.constant()/"triSurface",    // outputDir
+                sFeatFileName,                      // surfaceName
+                surf.points(),
+                faces,
+                "curvature",                        // fieldName
+                k,
+                true,                               // isNodeValues
+                true                                // verbose
+            );
+        }
+    }
 #endif
 
-    if (writeVTK)
+
+    if (args.optionFound("featureProximity"))
     {
-        vtkSurfaceWriter().write
+        Info<< nl << "Extracting proximity of close feature points and edges "
+            << "to the surface" << endl;
+
+        const scalar searchDistance =
+            args.optionRead<scalar>("featureProximity");
+
+        const scalar radiusSqr = sqr(searchDistance);
+
+        scalarField featureProximity(surf.size(), searchDistance);
+
+        forAll(surf, fI)
+        {
+            const triPointRef& tri = surf[fI].tri(surf.points());
+            const point& triCentre = tri.circumCentre();
+
+            List<pointIndexHit> hitList;
+
+            feMesh.allNearestFeatureEdges(triCentre, radiusSqr, hitList);
+
+            featureProximity[fI] =
+                calcProximityOfFeatureEdges
+                (
+                    feMesh,
+                    hitList,
+                    featureProximity[fI]
+                );
+
+            feMesh.allNearestFeaturePoints(triCentre, radiusSqr, hitList);
+
+            featureProximity[fI] =
+                calcProximityOfFeaturePoints
+                (
+                    hitList,
+                    featureProximity[fI]
+                );
+        }
+
+        triSurfaceScalarField featureProximityField
         (
-            runTime.constant()/"triSurface",    // outputDir
-            sFeatFileName,                      // surfaceName
-            surf.points(),
-            faces,
-            "internalCloseness",                // fieldName
-            internalCloseness,
-            false,                              // isNodeValues
-            true                                // verbose
+            IOobject
+            (
+                sFeatFileName + ".featureProximity",
+                runTime.constant(),
+                "triSurface",
+                runTime,
+                IOobject::NO_READ,
+                IOobject::NO_WRITE
+            ),
+            surf,
+            dimLength,
+            featureProximity
         );
 
-        vtkSurfaceWriter().write
-        (
-            runTime.constant()/"triSurface",    // outputDir
-            sFeatFileName,                      // surfaceName
-            surf.points(),
-            faces,
-            "externalCloseness",                // fieldName
-            externalCloseness,
-            false,                              // isNodeValues
-            true                                // verbose
-        );
+        featureProximityField.write();
 
-#       ifdef ENABLE_CURVATURE
-        vtkSurfaceWriter().write
-        (
-            runTime.constant()/"triSurface",    // outputDir
-            sFeatFileName,                      // surfaceName
-            surf.points(),
-            faces,
-            "curvature",                        // fieldName
-            k,
-            true,                               // isNodeValues
-            true                                // verbose
-        );
-#       endif
+        if (writeVTK)
+        {
+            vtkSurfaceWriter().write
+            (
+                runTime.constant()/"triSurface",    // outputDir
+                sFeatFileName,                      // surfaceName
+                surf.points(),
+                faces,
+                "featureProximity",                // fieldName
+                featureProximity,
+                false,                              // isNodeValues
+                true                                // verbose
+            );
+        }
     }
 
     Info<< "End\n" << endl;
diff --git a/src/edgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMesh.C b/src/edgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMesh.C
index 81f853aa41..cd0ac4fc94 100644
--- a/src/edgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMesh.C
+++ b/src/edgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMesh.C
@@ -819,6 +819,39 @@ void Foam::extendedFeatureEdgeMesh::nearestFeatureEdgeByType
 }
 
 
+void Foam::extendedFeatureEdgeMesh::allNearestFeaturePoints
+(
+    const point& sample,
+    scalar searchRadiusSqr,
+    List<pointIndexHit>& info
+) const
+{
+    DynamicList<pointIndexHit> dynPointHit;
+
+    // Pick up all the feature points that intersect the search sphere
+    labelList elems = pointTree().findSphere
+    (
+        sample,
+        searchRadiusSqr
+    );
+
+    forAll(elems, elemI)
+    {
+        label index = elems[elemI];
+        label ptI = pointTree().shapes().pointLabels()[index];
+        const point& pt = points()[ptI];
+
+        pointIndexHit nearHit;
+
+        nearHit = pointIndexHit(true, pt, index);
+
+        dynPointHit.append(nearHit);
+    }
+
+    info.transfer(dynPointHit);
+}
+
+
 void Foam::extendedFeatureEdgeMesh::allNearestFeatureEdges
 (
     const point& sample,
diff --git a/src/edgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMesh.H b/src/edgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMesh.H
index 52de62552c..28601a26dd 100644
--- a/src/edgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMesh.H
+++ b/src/edgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMesh.H
@@ -283,6 +283,14 @@ public:
                 List<pointIndexHit>& info
             ) const;
 
+            //- Find all the feature points within searchDistSqr of sample
+            void allNearestFeaturePoints
+            (
+                const point& sample,
+                scalar searchRadiusSqr,
+                List<pointIndexHit>& info
+            ) const;
+
             //- Find all the feature edges within searchDistSqr of sample
             void allNearestFeatureEdges
             (
@@ -291,6 +299,7 @@ public:
                 List<pointIndexHit>& info
             ) const;
 
+
         // Access
 
             //- Return the index of the start of the convex feature points
diff --git a/src/meshTools/indexedOctree/treeDataPoint.C b/src/meshTools/indexedOctree/treeDataPoint.C
index 7e381a7577..09bf90de38 100644
--- a/src/meshTools/indexedOctree/treeDataPoint.C
+++ b/src/meshTools/indexedOctree/treeDataPoint.C
@@ -93,6 +93,25 @@ bool Foam::treeDataPoint::overlaps
 }
 
 
+// Check if any point on shape is inside sphere.
+bool Foam::treeDataPoint::overlaps
+(
+    const label index,
+    const point& centre,
+    const scalar radiusSqr
+) const
+{
+    label pointI = (useSubset_ ? pointLabels_[index] : index);
+
+    if (magSqr(points_[pointI] - centre) <= radiusSqr)
+    {
+        return true;
+    }
+
+    return false;
+}
+
+
 // Calculate nearest point to sample. Updates (if any) nearestDistSqr, minIndex,
 // nearestPoint.
 void Foam::treeDataPoint::findNearest
diff --git a/src/meshTools/indexedOctree/treeDataPoint.H b/src/meshTools/indexedOctree/treeDataPoint.H
index abd0a4024a..f867a3274a 100644
--- a/src/meshTools/indexedOctree/treeDataPoint.H
+++ b/src/meshTools/indexedOctree/treeDataPoint.H
@@ -128,6 +128,14 @@ public:
                 const treeBoundBox& sampleBb
             ) const;
 
+            //- Does shape at index overlap the sphere
+            bool overlaps
+            (
+                const label index,
+                const point& centre,
+                const scalar radiusSqr
+            ) const;
+
             //- Calculates nearest (to sample) point in shape.
             //  Returns actual point and distance (squared)
             void findNearest

From 3a9b54f3b18d7eb9797149c597d342bc2227a673 Mon Sep 17 00:00:00 2001
From: laurence <laurence>
Date: Fri, 16 Mar 2012 11:25:09 +0000
Subject: [PATCH 035/317] ENH: cvMesh: Add support for changing the surface
 cell size during a simulation

Currently disabled, but adding the functionality to change the cell size
based upon the non-orthogonality and the offset of patch faces from the
surface they are supposed to conform to.
---
 .../conformalVoronoiMesh.H                    |  18 +-
 .../conformalVoronoiMeshCalcDualMesh.C        | 294 +++++++++++++++---
 .../conformalVoronoiMeshConformToSurface.C    |   2 +-
 .../conformalVoronoiMeshI.H                   |   2 +-
 .../conformalVoronoiMeshIO.C                  |  10 +-
 5 files changed, 269 insertions(+), 57 deletions(-)

diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.H b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.H
index a514c660a1..81ce496c71 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.H
+++ b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -911,6 +911,17 @@ private:
             const HashSet<labelPair, labelPair::Hash<> >& deferredCollapseFaces
         ) const;
 
+        //- Check whether the cell sizes are fine enough. Creates a polyMesh.
+        void checkCellSizing();
+
+        //- Find all cells with a patch face that is not near the surface. The
+        //  allowed offset is the fraction of the target cell size.
+        labelHashSet findOffsetPatchFaces
+        (
+            const polyMesh& mesh,
+            const scalar allowedOffset
+        ) const;
+
         //- Create a polyMesh and check its quality, reports which
         //  elements damage the mesh quality, allowing backtracking.
         labelHashSet checkPolyMeshQuality(const pointField& pts) const;
@@ -1005,6 +1016,9 @@ private:
             const labelList& procNeighbours
         ) const;
 
+        //- Create a polyMesh from points.
+        autoPtr<polyMesh> createPolyMeshFromPoints(const pointField& pts) const;
+
         //- Rotate the faces on processor patches if necessary
         void reorderProcessorPatches
         (
@@ -1193,7 +1207,7 @@ public:
 
             //- Find the cellSet of the boundary cells which have points that
             //  protrude out of the surface beyond a tolerance.
-            void findRemainingProtrusionSet(const fvMesh& mesh) const;
+            labelHashSet findRemainingProtrusionSet(const polyMesh& mesh) const;
 
             void writeProcessorInterface
             (
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshCalcDualMesh.C b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshCalcDualMesh.C
index d103d3c0fc..5586446cb8 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshCalcDualMesh.C
+++ b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshCalcDualMesh.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -26,6 +26,7 @@ License
 #include "conformalVoronoiMesh.H"
 #include "motionSmoother.H"
 #include "backgroundMeshDecomposition.H"
+#include "polyMeshGeometry.H"
 
 // * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * * //
 
@@ -1552,7 +1553,8 @@ void Foam::conformalVoronoiMesh::deferredCollapseFaceSet
 }
 
 
-Foam::labelHashSet Foam::conformalVoronoiMesh::checkPolyMeshQuality
+Foam::autoPtr<Foam::polyMesh>
+Foam::conformalVoronoiMesh::createPolyMeshFromPoints
 (
     const pointField& pts
 ) const
@@ -1592,62 +1594,67 @@ Foam::labelHashSet Foam::conformalVoronoiMesh::checkPolyMeshQuality
     labelList cellToDelaunayVertex(removeUnusedCells(owner, neighbour));
     cellCentres = pointField(cellCentres, cellToDelaunayVertex);
 
-    polyMesh pMesh
+    autoPtr<polyMesh> meshPtr
     (
-        IOobject
+        new polyMesh
         (
-            "cvMesh_temporary",
-            runTime_.timeName(),
-            runTime_,
-            IOobject::NO_READ,
-            IOobject::NO_WRITE
-        ),
-        xferCopy(pts),
-        xferMove(faces),
-        xferMove(owner),
-        xferMove(neighbour)
+            IOobject
+            (
+                "cvMesh_temporary",
+                runTime_.timeName(),
+                runTime_,
+                IOobject::NO_READ,
+                IOobject::NO_WRITE
+            ),
+            xferCopy(pts),
+            xferMove(faces),
+            xferMove(owner),
+            xferMove(neighbour)
+        )
     );
 
+    polyMesh& pMesh = meshPtr();
+
     List<polyPatch*> patches(patchStarts.size());
 
     label nValidPatches = 0;
 
     forAll(patches, p)
     {
-        if (patchTypes[p] == processorPolyPatch::typeName)
-        {
-            // Do not create empty processor patches
+       if (patchTypes[p] == processorPolyPatch::typeName)
+       {
+           // Do not create empty processor patches
 
-            if (patchSizes[p] > 0)
-            {
-                patches[nValidPatches] = new processorPolyPatch
-                (
-                    patchNames[p],
-                    patchSizes[p],
-                    patchStarts[p],
-                    nValidPatches,
-                    pMesh.boundaryMesh(),
-                    Pstream::myProcNo(),
-                    procNeighbours[p]
-                );
+           if (patchSizes[p] > 0)
+           {
+               patches[nValidPatches] = new processorPolyPatch
+               (
+                   patchNames[p],
+                   patchSizes[p],
+                   patchStarts[p],
+                   nValidPatches,
+                   pMesh.boundaryMesh(),
+                   Pstream::myProcNo(),
+                   procNeighbours[p]
+               );
 
-                nValidPatches++;
-            }
-        }
-        else
-        {
-            patches[nValidPatches] = polyPatch::New
-            (
-                patchTypes[p],
-                patchNames[p],
-                patchSizes[p],
-                patchStarts[p],
-                nValidPatches,
-                pMesh.boundaryMesh()
-            ).ptr();
+               nValidPatches++;
+           }
+       }
+       else
+       {
+           patches[nValidPatches] = polyPatch::New
+           (
+               patchTypes[p],
+               patchNames[p],
+               patchSizes[p],
+               patchStarts[p],
+               nValidPatches,
+               pMesh.boundaryMesh()
+           ).ptr();
 
-            nValidPatches++;
-        }
+           nValidPatches++;
+       }
     }
 
     patches.setSize(nValidPatches);
@@ -1672,6 +1679,199 @@ Foam::labelHashSet Foam::conformalVoronoiMesh::checkPolyMeshQuality
 
     // pMesh.overrideCellCentres(cellCentres);
 
+    return meshPtr;
+}
+
+
+void Foam::conformalVoronoiMesh::checkCellSizing()
+{
+    Info<< "Checking cell sizes..."<< endl;
+
+    timeCheck("Start of Cell Sizing");
+
+    PackedBoolList boundaryPts(number_of_cells(), false);
+    pointField ptsField;
+
+    indexDualVertices(ptsField, boundaryPts);
+
+    // Merge close dual vertices.
+    mergeCloseDualVertices(ptsField, boundaryPts);
+
+    autoPtr<polyMesh> meshPtr = createPolyMeshFromPoints(ptsField);
+    const polyMesh& pMesh = meshPtr();
+
+    //pMesh.write();
+
+    // Find cells with poor quality
+    DynamicList<label> checkFaces(identity(pMesh.nFaces()));
+    labelHashSet wrongFaces(pMesh.nFaces()/100);
+
+    Info<< "Running checkMesh on mesh with " << pMesh.nCells()
+        << " cells "<< endl;
+
+    const dictionary& dict
+        = cvMeshControls().cvMeshDict().subDict("meshQualityControls");
+
+    const scalar maxNonOrtho = readScalar(dict.lookup("maxNonOrtho", true));
+
+    label nWrongFaces = 0;
+
+    if (maxNonOrtho < 180.0 - SMALL)
+    {
+        polyMeshGeometry::checkFaceDotProduct
+        (
+            false,
+            maxNonOrtho,
+            pMesh,
+            pMesh.cellCentres(),
+            pMesh.faceAreas(),
+            checkFaces,
+            List<labelPair>(),
+            &wrongFaces
+        );
+
+        label nNonOrthogonal = returnReduce(wrongFaces.size(), sumOp<label>());
+
+        Info<< "    non-orthogonality > " << maxNonOrtho
+            << " degrees : " << nNonOrthogonal << endl;
+
+        nWrongFaces += nNonOrthogonal;
+    }
+
+    labelHashSet protrudingCells = findOffsetPatchFaces(pMesh, 0.25);
+
+    label nProtrudingCells = protrudingCells.size();
+
+    Info<< "    protruding/intruding cells : " << nProtrudingCells << endl;
+
+    nWrongFaces += nProtrudingCells;
+
+//    motionSmoother::checkMesh
+//    (
+//        false,
+//        pMesh,
+//        cvMeshControls().cvMeshDict().subDict("meshQualityControls"),
+//        checkFaces,
+//        wrongFaces
+//    );
+
+    Info<< "    Found total of " << nWrongFaces << " bad faces" << endl;
+
+    {
+        labelHashSet cellsToResizeMap(pMesh.nFaces()/100);
+
+        // Find cells that are attached to the faces in wrongFaces.
+        forAllConstIter(labelHashSet, wrongFaces, iter)
+        {
+            const label faceOwner = pMesh.faceOwner()[iter.key()];
+            const label faceNeighbour = pMesh.faceNeighbour()[iter.key()];
+
+            if (!cellsToResizeMap.found(faceOwner))
+            {
+                cellsToResizeMap.insert(faceOwner);
+            }
+
+            if (!cellsToResizeMap.found(faceNeighbour))
+            {
+                cellsToResizeMap.insert(faceNeighbour);
+            }
+        }
+
+        cellsToResizeMap += protrudingCells;
+
+        pointField cellsToResize(cellsToResizeMap.size());
+
+        label count = 0;
+        for (label cellI = 0; cellI < pMesh.nCells(); ++cellI)
+        {
+            if (cellsToResizeMap.found(cellI))
+            {
+                cellsToResize[count++] = pMesh.cellCentres()[cellI];
+            }
+        }
+
+        Info<< "    Automatically re-sizing " << cellsToResize.size()
+            << " cells that are attached to the bad faces: DISABLED" << endl;
+
+        //cellSizeControl_.setCellSizes(cellsToResize);
+    }
+
+    timeCheck("End of Cell Sizing");
+
+    Info<< "Finished checking cell sizes"<< endl;
+}
+
+
+Foam::labelHashSet Foam::conformalVoronoiMesh::findOffsetPatchFaces
+(
+    const polyMesh& mesh,
+    const scalar allowedOffset
+) const
+{
+    timeCheck("Start findRemainingProtrusionSet");
+
+    const polyBoundaryMesh& patches = mesh.boundaryMesh();
+
+    cellSet offsetBoundaryCells
+    (
+        mesh,
+        "cvMesh_protrudingCells",
+        mesh.nCells()/1000
+    );
+
+    forAll(patches, patchI)
+    {
+        const polyPatch& patch = patches[patchI];
+
+        const faceList& localFaces = patch.localFaces();
+        const pointField& localPoints = patch.localPoints();
+
+        const labelList& fCell = patch.faceCells();
+
+        forAll(localFaces, pLFI)
+        {
+            const face& f = localFaces[pLFI];
+
+            const Foam::point& faceCentre = f.centre(localPoints);
+
+            const scalar targetSize = targetCellSize(faceCentre);
+
+            pointIndexHit pHit;
+            label surfHit = -1;
+
+            geometryToConformTo_.findSurfaceNearest
+            (
+                faceCentre,
+                sqr(targetSize),
+                pHit,
+                surfHit
+            );
+
+            if
+            (
+                pHit.hit()
+             && (mag(pHit.hitPoint() - faceCentre) > allowedOffset*targetSize)
+            )
+            {
+                offsetBoundaryCells.insert(fCell[pLFI]);
+            }
+        }
+    }
+
+    offsetBoundaryCells.write();
+
+    return offsetBoundaryCells;
+}
+
+
+Foam::labelHashSet Foam::conformalVoronoiMesh::checkPolyMeshQuality
+(
+    const pointField& pts
+) const
+{
+    autoPtr<polyMesh> meshPtr = createPolyMeshFromPoints(pts);
+    polyMesh& pMesh = meshPtr();
+
     timeCheck("polyMesh created, checking quality");
 
     labelHashSet wrongFaces(pMesh.nFaces()/100);
@@ -2264,10 +2464,6 @@ void Foam::conformalVoronoiMesh::createFacesOwnerNeighbourAndPatches
                 }
             }
         }
-
-        Pout<< "Patch Names:     " << patchNames << endl;
-        Pout<< "Patch Sizes:     " << patchSizes << endl;
-        Pout<< "Proc Neighbours: " << procNeighbours << endl;
     }
 }
 
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshConformToSurface.C b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshConformToSurface.C
index 9bc2512f58..bee04b2fbd 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshConformToSurface.C
+++ b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshConformToSurface.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshI.H b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshI.H
index a18b173ecd..1e24b7d8ef 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshI.H
+++ b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshIO.C b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshIO.C
index 89afb87134..68f98e8a9d 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshIO.C
+++ b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshIO.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -1072,9 +1072,9 @@ void Foam::conformalVoronoiMesh::writeCellCentres
 }
 
 
-void Foam::conformalVoronoiMesh::findRemainingProtrusionSet
+Foam::labelHashSet Foam::conformalVoronoiMesh::findRemainingProtrusionSet
 (
-    const fvMesh& mesh
+    const polyMesh& mesh
 ) const
 {
     timeCheck("Start findRemainingProtrusionSet");
@@ -1129,7 +1129,7 @@ void Foam::conformalVoronoiMesh::findRemainingProtrusionSet
 
     reduce(protrudingCellsSize, sumOp<label>());
 
-    if (protrudingCellsSize > 0)
+    if (cvMeshControls().objOutput() && protrudingCellsSize > 0)
     {
         Info<< nl << "Found " << protrudingCellsSize
             << " cells protruding from the surface, writing cellSet "
@@ -1138,6 +1138,8 @@ void Foam::conformalVoronoiMesh::findRemainingProtrusionSet
 
         protrudingCells.write();
     }
+
+    return protrudingCells;
 }
 
 

From 82be4453f4429ba87783587be1a1db44ab58f728 Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Fri, 16 Mar 2012 12:26:15 +0000
Subject: [PATCH 036/317] MRFtwoPhaseEulerFoam: improved handling of the flux
 BCs for MRF

---
 .../twoPhaseEulerFoam/MRFtwoPhaseEulerFoam/pEqn.H | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/MRFtwoPhaseEulerFoam/pEqn.H b/applications/solvers/multiphase/twoPhaseEulerFoam/MRFtwoPhaseEulerFoam/pEqn.H
index 079ecfefe4..348cc847d7 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/MRFtwoPhaseEulerFoam/pEqn.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/MRFtwoPhaseEulerFoam/pEqn.H
@@ -69,6 +69,11 @@
     );
     mrfZones.relativeFlux(phiHbyA2);
 
+    mrfZones.relativeFlux(phi1.oldTime());
+    mrfZones.relativeFlux(phi1);
+    mrfZones.relativeFlux(phi2.oldTime());
+    mrfZones.relativeFlux(phi2);
+
     surfaceScalarField phiHbyA("phiHbyA", alpha1f*phiHbyA1 + alpha2f*phiHbyA2);
 
     surfaceScalarField Dp
@@ -92,18 +97,8 @@
         {
             surfaceScalarField SfGradp(pEqn.flux()/Dp);
 
-            phi1.boundaryField() ==
-                (fvc::interpolate(U1) & mesh.Sf())().boundaryField();
-            mrfZones.relativeFlux(phi1);
             phi1 = phiHbyA1 - rAU1f*SfGradp/rho1;
-            mrfZones.relativeFlux(phi1.oldTime());
-
-            phi2.boundaryField() ==
-                (fvc::interpolate(U2) & mesh.Sf())().boundaryField();
-            mrfZones.relativeFlux(phi2);
             phi2 = phiHbyA2 - rAU2f*SfGradp/rho2;
-            mrfZones.relativeFlux(phi2.oldTime());
-
             phi = alpha1f*phi1 + alpha2f*phi2;
 
             p.relax();

From f6df09870b8cb54ab3304e19f452bacad98ffc7f Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Fri, 16 Mar 2012 12:26:50 +0000
Subject: [PATCH 037/317] twoPhaseEulerFoam: new virtual-mass formulation being
 considered

---
 .../twoPhaseEulerFoam/newVirualMass/DDtU.H    |  11 ++
 .../twoPhaseEulerFoam/newVirualMass/UEqns.H   | 120 ++++++++++++++++++
 2 files changed, 131 insertions(+)
 create mode 100644 applications/solvers/multiphase/twoPhaseEulerFoam/newVirualMass/DDtU.H
 create mode 100644 applications/solvers/multiphase/twoPhaseEulerFoam/newVirualMass/UEqns.H

diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/newVirualMass/DDtU.H b/applications/solvers/multiphase/twoPhaseEulerFoam/newVirualMass/DDtU.H
new file mode 100644
index 0000000000..9ce4537979
--- /dev/null
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/newVirualMass/DDtU.H
@@ -0,0 +1,11 @@
+{
+    DDtU1 =
+        fvc::ddt(U1)
+      + fvc::div(phi, U1)
+      - fvc::div(phi)*U1;
+
+    DDtU2 =
+        fvc::ddt(U2)
+      + fvc::div(phi, U2)
+      - fvc::div(phi)*U2;
+}
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/newVirualMass/UEqns.H b/applications/solvers/multiphase/twoPhaseEulerFoam/newVirualMass/UEqns.H
new file mode 100644
index 0000000000..cae326e44a
--- /dev/null
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/newVirualMass/UEqns.H
@@ -0,0 +1,120 @@
+fvVectorMatrix U1Eqn(U1, U1.dimensions()*dimVol/dimTime);
+fvVectorMatrix U2Eqn(U2, U2.dimensions()*dimVol/dimTime);
+
+{
+    volScalarField Cvma
+    (
+        Cvm
+       /(
+           1
+         + mag(fvc::grad(alpha1))
+          *dimensionedScalar("l", dimLength, 1e-2)
+       )
+    );
+
+    {
+        volTensorField gradU1T(T(fvc::grad(U1)));
+
+        if (kineticTheory.on())
+        {
+            kineticTheory.solve(gradU1T);
+            nuEff1 = kineticTheory.mu1()/rho1;
+        }
+        else // If not using kinetic theory is using Ct model
+        {
+            nuEff1 = sqr(Ct)*nut2 + nu1;
+        }
+
+        volTensorField Rc1
+        (
+            "Rc1",
+            (((2.0/3.0)*I)*nuEff1)*tr(gradU1T) - nuEff1*gradU1T
+        );
+
+        if (kineticTheory.on())
+        {
+            Rc1 -= ((kineticTheory.lambda()/rho1)*tr(gradU1T))*tensor(I);
+        }
+
+        surfaceScalarField phiR1
+        (
+            -fvc::interpolate(nuEff1)*mesh.magSf()*fvc::snGrad(alpha1)
+            /fvc::interpolate(alpha1 + scalar(0.001))
+        );
+
+        U1Eqn =
+        (
+            fvm::ddt(U1)
+          + fvm::div(phi1, U1)
+          - fvm::Sp(fvc::div(phi1), U1)
+
+          + Cvma*alpha2*rho/rho1*
+            (
+                fvm::ddt(U1)
+              + fvm::div(phi, U1)
+              - fvm::Sp(fvc::div(phi), U1)
+            )
+
+          - fvm::laplacian(nuEff1, U1)
+          + fvc::div(Rc1)
+
+          + fvm::div(phiR1, U1, "div(phi1,U1)")
+          - fvm::Sp(fvc::div(phiR1), U1)
+          + (fvc::grad(alpha1)/(fvc::average(alpha1) + scalar(0.001)) & Rc1)
+         ==
+        //  g                          // Buoyancy term transfered to p-equation
+          - fvm::Sp(alpha2/rho1*K, U1)
+        //+ alpha2/rho1*K*U2           // Explicit drag transfered to p-equation
+        //  - fvm::Sp(K/rho1, U1)
+        ////+ K/rho1*U           // Explicit drag transfered to p-equation
+          - alpha2/rho1*liftCoeff + Cvma*alpha2*rho*DDtU2/rho1
+        );
+
+        U1Eqn.relax();
+    }
+
+    {
+        volTensorField gradU2T(T(fvc::grad(U2)));
+        volTensorField Rc2
+        (
+            "Rc2",
+            (((2.0/3.0)*I)*nuEff2)*tr(gradU2T) - nuEff2*gradU2T
+        );
+
+        surfaceScalarField phiR2
+        (
+            -fvc::interpolate(nuEff2)*mesh.magSf()*fvc::snGrad(alpha2)
+            /fvc::interpolate(alpha2 + scalar(0.001))
+        );
+
+        U2Eqn =
+        (
+            fvm::ddt(U2)
+          + fvm::div(phi2, U2)
+          - fvm::Sp(fvc::div(phi2), U2)
+
+          + Cvma*alpha1*rho/rho2*
+            (
+                fvm::ddt(U2)
+              + fvm::div(phi, U2)
+              - fvm::Sp(fvc::div(phi), U2)
+            )
+
+          - fvm::laplacian(nuEff2, U2)
+          + fvc::div(Rc2)
+
+          + fvm::div(phiR2, U2, "div(phi2,U2)")
+          - fvm::Sp(fvc::div(phiR2), U2)
+          + (fvc::grad(alpha2)/(fvc::average(alpha2) + scalar(0.001)) & Rc2)
+         ==
+        //  g                          // Buoyancy term transfered to p-equation
+          - fvm::Sp(alpha1/rho2*K, U2)
+        //+ alpha1/rho2*K*U1           // Explicit drag transfered to p-equation
+        //  - fvm::Sp(K/rho2, U2)
+        ////+ K/rho2*U           // Explicit drag transfered to p-equation
+          + alpha1/rho2*liftCoeff + Cvma*alpha1*rho*DDtU1/rho2
+        );
+
+        U2Eqn.relax();
+    }
+}

From 13e95e2a67312595d2f0ffbead5f16b2976e0c85 Mon Sep 17 00:00:00 2001
From: laurence <laurence>
Date: Tue, 20 Mar 2012 17:41:08 +0000
Subject: [PATCH 038/317] ENH: edgeMesh: Add PLOTEL keyword for NAS edge
 meshes.

---
 src/edgeMesh/edgeFormats/nas/NASedgeFormat.C | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/edgeMesh/edgeFormats/nas/NASedgeFormat.C b/src/edgeMesh/edgeFormats/nas/NASedgeFormat.C
index 93196c0e7b..c043ae3c0b 100644
--- a/src/edgeMesh/edgeFormats/nas/NASedgeFormat.C
+++ b/src/edgeMesh/edgeFormats/nas/NASedgeFormat.C
@@ -113,6 +113,17 @@ bool Foam::fileFormats::NASedgeFormat::read
             // discard groupID
             dynEdges.append(e);
         }
+        else if (cmd == "PLOTEL")
+        {
+            edge e;
+
+            // label groupId = readLabel(IStringStream(line.substr(16,8))());
+            e[0] = readLabel(IStringStream(line.substr(16,8))());
+            e[1] = readLabel(IStringStream(line.substr(24,8))());
+
+            // discard groupID
+            dynEdges.append(e);
+        }
         else if (cmd == "GRID")
         {
             label index = readLabel(IStringStream(line.substr(8,8))());

From 9a7beff358afc4e6536e1b9bc0fdb16ee04a36dc Mon Sep 17 00:00:00 2001
From: laurence <laurence>
Date: Tue, 20 Mar 2012 17:41:39 +0000
Subject: [PATCH 039/317] ENH: edgeMesh: Add function to eliminate duplicate
 edges

---
 src/edgeMesh/edgeMesh.C | 45 +++++++++++++++++++++++++++++++----------
 src/edgeMesh/edgeMesh.H |  3 +++
 2 files changed, 37 insertions(+), 11 deletions(-)

diff --git a/src/edgeMesh/edgeMesh.C b/src/edgeMesh/edgeMesh.C
index 113112fa28..bc63e3d117 100644
--- a/src/edgeMesh/edgeMesh.C
+++ b/src/edgeMesh/edgeMesh.C
@@ -28,6 +28,7 @@ License
 #include "addToRunTimeSelectionTable.H"
 #include "addToMemberFunctionSelectionTable.H"
 #include "ListOps.H"
+#include "EdgeMap.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
@@ -327,10 +328,7 @@ void Foam::edgeMesh::mergePoints(const scalar mergeDist)
         }
 
         // Compact using a hashtable and commutative hash of edge.
-        HashTable<label, edge, Hash<edge> > edgeToLabel
-        (
-            2*edges_.size()
-        );
+        EdgeMap<label> edgeToLabel(2*edges_.size());
 
         label newEdgeI = 0;
 
@@ -349,13 +347,7 @@ void Foam::edgeMesh::mergePoints(const scalar mergeDist)
 
         edges_.setSize(newEdgeI);
 
-        for
-        (
-            HashTable<label, edge, Hash<edge> >::const_iterator iter =
-                edgeToLabel.begin();
-            iter != edgeToLabel.end();
-            ++iter
-        )
+        forAllConstIter(EdgeMap<label>, edgeToLabel, iter)
         {
             edges_[iter()] = iter.key();
         }
@@ -363,4 +355,35 @@ void Foam::edgeMesh::mergePoints(const scalar mergeDist)
 }
 
 
+void Foam::edgeMesh::mergeEdges()
+{
+    EdgeMap<label> existingEdges(2*edges_.size());
+
+    label curEdgeI = 0;
+    forAll(edges_, edgeI)
+    {
+        const edge& e = edges_[edgeI];
+
+        if (existingEdges.insert(e, curEdgeI))
+        {
+            curEdgeI++;
+        }
+    }
+
+    if (debug)
+    {
+        Info<< "Merging duplicate edges: "
+            << edges_.size() - existingEdges.size()
+            << " edges will be deleted." << endl;
+    }
+
+    edges_.setSize(existingEdges.size());
+
+    forAllConstIter(EdgeMap<label>, existingEdges, iter)
+    {
+        edges_[iter()] = iter.key();
+    }
+}
+
+
 // ************************************************************************* //
diff --git a/src/edgeMesh/edgeMesh.H b/src/edgeMesh/edgeMesh.H
index baa6142815..66574e9fac 100644
--- a/src/edgeMesh/edgeMesh.H
+++ b/src/edgeMesh/edgeMesh.H
@@ -246,6 +246,9 @@ public:
         //- Merge common points (points within mergeDist)
         void mergePoints(const scalar mergeDist);
 
+        //- Merge similar edges
+        void mergeEdges();
+
 
     // Write
 

From 138f149b47eca977215ad7387134d8c7f080398c Mon Sep 17 00:00:00 2001
From: laurence <laurence>
Date: Tue, 20 Mar 2012 17:43:27 +0000
Subject: [PATCH 040/317] ENH: surfaceFeatures: Add constructor that takes an
 edgeMesh

---
 .../algorithms/indexedOctree/indexedOctree.C  |   6 +-
 .../surfaceFeatures/surfaceFeatures.C         | 261 ++++++++++++++----
 .../surfaceFeatures/surfaceFeatures.H         |  35 ++-
 3 files changed, 243 insertions(+), 59 deletions(-)

diff --git a/src/OpenFOAM/algorithms/indexedOctree/indexedOctree.C b/src/OpenFOAM/algorithms/indexedOctree/indexedOctree.C
index 024f7d27ec..f16dd2595c 100644
--- a/src/OpenFOAM/algorithms/indexedOctree/indexedOctree.C
+++ b/src/OpenFOAM/algorithms/indexedOctree/indexedOctree.C
@@ -2832,7 +2832,7 @@ Foam::pointIndexHit Foam::indexedOctree<Type>::findNearest
 ) const
 {
     label nearestShapeI = -1;
-    point nearestPoint;
+    point nearestPoint = vector::zero;
 
     if (nodes_.size())
     {
@@ -2847,10 +2847,6 @@ Foam::pointIndexHit Foam::indexedOctree<Type>::findNearest
             nearestPoint
         );
     }
-    else
-    {
-        nearestPoint = vector::zero;
-    }
 
     return pointIndexHit(nearestShapeI != -1, nearestPoint, nearestShapeI);
 }
diff --git a/src/meshTools/triSurface/surfaceFeatures/surfaceFeatures.C b/src/meshTools/triSurface/surfaceFeatures/surfaceFeatures.C
index e39eae5704..465734ff87 100644
--- a/src/meshTools/triSurface/surfaceFeatures/surfaceFeatures.C
+++ b/src/meshTools/triSurface/surfaceFeatures/surfaceFeatures.C
@@ -33,11 +33,15 @@ License
 #include "OFstream.H"
 #include "IFstream.H"
 #include "unitConversion.H"
+#include "EdgeMap.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 defineTypeNameAndDebug(Foam::surfaceFeatures, 0);
 
+const Foam::scalar Foam::surfaceFeatures::parallelTolerance =
+    sin(degToRad(1.0));
+
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
@@ -170,7 +174,10 @@ void Foam::surfaceFeatures::setFromStatus(const List<edgeStatus>& edgeStat)
 
 
 //construct feature points where more than 2 feature edges meet
-void Foam::surfaceFeatures::calcFeatPoints(const List<edgeStatus>& edgeStat)
+void Foam::surfaceFeatures::calcFeatPoints
+(
+    const List<edgeStatus>& edgeStat
+)
 {
     DynamicList<label> featurePoints(surf_.nPoints()/1000);
 
@@ -200,6 +207,60 @@ void Foam::surfaceFeatures::calcFeatPoints(const List<edgeStatus>& edgeStat)
 }
 
 
+void Foam::surfaceFeatures::classifyFeatureAngles
+(
+    const labelListList& edgeFaces,
+    List<edgeStatus>& edgeStat,
+    const scalar minCos
+) const
+{
+    const vectorField& faceNormals = surf_.faceNormals();
+    const pointField& points = surf_.points();
+
+    forAll(edgeFaces, edgeI)
+    {
+        const labelList& eFaces = edgeFaces[edgeI];
+
+        if (eFaces.size() != 2)
+        {
+            // Non-manifold. What to do here? Is region edge? external edge?
+            edgeStat[edgeI] = REGION;
+        }
+        else
+        {
+            label face0 = eFaces[0];
+            label face1 = eFaces[1];
+
+            if (surf_[face0].region() != surf_[face1].region())
+            {
+                edgeStat[edgeI] = REGION;
+            }
+            else
+            {
+                if ((faceNormals[face0] & faceNormals[face1]) < minCos)
+                {
+
+                    // Check if convex or concave by looking at angle
+                    // between face centres and normal
+                    vector f0Tof1 =
+                        surf_[face1].centre(points)
+                      - surf_[face0].centre(points);
+
+                    if ((f0Tof1 & faceNormals[face0]) > 0.0)
+                    {
+                        edgeStat[edgeI] = INTERNAL;
+                    }
+                    else
+                    {
+                        edgeStat[edgeI] = EXTERNAL;
+                    }
+                }
+            }
+        }
+    }
+}
+
+
 // Returns next feature edge connected to pointI with correct value.
 Foam::label Foam::surfaceFeatures::nextFeatEdge
 (
@@ -436,6 +497,80 @@ Foam::surfaceFeatures::surfaceFeatures
 }
 
 
+Foam::surfaceFeatures::surfaceFeatures
+(
+    const triSurface& surf,
+    const pointField& points,
+    const edgeList& edges,
+    const scalar mergeTol
+)
+:
+    surf_(surf),
+    featurePoints_(0),
+    featureEdges_(0),
+    externalStart_(0),
+    internalStart_(0)
+{
+    // Match edge mesh edges with the triSurface edges
+
+    const labelListList& surfEdgeFaces = surf_.edgeFaces();
+    const edgeList& surfEdges = surf_.edges();
+
+    scalar mergeTolSqr = sqr(mergeTol);
+
+    EdgeMap<label> dynFeatEdges(2*edges.size());
+    DynamicList<labelList> dynFeatureEdgeFaces(edges.size());
+
+    labelList edgeLabel;
+
+    nearestFeatEdge
+    (
+        edges,
+        points,
+        mergeTolSqr,
+        edgeLabel     // label of surface edge or -1
+    );
+
+    label count = 0;
+    forAll(edgeLabel, sEdgeI)
+    {
+        const label sEdge = edgeLabel[sEdgeI];
+
+        if (sEdge == -1)
+        {
+            continue;
+        }
+
+        dynFeatEdges.insert(surfEdges[sEdge], count++);
+        dynFeatureEdgeFaces.append(surfEdgeFaces[sEdge]);
+    }
+
+    // Find whether an edge is external or internal
+    List<edgeStatus> edgeStat(dynFeatEdges.size(), NONE);
+
+    classifyFeatureAngles(dynFeatureEdgeFaces, edgeStat, GREAT);
+
+    // Transfer the edge status to a list encompassing all edges in the surface
+    // so that calcFeatPoints can be used.
+    List<edgeStatus> allEdgeStat(surf_.nEdges(), NONE);
+
+    forAll(allEdgeStat, eI)
+    {
+        EdgeMap<label>::const_iterator iter = dynFeatEdges.find(surfEdges[eI]);
+
+        if (iter != dynFeatEdges.end())
+        {
+            allEdgeStat[eI] = edgeStat[iter()];
+        }
+    }
+
+    edgeStat.clear();
+    dynFeatEdges.clear();
+
+    setFromStatus(allEdgeStat);
+}
+
+
 //- Construct as copy
 Foam::surfaceFeatures::surfaceFeatures(const surfaceFeatures& sf)
 :
@@ -496,54 +631,10 @@ void Foam::surfaceFeatures::findFeatures(const scalar includedAngle)
 {
     scalar minCos = Foam::cos(degToRad(180.0 - includedAngle));
 
-    const labelListList& edgeFaces = surf_.edgeFaces();
-    const vectorField& faceNormals = surf_.faceNormals();
-    const pointField& points = surf_.points();
-
     // Per edge whether is feature edge.
     List<edgeStatus> edgeStat(surf_.nEdges(), NONE);
 
-    forAll(edgeFaces, edgeI)
-    {
-        const labelList& eFaces = edgeFaces[edgeI];
-
-        if (eFaces.size() != 2)
-        {
-            // Non-manifold. What to do here? Is region edge? external edge?
-            edgeStat[edgeI] = REGION;
-        }
-        else
-        {
-            label face0 = eFaces[0];
-            label face1 = eFaces[1];
-
-            if (surf_[face0].region() != surf_[face1].region())
-            {
-                edgeStat[edgeI] = REGION;
-            }
-            else
-            {
-                if ((faceNormals[face0] & faceNormals[face1]) < minCos)
-                {
-
-                    // Check if convex or concave by looking at angle
-                    // between face centres and normal
-                    vector f0Tof1 =
-                        surf_[face1].centre(points)
-                        - surf_[face0].centre(points);
-
-                    if ((f0Tof1 & faceNormals[face0]) > 0.0)
-                    {
-                        edgeStat[edgeI] = INTERNAL;
-                    }
-                    else
-                    {
-                        edgeStat[edgeI] = EXTERNAL;
-                    }
-                }
-            }
-        }
-    }
+    classifyFeatureAngles(surf_.edgeFaces(), edgeStat, minCos);
 
     setFromStatus(edgeStat);
 }
@@ -1147,6 +1238,9 @@ void Foam::surfaceFeatures::nearestSurfEdge
 
     const pointField& localPoints = surf_.localPoints();
 
+    treeBoundBox searchDomain(localPoints);
+    searchDomain.inflate(0.1);
+
     indexedOctree<treeDataEdge> ppTree
     (
         treeDataEdge
@@ -1156,7 +1250,7 @@ void Foam::surfaceFeatures::nearestSurfEdge
             localPoints,
             selectedEdges
         ),          // all information needed to do geometric checks
-        treeBoundBox(localPoints),  // overall search domain
+        searchDomain,  // overall search domain
         8,      // maxLevel
         10,     // leafsize
         3.0     // duplicity
@@ -1216,6 +1310,8 @@ void Foam::surfaceFeatures::nearestSurfEdge
     pointOnEdge.setSize(selectedSampleEdges.size());
     pointOnFeature.setSize(selectedSampleEdges.size());
 
+    treeBoundBox searchDomain(surf_.localPoints());
+
     indexedOctree<treeDataEdge> ppTree
     (
         treeDataEdge
@@ -1224,11 +1320,11 @@ void Foam::surfaceFeatures::nearestSurfEdge
             surf_.edges(),
             surf_.localPoints(),
             selectedEdges
-        ),          // all information needed to do geometric checks
-        treeBoundBox(surf_.localPoints()),  // overall search domain
-        8,      // maxLevel
-        10,     // leafsize
-        3.0     // duplicity
+        ),              // all information needed to do geometric checks
+        searchDomain,   // overall search domain
+        8,              // maxLevel
+        10,             // leafsize
+        3.0             // duplicity
     );
 
     forAll(selectedSampleEdges, i)
@@ -1262,6 +1358,67 @@ void Foam::surfaceFeatures::nearestSurfEdge
 }
 
 
+void Foam::surfaceFeatures::nearestFeatEdge
+(
+    const edgeList& edges,
+    const pointField& points,
+    scalar searchSpanSqr,   // Search span
+    labelList& edgeLabel
+) const
+{
+    edgeLabel = labelList(surf_.nEdges(), -1);
+
+    treeBoundBox searchDomain(points);
+    searchDomain.inflate(0.1);
+
+    indexedOctree<treeDataEdge> ppTree
+    (
+        treeDataEdge
+        (
+            false,
+            edges,
+            points,
+            identity(edges.size())
+        ),          // all information needed to do geometric checks
+        searchDomain,  // overall search domain
+        8,      // maxLevel
+        10,     // leafsize
+        3.0     // duplicity
+    );
+
+    const edgeList& surfEdges = surf_.edges();
+    const pointField& surfLocalPoints = surf_.localPoints();
+
+    forAll(surfEdges, edgeI)
+    {
+        const edge& sample = surfEdges[edgeI];
+
+        const point& startPoint = surfLocalPoints[sample.start()];
+        const point& midPoint = sample.centre(surfLocalPoints);
+
+        pointIndexHit infoMid = ppTree.findNearest
+        (
+            midPoint,
+            searchSpanSqr
+        );
+
+        if (infoMid.hit())
+        {
+            const vector surfEdgeDir = midPoint - startPoint;
+
+            const edge& featEdge = edges[infoMid.index()];
+            const vector featEdgeDir = featEdge.vec(points);
+
+            // Check that the edges are nearly parallel
+            if (mag(surfEdgeDir ^ featEdgeDir) < parallelTolerance)
+            {
+                edgeLabel[edgeI] = edgeI;
+            }
+        }
+    }
+}
+
+
 // * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
 
 void Foam::surfaceFeatures::operator=(const surfaceFeatures& rhs)
diff --git a/src/meshTools/triSurface/surfaceFeatures/surfaceFeatures.H b/src/meshTools/triSurface/surfaceFeatures/surfaceFeatures.H
index 7f7101b662..0fca9798a2 100644
--- a/src/meshTools/triSurface/surfaceFeatures/surfaceFeatures.H
+++ b/src/meshTools/triSurface/surfaceFeatures/surfaceFeatures.H
@@ -95,6 +95,11 @@ private:
         {}
     };
 
+    // Static data
+
+        //- Tolerance for determining whether two vectors are parallel
+        static const scalar parallelTolerance;
+
 
     // Private data
 
@@ -130,6 +135,14 @@ private:
         //- Construct feature points where more than 2 feature edges meet
         void calcFeatPoints(const List<edgeStatus>&);
 
+        //- Classify the angles of the feature edges
+        void classifyFeatureAngles
+        (
+            const labelListList& edgeFaces,
+            List<edgeStatus>& edgeStat,
+            const scalar minCos
+        ) const;
+
         //- Choose next unset feature edge.
         label nextFeatEdge
         (
@@ -186,6 +199,15 @@ public:
         //- Construct from file
         surfaceFeatures(const triSurface&, const fileName& fName);
 
+        //- Construct from pointField and edgeList (edgeMesh)
+        surfaceFeatures
+        (
+            const triSurface&,
+            const pointField& points,
+            const edgeList& edges,
+            const scalar mergeTol = 1e-6
+        );
+
         //- Construct as copy
         surfaceFeatures(const surfaceFeatures&);
 
@@ -327,9 +349,8 @@ public:
                 pointField& edgePoint
             ) const;
 
-
             //- Find nearest surface edge (out of selectedEdges) for each
-            // sample edge.
+            //  sample edge.
             //  Sets:
             //  - edgeLabel         : label of surface edge.
             //  - pointOnEdge       : exact position of nearest point on edge.
@@ -347,6 +368,16 @@ public:
                 pointField& pointOnFeature  // point on sample edge
             ) const;
 
+            //- Find nearest feature edge to each surface edge. Uses the
+            //  mid-point of the surface edges.
+            void nearestFeatEdge
+            (
+                const edgeList& edges,
+                const pointField& points,
+                scalar searchSpanSqr,
+                labelList& edgeLabel
+            ) const;
+
 
         // Write
 

From c6a2710bbec146d828683469001438bd2ba96ce2 Mon Sep 17 00:00:00 2001
From: laurence <laurence>
Date: Tue, 20 Mar 2012 17:46:04 +0000
Subject: [PATCH 041/317] COMP: surfaceFeatureExtract: Clean up build

---
 .../surface/surfaceFeatureExtract/Allwmake    | 37 ++++----
 .../CGALPolyhedron/buildCGALPolyhedron.C      | 89 -------------------
 .../CGALPolyhedron/buildCGALPolyhedron.H      | 46 +++++++++-
 .../surfaceFeatureExtract/Make/options        | 12 +++
 .../surfaceFeatureExtract/MakeWithCGAL/files  |  4 -
 .../MakeWithCGAL/options                      | 29 ------
 .../MakeWithoutCGAL/files                     |  3 -
 .../MakeWithoutCGAL/options                   | 13 ---
 8 files changed, 70 insertions(+), 163 deletions(-)
 delete mode 100644 applications/utilities/surface/surfaceFeatureExtract/CGALPolyhedron/buildCGALPolyhedron.C
 delete mode 100644 applications/utilities/surface/surfaceFeatureExtract/MakeWithCGAL/files
 delete mode 100644 applications/utilities/surface/surfaceFeatureExtract/MakeWithCGAL/options
 delete mode 100644 applications/utilities/surface/surfaceFeatureExtract/MakeWithoutCGAL/files
 delete mode 100644 applications/utilities/surface/surfaceFeatureExtract/MakeWithoutCGAL/options

diff --git a/applications/utilities/surface/surfaceFeatureExtract/Allwmake b/applications/utilities/surface/surfaceFeatureExtract/Allwmake
index e54f15ae28..369428e171 100755
--- a/applications/utilities/surface/surfaceFeatureExtract/Allwmake
+++ b/applications/utilities/surface/surfaceFeatureExtract/Allwmake
@@ -3,30 +3,25 @@ cd ${0%/*} || exit 1    # run from this directory
 
 set -x
 
-if [ ! -e "Make/files" ] || [ ! -e "Make/options" ]
+if [ -n "$CGAL_ARCH_PATH" ]
 then
-    mkdir -p Make
+    echo
+    echo "Compiling surfaceFeatureExtract with CGAL curvature support"
+    echo
 
-    if [ -n "$CGAL_ARCH_PATH" ]
-    then
-        cp -r MakeWithCGAL/* Make
-
-        echo
-        echo Compiling surfaceFeatureExtract with CGAL support for curvature
-        echo
-
-        wmake
-    else
-        cp -r MakeWithoutCGAL/* Make
-
-        echo
-        echo Compiling surfaceFeatureExtract without CGAL support for curvature
-        echo
-
-        wmake
-    fi
+    wmake "ENABLE_CURVATURE=-DENABLE_CURVATURE \
+           EXE_FROUNDING_MATH=-frounding-math \
+           USE_F2C=-DCGAL_USE_F2C \
+           CGAL_LIBDIR=-L$CGAL_ARCH_PATH/lib \
+           LAPACK_LIB=-llapack \
+           BLAS_LIB=-lblas \
+           CGAL_LIB=-lCGAL"
 else
-    echo surfaceFeatureExtract already has a Make folder
+    echo
+    echo "Compiling surfaceFeatureExtract without CGAL curvature support"
+    echo
+
+    wmake
 fi
 
 
diff --git a/applications/utilities/surface/surfaceFeatureExtract/CGALPolyhedron/buildCGALPolyhedron.C b/applications/utilities/surface/surfaceFeatureExtract/CGALPolyhedron/buildCGALPolyhedron.C
deleted file mode 100644
index 63e2b904bf..0000000000
--- a/applications/utilities/surface/surfaceFeatureExtract/CGALPolyhedron/buildCGALPolyhedron.C
+++ /dev/null
@@ -1,89 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "buildCGALPolyhedron.H"
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-Foam::buildCGALPolyhedron::buildCGALPolyhedron
-(
-    const Foam::triSurface& surf
-)
-:
-    CGAL::Modifier_base<HalfedgeDS>(),
-    surf_(surf)
-{}
-
-
-
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
-
-Foam::buildCGALPolyhedron::~buildCGALPolyhedron()
-{}
-
-
-// * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * * //
-
-void Foam::buildCGALPolyhedron::operator()
-(
-    HalfedgeDS& hds
-)
-{
-    typedef HalfedgeDS::Traits     Traits;
-    typedef Traits::Point_3        Point;
-
-    // Postcondition: `hds' is a valid polyhedral surface.
-    CGAL::Polyhedron_incremental_builder_3<HalfedgeDS> B(hds, false);
-
-    B.begin_surface
-    (
-        surf_.points().size(),      // n points
-        surf_.size(),               // n facets
-        2*surf_.edges().size()      // n halfedges
-    );
-
-    forAll(surf_.points(), pI)
-    {
-        const Foam::point& p = surf_.points()[pI];
-
-        B.add_vertex(Point(p.x(), p.y(), p.z()));
-    }
-
-    forAll(surf_, fI)
-    {
-        B.begin_facet();
-
-        B.add_vertex_to_facet(surf_[fI][0]);
-        B.add_vertex_to_facet(surf_[fI][1]);
-        B.add_vertex_to_facet(surf_[fI][2]);
-
-        B.end_facet();
-    }
-
-    B.end_surface();
-}
-
-
-// ************************************************************************* //
diff --git a/applications/utilities/surface/surfaceFeatureExtract/CGALPolyhedron/buildCGALPolyhedron.H b/applications/utilities/surface/surfaceFeatureExtract/CGALPolyhedron/buildCGALPolyhedron.H
index 3001a247d3..30627c7463 100644
--- a/applications/utilities/surface/surfaceFeatureExtract/CGALPolyhedron/buildCGALPolyhedron.H
+++ b/applications/utilities/surface/surfaceFeatureExtract/CGALPolyhedron/buildCGALPolyhedron.H
@@ -53,7 +53,7 @@ namespace Foam
 {
 
 /*---------------------------------------------------------------------------*\
-                     Class buildCGALPolyhedron Declaration
+                    Class buildCGALPolyhedron Declaration
 \*---------------------------------------------------------------------------*/
 
 class buildCGALPolyhedron
@@ -80,18 +80,56 @@ public:
     // Constructors
 
         //- Construct with reference to triSurface
-        buildCGALPolyhedron(const triSurface& surf);
+        explicit buildCGALPolyhedron(const triSurface& surf)
+        :
+            CGAL::Modifier_base<HalfedgeDS>(),
+            surf_(surf)
+        {}
 
 
     //- Destructor
-    ~buildCGALPolyhedron();
+    ~buildCGALPolyhedron(){}
 
 
     // Member Operators
 
         //- operator() of this `modifier' called by delegate function of
         //  Polyhedron
-        void operator()(HalfedgeDS& hds);
+        void operator()(HalfedgeDS& hds)
+        {
+            typedef HalfedgeDS::Traits     Traits;
+            typedef Traits::Point_3        Point;
+
+            // Postcondition: `hds' is a valid polyhedral surface.
+            CGAL::Polyhedron_incremental_builder_3<HalfedgeDS> B(hds, false);
+
+            B.begin_surface
+            (
+                surf_.points().size(),      // n points
+                surf_.size(),               // n facets
+                2*surf_.edges().size()      // n halfedges
+            );
+
+            forAll(surf_.points(), pI)
+            {
+                const Foam::point& p = surf_.points()[pI];
+
+                B.add_vertex(Point(p.x(), p.y(), p.z()));
+            }
+
+            forAll(surf_, fI)
+            {
+                B.begin_facet();
+
+                B.add_vertex_to_facet(surf_[fI][0]);
+                B.add_vertex_to_facet(surf_[fI][1]);
+                B.add_vertex_to_facet(surf_[fI][2]);
+
+                B.end_facet();
+            }
+
+            B.end_surface();
+        }
 };
 
 
diff --git a/applications/utilities/surface/surfaceFeatureExtract/Make/options b/applications/utilities/surface/surfaceFeatureExtract/Make/options
index b733d5fde9..b2e5dcf5f7 100644
--- a/applications/utilities/surface/surfaceFeatureExtract/Make/options
+++ b/applications/utilities/surface/surfaceFeatureExtract/Make/options
@@ -1,4 +1,11 @@
+include $(GENERAL_RULES)/CGAL
+
 EXE_INC = \
+    ${ENABLE_CURVATURE}\
+    ${EXE_FROUNDING_MATH} \
+    ${USE_F2C} \
+    ${CGAL_INC} \
+    -ICGALPolyhedron \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/edgeMesh/lnInclude \
@@ -7,6 +14,11 @@ EXE_INC = \
     -I$(LIB_SRC)/sampling/lnInclude
 
 EXE_LIBS = \
+    $(CGAL_LIBS) \
+    ${CGAL_LIBDIR} \
+    ${LAPACK_LIB} \
+    ${BLAS_LIB} \
+    ${CGAL_LIB} \
     -lmeshTools \
     -ledgeMesh \
     -ltriSurface \
diff --git a/applications/utilities/surface/surfaceFeatureExtract/MakeWithCGAL/files b/applications/utilities/surface/surfaceFeatureExtract/MakeWithCGAL/files
deleted file mode 100644
index 0c0f6f7966..0000000000
--- a/applications/utilities/surface/surfaceFeatureExtract/MakeWithCGAL/files
+++ /dev/null
@@ -1,4 +0,0 @@
-surfaceFeatureExtract.C
-CGALPolyhedron/buildCGALPolyhedron.C
-
-EXE = $(FOAM_APPBIN)/surfaceFeatureExtract
diff --git a/applications/utilities/surface/surfaceFeatureExtract/MakeWithCGAL/options b/applications/utilities/surface/surfaceFeatureExtract/MakeWithCGAL/options
deleted file mode 100644
index 60833572b7..0000000000
--- a/applications/utilities/surface/surfaceFeatureExtract/MakeWithCGAL/options
+++ /dev/null
@@ -1,29 +0,0 @@
-EXE_FROUNDING_MATH = -frounding-math
-EXE_NDEBUG = -DNDEBUG
-USE_F2C = -DCGAL_USE_F2C
-include $(GENERAL_RULES)/CGAL
-
-EXE_INC = \
-    -DENABLE_CURVATURE \
-    ${EXE_FROUNDING_MATH} \
-    ${EXE_NDEBUG} \
-    ${USE_F2C} \
-    ${CGAL_INC} \
-    -ICGALPolyhedron \
-    -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/meshTools/lnInclude \
-    -I$(LIB_SRC)/edgeMesh/lnInclude \
-    -I$(LIB_SRC)/triSurface/lnInclude \
-    -I$(LIB_SRC)/surfMesh/lnInclude \
-    -I$(LIB_SRC)/sampling/lnInclude
-
-EXE_LIBS = \
-    $(CGAL_LIBS) \
-    -L$(CGAL_ARCH_PATH)/lib \
-    -llapack \
-    -lblas \
-    -lCGAL \
-    -lmeshTools \
-    -ledgeMesh \
-    -ltriSurface \
-    -lsampling
diff --git a/applications/utilities/surface/surfaceFeatureExtract/MakeWithoutCGAL/files b/applications/utilities/surface/surfaceFeatureExtract/MakeWithoutCGAL/files
deleted file mode 100644
index a57125cd6a..0000000000
--- a/applications/utilities/surface/surfaceFeatureExtract/MakeWithoutCGAL/files
+++ /dev/null
@@ -1,3 +0,0 @@
-surfaceFeatureExtract.C
-
-EXE = $(FOAM_APPBIN)/surfaceFeatureExtract
diff --git a/applications/utilities/surface/surfaceFeatureExtract/MakeWithoutCGAL/options b/applications/utilities/surface/surfaceFeatureExtract/MakeWithoutCGAL/options
deleted file mode 100644
index b733d5fde9..0000000000
--- a/applications/utilities/surface/surfaceFeatureExtract/MakeWithoutCGAL/options
+++ /dev/null
@@ -1,13 +0,0 @@
-EXE_INC = \
-    -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/meshTools/lnInclude \
-    -I$(LIB_SRC)/edgeMesh/lnInclude \
-    -I$(LIB_SRC)/triSurface/lnInclude \
-    -I$(LIB_SRC)/surfMesh/lnInclude \
-    -I$(LIB_SRC)/sampling/lnInclude
-
-EXE_LIBS = \
-    -lmeshTools \
-    -ledgeMesh \
-    -ltriSurface \
-    -lsampling

From 73ec082aa7171e8a78ae2e1180bd1e15d6ffbce4 Mon Sep 17 00:00:00 2001
From: laurence <laurence>
Date: Tue, 20 Mar 2012 17:46:34 +0000
Subject: [PATCH 042/317] ENH: surfaceFeatureExtract: Use a dictionary instead
 of command line options

---
 .../surfaceFeatureExtract.C                   | 1297 +++++++++--------
 .../surfaceFeatureExtractDict                 |   86 ++
 2 files changed, 737 insertions(+), 646 deletions(-)
 create mode 100644 applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtractDict

diff --git a/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtract.C b/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtract.C
index c2baec519e..bf44c1cd77 100644
--- a/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtract.C
+++ b/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtract.C
@@ -74,30 +74,6 @@ scalarField calcCurvature(const triSurface& surf)
 
     // The rest of this function adapted from
     //     CGAL-3.7/examples/Jet_fitting_3/Mesh_estimation.cpp
-    // Licensed under CGAL-3.7/LICENSE.FREE_USE
-
-    // Copyright (c) 1996,1997,1998,1999,2000,2001,2002,2003,2004,2005,2006,2007
-    // Utrecht University (The Netherlands), ETH Zurich (Switzerland), Freie
-    // Universitaet Berlin (Germany), INRIA Sophia-Antipolis (France),
-    // Martin-Luther-University Halle-Wittenberg (Germany), Max-Planck-Institute
-    // Saarbruecken (Germany), RISC Linz (Austria), and Tel-Aviv University
-    // (Israel).  All rights reserved.
-
-    // Permission is hereby granted, free of charge, to any person obtaining a
-    // copy of this software and associated documentation files (the
-    // "Software"), to deal in the Software without restriction, including
-    // without limitation the rights to use, copy, modify, merge, publish,
-    // distribute, sublicense, and/or sell copies of the Software, and to permit
-    // persons to whom the Software is furnished to do so, subject to the
-    // following conditions:
-
-    // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-    // OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-    // MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-    // IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-    // CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT
-    // OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
-    // THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
      //Vertex property map, with std::map
     typedef std::map<Vertex*, int> Vertex2int_map_type;
@@ -503,358 +479,344 @@ int main(int argc, char *argv[])
         "extract and write surface features to file"
     );
     argList::noParallel();
-    argList::validArgs.append("surface");
-    argList::validArgs.append("output set");
 
     argList::addOption
     (
-        "includedAngle",
-        "degrees",
-        "construct feature set from included angle [0..180]"
+        "dict",
+        "word",
+        "name of dictionary to provide feature extraction information"
     );
-    argList::addOption
-    (
-        "set",
-        "name",
-        "use existing feature set from file"
-    );
-    argList::addOption
-    (
-        "minLen",
-        "scalar",
-        "remove features shorter than the specified cumulative length"
-    );
-    argList::addOption
-    (
-        "minElem",
-        "int",
-        "remove features with fewer than the specified number of edges"
-    );
-    argList::addOption
-    (
-        "subsetBox",
-        "((x0 y0 z0)(x1 y1 z1))",
-        "remove edges outside specified bounding box"
-    );
-    argList::addOption
-    (
-        "deleteBox",
-        "((x0 y0 z0)(x1 y1 z1))",
-        "remove edges within specified bounding box"
-    );
-    argList::addBoolOption
-    (
-        "writeObj",
-        "write extendedFeatureEdgeMesh obj files"
-    );
-    argList::addBoolOption
-    (
-        "writeVTK",
-        "write extendedFeatureEdgeMesh vtk files"
-    );
-    argList::addBoolOption
-    (
-        "closeness",
-        "span to look for surface closeness"
-    );
-    argList::addOption
-    (
-        "featureProximity",
-        "scalar",
-        "distance to look for close features"
-    );
-    argList::addBoolOption
-    (
-        "writeVTK",
-        "write surface property VTK files"
-    );
-    argList::addBoolOption
-    (
-        "manifoldEdgesOnly",
-        "remove any non-manifold (open or more than two connected faces) edges"
-    );
-    argList::addOption
-    (
-        "plane",
-        "(nx ny nz)(z0 y0 z0)",
-        "use a plane to create feature edges for 2D meshing"
-    );
-
-#   ifdef ENABLE_CURVATURE
-    argList::addBoolOption
-    (
-        "curvature",
-        "calculate curvature and closeness fields"
-    );
-#   endif
-
 
 #   include "setRootCase.H"
 #   include "createTime.H"
 
-    bool writeVTK = args.optionFound("writeVTK");
-
-    bool writeObj = args.optionFound("writeObj");
-
-    bool curvature = args.optionFound("curvature");
-
-    if (curvature && env("FOAM_SIGFPE"))
-    {
-        WarningIn(args.executable())
-            << "Detected floating point exception trapping (FOAM_SIGFPE)."
-            << " This might give" << nl
-            << "    problems when calculating curvature on straight angles"
-            << " (infinite curvature)" << nl
-            << "    Switch it off in case of problems." << endl;
-    }
-
-
-    Info<< "Feature line extraction is only valid on closed manifold surfaces."
-        << endl;
-
-    const fileName surfFileName = args[1];
-    const fileName outFileName  = args[2];
-
-    Info<< "Surface            : " << surfFileName << nl
-        << "Output feature set : " << outFileName << nl
-        << endl;
-
-    fileName sFeatFileName = surfFileName.lessExt().name();
-
-
-    // Read
-    // ~~~~
-
-    triSurface surf(surfFileName);
-
-    Info<< "Statistics:" << endl;
-    surf.writeStats(Info);
-    Info<< endl;
-
-    faceList faces(surf.size());
-
-    forAll(surf, fI)
-    {
-        faces[fI] = surf[fI].triFaceFace();
-    }
-
-    // Either construct features from surface&featureangle or read set.
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-    surfaceFeatures set(surf);
-
-    if (args.optionFound("set"))
-    {
-        const fileName setName = args["set"];
-
-        Info<< "Reading existing feature set from file " << setName << endl;
-
-        set = surfaceFeatures(surf, setName);
-    }
-    else if (args.optionFound("includedAngle"))
-    {
-        const scalar includedAngle = args.optionRead<scalar>("includedAngle");
-
-        Info<< "Constructing feature set from included angle " << includedAngle
-            << endl;
-
-        set = surfaceFeatures(surf, includedAngle);
-
-        // Info<< nl << "Writing initial features" << endl;
-        // set.write("initial.fSet");
-        // set.writeObj("initial");
-    }
-    else
-    {
-        FatalErrorIn(args.executable())
-            << "No initial feature set. Provide either one"
-            << " of -set (to read existing set)" << nl
-            << " or -includedAngle (to new set construct from angle)"
-            << exit(FatalError);
-    }
-
-    Info<< nl
-        << "Initial feature set:" << nl
-        << "    feature points : " << set.featurePoints().size() << nl
-        << "    feature edges  : " << set.featureEdges().size() << nl
-        << "    of which" << nl
-        << "        region edges   : " << set.nRegionEdges() << nl
-        << "        external edges : " << set.nExternalEdges() << nl
-        << "        internal edges : " << set.nInternalEdges() << nl
-        << endl;
-
-
-    // Trim set
-    // ~~~~~~~~
-
-    scalar minLen = -GREAT;
-    if (args.optionReadIfPresent("minLen", minLen))
-    {
-        Info<< "Removing features of length < " << minLen << endl;
-    }
-
-    label minElem = 0;
-    if (args.optionReadIfPresent("minElem", minElem))
-    {
-        Info<< "Removing features with number of edges < " << minElem << endl;
-    }
-
-    // Trim away small groups of features
-    if (minElem > 0 || minLen > 0)
-    {
-        set.trimFeatures(minLen, minElem);
-        Info<< endl << "Removed small features" << endl;
-    }
-
-
-    // Subset
-    // ~~~~~~
-
-    // Convert to marked edges, points
-    List<surfaceFeatures::edgeStatus> edgeStat(set.toStatus());
-
-    if (args.optionFound("subsetBox"))
-    {
-        treeBoundBox bb
-        (
-            args.optionLookup("subsetBox")()
-        );
-
-        Info<< "Removing all edges outside bb " << bb << endl;
-        dumpBox(bb, "subsetBox.obj");
-
-        deleteBox
-        (
-            surf,
-            bb,
-            false,
-            edgeStat
-        );
-    }
-    else if (args.optionFound("deleteBox"))
-    {
-        treeBoundBox bb
-        (
-            args.optionLookup("deleteBox")()
-        );
-
-        Info<< "Removing all edges inside bb " << bb << endl;
-        dumpBox(bb, "deleteBox.obj");
-
-        deleteBox
-        (
-            surf,
-            bb,
-            true,
-            edgeStat
-        );
-    }
-
-    if (args.optionFound("manifoldEdgesOnly"))
-    {
-        Info<< "Removing all non-manifold edges" << endl;
-
-        forAll(edgeStat, edgeI)
-        {
-            if (surf.edgeFaces()[edgeI].size() != 2)
-            {
-                edgeStat[edgeI] = surfaceFeatures::NONE;
-            }
-        }
-    }
-
-    if (args.optionFound("plane"))
-    {
-        plane cutPlane(args.optionLookup("plane")());
-
-        deleteEdges
-        (
-            surf,
-            cutPlane,
-            edgeStat
-        );
-
-        Info<< "Only edges that intersect the plane with normal "
-            << cutPlane.normal() << " and base point " << cutPlane.refPoint()
-            << " will be included as feature edges."<< endl;
-    }
-
-
-    surfaceFeatures newSet(surf);
-    newSet.setFromStatus(edgeStat);
-
-    //Info<< endl << "Writing trimmed features to " << outFileName << endl;
-    //newSet.write(outFileName);
-
-    // Info<< endl << "Writing edge objs." << endl;
-    // newSet.writeObj("final");
-
-    Info<< nl
-        << "Final feature set:" << nl
-        << "    feature points : " << newSet.featurePoints().size() << nl
-        << "    feature edges  : " << newSet.featureEdges().size() << nl
-        << "    of which" << nl
-        << "        region edges   : " << newSet.nRegionEdges() << nl
-        << "        external edges : " << newSet.nExternalEdges() << nl
-        << "        internal edges : " << newSet.nInternalEdges() << nl
-        << endl;
-
-    // Extracting and writing a extendedFeatureEdgeMesh
-    extendedFeatureEdgeMesh feMesh
+    word dictName
     (
-        newSet,
-        runTime,
-        sFeatFileName + ".extendedFeatureEdgeMesh"
+        args.optionLookupOrDefault<word>("dict", "surfaceFeatureExtractDict")
     );
 
-    Info<< nl << "Writing extendedFeatureEdgeMesh to " << feMesh.objectPath()
-        << endl;
+    Info<< "Reading " << dictName << nl << endl;
 
-    if (writeObj)
-    {
-        feMesh.writeObj(surfFileName.lessExt().name());
-    }
-
-    feMesh.write();
-
-    // Write a featureEdgeMesh for backwards compatibility
-    {
-        featureEdgeMesh bfeMesh
-        (
-            IOobject
-            (
-                surfFileName.lessExt().name() + ".eMesh",   // name
-                runTime.constant(), // instance
-                "triSurface",
-                runTime,            // registry
-                IOobject::NO_READ,
-                IOobject::AUTO_WRITE,
-                false
-            ),
-            feMesh.points(),
-            feMesh.edges()
-        );
-
-        Info<< nl << "Writing featureEdgeMesh to "
-            << bfeMesh.objectPath() << endl;
-
-        bfeMesh.regIOobject::write();
-    }
-
-    triSurfaceMesh searchSurf
+    IOdictionary dict
     (
         IOobject
         (
-            sFeatFileName + ".closeness",
-            runTime.constant(),
-            "triSurface",
+            dictName,
+            runTime.system(),
             runTime,
-            IOobject::NO_READ,
-            IOobject::NO_WRITE
-        ),
-        surf
+            IOobject::MUST_READ,
+            IOobject::NO_WRITE,
+            false
+        )
     );
 
+    forAllConstIter(dictionary, dict, iter)
+    {
+        dictionary surfaceDict = dict.subDict(iter().keyword());
+
+        const fileName surfFileName = iter().keyword();
+        const fileName sFeatFileName = surfFileName.lessExt().name();
+
+        Info<< "Surface            : " << surfFileName << nl << endl;
+
+        const Switch writeVTK =
+            surfaceDict.lookupOrAddDefault<Switch>("writeVTK", "off");
+        const Switch writeObj =
+            surfaceDict.lookupOrAddDefault<Switch>("writeObj", "off");
+        const Switch writeFeatureEdgeMesh =
+            surfaceDict.lookupOrAddDefault<Switch>
+            (
+                "writeFeatureEdgeMesh",
+                "off"
+            );
+
+        const Switch curvature =
+            surfaceDict.lookupOrAddDefault<Switch>("curvature", "off");
+        const Switch featureProximity =
+            surfaceDict.lookupOrAddDefault<Switch>("featureProximity", "off");
+        const Switch closeness =
+            surfaceDict.lookupOrAddDefault<Switch>("closeness", "off");
+
+        const word extractionMethod = surfaceDict.lookup("extractionMethod");
+
+
+#ifndef ENABLE_CURVATURE
+        if (curvature)
+        {
+            WarningIn(args.executable())
+                << "Curvature calculation has been requested but "
+                << args.executable() << " has not " << nl
+                << "    been compiled with CGAL. "
+                << "Skipping the curvature calculation." << endl;
+        }
+#else
+        if (curvature && env("FOAM_SIGFPE"))
+        {
+            WarningIn(args.executable())
+                << "Detected floating point exception trapping (FOAM_SIGFPE)."
+                << " This might give" << nl
+                << "    problems when calculating curvature on straight angles"
+                << " (infinite curvature)" << nl
+                << "    Switch it off in case of problems." << endl;
+        }
+#endif
+
+
+        Info<< nl << "Feature line extraction is only valid on closed manifold "
+            << "surfaces." << endl;
+
+        // Read
+        // ~~~~
+
+        triSurface surf("constant/triSurface/" + surfFileName);
+
+        Info<< "Statistics:" << endl;
+        surf.writeStats(Info);
+        Info<< endl;
+
+        faceList faces(surf.size());
+
+        forAll(surf, fI)
+        {
+            faces[fI] = surf[fI].triFaceFace();
+        }
+
+
+        // Either construct features from surface & featureAngle or read set.
+        // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+        surfaceFeatures set(surf);
+
+        if (extractionMethod == "extractFromFile")
+        {
+            const fileName featureEdgeFile =
+                surfaceDict.subDict("extractFromFile").lookup
+                (
+                    "featureEdgeFile"
+                );
+
+            edgeMesh eMesh(featureEdgeFile);
+
+            // Sometimes duplicate edges are present. Remove them.
+            eMesh.mergeEdges();
+
+            Info<< nl << "Reading existing feature edges from file "
+                << featureEdgeFile << endl;
+
+            set = surfaceFeatures(surf, eMesh.points(), eMesh.edges());
+        }
+        else if (extractionMethod == "extractFromSurface")
+        {
+            const scalar includedAngle =
+                readScalar
+                (
+                    surfaceDict.subDict("extractFromSurface").lookup
+                    (
+                        "includedAngle"
+                    )
+                );
+
+            Info<< nl << "Constructing feature set from included angle "
+                << includedAngle << endl;
+
+            set = surfaceFeatures(surf, includedAngle);
+        }
+        else
+        {
+            FatalErrorIn(args.executable())
+                << "No initial feature set. Provide either one"
+                << " of extractFromFile (to read existing set)" << nl
+                << " or extractFromSurface (to construct new set from angle)"
+                << exit(FatalError);
+        }
+
+        Info<< nl
+            << "Initial feature set:" << nl
+            << "    feature points : " << set.featurePoints().size() << nl
+            << "    feature edges  : " << set.featureEdges().size() << nl
+            << "    of which" << nl
+            << "        region edges   : " << set.nRegionEdges() << nl
+            << "        external edges : " << set.nExternalEdges() << nl
+            << "        internal edges : " << set.nInternalEdges() << nl
+            << endl;
+
+
+        // Trim set
+        // ~~~~~~~~
+
+        if (surfaceDict.isDict("trimFeatures"))
+        {
+            dictionary trimDict = surfaceDict.subDict("trimFeatures");
+
+            scalar minLen =
+                trimDict.lookupOrAddDefault<scalar>("minLen", -GREAT);
+
+            label minElem = trimDict.lookupOrAddDefault<label>("minElem", 0);
+
+            // Trim away small groups of features
+            if (minElem > 0 || minLen > 0)
+            {
+                Info<< "Removing features of length < "
+                    << minLen << endl;
+                Info<< "Removing features with number of edges < "
+                    << minElem << endl;
+
+                set.trimFeatures(minLen, minElem);
+            }
+        }
+
+
+        // Subset
+        // ~~~~~~
+
+        // Convert to marked edges, points
+        List<surfaceFeatures::edgeStatus> edgeStat(set.toStatus());
+
+        if (surfaceDict.isDict("subsetFeatures"))
+        {
+            dictionary subsetDict = surfaceDict.subDict("subsetFeatures");
+
+            if (subsetDict.found("insideBox"))
+            {
+                treeBoundBox bb(subsetDict.lookup("insideBox")());
+
+                Info<< "Removing all edges outside bb " << bb << endl;
+                dumpBox(bb, "subsetBox.obj");
+
+                deleteBox
+                (
+                    surf,
+                    bb,
+                    false,
+                    edgeStat
+                );
+            }
+            else if (subsetDict.found("outsideBox"))
+            {
+                treeBoundBox bb(subsetDict.lookup("outsideBox")());
+
+                Info<< "Removing all edges inside bb " << bb << endl;
+                dumpBox(bb, "deleteBox.obj");
+
+                deleteBox
+                (
+                    surf,
+                    bb,
+                    true,
+                    edgeStat
+                );
+            }
+
+            const Switch manifoldEdges =
+                subsetDict.lookupOrAddDefault<Switch>("manifoldEdges", "no");
+
+            if (manifoldEdges)
+            {
+                Info<< "Removing all non-manifold edges" << endl;
+
+                forAll(edgeStat, edgeI)
+                {
+                    if (surf.edgeFaces()[edgeI].size() != 2)
+                    {
+                        edgeStat[edgeI] = surfaceFeatures::NONE;
+                    }
+                }
+            }
+
+            if (subsetDict.found("plane"))
+            {
+                plane cutPlane(subsetDict.lookup("plane")());
+
+                deleteEdges
+                (
+                    surf,
+                    cutPlane,
+                    edgeStat
+                );
+
+                Info<< "Only edges that intersect the plane with normal "
+                    << cutPlane.normal()
+                    << " and base point " << cutPlane.refPoint()
+                    << " will be included as feature edges."<< endl;
+            }
+        }
+
+
+        surfaceFeatures newSet(surf);
+        newSet.setFromStatus(edgeStat);
+
+        if (writeObj)
+        {
+            newSet.writeObj("final");
+        }
+
+        Info<< nl
+            << "Final feature set after trimming and subsetting:" << nl
+            << "    feature points : " << newSet.featurePoints().size() << nl
+            << "    feature edges  : " << newSet.featureEdges().size() << nl
+            << "    of which" << nl
+            << "        region edges   : " << newSet.nRegionEdges() << nl
+            << "        external edges : " << newSet.nExternalEdges() << nl
+            << "        internal edges : " << newSet.nInternalEdges() << nl
+            << endl;
+
+        // Extracting and writing a extendedFeatureEdgeMesh
+        extendedFeatureEdgeMesh feMesh
+        (
+            newSet,
+            runTime,
+            sFeatFileName + ".extendedFeatureEdgeMesh"
+        );
+
+        Info<< nl << "Writing extendedFeatureEdgeMesh to "
+            << feMesh.objectPath() << endl;
+
+        if (writeObj)
+        {
+            feMesh.writeObj(surfFileName.lessExt().name());
+        }
+
+        feMesh.write();
+
+        // Write a featureEdgeMesh for backwards compatibility
+        if (writeFeatureEdgeMesh)
+        {
+            featureEdgeMesh bfeMesh
+            (
+                IOobject
+                (
+                    surfFileName.lessExt().name() + ".eMesh",   // name
+                    runTime.constant(),                         // instance
+                    "triSurface",
+                    runTime,                                    // registry
+                    IOobject::NO_READ,
+                    IOobject::AUTO_WRITE,
+                    false
+                ),
+                feMesh.points(),
+                feMesh.edges()
+            );
+
+            Info<< nl << "Writing featureEdgeMesh to "
+                << bfeMesh.objectPath() << endl;
+
+            bfeMesh.regIOobject::write();
+        }
+
+        triSurfaceMesh searchSurf
+        (
+            IOobject
+            (
+                sFeatFileName + ".closeness",
+                runTime.constant(),
+                "triSurface",
+                runTime,
+                IOobject::NO_READ,
+                IOobject::NO_WRITE
+            ),
+            surf
+        );
+
     // Find close features
 
     // // Dummy trim operation to mark features
@@ -922,72 +884,59 @@ int main(int argc, char *argv[])
     //     )
     // );
 
-    if (args.optionFound("closeness"))
-    {
-        Info<< nl << "Extracting internal and external closeness of surface."
-            << endl;
-
-        // Internal and external closeness
-
-        // Prepare start and end points for intersection tests
-
-        const vectorField& normals = searchSurf.faceNormals();
-
-        scalar span = searchSurf.bounds().mag();
-
-        //args.optionReadIfPresent("closeness", span);
-
-        scalar externalAngleTolerance = 10;
-        scalar externalToleranceCosAngle = Foam::cos
-        (
-            degToRad(180 - externalAngleTolerance)
-        );
-
-        scalar internalAngleTolerance = 45;
-        scalar internalToleranceCosAngle = Foam::cos
-        (
-            degToRad(180 - internalAngleTolerance)
-        );
-
-        Info<< "externalToleranceCosAngle: " << externalToleranceCosAngle << nl
-            << "internalToleranceCosAngle: " << internalToleranceCosAngle
-            << endl;
-
-        // Info<< "span " << span << endl;
-
-        pointField start = searchSurf.faceCentres() - span*normals;
-        pointField end = searchSurf.faceCentres() + span*normals;
-        const pointField& faceCentres = searchSurf.faceCentres();
-
-        List<List<pointIndexHit> > allHitInfo;
-
-        // Find all intersections (in order)
-        searchSurf.findLineAll(start, end, allHitInfo);
-
-        scalarField internalCloseness(start.size(), GREAT);
-        scalarField externalCloseness(start.size(), GREAT);
-
-        forAll(allHitInfo, fI)
+        if (closeness)
         {
-            const List<pointIndexHit>& hitInfo = allHitInfo[fI];
+            Info<< nl << "Extracting internal and external closeness of "
+                << "surface." << endl;
 
-            if (hitInfo.size() < 1)
-            {
-                drawHitProblem(fI, surf, start, faceCentres, end, hitInfo);
+            // Internal and external closeness
 
-                // FatalErrorIn(args.executable())
-                //     << "findLineAll did not hit its own face."
-                //     << exit(FatalError);
-            }
-            else if (hitInfo.size() == 1)
+            // Prepare start and end points for intersection tests
+
+            const vectorField& normals = searchSurf.faceNormals();
+
+            scalar span = searchSurf.bounds().mag();
+
+            //args.optionReadIfPresent("closeness", span);
+
+            scalar externalAngleTolerance = 10;
+            scalar externalToleranceCosAngle =
+                Foam::cos
+                (
+                    degToRad(180 - externalAngleTolerance)
+                );
+
+            scalar internalAngleTolerance = 45;
+            scalar internalToleranceCosAngle =
+                Foam::cos
+                (
+                    degToRad(180 - internalAngleTolerance)
+                );
+
+            Info<< "externalToleranceCosAngle: " << externalToleranceCosAngle
+                << nl
+                << "internalToleranceCosAngle: " << internalToleranceCosAngle
+                << endl;
+
+            // Info<< "span " << span << endl;
+
+            pointField start = searchSurf.faceCentres() - span*normals;
+            pointField end = searchSurf.faceCentres() + span*normals;
+            const pointField& faceCentres = searchSurf.faceCentres();
+
+            List<List<pointIndexHit> > allHitInfo;
+
+            // Find all intersections (in order)
+            searchSurf.findLineAll(start, end, allHitInfo);
+
+            scalarField internalCloseness(start.size(), GREAT);
+            scalarField externalCloseness(start.size(), GREAT);
+
+            forAll(allHitInfo, fI)
             {
-                if (!hitInfo[0].hit())
-                {
-                    // FatalErrorIn(args.executable())
-                    //     << "findLineAll did not hit any face."
-                    //     << exit(FatalError);
-                }
-                else if (hitInfo[0].index() != fI)
+                const List<pointIndexHit>& hitInfo = allHitInfo[fI];
+
+                if (hitInfo.size() < 1)
                 {
                     drawHitProblem(fI, surf, start, faceCentres, end, hitInfo);
 
@@ -995,283 +944,339 @@ int main(int argc, char *argv[])
                     //     << "findLineAll did not hit its own face."
                     //     << exit(FatalError);
                 }
-            }
-            else
-            {
-                label ownHitI = -1;
-
-                forAll(hitInfo, hI)
+                else if (hitInfo.size() == 1)
                 {
-                    // Find the hit on the triangle that launched the ray
-
-                    if (hitInfo[hI].index() == fI)
+                    if (!hitInfo[0].hit())
                     {
-                        ownHitI = hI;
-
-                        break;
+                        // FatalErrorIn(args.executable())
+                        //     << "findLineAll did not hit any face."
+                        //     << exit(FatalError);
                     }
-                }
-
-                if (ownHitI < 0)
-                {
-                    drawHitProblem(fI, surf, start, faceCentres, end, hitInfo);
-
-                    // FatalErrorIn(args.executable())
-                    //     << "findLineAll did not hit its own face."
-                    //     << exit(FatalError);
-                }
-                else if (ownHitI == 0)
-                {
-                    // There are no internal hits, the first hit is the closest
-                    // external hit
-
-                    if
-                    (
-                        (normals[fI] & normals[hitInfo[ownHitI + 1].index()])
-                      < externalToleranceCosAngle
-                    )
+                    else if (hitInfo[0].index() != fI)
                     {
-                        externalCloseness[fI] = mag
+                        drawHitProblem
                         (
-                            faceCentres[fI] - hitInfo[ownHitI + 1].hitPoint()
+                            fI,
+                            surf,
+                            start,
+                            faceCentres,
+                            end,
+                            hitInfo
                         );
-                    }
-                }
-                else if (ownHitI == hitInfo.size() - 1)
-                {
-                    // There are no external hits, the last but one hit is the
-                    // closest internal hit
 
-                    if
-                    (
-                        (normals[fI] & normals[hitInfo[ownHitI - 1].index()])
-                      < internalToleranceCosAngle
-                    )
-                    {
-                        internalCloseness[fI] = mag
-                        (
-                            faceCentres[fI] - hitInfo[ownHitI - 1].hitPoint()
-                        );
+                        // FatalErrorIn(args.executable())
+                        //     << "findLineAll did not hit its own face."
+                        //     << exit(FatalError);
                     }
                 }
                 else
                 {
-                    if
-                    (
-                        (normals[fI] & normals[hitInfo[ownHitI + 1].index()])
-                      < externalToleranceCosAngle
-                    )
+                    label ownHitI = -1;
+
+                    forAll(hitInfo, hI)
                     {
-                        externalCloseness[fI] = mag
-                        (
-                            faceCentres[fI] - hitInfo[ownHitI + 1].hitPoint()
-                        );
+                        // Find the hit on the triangle that launched the ray
+
+                        if (hitInfo[hI].index() == fI)
+                        {
+                            ownHitI = hI;
+
+                            break;
+                        }
                     }
 
-                    if
-                    (
-                        (normals[fI] & normals[hitInfo[ownHitI - 1].index()])
-                      < internalToleranceCosAngle
-                    )
+                    if (ownHitI < 0)
                     {
-                        internalCloseness[fI] = mag
+                        drawHitProblem
                         (
-                            faceCentres[fI] - hitInfo[ownHitI - 1].hitPoint()
+                            fI,
+                            surf,
+                            start,
+                            faceCentres,
+                            end,
+                            hitInfo
                         );
+
+                        // FatalErrorIn(args.executable())
+                        //     << "findLineAll did not hit its own face."
+                        //     << exit(FatalError);
+                    }
+                    else if (ownHitI == 0)
+                    {
+                        // There are no internal hits, the first hit is the
+                        // closest external hit
+
+                        if
+                        (
+                            (
+                                normals[fI]
+                              & normals[hitInfo[ownHitI + 1].index()]
+                            )
+                          < externalToleranceCosAngle
+                        )
+                        {
+                            externalCloseness[fI] =
+                                mag
+                                (
+                                    faceCentres[fI]
+                                  - hitInfo[ownHitI + 1].hitPoint()
+                                );
+                        }
+                    }
+                    else if (ownHitI == hitInfo.size() - 1)
+                    {
+                        // There are no external hits, the last but one hit is
+                        // the closest internal hit
+
+                        if
+                        (
+                            (
+                                normals[fI]
+                              & normals[hitInfo[ownHitI - 1].index()]
+                            )
+                          < internalToleranceCosAngle
+                        )
+                        {
+                            internalCloseness[fI] =
+                                mag
+                                (
+                                    faceCentres[fI]
+                                  - hitInfo[ownHitI - 1].hitPoint()
+                                );
+                        }
+                    }
+                    else
+                    {
+                        if
+                        (
+                            (
+                                normals[fI]
+                              & normals[hitInfo[ownHitI + 1].index()]
+                            )
+                          < externalToleranceCosAngle
+                        )
+                        {
+                            externalCloseness[fI] =
+                                mag
+                                (
+                                    faceCentres[fI]
+                                  - hitInfo[ownHitI + 1].hitPoint()
+                                );
+                        }
+
+                        if
+                        (
+                            (
+                                normals[fI]
+                              & normals[hitInfo[ownHitI - 1].index()]
+                            )
+                          < internalToleranceCosAngle
+                        )
+                        {
+                            internalCloseness[fI] =
+                                mag
+                                (
+                                    faceCentres[fI]
+                                  - hitInfo[ownHitI - 1].hitPoint()
+                                );
+                        }
                     }
                 }
             }
-        }
 
-        triSurfaceScalarField internalClosenessField
-        (
-            IOobject
+            triSurfaceScalarField internalClosenessField
             (
-                sFeatFileName + ".internalCloseness",
-                runTime.constant(),
-                "triSurface",
-                runTime,
-                IOobject::NO_READ,
-                IOobject::NO_WRITE
-            ),
-            surf,
-            dimLength,
-            internalCloseness
-        );
-
-        internalClosenessField.write();
-
-        triSurfaceScalarField externalClosenessField
-        (
-            IOobject
-            (
-                sFeatFileName + ".externalCloseness",
-                runTime.constant(),
-                "triSurface",
-                runTime,
-                IOobject::NO_READ,
-                IOobject::NO_WRITE
-            ),
-            surf,
-            dimLength,
-            externalCloseness
-        );
-
-        externalClosenessField.write();
-
-        if (writeVTK)
-        {
-            vtkSurfaceWriter().write
-            (
-                runTime.constant()/"triSurface",    // outputDir
-                sFeatFileName,                      // surfaceName
-                surf.points(),
-                faces,
-                "internalCloseness",                // fieldName
-                internalCloseness,
-                false,                              // isNodeValues
-                true                                // verbose
+                IOobject
+                (
+                    sFeatFileName + ".internalCloseness",
+                    runTime.constant(),
+                    "triSurface",
+                    runTime,
+                    IOobject::NO_READ,
+                    IOobject::NO_WRITE
+                ),
+                surf,
+                dimLength,
+                internalCloseness
             );
 
-            vtkSurfaceWriter().write
+            internalClosenessField.write();
+
+            triSurfaceScalarField externalClosenessField
             (
-                runTime.constant()/"triSurface",    // outputDir
-                sFeatFileName,                      // surfaceName
-                surf.points(),
-                faces,
-                "externalCloseness",                // fieldName
-                externalCloseness,
-                false,                              // isNodeValues
-                true                                // verbose
+                IOobject
+                (
+                    sFeatFileName + ".externalCloseness",
+                    runTime.constant(),
+                    "triSurface",
+                    runTime,
+                    IOobject::NO_READ,
+                    IOobject::NO_WRITE
+                ),
+                surf,
+                dimLength,
+                externalCloseness
             );
+
+            externalClosenessField.write();
+
+            if (writeVTK)
+            {
+                vtkSurfaceWriter().write
+                (
+                    runTime.constant()/"triSurface",    // outputDir
+                    sFeatFileName,                      // surfaceName
+                    surf.points(),
+                    faces,
+                    "internalCloseness",                // fieldName
+                    internalCloseness,
+                    false,                              // isNodeValues
+                    true                                // verbose
+                );
+
+                vtkSurfaceWriter().write
+                (
+                    runTime.constant()/"triSurface",    // outputDir
+                    sFeatFileName,                      // surfaceName
+                    surf.points(),
+                    faces,
+                    "externalCloseness",                // fieldName
+                    externalCloseness,
+                    false,                              // isNodeValues
+                    true                                // verbose
+                );
+            }
         }
-    }
 
 
 #ifdef ENABLE_CURVATURE
-    if (args.optionFound("curvature"))
-    {
-        Info<< nl << "Extracting curvature of surface at the points." << endl;
+        if (curvature)
+        {
+            Info<< nl << "Extracting curvature of surface at the points."
+                << endl;
 
-        scalarField k = calcCurvature(surf);
+            scalarField k = calcCurvature(surf);
 
         // Modify the curvature values on feature edges and points to be zero.
 
-    //    forAll(newSet.featureEdges(), fEI)
-    //    {
-    //        const edge& e = surf.edges()[newSet.featureEdges()[fEI]];
-    //
-    //        k[surf.meshPoints()[e.start()]] = 0.0;
-    //        k[surf.meshPoints()[e.end()]] = 0.0;
-    //    }
+        //    forAll(newSet.featureEdges(), fEI)
+        //    {
+        //        const edge& e = surf.edges()[newSet.featureEdges()[fEI]];
+        //
+        //        k[surf.meshPoints()[e.start()]] = 0.0;
+        //        k[surf.meshPoints()[e.end()]] = 0.0;
+        //    }
 
-        triSurfacePointScalarField kField
-        (
-            IOobject
+            triSurfacePointScalarField kField
             (
-                sFeatFileName + ".curvature",
-                runTime.constant(),
-                "triSurface",
-                runTime,
-                IOobject::NO_READ,
-                IOobject::NO_WRITE
-            ),
-            surf,
-            dimLength,
-            k
-        );
-
-        kField.write();
-
-        if (writeVTK)
-        {
-            vtkSurfaceWriter().write
-            (
-                runTime.constant()/"triSurface",    // outputDir
-                sFeatFileName,                      // surfaceName
-                surf.points(),
-                faces,
-                "curvature",                        // fieldName
-                k,
-                true,                               // isNodeValues
-                true                                // verbose
+                IOobject
+                (
+                    sFeatFileName + ".curvature",
+                    runTime.constant(),
+                    "triSurface",
+                    runTime,
+                    IOobject::NO_READ,
+                    IOobject::NO_WRITE
+                ),
+                surf,
+                dimLength,
+                k
             );
+
+            kField.write();
+
+            if (writeVTK)
+            {
+                vtkSurfaceWriter().write
+                (
+                    runTime.constant()/"triSurface",    // outputDir
+                    sFeatFileName,                      // surfaceName
+                    surf.points(),
+                    faces,
+                    "curvature",                        // fieldName
+                    k,
+                    true,                               // isNodeValues
+                    true                                // verbose
+                );
+            }
         }
-    }
 #endif
 
 
-    if (args.optionFound("featureProximity"))
-    {
-        Info<< nl << "Extracting proximity of close feature points and edges "
-            << "to the surface" << endl;
-
-        const scalar searchDistance =
-            args.optionRead<scalar>("featureProximity");
-
-        const scalar radiusSqr = sqr(searchDistance);
-
-        scalarField featureProximity(surf.size(), searchDistance);
-
-        forAll(surf, fI)
+        if (featureProximity)
         {
-            const triPointRef& tri = surf[fI].tri(surf.points());
-            const point& triCentre = tri.circumCentre();
+            Info<< nl << "Extracting proximity of close feature points and "
+                << "edges to the surface" << endl;
 
-            List<pointIndexHit> hitList;
+            const scalar searchDistance =
+                readScalar(surfaceDict.lookup("maxFeatureProximity"));
 
-            feMesh.allNearestFeatureEdges(triCentre, radiusSqr, hitList);
+            const scalar radiusSqr = sqr(searchDistance);
 
-            featureProximity[fI] =
-                calcProximityOfFeatureEdges
-                (
-                    feMesh,
-                    hitList,
-                    featureProximity[fI]
-                );
+            scalarField featureProximity(surf.size(), searchDistance);
 
-            feMesh.allNearestFeaturePoints(triCentre, radiusSqr, hitList);
+            forAll(surf, fI)
+            {
+                const triPointRef& tri = surf[fI].tri(surf.points());
+                const point& triCentre = tri.circumCentre();
 
-            featureProximity[fI] =
-                calcProximityOfFeaturePoints
-                (
-                    hitList,
-                    featureProximity[fI]
-                );
-        }
+                List<pointIndexHit> hitList;
 
-        triSurfaceScalarField featureProximityField
-        (
-            IOobject
+                feMesh.allNearestFeatureEdges(triCentre, radiusSqr, hitList);
+
+                featureProximity[fI] =
+                    calcProximityOfFeatureEdges
+                    (
+                        feMesh,
+                        hitList,
+                        featureProximity[fI]
+                    );
+
+                feMesh.allNearestFeaturePoints(triCentre, radiusSqr, hitList);
+
+                featureProximity[fI] =
+                    calcProximityOfFeaturePoints
+                    (
+                        hitList,
+                        featureProximity[fI]
+                    );
+            }
+
+            triSurfaceScalarField featureProximityField
             (
-                sFeatFileName + ".featureProximity",
-                runTime.constant(),
-                "triSurface",
-                runTime,
-                IOobject::NO_READ,
-                IOobject::NO_WRITE
-            ),
-            surf,
-            dimLength,
-            featureProximity
-        );
-
-        featureProximityField.write();
-
-        if (writeVTK)
-        {
-            vtkSurfaceWriter().write
-            (
-                runTime.constant()/"triSurface",    // outputDir
-                sFeatFileName,                      // surfaceName
-                surf.points(),
-                faces,
-                "featureProximity",                // fieldName
-                featureProximity,
-                false,                              // isNodeValues
-                true                                // verbose
+                IOobject
+                (
+                    sFeatFileName + ".featureProximity",
+                    runTime.constant(),
+                    "triSurface",
+                    runTime,
+                    IOobject::NO_READ,
+                    IOobject::NO_WRITE
+                ),
+                surf,
+                dimLength,
+                featureProximity
             );
+
+            featureProximityField.write();
+
+            if (writeVTK)
+            {
+                vtkSurfaceWriter().write
+                (
+                    runTime.constant()/"triSurface",    // outputDir
+                    sFeatFileName,                      // surfaceName
+                    surf.points(),
+                    faces,
+                    "featureProximity",                 // fieldName
+                    featureProximity,
+                    false,                              // isNodeValues
+                    true                                // verbose
+                );
+            }
         }
+
+        Info<< endl;
     }
 
     Info<< "End\n" << endl;
diff --git a/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtractDict b/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtractDict
new file mode 100644
index 0000000000..3621d64a29
--- /dev/null
+++ b/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtractDict
@@ -0,0 +1,86 @@
+/*--------------------------------*- 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;
+    object      surfaceFeatureExtractDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+surface1.stl
+{
+    // extractFromFile || extractFromSurface
+    extractionMethod    extractFromFile;
+
+    extractFromFile
+    {
+        // Load from an existing feature edge file
+        featureEdgeFile "constant/triSurface/featureEdges.nas";
+    }
+    
+    trimFeatures
+    {
+        // Remove features with fewer than the specified number of edges
+        minElem         0;
+        
+        // Remove features shorter than the specified cumulative length
+        minLen          0.0;
+    }  
+    
+    subsetFeatures
+    {        
+        // Use a plane to select feature edges
+        // (normal)(basePoint)
+        plane               (1 0 0)(0 0 0);
+        
+        // Select feature edges using a box
+        // (minPt)(maxPt)
+        insideBox           (0 0 0)(1 1 1);
+        outsideBox          (0 0 0)(1 1 1);
+        
+        // Remove any non-manifold (open or > 2 connected faces) edges
+        manifoldEdges       no;
+    }
+    
+    // Output the curvature of the surface
+    curvature               no;
+    
+    // Output the proximity of feature points and edges to each other
+    featureProximity        no;
+    // The maximum search distance to use when looking for other feature
+    // points and edges
+    maxFeatureProximity     1;
+    
+    // Out put the closeness of surface elements to other surface elements.
+    closeness               no;
+
+    // Write options
+    writeVTK                no;
+    writeObj                yes;
+    writeFeatureEdgeMesh    no;
+}
+
+
+surface2.nas
+{
+    extractionMethod    extractFromSurface;
+
+    extractFromSurface
+    {
+        // Mark edges whose adjacent surface normals are at an angle less
+        // than includedAngle as features
+        // - 0  : selects no edges
+        // - 180: selects all edges
+        includedAngle   120;
+    }
+}
+
+
+// ************************************************************************* //

From a2a9a09f94632ae9f34f9d83352994096c7f8886 Mon Sep 17 00:00:00 2001
From: laurence <laurence>
Date: Fri, 16 Mar 2012 15:11:22 +0000
Subject: [PATCH 043/317] BUG: Add indentation to Info statement

---
 .../cellSizeCalculationType/fieldFromFile/fieldFromFile.C       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/cellSizeCalculationType/fieldFromFile/fieldFromFile.C b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/cellSizeCalculationType/fieldFromFile/fieldFromFile.C
index d40427abf7..788c1d69c6 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/cellSizeCalculationType/fieldFromFile/fieldFromFile.C
+++ b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/cellSizeCalculationType/fieldFromFile/fieldFromFile.C
@@ -63,7 +63,7 @@ Foam::fieldFromFile::fieldFromFile
 
 Foam::triSurfaceScalarField Foam::fieldFromFile::load()
 {
-    Info<< "Loading: " << fileName_ << endl;
+    Info<< indent << "Loading: " << fileName_ << endl;
 
     triSurfaceScalarField surfaceCellSize
     (

From db8857a88bf5b087ebae10db3fd45d14c9a9603e Mon Sep 17 00:00:00 2001
From: laurence <laurence>
Date: Fri, 16 Mar 2012 15:11:50 +0000
Subject: [PATCH 044/317] ENH: cvMesh: Reactivate automatic cell-sizing within
 iterations

---
 .../conformalVoronoiMesh/conformalVoronoiMeshCalcDualMesh.C   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshCalcDualMesh.C b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshCalcDualMesh.C
index 5586446cb8..7cc8957de0 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshCalcDualMesh.C
+++ b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshCalcDualMesh.C
@@ -1791,9 +1791,9 @@ void Foam::conformalVoronoiMesh::checkCellSizing()
         }
 
         Info<< "    Automatically re-sizing " << cellsToResize.size()
-            << " cells that are attached to the bad faces: DISABLED" << endl;
+            << " cells that are attached to the bad faces: " << endl;
 
-        //cellSizeControl_.setCellSizes(cellsToResize);
+        cellSizeControl_.setCellSizes(cellsToResize);
     }
 
     timeCheck("End of Cell Sizing");

From 0a28425f2cf88212dddd77e3b4a14a094b82aa05 Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Fri, 16 Mar 2012 16:10:27 +0000
Subject: [PATCH 045/317] compressibleTwoPhaseEulerFoam/mixerVessel2D: new
 tutorial to test the MRF capability in compressibleTwoPhaseEulerFoam

---
 .../bubbleColumn/constant/MRFZones            |  20 +
 .../fluidisedBed/constant/MRFZones            |  20 +
 .../mixerVessel2D/0/T1                        |  44 +
 .../mixerVessel2D/0/T2                        |  44 +
 .../mixerVessel2D/0/Theta                     |  44 +
 .../mixerVessel2D/0/U1                        |  46 +
 .../mixerVessel2D/0/U2                        |  46 +
 .../mixerVessel2D/0/alpha1                    |  44 +
 .../mixerVessel2D/0/epsilon                   |  48 +
 .../mixerVessel2D/0/k                         |  48 +
 .../mixerVessel2D/0/p                         |  46 +
 .../mixerVessel2D/Allrun                      |  12 +
 .../mixerVessel2D/constant/MRFZones           |  31 +
 .../mixerVessel2D/constant/RASProperties      |  25 +
 .../mixerVessel2D/constant/g                  |  22 +
 .../constant/interfacialProperties            |  30 +
 .../constant/kineticTheoryProperties          |  52 ++
 .../constant/polyMesh/blockMeshDict.m4        | 818 ++++++++++++++++++
 .../mixerVessel2D/constant/polyMesh/boundary  |  46 +
 .../mixerVessel2D/constant/ppProperties       |  29 +
 .../constant/transportProperties              |  65 ++
 .../mixerVessel2D/makeMesh                    |   6 +
 .../mixerVessel2D/system/controlDict          |  55 ++
 .../mixerVessel2D/system/fvSchemes            |  67 ++
 .../mixerVessel2D/system/fvSolution           | 102 +++
 25 files changed, 1810 insertions(+)
 create mode 100644 tutorials/multiphase/compressibleTwoPhaseEulerFoam/bubbleColumn/constant/MRFZones
 create mode 100644 tutorials/multiphase/compressibleTwoPhaseEulerFoam/fluidisedBed/constant/MRFZones
 create mode 100644 tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/0/T1
 create mode 100644 tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/0/T2
 create mode 100644 tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/0/Theta
 create mode 100644 tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/0/U1
 create mode 100644 tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/0/U2
 create mode 100644 tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/0/alpha1
 create mode 100644 tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/0/epsilon
 create mode 100644 tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/0/k
 create mode 100644 tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/0/p
 create mode 100755 tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/Allrun
 create mode 100644 tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/constant/MRFZones
 create mode 100644 tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/constant/RASProperties
 create mode 100644 tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/constant/g
 create mode 100644 tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/constant/interfacialProperties
 create mode 100644 tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/constant/kineticTheoryProperties
 create mode 100644 tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/constant/polyMesh/blockMeshDict.m4
 create mode 100644 tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/constant/polyMesh/boundary
 create mode 100644 tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/constant/ppProperties
 create mode 100644 tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/constant/transportProperties
 create mode 100755 tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/makeMesh
 create mode 100644 tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/system/controlDict
 create mode 100644 tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/system/fvSchemes
 create mode 100644 tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/system/fvSolution

diff --git a/tutorials/multiphase/compressibleTwoPhaseEulerFoam/bubbleColumn/constant/MRFZones b/tutorials/multiphase/compressibleTwoPhaseEulerFoam/bubbleColumn/constant/MRFZones
new file mode 100644
index 0000000000..0034a58c22
--- /dev/null
+++ b/tutorials/multiphase/compressibleTwoPhaseEulerFoam/bubbleColumn/constant/MRFZones
@@ -0,0 +1,20 @@
+/*--------------------------------*- 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      MRFZones;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+0()
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/compressibleTwoPhaseEulerFoam/fluidisedBed/constant/MRFZones b/tutorials/multiphase/compressibleTwoPhaseEulerFoam/fluidisedBed/constant/MRFZones
new file mode 100644
index 0000000000..0034a58c22
--- /dev/null
+++ b/tutorials/multiphase/compressibleTwoPhaseEulerFoam/fluidisedBed/constant/MRFZones
@@ -0,0 +1,20 @@
+/*--------------------------------*- 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      MRFZones;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+0()
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/0/T1 b/tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/0/T1
new file mode 100644
index 0000000000..610cfff17e
--- /dev/null
+++ b/tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/0/T1
@@ -0,0 +1,44 @@
+/*--------------------------------*- 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;
+    object      T1;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 0 0 1 0 0 0];
+
+internalField   uniform 300;
+
+boundaryField
+{
+    rotor
+    {
+        type            zeroGradient;
+    }
+
+    stator
+    {
+        type            zeroGradient;
+    }
+
+    front
+    {
+        type            empty;
+    }
+
+    back
+    {
+        type            empty;
+    }
+}
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/0/T2 b/tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/0/T2
new file mode 100644
index 0000000000..c2ea64d776
--- /dev/null
+++ b/tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/0/T2
@@ -0,0 +1,44 @@
+/*--------------------------------*- 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;
+    object      T2;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 0 0 1 0 0 0];
+
+internalField   uniform 500;
+
+boundaryField
+{
+    rotor
+    {
+        type            zeroGradient;
+    }
+
+    stator
+    {
+        type            zeroGradient;
+    }
+
+    front
+    {
+        type            empty;
+    }
+
+    back
+    {
+        type            empty;
+    }
+}
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/0/Theta b/tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/0/Theta
new file mode 100644
index 0000000000..b18d202df8
--- /dev/null
+++ b/tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/0/Theta
@@ -0,0 +1,44 @@
+/*--------------------------------*- 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;
+    object      Theta;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 2 -2 0 0 0 0];
+
+internalField   uniform 0;
+
+boundaryField
+{
+    rotor
+    {
+        type            zeroGradient;
+    }
+
+    stator
+    {
+        type            zeroGradient;
+    }
+
+    front
+    {
+        type            empty;
+    }
+
+    back
+    {
+        type            empty;
+    }
+}
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/0/U1 b/tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/0/U1
new file mode 100644
index 0000000000..7a88b38478
--- /dev/null
+++ b/tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/0/U1
@@ -0,0 +1,46 @@
+/*--------------------------------*- 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       volVectorField;
+    object      U1;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 1 -1 0 0 0 0];
+
+internalField   uniform (0 0 0);
+
+boundaryField
+{
+    rotor
+    {
+        type            fixedValue;
+        value           uniform (0 0 0);
+    }
+
+    stator
+    {
+        type            fixedValue;
+        value           uniform (0 0 0);
+    }
+
+    front
+    {
+        type            empty;
+    }
+
+    back
+    {
+        type            empty;
+    }
+}
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/0/U2 b/tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/0/U2
new file mode 100644
index 0000000000..b93b8d870d
--- /dev/null
+++ b/tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/0/U2
@@ -0,0 +1,46 @@
+/*--------------------------------*- 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       volVectorField;
+    object      U2;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 1 -1 0 0 0 0];
+
+internalField   uniform (0 0 0);
+
+boundaryField
+{
+    rotor
+    {
+        type            fixedValue;
+        value           uniform (0 0 0);
+    }
+
+    stator
+    {
+        type            fixedValue;
+        value           uniform (0 0 0);
+    }
+
+    front
+    {
+        type            empty;
+    }
+
+    back
+    {
+        type            empty;
+    }
+}
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/0/alpha1 b/tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/0/alpha1
new file mode 100644
index 0000000000..637ebed0e8
--- /dev/null
+++ b/tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/0/alpha1
@@ -0,0 +1,44 @@
+/*--------------------------------*- 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;
+    object      alpha1;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 0 0 0 0 0 0];
+
+internalField   uniform 0.5;
+
+boundaryField
+{
+    rotor
+    {
+        type            zeroGradient;
+    }
+
+    stator
+    {
+        type            zeroGradient;
+    }
+
+    front
+    {
+        type            empty;
+    }
+
+    back
+    {
+        type            empty;
+    }
+}
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/0/epsilon b/tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/0/epsilon
new file mode 100644
index 0000000000..3f507afed8
--- /dev/null
+++ b/tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/0/epsilon
@@ -0,0 +1,48 @@
+/*--------------------------------*- 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      epsilon;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [ 0 2 -3 0 0 0 0 ];
+
+internalField   uniform 20;
+
+boundaryField
+{
+    rotor
+    {
+        type            zeroGradient;
+        value           uniform 20;
+    }
+
+    stator
+    {
+        type            zeroGradient;
+        value           uniform 20;
+    }
+
+    front
+    {
+        type            empty;
+    }
+
+    back
+    {
+        type            empty;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/0/k b/tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/0/k
new file mode 100644
index 0000000000..b8c3e8cc99
--- /dev/null
+++ b/tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/0/k
@@ -0,0 +1,48 @@
+/*--------------------------------*- 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      k;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [ 0 2 -2 0 0 0 0 ];
+
+internalField   uniform 0.1;
+
+boundaryField
+{
+    rotor
+    {
+        type            zeroGradient;
+        value           uniform 0.1;
+    }
+
+    stator
+    {
+        type            zeroGradient;
+        value           uniform 0.1;
+    }
+
+    front
+    {
+        type            empty;
+    }
+
+    back
+    {
+        type            empty;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/0/p b/tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/0/p
new file mode 100644
index 0000000000..9c4de0da51
--- /dev/null
+++ b/tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/0/p
@@ -0,0 +1,46 @@
+/*--------------------------------*- 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;
+    object      p;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [1 -1 -2 0 0 0 0];
+
+internalField   uniform 1e5;
+
+boundaryField
+{
+    rotor
+    {
+        type            multiphaseFixedFluxPressure;
+        value           $internalField;
+    }
+
+    stator
+    {
+        type            multiphaseFixedFluxPressure;
+        value           $internalField;
+    }
+
+    front
+    {
+        type            empty;
+    }
+
+    back
+    {
+        type            empty;
+    }
+}
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/Allrun b/tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/Allrun
new file mode 100755
index 0000000000..a718eaf7e6
--- /dev/null
+++ b/tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/Allrun
@@ -0,0 +1,12 @@
+#!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
+
+# Source tutorial run functions
+. $WM_PROJECT_DIR/bin/tools/RunFunctions
+
+application=`getApplication`
+
+runApplication ./makeMesh
+runApplication $application
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/constant/MRFZones b/tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/constant/MRFZones
new file mode 100644
index 0000000000..25c3311d0b
--- /dev/null
+++ b/tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/constant/MRFZones
@@ -0,0 +1,31 @@
+/*--------------------------------*- 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      MRFZones;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+1
+(
+    rotor
+    {
+        // Fixed patches (by default they 'move' with the MRF zone)
+        nonRotatingPatches ();
+
+        origin    origin [0 1 0 0 0 0 0]  (0 0 0);
+        axis      axis   [0 0 0 0 0 0 0]  (0 0 1);
+        omega     omega  [0 0 -1 0 0 0 0] 10.472;
+    }
+)
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/constant/RASProperties b/tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/constant/RASProperties
new file mode 100644
index 0000000000..a4937b503a
--- /dev/null
+++ b/tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/constant/RASProperties
@@ -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      RASProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+RASModel        kEpsilon;
+
+turbulence      on;
+
+printCoeffs     on;
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/constant/g b/tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/constant/g
new file mode 100644
index 0000000000..ced431bccc
--- /dev/null
+++ b/tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/constant/g
@@ -0,0 +1,22 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.7.1                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       uniformDimensionedVectorField;
+    location    "constant";
+    object      g;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 1 -2 0 0 0 0];
+value           (0 0 0);
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/constant/interfacialProperties b/tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/constant/interfacialProperties
new file mode 100644
index 0000000000..e910a161f7
--- /dev/null
+++ b/tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/constant/interfacialProperties
@@ -0,0 +1,30 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.7.1                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      interfacialProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dragModel1          SchillerNaumann;
+dragModel2          SchillerNaumann;
+
+heatTransferModel1  RanzMarshall;
+heatTransferModel2  RanzMarshall;
+
+dispersedPhase      both;
+dragPhase           blended;
+
+residualSlip        1e-2;
+minInterfaceAlpha   1e-3;
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/constant/kineticTheoryProperties b/tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/constant/kineticTheoryProperties
new file mode 100644
index 0000000000..bbb376f7d2
--- /dev/null
+++ b/tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/constant/kineticTheoryProperties
@@ -0,0 +1,52 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.7.1                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      kineticTheoryProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+kineticTheory   off;
+
+equilibrium     on;
+
+e               e [ 0 0 0 0 0 0 0 ] 0.9;
+
+alphaMax        alphaMax [ 0 0 0 0 0 0 0 ] 0.6;
+
+alphaMinFriction alphaMinFriction [ 0 0 0 0 0 0 0 ] 0.5;
+
+Fr              Fr [ 1 -1 -2 0 0 0 0 ] 0.05;
+
+eta             eta [ 0 0 0 0 0 0 0 ] 2;
+
+p               p [ 0 0 0 0 0 0 0 ] 5;
+
+phi             phi [ 0 0 0 0 0 0 0 ] 25;
+
+viscosityModel  Syamlal;
+
+conductivityModel HrenyaSinclair;
+
+granularPressureModel Lun;
+
+frictionalStressModel JohnsonJackson;
+
+radialModel     Gidaspow;
+
+HrenyaSinclairCoeffs
+{
+    L               L [ 0 1 0 0 0 0 0 ] 0.0005;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/constant/polyMesh/blockMeshDict.m4 b/tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/constant/polyMesh/blockMeshDict.m4
new file mode 100644
index 0000000000..81fdaeefaa
--- /dev/null
+++ b/tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/constant/polyMesh/blockMeshDict.m4
@@ -0,0 +1,818 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  2.1.x                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    `format'      ascii;
+    class       dictionary;
+    object      blockMeshDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// General macros to create 2D/extruded-2D meshes
+
+changecom(//)changequote([,])
+define(calc, [esyscmd(perl -e 'print ($1)')])
+define(VCOUNT, 0)
+define(vlabel, [[// ]Vertex $1 = VCOUNT define($1, VCOUNT)define([VCOUNT], incr(VCOUNT))])
+define(pi, 3.14159265)
+
+define(hex2D, hex ($1b $2b $3b $4b $1t $2t $3t $4t))
+define(quad2D, ($1b $2b $2t $1t))
+define(frontQuad, ($1t $2t $3t $4t))
+define(backQuad, ($1b $4b $3b $2b))
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+convertToMeters 0.1;
+
+// Hub radius
+define(r, 0.2)
+
+// Impeller-tip radius
+define(rb, 0.5)
+
+// Baffle-tip radius
+define(Rb, 0.7)
+
+// Tank radius
+define(R, 1)
+
+// MRF region radius
+define(ri, calc(0.5*(rb + Rb)))
+
+// Thickness of 2D slab
+define(z, 0.1)
+
+// Base z
+define(Zb, 0)
+
+// Top z
+define(Zt, calc(Zb + z))
+
+// Number of cells radially between hub and impeller tip
+define(Nr, 12)
+
+// Number of cells radially in each of the two regions between
+// impeller and baffle tips
+define(Ni, 4)
+
+// Number of cells radially between baffle tip and tank
+define(NR, 12)
+
+// Number of cells azimuthally in each of the 8 blocks
+define(Na, 12)
+
+// Number of cells in the thickness of the slab
+define(Nz, 1)
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+define(vert, (x$1$2 y$1$2 $3))
+define(evert, (ex$1$2 ey$1$2 $3))
+
+define(a0, 0)
+define(a1, -45)
+define(a2, -90)
+define(a3, -135)
+define(a4, 180)
+define(a5, 135)
+define(a6, 90)
+define(a7, 45)
+
+define(ea0, -22.5)
+define(ea1, -67.5)
+define(ea2, -112.5)
+define(ea3, -157.5)
+define(ea4, 157.5)
+define(ea5, 112.5)
+define(ea6, 67.5)
+define(ea7, 22.5)
+
+define(ca0, calc(cos((pi/180)*a0)))
+define(ca1, calc(cos((pi/180)*a1)))
+define(ca2, calc(cos((pi/180)*a2)))
+define(ca3, calc(cos((pi/180)*a3)))
+define(ca4, calc(cos((pi/180)*a4)))
+define(ca5, calc(cos((pi/180)*a5)))
+define(ca6, calc(cos((pi/180)*a6)))
+define(ca7, calc(cos((pi/180)*a7)))
+
+define(sa0, calc(sin((pi/180)*a0)))
+define(sa1, calc(sin((pi/180)*a1)))
+define(sa2, calc(sin((pi/180)*a2)))
+define(sa3, calc(sin((pi/180)*a3)))
+define(sa4, calc(sin((pi/180)*a4)))
+define(sa5, calc(sin((pi/180)*a5)))
+define(sa6, calc(sin((pi/180)*a6)))
+define(sa7, calc(sin((pi/180)*a7)))
+
+define(cea0, calc(cos((pi/180)*ea0)))
+define(cea1, calc(cos((pi/180)*ea1)))
+define(cea2, calc(cos((pi/180)*ea2)))
+define(cea3, calc(cos((pi/180)*ea3)))
+define(cea4, calc(cos((pi/180)*ea4)))
+define(cea5, calc(cos((pi/180)*ea5)))
+define(cea6, calc(cos((pi/180)*ea6)))
+define(cea7, calc(cos((pi/180)*ea7)))
+
+define(sea0, calc(sin((pi/180)*ea0)))
+define(sea1, calc(sin((pi/180)*ea1)))
+define(sea2, calc(sin((pi/180)*ea2)))
+define(sea3, calc(sin((pi/180)*ea3)))
+define(sea4, calc(sin((pi/180)*ea4)))
+define(sea5, calc(sin((pi/180)*ea5)))
+define(sea6, calc(sin((pi/180)*ea6)))
+define(sea7, calc(sin((pi/180)*ea7)))
+
+define(x00, calc(r*ca0))
+define(x01, calc(r*ca1))
+define(x02, calc(r*ca2))
+define(x03, calc(r*ca3))
+define(x04, calc(r*ca4))
+define(x05, calc(r*ca5))
+define(x06, calc(r*ca6))
+define(x07, calc(r*ca7))
+
+define(x10, calc(rb*ca0))
+define(x11, calc(rb*ca1))
+define(x12, calc(rb*ca2))
+define(x13, calc(rb*ca3))
+define(x14, calc(rb*ca4))
+define(x15, calc(rb*ca5))
+define(x16, calc(rb*ca6))
+define(x17, calc(rb*ca7))
+
+define(x20, calc(ri*ca0))
+define(x21, calc(ri*ca1))
+define(x22, calc(ri*ca2))
+define(x23, calc(ri*ca3))
+define(x24, calc(ri*ca4))
+define(x25, calc(ri*ca5))
+define(x26, calc(ri*ca6))
+define(x27, calc(ri*ca7))
+
+define(x30, calc(Rb*ca0))
+define(x31, calc(Rb*ca1))
+define(x32, calc(Rb*ca2))
+define(x33, calc(Rb*ca3))
+define(x34, calc(Rb*ca4))
+define(x35, calc(Rb*ca5))
+define(x36, calc(Rb*ca6))
+define(x37, calc(Rb*ca7))
+
+define(x40, calc(R*ca0))
+define(x41, calc(R*ca1))
+define(x42, calc(R*ca2))
+define(x43, calc(R*ca3))
+define(x44, calc(R*ca4))
+define(x45, calc(R*ca5))
+define(x46, calc(R*ca6))
+define(x47, calc(R*ca7))
+
+define(y00, calc(r*sa0))
+define(y01, calc(r*sa1))
+define(y02, calc(r*sa2))
+define(y03, calc(r*sa3))
+define(y04, calc(r*sa4))
+define(y05, calc(r*sa5))
+define(y06, calc(r*sa6))
+define(y07, calc(r*sa7))
+
+define(y10, calc(rb*sa0))
+define(y11, calc(rb*sa1))
+define(y12, calc(rb*sa2))
+define(y13, calc(rb*sa3))
+define(y14, calc(rb*sa4))
+define(y15, calc(rb*sa5))
+define(y16, calc(rb*sa6))
+define(y17, calc(rb*sa7))
+
+define(y20, calc(ri*sa0))
+define(y21, calc(ri*sa1))
+define(y22, calc(ri*sa2))
+define(y23, calc(ri*sa3))
+define(y24, calc(ri*sa4))
+define(y25, calc(ri*sa5))
+define(y26, calc(ri*sa6))
+define(y27, calc(ri*sa7))
+
+define(y30, calc(Rb*sa0))
+define(y31, calc(Rb*sa1))
+define(y32, calc(Rb*sa2))
+define(y33, calc(Rb*sa3))
+define(y34, calc(Rb*sa4))
+define(y35, calc(Rb*sa5))
+define(y36, calc(Rb*sa6))
+define(y37, calc(Rb*sa7))
+
+define(y40, calc(R*sa0))
+define(y41, calc(R*sa1))
+define(y42, calc(R*sa2))
+define(y43, calc(R*sa3))
+define(y44, calc(R*sa4))
+define(y45, calc(R*sa5))
+define(y46, calc(R*sa6))
+define(y47, calc(R*sa7))
+
+define(ex00, calc(r*cea0))
+define(ex01, calc(r*cea1))
+define(ex02, calc(r*cea2))
+define(ex03, calc(r*cea3))
+define(ex04, calc(r*cea4))
+define(ex05, calc(r*cea5))
+define(ex06, calc(r*cea6))
+define(ex07, calc(r*cea7))
+
+define(ex10, calc(rb*cea0))
+define(ex11, calc(rb*cea1))
+define(ex12, calc(rb*cea2))
+define(ex13, calc(rb*cea3))
+define(ex14, calc(rb*cea4))
+define(ex15, calc(rb*cea5))
+define(ex16, calc(rb*cea6))
+define(ex17, calc(rb*cea7))
+
+define(ex20, calc(ri*cea0))
+define(ex21, calc(ri*cea1))
+define(ex22, calc(ri*cea2))
+define(ex23, calc(ri*cea3))
+define(ex24, calc(ri*cea4))
+define(ex25, calc(ri*cea5))
+define(ex26, calc(ri*cea6))
+define(ex27, calc(ri*cea7))
+
+define(ex30, calc(Rb*cea0))
+define(ex31, calc(Rb*cea1))
+define(ex32, calc(Rb*cea2))
+define(ex33, calc(Rb*cea3))
+define(ex34, calc(Rb*cea4))
+define(ex35, calc(Rb*cea5))
+define(ex36, calc(Rb*cea6))
+define(ex37, calc(Rb*cea7))
+
+define(ex40, calc(R*cea0))
+define(ex41, calc(R*cea1))
+define(ex42, calc(R*cea2))
+define(ex43, calc(R*cea3))
+define(ex44, calc(R*cea4))
+define(ex45, calc(R*cea5))
+define(ex46, calc(R*cea6))
+define(ex47, calc(R*cea7))
+
+define(ey00, calc(r*sea0))
+define(ey01, calc(r*sea1))
+define(ey02, calc(r*sea2))
+define(ey03, calc(r*sea3))
+define(ey04, calc(r*sea4))
+define(ey05, calc(r*sea5))
+define(ey06, calc(r*sea6))
+define(ey07, calc(r*sea7))
+
+define(ey10, calc(rb*sea0))
+define(ey11, calc(rb*sea1))
+define(ey12, calc(rb*sea2))
+define(ey13, calc(rb*sea3))
+define(ey14, calc(rb*sea4))
+define(ey15, calc(rb*sea5))
+define(ey16, calc(rb*sea6))
+define(ey17, calc(rb*sea7))
+
+define(ey20, calc(ri*sea0))
+define(ey21, calc(ri*sea1))
+define(ey22, calc(ri*sea2))
+define(ey23, calc(ri*sea3))
+define(ey24, calc(ri*sea4))
+define(ey25, calc(ri*sea5))
+define(ey26, calc(ri*sea6))
+define(ey27, calc(ri*sea7))
+
+define(ey30, calc(Rb*sea0))
+define(ey31, calc(Rb*sea1))
+define(ey32, calc(Rb*sea2))
+define(ey33, calc(Rb*sea3))
+define(ey34, calc(Rb*sea4))
+define(ey35, calc(Rb*sea5))
+define(ey36, calc(Rb*sea6))
+define(ey37, calc(Rb*sea7))
+
+define(ey40, calc(R*sea0))
+define(ey41, calc(R*sea1))
+define(ey42, calc(R*sea2))
+define(ey43, calc(R*sea3))
+define(ey44, calc(R*sea4))
+define(ey45, calc(R*sea5))
+define(ey46, calc(R*sea6))
+define(ey47, calc(R*sea7))
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+vertices
+(
+    vert(0, 0, Zb) vlabel(r0b)
+    vert(0, 0, Zb) vlabel(r0sb)
+    vert(0, 1, Zb) vlabel(r1b)
+    vert(0, 2, Zb) vlabel(r2b)
+    vert(0, 2, Zb) vlabel(r2sb)
+    vert(0, 3, Zb) vlabel(r3b)
+    vert(0, 4, Zb) vlabel(r4b)
+    vert(0, 4, Zb) vlabel(r4sb)
+    vert(0, 5, Zb) vlabel(r5b)
+    vert(0, 6, Zb) vlabel(r6b)
+    vert(0, 6, Zb) vlabel(r6sb)
+    vert(0, 7, Zb) vlabel(r7b)
+
+    vert(1, 0, Zb) vlabel(rb0b)
+    vert(1, 1, Zb) vlabel(rb1b)
+    vert(1, 2, Zb) vlabel(rb2b)
+    vert(1, 3, Zb) vlabel(rb3b)
+    vert(1, 4, Zb) vlabel(rb4b)
+    vert(1, 5, Zb) vlabel(rb5b)
+    vert(1, 6, Zb) vlabel(rb6b)
+    vert(1, 7, Zb) vlabel(rb7b)
+
+    vert(2, 0, Zb) vlabel(ri0b)
+    vert(2, 1, Zb) vlabel(ri1b)
+    vert(2, 2, Zb) vlabel(ri2b)
+    vert(2, 3, Zb) vlabel(ri3b)
+    vert(2, 4, Zb) vlabel(ri4b)
+    vert(2, 5, Zb) vlabel(ri5b)
+    vert(2, 6, Zb) vlabel(ri6b)
+    vert(2, 7, Zb) vlabel(ri7b)
+
+    vert(3, 0, Zb) vlabel(Rb0b)
+    vert(3, 1, Zb) vlabel(Rb1b)
+    vert(3, 2, Zb) vlabel(Rb2b)
+    vert(3, 3, Zb) vlabel(Rb3b)
+    vert(3, 4, Zb) vlabel(Rb4b)
+    vert(3, 5, Zb) vlabel(Rb5b)
+    vert(3, 6, Zb) vlabel(Rb6b)
+    vert(3, 7, Zb) vlabel(Rb7b)
+
+    vert(4, 0, Zb) vlabel(R0b)
+    vert(4, 1, Zb) vlabel(R1b)
+    vert(4, 1, Zb) vlabel(R1sb)
+    vert(4, 2, Zb) vlabel(R2b)
+    vert(4, 3, Zb) vlabel(R3b)
+    vert(4, 3, Zb) vlabel(R3sb)
+    vert(4, 4, Zb) vlabel(R4b)
+    vert(4, 5, Zb) vlabel(R5b)
+    vert(4, 5, Zb) vlabel(R5sb)
+    vert(4, 6, Zb) vlabel(R6b)
+    vert(4, 7, Zb) vlabel(R7b)
+    vert(4, 7, Zb) vlabel(R7sb)
+
+    vert(0, 0, Zt) vlabel(r0t)
+    vert(0, 0, Zt) vlabel(r0st)
+    vert(0, 1, Zt) vlabel(r1t)
+    vert(0, 2, Zt) vlabel(r2t)
+    vert(0, 2, Zt) vlabel(r2st)
+    vert(0, 3, Zt) vlabel(r3t)
+    vert(0, 4, Zt) vlabel(r4t)
+    vert(0, 4, Zt) vlabel(r4st)
+    vert(0, 5, Zt) vlabel(r5t)
+    vert(0, 6, Zt) vlabel(r6t)
+    vert(0, 6, Zt) vlabel(r6st)
+    vert(0, 7, Zt) vlabel(r7t)
+
+    vert(1, 0, Zt) vlabel(rb0t)
+    vert(1, 1, Zt) vlabel(rb1t)
+    vert(1, 2, Zt) vlabel(rb2t)
+    vert(1, 3, Zt) vlabel(rb3t)
+    vert(1, 4, Zt) vlabel(rb4t)
+    vert(1, 5, Zt) vlabel(rb5t)
+    vert(1, 6, Zt) vlabel(rb6t)
+    vert(1, 7, Zt) vlabel(rb7t)
+
+    vert(2, 0, Zt) vlabel(ri0t)
+    vert(2, 1, Zt) vlabel(ri1t)
+    vert(2, 2, Zt) vlabel(ri2t)
+    vert(2, 3, Zt) vlabel(ri3t)
+    vert(2, 4, Zt) vlabel(ri4t)
+    vert(2, 5, Zt) vlabel(ri5t)
+    vert(2, 6, Zt) vlabel(ri6t)
+    vert(2, 7, Zt) vlabel(ri7t)
+
+    vert(3, 0, Zt) vlabel(Rb0t)
+    vert(3, 1, Zt) vlabel(Rb1t)
+    vert(3, 2, Zt) vlabel(Rb2t)
+    vert(3, 3, Zt) vlabel(Rb3t)
+    vert(3, 4, Zt) vlabel(Rb4t)
+    vert(3, 5, Zt) vlabel(Rb5t)
+    vert(3, 6, Zt) vlabel(Rb6t)
+    vert(3, 7, Zt) vlabel(Rb7t)
+
+    vert(4, 0, Zt) vlabel(R0t)
+    vert(4, 1, Zt) vlabel(R1t)
+    vert(4, 1, Zt) vlabel(R1st)
+    vert(4, 2, Zt) vlabel(R2t)
+    vert(4, 3, Zt) vlabel(R3t)
+    vert(4, 3, Zt) vlabel(R3st)
+    vert(4, 4, Zt) vlabel(R4t)
+    vert(4, 5, Zt) vlabel(R5t)
+    vert(4, 5, Zt) vlabel(R5st)
+    vert(4, 6, Zt) vlabel(R6t)
+    vert(4, 7, Zt) vlabel(R7t)
+    vert(4, 7, Zt) vlabel(R7st)
+);
+
+blocks
+(
+    // block0
+    hex2D(r0, r1, rb1, rb0)
+    rotor
+    (Na Nr Nz)
+    simpleGrading (1 1 1)
+
+    // block1
+    hex2D(r1, r2s, rb2, rb1)
+    rotor
+    (Na Nr Nz)
+    simpleGrading (1 1 1)
+
+    // block2
+    hex2D(r2, r3, rb3, rb2)
+    rotor
+    (Na Nr Nz)
+    simpleGrading (1 1 1)
+
+    // block3
+    hex2D(r3, r4s, rb4, rb3)
+    rotor
+    (Na Nr Nz)
+    simpleGrading (1 1 1)
+
+    // block4
+    hex2D(r4, r5, rb5, rb4)
+    rotor
+    (Na Nr Nz)
+    simpleGrading (1 1 1)
+
+    // block5
+    hex2D(r5, r6s, rb6, rb5)
+    rotor
+    (Na Nr Nz)
+    simpleGrading (1 1 1)
+
+    // block6
+    hex2D(r6, r7, rb7, rb6)
+    rotor
+    (Na Nr Nz)
+    simpleGrading (1 1 1)
+
+    // block7
+    hex2D(r7, r0s, rb0, rb7)
+    rotor
+    (Na Nr Nz)
+    simpleGrading (1 1 1)
+
+    // block0
+    hex2D(rb0, rb1, ri1, ri0)
+    rotor
+    (Na Ni Nz)
+    simpleGrading (1 1 1)
+
+    // block1
+    hex2D(rb1, rb2, ri2, ri1)
+    rotor
+    (Na Ni Nz)
+    simpleGrading (1 1 1)
+
+    // block2
+    hex2D(rb2, rb3, ri3, ri2)
+    rotor
+    (Na Ni Nz)
+    simpleGrading (1 1 1)
+
+    // block3
+    hex2D(rb3, rb4, ri4, ri3)
+    rotor
+    (Na Ni Nz)
+    simpleGrading (1 1 1)
+
+    // block4
+    hex2D(rb4, rb5, ri5, ri4)
+    rotor
+    (Na Ni Nz)
+    simpleGrading (1 1 1)
+
+    // block5
+    hex2D(rb5, rb6, ri6, ri5)
+    rotor
+    (Na Ni Nz)
+    simpleGrading (1 1 1)
+
+    // block6
+    hex2D(rb6, rb7, ri7, ri6)
+    rotor
+    (Na Ni Nz)
+    simpleGrading (1 1 1)
+
+    // block7
+    hex2D(rb7, rb0, ri0, ri7)
+    rotor
+    (Na Ni Nz)
+    simpleGrading (1 1 1)
+
+    // block0
+    hex2D(ri0, ri1, Rb1, Rb0)
+    (Na Ni Nz)
+    simpleGrading (1 1 1)
+
+    // block1
+    hex2D(ri1, ri2, Rb2, Rb1)
+    (Na Ni Nz)
+    simpleGrading (1 1 1)
+
+    // block2
+    hex2D(ri2, ri3, Rb3, Rb2)
+    (Na Ni Nz)
+    simpleGrading (1 1 1)
+
+    // block3
+    hex2D(ri3, ri4, Rb4, Rb3)
+    (Na Ni Nz)
+    simpleGrading (1 1 1)
+
+    // block4
+    hex2D(ri4, ri5, Rb5, Rb4)
+    (Na Ni Nz)
+    simpleGrading (1 1 1)
+
+    // block5
+    hex2D(ri5, ri6, Rb6, Rb5)
+    (Na Ni Nz)
+    simpleGrading (1 1 1)
+
+    // block6
+    hex2D(ri6, ri7, Rb7, Rb6)
+    (Na Ni Nz)
+    simpleGrading (1 1 1)
+
+    // block7
+    hex2D(ri7, ri0, Rb0, Rb7)
+    (Na Ni Nz)
+    simpleGrading (1 1 1)
+
+    // block0
+    hex2D(Rb0, Rb1, R1s, R0)
+    (Na NR Nz)
+    simpleGrading (1 1 1)
+
+    // block1
+    hex2D(Rb1, Rb2, R2, R1)
+    (Na NR Nz)
+    simpleGrading (1 1 1)
+
+    // block2
+    hex2D(Rb2, Rb3, R3s, R2)
+    (Na NR Nz)
+    simpleGrading (1 1 1)
+
+    // block3
+    hex2D(Rb3, Rb4, R4, R3)
+    (Na NR Nz)
+    simpleGrading (1 1 1)
+
+    // block4
+    hex2D(Rb4, Rb5, R5s, R4)
+    (Na NR Nz)
+    simpleGrading (1 1 1)
+
+    // block5
+    hex2D(Rb5, Rb6, R6, R5)
+    (Na NR Nz)
+    simpleGrading (1 1 1)
+
+    // block6
+    hex2D(Rb6, Rb7, R7s, R6)
+    (Na NR Nz)
+    simpleGrading (1 1 1)
+
+    // block7
+    hex2D(Rb7, Rb0, R0, R7)
+    (Na NR Nz)
+    simpleGrading (1 1 1)
+);
+
+edges
+(
+    arc r0b r1b evert(0, 0, Zb)
+    arc r1b r2sb evert(0, 1, Zb)
+    arc r2b r3b evert(0, 2, Zb)
+    arc r3b r4sb evert(0, 3, Zb)
+    arc r4b r5b evert(0, 4, Zb)
+    arc r5b r6sb evert(0, 5, Zb)
+    arc r6b r7b evert(0, 6, Zb)
+    arc r7b r0sb evert(0, 7, Zb)
+
+    arc rb0b rb1b evert(1, 0, Zb)
+    arc rb1b rb2b evert(1, 1, Zb)
+    arc rb2b rb3b evert(1, 2, Zb)
+    arc rb3b rb4b evert(1, 3, Zb)
+    arc rb4b rb5b evert(1, 4, Zb)
+    arc rb5b rb6b evert(1, 5, Zb)
+    arc rb6b rb7b evert(1, 6, Zb)
+    arc rb7b rb0b evert(1, 7, Zb)
+
+    arc ri0b ri1b evert(2, 0, Zb)
+    arc ri1b ri2b evert(2, 1, Zb)
+    arc ri2b ri3b evert(2, 2, Zb)
+    arc ri3b ri4b evert(2, 3, Zb)
+    arc ri4b ri5b evert(2, 4, Zb)
+    arc ri5b ri6b evert(2, 5, Zb)
+    arc ri6b ri7b evert(2, 6, Zb)
+    arc ri7b ri0b evert(2, 7, Zb)
+
+    arc Rb0b Rb1b evert(3, 0, Zb)
+    arc Rb1b Rb2b evert(3, 1, Zb)
+    arc Rb2b Rb3b evert(3, 2, Zb)
+    arc Rb3b Rb4b evert(3, 3, Zb)
+    arc Rb4b Rb5b evert(3, 4, Zb)
+    arc Rb5b Rb6b evert(3, 5, Zb)
+    arc Rb6b Rb7b evert(3, 6, Zb)
+    arc Rb7b Rb0b evert(3, 7, Zb)
+
+    arc R0b R1sb evert(4, 0, Zb)
+    arc R1b R2b evert(4, 1, Zb)
+    arc R2b R3sb evert(4, 2, Zb)
+    arc R3b R4b evert(4, 3, Zb)
+    arc R4b R5sb evert(4, 4, Zb)
+    arc R5b R6b evert(4, 5, Zb)
+    arc R6b R7sb evert(4, 6, Zb)
+    arc R7b R0b evert(4, 7, Zb)
+
+    arc r0t r1t evert(0, 0, Zt)
+    arc r1t r2st evert(0, 1, Zt)
+    arc r2t r3t evert(0, 2, Zt)
+    arc r3t r4st evert(0, 3, Zt)
+    arc r4t r5t evert(0, 4, Zt)
+    arc r5t r6st evert(0, 5, Zt)
+    arc r6t r7t evert(0, 6, Zt)
+    arc r7t r0st evert(0, 7, Zt)
+
+    arc rb0t rb1t evert(1, 0, Zt)
+    arc rb1t rb2t evert(1, 1, Zt)
+    arc rb2t rb3t evert(1, 2, Zt)
+    arc rb3t rb4t evert(1, 3, Zt)
+    arc rb4t rb5t evert(1, 4, Zt)
+    arc rb5t rb6t evert(1, 5, Zt)
+    arc rb6t rb7t evert(1, 6, Zt)
+    arc rb7t rb0t evert(1, 7, Zt)
+
+    arc ri0t ri1t evert(2, 0, Zt)
+    arc ri1t ri2t evert(2, 1, Zt)
+    arc ri2t ri3t evert(2, 2, Zt)
+    arc ri3t ri4t evert(2, 3, Zt)
+    arc ri4t ri5t evert(2, 4, Zt)
+    arc ri5t ri6t evert(2, 5, Zt)
+    arc ri6t ri7t evert(2, 6, Zt)
+    arc ri7t ri0t evert(2, 7, Zt)
+
+    arc Rb0t Rb1t evert(3, 0, Zt)
+    arc Rb1t Rb2t evert(3, 1, Zt)
+    arc Rb2t Rb3t evert(3, 2, Zt)
+    arc Rb3t Rb4t evert(3, 3, Zt)
+    arc Rb4t Rb5t evert(3, 4, Zt)
+    arc Rb5t Rb6t evert(3, 5, Zt)
+    arc Rb6t Rb7t evert(3, 6, Zt)
+    arc Rb7t Rb0t evert(3, 7, Zt)
+
+    arc R0t R1st evert(4, 0, Zt)
+    arc R1t R2t evert(4, 1, Zt)
+    arc R2t R3st evert(4, 2, Zt)
+    arc R3t R4t evert(4, 3, Zt)
+    arc R4t R5st evert(4, 4, Zt)
+    arc R5t R6t evert(4, 5, Zt)
+    arc R6t R7st evert(4, 6, Zt)
+    arc R7t R0t evert(4, 7, Zt)
+);
+
+patches
+(
+    wall rotor
+    (
+        quad2D(r0, r1)
+        quad2D(r1, r2s)
+        quad2D(r2, r3)
+        quad2D(r3, r4s)
+        quad2D(r4, r5)
+        quad2D(r5, r6s)
+        quad2D(r6, r7)
+        quad2D(r7, r0s)
+
+        quad2D(r0, rb0)
+        quad2D(r0s, rb0)
+
+        quad2D(r2, rb2)
+        quad2D(r2s, rb2)
+
+        quad2D(r4, rb4)
+        quad2D(r4s, rb4)
+
+        quad2D(r6, rb6)
+        quad2D(r6s, rb6)
+    )
+
+    wall stator
+    (
+        quad2D(R0, R1s)
+        quad2D(R1, R2)
+        quad2D(R2, R3s)
+        quad2D(R3, R4)
+        quad2D(R4, R5s)
+        quad2D(R5, R6)
+        quad2D(R6, R7s)
+        quad2D(R7, R0)
+
+        quad2D(R1, Rb1)
+        quad2D(R1s, Rb1)
+
+        quad2D(R3, Rb3)
+        quad2D(R3s, Rb3)
+
+        quad2D(R5, Rb5)
+        quad2D(R5s, Rb5)
+
+        quad2D(R7, Rb7)
+        quad2D(R7s, Rb7)
+    )
+
+    empty front
+    (
+        frontQuad(r0, r1, rb1, rb0)
+        frontQuad(r1, r2s, rb2, rb1)
+        frontQuad(r2, r3, rb3, rb2)
+        frontQuad(r3, r4s, rb4, rb3)
+        frontQuad(r4, r5, rb5, rb4)
+        frontQuad(r5, r6s, rb6, rb5)
+        frontQuad(r6, r7, rb7, rb6)
+        frontQuad(r7, r0s, rb0, rb7)
+        frontQuad(rb0, rb1, ri1, ri0)
+        frontQuad(rb1, rb2, ri2, ri1)
+        frontQuad(rb2, rb3, ri3, ri2)
+        frontQuad(rb3, rb4, ri4, ri3)
+        frontQuad(rb4, rb5, ri5, ri4)
+        frontQuad(rb5, rb6, ri6, ri5)
+        frontQuad(rb6, rb7, ri7, ri6)
+        frontQuad(rb7, rb0, ri0, ri7)
+        frontQuad(ri0, ri1, Rb1, Rb0)
+        frontQuad(ri1, ri2, Rb2, Rb1)
+        frontQuad(ri2, ri3, Rb3, Rb2)
+        frontQuad(ri3, ri4, Rb4, Rb3)
+        frontQuad(ri4, ri5, Rb5, Rb4)
+        frontQuad(ri5, ri6, Rb6, Rb5)
+        frontQuad(ri6, ri7, Rb7, Rb6)
+        frontQuad(ri7, ri0, Rb0, Rb7)
+        frontQuad(Rb0, Rb1, R1s, R0)
+        frontQuad(Rb1, Rb2, R2, R1)
+        frontQuad(Rb2, Rb3, R3s, R2)
+        frontQuad(Rb3, Rb4, R4, R3)
+        frontQuad(Rb4, Rb5, R5s, R4)
+        frontQuad(Rb5, Rb6, R6, R5)
+        frontQuad(Rb6, Rb7, R7s, R6)
+        frontQuad(Rb7, Rb0, R0, R7)
+    )
+
+    empty back
+    (
+        backQuad(r0, r1, rb1, rb0)
+        backQuad(r1, r2s, rb2, rb1)
+        backQuad(r2, r3, rb3, rb2)
+        backQuad(r3, r4s, rb4, rb3)
+        backQuad(r4, r5, rb5, rb4)
+        backQuad(r5, r6s, rb6, rb5)
+        backQuad(r6, r7, rb7, rb6)
+        backQuad(r7, r0s, rb0, rb7)
+        backQuad(rb0, rb1, ri1, ri0)
+        backQuad(rb1, rb2, ri2, ri1)
+        backQuad(rb2, rb3, ri3, ri2)
+        backQuad(rb3, rb4, ri4, ri3)
+        backQuad(rb4, rb5, ri5, ri4)
+        backQuad(rb5, rb6, ri6, ri5)
+        backQuad(rb6, rb7, ri7, ri6)
+        backQuad(rb7, rb0, ri0, ri7)
+        backQuad(ri0, ri1, Rb1, Rb0)
+        backQuad(ri1, ri2, Rb2, Rb1)
+        backQuad(ri2, ri3, Rb3, Rb2)
+        backQuad(ri3, ri4, Rb4, Rb3)
+        backQuad(ri4, ri5, Rb5, Rb4)
+        backQuad(ri5, ri6, Rb6, Rb5)
+        backQuad(ri6, ri7, Rb7, Rb6)
+        backQuad(ri7, ri0, Rb0, Rb7)
+        backQuad(Rb0, Rb1, R1s, R0)
+        backQuad(Rb1, Rb2, R2, R1)
+        backQuad(Rb2, Rb3, R3s, R2)
+        backQuad(Rb3, Rb4, R4, R3)
+        backQuad(Rb4, Rb5, R5s, R4)
+        backQuad(Rb5, Rb6, R6, R5)
+        backQuad(Rb6, Rb7, R7s, R6)
+        backQuad(Rb7, Rb0, R0, R7)
+    )
+);
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/constant/polyMesh/boundary b/tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/constant/polyMesh/boundary
new file mode 100644
index 0000000000..292f25b806
--- /dev/null
+++ b/tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/constant/polyMesh/boundary
@@ -0,0 +1,46 @@
+/*--------------------------------*- 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
+(
+    rotor
+    {
+        type            wall;
+        nFaces          192;
+        startFace       5952;
+    }
+    stator
+    {
+        type            wall;
+        nFaces          192;
+        startFace       6144;
+    }
+    front
+    {
+        type            empty;
+        nFaces          3072;
+        startFace       6336;
+    }
+    back
+    {
+        type            empty;
+        nFaces          3072;
+        startFace       9408;
+    }
+)
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/constant/ppProperties b/tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/constant/ppProperties
new file mode 100644
index 0000000000..3046686fac
--- /dev/null
+++ b/tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/constant/ppProperties
@@ -0,0 +1,29 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.7.1                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      ppProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+preAlphaExp     300;
+
+expMax          10;
+
+alphaMax        0.6;
+
+g0              g0 [ 1 -1 -2 0 0 0 0 ] 0;
+
+packingLimiter  off;
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/constant/transportProperties b/tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/constant/transportProperties
new file mode 100644
index 0000000000..82851fa93c
--- /dev/null
+++ b/tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/constant/transportProperties
@@ -0,0 +1,65 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.7.1                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      transportProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+phase1
+{
+    rho0            0;
+    rho             0.88;
+    R               287;
+    Cp              1007;
+    nu              2.46e-05;
+    d               4e-3;
+
+    kappa           2.63e-2;
+    diameterModel   isothermal;
+    isothermalCoeffs
+    {
+        d0              3e-3;
+        p0              1e5;
+    }
+}
+
+phase2
+{
+    rho             733;
+    rho0            733;
+    R               1e10;
+    Cp              4195;
+    nu              2.73e-6;
+    d               1e-4;
+
+    kappa           0.668;
+    diameterModel constant;
+    constantCoeffs
+    {
+        d               1e-4;
+    }
+}
+
+// Virtual-mass ceofficient
+Cvm             0.5;
+
+// Lift coefficient
+Cl               0;
+
+// Dispersed-phase turbulence coefficient
+Ct               0.2;
+
+// Minimum allowable pressure
+pMin            10000;
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/makeMesh b/tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/makeMesh
new file mode 100755
index 0000000000..8ef4993fde
--- /dev/null
+++ b/tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/makeMesh
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+m4 < constant/polyMesh/blockMeshDict.m4 > constant/polyMesh/blockMeshDict
+blockMesh
+topoSet
+setsToZones -noFlipMap
diff --git a/tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/system/controlDict b/tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/system/controlDict
new file mode 100644
index 0000000000..5d64d363fa
--- /dev/null
+++ b/tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/system/controlDict
@@ -0,0 +1,55 @@
+/*--------------------------------*- 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    "system";
+    object      controlDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+application     compressibleTwoPhaseEulerFoam;
+
+startFrom       startTime;
+
+startTime       0;
+
+stopAt          endTime;
+
+endTime         20;
+
+deltaT          1e-4;
+
+writeControl    adjustableRunTime;
+
+writeInterval   0.1;
+
+purgeWrite      0;
+
+writeFormat     ascii;
+
+writePrecision  6;
+
+writeCompression uncompressed;
+
+timeFormat      general;
+
+timePrecision   6;
+
+runTimeModifiable yes;
+
+adjustTimeStep  yes;
+
+maxCo           0.2;
+
+maxDeltaT       1;
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/system/fvSchemes b/tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/system/fvSchemes
new file mode 100644
index 0000000000..56e5e3fd0d
--- /dev/null
+++ b/tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/system/fvSchemes
@@ -0,0 +1,67 @@
+/*--------------------------------*- 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    "system";
+    object      fvSchemes;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+ddtSchemes
+{
+    default         Euler;
+}
+
+gradSchemes
+{
+    default         Gauss linear;
+}
+
+divSchemes
+{
+    default             none;
+
+    div(phi,alpha1)         Gauss limitedLinear01 1;
+    div(phir,alpha1)        Gauss limitedLinear01 1;
+    "div\(phi.,U.\)"        Gauss limitedLinearV 1;
+    "div\(alphaPhi.,U.\)"   Gauss limitedLinearV 1;
+    "div\(\(alpha.*Rc.\)\)" Gauss linear;
+    "div\(alphaPhi.,(k|epsilon)\)"  Gauss limitedLinear 1;
+    div(phi,Theta)          Gauss limitedLinear 1;
+    "div\(phi.,K.\)"        Gauss linear;
+    "div\(alphaPhi.,T.\)"   Gauss limitedLinear 1;
+    "div\(phid.,p\)"        Gauss linear;
+}
+
+laplacianSchemes
+{
+    default         Gauss linear corrected;
+}
+
+interpolationSchemes
+{
+    default         linear;
+}
+
+snGradSchemes
+{
+    default         corrected;
+}
+
+fluxRequired
+{
+    default         no;
+    p               ;
+    alpha1;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/system/fvSolution b/tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/system/fvSolution
new file mode 100644
index 0000000000..891746fcf3
--- /dev/null
+++ b/tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/system/fvSolution
@@ -0,0 +1,102 @@
+/*--------------------------------*- 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    "system";
+    object      fvSolution;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+solvers
+{
+    p
+    {
+        solver          GAMG;
+        tolerance       1e-08;
+        relTol          0.05;
+        smoother        GaussSeidel;
+        cacheAgglomeration true;
+        nCellsInCoarsestLevel 20;
+        agglomerator    faceAreaPair;
+        mergeLevels     1;
+    }
+
+    pFinal
+    {
+        $p;
+        tolerance       1e-08;
+        relTol          0;
+    }
+
+    U
+    {
+        solver          smoothSolver;
+        smoother        GaussSeidel;
+        nSweeps         2;
+        tolerance       1e-07;
+        relTol          0.1;
+    }
+
+    UFinal
+    {
+        solver          PBiCG;
+        preconditioner  DILU;
+        tolerance       1e-07;
+        relTol          0;
+    }
+
+    "alpha.*"
+    {
+        solver          PBiCG;
+        preconditioner  DILU;
+        tolerance       1e-10;
+        relTol          0;
+    }
+
+    "(k|epsilon|Theta|T).*"
+    {
+        solver          PBiCG;
+        preconditioner  DILU;
+        tolerance       1e-06;
+        relTol          0;
+    }
+}
+
+PIMPLE
+{
+    nOuterCorrectors 1;
+    nCorrectors     3;
+    nNonOrthogonalCorrectors 0;
+    nAlphaCorr      1;
+    correctAlpha    yes;
+    pRefCell        0;
+    pRefValue       0;
+}
+
+relaxationFactors
+{
+    fields
+    {
+        p                1;
+    }
+    equations
+    {
+        "U.*"            1;
+        "alpha.*"        1;
+        "Theta.*"        1;
+        "k.*"            1;
+        "epsilon.*"      1;
+        "T.*"            1;
+    }
+}
+
+
+// ************************************************************************* //

From cc656fa844eef885bc00f84c66d88f8581ddfafa Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Fri, 16 Mar 2012 16:12:46 +0000
Subject: [PATCH 046/317] Updated headers

---
 .../compressibleTwoPhaseEulerFoam/mixerVessel2D/constant/g      | 2 +-
 .../mixerVessel2D/constant/interfacialProperties                | 2 +-
 .../mixerVessel2D/constant/kineticTheoryProperties              | 2 +-
 .../mixerVessel2D/constant/polyMesh/blockMeshDict.m4            | 2 +-
 .../mixerVessel2D/constant/ppProperties                         | 2 +-
 .../mixerVessel2D/constant/transportProperties                  | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/constant/g b/tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/constant/g
index ced431bccc..db2fa4c55e 100644
--- a/tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/constant/g
+++ b/tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/constant/g
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  1.7.1                                 |
+|  \\    /   O peration     | Version:  dev                                   |
 |   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/constant/interfacialProperties b/tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/constant/interfacialProperties
index e910a161f7..994230c76f 100644
--- a/tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/constant/interfacialProperties
+++ b/tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/constant/interfacialProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  1.7.1                                 |
+|  \\    /   O peration     | Version:  dev                                   |
 |   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/constant/kineticTheoryProperties b/tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/constant/kineticTheoryProperties
index bbb376f7d2..72770a8ecc 100644
--- a/tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/constant/kineticTheoryProperties
+++ b/tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/constant/kineticTheoryProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  1.7.1                                 |
+|  \\    /   O peration     | Version:  dev                                   |
 |   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/constant/polyMesh/blockMeshDict.m4 b/tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/constant/polyMesh/blockMeshDict.m4
index 81fdaeefaa..a93868498b 100644
--- a/tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/constant/polyMesh/blockMeshDict.m4
+++ b/tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/constant/polyMesh/blockMeshDict.m4
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  2.1.x                                 |
+|  \\    /   O peration     | Version:  dev                                   |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/constant/ppProperties b/tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/constant/ppProperties
index 3046686fac..f5735333ed 100644
--- a/tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/constant/ppProperties
+++ b/tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/constant/ppProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  1.7.1                                 |
+|  \\    /   O peration     | Version:  dev                                   |
 |   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/constant/transportProperties b/tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/constant/transportProperties
index 82851fa93c..9009b9dd2a 100644
--- a/tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/constant/transportProperties
+++ b/tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/constant/transportProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  1.7.1                                 |
+|  \\    /   O peration     | Version:  dev                                   |
 |   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/

From aa7066dad958583104c88a545b5df536b9f9bddf Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Fri, 16 Mar 2012 16:13:58 +0000
Subject: [PATCH 047/317] Updated headers

---
 .../compressibleTwoPhaseEulerFoam/mixerVessel2D/constant/g      | 2 +-
 .../mixerVessel2D/constant/interfacialProperties                | 2 +-
 .../mixerVessel2D/constant/kineticTheoryProperties              | 2 +-
 .../mixerVessel2D/constant/ppProperties                         | 2 +-
 .../mixerVessel2D/constant/transportProperties                  | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/constant/g b/tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/constant/g
index db2fa4c55e..508d658494 100644
--- a/tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/constant/g
+++ b/tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/constant/g
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/constant/interfacialProperties b/tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/constant/interfacialProperties
index 994230c76f..41159fe9de 100644
--- a/tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/constant/interfacialProperties
+++ b/tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/constant/interfacialProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/constant/kineticTheoryProperties b/tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/constant/kineticTheoryProperties
index 72770a8ecc..53521fbae3 100644
--- a/tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/constant/kineticTheoryProperties
+++ b/tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/constant/kineticTheoryProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/constant/ppProperties b/tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/constant/ppProperties
index f5735333ed..eddbfd7ad7 100644
--- a/tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/constant/ppProperties
+++ b/tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/constant/ppProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/constant/transportProperties b/tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/constant/transportProperties
index 9009b9dd2a..9ea9ed2189 100644
--- a/tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/constant/transportProperties
+++ b/tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/constant/transportProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile

From 0848c825215ef2213ee5b1338f074fe53f0b5451 Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Mon, 19 Mar 2012 10:06:39 +0000
Subject: [PATCH 048/317] ENH: Spalart-Allmaras - update nut_ from nuTilda_*fv1
 when turbulence inactive

---
 .../incompressible/RAS/SpalartAllmaras/SpalartAllmaras.C   | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/turbulenceModels/incompressible/RAS/SpalartAllmaras/SpalartAllmaras.C b/src/turbulenceModels/incompressible/RAS/SpalartAllmaras/SpalartAllmaras.C
index 213896ff7d..1804ba5b01 100644
--- a/src/turbulenceModels/incompressible/RAS/SpalartAllmaras/SpalartAllmaras.C
+++ b/src/turbulenceModels/incompressible/RAS/SpalartAllmaras/SpalartAllmaras.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -367,6 +367,10 @@ void SpalartAllmaras::correct()
 
     if (!turbulence_)
     {
+        // Re-calculate viscosity
+        nut_ = nuTilda_*fv1(this->chi());
+        nut_.correctBoundaryConditions();
+
         return;
     }
 
@@ -401,6 +405,7 @@ void SpalartAllmaras::correct()
     bound(nuTilda_, dimensionedScalar("0", nuTilda_.dimensions(), 0.0));
     nuTilda_.correctBoundaryConditions();
 
+    // Re-calculate viscosity
     nut_.internalField() = fv1*nuTilda_.internalField();
     nut_.correctBoundaryConditions();
 }

From cef3f638234537b05bf819e0819754a21eeb9035 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Mon, 19 Mar 2012 10:54:08 +0000
Subject: [PATCH 049/317] STYLE:rotorDiskSource: unused variables

---
 .../basicSource/rotorDiskSource/rotorDiskSource.C            | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/fieldSources/basicSource/rotorDiskSource/rotorDiskSource.C b/src/fieldSources/basicSource/rotorDiskSource/rotorDiskSource.C
index 80e12aae66..8177c02efa 100644
--- a/src/fieldSources/basicSource/rotorDiskSource/rotorDiskSource.C
+++ b/src/fieldSources/basicSource/rotorDiskSource/rotorDiskSource.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -347,9 +347,6 @@ void Foam::rotorDiskSource::constructGeometry()
 {
     const vectorField& C = mesh_.C();
 
-    const vector rDir = coordSys_.e1();
-    const vector zDir = coordSys_.e3();
-
     forAll(cells_, i)
     {
         const label cellI = cells_[i];

From 32394ef52a97af50cf87957237e404b28981f5e9 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Mon, 19 Mar 2012 10:54:52 +0000
Subject: [PATCH 050/317] BUG: SpalartAllmaras: epsilon misspelled

---
 .../RAS/SpalartAllmaras/SpalartAllmaras.C     | 23 +++++++++----------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/src/turbulenceModels/compressible/RAS/SpalartAllmaras/SpalartAllmaras.C b/src/turbulenceModels/compressible/RAS/SpalartAllmaras/SpalartAllmaras.C
index 7a626474ba..358e6810ec 100644
--- a/src/turbulenceModels/compressible/RAS/SpalartAllmaras/SpalartAllmaras.C
+++ b/src/turbulenceModels/compressible/RAS/SpalartAllmaras/SpalartAllmaras.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -52,7 +52,7 @@ tmp<volScalarField> SpalartAllmaras::chi() const
 
 tmp<volScalarField> SpalartAllmaras::fv1(const volScalarField& chi) const
 {
-    volScalarField chi3(pow3(chi));
+    const volScalarField chi3(pow3(chi));
     return chi3/(chi3 + pow3(Cv1_));
 }
 
@@ -73,7 +73,7 @@ tmp<volScalarField> SpalartAllmaras::fv3
     const volScalarField& fv1
 ) const
 {
-    volScalarField chiByCv2((1/Cv2_)*chi);
+    const volScalarField chiByCv2((1/Cv2_)*chi);
 
     return
         (scalar(1) + chi*fv1)
@@ -96,14 +96,14 @@ tmp<volScalarField> SpalartAllmaras::fw(const volScalarField& Stilda) const
                    Stilda,
                    dimensionedScalar("SMALL", Stilda.dimensions(), SMALL)
                )
-               *sqr(kappa_*d_)
+              *sqr(kappa_*d_)
             ),
             scalar(10.0)
         )
     );
     r.boundaryField() == 0.0;
 
-    volScalarField g(r + Cw2_*(pow6(r) - r));
+    const volScalarField g(r + Cw2_*(pow6(r) - r));
 
     return g*pow((1.0 + pow6(Cw3_))/(pow6(g) + pow6(Cw3_)), 1.0/6.0);
 }
@@ -261,8 +261,7 @@ tmp<volScalarField> SpalartAllmaras::k() const
 {
     WarningIn("tmp<volScalarField> SpalartAllmaras::k() const")
         << "Turbulence kinetic energy not defined for Spalart-Allmaras model. "
-        << "Returning zero field"
-        << endl;
+        << "Returning zero field" << endl;
 
     return tmp<volScalarField>
     (
@@ -294,7 +293,7 @@ tmp<volScalarField> SpalartAllmaras::epsilon() const
         (
             IOobject
             (
-                "epslion",
+                "epsilon",
                 runTime_.timeName(),
                 mesh_
             ),
@@ -347,7 +346,7 @@ tmp<volSymmTensorField> SpalartAllmaras::devRhoReff() const
 
 tmp<fvVectorMatrix> SpalartAllmaras::divDevRhoReff(volVectorField& U) const
 {
-    volScalarField muEff_(muEff());
+    const volScalarField muEff_(muEff());
 
     return
     (
@@ -404,10 +403,10 @@ void SpalartAllmaras::correct()
         d_.correct();
     }
 
-    volScalarField chi(this->chi());
-    volScalarField fv1(this->fv1(chi));
+    const volScalarField chi(this->chi());
+    const volScalarField fv1(this->fv1(chi));
 
-    volScalarField Stilda
+    const volScalarField Stilda
     (
         fv3(chi, fv1)*::sqrt(2.0)*mag(skew(fvc::grad(U_)))
       + fv2(chi, fv1)*nuTilda_/sqr(kappa_*d_)

From c0524a8eebc78a74a68a86a8fcaaa021541169d8 Mon Sep 17 00:00:00 2001
From: laurence <laurence>
Date: Mon, 19 Mar 2012 11:29:03 +0000
Subject: [PATCH 051/317] STYLE: Correct formatting

---
 .../nonUniformField/nonUniformField.C         |  6 ++---
 .../conformalVoronoiMeshConformToSurface.C    | 13 ++++++----
 .../surfaceFeatureExtract.C                   | 24 +++++++++----------
 3 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/nonUniformField/nonUniformField.C b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/nonUniformField/nonUniformField.C
index 5e2d032d91..fc91ed279b 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/nonUniformField/nonUniformField.C
+++ b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/nonUniformField/nonUniformField.C
@@ -82,9 +82,9 @@ Foam::nonUniformField::nonUniformField
     Info<< decrIndent;
 
     Info<< indent << "Cell size field statistics:" << nl
-        << indent << "   Minimum: " << min(surfaceCellSize_).value() << nl
-        << indent << "   Average: " << average(surfaceCellSize_).value() << nl
-        << indent << "   Maximum: " << max(surfaceCellSize_).value() << endl;
+        << indent << "    Minimum: " << min(surfaceCellSize_).value() << nl
+        << indent << "    Average: " << average(surfaceCellSize_).value() << nl
+        << indent << "    Maximum: " << max(surfaceCellSize_).value() << endl;
 
     Info<< decrIndent;
 }
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshConformToSurface.C b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshConformToSurface.C
index bee04b2fbd..989fe2cf95 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshConformToSurface.C
+++ b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshConformToSurface.C
@@ -719,12 +719,15 @@ bool Foam::conformalVoronoiMesh::dualCellSurfaceAllIntersections
 
                         const Foam::point& p = infoList[hitI].hitPoint();
 
-                        const scalar separationDistance
-                            = mag(p - info.hitPoint());
+                        const scalar separationDistance =
+                            mag(p - info.hitPoint());
 
-                        const scalar minSepDist
-                            = sqr(cvMeshControls().removalDistCoeff()
-                             *targetCellSize(p));
+                        const scalar minSepDist =
+                            sqr
+                            (
+                                cvMeshControls().removalDistCoeff()
+                               *targetCellSize(p)
+                            );
 
                         // Reject the point if it is too close to another
                         // surface point.
diff --git a/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtract.C b/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtract.C
index 0c4628e0e5..b02c4c815d 100644
--- a/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtract.C
+++ b/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtract.C
@@ -157,12 +157,12 @@ scalarField calcCurvature(const triSurface& surf)
 //                 << monge_fit.condition_number() << nl << std::endl;
 
         // Use the maximum curvature to give smaller cell sizes later.
-        k[vertI++]
-            = max
-              (
-                   mag(monge_form.principal_curvatures(0)),
-                   mag(monge_form.principal_curvatures(1))
-              );
+        k[vertI++] =
+            max
+            (
+                mag(monge_form.principal_curvatures(0)),
+                mag(monge_form.principal_curvatures(1))
+            );
     }
 
     return k;
@@ -174,8 +174,10 @@ bool edgesConnected(const edge& e1, const edge& e2)
 {
     if
     (
-        e1.start() == e2.start() || e1.start() == e2.end()
-     || e1.end() == e2.start() || e1.end() == e2.end()
+        e1.start() == e2.start()
+     || e1.start() == e2.end()
+     || e1.end() == e2.start()
+     || e1.end() == e2.end()
     )
     {
         return true;
@@ -265,8 +267,8 @@ scalar calcProximityOfFeatureEdges
                     // Don't refine if the edges are connected to each other
                     if (!edgesConnected(e1, e2))
                     {
-                        scalar curDist
-                            = mag(pHit1.hitPoint() - pHit2.hitPoint());
+                        scalar curDist =
+                            mag(pHit1.hitPoint() - pHit2.hitPoint());
 
                         minDist = min(curDist, minDist);
                     }
@@ -897,8 +899,6 @@ int main(int argc, char *argv[])
 
             scalar span = searchSurf.bounds().mag();
 
-            //args.optionReadIfPresent("closeness", span);
-
             scalar externalAngleTolerance = 10;
             scalar externalToleranceCosAngle =
                 Foam::cos

From 1b19e1dbc0f29e52bb8914925140201391f6f10e Mon Sep 17 00:00:00 2001
From: laurence <laurence>
Date: Mon, 19 Mar 2012 11:29:34 +0000
Subject: [PATCH 052/317] ENH: cvMesh: Initial code for required cell size in
 the style of required alignment

---
 .../conformalVoronoiMesh.C                    | 141 +++++++++++++++++-
 .../conformalVoronoiMesh.H                    |   3 +
 2 files changed, 140 insertions(+), 4 deletions(-)

diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C
index 09d27dfa36..de23690ea4 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C
+++ b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C
@@ -44,6 +44,142 @@ const Foam::scalar Foam::conformalVoronoiMesh::tolParallel = 1e-3;
 
 // * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * * //
 
+Foam::scalar Foam::conformalVoronoiMesh::requiredSize
+(
+    const Foam::point& pt
+) const
+{
+    pointIndexHit surfHit;
+    label hitSurface;
+
+    DynamicList<scalar> cellSizeHits;
+
+    geometryToConformTo_.findSurfaceNearest
+    (
+        pt,
+        sqr(GREAT),
+        surfHit,
+        hitSurface
+    );
+
+    if (!surfHit.hit())
+    {
+        FatalErrorIn
+        (
+            "Foam::tensor Foam::conformalVoronoiMesh::requiredAlignment"
+        )
+            << "findSurfaceNearest did not find a hit across the surfaces."
+            << exit(FatalError) << endl;
+    }
+
+    cellSizeHits.append(cellSizeControl().cellSize(pt));
+
+    // Primary alignment
+
+    vectorField norm(1);
+
+    allGeometry_[hitSurface].getNormal
+    (
+        List<pointIndexHit>(1, surfHit),
+        norm
+    );
+
+    const vector np = norm[0];
+
+    // Generate equally spaced 'spokes' in a circle normal to the
+    // direction from the vertex to the closest point on the surface
+    // and look for a secondary intersection.
+
+    const vector d = surfHit.hitPoint() - pt;
+
+    const tensor Rp = rotationTensor(vector(0,0,1), np);
+
+    const label s = cvMeshControls().alignmentSearchSpokes();
+
+    const scalar spanMag = geometryToConformTo_.globalBounds().mag();
+
+    scalar totalDist = 0;
+
+    for (label i = 0; i < s; i++)
+    {
+        vector spoke
+        (
+            Foam::cos(i*constant::mathematical::twoPi/s),
+            Foam::sin(i*constant::mathematical::twoPi/s),
+            0
+        );
+
+        spoke *= spanMag;
+
+        spoke = Rp & spoke;
+
+        pointIndexHit spokeHit;
+
+        label spokeSurface = -1;
+
+        // internal spoke
+
+        geometryToConformTo_.findSurfaceNearestIntersection
+        (
+            pt,
+            pt + spoke,
+            spokeHit,
+            spokeSurface
+        );
+
+        if (spokeHit.hit())
+        {
+            const Foam::point& hitPt = spokeHit.hitPoint();
+
+            scalar spokeHitDistance = mag(hitPt - pt);
+
+            cellSizeHits.append
+            (
+                cellSizeControl().cellSize(hitPt)
+            );
+
+            totalDist += spokeHitDistance;
+        }
+
+        //external spoke
+
+        Foam::point mirrorPt = pt + 2*d;
+
+        geometryToConformTo_.findSurfaceNearestIntersection
+        (
+            mirrorPt,
+            mirrorPt + spoke,
+            spokeHit,
+            spokeSurface
+        );
+
+        if (spokeHit.hit())
+        {
+            const Foam::point& hitPt = spokeHit.hitPoint();
+
+            scalar spokeHitDistance = mag(hitPt - mirrorPt);
+
+            cellSizeHits.append
+            (
+                cellSizeControl().cellSize(hitPt)
+            );
+
+            totalDist += spokeHitDistance;
+        }
+    }
+
+    scalar cellSize = 0;
+
+    forAll(cellSizeHits, hitI)
+    {
+        cellSize += cellSizeHits[hitI];
+    }
+
+    return cellSize/cellSizeHits.size();
+    //return cellSizeControl().cellSize(pt);
+}
+
+
 Foam::tensor Foam::conformalVoronoiMesh::requiredAlignment
 (
     const Foam::point& pt
@@ -828,10 +964,7 @@ void Foam::conformalVoronoiMesh::storeSizesAndAlignments
     {
         sizeAndAlignmentLocations_[i] = topoint(*pit);
 
-        storedSizes_[i] = cellSizeControl().cellSize
-        (
-            sizeAndAlignmentLocations_[i]
-        );
+        storedSizes_[i] = requiredSize(sizeAndAlignmentLocations_[i]);
 
         storedAlignments_[i] = requiredAlignment(sizeAndAlignmentLocations_[i]);
 
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.H b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.H
index 81ce496c71..cde15d0662 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.H
+++ b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.H
@@ -268,6 +268,9 @@ private:
         //- Return the local maximum surface protrusion distance
         inline scalar maxSurfaceProtrusion(const Foam::point& pt) const;
 
+        //- Return the required cell size at the given location
+        scalar requiredSize(const Foam::point& pt) const;
+
         //- Return the required alignment directions at the given location
         tensor requiredAlignment(const Foam::point& pt) const;
 

From ce68fb16a3f96b885eb3291c0fc36565cdaefa7b Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Mon, 19 Mar 2012 11:41:37 +0000
Subject: [PATCH 053/317] ENH: Removed redundant molecularDynamics code

---
 .../old/mdTools/averageMDFields.H             | 227 ---------
 .../calculateAutoCorrelationFunctions.H       |  77 ---
 .../old/mdTools/calculateMDFields.H           |  23 -
 .../mdTools/calculateTransportProperties.H    |  81 ---
 .../mdTools/createAutoCorrelationFunctions.H  |  98 ----
 .../old/mdTools/createMDFields.H              | 324 ------------
 .../old/mdTools/createRefUnits.H              |  22 -
 .../molecularDynamics/old/mdTools/md.H        |   9 -
 .../old/mdTools/meanMomentumEnergyAndNMols.H  | 180 -------
 .../old/mdTools/resetMDFields.H               |  26 -
 .../old/mdTools/temperatureAndPressure.H      | 111 ----
 .../mdTools/temperatureAndPressureVariables.H |  62 ---
 .../old/mdTools/temperatureEquilibration.H    |  42 --
 .../old/molecularMeasurements/Make/files      |   3 -
 .../old/molecularMeasurements/Make/options    |   0
 .../bufferedAccumulator/bufferedAccumulator.C | 236 ---------
 .../bufferedAccumulator/bufferedAccumulator.H | 176 -------
 .../bufferedAccumulatorI.H                    |  79 ---
 .../bufferedAccumulatorIO.C                   |  51 --
 .../correlationFunction/correlationFunction.C | 223 --------
 .../correlationFunction/correlationFunction.H | 181 -------
 .../correlationFunctionI.H                    |  69 ---
 .../correlationFunctionIO.C                   |  71 ---
 .../distribution/distribution.C               | 478 ------------------
 .../distribution/distribution.H               | 148 ------
 .../distribution/distributionI.H              |  34 --
 .../old/reducedUnits/reducedUnits.C           | 164 ------
 .../old/reducedUnits/reducedUnits.H           | 182 -------
 .../old/reducedUnits/reducedUnitsI.H          |  94 ----
 .../old/reducedUnits/reducedUnitsIO.C         |  60 ---
 30 files changed, 3531 deletions(-)
 delete mode 100644 src/lagrangian/molecularDynamics/old/mdTools/averageMDFields.H
 delete mode 100644 src/lagrangian/molecularDynamics/old/mdTools/calculateAutoCorrelationFunctions.H
 delete mode 100644 src/lagrangian/molecularDynamics/old/mdTools/calculateMDFields.H
 delete mode 100644 src/lagrangian/molecularDynamics/old/mdTools/calculateTransportProperties.H
 delete mode 100644 src/lagrangian/molecularDynamics/old/mdTools/createAutoCorrelationFunctions.H
 delete mode 100644 src/lagrangian/molecularDynamics/old/mdTools/createMDFields.H
 delete mode 100644 src/lagrangian/molecularDynamics/old/mdTools/createRefUnits.H
 delete mode 100644 src/lagrangian/molecularDynamics/old/mdTools/md.H
 delete mode 100644 src/lagrangian/molecularDynamics/old/mdTools/meanMomentumEnergyAndNMols.H
 delete mode 100644 src/lagrangian/molecularDynamics/old/mdTools/resetMDFields.H
 delete mode 100644 src/lagrangian/molecularDynamics/old/mdTools/temperatureAndPressure.H
 delete mode 100644 src/lagrangian/molecularDynamics/old/mdTools/temperatureAndPressureVariables.H
 delete mode 100644 src/lagrangian/molecularDynamics/old/mdTools/temperatureEquilibration.H
 delete mode 100644 src/lagrangian/molecularDynamics/old/molecularMeasurements/Make/files
 delete mode 100644 src/lagrangian/molecularDynamics/old/molecularMeasurements/Make/options
 delete mode 100644 src/lagrangian/molecularDynamics/old/molecularMeasurements/bufferedAccumulator/bufferedAccumulator.C
 delete mode 100644 src/lagrangian/molecularDynamics/old/molecularMeasurements/bufferedAccumulator/bufferedAccumulator.H
 delete mode 100644 src/lagrangian/molecularDynamics/old/molecularMeasurements/bufferedAccumulator/bufferedAccumulatorI.H
 delete mode 100644 src/lagrangian/molecularDynamics/old/molecularMeasurements/bufferedAccumulator/bufferedAccumulatorIO.C
 delete mode 100644 src/lagrangian/molecularDynamics/old/molecularMeasurements/correlationFunction/correlationFunction.C
 delete mode 100644 src/lagrangian/molecularDynamics/old/molecularMeasurements/correlationFunction/correlationFunction.H
 delete mode 100644 src/lagrangian/molecularDynamics/old/molecularMeasurements/correlationFunction/correlationFunctionI.H
 delete mode 100644 src/lagrangian/molecularDynamics/old/molecularMeasurements/correlationFunction/correlationFunctionIO.C
 delete mode 100644 src/lagrangian/molecularDynamics/old/molecularMeasurements/distribution/distribution.C
 delete mode 100644 src/lagrangian/molecularDynamics/old/molecularMeasurements/distribution/distribution.H
 delete mode 100644 src/lagrangian/molecularDynamics/old/molecularMeasurements/distribution/distributionI.H
 delete mode 100644 src/lagrangian/molecularDynamics/old/reducedUnits/reducedUnits.C
 delete mode 100644 src/lagrangian/molecularDynamics/old/reducedUnits/reducedUnits.H
 delete mode 100644 src/lagrangian/molecularDynamics/old/reducedUnits/reducedUnitsI.H
 delete mode 100644 src/lagrangian/molecularDynamics/old/reducedUnits/reducedUnitsIO.C

diff --git a/src/lagrangian/molecularDynamics/old/mdTools/averageMDFields.H b/src/lagrangian/molecularDynamics/old/mdTools/averageMDFields.H
deleted file mode 100644
index a19febe07b..0000000000
--- a/src/lagrangian/molecularDynamics/old/mdTools/averageMDFields.H
+++ /dev/null
@@ -1,227 +0,0 @@
-if (runTime.outputTime())
-{
-    /*-----------------------------------------------------------------------*\
-        Number density
-    \*-----------------------------------------------------------------------*/
-
-    scalarField totalRhoN_sum(mesh.nCells(), 0.0);
-
-    forAll(allSpeciesRhoN, rN)
-    {
-        allSpeciesRhoN[rN].internalField() =
-            allSpeciesN_RU[rN]
-            /mesh.cellVolumes()
-            /nAveragingSteps;
-
-        totalRhoN_sum += allSpeciesRhoN[rN].internalField();
-    }
-
-    totalRhoN.internalField() = totalRhoN_sum;
-
-
-    /*-----------------------------------------------------------------------*\
-        Mass density
-    \*-----------------------------------------------------------------------*/
-
-    scalarField totalRhoM_sum(mesh.nCells(), 0.0);
-
-    forAll(allSpeciesRhoM, rM)
-    {
-        allSpeciesRhoM[rM].internalField() =
-            allSpeciesM_RU[rM]
-            /mesh.cellVolumes()
-            /nAveragingSteps;
-
-        totalRhoM_sum += allSpeciesRhoM[rM].internalField();
-    }
-
-    totalRhoM.internalField() = totalRhoM_sum;
-
-    /*-----------------------------------------------------------------------*\
-        Bulk velocity
-    \*-----------------------------------------------------------------------*/
-
-    vectorField totalMomentum_sum(mesh.nCells(), vector::zero);
-
-    scalarField totalMass_sum(mesh.nCells(), 0.0);
-
-    forAll(allSpeciesVelocity, v)
-    {
-        // A check for 1/0 molecules is required.
-
-        vectorField& singleSpeciesVelocity
-        (
-            allSpeciesVelocity[v].internalField()
-        );
-
-        forAll(singleSpeciesVelocity, sSV)
-        {
-            if (allSpeciesN_RU[v][sSV])
-            {
-                singleSpeciesVelocity[sSV] =
-                    allSpeciesVelocitySum_RU[v][sSV]
-                    /allSpeciesN_RU[v][sSV];
-
-                totalMomentum_sum[sSV] +=
-                    allSpeciesM_RU[v][sSV]
-                    /allSpeciesN_RU[v][sSV]
-                    *allSpeciesVelocitySum_RU[v][sSV];
-
-                totalMass_sum[sSV] += allSpeciesM_RU[v][sSV];
-            }
-            else
-            {
-                singleSpeciesVelocity[sSV] = vector::zero;
-            }
-        }
-    }
-
-    volVectorField::InternalField& itotalVelocity =
-        totalVelocity.internalField();
-
-    forAll(itotalVelocity, tV)
-    {
-        if (totalMass_sum[tV] > VSMALL)
-        {
-            itotalVelocity[tV] = totalMomentum_sum[tV]/totalMass_sum[tV];
-        }
-        else
-        {
-            itotalVelocity[tV] = vector::zero;
-        }
-    }
-
-    /*-----------------------------------------------------------------------*\
-        Kinetic temperature
-    \*-----------------------------------------------------------------------*/
-
-    scalarField totalTemperatureVTerms_sum(mesh.nCells(), 0.0);
-
-    scalarField totalN_sum(mesh.nCells(), 0.0);
-
-    forAll(allSpeciesTemperature, t)
-    {
-        // A check for 1/0 molecules is required.
-
-        scalarField& singleSpeciesTemp
-        (
-            allSpeciesTemperature[t].internalField()
-        );
-
-        forAll(singleSpeciesTemp, sST)
-        {
-            if (allSpeciesN_RU[t][sST])
-            {
-                singleSpeciesTemp[sST] =
-                    allSpeciesM_RU[t][sST]
-                    /allSpeciesN_RU[t][sST]
-                    /(3.0 * moleculeCloud::kb * allSpeciesN_RU[t][sST])
-                   *(
-                        allSpeciesVelocityMagSquaredSum_RU[t][sST]
-                        -
-                        (
-                            allSpeciesVelocitySum_RU[t][sST]
-                            &
-                            allSpeciesVelocitySum_RU[t][sST]
-                        )
-                        /allSpeciesN_RU[t][sST]
-                    );
-
-                totalTemperatureVTerms_sum[sST] +=
-                    allSpeciesM_RU[t][sST]
-                   /allSpeciesN_RU[t][sST]
-                   *(
-                        allSpeciesVelocityMagSquaredSum_RU[t][sST]
-                      -
-                        (
-                            allSpeciesVelocitySum_RU[t][sST]
-                            &
-                            allSpeciesVelocitySum_RU[t][sST]
-                        )
-                        /allSpeciesN_RU[t][sST]
-                    );
-
-                totalN_sum[sST] += allSpeciesN_RU[t][sST];
-            }
-            else
-            {
-                singleSpeciesTemp[sST] = 0.0;
-            }
-        }
-    }
-
-    volScalarField::InternalField& itotalTemperature =
-        totalTemperature.internalField();
-
-    forAll(itotalTemperature, tT)
-    {
-        if (totalN_sum[tT] > 0)
-        {
-            itotalTemperature[tT] =
-                totalTemperatureVTerms_sum[tT]
-                /(3.0 * moleculeCloud::kb * totalN_sum[tT]);
-        }
-        else
-        {
-            itotalTemperature[tT] = 0.0;
-        }
-    }
-
-    /*-----------------------------------------------------------------------*\
-        Mean kinetic energy
-    \*-----------------------------------------------------------------------*/
-
-    scalarField totalKE_sum(mesh.nCells(), 0.0);
-
-    forAll(allSpeciesMeanKE, mKE)
-    {
-        // A check for 1/0 molecules is required.
-
-        scalarField& singleSpeciesMeanKE
-        (
-            allSpeciesMeanKE[mKE].internalField()
-        );
-
-        forAll(singleSpeciesMeanKE, sSMKE)
-        {
-            if (allSpeciesN_RU[mKE][sSMKE])
-            {
-                singleSpeciesMeanKE[sSMKE] =
-                    allSpeciesM_RU[mKE][sSMKE]
-                   /allSpeciesN_RU[mKE][sSMKE]
-                   /(2.0*allSpeciesN_RU[mKE][sSMKE])
-                   *(
-                        allSpeciesVelocityMagSquaredSum_RU[mKE][sSMKE]
-                    );
-
-                totalKE_sum[sSMKE] +=
-                    allSpeciesM_RU[mKE][sSMKE]
-                    /allSpeciesN_RU[mKE][sSMKE]
-                    /2.0
-                   *(
-                        allSpeciesVelocityMagSquaredSum_RU[mKE][sSMKE]
-                    );
-            }
-            else
-            {
-                singleSpeciesMeanKE[sSMKE] = 0.0;
-            }
-        }
-    }
-
-    volScalarField::InternalField& itotalMeanKE = totalMeanKE.internalField();
-
-    forAll(itotalMeanKE, tMKE)
-    {
-        if (totalN_sum[tMKE] > 0)
-        {
-            itotalMeanKE[tMKE] =
-                totalKE_sum[tMKE]
-                /totalN_sum[tMKE];
-        }
-        else
-        {
-            itotalMeanKE[tMKE] = 0.0;
-        }
-    }
-}
diff --git a/src/lagrangian/molecularDynamics/old/mdTools/calculateAutoCorrelationFunctions.H b/src/lagrangian/molecularDynamics/old/mdTools/calculateAutoCorrelationFunctions.H
deleted file mode 100644
index 4b46bdd0df..0000000000
--- a/src/lagrangian/molecularDynamics/old/mdTools/calculateAutoCorrelationFunctions.H
+++ /dev/null
@@ -1,77 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-if (mesh.time().timeIndex() % vacf.sampleSteps() == 0)
-{
-    Field<vector> uVals(molecules.size());
-
-    label uV = 0;
-
-    forAllConstIter(IDLList<molecule>, molecules, mol)
-    {
-        uVals[uV++] = mol().U();
-    }
-
-    vacf.calculateCorrelationFunction(uVals);
-}
-
-if (mesh.time().timeIndex() % pacf.sampleSteps() == 0)
-{
-    vector p = vector::zero;
-
-    forAllConstIter(IDLList<molecule>, molecules, mol)
-    {
-        p.x() +=
-            mol().mass() * mol().U().y() * mol().U().z()
-          + 0.5*mol().rf().yz();
-
-        p.y() +=
-            mol().mass() * mol().U().z() * mol().U().x()
-          + 0.5*mol().rf().zx();
-
-        p.z() +=
-            mol().mass() * mol().U().x() * mol().U().y()
-          + 0.5*mol().rf().xy();
-    }
-
-    pacf.calculateCorrelationFunction(p);
-}
-
-if (mesh.time().timeIndex() % hfacf.sampleSteps() == 0)
-{
-    vector s = vector::zero;
-
-    forAllConstIter(IDLList<molecule>, molecules, mol)
-    {
-        s +=
-        (
-            0.5*mol().mass()*magSqr(mol().U())
-          + mol().potentialEnergy()
-        )*mol().U()
-      + 0.5*(mol().rf() & mol().U());
-    }
-
-    hfacf.calculateCorrelationFunction(s);
-}
diff --git a/src/lagrangian/molecularDynamics/old/mdTools/calculateMDFields.H b/src/lagrangian/molecularDynamics/old/mdTools/calculateMDFields.H
deleted file mode 100644
index af5c938da4..0000000000
--- a/src/lagrangian/molecularDynamics/old/mdTools/calculateMDFields.H
+++ /dev/null
@@ -1,23 +0,0 @@
-const List<DynamicList<molecule*> >& cellOccupancy = molecules.cellOccupancy();
-
-forAll(cellOccupancy, cell)
-{
-    const List<molecule*>& molsInCell = cellOccupancy[cell];
-
-    forAll(molsInCell, mIC)
-    {
-        molecule* mol = molsInCell[mIC];
-
-        const label molId = mol->id();
-
-        const vector& molU = mol->U();
-
-        allSpeciesN_RU[molId][cell]++;
-
-        allSpeciesM_RU[molId][cell] += mol->mass();
-
-        allSpeciesVelocitySum_RU[molId][cell] += molU;
-
-        allSpeciesVelocityMagSquaredSum_RU[molId][cell] += molU & molU;
-    }
-}
diff --git a/src/lagrangian/molecularDynamics/old/mdTools/calculateTransportProperties.H b/src/lagrangian/molecularDynamics/old/mdTools/calculateTransportProperties.H
deleted file mode 100644
index 72af8f3657..0000000000
--- a/src/lagrangian/molecularDynamics/old/mdTools/calculateTransportProperties.H
+++ /dev/null
@@ -1,81 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-if (writeVacf)
-{
-    OFstream vacfFile(runTime.path()/"vacf");
-
-    if (!vacf.writeAveraged(vacfFile))
-    {
-        FatalErrorIn(args.executable())
-            << "Failed writing to "
-            << vacfFile.name()
-            << abort(FatalError);
-    }
-}
-
-Info<< "Diffusion coefficient = "
-    << vacf.integral() << endl;
-
-if (writePacf)
-{
-    OFstream pacfFile(runTime.path()/"pacf");
-
-    if (!pacf.writeAveraged(pacfFile))
-    {
-        FatalErrorIn(args.executable())
-            << "Failed writing to "
-            << pacfFile.name()
-            << abort(FatalError);
-    }
-}
-
-Info<< "Viscosity = "
-    << pacf.integral()/averageTemperature/moleculeCloud::kb/meshVolume
-    << endl;
-
-if (writeHFacf)
-{
-    OFstream hfacfFile
-    (
-        runTime.path()/ + "hfacf"
-    );
-
-    if (!hfacf.writeAveraged(hfacfFile))
-    {
-        FatalErrorIn(args.executable())
-            << "Failed writing to "
-            << hfacfFile.name()
-            << abort(FatalError);
-    }
-}
-
-Info<< "Thermal conductivity = "
-    << hfacf.integral()
-        /averageTemperature
-        /averageTemperature
-        /moleculeCloud::kb
-        / meshVolume
-    << endl;
diff --git a/src/lagrangian/molecularDynamics/old/mdTools/createAutoCorrelationFunctions.H b/src/lagrangian/molecularDynamics/old/mdTools/createAutoCorrelationFunctions.H
deleted file mode 100644
index 55fbe14bbc..0000000000
--- a/src/lagrangian/molecularDynamics/old/mdTools/createAutoCorrelationFunctions.H
+++ /dev/null
@@ -1,98 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-Info << nl << "Creating autocorrelation functions." << endl;
-
-IOdictionary mdTransportProperitesDict
-(
-    IOobject
-    (
-        "mdTransportProperitesDict",
-        mesh.time().system(),
-        mesh,
-        IOobject::MUST_READ_IF_MODIFIED,
-        IOobject::NO_WRITE,
-        false
-    )
-);
-
-const dictionary& autocorrelationFunctionDict
-(
-    mdTransportProperitesDict.subDict("autocorrelationFunctions")
-);
-
-//- Velocity autocorrelation function
-
-Info << tab << "velocty" << endl;
-
-const dictionary& velocityACFDict
-(
-    autocorrelationFunctionDict.subDict("velocity")
-);
-
-correlationFunction<vector> vacf
-(
-    mesh,
-    velocityACFDict,
-    molecules.size()
-);
-
-bool writeVacf(Switch(velocityACFDict.lookup("writeFile")));
-
-//- Pressure autocorrelation function
-
-Info << tab << "pressure" << endl;
-
-const dictionary& pressureACFDict
-(
-    autocorrelationFunctionDict.subDict("pressure")
-);
-
-correlationFunction<vector> pacf
-(
-    mesh,
-    pressureACFDict,
-    1
-);
-
-bool writePacf(Switch(pressureACFDict.lookup("writeFile")));
-
-//- Heat flux autocorrelation function
-
-Info << tab << "heat flux" << endl;
-
-const dictionary& heatFluxACFDict
-(
-    autocorrelationFunctionDict.subDict("heatFlux")
-);
-
-correlationFunction<vector> hfacf
-(
-    mesh,
-    heatFluxACFDict,
-    1
-);
-
-bool writeHFacf(Switch(heatFluxACFDict.lookup("writeFile")));
diff --git a/src/lagrangian/molecularDynamics/old/mdTools/createMDFields.H b/src/lagrangian/molecularDynamics/old/mdTools/createMDFields.H
deleted file mode 100644
index 6d6617d652..0000000000
--- a/src/lagrangian/molecularDynamics/old/mdTools/createMDFields.H
+++ /dev/null
@@ -1,324 +0,0 @@
-// Fields for data gathering
-
-List< scalarField > allSpeciesN_RU
-(
-    molecules.potential().nIds(),
-    scalarField (mesh.nCells(), 0.0)
-);
-
-List< scalarField > allSpeciesM_RU
-(
-    molecules.potential().nIds(),
-    scalarField (mesh.nCells(), 0.0)
-);
-
-List< vectorField > allSpeciesVelocitySum_RU
-(
-    molecules.potential().nIds(),
-    vectorField (mesh.nCells(), vector::zero)
-);
-
-List< scalarField > allSpeciesVelocityMagSquaredSum_RU
-(
-    molecules.potential().nIds(),
-    scalarField (mesh.nCells(), 0.0)
-);
-
-// Geometric Fields for IO
-
-Info << nl << "Creating fields." << endl;
-
-/*---------------------------------------------------------------------------*\
-    Number density
-\*---------------------------------------------------------------------------*/
-
-PtrList<volScalarField> allSpeciesRhoN
-(
-    molecules.potential().nIds()
-);
-
-forAll(allSpeciesRhoN, rN)
-{
-    Info<< "    Creating number density field for "
-        << molecules.potential().idList()[rN] << endl;
-
-    allSpeciesRhoN.set
-    (
-        rN,
-        new volScalarField
-        (
-            IOobject
-            (
-                "rhoN_" + molecules.potential().idList()[rN],
-                runTime.timeName(),
-                mesh,
-                IOobject::NO_READ,
-                IOobject::AUTO_WRITE
-            ),
-            mesh,
-            dimless/dimVolume,
-            "zeroGradient"
-        )
-    );
-    allSpeciesRhoN[rN].internalField() = scalarField (mesh.nCells(), 0.0);
-    allSpeciesRhoN[rN].correctBoundaryConditions();
-}
-
-Info << "    Creating total number density field" << endl;
-
-volScalarField totalRhoN
-(
-    IOobject
-    (
-        "rhoN_total",
-        runTime.timeName(),
-        mesh,
-        IOobject::NO_READ,
-        IOobject::AUTO_WRITE
-    ),
-    mesh,
-    dimless/dimVolume,
-    "zeroGradient"
-);
-totalRhoN.internalField() = scalarField (mesh.nCells(), 0.0);
-totalRhoN.correctBoundaryConditions();
-
-/*---------------------------------------------------------------------------*\
-    Mass density
-\*---------------------------------------------------------------------------*/
-
-PtrList<volScalarField> allSpeciesRhoM
-(
-    molecules.potential().nIds()
-);
-
-forAll(allSpeciesRhoM, rM)
-{
-    Info<< "    Creating mass density field for "
-        << molecules.potential().idList()[rM] << endl;
-
-    allSpeciesRhoM.set
-    (
-        rM,
-        new volScalarField
-        (
-            IOobject
-            (
-                "rhoM_" + molecules.potential().idList()[rM],
-                runTime.timeName(),
-                mesh,
-                IOobject::NO_READ,
-                IOobject::AUTO_WRITE
-            ),
-            mesh,
-            dimMass/dimVolume,
-            "zeroGradient"
-        )
-    );
-    allSpeciesRhoM[rM].internalField() = scalarField (mesh.nCells(), 0.0);
-    allSpeciesRhoM[rM].correctBoundaryConditions();
-}
-
-Info << "    Creating total mass density field" << endl;
-
-volScalarField totalRhoM
-(
-    IOobject
-    (
-        "rhoM_total",
-        runTime.timeName(),
-        mesh,
-        IOobject::NO_READ,
-        IOobject::AUTO_WRITE
-    ),
-    mesh,
-    dimMass/dimVolume,
-    "zeroGradient"
-);
-totalRhoM.internalField() = scalarField (mesh.nCells(), 0.0);
-totalRhoM.correctBoundaryConditions();
-
-/*---------------------------------------------------------------------------*\
-    Bulk velocity
-\*---------------------------------------------------------------------------*/
-
-PtrList<volVectorField> allSpeciesVelocity
-(
-    molecules.potential().nIds()
-);
-
-forAll(allSpeciesVelocity, v)
-{
-    Info<< "    Creating velocity field for "
-        << molecules.potential().idList()[v] << endl;
-
-    allSpeciesVelocity.set
-    (
-        v,
-        new volVectorField
-        (
-            IOobject
-            (
-                "velocity_" + molecules.potential().idList()[v],
-                runTime.timeName(),
-                mesh,
-                IOobject::NO_READ,
-                IOobject::AUTO_WRITE
-            ),
-            mesh,
-            dimVelocity,
-            "zeroGradient"
-        )
-    );
-    allSpeciesVelocity[v].internalField() =
-        vectorField (mesh.nCells(), vector::zero);
-    allSpeciesVelocity[v].correctBoundaryConditions();
-}
-
-Info << "    Creating total velocity field" << endl;
-
-// volVectorField totalVelocity
-// (
-//     IOobject
-//     (
-//         "velocity_total",
-//         runTime.timeName(),
-//         mesh,
-//         IOobject::NO_READ,
-//         IOobject::AUTO_WRITE
-//     ),
-//     mesh,
-//     dimVelocity,
-//     "zeroGradient"
-// );
-// totalVelocity.internalField() = vectorField (mesh.nCells(), vector::zero);
-// totalVelocity.correctBoundaryConditions();
-
-
-volVectorField totalVelocity
-
-(
-    IOobject
-    (
-
-    "velocity_total",
-    runTime.timeName(),
-    mesh,
-    IOobject::NO_READ,
-    IOobject::AUTO_WRITE
-
-    ),
-    mesh,
-    dimensionedVector("zero", dimVelocity, vector::zero)
-);
-
-/*---------------------------------------------------------------------------*\
-    Kinetic temperature
-\*---------------------------------------------------------------------------*/
-
-PtrList<volScalarField> allSpeciesTemperature
-(
-    molecules.potential().nIds()
-);
-
-forAll(allSpeciesTemperature, t)
-{
-    Info<< "    Creating temperature field for "
-        << molecules.potential().idList()[t] << endl;
-
-    allSpeciesTemperature.set
-    (
-        t,
-        new volScalarField
-        (
-            IOobject
-            (
-                "temperature_" + molecules.potential().idList()[t],
-                runTime.timeName(),
-                mesh,
-                IOobject::NO_READ,
-                IOobject::AUTO_WRITE
-            ),
-            mesh,
-            dimTemperature,
-            "zeroGradient"
-        )
-    );
-    allSpeciesTemperature[t].internalField() = scalarField (mesh.nCells(), 0.0);
-    allSpeciesTemperature[t].correctBoundaryConditions();
-}
-
-Info << "    Creating total temperature field" << endl;
-
-volScalarField totalTemperature
-(
-    IOobject
-    (
-        "temperature_total",
-        runTime.timeName(),
-        mesh,
-        IOobject::NO_READ,
-        IOobject::AUTO_WRITE
-    ),
-    mesh,
-    dimTemperature,
-    "zeroGradient"
-);
-totalTemperature.internalField() = scalarField (mesh.nCells(), 0.0);
-totalTemperature.correctBoundaryConditions();
-
-/*---------------------------------------------------------------------------*\
-    Mean kinetic energy
-\*---------------------------------------------------------------------------*/
-
-
-PtrList<volScalarField> allSpeciesMeanKE
-(
-    molecules.potential().nIds()
-);
-
-forAll(allSpeciesMeanKE, mKE)
-{
-    Info<< "    Creating mean kinetic energy field for "
-        << molecules.potential().idList()[mKE] << endl;
-
-    allSpeciesMeanKE.set
-    (
-        mKE,
-        new volScalarField
-        (
-            IOobject
-            (
-                "meanKE_" + molecules.potential().idList()[mKE],
-                runTime.timeName(),
-                mesh,
-                IOobject::NO_READ,
-                IOobject::AUTO_WRITE
-            ),
-            mesh,
-            dimensionSet(1, 2, -2, 0, 0, 0, 0),
-            "zeroGradient"
-        )
-    );
-    allSpeciesMeanKE[mKE].internalField() = scalarField (mesh.nCells(), 0.0);
-    allSpeciesMeanKE[mKE].correctBoundaryConditions();
-}
-
-Info << "    Creating total mean kinetic energy field" << endl;
-
-volScalarField totalMeanKE
-(
-    IOobject
-    (
-        "meanKE_total",
-        runTime.timeName(),
-        mesh,
-        IOobject::NO_READ,
-        IOobject::AUTO_WRITE
-    ),
-    mesh,
-    dimensionSet(1, 2, -2, 0, 0, 0, 0),
-    "zeroGradient"
-);
-totalMeanKE.internalField() = scalarField (mesh.nCells(), 0.0);
-totalMeanKE.correctBoundaryConditions();
diff --git a/src/lagrangian/molecularDynamics/old/mdTools/createRefUnits.H b/src/lagrangian/molecularDynamics/old/mdTools/createRefUnits.H
deleted file mode 100644
index c1e558b221..0000000000
--- a/src/lagrangian/molecularDynamics/old/mdTools/createRefUnits.H
+++ /dev/null
@@ -1,22 +0,0 @@
-reducedUnits refUnits;
-
-IOobject reducedUnitsDictIOobject
-(
-    "reducedUnitsDict",
-    runTime.system(),
-    mesh,
-    IOobject::READ_IF_PRESENT,
-    IOobject::NO_WRITE
-);
-
-if (reducedUnitsDictIOobject.headerOk())
-{
-    Info<< nl
-        << "Reading reference quantities from reducedUnitsDict file." << endl;
-
-    IOdictionary reducedUnitsDict(reducedUnitsDictIOobject);
-
-    refUnits.setRefValues(reducedUnitsDict);
-}
-
-Info << refUnits << endl;
diff --git a/src/lagrangian/molecularDynamics/old/mdTools/md.H b/src/lagrangian/molecularDynamics/old/mdTools/md.H
deleted file mode 100644
index 9a079764ae..0000000000
--- a/src/lagrangian/molecularDynamics/old/mdTools/md.H
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef md_H
-#define md_H
-    #include "potential.H"
-    #include "moleculeCloud.H"
-    #include "correlationFunction.H"
-    #include "distribution.H"
-    #include "reducedUnits.H"
-#endif
-
diff --git a/src/lagrangian/molecularDynamics/old/mdTools/meanMomentumEnergyAndNMols.H b/src/lagrangian/molecularDynamics/old/mdTools/meanMomentumEnergyAndNMols.H
deleted file mode 100644
index ae117cafc5..0000000000
--- a/src/lagrangian/molecularDynamics/old/mdTools/meanMomentumEnergyAndNMols.H
+++ /dev/null
@@ -1,180 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-Global
-    meanMomentumEnergyAndNMols.H
-
-Description
-    Calculates and prints the mean momentum and energy in the system
-    and the number of molecules.
-
-\*---------------------------------------------------------------------------*/
-
-
-vector singleStepTotalLinearMomentum(vector::zero);
-
-vector singleStepTotalAngularMomentum(vector::zero);
-
-scalar singleStepMaxVelocityMag = 0.0;
-
-scalar singleStepTotalMass = 0.0;
-
-scalar singleStepTotalLinearKE = 0.0;
-
-scalar singleStepTotalAngularKE = 0.0;
-
-scalar singleStepTotalPE = 0.0;
-
-scalar singleStepTotalrDotf = 0.0;
-
-//vector singleStepCentreOfMass(vector::zero);
-
-label singleStepNMols = molecules.size();
-
-label singleStepDOFs = 0;
-
-{
-    forAllConstIter(IDLList<molecule>, molecules, mol)
-    {
-        const label molId = mol().id();
-
-        scalar molMass(molecules.constProps(molId).mass());
-
-        singleStepTotalMass += molMass;
-
-        //singleStepCentreOfMass += mol().position()*molMass;
-    }
-
-    // if (singleStepNMols)
-    // {
-    //     singleStepCentreOfMass /= singleStepTotalMass;
-    // }
-
-    forAllConstIter(IDLList<molecule>, molecules, mol)
-    {
-        const label molId = mol().id();
-
-        const molecule::constantProperties cP(molecules.constProps(molId));
-
-        scalar molMass(cP.mass());
-
-        const diagTensor& molMoI(cP.momentOfInertia());
-
-        const vector& molV(mol().v());
-
-        const vector& molOmega(inv(molMoI) & mol().pi());
-
-        vector molPiGlobal = mol().Q() & mol().pi();
-
-        singleStepTotalLinearMomentum += molV * molMass;
-
-        singleStepTotalAngularMomentum += molPiGlobal;
-        //+((mol().position() - singleStepCentreOfMass) ^ (molV * molMass));
-
-        if (mag(molV) > singleStepMaxVelocityMag)
-        {
-            singleStepMaxVelocityMag = mag(molV);
-        }
-
-        singleStepTotalLinearKE += 0.5*molMass*magSqr(molV);
-
-        singleStepTotalAngularKE += 0.5*(molOmega & molMoI & molOmega);
-
-        singleStepTotalPE += mol().potentialEnergy();
-
-        singleStepTotalrDotf += tr(mol().rf());
-
-        singleStepDOFs += cP.degreesOfFreedom();
-    }
-}
-
-if (Pstream::parRun())
-{
-    reduce(singleStepTotalLinearMomentum, sumOp<vector>());
-
-    reduce(singleStepTotalAngularMomentum, sumOp<vector>());
-
-    reduce(singleStepMaxVelocityMag, maxOp<scalar>());
-
-    reduce(singleStepTotalMass, sumOp<scalar>());
-
-    reduce(singleStepTotalLinearKE, sumOp<scalar>());
-
-    reduce(singleStepTotalAngularKE, sumOp<scalar>());
-
-    reduce(singleStepTotalPE, sumOp<scalar>());
-
-    reduce(singleStepTotalrDotf, sumOp<scalar>());
-
-    reduce(singleStepNMols, sumOp<label>());
-
-    reduce(singleStepDOFs, sumOp<label>());
-}
-
-if (singleStepNMols)
-{
-    Info<< "Number of molecules in system = "
-        << singleStepNMols << nl
-        << "Overall number density = "
-        << singleStepNMols/meshVolume << nl
-        << "Overall mass density = "
-        << singleStepTotalMass/meshVolume << nl
-        << "Average linear momentum per molecule = "
-        << singleStepTotalLinearMomentum/singleStepNMols << ' '
-        << mag(singleStepTotalLinearMomentum)/singleStepNMols << nl
-        << "Average angular momentum per molecule = "
-        << singleStepTotalAngularMomentum << ' '
-        << mag(singleStepTotalAngularMomentum)/singleStepNMols << nl
-        << "Maximum |velocity| = "
-        << singleStepMaxVelocityMag << nl
-        << "Average linear KE per molecule = "
-        << singleStepTotalLinearKE/singleStepNMols << nl
-        << "Average angular KE per molecule = "
-        << singleStepTotalAngularKE/singleStepNMols << nl
-        << "Average PE per molecule = "
-        << singleStepTotalPE/singleStepNMols << nl
-        << "Average TE per molecule = "
-        <<
-        (
-            singleStepTotalLinearKE
-          + singleStepTotalAngularKE
-          + singleStepTotalPE
-        )
-        /singleStepNMols
-        << endl;
-
-        // Info<< singleStepNMols << " "
-        //     << singleStepTotalMomentum/singleStepTotalMass << " "
-        //     << singleStepMaxVelocityMag << " "
-        //     << singleStepTotalKE/singleStepNMols << " "
-        //     << singleStepTotalPE/singleStepNMols << " "
-        //     << (singleStepTotalKE + singleStepTotalPE)
-        //        /singleStepNMols << endl;
-}
-else
-{
-    Info<< "No molecules in system" << endl;
-}
-
-
-// ************************************************************************* //
diff --git a/src/lagrangian/molecularDynamics/old/mdTools/resetMDFields.H b/src/lagrangian/molecularDynamics/old/mdTools/resetMDFields.H
deleted file mode 100644
index af0197b5fe..0000000000
--- a/src/lagrangian/molecularDynamics/old/mdTools/resetMDFields.H
+++ /dev/null
@@ -1,26 +0,0 @@
-if (runTime.outputTime())
-{
-    allSpeciesN_RU = List< scalarField >
-    (
-        molecules.potential().nIds(),
-        scalarField(mesh.nCells(), 0.0)
-    );
-
-    allSpeciesM_RU = List< scalarField >
-    (
-        molecules.potential().nIds(),
-        scalarField(mesh.nCells(), 0.0)
-    );
-
-    allSpeciesVelocitySum_RU = List< vectorField >
-    (
-        molecules.potential().nIds(),
-        vectorField(mesh.nCells(), vector::zero)
-    );
-
-    allSpeciesVelocityMagSquaredSum_RU = List< scalarField >
-    (
-        molecules.potential().nIds(),
-        scalarField(mesh.nCells(), 0.0)
-    );
-}
diff --git a/src/lagrangian/molecularDynamics/old/mdTools/temperatureAndPressure.H b/src/lagrangian/molecularDynamics/old/mdTools/temperatureAndPressure.H
deleted file mode 100644
index df182244d2..0000000000
--- a/src/lagrangian/molecularDynamics/old/mdTools/temperatureAndPressure.H
+++ /dev/null
@@ -1,111 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-Global
-    temperatureAndPressure.H
-
-Description
-    Accumulates values for temperature and pressure measurement, and
-    calculates and outputs the average values at output times.
-    Requires temperatureAndPressureVariables.H to be declared before the
-    timeloop.
-
-\*---------------------------------------------------------------------------*/
-
-accumulatedTotalLinearMomentum += singleStepTotalLinearMomentum;
-
-accumulatedTotalMass += singleStepTotalMass;
-
-accumulatedTotalLinearKE += singleStepTotalLinearKE;
-
-accumulatedTotalAngularKE += singleStepTotalAngularKE;
-
-accumulatedTotalPE += singleStepTotalPE;
-
-accumulatedTotalrDotfSum += singleStepTotalrDotf;
-
-accumulatedNMols += singleStepNMols;
-
-accumulatedDOFs += singleStepDOFs;
-
-if (runTime.outputTime())
-{
-    if (accumulatedNMols)
-    {
-        Info<< "calculating averages" << endl;
-
-        averageTemperature =
-        (
-            2.0/(physicoChemical::k.value()*accumulatedDOFs)
-            *
-            (
-                accumulatedTotalLinearKE + accumulatedTotalAngularKE
-                -
-                0.5*magSqr(accumulatedTotalLinearMomentum)/accumulatedTotalMass
-            )
-        );
-
-        averagePressure =
-        (
-            (
-                (accumulatedNMols/nAveragingSteps)
-               *physicoChemical::k.value()*averageTemperature
-              + accumulatedTotalrDotfSum/(6.0*nAveragingSteps)
-            )
-            /
-            meshVolume
-        );
-
-        Info<< "----------------------------------------" << nl
-            << "Averaged properties" << nl
-            << "Average |velocity| = "
-            << mag(accumulatedTotalLinearMomentum)/accumulatedTotalMass << nl
-            << "Average temperature = " << averageTemperature << nl
-            << "Average pressure = " << averagePressure << nl
-            << "----------------------------------------" << endl;
-    }
-    else
-    {
-        Info<< "Not averaging temperature and pressure: "
-            << "no molecules in system" << endl;
-    }
-
-    accumulatedTotalLinearMomentum = vector::zero;
-
-    accumulatedTotalMass = 0.0;
-
-    accumulatedTotalLinearKE = 0.0;
-
-    accumulatedTotalAngularKE = 0.0;
-
-    accumulatedTotalPE = 0.0;
-
-    accumulatedTotalrDotfSum = 0.0;
-
-    accumulatedNMols = 0;
-
-    accumulatedDOFs = 0;
-}
-
-
-// ************************************************************************* //
diff --git a/src/lagrangian/molecularDynamics/old/mdTools/temperatureAndPressureVariables.H b/src/lagrangian/molecularDynamics/old/mdTools/temperatureAndPressureVariables.H
deleted file mode 100644
index d0aa0aabe8..0000000000
--- a/src/lagrangian/molecularDynamics/old/mdTools/temperatureAndPressureVariables.H
+++ /dev/null
@@ -1,62 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-Global
-    temperatureAndPressureVariables.H
-
-Description
-    Provides accumulation variables for temperatureAndPressure.H
-
-\*---------------------------------------------------------------------------*/
-
-vector accumulatedTotalLinearMomentum(vector::zero);
-
-scalar accumulatedTotalMass = 0.0;
-
-scalar accumulatedTotalAngularKE = 0.0;
-
-scalar accumulatedTotalLinearKE = 0.0;
-
-scalar accumulatedTotalPE = 0.0;
-
-scalar accumulatedTotalrDotfSum = 0.0;
-
-label accumulatedNMols = 0;
-
-label accumulatedDOFs = 0;
-
-scalar averageTemperature = 0.0;
-
-scalar averagePressure = 0.0;
-
-const scalarField& cellVols = mesh.cellVolumes();
-
-scalar meshVolume = sum(cellVols);
-
-if (Pstream::parRun())
-{
-    reduce(meshVolume, sumOp<scalar>());
-}
-
-
-// ************************************************************************* //
diff --git a/src/lagrangian/molecularDynamics/old/mdTools/temperatureEquilibration.H b/src/lagrangian/molecularDynamics/old/mdTools/temperatureEquilibration.H
deleted file mode 100644
index 78a1e42d9b..0000000000
--- a/src/lagrangian/molecularDynamics/old/mdTools/temperatureEquilibration.H
+++ /dev/null
@@ -1,42 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-Global
-    temperatureEquilibration.H
-
-Description
-    Applies temperature control to molecules
-
-\*---------------------------------------------------------------------------*/
-
-if (runTime.outputTime())
-{
-    molecules.applyConstraintsAndThermostats
-    (
-        targetTemperature,
-        averageTemperature
-    );
-}
-
-
-// ************************************************************************* //
diff --git a/src/lagrangian/molecularDynamics/old/molecularMeasurements/Make/files b/src/lagrangian/molecularDynamics/old/molecularMeasurements/Make/files
deleted file mode 100644
index 8450dc8360..0000000000
--- a/src/lagrangian/molecularDynamics/old/molecularMeasurements/Make/files
+++ /dev/null
@@ -1,3 +0,0 @@
-distribution/distribution.C
-
-LIB = $(FOAM_LIBBIN)/libmolecularMeasurements
diff --git a/src/lagrangian/molecularDynamics/old/molecularMeasurements/Make/options b/src/lagrangian/molecularDynamics/old/molecularMeasurements/Make/options
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/src/lagrangian/molecularDynamics/old/molecularMeasurements/bufferedAccumulator/bufferedAccumulator.C b/src/lagrangian/molecularDynamics/old/molecularMeasurements/bufferedAccumulator/bufferedAccumulator.C
deleted file mode 100644
index 2163688da9..0000000000
--- a/src/lagrangian/molecularDynamics/old/molecularMeasurements/bufferedAccumulator/bufferedAccumulator.C
+++ /dev/null
@@ -1,236 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "bufferedAccumulator.H"
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-template<class Type>
-const char* const
-    Foam::bufferedAccumulator<Type>::typeName("bufferedAccumulator");
-
-
-// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
-
-template<class Type>
-void Foam::bufferedAccumulator<Type>::accumulateAndResetBuffer(const label b)
-{
-    accumulationBuffer() += (*this)[b];
-
-    averagesTaken_++;
-
-    (*this)[b] = Field<Type>(bufferLength(), pTraits<Type>::zero);
-
-    bufferOffsets_[b] = 0;
-}
-
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-template<class Type>
-Foam::bufferedAccumulator<Type>::bufferedAccumulator()
-:
-    List< Field<Type> >(),
-    averagesTaken_(),
-    bufferOffsets_()
-{}
-
-
-template<class Type>
-Foam::bufferedAccumulator<Type>::bufferedAccumulator
-(
-    const label nBuffers,
-    const label bufferLength,
-    const label bufferingInterval
-)
-:
-    List< Field<Type> >(),
-    averagesTaken_(),
-    bufferOffsets_()
-{
-    setSizes
-    (
-        nBuffers,
-        bufferLength,
-        bufferingInterval
-    );
-}
-
-
-template<class Type>
-Foam::bufferedAccumulator<Type>::bufferedAccumulator
-(
-    const bufferedAccumulator<Type>& bA
-)
-:
-    List< Field<Type> >(static_cast< List< Field<Type> > >(bA)),
-    averagesTaken_(bA.averagesTaken()),
-    bufferOffsets_(bA.bufferOffsets())
-{}
-
-
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
-
-template<class Type>
-Foam::bufferedAccumulator<Type>::~bufferedAccumulator()
-{}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-template<class Type>
-void Foam::bufferedAccumulator<Type>::setSizes
-(
-    const label nBuffers,
-    const label bufferLength,
-    const label bufferingInterval
-)
-{
-    (*this).setSize(nBuffers + 1);
-
-    forAll((*this), b)
-    {
-        (*this)[b] = Field<Type>(bufferLength, pTraits<Type>::zero);
-    }
-
-    averagesTaken_ = 0;
-
-    bufferOffsets_.setSize(nBuffers);
-
-    forAll(bufferOffsets_, bO)
-    {
-        bufferOffsets_[bO] = -bufferingInterval * bO - 1;
-    }
-}
-
-
-template<class Type>
-Foam::label Foam::bufferedAccumulator<Type>::addToBuffers
-(
-    const List<Type>& valuesToAdd
-)
-{
-    label bufferToRefill = -1;
-
-    for (label b = 0; b < nBuffers(); b++)
-    {
-        Field<Type>& buf((*this)[b]);
-
-        label& bO = bufferOffsets_[b];
-
-        if (bO >= 0)
-        {
-            buf[bO] = valuesToAdd[b];
-        }
-
-        bO++;
-
-        if (bO == bufferLength())
-        {
-            accumulateAndResetBuffer(b);
-        }
-
-        if (bO == 0)
-        {
-            if (bufferToRefill != -1)
-            {
-                FatalErrorIn("bufferedAccumulator<Type>::addToBuffers ")
-                    << "More than one bufferedAccumulator accumulation "
-                    << "buffer filled at once, this is considered an error."
-                    << abort(FatalError);
-            }
-
-            bufferToRefill = b;
-        }
-    }
-
-    return bufferToRefill;
-}
-
-
-template<class Type>
-Foam::Field<Type> Foam::bufferedAccumulator<Type>::averaged() const
-{
-    if (averagesTaken_)
-    {
-        Field<Type> bA = accumulationBuffer()/averagesTaken_;
-
-        return bA;
-    }
-    else
-    {
-        WarningIn
-        (
-            "bufferedAccumulator<Type>::averagedbufferedAccumulator() const"
-        )   << "Averaged correlation function requested but averagesTaken = "
-            << averagesTaken_
-            << ". Returning empty field."
-            << endl;
-
-        return Field<Type>(bufferLength(), pTraits<Type>::zero);
-    }
-}
-
-
-template<class Type>
-void Foam::bufferedAccumulator<Type>::resetAveraging()
-{
-    accumulationBuffer() = Field<Type>(bufferLength(), pTraits<Type>::zero);
-
-    averagesTaken_ = 0;
-}
-
-
-// * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
-
-template<class Type>
-void Foam::bufferedAccumulator<Type>::operator=
-(
-    const bufferedAccumulator<Type>& rhs
-)
-{
-    // Check for assignment to self
-    if (this == &rhs)
-    {
-        FatalErrorIn
-        (
-            "bufferedAccumulator<Type>::operator=(const bufferedAccumulator&)"
-        )   << "Attempted assignment to self"
-            << abort(FatalError);
-    }
-
-    List< Field<Type> >::operator=(rhs);
-
-    averagesTaken_ = rhs.averagesTaken();
-
-    bufferOffsets_ = rhs.bufferOffsets();
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#   include "bufferedAccumulatorIO.C"
-
-// ************************************************************************* //
diff --git a/src/lagrangian/molecularDynamics/old/molecularMeasurements/bufferedAccumulator/bufferedAccumulator.H b/src/lagrangian/molecularDynamics/old/molecularMeasurements/bufferedAccumulator/bufferedAccumulator.H
deleted file mode 100644
index 8d462902f4..0000000000
--- a/src/lagrangian/molecularDynamics/old/molecularMeasurements/bufferedAccumulator/bufferedAccumulator.H
+++ /dev/null
@@ -1,176 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-Class
-    Foam::bufferedAccumulator
-
-Description
-
-SourceFiles
-    bufferedAccumulatorI.H
-    bufferedAccumulator.C
-    bufferedAccumulatorIO.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef bufferedAccumulator_H
-#define bufferedAccumulator_H
-
-#include "Field.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-template<class Type>
-class bufferedAccumulator;
-
-template<class Type>
-Ostream& operator<<
-(
-    Ostream&,
-    const bufferedAccumulator<Type>&
-);
-
-/*---------------------------------------------------------------------------*\
-                      Class bufferedAccumulator Declaration
-\*---------------------------------------------------------------------------*/
-
-template<class Type>
-class bufferedAccumulator
-:
-    public List< Field<Type> >
-{
-    // Private data
-
-        label averagesTaken_;
-
-        List<label> bufferOffsets_;
-
-
-    // Private Member Functions
-
-        inline Field<Type>& accumulationBuffer();
-
-        inline const Field<Type>& accumulationBuffer() const;
-
-        void accumulateAndResetBuffer(const label b);
-
-
-public:
-
-    //- Component type
-    typedef typename pTraits<Type>::cmptType cmptType;
-
-
-    // Static data members
-
-        static const char* const typeName;
-
-
-    // Constructors
-
-        //- Construct null
-        bufferedAccumulator();
-
-        //- Construct from components
-        bufferedAccumulator
-        (
-            const label nBuffers,
-            const label bufferLength,
-            const label bufferingInterval
-        );
-
-        //- Construct as copy
-        bufferedAccumulator(const bufferedAccumulator<Type>&);
-
-
-    //- Destructor
-    ~bufferedAccumulator();
-
-
-    // Member Functions
-
-        label addToBuffers(const List<Type>& valuesToAdd);
-
-        Field<Type> averaged() const;
-
-        void resetAveraging();
-
-
-        // Access
-
-            inline label averagesTaken() const;
-
-            inline label nBuffers() const;
-
-            inline label bufferLength() const;
-
-            inline const List<label>& bufferOffsets() const;
-
-
-        // Edit
-
-            void setSizes
-            (
-                const label nBuffers,
-                const label bufferLength,
-                const label bufferingInterval
-            );
-
-
-    // Member Operators
-
-        void operator=(const bufferedAccumulator<Type>&);
-
-
-    // IOstream Operators
-
-        friend Ostream& operator<< <Type>
-        (
-            Ostream&,
-            const bufferedAccumulator<Type>&
-        );
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#include "bufferedAccumulatorI.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#ifdef NoRepository
-#   include "bufferedAccumulator.C"
-#endif
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/lagrangian/molecularDynamics/old/molecularMeasurements/bufferedAccumulator/bufferedAccumulatorI.H b/src/lagrangian/molecularDynamics/old/molecularMeasurements/bufferedAccumulator/bufferedAccumulatorI.H
deleted file mode 100644
index 303b2e5ec0..0000000000
--- a/src/lagrangian/molecularDynamics/old/molecularMeasurements/bufferedAccumulator/bufferedAccumulatorI.H
+++ /dev/null
@@ -1,79 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
-
-template<class Type>
-inline Field<Type>& bufferedAccumulator<Type>::accumulationBuffer()
-{
-    return (*this)[nBuffers()];
-}
-
-
-template<class Type>
-inline const Field<Type>& bufferedAccumulator<Type>::accumulationBuffer() const
-{
-    return (*this)[nBuffers()];
-}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-template<class Type>
-inline label bufferedAccumulator<Type>::averagesTaken() const
-{
-    return averagesTaken_;
-}
-
-
-template<class Type>
-inline label bufferedAccumulator<Type>::nBuffers() const
-{
-    return bufferOffsets_.size();
-}
-
-
-template<class Type>
-inline label bufferedAccumulator<Type>::bufferLength() const
-{
-    return (*this)[0].size();
-}
-
-
-template<class Type>
-inline const List<label>& bufferedAccumulator<Type>::bufferOffsets() const
-{
-    return bufferOffsets_;
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// ************************************************************************* //
diff --git a/src/lagrangian/molecularDynamics/old/molecularMeasurements/bufferedAccumulator/bufferedAccumulatorIO.C b/src/lagrangian/molecularDynamics/old/molecularMeasurements/bufferedAccumulator/bufferedAccumulatorIO.C
deleted file mode 100644
index 247fe3d37d..0000000000
--- a/src/lagrangian/molecularDynamics/old/molecularMeasurements/bufferedAccumulator/bufferedAccumulatorIO.C
+++ /dev/null
@@ -1,51 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "bufferedAccumulator.H"
-#include "IOstreams.H"
-
-// * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
-
-template<class Type>
-Foam::Ostream&
-Foam::operator<<(Ostream& os, const bufferedAccumulator<Type>& bA)
-{
-
-    os  << bA.averagesTaken_
-        << static_cast<const List< Field<Type> >&>(bA)
-        << bA.bufferOffsets();
-
-    // Check state of Ostream
-    os.check
-    (
-        "Foam::Ostream& Foam::operator<<(Foam::Ostream&, "
-        "const Foam::bufferedAccumulator&)"
-    );
-
-    return os;
-}
-
-
-// ************************************************************************* //
diff --git a/src/lagrangian/molecularDynamics/old/molecularMeasurements/correlationFunction/correlationFunction.C b/src/lagrangian/molecularDynamics/old/molecularMeasurements/correlationFunction/correlationFunction.C
deleted file mode 100644
index 0928783a53..0000000000
--- a/src/lagrangian/molecularDynamics/old/molecularMeasurements/correlationFunction/correlationFunction.C
+++ /dev/null
@@ -1,223 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "correlationFunction.H"
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-template<class Type>
-const char* const
-    Foam::correlationFunction<Type>::typeName("correlationFunction");
-
-
-// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
-
-template<class Type>
-void Foam::correlationFunction<Type>::setTimesAndSizes
-(
-    const label tZeroBufferSize
-)
-{
-    sampleSteps_  = ceil(sampleInterval_/mesh_.time().deltaTValue());
-
-    sampleInterval_ = sampleSteps_*mesh_.time().deltaTValue();
-
-    label bufferLength(ceil(duration_/sampleInterval_));
-
-    duration_ = bufferLength*sampleInterval_;
-
-    label bufferingInterval(ceil(averagingInterval_/sampleInterval_));
-
-    averagingInterval_ = bufferingInterval*sampleInterval_;
-
-    label nBuffers(ceil(duration_/averagingInterval_));
-
-    this->setSizes
-    (
-        nBuffers,
-        bufferLength,
-        bufferingInterval
-    );
-
-    tZeroBuffers_ =
-        Field< Field<Type> >
-        (
-            nBuffers,
-            Field<Type>
-            (
-                tZeroBufferSize,
-                pTraits<Type>::zero
-            )
-        );
-}
-
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-template<class Type>
-Foam::correlationFunction<Type>::correlationFunction
-(
-    const polyMesh& mesh,
-    const dictionary& cfDict,
-    const label tZeroBufferSize
-)
-:
-    bufferedAccumulator<scalar>(),
-    mesh_(mesh)
-{
-    duration_ = readScalar(cfDict.lookup("duration"));
-
-    sampleInterval_ = readScalar(cfDict.lookup("sampleInterval"));
-
-    averagingInterval_ = readScalar(cfDict.lookup("averagingInterval"));
-
-    setTimesAndSizes(tZeroBufferSize);
-}
-
-
-template<class Type>
-Foam::correlationFunction<Type>::correlationFunction
-(
-    const polyMesh& mesh,
-    const label tZeroBufferSize,
-    const scalar duration,
-    const scalar sampleInterval,
-    const scalar averagingInterval
-)
-:
-    bufferedAccumulator<scalar>(),
-    mesh_(mesh),
-    duration_(duration),
-    sampleInterval_(sampleInterval),
-    averagingInterval_(averagingInterval)
-{
-    setTimesAndSizes(tZeroBufferSize);
-}
-
-
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
-
-template<class Type>
-Foam::correlationFunction<Type>::~correlationFunction()
-{}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-template<class Type>
-void Foam::correlationFunction<Type>::calculateCorrelationFunction
-(
-    const Field<Type>& currentValues
-)
-{
-    if (measurandFieldSize() != currentValues.size())
-    {
-        FatalErrorIn("correlationFunction<Type>::calculateCorrelationFunction")
-            << "Trying to supply a Field of length"
-            << currentValues.size()
-            << " to calculate the correlation function. "
-            << "Expecting a Field of length "
-            << measurandFieldSize() << nl
-            << abort(FatalError);
-    }
-
-    List<scalar> cFSums(nBuffers(),0.0);
-
-    forAll(tZeroBuffers_, tZB)
-    {
-        scalar& cFSum = cFSums[tZB];
-
-        const Field<Type>& tZeroBuffer = tZeroBuffers_[tZB];
-
-        forAll(currentValues, cV)
-        {
-            const Type& tZeroBufferValue = tZeroBuffer[cV];
-
-            const Type& currentValue = currentValues[cV];
-
-            forAll(currentValue, component)
-            {
-                cFSum +=
-                (
-                    tZeroBufferValue[component]*currentValue[component]
-                );
-            }
-        }
-
-        cFSum /= (measurandFieldSize()*currentValues[0].size());
-    }
-
-    label bufferToRefill = addToBuffers(cFSums);
-
-    if (bufferToRefill != -1)
-    {
-        tZeroBuffers_[bufferToRefill] = currentValues;
-    }
-}
-
-
-template<class Type>
-void Foam::correlationFunction<Type>::calculateCorrelationFunction
-(
-    const Type& currentValue
-)
-{
-    if (measurandFieldSize() != 1)
-    {
-        FatalErrorIn("correlationFunction<Type>::calculateCorrelationFunction")
-            << "Trying to supply a single value to calculate the correlation "
-            << "function.  Expecting a Field of length "
-            << measurandFieldSize()
-            << abort(FatalError);
-    }
-
-    calculateCorrelationFunction(Field<Type>(1, currentValue));
-}
-
-
-template<class Type>
-Foam::scalar Foam::correlationFunction<Type>::integral() const
-{
-    Field<scalar> averageCF(averaged());
-
-    scalar cFIntegral = 0.0;
-
-    for (label v = 0; v < averageCF.size() - 1; v++)
-    {
-        cFIntegral +=
-            0.5
-           *sampleInterval_
-           *(averageCF[v+1] + averageCF[v]);
-    }
-
-    return cFIntegral;
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#   include "correlationFunctionIO.C"
-
-// ************************************************************************* //
diff --git a/src/lagrangian/molecularDynamics/old/molecularMeasurements/correlationFunction/correlationFunction.H b/src/lagrangian/molecularDynamics/old/molecularMeasurements/correlationFunction/correlationFunction.H
deleted file mode 100644
index 0c02e412df..0000000000
--- a/src/lagrangian/molecularDynamics/old/molecularMeasurements/correlationFunction/correlationFunction.H
+++ /dev/null
@@ -1,181 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-Class
-    Foam::correlationFunction
-
-Description
-
-SourceFiles
-    correlationFunctionI.H
-    correlationFunction.C
-    correlationFunctionIO.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef correlationFunction_H
-#define correlationFunction_H
-
-#include "bufferedAccumulator.H"
-#include "dictionary.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-template<class Type>
-class correlationFunction;
-
-template<class Type>
-Ostream& operator<<
-(
-    Ostream&,
-    const correlationFunction<Type>&
-);
-
-/*---------------------------------------------------------------------------*\
-                    Class correlationFunction Declaration
-\*---------------------------------------------------------------------------*/
-
-template<class Type>
-class correlationFunction
-:
-    public bufferedAccumulator<scalar>
-{
-    // Private data
-
-        const polyMesh& mesh_;
-
-        Field< Field<Type> > tZeroBuffers_;
-
-        scalar duration_;
-        scalar sampleInterval_;
-        scalar averagingInterval_;
-
-        label sampleSteps_;
-
-
-    // Private Member Functions
-
-        void setTimesAndSizes(const label);
-
-        //- Disallow default bitwise copy construct
-        correlationFunction(const correlationFunction<Type>&);
-
-        //- Disallow default bitwise assignment
-        void operator=(const correlationFunction<Type>&);
-
-
-public:
-
-    //- Component type
-    typedef typename pTraits<Type>::cmptType cmptType;
-
-
-    // Static data members
-
-        static const char* const typeName;
-
-
-    // Constructors
-
-        //- Construct from dictionary
-        correlationFunction
-        (
-            const polyMesh&,
-            const dictionary&,
-            const label tZeroBufferSize
-        );
-
-        //- Construct from components
-        correlationFunction
-        (
-            const polyMesh&,
-            const label tZeroBufferSize,
-            const scalar duration,
-            const scalar sampleInterval,
-            const scalar averagingInterval
-
-        );
-
-
-    //- Destructor
-    ~correlationFunction();
-
-
-    // Member Functions
-
-        void calculateCorrelationFunction(const Field<Type>&);
-
-        void calculateCorrelationFunction(const Type&);
-
-        scalar integral() const;
-
-        bool writeAveraged(Ostream&) const;
-
-
-    // Access
-
-        inline const Field< Field<Type> >& tZeroBuffers() const;
-
-        inline scalar duration() const;
-
-        inline scalar sampleInterval() const;
-
-        inline scalar averagingInterval() const;
-
-        inline label sampleSteps() const;
-
-        inline label measurandFieldSize() const;
-
-
-    // IOstream Operators
-
-        friend Ostream& operator<< <Type>
-        (
-            Ostream&,
-            const correlationFunction<Type>&
-        );
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#include "correlationFunctionI.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#ifdef NoRepository
-#   include "correlationFunction.C"
-#endif
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/lagrangian/molecularDynamics/old/molecularMeasurements/correlationFunction/correlationFunctionI.H b/src/lagrangian/molecularDynamics/old/molecularMeasurements/correlationFunction/correlationFunctionI.H
deleted file mode 100644
index c3296a928a..0000000000
--- a/src/lagrangian/molecularDynamics/old/molecularMeasurements/correlationFunction/correlationFunctionI.H
+++ /dev/null
@@ -1,69 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-template<class Type>
-inline const Foam::Field< Foam::Field<Type> >&
-Foam::correlationFunction<Type>::tZeroBuffers() const
-{
-    return tZeroBuffers_;
-}
-
-
-template<class Type>
-inline Foam::scalar Foam::correlationFunction<Type>::duration() const
-{
-    return duration_;
-}
-
-
-template<class Type>
-inline Foam::scalar Foam::correlationFunction<Type>::sampleInterval() const
-{
-    return sampleInterval_;
-}
-
-
-template<class Type>
-inline Foam::scalar Foam::correlationFunction<Type>::averagingInterval() const
-{
-    return averagingInterval_;
-}
-
-
-template<class Type>
-inline Foam::label Foam::correlationFunction<Type>::sampleSteps() const
-{
-    return sampleSteps_;
-}
-
-
-template<class Type>
-inline Foam::label Foam::correlationFunction<Type>::measurandFieldSize() const
-{
-    return tZeroBuffers_[0].size();
-}
-
-
-// ************************************************************************* //
diff --git a/src/lagrangian/molecularDynamics/old/molecularMeasurements/correlationFunction/correlationFunctionIO.C b/src/lagrangian/molecularDynamics/old/molecularMeasurements/correlationFunction/correlationFunctionIO.C
deleted file mode 100644
index 63d7b68c88..0000000000
--- a/src/lagrangian/molecularDynamics/old/molecularMeasurements/correlationFunction/correlationFunctionIO.C
+++ /dev/null
@@ -1,71 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "correlationFunction.H"
-#include "IOstreams.H"
-
-template<class Type>
-bool Foam::correlationFunction<Type>::writeAveraged(Ostream& os) const
-{
-    Field<scalar> averageCF(averaged());
-
-    forAll(averageCF, v)
-    {
-        os  << v*sampleInterval()
-            << token::SPACE
-            << averageCF[v]
-            << nl;
-    }
-
-    return os.good();
-}
-
-
-template<class Type>
-Foam::Ostream& Foam::operator<<
-(
-    Ostream& os,
-    const correlationFunction<Type>& cF
-)
-{
-    os  << cF.duration()
-        << nl << cF.sampleInterval()
-        << nl << cF.averagingInterval()
-        << nl << cF.sampleSteps()
-        << nl << cF.tZeroBuffers()
-        << nl << static_cast<const bufferedAccumulator<scalar>&>(cF);
-
-    // Check state of Ostream
-    os.check
-    (
-        "Foam::Ostream& Foam::operator<<"
-        "(Ostream&, const correlationFunction<Type>&)"
-    );
-
-    return os;
-}
-
-
-// ************************************************************************* //
diff --git a/src/lagrangian/molecularDynamics/old/molecularMeasurements/distribution/distribution.C b/src/lagrangian/molecularDynamics/old/molecularMeasurements/distribution/distribution.C
deleted file mode 100644
index 2089fb0e07..0000000000
--- a/src/lagrangian/molecularDynamics/old/molecularMeasurements/distribution/distribution.C
+++ /dev/null
@@ -1,478 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-\*----------------------------------------------------------------------------*/
-
-#include "distribution.H"
-#include "OFstream.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-    defineTypeNameAndDebug(distribution, 0);
-}
-
-// * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * //
-
-void Foam::distribution::write
-(
-    const fileName& file,
-    const List<Pair<scalar> >& pairs
-)
-{
-    OFstream os(file);
-
-    forAll(pairs, i)
-    {
-        os  << pairs[i].first() << ' ' << pairs[i].second() << nl;
-    }
-}
-
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-Foam::distribution::distribution()
-:
-    Map<label>(),
-    binWidth_(1)
-{}
-
-
-Foam::distribution::distribution(const scalar binWidth)
-:
-    Map<label>(),
-    binWidth_(binWidth)
-{}
-
-
-Foam::distribution::distribution(const distribution& d)
-:
-    Map<label>(static_cast< Map<label> >(d)),
-    binWidth_(d.binWidth())
-{}
-
-
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
-
-Foam::distribution::~distribution()
-{}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-Foam::label Foam::distribution::totalEntries() const
-{
-    label sumOfEntries = 0;
-
-    forAllConstIter(Map<label>, *this, iter)
-    {
-        sumOfEntries += iter();
-
-        if (sumOfEntries < 0)
-        {
-            WarningIn("label distribution::totalEntries()")
-                << "Accumulated distribution values total has become negative: "
-                << "sumOfEntries = " << sumOfEntries
-                << ". This is most likely to be because too many samples "
-                << "have been added to the bins and the label has 'rolled "
-                << "round'. Try distribution::approxTotalEntries which "
-                << "returns a scalar." << endl;
-
-            sumOfEntries = -1;
-
-            break;
-        }
-    }
-
-    return sumOfEntries;
-}
-
-
-Foam::scalar Foam::distribution::approxTotalEntries() const
-{
-    scalar sumOfEntries = 0;
-
-    forAllConstIter(Map<label>, *this, iter)
-    {
-        sumOfEntries += scalar(iter());
-    }
-
-    return sumOfEntries;
-}
-
-
-Foam::scalar Foam::distribution::mean() const
-{
-    scalar runningSum = 0;
-
-    scalar totEnt = approxTotalEntries();
-
-    List<label> keys = toc();
-
-    forAll(keys,k)
-    {
-        label key = keys[k];
-
-        runningSum +=
-            (0.5 + scalar(key))
-           *binWidth_
-           *scalar((*this)[key])
-           /totEnt;
-    }
-
-    return runningSum;
-}
-
-
-Foam::scalar Foam::distribution::median()
-{
-    // From:
-    // http://mathworld.wolfram.com/StatisticalMedian.html
-    // The statistical median is the value of the distribution variable
-    // where the cumulative distribution = 0.5.
-
-    scalar median = 0.0;
-
-    scalar runningSum = 0.0;
-
-    List<Pair<scalar> > normDist(normalised());
-
-    if (normDist.size())
-    {
-        if (normDist.size() == 1)
-        {
-            median = normDist[0].first();
-        }
-        else if
-        (
-            normDist.size() > 1
-         && normDist[0].second()*binWidth_ > 0.5
-        )
-        {
-            scalar xk = normDist[1].first();
-            scalar xkm1 = normDist[0].first();
-            scalar Sk =
-                (normDist[0].second() + normDist[1].second())*binWidth_;
-            scalar Skm1 = normDist[0].second()*binWidth_;
-
-            median = (0.5 - Skm1)*(xk - xkm1)/(Sk - Skm1) + xkm1;
-        }
-        else
-        {
-            label lastNonZeroIndex = 0;
-
-            forAll(normDist,nD)
-            {
-                if (runningSum + (normDist[nD].second()*binWidth_) > 0.5)
-                {
-                    scalar xk = normDist[nD].first();
-                    scalar xkm1 = normDist[lastNonZeroIndex].first();
-                    scalar Sk = runningSum + (normDist[nD].second()*binWidth_);
-                    scalar Skm1 = runningSum;
-
-                    median = (0.5 - Skm1)*(xk - xkm1)/(Sk - Skm1) + xkm1;
-
-                    break;
-                }
-                else if (normDist[nD].second() > 0.0)
-                {
-                    runningSum += normDist[nD].second()*binWidth_;
-
-                    lastNonZeroIndex = nD;
-                }
-            }
-        }
-    }
-
-    return median;
-}
-
-
-void Foam::distribution::add(const scalar valueToAdd)
-{
-    iterator iter(this->begin());
-
-    label n = label(valueToAdd/binWidth_) - label(neg(valueToAdd/binWidth_));
-
-    iter = find(n);
-
-    if (iter == this->end())
-    {
-        this->insert(n,1);
-    }
-    else
-    {
-        (*this)[n]++;
-    }
-
-    if ((*this)[n] < 0)
-    {
-        FatalErrorIn("distribution::add(const scalar valueToAdd)")
-            << "Accumulated distribution value has become negative: "
-            << "bin = " << (0.5 + scalar(n)) * binWidth_
-            << ", value = " << (*this)[n]
-            << ". This is most likely to be because too many samples "
-            << "have been added to a bin and the label has 'rolled round'"
-            << abort(FatalError);
-    }
-}
-
-
-void Foam::distribution::add(const label valueToAdd)
-{
-    add(scalar(valueToAdd));
-}
-
-
-void Foam::distribution::insertMissingKeys()
-{
-    iterator iter(this->begin());
-
-    List<label> keys = toc();
-
-    sort(keys);
-
-    if (keys.size())
-    {
-        for (label k = keys[0]; k < keys.last(); k++)
-        {
-            iter = find(k);
-
-            if (iter == this->end())
-            {
-                this->insert(k,0);
-            }
-        }
-    }
-}
-
-
-Foam::List<Foam::Pair<Foam::scalar> > Foam::distribution::normalised()
-{
-    scalar totEnt = approxTotalEntries();
-
-    insertMissingKeys();
-
-    List<label> keys = toc();
-
-    sort(keys);
-
-    List<Pair<scalar> > normDist(size());
-
-    forAll(keys,k)
-    {
-        label key = keys[k];
-
-        normDist[k].first() = (0.5 + scalar(key))*binWidth_;
-
-        normDist[k].second() = scalar((*this)[key])/totEnt/binWidth_;
-    }
-
-    if (debug)
-    {
-        Info<< "totEnt: " << totEnt << endl;
-    }
-
-    return normDist;
-}
-
-
-Foam::List<Foam::Pair<Foam::scalar> > Foam::distribution::normalisedMinusMean()
-{
-    return normalisedShifted(mean());
-}
-
-
-Foam::List<Foam::Pair<Foam::scalar> > Foam::distribution::normalisedShifted
-(
-    scalar shiftValue
-)
-{
-    List<Pair<scalar> > oldDist(normalised());
-
-    List<Pair<scalar> > newDist(oldDist.size());
-
-    forAll(oldDist,u)
-    {
-        oldDist[u].first() -= shiftValue;
-    }
-
-    scalar lowestOldBin = oldDist[0].first()/binWidth_ - 0.5;
-
-    label lowestNewKey = label
-    (
-        lowestOldBin + 0.5*sign(lowestOldBin)
-    );
-
-    scalar interpolationStartDirection =
-        sign(scalar(lowestNewKey) - lowestOldBin);
-
-    label newKey = lowestNewKey;
-
-    if (debug)
-    {
-        Info<< shiftValue
-            << nl << lowestOldBin
-            << nl << lowestNewKey
-            << nl << interpolationStartDirection
-            << endl;
-
-        scalar checkNormalisation = 0;
-
-        forAll(oldDist, oD)
-        {
-            checkNormalisation += oldDist[oD].second()*binWidth_;
-        }
-
-        Info<< "Initial normalisation = " << checkNormalisation << endl;
-    }
-
-    forAll(oldDist,u)
-    {
-        newDist[u].first() = (0.5 + scalar(newKey)) * binWidth_;
-
-        if (interpolationStartDirection < 0)
-        {
-            if (u == 0)
-            {
-                newDist[u].second() =
-                    (0.5 + scalar(newKey))*oldDist[u].second()
-                  - oldDist[u].second()
-                        *(oldDist[u].first() - binWidth_)/ binWidth_;
-            }
-            else
-            {
-                newDist[u].second() =
-                    (0.5 + scalar(newKey))
-                   *(oldDist[u].second() - oldDist[u-1].second())
-                  +
-                    (
-                        oldDist[u-1].second()*oldDist[u].first()
-                      - oldDist[u].second()*oldDist[u-1].first()
-                    )
-                    /binWidth_;
-            }
-        }
-        else
-        {
-            if (u == oldDist.size() - 1)
-            {
-                newDist[u].second() =
-                    (0.5 + scalar(newKey))*-oldDist[u].second()
-                  + oldDist[u].second()*(oldDist[u].first() + binWidth_)
-                   /binWidth_;
-            }
-            else
-            {
-                newDist[u].second() =
-                    (0.5 + scalar(newKey))
-                   *(oldDist[u+1].second() - oldDist[u].second())
-                  +
-                    (
-                        oldDist[u].second()*oldDist[u+1].first()
-                      - oldDist[u+1].second()*oldDist[u].first()
-                    )
-                   /binWidth_;
-            }
-        }
-
-        newKey++;
-    }
-
-    if (debug)
-    {
-        scalar checkNormalisation = 0;
-
-        forAll(newDist, nD)
-        {
-            checkNormalisation += newDist[nD].second()*binWidth_;
-        }
-
-        Info<< "Shifted normalisation = " << checkNormalisation << endl;
-    }
-
-    return newDist;
-}
-
-
-Foam::List<Foam::Pair<Foam::scalar> > Foam::distribution::raw()
-{
-    insertMissingKeys();
-
-    List<label> keys = toc();
-
-    sort(keys);
-
-    List<Pair<scalar> > rawDist(size());
-
-    forAll(keys,k)
-    {
-        label key = keys[k];
-
-        rawDist[k].first() = (0.5 + scalar(key))*binWidth_;
-
-        rawDist[k].second() = scalar((*this)[key]);
-    }
-
-    return rawDist;
-}
-
-
-// * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
-
-void Foam::distribution::operator=(const distribution& rhs)
-{
-    // Check for assignment to self
-    if (this == &rhs)
-    {
-        FatalErrorIn("distribution::operator=(const distribution&)")
-            << "Attempted assignment to self"
-            << abort(FatalError);
-    }
-
-    Map<label>::operator=(rhs);
-
-    binWidth_ = rhs.binWidth();
-}
-
-
-// * * * * * * * * * * * * * * * Friend Operators  * * * * * * * * * * * * * //
-
-Foam::Ostream& Foam::operator<<(Ostream& os, const distribution& d)
-{
-    os  << d.binWidth_
-        << static_cast<const Map<label>&>(d);
-
-    // Check state of Ostream
-    os.check
-    (
-        "Ostream& operator<<(Ostream&, "
-        "const distribution&)"
-    );
-
-    return os;
-}
-
-
-// ************************************************************************* //
diff --git a/src/lagrangian/molecularDynamics/old/molecularMeasurements/distribution/distribution.H b/src/lagrangian/molecularDynamics/old/molecularMeasurements/distribution/distribution.H
deleted file mode 100644
index 7897c034ec..0000000000
--- a/src/lagrangian/molecularDynamics/old/molecularMeasurements/distribution/distribution.H
+++ /dev/null
@@ -1,148 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-Class
-    Foam::distribution
-
-Description
-    Accumulating histogram of values.  Specified bin resolution
-    automatic generation of bins.
-
-SourceFiles
-    distributionI.H
-    distribution.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef distribution_H
-#define distribution_H
-
-#include "Map.H"
-#include "Pair.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-/*---------------------------------------------------------------------------*\
-                        Class distribution Declaration
-\*---------------------------------------------------------------------------*/
-
-class distribution
-:
-    public Map<label>
-{
-    // Private data
-
-        scalar binWidth_;
-
-
-public:
-
-    //- Runtime type information
-
-        TypeName("distribution");
-
-    // Static functions
-
-        //- write to file
-
-            static void write
-            (
-                const fileName& file,
-                const List<Pair<scalar> >& pairs
-            );
-
-
-    // Constructors
-
-        //- Construct null
-        distribution();
-
-        //- Construct from binWidth
-        distribution(const scalar binWidth);
-
-        //- Construct as copy
-        distribution(const distribution&);
-
-
-    //- Destructor
-    virtual ~distribution();
-
-
-    // Member Functions
-
-        label totalEntries() const;
-
-        scalar approxTotalEntries() const;
-
-        scalar mean() const;
-
-        scalar median();
-
-        //- Add a value to the appropriate bin of the distribution.
-        void add(const scalar valueToAdd);
-
-        void add(const label valueToAdd);
-
-        void insertMissingKeys();
-
-        List<Pair<scalar> > normalised();
-
-        List<Pair<scalar> > normalisedMinusMean();
-
-        List<Pair<scalar> > normalisedShifted(scalar shiftValue);
-
-        List<Pair<scalar> > raw();
-
-
-        // Access
-
-            inline scalar binWidth() const;
-
-
-    // Member Operators
-
-        void operator=(const distribution&);
-
-
-    // IOstream Operators
-
-        friend Ostream& operator<<(Ostream&, const distribution&);
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#include "distributionI.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/lagrangian/molecularDynamics/old/molecularMeasurements/distribution/distributionI.H b/src/lagrangian/molecularDynamics/old/molecularMeasurements/distribution/distributionI.H
deleted file mode 100644
index 81883e5820..0000000000
--- a/src/lagrangian/molecularDynamics/old/molecularMeasurements/distribution/distributionI.H
+++ /dev/null
@@ -1,34 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-inline Foam::scalar Foam::distribution::binWidth() const
-{
-    return binWidth_;
-}
-
-
-// ************************************************************************* //
diff --git a/src/lagrangian/molecularDynamics/old/reducedUnits/reducedUnits.C b/src/lagrangian/molecularDynamics/old/reducedUnits/reducedUnits.C
deleted file mode 100644
index 61c768c9fe..0000000000
--- a/src/lagrangian/molecularDynamics/old/reducedUnits/reducedUnits.C
+++ /dev/null
@@ -1,164 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "reducedUnits.H"
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-const  Foam::scalar Foam::reducedUnits::kb = 1.3806504e-23;
-
-
-// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
-
-void Foam::reducedUnits::calcRefValues()
-{
-    if
-    (
-        refTime_ < VSMALL
-     || refLength_ < VSMALL
-     || refMass_ < VSMALL
-    )
-    {
-        FatalErrorIn("Foam::reducedUnits::calcRefValues() ")
-            << "One of more referencence values too small for floating point "
-            << "calculation: "
-            << "refTime_ = " << refTime_
-            << ", refLength = " << refTemp_
-            << ", refMass = " << refMass_
-            << nl << abort(FatalError);
-    }
-
-    refEnergy_ = refLength_*refLength_*refMass_/(refTime_*refTime_);
-
-    refTemp_ = refEnergy_ / kb;
-
-    refForce_ = refEnergy_/refLength_;
-
-    refVelocity_ = Foam::sqrt(refEnergy_/refMass_);
-
-    refVolume_ = Foam::pow(refLength_,3.0);
-
-    refPressure_ = refEnergy_/refVolume_;
-
-    refMassDensity_ = refMass_/refVolume_;
-
-    refNumberDensity_ = 1.0/refVolume_;
-}
-
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-Foam::reducedUnits::reducedUnits()
-:
-    refLength_(1e-9),
-    refTime_(1e-12),
-    refMass_(1.660538782e-27)
-{
-    calcRefValues();
-}
-
-
-Foam::reducedUnits::reducedUnits
-(
-    scalar refLength,
-    scalar refTime,
-    scalar refMass
-)
-:
-    refLength_(refLength),
-    refTime_(refTime),
-    refMass_(refMass)
-{
-    calcRefValues();
-}
-
-
-Foam::reducedUnits::reducedUnits(const IOdictionary& reducedUnitsDict)
-:
-    refLength_(),
-    refTime_(),
-    refMass_()
-{
-    setRefValues(reducedUnitsDict);
-}
-
-
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
-
-Foam::reducedUnits::~reducedUnits()
-{}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-void Foam::reducedUnits::setRefValues
-(
-    scalar refLength,
-    scalar refTime,
-    scalar refMass
-)
-{
-    refLength_ = refLength;
-
-    refTime_ = refTime;
-
-    refMass_ = refMass;
-
-    calcRefValues();
-}
-
-
-void Foam::reducedUnits::setRefValues
-(
-    const IOdictionary& reducedUnitsDict
-)
-{
-    refLength_ = readScalar(reducedUnitsDict.lookup("refLength"));
-
-    refTime_ = readScalar(reducedUnitsDict.lookup("refTime"));
-
-    refMass_  = readScalar(reducedUnitsDict.lookup("refMass"));
-
-    calcRefValues();
-}
-
-
-// * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
-
-void Foam::reducedUnits::operator=(const reducedUnits& rhs)
-{
-    // Check for assignment to self
-    if (this == &rhs)
-    {
-        FatalErrorIn
-        (
-            "Foam::reducedUnits::operator=(const Foam::reducedUnits&)"
-        )   << "Attempted assignment to self"
-            << abort(FatalError);
-    }
-}
-
-
-// ************************************************************************* //
diff --git a/src/lagrangian/molecularDynamics/old/reducedUnits/reducedUnits.H b/src/lagrangian/molecularDynamics/old/reducedUnits/reducedUnits.H
deleted file mode 100644
index 8319bf50bc..0000000000
--- a/src/lagrangian/molecularDynamics/old/reducedUnits/reducedUnits.H
+++ /dev/null
@@ -1,182 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-Class
-    Foam::reducedUnits
-
-Description
-
-SourceFiles
-    reducedUnitsI.H
-    reducedUnits.C
-    reducedUnitsIO.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef reducedUnits_H
-#define reducedUnits_H
-
-#include "scalar.H"
-#include "IOdictionary.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-/*---------------------------------------------------------------------------*\
-                         Class reducedUnits Declaration
-\*---------------------------------------------------------------------------*/
-
-class reducedUnits
-{
-    // Private data
-
-        // Reduced units
-
-            // Fundamental values
-
-                scalar refLength_;
-
-                scalar refTime_;
-
-                scalar refMass_;
-
-            // Derived values
-
-                scalar refEnergy_;
-
-                scalar refTemp_;
-
-                scalar refForce_;
-
-                scalar refVelocity_;
-
-                scalar refVolume_;
-
-                scalar refPressure_;
-
-                scalar refMassDensity_;
-
-                scalar refNumberDensity_;
-
-
-    // Private Member Functions
-
-        void calcRefValues();
-
-        //- Disallow default bitwise copy construct
-        reducedUnits(const reducedUnits&);
-
-        //- Disallow default bitwise assignment
-        void operator=(const reducedUnits&);
-
-
-public:
-
-    // Static data members
-
-        //- Static data someStaticData
-        static const scalar kb;
-
-
-    // Constructors
-
-        //- Construct with no argument, uses default values:
-        //  length  = 1nm
-        //  mass = 1.660538782e-27kg (unified atomic mass unit)
-        //  temperature = 1K (therefore, energy = 1*kb)
-        reducedUnits();
-
-        //- Construct from components
-        reducedUnits
-        (
-            scalar refLength,
-            scalar refTime,
-            scalar refMass
-        );
-
-        //- Construct from dictionary
-        reducedUnits(const IOdictionary& reducedUnitsDict);
-
-
-    //- Destructor
-    ~reducedUnits();
-
-
-    // Member Functions
-
-        void setRefValues
-        (
-            scalar refLength,
-            scalar refTime,
-            scalar refMass
-        );
-
-        void setRefValues(const IOdictionary& reducedUnitsDict);
-
-
-        // Access
-
-            inline scalar refLength() const;
-
-            inline scalar refTime() const;
-
-            inline scalar refMass() const;
-
-            inline scalar refTemp() const;
-
-            inline scalar refEnergy() const;
-
-            inline scalar refForce() const;
-
-            inline scalar refVelocity() const;
-
-            inline scalar refVolume() const;
-
-            inline scalar refPressure() const;
-
-            inline scalar refMassDensity() const;
-
-            inline scalar refNumberDensity() const;
-
-
-    // IOstream Operators
-
-        friend Ostream& operator<<(Ostream&, const reducedUnits&);
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#include "reducedUnitsI.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/lagrangian/molecularDynamics/old/reducedUnits/reducedUnitsI.H b/src/lagrangian/molecularDynamics/old/reducedUnits/reducedUnitsI.H
deleted file mode 100644
index 6144b7568c..0000000000
--- a/src/lagrangian/molecularDynamics/old/reducedUnits/reducedUnitsI.H
+++ /dev/null
@@ -1,94 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-inline Foam::scalar Foam::reducedUnits::refLength() const
-{
-    return refLength_;
-}
-
-
-inline Foam::scalar Foam::reducedUnits::refTime() const
-{
-    return refTime_;
-}
-
-
-inline Foam::scalar Foam::reducedUnits::refMass() const
-{
-    return refMass_;
-}
-
-
-inline Foam::scalar Foam::reducedUnits::refTemp() const
-{
-    return refTemp_;
-}
-
-
-inline Foam::scalar Foam::reducedUnits::refEnergy() const
-{
-    return refEnergy_;
-}
-
-
-inline Foam::scalar Foam::reducedUnits::refForce() const
-{
-    return refForce_;
-}
-
-
-inline Foam::scalar Foam::reducedUnits::refVelocity() const
-{
-    return refVelocity_;
-}
-
-
-inline Foam::scalar Foam::reducedUnits::refVolume() const
-{
-    return refVolume_;
-}
-
-
-inline Foam::scalar Foam::reducedUnits::refPressure() const
-{
-    return refPressure_;
-}
-
-
-inline Foam::scalar Foam::reducedUnits::refMassDensity() const
-{
-    return refMassDensity_;
-}
-
-
-inline Foam::scalar Foam::reducedUnits::refNumberDensity() const
-{
-    return refNumberDensity_;
-}
-
-
-// ************************************************************************* //
diff --git a/src/lagrangian/molecularDynamics/old/reducedUnits/reducedUnitsIO.C b/src/lagrangian/molecularDynamics/old/reducedUnits/reducedUnitsIO.C
deleted file mode 100644
index 7ee1f39bd0..0000000000
--- a/src/lagrangian/molecularDynamics/old/reducedUnits/reducedUnitsIO.C
+++ /dev/null
@@ -1,60 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "reducedUnits.H"
-#include "IOstreams.H"
-
-// * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
-
-Foam::Ostream& Foam::operator<<(Ostream& os, const reducedUnits& rU)
-{
-    os  << nl << "Defined: " << nl
-        << tab << "refLength = " << rU.refLength() << " m" << nl
-        << tab << "refTime = " << rU.refTime() << " s" << nl
-        << tab << "refMass = " << rU.refMass() << " kg" << nl
-        << tab << "Boltzmann constant, kb = " << reducedUnits::kb << " J/K"
-        << nl << "Calculated: " << nl
-        << tab << "refEnergy = " << rU.refEnergy() << " J" << nl
-        << tab << "refTemp = " << rU.refTemp() << " K" << nl
-        << tab << "refForce = " << rU.refForce() << " N" << nl
-        << tab << "refVelocity = " << rU.refVelocity() << " m/s" << nl
-        << tab << "refVolume = " << rU.refVolume() << " m^3" << nl
-        << tab << "refPressure = " << rU.refPressure() << " N/m^2" << nl
-        << tab << "refMassDensity = " << rU.refMassDensity() << " kg/m^3" << nl
-        << tab << "refNumberDensity = " << rU.refNumberDensity() << " m^-3"
-        << endl;
-
-    // Check state of Ostream
-    os.check
-    (
-        "Foam::Ostream& Foam::operator<<(Foam::Ostream&, "
-        "const Foam::reducedUnits&)"
-    );
-
-    return os;
-}
-
-
-// ************************************************************************* //

From 7c7fc6e02bb18c66d55e74e4464253123fcbcdea Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Mon, 19 Mar 2012 11:54:52 +0000
Subject: [PATCH 054/317] multiphaseEulerFoam: Updated MRF support

---
 .../solvers/multiphase/multiphaseEulerFoam/pEqn.H    | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/pEqn.H b/applications/solvers/multiphase/multiphaseEulerFoam/pEqn.H
index 1c42c7b91a..9c8c2d4f18 100644
--- a/applications/solvers/multiphase/multiphaseEulerFoam/pEqn.H
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/pEqn.H
@@ -132,6 +132,17 @@
         phasei++;
     }
 
+    phasei = 0;
+    forAllIter(PtrDictionary<phaseModel>, fluid.phases(), iter)
+    {
+        phaseModel& phase = iter();
+
+        mrfZones.relativeFlux(phase.phi().oldTime());
+        mrfZones.relativeFlux(phase.phi());
+
+        phasei++;
+    }
+
     surfaceScalarField Dp
     (
         IOobject
@@ -185,7 +196,6 @@
                 phase.phi() =
                     phiHbyAs[phasei]
                   + rAlphaAUfs[phasei]*mSfGradp/phase.rho();
-                mrfZones.relativeFlux(phase.phi().oldTime());
                 phi += alphafs[phasei]*phase.phi();
 
                 phasei++;

From 7841318b76a28442fd12cd62c16dd407d7e68c0a Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Mon, 19 Mar 2012 11:55:48 +0000
Subject: [PATCH 055/317] twoPhaseEulerFoam: Add MRF support and remove
 MRFTwoPhaseEulerFoam

---
 .../multiphase/twoPhaseEulerFoam/Allwclean    |   1 -
 .../multiphase/twoPhaseEulerFoam/Allwmake     |   1 -
 .../MRFTwoPhaseEulerFoam.C                    | 119 ------------------
 .../MRFtwoPhaseEulerFoam/Make/files           |   3 -
 .../MRFtwoPhaseEulerFoam/Make/options         |  17 ---
 .../MRFtwoPhaseEulerFoam/UEqns.H              |  99 ---------------
 .../MRFtwoPhaseEulerFoam/createMRFZones.H     |   4 -
 .../MRFtwoPhaseEulerFoam/pEqn.H               | 118 -----------------
 .../multiphase/twoPhaseEulerFoam/UEqns.H      |   4 +-
 .../twoPhaseEulerFoam/createFields.H          |   6 +
 .../multiphase/twoPhaseEulerFoam/pEqn.H       |  20 ++-
 .../twoPhaseEulerFoam/twoPhaseEulerFoam.C     |   4 +-
 12 files changed, 25 insertions(+), 371 deletions(-)
 delete mode 100644 applications/solvers/multiphase/twoPhaseEulerFoam/MRFtwoPhaseEulerFoam/MRFTwoPhaseEulerFoam.C
 delete mode 100644 applications/solvers/multiphase/twoPhaseEulerFoam/MRFtwoPhaseEulerFoam/Make/files
 delete mode 100644 applications/solvers/multiphase/twoPhaseEulerFoam/MRFtwoPhaseEulerFoam/Make/options
 delete mode 100644 applications/solvers/multiphase/twoPhaseEulerFoam/MRFtwoPhaseEulerFoam/UEqns.H
 delete mode 100644 applications/solvers/multiphase/twoPhaseEulerFoam/MRFtwoPhaseEulerFoam/createMRFZones.H
 delete mode 100644 applications/solvers/multiphase/twoPhaseEulerFoam/MRFtwoPhaseEulerFoam/pEqn.H

diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/Allwclean b/applications/solvers/multiphase/twoPhaseEulerFoam/Allwclean
index 63db39ff05..cc138bc068 100755
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/Allwclean
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/Allwclean
@@ -6,6 +6,5 @@ wclean libso phaseModel
 wclean libso interfacialModels
 wclean libso kineticTheoryModels
 wclean
-wclean MRFtwoPhaseEulerFoam
 
 # ----------------------------------------------------------------- end-of-file
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/Allwmake b/applications/solvers/multiphase/twoPhaseEulerFoam/Allwmake
index faf438d0bd..29294d166a 100755
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/Allwmake
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/Allwmake
@@ -6,6 +6,5 @@ wmake libso phaseModel
 wmake libso interfacialModels
 wmake libso kineticTheoryModels
 wmake
-wmake MRFtwoPhaseEulerFoam
 
 # ----------------------------------------------------------------- end-of-file
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/MRFtwoPhaseEulerFoam/MRFTwoPhaseEulerFoam.C b/applications/solvers/multiphase/twoPhaseEulerFoam/MRFtwoPhaseEulerFoam/MRFTwoPhaseEulerFoam.C
deleted file mode 100644
index 357c7e413a..0000000000
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/MRFtwoPhaseEulerFoam/MRFTwoPhaseEulerFoam.C
+++ /dev/null
@@ -1,119 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-Application
-    twoPhaseEulerFoam
-
-Description
-    Solver for a system of 2 incompressible fluid phases with one phase
-    dispersed, e.g. gas bubbles in a liquid or solid particles in a gas.
-
-\*---------------------------------------------------------------------------*/
-
-#include "fvCFD.H"
-#include "nearWallDist.H"
-#include "wallFvPatch.H"
-#include "Switch.H"
-
-#include "IFstream.H"
-#include "OFstream.H"
-
-#include "dragModel.H"
-#include "phaseModel.H"
-#include "kineticTheoryModel.H"
-
-#include "pimpleControl.H"
-#include "MRFZones.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-int main(int argc, char *argv[])
-{
-    #include "setRootCase.H"
-
-    #include "createTime.H"
-    #include "createMesh.H"
-    #include "readGravitationalAcceleration.H"
-    #include "createFields.H"
-    #include "readPPProperties.H"
-    #include "initContinuityErrs.H"
-    #include "createMRFZones.H"
-    #include "readTimeControls.H"
-    #include "CourantNo.H"
-    #include "setInitialDeltaT.H"
-
-    pimpleControl pimple(mesh);
-
-    // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-    Info<< "\nStarting time loop\n" << endl;
-
-    while (runTime.run())
-    {
-        #include "readTwoPhaseEulerFoamControls.H"
-        #include "CourantNos.H"
-        #include "setDeltaT.H"
-
-        runTime++;
-        Info<< "Time = " << runTime.timeName() << nl << endl;
-
-        // --- Pressure-velocity PIMPLE corrector loop
-        while (pimple.loop())
-        {
-            #include "alphaEqn.H"
-            #include "liftDragCoeffs.H"
-            #include "UEqns.H"
-
-            // --- Pressure corrector loop
-            while (pimple.correct())
-            {
-                #include "pEqn.H"
-
-                if (correctAlpha && !pimple.finalIter())
-                {
-                    #include "alphaEqn.H"
-                }
-            }
-
-            #include "DDtU.H"
-
-            if (pimple.turbCorr())
-            {
-                #include "kEpsilon.H"
-            }
-        }
-
-        #include "write.H"
-
-        Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
-            << "  ClockTime = " << runTime.elapsedClockTime() << " s"
-            << nl << endl;
-    }
-
-    Info<< "End\n" << endl;
-
-    return 0;
-}
-
-
-// ************************************************************************* //
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/MRFtwoPhaseEulerFoam/Make/files b/applications/solvers/multiphase/twoPhaseEulerFoam/MRFtwoPhaseEulerFoam/Make/files
deleted file mode 100644
index 45960722ae..0000000000
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/MRFtwoPhaseEulerFoam/Make/files
+++ /dev/null
@@ -1,3 +0,0 @@
-MRFTwoPhaseEulerFoam.C
-
-EXE = $(FOAM_APPBIN)/MRFTwoPhaseEulerFoam
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/MRFtwoPhaseEulerFoam/Make/options b/applications/solvers/multiphase/twoPhaseEulerFoam/MRFtwoPhaseEulerFoam/Make/options
deleted file mode 100644
index b9b19059da..0000000000
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/MRFtwoPhaseEulerFoam/Make/options
+++ /dev/null
@@ -1,17 +0,0 @@
-EXE_INC = \
-    -I.. \
-    -I../../bubbleFoam \
-    -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/transportModels/incompressible/lnInclude \
-    -IturbulenceModel \
-    -I../kineticTheoryModels/lnInclude \
-    -I../interfacialModels/lnInclude \
-    -I../phaseModel/lnInclude \
-
-EXE_LIBS = \
-    -lEulerianInterfacialModels \
-    -lfiniteVolume \
-    -lmeshTools \
-    -lincompressibleTransportModels \
-    -lphaseModel \
-    -lkineticTheoryModel
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/MRFtwoPhaseEulerFoam/UEqns.H b/applications/solvers/multiphase/twoPhaseEulerFoam/MRFtwoPhaseEulerFoam/UEqns.H
deleted file mode 100644
index 0c0cc1543a..0000000000
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/MRFtwoPhaseEulerFoam/UEqns.H
+++ /dev/null
@@ -1,99 +0,0 @@
-fvVectorMatrix U1Eqn(U1, U1.dimensions()*dimVol/dimTime);
-fvVectorMatrix U2Eqn(U2, U2.dimensions()*dimVol/dimTime);
-
-{
-    {
-        volTensorField gradU1T(T(fvc::grad(U1)));
-
-        if (kineticTheory.on())
-        {
-            kineticTheory.solve(gradU1T);
-            nuEff1 = kineticTheory.mu1()/rho1;
-        }
-        else // If not using kinetic theory is using Ct model
-        {
-            nuEff1 = sqr(Ct)*nut2 + nu1;
-        }
-
-        volTensorField Rc1
-        (
-            "Rc1",
-            (((2.0/3.0)*I)*nuEff1)*tr(gradU1T) - nuEff1*gradU1T
-        );
-
-        if (kineticTheory.on())
-        {
-            Rc1 -= ((kineticTheory.lambda()/rho1)*tr(gradU1T))*tensor(I);
-        }
-
-        surfaceScalarField phiR1
-        (
-            -fvc::interpolate(nuEff1)*mesh.magSf()*fvc::snGrad(alpha1)
-            /fvc::interpolate(alpha1 + scalar(0.001))
-        );
-
-        U1Eqn =
-        (
-            (scalar(1) + Cvm*rho2*alpha2/rho1)*
-            (
-                fvm::ddt(U1)
-              + fvm::div(phi1, U1, "div(phi1,U1)")
-              - fvm::Sp(fvc::div(phi1), U1)
-            )
-
-          - fvm::laplacian(nuEff1, U1)
-          + fvc::div(Rc1)
-
-          + fvm::div(phiR1, U1, "div(phi1,U1)")
-          - fvm::Sp(fvc::div(phiR1), U1)
-          + (fvc::grad(alpha1)/(fvc::average(alpha1) + scalar(0.001)) & Rc1)
-         ==
-        //  g                          // Buoyancy term transfered to p-equation
-          - fvm::Sp(alpha2/rho1*K, U1)
-        //+ alpha2/rho1*K*U2           // Explicit drag transfered to p-equation
-          - alpha2/rho1*(liftCoeff - Cvm*rho2*DDtU2)
-        );
-        mrfZones.addCoriolis(U1Eqn);
-        U1Eqn.relax();
-    }
-
-    {
-        volTensorField gradU2T(T(fvc::grad(U2)));
-        volTensorField Rc2
-        (
-            "Rc2",
-            (((2.0/3.0)*I)*nuEff2)*tr(gradU2T) - nuEff2*gradU2T
-        );
-
-        surfaceScalarField phiR2
-        (
-            -fvc::interpolate(nuEff2)*mesh.magSf()*fvc::snGrad(alpha2)
-            /fvc::interpolate(alpha2 + scalar(0.001))
-        );
-
-        U2Eqn =
-        (
-            (scalar(1) + Cvm*rho2*alpha1/rho2)*
-            (
-                fvm::ddt(U2)
-              + fvm::div(phi2, U2, "div(phi2,U2)")
-              - fvm::Sp(fvc::div(phi2), U2)
-            )
-
-          - fvm::laplacian(nuEff2, U2)
-          + fvc::div(Rc2)
-
-          + fvm::div(phiR2, U2, "div(phi2,U2)")
-          - fvm::Sp(fvc::div(phiR2), U2)
-
-          + (fvc::grad(alpha2)/(fvc::average(alpha2) + scalar(0.001)) & Rc2)
-         ==
-        //  g                          // Buoyancy term transfered to p-equation
-          - fvm::Sp(alpha1/rho2*K, U2)
-        //+ alpha1/rho2*K*U1           // Explicit drag transfered to p-equation
-          + alpha1/rho2*(liftCoeff + Cvm*rho2*DDtU1)
-        );
-        mrfZones.addCoriolis(U2Eqn);
-        U2Eqn.relax();
-    }
-}
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/MRFtwoPhaseEulerFoam/createMRFZones.H b/applications/solvers/multiphase/twoPhaseEulerFoam/MRFtwoPhaseEulerFoam/createMRFZones.H
deleted file mode 100644
index 4d5c2bab72..0000000000
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/MRFtwoPhaseEulerFoam/createMRFZones.H
+++ /dev/null
@@ -1,4 +0,0 @@
-    MRFZones mrfZones(mesh);
-    mrfZones.correctBoundaryVelocity(U1);
-    mrfZones.correctBoundaryVelocity(U2);
-    mrfZones.correctBoundaryVelocity(U);
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/MRFtwoPhaseEulerFoam/pEqn.H b/applications/solvers/multiphase/twoPhaseEulerFoam/MRFtwoPhaseEulerFoam/pEqn.H
deleted file mode 100644
index 348cc847d7..0000000000
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/MRFtwoPhaseEulerFoam/pEqn.H
+++ /dev/null
@@ -1,118 +0,0 @@
-{
-    surfaceScalarField alpha1f(fvc::interpolate(alpha1));
-    surfaceScalarField alpha2f(scalar(1) - alpha1f);
-
-    volScalarField rAU1(1.0/U1Eqn.A());
-    volScalarField rAU2(1.0/U2Eqn.A());
-
-    rAU1f = fvc::interpolate(rAU1);
-    surfaceScalarField rAU2f(fvc::interpolate(rAU2));
-
-    volVectorField HbyA1("HbyA1", U1);
-    HbyA1 = rAU1*U1Eqn.H();
-
-    volVectorField HbyA2("HbyA2", U2);
-    HbyA2 = rAU2*U2Eqn.H();
-
-    mrfZones.absoluteFlux(phi1.oldTime());
-    mrfZones.absoluteFlux(phi1);
-
-    mrfZones.absoluteFlux(phi2.oldTime());
-    mrfZones.absoluteFlux(phi2);
-
-    surfaceScalarField phiDrag1
-    (
-        fvc::interpolate(alpha2/rho1*K*rAU1)*phi2 + rAU1f*(g & mesh.Sf())
-    );
-
-    if (g0.value() > 0.0)
-    {
-        phiDrag1 -= ppMagf*fvc::snGrad(alpha1)*mesh.magSf();
-    }
-
-    if (kineticTheory.on())
-    {
-        phiDrag1 -= rAU1f*fvc::snGrad(kineticTheory.pa()/rho1)*mesh.magSf();
-    }
-
-
-    surfaceScalarField phiDrag2
-    (
-        fvc::interpolate(alpha1/rho2*K*rAU2)*phi1 + rAU2f*(g & mesh.Sf())
-    );
-
-    // Fix for gravity on outlet boundary.
-    forAll(p.boundaryField(), patchi)
-    {
-        if (isA<zeroGradientFvPatchScalarField>(p.boundaryField()[patchi]))
-        {
-            phiDrag1.boundaryField()[patchi] = 0.0;
-            phiDrag2.boundaryField()[patchi] = 0.0;
-        }
-    }
-
-    surfaceScalarField phiHbyA1
-    (
-        "phiHbyA1",
-        (fvc::interpolate(HbyA1) & mesh.Sf())
-      + fvc::ddtPhiCorr(rAU1, U1, phi1)
-      + phiDrag1
-    );
-    mrfZones.relativeFlux(phiHbyA1);
-
-    surfaceScalarField phiHbyA2
-    (
-        "phiHbyA2",
-        (fvc::interpolate(HbyA2) & mesh.Sf())
-      + fvc::ddtPhiCorr(rAU2, U2, phi2)
-      + phiDrag2
-    );
-    mrfZones.relativeFlux(phiHbyA2);
-
-    mrfZones.relativeFlux(phi1.oldTime());
-    mrfZones.relativeFlux(phi1);
-    mrfZones.relativeFlux(phi2.oldTime());
-    mrfZones.relativeFlux(phi2);
-
-    surfaceScalarField phiHbyA("phiHbyA", alpha1f*phiHbyA1 + alpha2f*phiHbyA2);
-
-    surfaceScalarField Dp
-    (
-        "Dp",
-        alpha1f*rAU1f/rho1 + alpha2f*rAU2f/rho2
-    );
-
-    while (pimple.correctNonOrthogonal())
-    {
-        fvScalarMatrix pEqn
-        (
-            fvm::laplacian(Dp, p) == fvc::div(phiHbyA)
-        );
-
-        pEqn.setReference(pRefCell, pRefValue);
-
-        pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter())));
-
-        if (pimple.finalNonOrthogonalIter())
-        {
-            surfaceScalarField SfGradp(pEqn.flux()/Dp);
-
-            phi1 = phiHbyA1 - rAU1f*SfGradp/rho1;
-            phi2 = phiHbyA2 - rAU2f*SfGradp/rho2;
-            phi = alpha1f*phi1 + alpha2f*phi2;
-
-            p.relax();
-            SfGradp = pEqn.flux()/Dp;
-
-            U1 = HbyA1 + fvc::reconstruct(phiDrag1 - rAU1f*SfGradp/rho1);
-            U1.correctBoundaryConditions();
-
-            U2 = HbyA2 + fvc::reconstruct(phiDrag2 - rAU2f*SfGradp/rho2);
-            U2.correctBoundaryConditions();
-
-            U = alpha1*U1 + alpha2*U2;
-        }
-    }
-}
-
-#include "continuityErrs.H"
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/UEqns.H b/applications/solvers/multiphase/twoPhaseEulerFoam/UEqns.H
index 8d09ccd3ef..0c0cc1543a 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/UEqns.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/UEqns.H
@@ -53,7 +53,7 @@ fvVectorMatrix U2Eqn(U2, U2.dimensions()*dimVol/dimTime);
         //+ alpha2/rho1*K*U2           // Explicit drag transfered to p-equation
           - alpha2/rho1*(liftCoeff - Cvm*rho2*DDtU2)
         );
-
+        mrfZones.addCoriolis(U1Eqn);
         U1Eqn.relax();
     }
 
@@ -93,7 +93,7 @@ fvVectorMatrix U2Eqn(U2, U2.dimensions()*dimVol/dimTime);
         //+ alpha1/rho2*K*U1           // Explicit drag transfered to p-equation
           + alpha1/rho2*(liftCoeff + Cvm*rho2*DDtU1)
         );
-
+        mrfZones.addCoriolis(U2Eqn);
         U2Eqn.relax();
     }
 }
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/createFields.H b/applications/solvers/multiphase/twoPhaseEulerFoam/createFields.H
index b71c7849e5..314d9b55ea 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/createFields.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/createFields.H
@@ -93,16 +93,22 @@
 
     dimensionedScalar Cvm
     (
+        "Cvm",
+        dimless,
         transportProperties.lookup("Cvm")
     );
 
     dimensionedScalar Cl
     (
+        "Cl",
+        dimless,
         transportProperties.lookup("Cl")
     );
 
     dimensionedScalar Ct
     (
+        "Ct",
+        dimless,
         transportProperties.lookup("Ct")
     );
 
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/pEqn.H b/applications/solvers/multiphase/twoPhaseEulerFoam/pEqn.H
index 91f8302d7f..348cc847d7 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/pEqn.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/pEqn.H
@@ -14,6 +14,12 @@
     volVectorField HbyA2("HbyA2", U2);
     HbyA2 = rAU2*U2Eqn.H();
 
+    mrfZones.absoluteFlux(phi1.oldTime());
+    mrfZones.absoluteFlux(phi1);
+
+    mrfZones.absoluteFlux(phi2.oldTime());
+    mrfZones.absoluteFlux(phi2);
+
     surfaceScalarField phiDrag1
     (
         fvc::interpolate(alpha2/rho1*K*rAU1)*phi2 + rAU1f*(g & mesh.Sf())
@@ -29,6 +35,7 @@
         phiDrag1 -= rAU1f*fvc::snGrad(kineticTheory.pa()/rho1)*mesh.magSf();
     }
 
+
     surfaceScalarField phiDrag2
     (
         fvc::interpolate(alpha1/rho2*K*rAU2)*phi1 + rAU2f*(g & mesh.Sf())
@@ -51,6 +58,7 @@
       + fvc::ddtPhiCorr(rAU1, U1, phi1)
       + phiDrag1
     );
+    mrfZones.relativeFlux(phiHbyA1);
 
     surfaceScalarField phiHbyA2
     (
@@ -59,6 +67,12 @@
       + fvc::ddtPhiCorr(rAU2, U2, phi2)
       + phiDrag2
     );
+    mrfZones.relativeFlux(phiHbyA2);
+
+    mrfZones.relativeFlux(phi1.oldTime());
+    mrfZones.relativeFlux(phi1);
+    mrfZones.relativeFlux(phi2.oldTime());
+    mrfZones.relativeFlux(phi2);
 
     surfaceScalarField phiHbyA("phiHbyA", alpha1f*phiHbyA1 + alpha2f*phiHbyA2);
 
@@ -83,14 +97,8 @@
         {
             surfaceScalarField SfGradp(pEqn.flux()/Dp);
 
-            phi1.boundaryField() ==
-                (fvc::interpolate(U1) & mesh.Sf())().boundaryField();
             phi1 = phiHbyA1 - rAU1f*SfGradp/rho1;
-
-            phi2.boundaryField() ==
-                (fvc::interpolate(U2) & mesh.Sf())().boundaryField();
             phi2 = phiHbyA2 - rAU2f*SfGradp/rho2;
-
             phi = alpha1f*phi1 + alpha2f*phi2;
 
             p.relax();
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseEulerFoam.C b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseEulerFoam.C
index 19810a15f1..357c7e413a 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseEulerFoam.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseEulerFoam.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -43,6 +43,7 @@ Description
 #include "kineticTheoryModel.H"
 
 #include "pimpleControl.H"
+#include "MRFZones.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -56,6 +57,7 @@ int main(int argc, char *argv[])
     #include "createFields.H"
     #include "readPPProperties.H"
     #include "initContinuityErrs.H"
+    #include "createMRFZones.H"
     #include "readTimeControls.H"
     #include "CourantNo.H"
     #include "setInitialDeltaT.H"

From 6056c00f2813645df684b6c849600ca99311fac9 Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Mon, 19 Mar 2012 11:56:22 +0000
Subject: [PATCH 056/317] twoPhaseEulerFoam/phaseModel: Make consistent with
 compressibleTwoPhaseEulerFoam

---
 .../twoPhaseEulerFoam/phaseModel/phaseModel/phaseModel.C    | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseModel/phaseModel/phaseModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseModel/phaseModel/phaseModel.C
index d81ad8e703..aebc7ba6cb 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseModel/phaseModel/phaseModel.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseModel/phaseModel/phaseModel.C
@@ -43,14 +43,20 @@ Foam::phaseModel::phaseModel
     name_(phaseName),
     d_
     (
+        "d",
+        dimLength,
         dict_.lookup("d")
     ),
     nu_
     (
+        "nu",
+        dimensionSet(0, 2, -1, 0, 0),
         dict_.lookup("nu")
     ),
     rho_
     (
+        "rho",
+        dimDensity,
         dict_.lookup("rho")
     ),
     U_

From 5fe6a033375e346a3b77632b9eecfc612e40efd2 Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Mon, 19 Mar 2012 11:56:38 +0000
Subject: [PATCH 057/317] twoPhaseEulerFoam: Add MRF support

---
 .../solvers/multiphase/twoPhaseEulerFoam/createMRFZones.H     | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 applications/solvers/multiphase/twoPhaseEulerFoam/createMRFZones.H

diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/createMRFZones.H b/applications/solvers/multiphase/twoPhaseEulerFoam/createMRFZones.H
new file mode 100644
index 0000000000..4d5c2bab72
--- /dev/null
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/createMRFZones.H
@@ -0,0 +1,4 @@
+    MRFZones mrfZones(mesh);
+    mrfZones.correctBoundaryVelocity(U1);
+    mrfZones.correctBoundaryVelocity(U2);
+    mrfZones.correctBoundaryVelocity(U);

From bd1317b71b7c5827dc1f3a9c4eb6ecca980491e3 Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Mon, 19 Mar 2012 11:58:40 +0000
Subject: [PATCH 058/317] twoPhaseEulerFoam/mixerVessel2D: new tutorial for MRF
 support in twoPhaseEulerFoam

---
 .../twoPhaseEulerFoam/mixerVessel2D/0/Theta   |  44 +
 .../twoPhaseEulerFoam/mixerVessel2D/0/U1      |  46 +
 .../twoPhaseEulerFoam/mixerVessel2D/0/U2      |  46 +
 .../twoPhaseEulerFoam/mixerVessel2D/0/alpha1  |  44 +
 .../twoPhaseEulerFoam/mixerVessel2D/0/epsilon |  48 +
 .../twoPhaseEulerFoam/mixerVessel2D/0/k       |  48 +
 .../twoPhaseEulerFoam/mixerVessel2D/0/p       |  46 +
 .../twoPhaseEulerFoam/mixerVessel2D/Allrun    |  12 +
 .../mixerVessel2D/constant/MRFZones           |  31 +
 .../mixerVessel2D/constant/RASProperties      |  25 +
 .../mixerVessel2D/constant/g                  |  22 +
 .../constant/interfacialProperties            |  30 +
 .../constant/kineticTheoryProperties          |  52 ++
 .../constant/polyMesh/blockMeshDict.m4        | 818 ++++++++++++++++++
 .../mixerVessel2D/constant/polyMesh/boundary  |  46 +
 .../mixerVessel2D/constant/ppProperties       |  29 +
 .../constant/transportProperties              |  65 ++
 .../twoPhaseEulerFoam/mixerVessel2D/makeMesh  |   6 +
 .../mixerVessel2D/system/controlDict          |  55 ++
 .../mixerVessel2D/system/fvSchemes            |  62 ++
 .../mixerVessel2D/system/fvSolution           | 102 +++
 21 files changed, 1677 insertions(+)
 create mode 100644 tutorials/multiphase/twoPhaseEulerFoam/mixerVessel2D/0/Theta
 create mode 100644 tutorials/multiphase/twoPhaseEulerFoam/mixerVessel2D/0/U1
 create mode 100644 tutorials/multiphase/twoPhaseEulerFoam/mixerVessel2D/0/U2
 create mode 100644 tutorials/multiphase/twoPhaseEulerFoam/mixerVessel2D/0/alpha1
 create mode 100644 tutorials/multiphase/twoPhaseEulerFoam/mixerVessel2D/0/epsilon
 create mode 100644 tutorials/multiphase/twoPhaseEulerFoam/mixerVessel2D/0/k
 create mode 100644 tutorials/multiphase/twoPhaseEulerFoam/mixerVessel2D/0/p
 create mode 100755 tutorials/multiphase/twoPhaseEulerFoam/mixerVessel2D/Allrun
 create mode 100644 tutorials/multiphase/twoPhaseEulerFoam/mixerVessel2D/constant/MRFZones
 create mode 100644 tutorials/multiphase/twoPhaseEulerFoam/mixerVessel2D/constant/RASProperties
 create mode 100644 tutorials/multiphase/twoPhaseEulerFoam/mixerVessel2D/constant/g
 create mode 100644 tutorials/multiphase/twoPhaseEulerFoam/mixerVessel2D/constant/interfacialProperties
 create mode 100644 tutorials/multiphase/twoPhaseEulerFoam/mixerVessel2D/constant/kineticTheoryProperties
 create mode 100644 tutorials/multiphase/twoPhaseEulerFoam/mixerVessel2D/constant/polyMesh/blockMeshDict.m4
 create mode 100644 tutorials/multiphase/twoPhaseEulerFoam/mixerVessel2D/constant/polyMesh/boundary
 create mode 100644 tutorials/multiphase/twoPhaseEulerFoam/mixerVessel2D/constant/ppProperties
 create mode 100644 tutorials/multiphase/twoPhaseEulerFoam/mixerVessel2D/constant/transportProperties
 create mode 100755 tutorials/multiphase/twoPhaseEulerFoam/mixerVessel2D/makeMesh
 create mode 100644 tutorials/multiphase/twoPhaseEulerFoam/mixerVessel2D/system/controlDict
 create mode 100644 tutorials/multiphase/twoPhaseEulerFoam/mixerVessel2D/system/fvSchemes
 create mode 100644 tutorials/multiphase/twoPhaseEulerFoam/mixerVessel2D/system/fvSolution

diff --git a/tutorials/multiphase/twoPhaseEulerFoam/mixerVessel2D/0/Theta b/tutorials/multiphase/twoPhaseEulerFoam/mixerVessel2D/0/Theta
new file mode 100644
index 0000000000..b18d202df8
--- /dev/null
+++ b/tutorials/multiphase/twoPhaseEulerFoam/mixerVessel2D/0/Theta
@@ -0,0 +1,44 @@
+/*--------------------------------*- 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;
+    object      Theta;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 2 -2 0 0 0 0];
+
+internalField   uniform 0;
+
+boundaryField
+{
+    rotor
+    {
+        type            zeroGradient;
+    }
+
+    stator
+    {
+        type            zeroGradient;
+    }
+
+    front
+    {
+        type            empty;
+    }
+
+    back
+    {
+        type            empty;
+    }
+}
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/mixerVessel2D/0/U1 b/tutorials/multiphase/twoPhaseEulerFoam/mixerVessel2D/0/U1
new file mode 100644
index 0000000000..7a88b38478
--- /dev/null
+++ b/tutorials/multiphase/twoPhaseEulerFoam/mixerVessel2D/0/U1
@@ -0,0 +1,46 @@
+/*--------------------------------*- 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       volVectorField;
+    object      U1;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 1 -1 0 0 0 0];
+
+internalField   uniform (0 0 0);
+
+boundaryField
+{
+    rotor
+    {
+        type            fixedValue;
+        value           uniform (0 0 0);
+    }
+
+    stator
+    {
+        type            fixedValue;
+        value           uniform (0 0 0);
+    }
+
+    front
+    {
+        type            empty;
+    }
+
+    back
+    {
+        type            empty;
+    }
+}
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/mixerVessel2D/0/U2 b/tutorials/multiphase/twoPhaseEulerFoam/mixerVessel2D/0/U2
new file mode 100644
index 0000000000..b93b8d870d
--- /dev/null
+++ b/tutorials/multiphase/twoPhaseEulerFoam/mixerVessel2D/0/U2
@@ -0,0 +1,46 @@
+/*--------------------------------*- 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       volVectorField;
+    object      U2;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 1 -1 0 0 0 0];
+
+internalField   uniform (0 0 0);
+
+boundaryField
+{
+    rotor
+    {
+        type            fixedValue;
+        value           uniform (0 0 0);
+    }
+
+    stator
+    {
+        type            fixedValue;
+        value           uniform (0 0 0);
+    }
+
+    front
+    {
+        type            empty;
+    }
+
+    back
+    {
+        type            empty;
+    }
+}
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/mixerVessel2D/0/alpha1 b/tutorials/multiphase/twoPhaseEulerFoam/mixerVessel2D/0/alpha1
new file mode 100644
index 0000000000..637ebed0e8
--- /dev/null
+++ b/tutorials/multiphase/twoPhaseEulerFoam/mixerVessel2D/0/alpha1
@@ -0,0 +1,44 @@
+/*--------------------------------*- 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;
+    object      alpha1;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 0 0 0 0 0 0];
+
+internalField   uniform 0.5;
+
+boundaryField
+{
+    rotor
+    {
+        type            zeroGradient;
+    }
+
+    stator
+    {
+        type            zeroGradient;
+    }
+
+    front
+    {
+        type            empty;
+    }
+
+    back
+    {
+        type            empty;
+    }
+}
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/mixerVessel2D/0/epsilon b/tutorials/multiphase/twoPhaseEulerFoam/mixerVessel2D/0/epsilon
new file mode 100644
index 0000000000..3f507afed8
--- /dev/null
+++ b/tutorials/multiphase/twoPhaseEulerFoam/mixerVessel2D/0/epsilon
@@ -0,0 +1,48 @@
+/*--------------------------------*- 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      epsilon;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [ 0 2 -3 0 0 0 0 ];
+
+internalField   uniform 20;
+
+boundaryField
+{
+    rotor
+    {
+        type            zeroGradient;
+        value           uniform 20;
+    }
+
+    stator
+    {
+        type            zeroGradient;
+        value           uniform 20;
+    }
+
+    front
+    {
+        type            empty;
+    }
+
+    back
+    {
+        type            empty;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/mixerVessel2D/0/k b/tutorials/multiphase/twoPhaseEulerFoam/mixerVessel2D/0/k
new file mode 100644
index 0000000000..4704b49c83
--- /dev/null
+++ b/tutorials/multiphase/twoPhaseEulerFoam/mixerVessel2D/0/k
@@ -0,0 +1,48 @@
+/*--------------------------------*- 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      k;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [ 0 2 -2 0 0 0 0 ];
+
+internalField   uniform 0;
+
+boundaryField
+{
+    rotor
+    {
+        type            zeroGradient;
+        value           uniform 0;
+    }
+
+    stator
+    {
+        type            zeroGradient;
+        value           uniform 0;
+    }
+
+    front
+    {
+        type            empty;
+    }
+
+    back
+    {
+        type            empty;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/mixerVessel2D/0/p b/tutorials/multiphase/twoPhaseEulerFoam/mixerVessel2D/0/p
new file mode 100644
index 0000000000..9c4de0da51
--- /dev/null
+++ b/tutorials/multiphase/twoPhaseEulerFoam/mixerVessel2D/0/p
@@ -0,0 +1,46 @@
+/*--------------------------------*- 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;
+    object      p;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [1 -1 -2 0 0 0 0];
+
+internalField   uniform 1e5;
+
+boundaryField
+{
+    rotor
+    {
+        type            multiphaseFixedFluxPressure;
+        value           $internalField;
+    }
+
+    stator
+    {
+        type            multiphaseFixedFluxPressure;
+        value           $internalField;
+    }
+
+    front
+    {
+        type            empty;
+    }
+
+    back
+    {
+        type            empty;
+    }
+}
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/mixerVessel2D/Allrun b/tutorials/multiphase/twoPhaseEulerFoam/mixerVessel2D/Allrun
new file mode 100755
index 0000000000..a718eaf7e6
--- /dev/null
+++ b/tutorials/multiphase/twoPhaseEulerFoam/mixerVessel2D/Allrun
@@ -0,0 +1,12 @@
+#!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
+
+# Source tutorial run functions
+. $WM_PROJECT_DIR/bin/tools/RunFunctions
+
+application=`getApplication`
+
+runApplication ./makeMesh
+runApplication $application
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/mixerVessel2D/constant/MRFZones b/tutorials/multiphase/twoPhaseEulerFoam/mixerVessel2D/constant/MRFZones
new file mode 100644
index 0000000000..25c3311d0b
--- /dev/null
+++ b/tutorials/multiphase/twoPhaseEulerFoam/mixerVessel2D/constant/MRFZones
@@ -0,0 +1,31 @@
+/*--------------------------------*- 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      MRFZones;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+1
+(
+    rotor
+    {
+        // Fixed patches (by default they 'move' with the MRF zone)
+        nonRotatingPatches ();
+
+        origin    origin [0 1 0 0 0 0 0]  (0 0 0);
+        axis      axis   [0 0 0 0 0 0 0]  (0 0 1);
+        omega     omega  [0 0 -1 0 0 0 0] 10.472;
+    }
+)
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/mixerVessel2D/constant/RASProperties b/tutorials/multiphase/twoPhaseEulerFoam/mixerVessel2D/constant/RASProperties
new file mode 100644
index 0000000000..41b54318fe
--- /dev/null
+++ b/tutorials/multiphase/twoPhaseEulerFoam/mixerVessel2D/constant/RASProperties
@@ -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      RASProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+RASModel        kEpsilon;
+
+turbulence      off;
+
+printCoeffs     on;
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/mixerVessel2D/constant/g b/tutorials/multiphase/twoPhaseEulerFoam/mixerVessel2D/constant/g
new file mode 100644
index 0000000000..508d658494
--- /dev/null
+++ b/tutorials/multiphase/twoPhaseEulerFoam/mixerVessel2D/constant/g
@@ -0,0 +1,22 @@
+/*--------------------------------*- 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       uniformDimensionedVectorField;
+    location    "constant";
+    object      g;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 1 -2 0 0 0 0];
+value           (0 0 0);
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/mixerVessel2D/constant/interfacialProperties b/tutorials/multiphase/twoPhaseEulerFoam/mixerVessel2D/constant/interfacialProperties
new file mode 100644
index 0000000000..41159fe9de
--- /dev/null
+++ b/tutorials/multiphase/twoPhaseEulerFoam/mixerVessel2D/constant/interfacialProperties
@@ -0,0 +1,30 @@
+/*--------------------------------*- 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      interfacialProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dragModel1          SchillerNaumann;
+dragModel2          SchillerNaumann;
+
+heatTransferModel1  RanzMarshall;
+heatTransferModel2  RanzMarshall;
+
+dispersedPhase      both;
+dragPhase           blended;
+
+residualSlip        1e-2;
+minInterfaceAlpha   1e-3;
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/mixerVessel2D/constant/kineticTheoryProperties b/tutorials/multiphase/twoPhaseEulerFoam/mixerVessel2D/constant/kineticTheoryProperties
new file mode 100644
index 0000000000..53521fbae3
--- /dev/null
+++ b/tutorials/multiphase/twoPhaseEulerFoam/mixerVessel2D/constant/kineticTheoryProperties
@@ -0,0 +1,52 @@
+/*--------------------------------*- 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      kineticTheoryProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+kineticTheory   off;
+
+equilibrium     on;
+
+e               e [ 0 0 0 0 0 0 0 ] 0.9;
+
+alphaMax        alphaMax [ 0 0 0 0 0 0 0 ] 0.6;
+
+alphaMinFriction alphaMinFriction [ 0 0 0 0 0 0 0 ] 0.5;
+
+Fr              Fr [ 1 -1 -2 0 0 0 0 ] 0.05;
+
+eta             eta [ 0 0 0 0 0 0 0 ] 2;
+
+p               p [ 0 0 0 0 0 0 0 ] 5;
+
+phi             phi [ 0 0 0 0 0 0 0 ] 25;
+
+viscosityModel  Syamlal;
+
+conductivityModel HrenyaSinclair;
+
+granularPressureModel Lun;
+
+frictionalStressModel JohnsonJackson;
+
+radialModel     Gidaspow;
+
+HrenyaSinclairCoeffs
+{
+    L               L [ 0 1 0 0 0 0 0 ] 0.0005;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/mixerVessel2D/constant/polyMesh/blockMeshDict.m4 b/tutorials/multiphase/twoPhaseEulerFoam/mixerVessel2D/constant/polyMesh/blockMeshDict.m4
new file mode 100644
index 0000000000..a93868498b
--- /dev/null
+++ b/tutorials/multiphase/twoPhaseEulerFoam/mixerVessel2D/constant/polyMesh/blockMeshDict.m4
@@ -0,0 +1,818 @@
+/*--------------------------------*- 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;
+    object      blockMeshDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// General macros to create 2D/extruded-2D meshes
+
+changecom(//)changequote([,])
+define(calc, [esyscmd(perl -e 'print ($1)')])
+define(VCOUNT, 0)
+define(vlabel, [[// ]Vertex $1 = VCOUNT define($1, VCOUNT)define([VCOUNT], incr(VCOUNT))])
+define(pi, 3.14159265)
+
+define(hex2D, hex ($1b $2b $3b $4b $1t $2t $3t $4t))
+define(quad2D, ($1b $2b $2t $1t))
+define(frontQuad, ($1t $2t $3t $4t))
+define(backQuad, ($1b $4b $3b $2b))
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+convertToMeters 0.1;
+
+// Hub radius
+define(r, 0.2)
+
+// Impeller-tip radius
+define(rb, 0.5)
+
+// Baffle-tip radius
+define(Rb, 0.7)
+
+// Tank radius
+define(R, 1)
+
+// MRF region radius
+define(ri, calc(0.5*(rb + Rb)))
+
+// Thickness of 2D slab
+define(z, 0.1)
+
+// Base z
+define(Zb, 0)
+
+// Top z
+define(Zt, calc(Zb + z))
+
+// Number of cells radially between hub and impeller tip
+define(Nr, 12)
+
+// Number of cells radially in each of the two regions between
+// impeller and baffle tips
+define(Ni, 4)
+
+// Number of cells radially between baffle tip and tank
+define(NR, 12)
+
+// Number of cells azimuthally in each of the 8 blocks
+define(Na, 12)
+
+// Number of cells in the thickness of the slab
+define(Nz, 1)
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+define(vert, (x$1$2 y$1$2 $3))
+define(evert, (ex$1$2 ey$1$2 $3))
+
+define(a0, 0)
+define(a1, -45)
+define(a2, -90)
+define(a3, -135)
+define(a4, 180)
+define(a5, 135)
+define(a6, 90)
+define(a7, 45)
+
+define(ea0, -22.5)
+define(ea1, -67.5)
+define(ea2, -112.5)
+define(ea3, -157.5)
+define(ea4, 157.5)
+define(ea5, 112.5)
+define(ea6, 67.5)
+define(ea7, 22.5)
+
+define(ca0, calc(cos((pi/180)*a0)))
+define(ca1, calc(cos((pi/180)*a1)))
+define(ca2, calc(cos((pi/180)*a2)))
+define(ca3, calc(cos((pi/180)*a3)))
+define(ca4, calc(cos((pi/180)*a4)))
+define(ca5, calc(cos((pi/180)*a5)))
+define(ca6, calc(cos((pi/180)*a6)))
+define(ca7, calc(cos((pi/180)*a7)))
+
+define(sa0, calc(sin((pi/180)*a0)))
+define(sa1, calc(sin((pi/180)*a1)))
+define(sa2, calc(sin((pi/180)*a2)))
+define(sa3, calc(sin((pi/180)*a3)))
+define(sa4, calc(sin((pi/180)*a4)))
+define(sa5, calc(sin((pi/180)*a5)))
+define(sa6, calc(sin((pi/180)*a6)))
+define(sa7, calc(sin((pi/180)*a7)))
+
+define(cea0, calc(cos((pi/180)*ea0)))
+define(cea1, calc(cos((pi/180)*ea1)))
+define(cea2, calc(cos((pi/180)*ea2)))
+define(cea3, calc(cos((pi/180)*ea3)))
+define(cea4, calc(cos((pi/180)*ea4)))
+define(cea5, calc(cos((pi/180)*ea5)))
+define(cea6, calc(cos((pi/180)*ea6)))
+define(cea7, calc(cos((pi/180)*ea7)))
+
+define(sea0, calc(sin((pi/180)*ea0)))
+define(sea1, calc(sin((pi/180)*ea1)))
+define(sea2, calc(sin((pi/180)*ea2)))
+define(sea3, calc(sin((pi/180)*ea3)))
+define(sea4, calc(sin((pi/180)*ea4)))
+define(sea5, calc(sin((pi/180)*ea5)))
+define(sea6, calc(sin((pi/180)*ea6)))
+define(sea7, calc(sin((pi/180)*ea7)))
+
+define(x00, calc(r*ca0))
+define(x01, calc(r*ca1))
+define(x02, calc(r*ca2))
+define(x03, calc(r*ca3))
+define(x04, calc(r*ca4))
+define(x05, calc(r*ca5))
+define(x06, calc(r*ca6))
+define(x07, calc(r*ca7))
+
+define(x10, calc(rb*ca0))
+define(x11, calc(rb*ca1))
+define(x12, calc(rb*ca2))
+define(x13, calc(rb*ca3))
+define(x14, calc(rb*ca4))
+define(x15, calc(rb*ca5))
+define(x16, calc(rb*ca6))
+define(x17, calc(rb*ca7))
+
+define(x20, calc(ri*ca0))
+define(x21, calc(ri*ca1))
+define(x22, calc(ri*ca2))
+define(x23, calc(ri*ca3))
+define(x24, calc(ri*ca4))
+define(x25, calc(ri*ca5))
+define(x26, calc(ri*ca6))
+define(x27, calc(ri*ca7))
+
+define(x30, calc(Rb*ca0))
+define(x31, calc(Rb*ca1))
+define(x32, calc(Rb*ca2))
+define(x33, calc(Rb*ca3))
+define(x34, calc(Rb*ca4))
+define(x35, calc(Rb*ca5))
+define(x36, calc(Rb*ca6))
+define(x37, calc(Rb*ca7))
+
+define(x40, calc(R*ca0))
+define(x41, calc(R*ca1))
+define(x42, calc(R*ca2))
+define(x43, calc(R*ca3))
+define(x44, calc(R*ca4))
+define(x45, calc(R*ca5))
+define(x46, calc(R*ca6))
+define(x47, calc(R*ca7))
+
+define(y00, calc(r*sa0))
+define(y01, calc(r*sa1))
+define(y02, calc(r*sa2))
+define(y03, calc(r*sa3))
+define(y04, calc(r*sa4))
+define(y05, calc(r*sa5))
+define(y06, calc(r*sa6))
+define(y07, calc(r*sa7))
+
+define(y10, calc(rb*sa0))
+define(y11, calc(rb*sa1))
+define(y12, calc(rb*sa2))
+define(y13, calc(rb*sa3))
+define(y14, calc(rb*sa4))
+define(y15, calc(rb*sa5))
+define(y16, calc(rb*sa6))
+define(y17, calc(rb*sa7))
+
+define(y20, calc(ri*sa0))
+define(y21, calc(ri*sa1))
+define(y22, calc(ri*sa2))
+define(y23, calc(ri*sa3))
+define(y24, calc(ri*sa4))
+define(y25, calc(ri*sa5))
+define(y26, calc(ri*sa6))
+define(y27, calc(ri*sa7))
+
+define(y30, calc(Rb*sa0))
+define(y31, calc(Rb*sa1))
+define(y32, calc(Rb*sa2))
+define(y33, calc(Rb*sa3))
+define(y34, calc(Rb*sa4))
+define(y35, calc(Rb*sa5))
+define(y36, calc(Rb*sa6))
+define(y37, calc(Rb*sa7))
+
+define(y40, calc(R*sa0))
+define(y41, calc(R*sa1))
+define(y42, calc(R*sa2))
+define(y43, calc(R*sa3))
+define(y44, calc(R*sa4))
+define(y45, calc(R*sa5))
+define(y46, calc(R*sa6))
+define(y47, calc(R*sa7))
+
+define(ex00, calc(r*cea0))
+define(ex01, calc(r*cea1))
+define(ex02, calc(r*cea2))
+define(ex03, calc(r*cea3))
+define(ex04, calc(r*cea4))
+define(ex05, calc(r*cea5))
+define(ex06, calc(r*cea6))
+define(ex07, calc(r*cea7))
+
+define(ex10, calc(rb*cea0))
+define(ex11, calc(rb*cea1))
+define(ex12, calc(rb*cea2))
+define(ex13, calc(rb*cea3))
+define(ex14, calc(rb*cea4))
+define(ex15, calc(rb*cea5))
+define(ex16, calc(rb*cea6))
+define(ex17, calc(rb*cea7))
+
+define(ex20, calc(ri*cea0))
+define(ex21, calc(ri*cea1))
+define(ex22, calc(ri*cea2))
+define(ex23, calc(ri*cea3))
+define(ex24, calc(ri*cea4))
+define(ex25, calc(ri*cea5))
+define(ex26, calc(ri*cea6))
+define(ex27, calc(ri*cea7))
+
+define(ex30, calc(Rb*cea0))
+define(ex31, calc(Rb*cea1))
+define(ex32, calc(Rb*cea2))
+define(ex33, calc(Rb*cea3))
+define(ex34, calc(Rb*cea4))
+define(ex35, calc(Rb*cea5))
+define(ex36, calc(Rb*cea6))
+define(ex37, calc(Rb*cea7))
+
+define(ex40, calc(R*cea0))
+define(ex41, calc(R*cea1))
+define(ex42, calc(R*cea2))
+define(ex43, calc(R*cea3))
+define(ex44, calc(R*cea4))
+define(ex45, calc(R*cea5))
+define(ex46, calc(R*cea6))
+define(ex47, calc(R*cea7))
+
+define(ey00, calc(r*sea0))
+define(ey01, calc(r*sea1))
+define(ey02, calc(r*sea2))
+define(ey03, calc(r*sea3))
+define(ey04, calc(r*sea4))
+define(ey05, calc(r*sea5))
+define(ey06, calc(r*sea6))
+define(ey07, calc(r*sea7))
+
+define(ey10, calc(rb*sea0))
+define(ey11, calc(rb*sea1))
+define(ey12, calc(rb*sea2))
+define(ey13, calc(rb*sea3))
+define(ey14, calc(rb*sea4))
+define(ey15, calc(rb*sea5))
+define(ey16, calc(rb*sea6))
+define(ey17, calc(rb*sea7))
+
+define(ey20, calc(ri*sea0))
+define(ey21, calc(ri*sea1))
+define(ey22, calc(ri*sea2))
+define(ey23, calc(ri*sea3))
+define(ey24, calc(ri*sea4))
+define(ey25, calc(ri*sea5))
+define(ey26, calc(ri*sea6))
+define(ey27, calc(ri*sea7))
+
+define(ey30, calc(Rb*sea0))
+define(ey31, calc(Rb*sea1))
+define(ey32, calc(Rb*sea2))
+define(ey33, calc(Rb*sea3))
+define(ey34, calc(Rb*sea4))
+define(ey35, calc(Rb*sea5))
+define(ey36, calc(Rb*sea6))
+define(ey37, calc(Rb*sea7))
+
+define(ey40, calc(R*sea0))
+define(ey41, calc(R*sea1))
+define(ey42, calc(R*sea2))
+define(ey43, calc(R*sea3))
+define(ey44, calc(R*sea4))
+define(ey45, calc(R*sea5))
+define(ey46, calc(R*sea6))
+define(ey47, calc(R*sea7))
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+vertices
+(
+    vert(0, 0, Zb) vlabel(r0b)
+    vert(0, 0, Zb) vlabel(r0sb)
+    vert(0, 1, Zb) vlabel(r1b)
+    vert(0, 2, Zb) vlabel(r2b)
+    vert(0, 2, Zb) vlabel(r2sb)
+    vert(0, 3, Zb) vlabel(r3b)
+    vert(0, 4, Zb) vlabel(r4b)
+    vert(0, 4, Zb) vlabel(r4sb)
+    vert(0, 5, Zb) vlabel(r5b)
+    vert(0, 6, Zb) vlabel(r6b)
+    vert(0, 6, Zb) vlabel(r6sb)
+    vert(0, 7, Zb) vlabel(r7b)
+
+    vert(1, 0, Zb) vlabel(rb0b)
+    vert(1, 1, Zb) vlabel(rb1b)
+    vert(1, 2, Zb) vlabel(rb2b)
+    vert(1, 3, Zb) vlabel(rb3b)
+    vert(1, 4, Zb) vlabel(rb4b)
+    vert(1, 5, Zb) vlabel(rb5b)
+    vert(1, 6, Zb) vlabel(rb6b)
+    vert(1, 7, Zb) vlabel(rb7b)
+
+    vert(2, 0, Zb) vlabel(ri0b)
+    vert(2, 1, Zb) vlabel(ri1b)
+    vert(2, 2, Zb) vlabel(ri2b)
+    vert(2, 3, Zb) vlabel(ri3b)
+    vert(2, 4, Zb) vlabel(ri4b)
+    vert(2, 5, Zb) vlabel(ri5b)
+    vert(2, 6, Zb) vlabel(ri6b)
+    vert(2, 7, Zb) vlabel(ri7b)
+
+    vert(3, 0, Zb) vlabel(Rb0b)
+    vert(3, 1, Zb) vlabel(Rb1b)
+    vert(3, 2, Zb) vlabel(Rb2b)
+    vert(3, 3, Zb) vlabel(Rb3b)
+    vert(3, 4, Zb) vlabel(Rb4b)
+    vert(3, 5, Zb) vlabel(Rb5b)
+    vert(3, 6, Zb) vlabel(Rb6b)
+    vert(3, 7, Zb) vlabel(Rb7b)
+
+    vert(4, 0, Zb) vlabel(R0b)
+    vert(4, 1, Zb) vlabel(R1b)
+    vert(4, 1, Zb) vlabel(R1sb)
+    vert(4, 2, Zb) vlabel(R2b)
+    vert(4, 3, Zb) vlabel(R3b)
+    vert(4, 3, Zb) vlabel(R3sb)
+    vert(4, 4, Zb) vlabel(R4b)
+    vert(4, 5, Zb) vlabel(R5b)
+    vert(4, 5, Zb) vlabel(R5sb)
+    vert(4, 6, Zb) vlabel(R6b)
+    vert(4, 7, Zb) vlabel(R7b)
+    vert(4, 7, Zb) vlabel(R7sb)
+
+    vert(0, 0, Zt) vlabel(r0t)
+    vert(0, 0, Zt) vlabel(r0st)
+    vert(0, 1, Zt) vlabel(r1t)
+    vert(0, 2, Zt) vlabel(r2t)
+    vert(0, 2, Zt) vlabel(r2st)
+    vert(0, 3, Zt) vlabel(r3t)
+    vert(0, 4, Zt) vlabel(r4t)
+    vert(0, 4, Zt) vlabel(r4st)
+    vert(0, 5, Zt) vlabel(r5t)
+    vert(0, 6, Zt) vlabel(r6t)
+    vert(0, 6, Zt) vlabel(r6st)
+    vert(0, 7, Zt) vlabel(r7t)
+
+    vert(1, 0, Zt) vlabel(rb0t)
+    vert(1, 1, Zt) vlabel(rb1t)
+    vert(1, 2, Zt) vlabel(rb2t)
+    vert(1, 3, Zt) vlabel(rb3t)
+    vert(1, 4, Zt) vlabel(rb4t)
+    vert(1, 5, Zt) vlabel(rb5t)
+    vert(1, 6, Zt) vlabel(rb6t)
+    vert(1, 7, Zt) vlabel(rb7t)
+
+    vert(2, 0, Zt) vlabel(ri0t)
+    vert(2, 1, Zt) vlabel(ri1t)
+    vert(2, 2, Zt) vlabel(ri2t)
+    vert(2, 3, Zt) vlabel(ri3t)
+    vert(2, 4, Zt) vlabel(ri4t)
+    vert(2, 5, Zt) vlabel(ri5t)
+    vert(2, 6, Zt) vlabel(ri6t)
+    vert(2, 7, Zt) vlabel(ri7t)
+
+    vert(3, 0, Zt) vlabel(Rb0t)
+    vert(3, 1, Zt) vlabel(Rb1t)
+    vert(3, 2, Zt) vlabel(Rb2t)
+    vert(3, 3, Zt) vlabel(Rb3t)
+    vert(3, 4, Zt) vlabel(Rb4t)
+    vert(3, 5, Zt) vlabel(Rb5t)
+    vert(3, 6, Zt) vlabel(Rb6t)
+    vert(3, 7, Zt) vlabel(Rb7t)
+
+    vert(4, 0, Zt) vlabel(R0t)
+    vert(4, 1, Zt) vlabel(R1t)
+    vert(4, 1, Zt) vlabel(R1st)
+    vert(4, 2, Zt) vlabel(R2t)
+    vert(4, 3, Zt) vlabel(R3t)
+    vert(4, 3, Zt) vlabel(R3st)
+    vert(4, 4, Zt) vlabel(R4t)
+    vert(4, 5, Zt) vlabel(R5t)
+    vert(4, 5, Zt) vlabel(R5st)
+    vert(4, 6, Zt) vlabel(R6t)
+    vert(4, 7, Zt) vlabel(R7t)
+    vert(4, 7, Zt) vlabel(R7st)
+);
+
+blocks
+(
+    // block0
+    hex2D(r0, r1, rb1, rb0)
+    rotor
+    (Na Nr Nz)
+    simpleGrading (1 1 1)
+
+    // block1
+    hex2D(r1, r2s, rb2, rb1)
+    rotor
+    (Na Nr Nz)
+    simpleGrading (1 1 1)
+
+    // block2
+    hex2D(r2, r3, rb3, rb2)
+    rotor
+    (Na Nr Nz)
+    simpleGrading (1 1 1)
+
+    // block3
+    hex2D(r3, r4s, rb4, rb3)
+    rotor
+    (Na Nr Nz)
+    simpleGrading (1 1 1)
+
+    // block4
+    hex2D(r4, r5, rb5, rb4)
+    rotor
+    (Na Nr Nz)
+    simpleGrading (1 1 1)
+
+    // block5
+    hex2D(r5, r6s, rb6, rb5)
+    rotor
+    (Na Nr Nz)
+    simpleGrading (1 1 1)
+
+    // block6
+    hex2D(r6, r7, rb7, rb6)
+    rotor
+    (Na Nr Nz)
+    simpleGrading (1 1 1)
+
+    // block7
+    hex2D(r7, r0s, rb0, rb7)
+    rotor
+    (Na Nr Nz)
+    simpleGrading (1 1 1)
+
+    // block0
+    hex2D(rb0, rb1, ri1, ri0)
+    rotor
+    (Na Ni Nz)
+    simpleGrading (1 1 1)
+
+    // block1
+    hex2D(rb1, rb2, ri2, ri1)
+    rotor
+    (Na Ni Nz)
+    simpleGrading (1 1 1)
+
+    // block2
+    hex2D(rb2, rb3, ri3, ri2)
+    rotor
+    (Na Ni Nz)
+    simpleGrading (1 1 1)
+
+    // block3
+    hex2D(rb3, rb4, ri4, ri3)
+    rotor
+    (Na Ni Nz)
+    simpleGrading (1 1 1)
+
+    // block4
+    hex2D(rb4, rb5, ri5, ri4)
+    rotor
+    (Na Ni Nz)
+    simpleGrading (1 1 1)
+
+    // block5
+    hex2D(rb5, rb6, ri6, ri5)
+    rotor
+    (Na Ni Nz)
+    simpleGrading (1 1 1)
+
+    // block6
+    hex2D(rb6, rb7, ri7, ri6)
+    rotor
+    (Na Ni Nz)
+    simpleGrading (1 1 1)
+
+    // block7
+    hex2D(rb7, rb0, ri0, ri7)
+    rotor
+    (Na Ni Nz)
+    simpleGrading (1 1 1)
+
+    // block0
+    hex2D(ri0, ri1, Rb1, Rb0)
+    (Na Ni Nz)
+    simpleGrading (1 1 1)
+
+    // block1
+    hex2D(ri1, ri2, Rb2, Rb1)
+    (Na Ni Nz)
+    simpleGrading (1 1 1)
+
+    // block2
+    hex2D(ri2, ri3, Rb3, Rb2)
+    (Na Ni Nz)
+    simpleGrading (1 1 1)
+
+    // block3
+    hex2D(ri3, ri4, Rb4, Rb3)
+    (Na Ni Nz)
+    simpleGrading (1 1 1)
+
+    // block4
+    hex2D(ri4, ri5, Rb5, Rb4)
+    (Na Ni Nz)
+    simpleGrading (1 1 1)
+
+    // block5
+    hex2D(ri5, ri6, Rb6, Rb5)
+    (Na Ni Nz)
+    simpleGrading (1 1 1)
+
+    // block6
+    hex2D(ri6, ri7, Rb7, Rb6)
+    (Na Ni Nz)
+    simpleGrading (1 1 1)
+
+    // block7
+    hex2D(ri7, ri0, Rb0, Rb7)
+    (Na Ni Nz)
+    simpleGrading (1 1 1)
+
+    // block0
+    hex2D(Rb0, Rb1, R1s, R0)
+    (Na NR Nz)
+    simpleGrading (1 1 1)
+
+    // block1
+    hex2D(Rb1, Rb2, R2, R1)
+    (Na NR Nz)
+    simpleGrading (1 1 1)
+
+    // block2
+    hex2D(Rb2, Rb3, R3s, R2)
+    (Na NR Nz)
+    simpleGrading (1 1 1)
+
+    // block3
+    hex2D(Rb3, Rb4, R4, R3)
+    (Na NR Nz)
+    simpleGrading (1 1 1)
+
+    // block4
+    hex2D(Rb4, Rb5, R5s, R4)
+    (Na NR Nz)
+    simpleGrading (1 1 1)
+
+    // block5
+    hex2D(Rb5, Rb6, R6, R5)
+    (Na NR Nz)
+    simpleGrading (1 1 1)
+
+    // block6
+    hex2D(Rb6, Rb7, R7s, R6)
+    (Na NR Nz)
+    simpleGrading (1 1 1)
+
+    // block7
+    hex2D(Rb7, Rb0, R0, R7)
+    (Na NR Nz)
+    simpleGrading (1 1 1)
+);
+
+edges
+(
+    arc r0b r1b evert(0, 0, Zb)
+    arc r1b r2sb evert(0, 1, Zb)
+    arc r2b r3b evert(0, 2, Zb)
+    arc r3b r4sb evert(0, 3, Zb)
+    arc r4b r5b evert(0, 4, Zb)
+    arc r5b r6sb evert(0, 5, Zb)
+    arc r6b r7b evert(0, 6, Zb)
+    arc r7b r0sb evert(0, 7, Zb)
+
+    arc rb0b rb1b evert(1, 0, Zb)
+    arc rb1b rb2b evert(1, 1, Zb)
+    arc rb2b rb3b evert(1, 2, Zb)
+    arc rb3b rb4b evert(1, 3, Zb)
+    arc rb4b rb5b evert(1, 4, Zb)
+    arc rb5b rb6b evert(1, 5, Zb)
+    arc rb6b rb7b evert(1, 6, Zb)
+    arc rb7b rb0b evert(1, 7, Zb)
+
+    arc ri0b ri1b evert(2, 0, Zb)
+    arc ri1b ri2b evert(2, 1, Zb)
+    arc ri2b ri3b evert(2, 2, Zb)
+    arc ri3b ri4b evert(2, 3, Zb)
+    arc ri4b ri5b evert(2, 4, Zb)
+    arc ri5b ri6b evert(2, 5, Zb)
+    arc ri6b ri7b evert(2, 6, Zb)
+    arc ri7b ri0b evert(2, 7, Zb)
+
+    arc Rb0b Rb1b evert(3, 0, Zb)
+    arc Rb1b Rb2b evert(3, 1, Zb)
+    arc Rb2b Rb3b evert(3, 2, Zb)
+    arc Rb3b Rb4b evert(3, 3, Zb)
+    arc Rb4b Rb5b evert(3, 4, Zb)
+    arc Rb5b Rb6b evert(3, 5, Zb)
+    arc Rb6b Rb7b evert(3, 6, Zb)
+    arc Rb7b Rb0b evert(3, 7, Zb)
+
+    arc R0b R1sb evert(4, 0, Zb)
+    arc R1b R2b evert(4, 1, Zb)
+    arc R2b R3sb evert(4, 2, Zb)
+    arc R3b R4b evert(4, 3, Zb)
+    arc R4b R5sb evert(4, 4, Zb)
+    arc R5b R6b evert(4, 5, Zb)
+    arc R6b R7sb evert(4, 6, Zb)
+    arc R7b R0b evert(4, 7, Zb)
+
+    arc r0t r1t evert(0, 0, Zt)
+    arc r1t r2st evert(0, 1, Zt)
+    arc r2t r3t evert(0, 2, Zt)
+    arc r3t r4st evert(0, 3, Zt)
+    arc r4t r5t evert(0, 4, Zt)
+    arc r5t r6st evert(0, 5, Zt)
+    arc r6t r7t evert(0, 6, Zt)
+    arc r7t r0st evert(0, 7, Zt)
+
+    arc rb0t rb1t evert(1, 0, Zt)
+    arc rb1t rb2t evert(1, 1, Zt)
+    arc rb2t rb3t evert(1, 2, Zt)
+    arc rb3t rb4t evert(1, 3, Zt)
+    arc rb4t rb5t evert(1, 4, Zt)
+    arc rb5t rb6t evert(1, 5, Zt)
+    arc rb6t rb7t evert(1, 6, Zt)
+    arc rb7t rb0t evert(1, 7, Zt)
+
+    arc ri0t ri1t evert(2, 0, Zt)
+    arc ri1t ri2t evert(2, 1, Zt)
+    arc ri2t ri3t evert(2, 2, Zt)
+    arc ri3t ri4t evert(2, 3, Zt)
+    arc ri4t ri5t evert(2, 4, Zt)
+    arc ri5t ri6t evert(2, 5, Zt)
+    arc ri6t ri7t evert(2, 6, Zt)
+    arc ri7t ri0t evert(2, 7, Zt)
+
+    arc Rb0t Rb1t evert(3, 0, Zt)
+    arc Rb1t Rb2t evert(3, 1, Zt)
+    arc Rb2t Rb3t evert(3, 2, Zt)
+    arc Rb3t Rb4t evert(3, 3, Zt)
+    arc Rb4t Rb5t evert(3, 4, Zt)
+    arc Rb5t Rb6t evert(3, 5, Zt)
+    arc Rb6t Rb7t evert(3, 6, Zt)
+    arc Rb7t Rb0t evert(3, 7, Zt)
+
+    arc R0t R1st evert(4, 0, Zt)
+    arc R1t R2t evert(4, 1, Zt)
+    arc R2t R3st evert(4, 2, Zt)
+    arc R3t R4t evert(4, 3, Zt)
+    arc R4t R5st evert(4, 4, Zt)
+    arc R5t R6t evert(4, 5, Zt)
+    arc R6t R7st evert(4, 6, Zt)
+    arc R7t R0t evert(4, 7, Zt)
+);
+
+patches
+(
+    wall rotor
+    (
+        quad2D(r0, r1)
+        quad2D(r1, r2s)
+        quad2D(r2, r3)
+        quad2D(r3, r4s)
+        quad2D(r4, r5)
+        quad2D(r5, r6s)
+        quad2D(r6, r7)
+        quad2D(r7, r0s)
+
+        quad2D(r0, rb0)
+        quad2D(r0s, rb0)
+
+        quad2D(r2, rb2)
+        quad2D(r2s, rb2)
+
+        quad2D(r4, rb4)
+        quad2D(r4s, rb4)
+
+        quad2D(r6, rb6)
+        quad2D(r6s, rb6)
+    )
+
+    wall stator
+    (
+        quad2D(R0, R1s)
+        quad2D(R1, R2)
+        quad2D(R2, R3s)
+        quad2D(R3, R4)
+        quad2D(R4, R5s)
+        quad2D(R5, R6)
+        quad2D(R6, R7s)
+        quad2D(R7, R0)
+
+        quad2D(R1, Rb1)
+        quad2D(R1s, Rb1)
+
+        quad2D(R3, Rb3)
+        quad2D(R3s, Rb3)
+
+        quad2D(R5, Rb5)
+        quad2D(R5s, Rb5)
+
+        quad2D(R7, Rb7)
+        quad2D(R7s, Rb7)
+    )
+
+    empty front
+    (
+        frontQuad(r0, r1, rb1, rb0)
+        frontQuad(r1, r2s, rb2, rb1)
+        frontQuad(r2, r3, rb3, rb2)
+        frontQuad(r3, r4s, rb4, rb3)
+        frontQuad(r4, r5, rb5, rb4)
+        frontQuad(r5, r6s, rb6, rb5)
+        frontQuad(r6, r7, rb7, rb6)
+        frontQuad(r7, r0s, rb0, rb7)
+        frontQuad(rb0, rb1, ri1, ri0)
+        frontQuad(rb1, rb2, ri2, ri1)
+        frontQuad(rb2, rb3, ri3, ri2)
+        frontQuad(rb3, rb4, ri4, ri3)
+        frontQuad(rb4, rb5, ri5, ri4)
+        frontQuad(rb5, rb6, ri6, ri5)
+        frontQuad(rb6, rb7, ri7, ri6)
+        frontQuad(rb7, rb0, ri0, ri7)
+        frontQuad(ri0, ri1, Rb1, Rb0)
+        frontQuad(ri1, ri2, Rb2, Rb1)
+        frontQuad(ri2, ri3, Rb3, Rb2)
+        frontQuad(ri3, ri4, Rb4, Rb3)
+        frontQuad(ri4, ri5, Rb5, Rb4)
+        frontQuad(ri5, ri6, Rb6, Rb5)
+        frontQuad(ri6, ri7, Rb7, Rb6)
+        frontQuad(ri7, ri0, Rb0, Rb7)
+        frontQuad(Rb0, Rb1, R1s, R0)
+        frontQuad(Rb1, Rb2, R2, R1)
+        frontQuad(Rb2, Rb3, R3s, R2)
+        frontQuad(Rb3, Rb4, R4, R3)
+        frontQuad(Rb4, Rb5, R5s, R4)
+        frontQuad(Rb5, Rb6, R6, R5)
+        frontQuad(Rb6, Rb7, R7s, R6)
+        frontQuad(Rb7, Rb0, R0, R7)
+    )
+
+    empty back
+    (
+        backQuad(r0, r1, rb1, rb0)
+        backQuad(r1, r2s, rb2, rb1)
+        backQuad(r2, r3, rb3, rb2)
+        backQuad(r3, r4s, rb4, rb3)
+        backQuad(r4, r5, rb5, rb4)
+        backQuad(r5, r6s, rb6, rb5)
+        backQuad(r6, r7, rb7, rb6)
+        backQuad(r7, r0s, rb0, rb7)
+        backQuad(rb0, rb1, ri1, ri0)
+        backQuad(rb1, rb2, ri2, ri1)
+        backQuad(rb2, rb3, ri3, ri2)
+        backQuad(rb3, rb4, ri4, ri3)
+        backQuad(rb4, rb5, ri5, ri4)
+        backQuad(rb5, rb6, ri6, ri5)
+        backQuad(rb6, rb7, ri7, ri6)
+        backQuad(rb7, rb0, ri0, ri7)
+        backQuad(ri0, ri1, Rb1, Rb0)
+        backQuad(ri1, ri2, Rb2, Rb1)
+        backQuad(ri2, ri3, Rb3, Rb2)
+        backQuad(ri3, ri4, Rb4, Rb3)
+        backQuad(ri4, ri5, Rb5, Rb4)
+        backQuad(ri5, ri6, Rb6, Rb5)
+        backQuad(ri6, ri7, Rb7, Rb6)
+        backQuad(ri7, ri0, Rb0, Rb7)
+        backQuad(Rb0, Rb1, R1s, R0)
+        backQuad(Rb1, Rb2, R2, R1)
+        backQuad(Rb2, Rb3, R3s, R2)
+        backQuad(Rb3, Rb4, R4, R3)
+        backQuad(Rb4, Rb5, R5s, R4)
+        backQuad(Rb5, Rb6, R6, R5)
+        backQuad(Rb6, Rb7, R7s, R6)
+        backQuad(Rb7, Rb0, R0, R7)
+    )
+);
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/mixerVessel2D/constant/polyMesh/boundary b/tutorials/multiphase/twoPhaseEulerFoam/mixerVessel2D/constant/polyMesh/boundary
new file mode 100644
index 0000000000..292f25b806
--- /dev/null
+++ b/tutorials/multiphase/twoPhaseEulerFoam/mixerVessel2D/constant/polyMesh/boundary
@@ -0,0 +1,46 @@
+/*--------------------------------*- 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
+(
+    rotor
+    {
+        type            wall;
+        nFaces          192;
+        startFace       5952;
+    }
+    stator
+    {
+        type            wall;
+        nFaces          192;
+        startFace       6144;
+    }
+    front
+    {
+        type            empty;
+        nFaces          3072;
+        startFace       6336;
+    }
+    back
+    {
+        type            empty;
+        nFaces          3072;
+        startFace       9408;
+    }
+)
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/mixerVessel2D/constant/ppProperties b/tutorials/multiphase/twoPhaseEulerFoam/mixerVessel2D/constant/ppProperties
new file mode 100644
index 0000000000..eddbfd7ad7
--- /dev/null
+++ b/tutorials/multiphase/twoPhaseEulerFoam/mixerVessel2D/constant/ppProperties
@@ -0,0 +1,29 @@
+/*--------------------------------*- 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      ppProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+preAlphaExp     300;
+
+expMax          10;
+
+alphaMax        0.6;
+
+g0              g0 [ 1 -1 -2 0 0 0 0 ] 0;
+
+packingLimiter  off;
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/mixerVessel2D/constant/transportProperties b/tutorials/multiphase/twoPhaseEulerFoam/mixerVessel2D/constant/transportProperties
new file mode 100644
index 0000000000..9ea9ed2189
--- /dev/null
+++ b/tutorials/multiphase/twoPhaseEulerFoam/mixerVessel2D/constant/transportProperties
@@ -0,0 +1,65 @@
+/*--------------------------------*- 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;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+phase1
+{
+    rho0            0;
+    rho             0.88;
+    R               287;
+    Cp              1007;
+    nu              2.46e-05;
+    d               4e-3;
+
+    kappa           2.63e-2;
+    diameterModel   isothermal;
+    isothermalCoeffs
+    {
+        d0              3e-3;
+        p0              1e5;
+    }
+}
+
+phase2
+{
+    rho             733;
+    rho0            733;
+    R               1e10;
+    Cp              4195;
+    nu              2.73e-6;
+    d               1e-4;
+
+    kappa           0.668;
+    diameterModel constant;
+    constantCoeffs
+    {
+        d               1e-4;
+    }
+}
+
+// Virtual-mass ceofficient
+Cvm             0.5;
+
+// Lift coefficient
+Cl               0;
+
+// Dispersed-phase turbulence coefficient
+Ct               0.2;
+
+// Minimum allowable pressure
+pMin            10000;
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/mixerVessel2D/makeMesh b/tutorials/multiphase/twoPhaseEulerFoam/mixerVessel2D/makeMesh
new file mode 100755
index 0000000000..8ef4993fde
--- /dev/null
+++ b/tutorials/multiphase/twoPhaseEulerFoam/mixerVessel2D/makeMesh
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+m4 < constant/polyMesh/blockMeshDict.m4 > constant/polyMesh/blockMeshDict
+blockMesh
+topoSet
+setsToZones -noFlipMap
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/mixerVessel2D/system/controlDict b/tutorials/multiphase/twoPhaseEulerFoam/mixerVessel2D/system/controlDict
new file mode 100644
index 0000000000..dd1a00f171
--- /dev/null
+++ b/tutorials/multiphase/twoPhaseEulerFoam/mixerVessel2D/system/controlDict
@@ -0,0 +1,55 @@
+/*--------------------------------*- 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    "system";
+    object      controlDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+application     twoPhaseEulerFoam;
+
+startFrom       startTime;
+
+startTime       0;
+
+stopAt          endTime;
+
+endTime         20;
+
+deltaT          1e-4;
+
+writeControl    adjustableRunTime;
+
+writeInterval   0.1;
+
+purgeWrite      0;
+
+writeFormat     ascii;
+
+writePrecision  6;
+
+writeCompression uncompressed;
+
+timeFormat      general;
+
+timePrecision   6;
+
+runTimeModifiable yes;
+
+adjustTimeStep  yes;
+
+maxCo           0.2;
+
+maxDeltaT       1;
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/mixerVessel2D/system/fvSchemes b/tutorials/multiphase/twoPhaseEulerFoam/mixerVessel2D/system/fvSchemes
new file mode 100644
index 0000000000..22f9646707
--- /dev/null
+++ b/tutorials/multiphase/twoPhaseEulerFoam/mixerVessel2D/system/fvSchemes
@@ -0,0 +1,62 @@
+/*--------------------------------*- 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    "system";
+    object      fvSchemes;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+ddtSchemes
+{
+    default         Euler;
+}
+
+gradSchemes
+{
+    default         Gauss linear;
+}
+
+divSchemes
+{
+    default             none;
+
+    div(phi,alpha1)         Gauss limitedLinear01 1;
+    div(phir,alpha1)        Gauss limitedLinear01 1;
+    "div\(phi.,U.\)"        Gauss limitedLinearV 1;
+    "div\(Rc.\)"            Gauss linear;
+    "div\(phi.,(k|epsilon)\)"  Gauss limitedLinear 1;
+}
+
+laplacianSchemes
+{
+    default         Gauss linear corrected;
+}
+
+interpolationSchemes
+{
+    default         linear;
+}
+
+snGradSchemes
+{
+    default         corrected;
+}
+
+fluxRequired
+{
+    default         no;
+    p               ;
+    alpha1;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/mixerVessel2D/system/fvSolution b/tutorials/multiphase/twoPhaseEulerFoam/mixerVessel2D/system/fvSolution
new file mode 100644
index 0000000000..891746fcf3
--- /dev/null
+++ b/tutorials/multiphase/twoPhaseEulerFoam/mixerVessel2D/system/fvSolution
@@ -0,0 +1,102 @@
+/*--------------------------------*- 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    "system";
+    object      fvSolution;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+solvers
+{
+    p
+    {
+        solver          GAMG;
+        tolerance       1e-08;
+        relTol          0.05;
+        smoother        GaussSeidel;
+        cacheAgglomeration true;
+        nCellsInCoarsestLevel 20;
+        agglomerator    faceAreaPair;
+        mergeLevels     1;
+    }
+
+    pFinal
+    {
+        $p;
+        tolerance       1e-08;
+        relTol          0;
+    }
+
+    U
+    {
+        solver          smoothSolver;
+        smoother        GaussSeidel;
+        nSweeps         2;
+        tolerance       1e-07;
+        relTol          0.1;
+    }
+
+    UFinal
+    {
+        solver          PBiCG;
+        preconditioner  DILU;
+        tolerance       1e-07;
+        relTol          0;
+    }
+
+    "alpha.*"
+    {
+        solver          PBiCG;
+        preconditioner  DILU;
+        tolerance       1e-10;
+        relTol          0;
+    }
+
+    "(k|epsilon|Theta|T).*"
+    {
+        solver          PBiCG;
+        preconditioner  DILU;
+        tolerance       1e-06;
+        relTol          0;
+    }
+}
+
+PIMPLE
+{
+    nOuterCorrectors 1;
+    nCorrectors     3;
+    nNonOrthogonalCorrectors 0;
+    nAlphaCorr      1;
+    correctAlpha    yes;
+    pRefCell        0;
+    pRefValue       0;
+}
+
+relaxationFactors
+{
+    fields
+    {
+        p                1;
+    }
+    equations
+    {
+        "U.*"            1;
+        "alpha.*"        1;
+        "Theta.*"        1;
+        "k.*"            1;
+        "epsilon.*"      1;
+        "T.*"            1;
+    }
+}
+
+
+// ************************************************************************* //

From 308739d2e8fe8cffc19b786c992fbaa07b55db8f Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Mon, 19 Mar 2012 16:13:20 +0000
Subject: [PATCH 059/317] src/OpenFOAM/algorithms/subCycle: corrected handling
 of oldTime field to support outer iteration

Note: currently only the oldTime field is handled so only Euler ddt is supported with outer iteration
---
 src/OpenFOAM/algorithms/subCycle/subCycle.H | 54 +++++++++++++++------
 1 file changed, 40 insertions(+), 14 deletions(-)

diff --git a/src/OpenFOAM/algorithms/subCycle/subCycle.H b/src/OpenFOAM/algorithms/subCycle/subCycle.H
index 7ead823505..d5f1ba8753 100644
--- a/src/OpenFOAM/algorithms/subCycle/subCycle.H
+++ b/src/OpenFOAM/algorithms/subCycle/subCycle.H
@@ -40,13 +40,11 @@ namespace Foam
 {
 
 /*---------------------------------------------------------------------------*\
-                          Class subCycle Declaration
+                          Class subCycleField Declaration
 \*---------------------------------------------------------------------------*/
 
 template<class GeometricField>
-class subCycle
-:
-    public subCycleTime
+class subCycleField
 {
     // Private data
 
@@ -57,6 +55,41 @@ class subCycle
         GeometricField  gf0_;
 
 
+public:
+
+    // Constructors
+
+        //- Construct field and number of sub-cycles
+        subCycleField(GeometricField& gf)
+        :
+            gf_(gf),
+            gf0_(gf.oldTime())
+        {}
+
+
+    //- Destructor
+    ~subCycleField()
+    {
+        // Correct the time index of the field to correspond to the global time
+        gf_.timeIndex() = gf_.time().timeIndex();
+
+        // Reset the old-time field value
+        gf_.oldTime() = gf0_;
+        gf_.oldTime().timeIndex() = gf0_.timeIndex();
+    }
+};
+
+
+/*---------------------------------------------------------------------------*\
+                          Class subCycle Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class GeometricField>
+class subCycle
+:
+    public subCycleField<GeometricField>,
+    public subCycleTime
+{
     // Private Member Functions
 
         //- Disallow default bitwise copy construct
@@ -73,9 +106,9 @@ public:
         //- Construct field and number of sub-cycles
         subCycle(GeometricField& gf, const label nSubCycles)
         :
-            subCycleTime(const_cast<Time&>(gf.time()), nSubCycles),
-            gf_(gf),
-            gf0_(gf.oldTime())
+
+            subCycleField<GeometricField>(gf),
+            subCycleTime(const_cast<Time&>(gf.time()), nSubCycles)
         {}
 
 
@@ -84,13 +117,6 @@ public:
     {
         // End the subCycleTime, which restores the time state
         endSubCycle();
-
-        // Correct the time index of the field to correspond to the global time
-        gf_.timeIndex() = gf_.time().timeIndex();
-
-        // Reset the old-time field value
-        gf_.oldTime() = gf0_;
-        gf_.oldTime().timeIndex() = gf_.time().timeIndex();
     }
 };
 

From 3324e7bbff4f592837bcba3294ae88378ff8fbe3 Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Mon, 19 Mar 2012 16:13:46 +0000
Subject: [PATCH 060/317] interFoam: minor formatting improvement

---
 applications/solvers/multiphase/interFoam/alphaEqnSubCycle.H | 1 -
 1 file changed, 1 deletion(-)

diff --git a/applications/solvers/multiphase/interFoam/alphaEqnSubCycle.H b/applications/solvers/multiphase/interFoam/alphaEqnSubCycle.H
index 8dbb489c8d..fa56de00bb 100644
--- a/applications/solvers/multiphase/interFoam/alphaEqnSubCycle.H
+++ b/applications/solvers/multiphase/interFoam/alphaEqnSubCycle.H
@@ -1,5 +1,4 @@
 label nAlphaCorr(readLabel(pimple.dict().lookup("nAlphaCorr")));
-
 label nAlphaSubCycles(readLabel(pimple.dict().lookup("nAlphaSubCycles")));
 
 if (nAlphaSubCycles > 1)

From 0b240922e9ab95a44c85e9e3f76f6bb9e5f750eb Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Mon, 19 Mar 2012 16:14:58 +0000
Subject: [PATCH 061/317] twoPhaseEulerFoam: updated alphaEqn to use MULES

---
 .../multiphase/twoPhaseEulerFoam/alphaEqn.H   | 66 ++++++++++++++-----
 .../readTwoPhaseEulerFoamControls.H           |  2 -
 .../twoPhaseEulerFoam/twoPhaseEulerFoam.C     |  2 +
 3 files changed, 51 insertions(+), 19 deletions(-)

diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/alphaEqn.H b/applications/solvers/multiphase/twoPhaseEulerFoam/alphaEqn.H
index 52f09e4793..34fdc24afc 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/alphaEqn.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/alphaEqn.H
@@ -1,6 +1,9 @@
 {
-    word scheme("div(phi,alpha1)");
-    word schemer("div(phir,alpha1)");
+    label nAlphaCorr(readLabel(pimple.dict().lookup("nAlphaCorr")));
+    label nAlphaSubCycles(readLabel(pimple.dict().lookup("nAlphaSubCycles")));
+
+    word alphaScheme("div(phi,alpha1)");
+    word alpharScheme("div(phir,alpha1)");
 
     surfaceScalarField phic("phic", phi);
     surfaceScalarField phir("phir", phi1 - phi2);
@@ -15,14 +18,39 @@
 
     for (int acorr=0; acorr<nAlphaCorr; acorr++)
     {
-        fvScalarMatrix alpha1Eqn
+        for
         (
-             fvm::ddt(alpha1)
-           + fvm::div(phic, alpha1, scheme)
-           + fvm::div(-fvc::flux(-phir, alpha2, schemer), alpha1, schemer)
-        );
+            subCycle<volScalarField> alphaSubCycle(alpha1, nAlphaSubCycles);
+            !(++alphaSubCycle).end();
+        )
+        {
+            surfaceScalarField phiAlpha
+            (
+                fvc::flux
+                (
+                    phic,
+                    alpha1,
+                    alphaScheme
+                )
+              + fvc::flux
+                (
+                    -fvc::flux(-phir, alpha2, alpharScheme),
+                    alpha1,
+                    alpharScheme
+                )
+            );
 
-        if (g0.value() > 0.0)
+            MULES::explicitSolve
+            (
+                alpha1,
+                phi,
+                phiAlpha,
+                (g0.value() > 0 ? alphaMax : 1),
+                0
+            );
+        }
+
+        if (g0.value() > 0)
         {
             ppMagf = rAU1f*fvc::interpolate
             (
@@ -30,19 +58,23 @@
                *g0*min(exp(preAlphaExp*(alpha1 - alphaMax)), expMax)
             );
 
-            alpha1Eqn -= fvm::laplacian
+            fvScalarMatrix alpha1Eqn
             (
-                (fvc::interpolate(alpha1) + scalar(0.0001))*ppMagf,
-                alpha1,
-                "laplacian(alpha1PpMag,alpha1)"
+                fvm::ddt(alpha1) - fvc::ddt(alpha1)
+              - fvm::laplacian
+                (
+                    (fvc::interpolate(alpha1) + scalar(0.0001))*ppMagf,
+                    alpha1,
+                    "laplacian(alpha1PpMag,alpha1)"
+                )
             );
+
+            alpha1Eqn.relax();
+            alpha1Eqn.solve();
+
+            #include "packingLimiter.H"
         }
 
-        alpha1Eqn.relax();
-        alpha1Eqn.solve();
-
-        #include "packingLimiter.H"
-
         alpha2 = scalar(1) - alpha1;
 
         Info<< "Dispersed phase volume fraction = "
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/readTwoPhaseEulerFoamControls.H b/applications/solvers/multiphase/twoPhaseEulerFoam/readTwoPhaseEulerFoamControls.H
index a345c4e53b..4e6847debe 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/readTwoPhaseEulerFoamControls.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/readTwoPhaseEulerFoamControls.H
@@ -1,5 +1,3 @@
     #include "readTimeControls.H"
 
-    int nAlphaCorr(readInt(pimple.dict().lookup("nAlphaCorr")));
-
     Switch correctAlpha(pimple.dict().lookup("correctAlpha"));
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseEulerFoam.C b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseEulerFoam.C
index 357c7e413a..d9da532aef 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseEulerFoam.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseEulerFoam.C
@@ -31,6 +31,8 @@ Description
 \*---------------------------------------------------------------------------*/
 
 #include "fvCFD.H"
+#include "MULES.H"
+#include "subCycle.H"
 #include "nearWallDist.H"
 #include "wallFvPatch.H"
 #include "Switch.H"

From f46e2fadf7ceffc2ac657a42ec5047f16423581b Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Mon, 19 Mar 2012 16:15:23 +0000
Subject: [PATCH 062/317] Corrected header

---
 src/OpenFOAM/algorithms/subCycle/subCycle.H | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/OpenFOAM/algorithms/subCycle/subCycle.H b/src/OpenFOAM/algorithms/subCycle/subCycle.H
index d5f1ba8753..a4a1ea1844 100644
--- a/src/OpenFOAM/algorithms/subCycle/subCycle.H
+++ b/src/OpenFOAM/algorithms/subCycle/subCycle.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

From e09d04c3ba7ca8adfbd640f5a6b1134cb000d3d8 Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Mon, 19 Mar 2012 16:15:44 +0000
Subject: [PATCH 063/317] twoPhaseEulerFoam: updated tutorials

---
 .../twoPhaseEulerFoam/bed/constant/MRFZones   | 20 ++++++++++++++++
 .../bed/constant/transportProperties          | 21 ++++++++---------
 .../twoPhaseEulerFoam/bed/system/fvSolution   | 13 ++++-------
 .../twoPhaseEulerFoam/bed2/constant/MRFZones  | 20 ++++++++++++++++
 .../bed2/constant/transportProperties         | 23 ++++++++-----------
 .../twoPhaseEulerFoam/bed2/system/fvSolution  |  3 ++-
 .../bubbleColumn/constant/MRFZones            | 20 ++++++++++++++++
 .../bubbleColumn/constant/transportProperties | 20 ++++++++--------
 .../bubbleColumn/system/fvSolution            |  3 ++-
 .../mixerVessel2D/system/controlDict          |  2 +-
 .../mixerVessel2D/system/fvSolution           |  1 +
 11 files changed, 98 insertions(+), 48 deletions(-)
 create mode 100644 tutorials/multiphase/twoPhaseEulerFoam/bed/constant/MRFZones
 create mode 100644 tutorials/multiphase/twoPhaseEulerFoam/bed2/constant/MRFZones
 create mode 100644 tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/constant/MRFZones

diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/MRFZones b/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/MRFZones
new file mode 100644
index 0000000000..0034a58c22
--- /dev/null
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/MRFZones
@@ -0,0 +1,20 @@
+/*--------------------------------*- 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      MRFZones;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+0()
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/transportProperties b/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/transportProperties
index ef9a0fccf7..6d05c03c61 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/transportProperties
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/transportProperties
@@ -17,25 +17,22 @@ FoamFile
 
 phase1
 {
-    rho             rho [ 1 -3 0 0 0 ] 2640;
-    nu              nu [ 0 2 -1 0 0 ] 1e-06;
-    d               d [ 0 1 0 0 0 0 0 ] 0.00048;
+    rho             2640;
+    nu              1e-06;
+    d               0.00048;
 }
 
 phase2
 {
-    rho             rho [ 1 -3 0 0 0 ] 1.28;
-    nu              nu [ 0 2 -1 0 0 ] 1.328e-05;
-    d               d [ 0 1 0 0 0 0 0 ] 1;
+    rho             1.28;
+    nu              1.328e-05;
+    d               1;
 }
 
-Cvm             Cvm [ 0 0 0 0 0 ] 0;
+Cvm             0;
 
-Cl              Cl [ 0 0 0 0 0 ] 0;
-
-Ct              Ct [ 0 0 0 0 0 ] 0;
-
-alpha1Alpha      alpha1Alpha [ 0 0 0 0 0 ] 0;
+Cl              0;
 
+Ct              0;
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed/system/fvSolution b/tutorials/multiphase/twoPhaseEulerFoam/bed/system/fvSolution
index bdb02666e3..5800e2a4b4 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/bed/system/fvSolution
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bed/system/fvSolution
@@ -49,25 +49,21 @@ solvers
 
     "(k|epsilon)Final"
     {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-05;
+        $k;
         relTol          0;
     }
 
     alpha
     {
-        solver          PBiCG;
-        preconditioner  DILU;
+        solver          PCG;
+        preconditioner  DIC;
         tolerance       1e-10;
         relTol          0.1;
     }
 
     alpha1Final
     {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-10;
+        $alpha;
         relTol          0;
     }
 }
@@ -77,6 +73,7 @@ PIMPLE
     nCorrectors     2;
     nNonOrthogonalCorrectors 0;
     nAlphaCorr      2;
+    nAlphaSubCycles 3;
     correctAlpha    yes;
     pRefCell        0;
     pRefValue       0;
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed2/constant/MRFZones b/tutorials/multiphase/twoPhaseEulerFoam/bed2/constant/MRFZones
new file mode 100644
index 0000000000..0034a58c22
--- /dev/null
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bed2/constant/MRFZones
@@ -0,0 +1,20 @@
+/*--------------------------------*- 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      MRFZones;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+0()
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed2/constant/transportProperties b/tutorials/multiphase/twoPhaseEulerFoam/bed2/constant/transportProperties
index 859bd94263..1afd6e92c5 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/bed2/constant/transportProperties
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bed2/constant/transportProperties
@@ -17,25 +17,20 @@ FoamFile
 
 phase1
 {
-    rho             rho [ 1 -3 0 0 0 ] 2500;
-    nu              nu [ 0 2 -1 0 0 ] 1e-06;
-    d               d [ 0 1 0 0 0 0 0 ] 0.0003;
+    rho             2500;
+    nu              1e-06;
+    d               0.0003;
 }
 
 phase2
 {
-    rho             rho [ 1 -3 0 0 0 ] 1.2;
-    nu              nu [ 0 2 -1 0 0 ] 1.5e-05;
-    d               d [ 0 1 0 0 0 0 0 ] 1;
+    rho             1.2;
+    nu              1.5e-05;
+    d               1;
 }
 
-Cvm             Cvm [ 0 0 0 0 0 ] 0;
-
-Cl              Cl [ 0 0 0 0 0 ] 0;
-
-Ct              Ct [ 0 0 0 0 0 ] 0;
-
-alpha1Alpha      alpha1Alpha [ 0 0 0 0 0 ] 0;
-
+Cvm             0;
+Cl              0;
+Ct              0;
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed2/system/fvSolution b/tutorials/multiphase/twoPhaseEulerFoam/bed2/system/fvSolution
index bdb02666e3..2e3cdfa4aa 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/bed2/system/fvSolution
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bed2/system/fvSolution
@@ -76,7 +76,8 @@ PIMPLE
 {
     nCorrectors     2;
     nNonOrthogonalCorrectors 0;
-    nAlphaCorr      2;
+    nAlphaCorr      1;
+    nAlphaSubCycles 3;
     correctAlpha    yes;
     pRefCell        0;
     pRefValue       0;
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/constant/MRFZones b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/constant/MRFZones
new file mode 100644
index 0000000000..0034a58c22
--- /dev/null
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/constant/MRFZones
@@ -0,0 +1,20 @@
+/*--------------------------------*- 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      MRFZones;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+0()
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/constant/transportProperties b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/constant/transportProperties
index 276c521ad3..e013730cb5 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/constant/transportProperties
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/constant/transportProperties
@@ -17,23 +17,21 @@ FoamFile
 
 phase1
 {
-    nu              nu [ 0 2 -1 0 0 0 0 ] 1.6e-05;
-    rho             rho [ 1 -3 0 0 0 0 0 ] 1;
-    d               d [ 0 1 0 0 0 0 0 ] 0.003;
+    nu              1.6e-05;
+    rho             1;
+    d               0.003;
 }
 
 phase2
 {
-    nu              nu [ 0 2 -1 0 0 0 0 ] 1e-06;
-    rho             rho [ 1 -3 0 0 0 0 0 ] 1000;
-    d               d [ 0 1 0 0 0 0 0 ] 0.0001;
+    nu              1e-06;
+    rho             1000;
+    d               0.0001;
 }
 
-Cvm             Cvm [ 0 0 0 0 0 0 0 ] 0.5;
-
-Cl              Cl [ 0 0 0 0 0 0 0 ] 0;
-
-Ct              Ct [ 0 0 0 0 0 0 0 ] 1;
+Cvm             0.5;
+Cl              0;
+Ct              1;
 
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/system/fvSolution b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/system/fvSolution
index d0491f6d65..76a95c8327 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/system/fvSolution
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/system/fvSolution
@@ -76,7 +76,8 @@ PIMPLE
 {
     nCorrectors     2;
     nNonOrthogonalCorrectors 0;
-    nAlphaCorr      2;
+    nAlphaCorr      1;
+    nAlphaSubCycles 2;
     correctAlpha    yes;
     pRefCell        0;
     pRefValue       0;
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/mixerVessel2D/system/controlDict b/tutorials/multiphase/twoPhaseEulerFoam/mixerVessel2D/system/controlDict
index dd1a00f171..7b2bf5a816 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/mixerVessel2D/system/controlDict
+++ b/tutorials/multiphase/twoPhaseEulerFoam/mixerVessel2D/system/controlDict
@@ -47,7 +47,7 @@ runTimeModifiable yes;
 
 adjustTimeStep  yes;
 
-maxCo           0.2;
+maxCo           0.5;
 
 maxDeltaT       1;
 
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/mixerVessel2D/system/fvSolution b/tutorials/multiphase/twoPhaseEulerFoam/mixerVessel2D/system/fvSolution
index 891746fcf3..69208cbe95 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/mixerVessel2D/system/fvSolution
+++ b/tutorials/multiphase/twoPhaseEulerFoam/mixerVessel2D/system/fvSolution
@@ -76,6 +76,7 @@ PIMPLE
     nCorrectors     3;
     nNonOrthogonalCorrectors 0;
     nAlphaCorr      1;
+    nAlphaSubCycles 3;
     correctAlpha    yes;
     pRefCell        0;
     pRefValue       0;

From 5a3ba9bc2b1633da7f57b8c77d5b66282097982a Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Tue, 20 Mar 2012 09:33:54 +0000
Subject: [PATCH 064/317] STYLE: minor code formatting change

---
 src/lagrangian/basic/particle/particleI.H | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lagrangian/basic/particle/particleI.H b/src/lagrangian/basic/particle/particleI.H
index 2f6d975120..e3c9a6e049 100644
--- a/src/lagrangian/basic/particle/particleI.H
+++ b/src/lagrangian/basic/particle/particleI.H
@@ -748,7 +748,7 @@ inline void Foam::particle::initCellFacePt()
                 // number, but hasn't been able to find a cell to
                 // occupy.
 
-                if(!mesh_.pointInCellBB(position_, oldCellI, 0.1))
+                if (!mesh_.pointInCellBB(position_, oldCellI, 0.1))
                 {
                     // If the position is not inside the (slightly
                     // extended) bound-box of the cell that it thought

From a12b0221600b197853997d23d9dc75bf48fe8396 Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Tue, 20 Mar 2012 10:18:25 +0000
Subject: [PATCH 065/317] ENH: partial-fix for mapping lagrangian clouds

---
 src/lagrangian/basic/Cloud/Cloud.C              |  3 ++-
 src/lagrangian/basic/Cloud/Cloud.H              |  2 +-
 .../Templates/KinematicCloud/KinematicCloud.C   | 13 ++++++++++++-
 .../Templates/KinematicCloud/KinematicCloud.H   |  7 +++++++
 .../Templates/ReactingCloud/ReactingCloud.C     | 13 ++++++++++++-
 .../Templates/ReactingCloud/ReactingCloud.H     |  9 ++++++++-
 .../ReactingMultiphaseCloud.C                   | 17 ++++++++++++++++-
 .../ReactingMultiphaseCloud.H                   |  9 ++++++++-
 .../clouds/Templates/ThermoCloud/ThermoCloud.C  | 13 ++++++++++++-
 .../clouds/Templates/ThermoCloud/ThermoCloud.H  | 11 +++++++++--
 10 files changed, 87 insertions(+), 10 deletions(-)

diff --git a/src/lagrangian/basic/Cloud/Cloud.C b/src/lagrangian/basic/Cloud/Cloud.C
index 8f951b6c52..460b965070 100644
--- a/src/lagrangian/basic/Cloud/Cloud.C
+++ b/src/lagrangian/basic/Cloud/Cloud.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -421,6 +421,7 @@ void Foam::Cloud<ParticleType>::autoMap
             if (trackStartCell < 0)
             {
                 trackStartCell = 0;
+                p.cell() = 0;
             }
 
             vector pos = p.position();
diff --git a/src/lagrangian/basic/Cloud/Cloud.H b/src/lagrangian/basic/Cloud/Cloud.H
index 2ec24517e3..c295a18e24 100644
--- a/src/lagrangian/basic/Cloud/Cloud.H
+++ b/src/lagrangian/basic/Cloud/Cloud.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C
index 5c97c41d5c..d7134f5cd3 100644
--- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C
+++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -674,6 +674,17 @@ void  Foam::KinematicCloud<CloudType>::motion(TrackData& td)
 }
 
 
+template<class CloudType>
+void Foam::KinematicCloud<CloudType>::autoMap(const mapPolyMesh& mapper)
+{
+    typedef typename particle::TrackingData<KinematicCloud<CloudType> > tdType;
+
+    tdType td(*this);
+
+    Cloud<parcelType>::template autoMap<tdType>(td, mapper);
+}
+
+
 template<class CloudType>
 void Foam::KinematicCloud<CloudType>::info()
 {
diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H
index 7225347e60..91a261f4df 100644
--- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H
+++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H
@@ -556,6 +556,13 @@ public:
             void motion(TrackData& td);
 
 
+        // Mapping
+
+            //- Remap the cells of particles corresponding to the
+            //  mesh topology change with a default tracking data object
+            virtual void autoMap(const mapPolyMesh&);
+
+
         // I-O
 
             //- Print cloud information
diff --git a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C
index 3de4ae546d..4a83808fa2 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C
+++ b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -342,6 +342,17 @@ void Foam::ReactingCloud<CloudType>::evolve()
 
 
 
+template<class CloudType>
+void Foam::ReactingCloud<CloudType>::autoMap(const mapPolyMesh& mapper)
+{
+    typedef typename particle::TrackingData<ReactingCloud<CloudType> > tdType;
+
+    tdType td(*this);
+
+    Cloud<parcelType>::template autoMap<tdType>(td, mapper);
+}
+
+
 template<class CloudType>
 void Foam::ReactingCloud<CloudType>::info()
 {
diff --git a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.H b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.H
index 7f58d83bd6..a16f1255af 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.H
+++ b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -299,6 +299,13 @@ public:
             void evolve();
 
 
+        // Mapping
+
+            //- Remap the cells of particles corresponding to the
+            //  mesh topology change with a default tracking data object
+            virtual void autoMap(const mapPolyMesh&);
+
+
         // I-O
 
             //- Print cloud information
diff --git a/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.C b/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.C
index 9088b97717..8cab7d3f85 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.C
+++ b/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -252,6 +252,21 @@ void Foam::ReactingMultiphaseCloud<CloudType>::evolve()
 }
 
 
+template<class CloudType>
+void Foam::ReactingMultiphaseCloud<CloudType>::autoMap
+(
+    const mapPolyMesh& mapper
+)
+{
+    typedef typename particle::TrackingData<ReactingMultiphaseCloud<CloudType> >
+        tdType;
+
+    tdType td(*this);
+
+    Cloud<parcelType>::template autoMap<tdType>(td, mapper);
+}
+
+
 template<class CloudType>
 void Foam::ReactingMultiphaseCloud<CloudType>::info()
 {
diff --git a/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.H b/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.H
index 5f92be1ea8..bb72273e3f 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.H
+++ b/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -273,6 +273,13 @@ public:
             void evolve();
 
 
+        // Mapping
+
+            //- Remap the cells of particles corresponding to the
+            //  mesh topology change with a default tracking data object
+            virtual void autoMap(const mapPolyMesh&);
+
+
         // I-O
 
             //- Print cloud information
diff --git a/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.C b/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.C
index 9530707bb4..1844a6b21e 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.C
+++ b/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -333,6 +333,17 @@ void Foam::ThermoCloud<CloudType>::evolve()
 }
 
 
+template<class CloudType>
+void Foam::ThermoCloud<CloudType>::autoMap(const mapPolyMesh& mapper)
+{
+    typedef typename particle::TrackingData<ThermoCloud<CloudType> > tdType;
+
+    tdType td(*this);
+
+    Cloud<parcelType>::template autoMap<tdType>(td, mapper);
+}
+
+
 template<class CloudType>
 void Foam::ThermoCloud<CloudType>::info()
 {
diff --git a/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.H b/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.H
index c3c552472f..4acd251621 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.H
+++ b/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -318,7 +318,14 @@ public:
             void evolve();
 
 
-        // Check
+        // Mapping
+
+            //- Remap the cells of particles corresponding to the
+            //  mesh topology change with a default tracking data object
+            virtual void autoMap(const mapPolyMesh&);
+
+
+        // I-O
 
             //- Print cloud information
             void info();

From 9967a47f6f5b7230a3a8fcc4f5795633c2a32f2b Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Tue, 20 Mar 2012 10:37:46 +0000
Subject: [PATCH 066/317] ENH: Added new particleTrap cloud function object

---
 .../include/makeParcelCloudFunctionObjects.H  |   2 +
 .../ParticleTrap/ParticleTrap.C               | 124 +++++++++++++++
 .../ParticleTrap/ParticleTrap.H               | 147 ++++++++++++++++++
 3 files changed, 273 insertions(+)
 create mode 100644 src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleTrap/ParticleTrap.C
 create mode 100644 src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleTrap/ParticleTrap.H

diff --git a/src/lagrangian/intermediate/parcels/include/makeParcelCloudFunctionObjects.H b/src/lagrangian/intermediate/parcels/include/makeParcelCloudFunctionObjects.H
index 572be515a6..9e19beae34 100644
--- a/src/lagrangian/intermediate/parcels/include/makeParcelCloudFunctionObjects.H
+++ b/src/lagrangian/intermediate/parcels/include/makeParcelCloudFunctionObjects.H
@@ -31,6 +31,7 @@ License
 #include "FacePostProcessing.H"
 #include "ParticleErosion.H"
 #include "ParticleTracks.H"
+#include "ParticleTrap.H"
 #include "PatchPostProcessing.H"
 #include "VoidFraction.H"
 
@@ -43,6 +44,7 @@ License
     makeCloudFunctionObjectType(FacePostProcessing, CloudType);               \
     makeCloudFunctionObjectType(ParticleErosion, CloudType);                  \
     makeCloudFunctionObjectType(ParticleTracks, CloudType);                   \
+    makeCloudFunctionObjectType(ParticleTrap, CloudType);                     \
     makeCloudFunctionObjectType(PatchPostProcessing, CloudType);              \
     makeCloudFunctionObjectType(VoidFraction, CloudType);
 
diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleTrap/ParticleTrap.C b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleTrap/ParticleTrap.C
new file mode 100644
index 0000000000..f1b19bde59
--- /dev/null
+++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleTrap/ParticleTrap.C
@@ -0,0 +1,124 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "ParticleTrap.H"
+#include "fvcGrad.H"
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template<class CloudType>
+Foam::ParticleTrap<CloudType>::ParticleTrap
+(
+    const dictionary& dict,
+    CloudType& owner
+)
+:
+    CloudFunctionObject<CloudType>(dict, owner, typeName),
+    alphaName_
+    (
+        this->coeffDict().template lookupOrDefault<word>("alphaName", "alpha")
+    ),
+    alphaPtr_(NULL),
+    gradAlphaPtr_(NULL),
+    threshold_(readScalar(this->coeffDict().lookup("threshold")))
+{}
+
+
+template<class CloudType>
+Foam::ParticleTrap<CloudType>::ParticleTrap
+(
+    const ParticleTrap<CloudType>& pt
+)
+:
+    CloudFunctionObject<CloudType>(pt),
+    alphaName_(pt.alphaName_),
+    alphaPtr_(pt.alphaPtr_),
+    gradAlphaPtr_(NULL),
+    threshold_(pt.threshold_)
+{}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+template<class CloudType>
+Foam::ParticleTrap<CloudType>::~ParticleTrap()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class CloudType>
+void Foam::ParticleTrap<CloudType>::preEvolve()
+{
+    if (alphaPtr_ == NULL)
+    {
+        const fvMesh& mesh = this->owner().mesh();
+        const volScalarField& alpha =
+            mesh.lookupObject<volScalarField>(alphaName_);
+
+        alphaPtr_ = &alpha;
+    }
+
+    if (gradAlphaPtr_.valid())
+    {
+        gradAlphaPtr_() == fvc::grad(*alphaPtr_);
+    }
+    else
+    {
+        gradAlphaPtr_.reset(new volVectorField(fvc::grad(*alphaPtr_)));
+    }
+}
+
+
+template<class CloudType>
+void Foam::ParticleTrap<CloudType>::postEvolve()
+{
+    gradAlphaPtr_.clear();
+}
+
+
+template<class CloudType>
+void Foam::ParticleTrap<CloudType>::postMove
+(
+    parcelType& p,
+    const label cellI,
+    const scalar
+)
+{
+    if (alphaPtr_->internalField()[cellI] < threshold_)
+    {
+        const vector& gradAlpha = gradAlphaPtr_()[cellI];
+        vector nHat = gradAlpha/mag(gradAlpha);
+        scalar nHatU = nHat & p.U();
+
+        if (nHatU < 0)
+        {
+            p.U() -= 2*nHat*nHatU;
+        }
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleTrap/ParticleTrap.H b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleTrap/ParticleTrap.H
new file mode 100644
index 0000000000..39321af3c0
--- /dev/null
+++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleTrap/ParticleTrap.H
@@ -0,0 +1,147 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::ParticleTrap
+
+Description
+    Traps particles within a given phase fraction for multi-phase cases
+
+    Model is activated using:
+
+        particleTrap
+        {
+            alphaName   alpha;      // name volume fraction field
+            threshold   0.95;       // alpha value below which model is active
+        }
+
+
+SourceFiles
+    ParticleTrap.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef ParticleTrap_H
+#define ParticleTrap_H
+
+#include "CloudFunctionObject.H"
+#include "volFields.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                       Class ParticleTrap Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class CloudType>
+class ParticleTrap
+:
+    public CloudFunctionObject<CloudType>
+{
+    // Private Data
+
+        // Typedefs
+
+            //- Convenience typedef for parcel type
+            typedef typename CloudType::parcelType parcelType;
+
+
+        //- Name of vol fraction field
+        const word alphaName_;
+
+        //- Pointer to the volume fraction field
+        const volScalarField* alphaPtr_;
+
+        //- Gradient of the volume fraction field
+        autoPtr<volVectorField> gradAlphaPtr_;
+
+        //- Threshold beyond which model is active
+        scalar threshold_;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("particleTrap");
+
+
+    // Constructors
+
+        //- Construct from dictionary
+        ParticleTrap(const dictionary& dict, CloudType& owner);
+
+        //- Construct copy
+        ParticleTrap(const ParticleTrap<CloudType>& pe);
+
+        //- Construct and return a clone
+        virtual autoPtr<CloudFunctionObject<CloudType> > clone() const
+        {
+            return autoPtr<CloudFunctionObject<CloudType> >
+            (
+                new ParticleTrap<CloudType>(*this)
+            );
+        }
+
+
+    //- Destructor
+    virtual ~ParticleTrap();
+
+
+    // Member Functions
+
+        // Evaluation
+
+            //- Pre-evolve hook
+            virtual void preEvolve();
+
+            //- Post-evolve hook
+            virtual void postEvolve();
+
+            //- Post-move hook
+            virtual void postMove
+            (
+                typename CloudType::parcelType& p,
+                const label cellI,
+                const scalar dt
+            );
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+#   include "ParticleTrap.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //

From 656d921b2cec52a57b6a9e093e161567641dbf0a Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Tue, 20 Mar 2012 12:42:48 +0000
Subject: [PATCH 067/317] ENH: Added new yPlusRAS function object

---
 .../functionObjects/utilities/Make/files      |   9 +-
 .../functionObjects/utilities/Make/options    |  13 +-
 .../utilities/yPlusRAS/IOyPlusRAS.H           |  49 ++++
 .../utilities/yPlusRAS/yPlusRAS.C             | 235 ++++++++++++++++++
 .../utilities/yPlusRAS/yPlusRAS.H             | 158 ++++++++++++
 .../yPlusRAS/yPlusRASFunctionObject.C         |  42 ++++
 .../yPlusRAS/yPlusRASFunctionObject.H         |  53 ++++
 7 files changed, 554 insertions(+), 5 deletions(-)
 create mode 100644 src/postProcessing/functionObjects/utilities/yPlusRAS/IOyPlusRAS.H
 create mode 100644 src/postProcessing/functionObjects/utilities/yPlusRAS/yPlusRAS.C
 create mode 100644 src/postProcessing/functionObjects/utilities/yPlusRAS/yPlusRAS.H
 create mode 100644 src/postProcessing/functionObjects/utilities/yPlusRAS/yPlusRASFunctionObject.C
 create mode 100644 src/postProcessing/functionObjects/utilities/yPlusRAS/yPlusRASFunctionObject.H

diff --git a/src/postProcessing/functionObjects/utilities/Make/files b/src/postProcessing/functionObjects/utilities/Make/files
index c632fc6222..5737e2f473 100644
--- a/src/postProcessing/functionObjects/utilities/Make/files
+++ b/src/postProcessing/functionObjects/utilities/Make/files
@@ -1,15 +1,18 @@
 codedFunctionObject/codedFunctionObject.C
 
+dsmcFields/dsmcFields.C
+dsmcFields/dsmcFieldsFunctionObject.C
+
 pressureCoefficient/pressureCoefficient.C
 pressureCoefficient/pressureCoefficientFunctionObject.C
 
 staticPressure/staticPressure.C
 staticPressure/staticPressureFunctionObject.C
 
-dsmcFields/dsmcFields.C
-dsmcFields/dsmcFieldsFunctionObject.C
-
 timeActivatedFileUpdate/timeActivatedFileUpdate.C
 timeActivatedFileUpdate/timeActivatedFileUpdateFunctionObject.C
 
+yPlusRAS/yPlusRAS.C
+yPlusRAS/yPlusRASFunctionObject.C
+
 LIB = $(FOAM_LIBBIN)/libutilityFunctionObjects
diff --git a/src/postProcessing/functionObjects/utilities/Make/options b/src/postProcessing/functionObjects/utilities/Make/options
index 623013bc21..ecc2c0a411 100644
--- a/src/postProcessing/functionObjects/utilities/Make/options
+++ b/src/postProcessing/functionObjects/utilities/Make/options
@@ -3,11 +3,20 @@ EXE_INC = \
     -I$(LIB_SRC)/lagrangian/basic/lnInclude \
     -I$(LIB_SRC)/lagrangian/dsmc/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
-    -I$(LIB_SRC)/sampling/lnInclude
+    -I$(LIB_SRC)/sampling/lnInclude \
+    -I$(LIB_SRC)/transportModels \
+    -I$(LIB_SRC)/turbulenceModels \
+    -I$(LIB_SRC)/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions \
+    -I$(LIB_SRC)/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions \
+    -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude
 
 LIB_LIBS = \
     -lfiniteVolume \
     -lmeshTools \
     -lsampling \
     -llagrangian \
-    -ldsmc
+    -ldsmc \
+    -lincompressibleTransportModels \
+    -lcompressibleRASModels \
+    -lincompressibleRASModels \
+    -lbasicThermophysicalModels
diff --git a/src/postProcessing/functionObjects/utilities/yPlusRAS/IOyPlusRAS.H b/src/postProcessing/functionObjects/utilities/yPlusRAS/IOyPlusRAS.H
new file mode 100644
index 0000000000..959d3fbf4a
--- /dev/null
+++ b/src/postProcessing/functionObjects/utilities/yPlusRAS/IOyPlusRAS.H
@@ -0,0 +1,49 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Typedef
+    Foam::IOyPlusRAS
+
+Description
+    Instance of the generic IOOutputFilter for yPlusRAS.
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef IOyPlusRAS_H
+#define IOyPlusRAS_H
+
+#include "yPlusRAS.H"
+#include "IOOutputFilter.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    typedef IOOutputFilter<yPlusRAS> IOyPlusRAS;
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/postProcessing/functionObjects/utilities/yPlusRAS/yPlusRAS.C b/src/postProcessing/functionObjects/utilities/yPlusRAS/yPlusRAS.C
new file mode 100644
index 0000000000..788d9f19ff
--- /dev/null
+++ b/src/postProcessing/functionObjects/utilities/yPlusRAS/yPlusRAS.C
@@ -0,0 +1,235 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "yPlusRAS.H"
+#include "volFields.H"
+
+#include "incompressible/RAS/RASModel/RASModel.H"
+#include "nutkWallFunction/nutkWallFunctionFvPatchScalarField.H"
+
+#include "compressible/RAS/RASModel/RASModel.H"
+#include "mutkWallFunction/mutkWallFunctionFvPatchScalarField.H"
+
+#include "wallDist.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+defineTypeNameAndDebug(Foam::yPlusRAS, 0);
+
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+void Foam::yPlusRAS::calcIncompressibleYPlus
+(
+    const fvMesh& mesh,
+    volScalarField& yPlus
+) const
+{
+    typedef incompressible::RASModels::nutkWallFunctionFvPatchScalarField
+        wallFunctionPatchField;
+
+    const incompressible::RASModel& model =
+        mesh.lookupObject<incompressible::RASModel>("RASProperties");
+
+    const volScalarField nut(model.nut());
+    const volScalarField::GeometricBoundaryField& nutPatches =
+        nut.boundaryField();
+
+    Info<< type() << " output:" << nl;
+
+    bool foundNutPatch = false;
+    forAll(nutPatches, patchi)
+    {
+        if (isA<wallFunctionPatchField>(nutPatches[patchi]))
+        {
+            foundNutPatch = true;
+
+            const wallFunctionPatchField& nutPw =
+                dynamic_cast<const wallFunctionPatchField&>(nutPatches[patchi]);
+
+            yPlus.boundaryField()[patchi] = nutPw.yPlus();
+            const scalarField& Yp = yPlus.boundaryField()[patchi];
+
+            Info<< "    patch " << nutPw.patch().name()
+                << " y+ : min = " << min(Yp) << ", max = " << max(Yp)
+                << ", average = " << average(Yp) << nl;
+        }
+    }
+
+    if (!foundNutPatch)
+    {
+        Info<< "    no " << wallFunctionPatchField::typeName << " patches"
+            << endl;
+    }
+}
+
+
+void Foam::yPlusRAS::calcCompressibleYPlus
+(
+    const fvMesh& mesh,
+    volScalarField& yPlus
+) const
+{
+    typedef compressible::RASModels::mutkWallFunctionFvPatchScalarField
+        wallFunctionPatchField;
+
+    const compressible::RASModel& model =
+        mesh.lookupObject<compressible::RASModel>("RASProperties");
+
+    const volScalarField mut(model.mut());
+    const volScalarField::GeometricBoundaryField& mutPatches =
+        mut.boundaryField();
+
+    Info<< type() << " output:" << nl;
+
+    bool foundMutPatch = false;
+    forAll(mutPatches, patchi)
+    {
+        if (isA<wallFunctionPatchField>(mutPatches[patchi]))
+        {
+            foundMutPatch = true;
+
+            const wallFunctionPatchField& mutPw =
+                dynamic_cast<const wallFunctionPatchField&>(mutPatches[patchi]);
+
+            yPlus.boundaryField()[patchi] = mutPw.yPlus();
+            const scalarField& Yp = yPlus.boundaryField()[patchi];
+
+            Info<< "    patch " << mutPw.patch().name()
+                << " y+ : min = " << min(Yp) << ", max = " << max(Yp)
+                << ", average = " << average(Yp) << nl;
+        }
+    }
+
+    if (!foundMutPatch)
+    {
+        Info<< "    no " << wallFunctionPatchField::typeName << " patches"
+            << endl;
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::yPlusRAS::yPlusRAS
+(
+    const word& name,
+    const objectRegistry& obr,
+    const dictionary& dict,
+    const bool loadFromFiles
+)
+:
+    name_(name),
+    obr_(obr),
+    active_(true),
+    phiName_("phi")
+{
+    // Check if the available mesh is an fvMesh, otherwise deactivate
+    if (!isA<fvMesh>(obr_))
+    {
+        active_ = false;
+        WarningIn
+        (
+            "yPlusRAS::yPlusRAS"
+            "("
+                "const word&, "
+                "const objectRegistry&, "
+                "const dictionary&, "
+                "const bool"
+            ")"
+        )   << "No fvMesh available, deactivating." << nl
+            << endl;
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::yPlusRAS::~yPlusRAS()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::yPlusRAS::read(const dictionary& dict)
+{
+    if (active_)
+    {
+        phiName_ = dict.lookupOrDefault<word>("phiName", "phi");
+    }
+}
+
+
+void Foam::yPlusRAS::execute()
+{
+    // Do nothing - only valid on write
+}
+
+
+void Foam::yPlusRAS::end()
+{
+    // Do nothing - only valid on write
+}
+
+
+void Foam::yPlusRAS::write()
+{
+    if (active_)
+    {
+        const surfaceScalarField& phi =
+            obr_.lookupObject<surfaceScalarField>(phiName_);
+
+        const fvMesh& mesh = refCast<const fvMesh>(obr_);
+
+        volScalarField yPlusRAS
+        (
+            IOobject
+            (
+                "yPlusRAS",
+                mesh.time().timeName(),
+                mesh,
+                IOobject::NO_READ
+            ),
+            mesh,
+            dimensionedScalar("0", dimless, 0.0)
+        );
+
+        if (phi.dimensions() == dimMass/dimTime)
+        {
+            calcCompressibleYPlus(mesh, yPlusRAS);
+        }
+        else
+        {
+            calcIncompressibleYPlus(mesh, yPlusRAS);
+        }
+
+        Info<< endl;
+
+        yPlusRAS.write();
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/src/postProcessing/functionObjects/utilities/yPlusRAS/yPlusRAS.H b/src/postProcessing/functionObjects/utilities/yPlusRAS/yPlusRAS.H
new file mode 100644
index 0000000000..5b8a0031cc
--- /dev/null
+++ b/src/postProcessing/functionObjects/utilities/yPlusRAS/yPlusRAS.H
@@ -0,0 +1,158 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::yPlusRAS
+
+Description
+    Evaluates and outputs turbulence y+ for RAS models.  Values written to
+    time folders as field 'yPlusRAS'
+
+SourceFiles
+    yPlusRAS.C
+    IOyPlusRAS.H
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef yPlusRAS_H
+#define yPlusRAS_H
+
+#include "volFieldsFwd.H"
+#include "pointFieldFwd.H"
+#include "fvMesh.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// Forward declaration of classes
+class objectRegistry;
+class dictionary;
+class mapPolyMesh;
+
+/*---------------------------------------------------------------------------*\
+                  Class yPlusRAS Declaration
+\*---------------------------------------------------------------------------*/
+
+class yPlusRAS
+{
+    // Private data
+
+        //- Name of this set of yPlusRAS objects
+        word name_;
+
+        const objectRegistry& obr_;
+
+        //- on/off switch
+        bool active_;
+
+        //- Name of mass/volume flux field (optional, default = phi)
+        word phiName_;
+
+
+    // Private Member Functions
+
+        //- Calculate incompressible form of y+
+        void calcIncompressibleYPlus
+        (
+            const fvMesh& mesh,
+            volScalarField& yPlus
+        ) const;
+
+        //- Calculate compressible form of y+
+        void calcCompressibleYPlus
+        (
+            const fvMesh& mesh,
+            volScalarField& yPlus
+        ) const;
+
+        //- Disallow default bitwise copy construct
+        yPlusRAS(const yPlusRAS&);
+
+        //- Disallow default bitwise assignment
+        void operator=(const yPlusRAS&);
+
+
+public:
+
+    //- Runtime type information
+    TypeName("yPlusRAS");
+
+
+    // Constructors
+
+        //- Construct for given objectRegistry and dictionary.
+        //  Allow the possibility to load fields from files
+        yPlusRAS
+        (
+            const word& name,
+            const objectRegistry&,
+            const dictionary&,
+            const bool loadFromFiles = false
+        );
+
+
+    //- Destructor
+    virtual ~yPlusRAS();
+
+
+    // Member Functions
+
+        //- Return name of the set of yPlusRAS
+        virtual const word& name() const
+        {
+            return name_;
+        }
+
+        //- Read the yPlusRAS data
+        virtual void read(const dictionary&);
+
+        //- Execute, currently does nothing
+        virtual void execute();
+
+        //- Execute at the final time-loop, currently does nothing
+        virtual void end();
+
+        //- Calculate the yPlusRAS and write
+        virtual void write();
+
+        //- Update for changes of mesh
+        virtual void updateMesh(const mapPolyMesh&)
+        {}
+
+        //- Update for changes of mesh
+        virtual void movePoints(const pointField&)
+        {}
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/postProcessing/functionObjects/utilities/yPlusRAS/yPlusRASFunctionObject.C b/src/postProcessing/functionObjects/utilities/yPlusRAS/yPlusRASFunctionObject.C
new file mode 100644
index 0000000000..77ffceeb84
--- /dev/null
+++ b/src/postProcessing/functionObjects/utilities/yPlusRAS/yPlusRASFunctionObject.C
@@ -0,0 +1,42 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "yPlusRASFunctionObject.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    defineNamedTemplateTypeNameAndDebug(yPlusRASFunctionObject, 0);
+
+    addToRunTimeSelectionTable
+    (
+        functionObject,
+        yPlusRASFunctionObject,
+        dictionary
+    );
+}
+
+// ************************************************************************* //
diff --git a/src/postProcessing/functionObjects/utilities/yPlusRAS/yPlusRASFunctionObject.H b/src/postProcessing/functionObjects/utilities/yPlusRAS/yPlusRASFunctionObject.H
new file mode 100644
index 0000000000..99d34c6517
--- /dev/null
+++ b/src/postProcessing/functionObjects/utilities/yPlusRAS/yPlusRASFunctionObject.H
@@ -0,0 +1,53 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Typedef
+    Foam::yPlusRASFunctionObject
+
+Description
+    FunctionObject wrapper around yPlusRAS to allow it to be created
+    via the functions entry within controlDict.
+
+SourceFiles
+    yPlusRASFunctionObject.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef yPlusRASFunctionObject_H
+#define yPlusRASFunctionObject_H
+
+#include "yPlusRAS.H"
+#include "OutputFilterFunctionObject.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    typedef OutputFilterFunctionObject<yPlusRAS> yPlusRASFunctionObject;
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //

From ce7a93a8476f6c6f4ae5e48177d4178183e05958 Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Tue, 20 Mar 2012 13:25:12 +0000
Subject: [PATCH 068/317] ENH: Added new yPlusLES function object

---
 .../functionObjects/utilities/Make/files      |   3 +
 .../functionObjects/utilities/Make/options    |   5 +-
 .../utilities/yPlusLES/IOyPlusLES.H           |  49 ++++
 .../utilities/yPlusLES/yPlusLES.C             | 248 ++++++++++++++++++
 .../utilities/yPlusLES/yPlusLES.H             | 163 ++++++++++++
 .../yPlusLES/yPlusLESFunctionObject.C         |  42 +++
 .../yPlusLES/yPlusLESFunctionObject.H         |  53 ++++
 .../utilities/yPlusRAS/yPlusRAS.C             |  12 +-
 .../utilities/yPlusRAS/yPlusRAS.H             |   2 +-
 9 files changed, 569 insertions(+), 8 deletions(-)
 create mode 100644 src/postProcessing/functionObjects/utilities/yPlusLES/IOyPlusLES.H
 create mode 100644 src/postProcessing/functionObjects/utilities/yPlusLES/yPlusLES.C
 create mode 100644 src/postProcessing/functionObjects/utilities/yPlusLES/yPlusLES.H
 create mode 100644 src/postProcessing/functionObjects/utilities/yPlusLES/yPlusLESFunctionObject.C
 create mode 100644 src/postProcessing/functionObjects/utilities/yPlusLES/yPlusLESFunctionObject.H

diff --git a/src/postProcessing/functionObjects/utilities/Make/files b/src/postProcessing/functionObjects/utilities/Make/files
index 5737e2f473..f6e23536e0 100644
--- a/src/postProcessing/functionObjects/utilities/Make/files
+++ b/src/postProcessing/functionObjects/utilities/Make/files
@@ -12,6 +12,9 @@ staticPressure/staticPressureFunctionObject.C
 timeActivatedFileUpdate/timeActivatedFileUpdate.C
 timeActivatedFileUpdate/timeActivatedFileUpdateFunctionObject.C
 
+yPlusLES/yPlusLES.C
+yPlusLES/yPlusLESFunctionObject.C
+
 yPlusRAS/yPlusRAS.C
 yPlusRAS/yPlusRASFunctionObject.C
 
diff --git a/src/postProcessing/functionObjects/utilities/Make/options b/src/postProcessing/functionObjects/utilities/Make/options
index ecc2c0a411..9acdda40ef 100644
--- a/src/postProcessing/functionObjects/utilities/Make/options
+++ b/src/postProcessing/functionObjects/utilities/Make/options
@@ -8,7 +8,8 @@ EXE_INC = \
     -I$(LIB_SRC)/turbulenceModels \
     -I$(LIB_SRC)/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions \
     -I$(LIB_SRC)/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions \
-    -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude
+    -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
+    -I$(LIB_SRC)/turbulenceModels/LES/LESdeltas/lnInclude
 
 LIB_LIBS = \
     -lfiniteVolume \
@@ -19,4 +20,6 @@ LIB_LIBS = \
     -lincompressibleTransportModels \
     -lcompressibleRASModels \
     -lincompressibleRASModels \
+    -lcompressibleLESModels \
+    -lincompressibleLESModels \
     -lbasicThermophysicalModels
diff --git a/src/postProcessing/functionObjects/utilities/yPlusLES/IOyPlusLES.H b/src/postProcessing/functionObjects/utilities/yPlusLES/IOyPlusLES.H
new file mode 100644
index 0000000000..55c541ab8f
--- /dev/null
+++ b/src/postProcessing/functionObjects/utilities/yPlusLES/IOyPlusLES.H
@@ -0,0 +1,49 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Typedef
+    Foam::IOyPlusLES
+
+Description
+    Instance of the generic IOOutputFilter for yPlusLES.
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef IOyPlusLES_H
+#define IOyPlusLES_H
+
+#include "yPlusLES.H"
+#include "IOOutputFilter.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    typedef IOOutputFilter<yPlusLES> IOyPlusLES;
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/postProcessing/functionObjects/utilities/yPlusLES/yPlusLES.C b/src/postProcessing/functionObjects/utilities/yPlusLES/yPlusLES.C
new file mode 100644
index 0000000000..59436ba7da
--- /dev/null
+++ b/src/postProcessing/functionObjects/utilities/yPlusLES/yPlusLES.C
@@ -0,0 +1,248 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "yPlusLES.H"
+#include "volFields.H"
+
+#include "incompressible/LES/LESModel/LESModel.H"
+#include "compressible/LES/LESModel/LESModel.H"
+#include "wallFvPatch.H"
+#include "nearWallDist.H"
+//#include "wallDist.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+defineTypeNameAndDebug(Foam::yPlusLES, 0);
+
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+void Foam::yPlusLES::calcIncompressibleYPlus
+(
+    const fvMesh& mesh,
+    const volVectorField& U,
+    volScalarField& yPlus
+) const
+{
+    const incompressible::LESModel& model =
+        mesh.lookupObject<incompressible::LESModel>("LESProperties");
+
+    volScalarField::GeometricBoundaryField d = nearWallDist(mesh).y();
+    volScalarField nuEff(model.nuEff());
+
+    const fvPatchList& patches = mesh.boundary();
+
+    const volScalarField nuLam(model.nu());
+
+    Info<< type() << " output:" << nl;
+
+    bool foundPatch = false;
+    forAll(patches, patchI)
+    {
+        const fvPatch& currPatch = patches[patchI];
+
+        if (isA<wallFvPatch>(currPatch))
+        {
+            foundPatch = true;
+            yPlus.boundaryField()[patchI] =
+                d[patchI]
+               *sqrt
+                (
+                    nuEff.boundaryField()[patchI]
+                   *mag(U.boundaryField()[patchI].snGrad())
+                )
+               /nuLam.boundaryField()[patchI];
+
+            const scalarField& Yp = yPlus.boundaryField()[patchI];
+
+            Info<< "    patch " << currPatch.name()
+                << " y+ : min = " << min(Yp) << ", max = " << max(Yp)
+                << ", average = " << average(Yp) << nl;
+        }
+    }
+
+    if (!foundPatch)
+    {
+        Info<< "    no " << wallFvPatch::typeName << " patches" << endl;
+    }
+}
+
+
+void Foam::yPlusLES::calcCompressibleYPlus
+(
+    const fvMesh& mesh,
+    const volVectorField& U,
+    volScalarField& yPlus
+) const
+{
+    const compressible::LESModel& model =
+        mesh.lookupObject<compressible::LESModel>("LESProperties");
+
+    volScalarField::GeometricBoundaryField d = nearWallDist(mesh).y();
+    volScalarField muEff(model.muEff());
+
+    const fvPatchList& patches = mesh.boundary();
+
+    const volScalarField muLam(model.mu());
+
+    Info<< type() << " output:" << nl;
+
+    bool foundPatch = false;
+    forAll(patches, patchI)
+    {
+        const fvPatch& currPatch = patches[patchI];
+
+        if (isA<wallFvPatch>(currPatch))
+        {
+            foundPatch = true;
+            yPlus.boundaryField()[patchI] =
+                d[patchI]
+               *sqrt
+                (
+                    muEff.boundaryField()[patchI]
+                   *mag(U.boundaryField()[patchI].snGrad())
+                )
+               /muLam.boundaryField()[patchI];
+
+            const scalarField& Yp = yPlus.boundaryField()[patchI];
+
+            Info<< "    patch " << currPatch.name()
+                << " y+ : min = " << min(Yp) << ", max = " << max(Yp)
+                << ", average = " << average(Yp) << nl;
+        }
+    }
+
+    if (!foundPatch)
+    {
+        Info<< "    no " << wallFvPatch::typeName << " patches" << endl;
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::yPlusLES::yPlusLES
+(
+    const word& name,
+    const objectRegistry& obr,
+    const dictionary& dict,
+    const bool loadFromFiles
+)
+:
+    name_(name),
+    obr_(obr),
+    active_(true),
+    phiName_("phi"),
+    UName_("U")
+{
+    // Check if the available mesh is an fvMesh, otherwise deactivate
+    if (!isA<fvMesh>(obr_))
+    {
+        active_ = false;
+        WarningIn
+        (
+            "yPlusLES::yPlusLES"
+            "("
+                "const word&, "
+                "const objectRegistry&, "
+                "const dictionary&, "
+                "const bool"
+            ")"
+        )   << "No fvMesh available, deactivating." << nl
+            << endl;
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::yPlusLES::~yPlusLES()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::yPlusLES::read(const dictionary& dict)
+{
+    if (active_)
+    {
+        phiName_ = dict.lookupOrDefault<word>("phiName", "phi");
+    }
+}
+
+
+void Foam::yPlusLES::execute()
+{
+    // Do nothing - only valid on write
+}
+
+
+void Foam::yPlusLES::end()
+{
+    // Do nothing - only valid on write
+}
+
+
+void Foam::yPlusLES::write()
+{
+    if (active_)
+    {
+        const surfaceScalarField& phi =
+            obr_.lookupObject<surfaceScalarField>(phiName_);
+
+        const volVectorField& U = obr_.lookupObject<volVectorField>(UName_);
+
+        const fvMesh& mesh = refCast<const fvMesh>(obr_);
+
+        volScalarField yPlusLES
+        (
+            IOobject
+            (
+                "yPlusLES",
+                mesh.time().timeName(),
+                mesh,
+                IOobject::NO_READ
+            ),
+            mesh,
+            dimensionedScalar("0", dimless, 0.0)
+        );
+
+        if (phi.dimensions() == dimMass/dimTime)
+        {
+            calcCompressibleYPlus(mesh, U, yPlusLES);
+        }
+        else
+        {
+            calcIncompressibleYPlus(mesh, U, yPlusLES);
+        }
+
+        Info<< endl;
+
+        yPlusLES.write();
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/src/postProcessing/functionObjects/utilities/yPlusLES/yPlusLES.H b/src/postProcessing/functionObjects/utilities/yPlusLES/yPlusLES.H
new file mode 100644
index 0000000000..48b9a1186a
--- /dev/null
+++ b/src/postProcessing/functionObjects/utilities/yPlusLES/yPlusLES.H
@@ -0,0 +1,163 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::yPlusLES
+
+Description
+    Evaluates and outputs turbulence y+ for LES models.  Values written to
+    time folders as field 'yPlusLES'
+
+SourceFiles
+    yPlusLES.C
+    IOyPlusLES.H
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef yPlusLES_H
+#define yPlusLES_H
+
+#include "volFieldsFwd.H"
+#include "pointFieldFwd.H"
+#include "fvMesh.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// Forward declaration of classes
+class objectRegistry;
+class dictionary;
+class mapPolyMesh;
+
+/*---------------------------------------------------------------------------*\
+                          Class yPlusLES Declaration
+\*---------------------------------------------------------------------------*/
+
+class yPlusLES
+{
+    // Private data
+
+        //- Name of this set of yPlusLES objects
+        word name_;
+
+        const objectRegistry& obr_;
+
+        //- on/off switch
+        bool active_;
+
+        //- Name of mass/volume flux field (optional, default = phi)
+        word phiName_;
+
+        //- Name of velocity field
+        word UName_;
+
+
+    // Private Member Functions
+
+        //- Calculate incompressible form of y+
+        void calcIncompressibleYPlus
+        (
+            const fvMesh& mesh,
+            const volVectorField& U,
+            volScalarField& yPlus
+        ) const;
+
+        //- Calculate compressible form of y+
+        void calcCompressibleYPlus
+        (
+            const fvMesh& mesh,
+            const volVectorField& U,
+            volScalarField& yPlus
+        ) const;
+
+        //- Disallow default bitwise copy construct
+        yPlusLES(const yPlusLES&);
+
+        //- Disallow default bitwise assignment
+        void operator=(const yPlusLES&);
+
+
+public:
+
+    //- Runtime type information
+    TypeName("yPlusLES");
+
+
+    // Constructors
+
+        //- Construct for given objectRegistry and dictionary.
+        //  Allow the possibility to load fields from files
+        yPlusLES
+        (
+            const word& name,
+            const objectRegistry&,
+            const dictionary&,
+            const bool loadFromFiles = false
+        );
+
+
+    //- Destructor
+    virtual ~yPlusLES();
+
+
+    // Member Functions
+
+        //- Return name of the set of yPlusLES
+        virtual const word& name() const
+        {
+            return name_;
+        }
+
+        //- Read the yPlusLES data
+        virtual void read(const dictionary&);
+
+        //- Execute, currently does nothing
+        virtual void execute();
+
+        //- Execute at the final time-loop, currently does nothing
+        virtual void end();
+
+        //- Calculate the yPlusLES and write
+        virtual void write();
+
+        //- Update for changes of mesh
+        virtual void updateMesh(const mapPolyMesh&)
+        {}
+
+        //- Update for changes of mesh
+        virtual void movePoints(const pointField&)
+        {}
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/postProcessing/functionObjects/utilities/yPlusLES/yPlusLESFunctionObject.C b/src/postProcessing/functionObjects/utilities/yPlusLES/yPlusLESFunctionObject.C
new file mode 100644
index 0000000000..77ea1c21a3
--- /dev/null
+++ b/src/postProcessing/functionObjects/utilities/yPlusLES/yPlusLESFunctionObject.C
@@ -0,0 +1,42 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "yPlusLESFunctionObject.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    defineNamedTemplateTypeNameAndDebug(yPlusLESFunctionObject, 0);
+
+    addToRunTimeSelectionTable
+    (
+        functionObject,
+        yPlusLESFunctionObject,
+        dictionary
+    );
+}
+
+// ************************************************************************* //
diff --git a/src/postProcessing/functionObjects/utilities/yPlusLES/yPlusLESFunctionObject.H b/src/postProcessing/functionObjects/utilities/yPlusLES/yPlusLESFunctionObject.H
new file mode 100644
index 0000000000..35a19abb69
--- /dev/null
+++ b/src/postProcessing/functionObjects/utilities/yPlusLES/yPlusLESFunctionObject.H
@@ -0,0 +1,53 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Typedef
+    Foam::yPlusLESFunctionObject
+
+Description
+    FunctionObject wrapper around yPlusLES to allow it to be created
+    via the functions entry within controlDict.
+
+SourceFiles
+    yPlusLESFunctionObject.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef yPlusLESFunctionObject_H
+#define yPlusLESFunctionObject_H
+
+#include "yPlusLES.H"
+#include "OutputFilterFunctionObject.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    typedef OutputFilterFunctionObject<yPlusLES> yPlusLESFunctionObject;
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/postProcessing/functionObjects/utilities/yPlusRAS/yPlusRAS.C b/src/postProcessing/functionObjects/utilities/yPlusRAS/yPlusRAS.C
index 788d9f19ff..188c79bba5 100644
--- a/src/postProcessing/functionObjects/utilities/yPlusRAS/yPlusRAS.C
+++ b/src/postProcessing/functionObjects/utilities/yPlusRAS/yPlusRAS.C
@@ -59,12 +59,12 @@ void Foam::yPlusRAS::calcIncompressibleYPlus
 
     Info<< type() << " output:" << nl;
 
-    bool foundNutPatch = false;
+    bool foundPatch = false;
     forAll(nutPatches, patchi)
     {
         if (isA<wallFunctionPatchField>(nutPatches[patchi]))
         {
-            foundNutPatch = true;
+            foundPatch = true;
 
             const wallFunctionPatchField& nutPw =
                 dynamic_cast<const wallFunctionPatchField&>(nutPatches[patchi]);
@@ -78,7 +78,7 @@ void Foam::yPlusRAS::calcIncompressibleYPlus
         }
     }
 
-    if (!foundNutPatch)
+    if (!foundPatch)
     {
         Info<< "    no " << wallFunctionPatchField::typeName << " patches"
             << endl;
@@ -104,12 +104,12 @@ void Foam::yPlusRAS::calcCompressibleYPlus
 
     Info<< type() << " output:" << nl;
 
-    bool foundMutPatch = false;
+    bool foundPatch = false;
     forAll(mutPatches, patchi)
     {
         if (isA<wallFunctionPatchField>(mutPatches[patchi]))
         {
-            foundMutPatch = true;
+            foundPatch = true;
 
             const wallFunctionPatchField& mutPw =
                 dynamic_cast<const wallFunctionPatchField&>(mutPatches[patchi]);
@@ -123,7 +123,7 @@ void Foam::yPlusRAS::calcCompressibleYPlus
         }
     }
 
-    if (!foundMutPatch)
+    if (!foundPatch)
     {
         Info<< "    no " << wallFunctionPatchField::typeName << " patches"
             << endl;
diff --git a/src/postProcessing/functionObjects/utilities/yPlusRAS/yPlusRAS.H b/src/postProcessing/functionObjects/utilities/yPlusRAS/yPlusRAS.H
index 5b8a0031cc..040e6f86bb 100644
--- a/src/postProcessing/functionObjects/utilities/yPlusRAS/yPlusRAS.H
+++ b/src/postProcessing/functionObjects/utilities/yPlusRAS/yPlusRAS.H
@@ -52,7 +52,7 @@ class dictionary;
 class mapPolyMesh;
 
 /*---------------------------------------------------------------------------*\
-                  Class yPlusRAS Declaration
+                          Class yPlusRAS Declaration
 \*---------------------------------------------------------------------------*/
 
 class yPlusRAS

From c440f4fbb9c0c7a81610ab76d664aff5b8d037f4 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Tue, 20 Mar 2012 14:12:51 +0000
Subject: [PATCH 069/317] ENH: topoSet: added pointToCell/Face with edge option

---
 .../mesh/manipulation/topoSet/topoSetDict     |  2 ++
 .../cellSources/pointToCell/pointToCell.C     | 34 +++++++++++++++----
 .../cellSources/pointToCell/pointToCell.H     |  7 ++--
 .../faceSources/pointToFace/pointToFace.C     | 29 +++++++++++++---
 .../faceSources/pointToFace/pointToFace.H     |  7 ++--
 5 files changed, 62 insertions(+), 17 deletions(-)

diff --git a/applications/utilities/mesh/manipulation/topoSet/topoSetDict b/applications/utilities/mesh/manipulation/topoSet/topoSetDict
index 5b8a4b73bb..2bbe8ec55a 100644
--- a/applications/utilities/mesh/manipulation/topoSet/topoSetDict
+++ b/applications/utilities/mesh/manipulation/topoSet/topoSetDict
@@ -86,6 +86,7 @@ FoamFile
 //        set p0;
 //        option any;         // cell with any point in pointSet
 //        //option all;       // cell with all points in pointSet
+//        //option edge;      // cell with an edge with both points in pointSet
 //    }
 //
 //    // Select based on cellShape
@@ -198,6 +199,7 @@ FoamFile
 //        set p0;
 //        option any;         // Faces using any point in pointSet
 //        //option all        // Faces with all points in pointSet
+//        //option edge       // Faces with two consecutive points in pointSet
 //    }
 //
 //    //  Select by explicitly providing face labels
diff --git a/src/meshTools/sets/cellSources/pointToCell/pointToCell.C b/src/meshTools/sets/cellSources/pointToCell/pointToCell.C
index 9701431dc4..0939a2e3be 100644
--- a/src/meshTools/sets/cellSources/pointToCell/pointToCell.C
+++ b/src/meshTools/sets/cellSources/pointToCell/pointToCell.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -41,10 +41,11 @@ namespace Foam
     const char* Foam::NamedEnum
     <
         Foam::pointToCell::pointAction,
-        1
+        2
     >::names[] =
     {
-        "any"
+        "any",
+        "edge"
     };
 }
 
@@ -52,11 +53,12 @@ namespace Foam
 Foam::topoSetSource::addToUsageTable Foam::pointToCell::usage_
 (
     pointToCell::typeName,
-    "\n    Usage: pointToCell <pointSet> any\n\n"
-    "    Select all cells with any point in the pointSet\n\n"
+    "\n    Usage: pointToCell <pointSet> any|edge\n\n"
+    "    Select all cells with any point ('any') or any edge ('edge')"
+    " in the pointSet\n\n"
 );
 
-const Foam::NamedEnum<Foam::pointToCell::pointAction, 1>
+const Foam::NamedEnum<Foam::pointToCell::pointAction, 2>
     Foam::pointToCell::pointActionNames_;
 
 
@@ -82,6 +84,26 @@ void Foam::pointToCell::combine(topoSet& set, const bool add) const
             }
         }
     }
+    else if (option_ == EDGE)
+    {
+        const faceList& faces = mesh_.faces();
+        forAll(faces, faceI)
+        {
+            const face& f = faces[faceI];
+
+            forAll(f, fp)
+            {
+                if (loadedSet.found(f[fp]) && loadedSet.found(f.nextLabel(fp)))
+                {
+                    addOrDelete(set, mesh_.faceOwner()[faceI], add);
+                    if (mesh_.isInternalFace(faceI))
+                    {
+                        addOrDelete(set, mesh_.faceNeighbour()[faceI], add);
+                    }
+                }
+            }
+        }
+    }
 }
 
 
diff --git a/src/meshTools/sets/cellSources/pointToCell/pointToCell.H b/src/meshTools/sets/cellSources/pointToCell/pointToCell.H
index 2e8a507640..96f02f18bf 100644
--- a/src/meshTools/sets/cellSources/pointToCell/pointToCell.H
+++ b/src/meshTools/sets/cellSources/pointToCell/pointToCell.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -55,7 +55,8 @@ public:
         //- Enumeration defining the valid options
         enum pointAction
         {
-            ANY     // Cells using any point in set
+            ANY,    // Cells using any point in set
+            EDGE    // Cells using an edge with both points in set
             //ALL   // Possible extension: cells whose all points are in set
         };
 
@@ -64,7 +65,7 @@ private:
         //- Add usage string
         static addToUsageTable usage_;
 
-        static const NamedEnum<pointAction, 1> pointActionNames_;
+        static const NamedEnum<pointAction, 2> pointActionNames_;
 
         //- Name of set to use
         word setName_;
diff --git a/src/meshTools/sets/faceSources/pointToFace/pointToFace.C b/src/meshTools/sets/faceSources/pointToFace/pointToFace.C
index 81e13e4fc4..7d66aaefe2 100644
--- a/src/meshTools/sets/faceSources/pointToFace/pointToFace.C
+++ b/src/meshTools/sets/faceSources/pointToFace/pointToFace.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -41,11 +41,12 @@ namespace Foam
     const char* Foam::NamedEnum
     <
         Foam::pointToFace::pointAction,
-        2
+        3
     >::names[] =
     {
         "any",
-        "all"
+        "all",
+        "edge"
     };
 }
 
@@ -53,13 +54,14 @@ namespace Foam
 Foam::topoSetSource::addToUsageTable Foam::pointToFace::usage_
 (
     pointToFace::typeName,
-    "\n    Usage: pointToFace <pointSet> any|all\n\n"
+    "\n    Usage: pointToFace <pointSet> any|all|edge\n\n"
     "    Select faces with\n"
     "    -any point in the pointSet\n"
     "    -all points in the pointSet\n\n"
+    "    -two consecutive points (an edge) in the pointSet\n\n"
 );
 
-const Foam::NamedEnum<Foam::pointToFace::pointAction, 2>
+const Foam::NamedEnum<Foam::pointToFace::pointAction, 3>
     Foam::pointToFace::pointActionNames_;
 
 
@@ -126,6 +128,23 @@ void Foam::pointToFace::combine(topoSet& set, const bool add) const
             }
         }
     }
+    else if (option_ == EDGE)
+    {
+        const faceList& faces = mesh_.faces();
+        forAll(faces, faceI)
+        {
+            const face& f = faces[faceI];
+
+            forAll(f, fp)
+            {
+                if (loadedSet.found(f[fp]) && loadedSet.found(f.nextLabel(fp)))
+                {
+                    addOrDelete(set, faceI, add);
+                    break;
+                }
+            }
+        }
+    }
 }
 
 
diff --git a/src/meshTools/sets/faceSources/pointToFace/pointToFace.H b/src/meshTools/sets/faceSources/pointToFace/pointToFace.H
index 482626f33f..e31bc65086 100644
--- a/src/meshTools/sets/faceSources/pointToFace/pointToFace.H
+++ b/src/meshTools/sets/faceSources/pointToFace/pointToFace.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -58,7 +58,8 @@ public:
         enum pointAction
         {
             ANY,
-            ALL
+            ALL,
+            EDGE
         };
 
 
@@ -67,7 +68,7 @@ private:
         //- Add usage string
         static addToUsageTable usage_;
 
-        static const NamedEnum<pointAction, 2> pointActionNames_;
+        static const NamedEnum<pointAction, 3> pointActionNames_;
 
         //- Name of set to use
         word setName_;

From 04c715a19b6c4bece2984e1db0bb5d2d8e2871e1 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Tue, 20 Mar 2012 14:14:49 +0000
Subject: [PATCH 070/317] ENH: faceSource: add area-normal integration or
 averaging

---
 .../field/fieldValues/controlDict             | 15 ++--
 .../field/fieldValues/faceSource/faceSource.C | 37 +++++++++-
 .../field/fieldValues/faceSource/faceSource.H | 45 +++++++++--
 .../faceSource/faceSourceTemplates.C          | 74 ++++++++++++++++---
 4 files changed, 139 insertions(+), 32 deletions(-)

diff --git a/src/postProcessing/functionObjects/field/fieldValues/controlDict b/src/postProcessing/functionObjects/field/fieldValues/controlDict
index 24b3ddbad4..ff5007f18d 100644
--- a/src/postProcessing/functionObjects/field/fieldValues/controlDict
+++ b/src/postProcessing/functionObjects/field/fieldValues/controlDict
@@ -67,17 +67,14 @@ functions
         sourceName      movingWall;
 
         //// if sampledSurface: dictionary with a sampledSurface
-        //// Note: the sampledSurfaces will have cell-values, i.e.
-        //// non-interpolated. Also will not sample surface fields.
+        //// Note: will not sample surface fields.
         //sampledSurfaceDict
         //{
-        //    type            cuttingPlane;
-        //    planeType       pointAndNormal;
-        //    pointAndNormalDict
-        //    {
-        //        basePoint       (0 0.099 0);
-        //        normalVector    (0 1 0);
-        //    }
+        //    // Sampling on triSurface
+        //    type        sampledTriSurfaceMesh;
+        //    surface     integrationPlane.stl;
+        //    source      cells;  // sample cells or boundaryFaces
+        //    interpolate true;
         //}
 
         // Operation: areaAverage/sum/weightedAverage ...
diff --git a/src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSource.C b/src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSource.C
index 97f244c60b..6ce7b3350d 100644
--- a/src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSource.C
+++ b/src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSource.C
@@ -53,7 +53,7 @@ namespace Foam
     const char* Foam::NamedEnum
     <
         Foam::fieldValues::faceSource::operationType,
-        9
+        11
     >::names[] =
     {
         "none",
@@ -64,7 +64,9 @@ namespace Foam
         "areaIntegrate",
         "min",
         "max",
-        "CoV"
+        "CoV",
+        "areaNormalAverage",
+        "areaNormalIntegrate"
     };
 
 }
@@ -73,7 +75,7 @@ namespace Foam
 const Foam::NamedEnum<Foam::fieldValues::faceSource::sourceType, 3>
     Foam::fieldValues::faceSource::sourceTypeNames_;
 
-const Foam::NamedEnum<Foam::fieldValues::faceSource::operationType, 9>
+const Foam::NamedEnum<Foam::fieldValues::faceSource::operationType, 11>
     Foam::fieldValues::faceSource::operationTypeNames_;
 
 
@@ -313,6 +315,35 @@ void Foam::fieldValues::faceSource::writeFileHeader()
 }
 
 
+template<>
+Foam::vector Foam::fieldValues::faceSource::processValues
+(
+    const Field<vector>& values,
+    const vectorField& Sf,
+    const scalarField& weightField
+) const
+{
+    switch (operation_)
+    {
+        case opAreaNormalAverage:
+        {
+            scalar result = sum(values&Sf)/sum(mag(Sf));
+            return vector(result, 0.0, 0.0);
+        }
+        case opAreaNormalIntegrate:
+        {
+            scalar result = sum(values&Sf);
+            return vector(result, 0.0, 0.0);
+        }
+        default:
+        {
+            // Fall through to other operations
+            return processSameTypeValues(values, Sf, weightField);
+        }
+    }
+}
+
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 Foam::fieldValues::faceSource::faceSource
diff --git a/src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSource.H b/src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSource.H
index b7a2924035..fd95788894 100644
--- a/src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSource.H
+++ b/src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSource.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -65,7 +65,9 @@ Description
       - min
       - max
       - CoV (Coefficient of variation: standard deviation/mean)
-
+      - areaNormalAverage   (vector with first component (average of) inproduct
+                             of value and face area vector)
+      - areaNormalIntegrate (   ,,          ,,           (sum of)       ,,
 
     Notes:
     - faces on empty patches get ignored
@@ -75,7 +77,11 @@ Description
       negative pressure)
     - using sampledSurfaces:
             - they do not do surface fields
-            - they use cell values - they do not do any interpolation.
+            - if interpolate=true they use interpolationCellPoint
+              otherwise they use cell values
+            - each triangle in sampledSurface is logically only in one cell
+              so interpolation will be wrong when triangles are larger than
+              cells. This can only happen for sampling on triSurfaceMesh.
             - take care when using isoSurfaces - these might have duplicate
               triangles so integration might be wrong
 
@@ -138,11 +144,13 @@ public:
             opAreaIntegrate,
             opMin,
             opMax,
-            opCoV
+            opCoV,
+            opAreaNormalAverage,
+            opAreaNormalIntegrate
         };
 
         //- Operation type names
-        static const NamedEnum<operationType, 9> operationTypeNames_;
+        static const NamedEnum<operationType, 11> operationTypeNames_;
 
 
 private:
@@ -194,7 +202,6 @@ protected:
             autoPtr<sampledSurface> surfacePtr_;
 
 
-
     // Protected Member Functions
 
         //- Initialise, e.g. face addressing
@@ -212,12 +219,23 @@ protected:
             const bool mustGet = false
         ) const;
 
-        //- Apply the 'operation' to the values
+        //- Apply the 'operation' to the values. Operation has to
+        //  preserve Type.
+        template<class Type>
+        Type processSameTypeValues
+        (
+            const Field<Type>& values,
+            const vectorField& Sf,
+            const scalarField& weightField
+        ) const;
+
+        //- Apply the 'operation' to the values. Wrapper around
+        //  processSameTypeValues. See also template specialisation below.
         template<class Type>
         Type processValues
         (
             const Field<Type>& values,
-            const scalarField& magSf,
+            const vectorField& Sf,
             const scalarField& weightField
         ) const;
 
@@ -292,6 +310,17 @@ public:
 };
 
 
+//- Specialisation of processing vectors for opAreaNormalAverage,
+//  opAreaNormalIntegrate (use inproduct - dimension reducing operation)
+template<>
+vector faceSource::processValues
+(
+    const Field<vector>& values,
+    const vectorField& Sf,
+    const scalarField& weightField
+) const;
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace fieldValues
diff --git a/src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSourceTemplates.C b/src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSourceTemplates.C
index 79c031818f..892593d036 100644
--- a/src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSourceTemplates.C
+++ b/src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSourceTemplates.C
@@ -27,6 +27,7 @@ License
 #include "surfaceFields.H"
 #include "volFields.H"
 #include "sampledSurface.H"
+#include "interpolationCellPoint.H"
 
 // * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
 
@@ -65,13 +66,44 @@ Foam::tmp<Foam::Field<Type> > Foam::fieldValues::faceSource::getFieldValues
     }
     else if (obr_.foundObject<vf>(fieldName))
     {
+        const vf& fld = obr_.lookupObject<vf>(fieldName);
+
         if (surfacePtr_.valid())
         {
-            return surfacePtr_().sample(obr_.lookupObject<vf>(fieldName));
+            if (surfacePtr_().interpolate())
+            {
+                const interpolationCellPoint<Type> interp(fld);
+                tmp<Field<Type> > tintFld(surfacePtr_().interpolate(interp));
+                const Field<Type>& intFld = tintFld();
+
+                // Average
+                const faceList& faces = surfacePtr_().faces();
+                tmp<Field<Type> > tavg
+                (
+                    new Field<Type>(faces.size(), pTraits<Type>::zero)
+                );
+                Field<Type>& avg = tavg();
+
+                forAll(faces, faceI)
+                {
+                    const face& f = faces[faceI];
+                    forAll(f, fp)
+                    {
+                        avg[faceI] += intFld[f[fp]];
+                    }
+                    avg[faceI] /= f.size();
+                }
+
+                return tavg;
+            }
+            else
+            {
+                return surfacePtr_().sample(fld);
+            }
         }
         else
         {
-            return filterField(obr_.lookupObject<vf>(fieldName), true);
+            return filterField(fld, true);
         }
     }
 
@@ -94,12 +126,11 @@ Foam::tmp<Foam::Field<Type> > Foam::fieldValues::faceSource::getFieldValues
 
 
 template<class Type>
-Type Foam::fieldValues::faceSource::processValues
+Type Foam::fieldValues::faceSource::processSameTypeValues
 (
     const Field<Type>& values,
-    const scalarField& magSf,
+    const vectorField& Sf,
     const scalarField& weightField
-
 ) const
 {
     Type result = pTraits<Type>::zero;
@@ -122,11 +153,15 @@ Type Foam::fieldValues::faceSource::processValues
         }
         case opAreaAverage:
         {
+            const scalarField magSf = mag(Sf);
+
             result = sum(values*magSf)/sum(magSf);
             break;
         }
         case opAreaIntegrate:
         {
+            const scalarField magSf = mag(Sf);
+
             result = sum(values*magSf);
             break;
         }
@@ -142,6 +177,8 @@ Type Foam::fieldValues::faceSource::processValues
         }
         case opCoV:
         {
+            const scalarField magSf = mag(Sf);
+
             Type meanValue = sum(values*magSf)/sum(magSf);
 
             const label nComp = pTraits<Type>::nComponents;
@@ -169,6 +206,19 @@ Type Foam::fieldValues::faceSource::processValues
 }
 
 
+template<class Type>
+Type Foam::fieldValues::faceSource::processValues
+(
+    const Field<Type>& values,
+    const vectorField& Sf,
+    const scalarField& weightField
+) const
+{
+    return processSameTypeValues(values, Sf, weightField);
+}
+
+
+
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
@@ -186,22 +236,22 @@ bool Foam::fieldValues::faceSource::writeValues(const word& fieldName)
             weightField = getFieldValues<scalar>(weightFieldName_, true);
         }
 
-        scalarField magSf;
+        vectorField Sf;
 
         if (surfacePtr_.valid())
         {
-            // Get unoriented magSf
-            magSf = surfacePtr_().magSf();
+            // Get oriented Sf
+            Sf = surfacePtr_().Sf();
         }
         else
         {
-            // Get unoriented magSf
-            magSf = filterField(mesh().magSf(), false);
+            // Get oriented Sf
+            Sf = filterField(mesh().Sf(), false);
         }
 
         // Combine onto master
         combineFields(values);
-        combineFields(magSf);
+        combineFields(Sf);
         combineFields(weightField);
 
         // apply weight field
@@ -210,7 +260,7 @@ bool Foam::fieldValues::faceSource::writeValues(const word& fieldName)
 
         if (Pstream::master())
         {
-            Type result = processValues(values, magSf, weightField);
+            Type result = processValues(values, Sf, weightField);
 
             if (valueOutput_)
             {

From b78e8b6e51e76c40475a6900a6c9d24d04a7c00d Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Tue, 20 Mar 2012 16:14:13 +0000
Subject: [PATCH 071/317] ENH: Created log output for yPlusRAS/LES function
 objects

---
 .../utilities/yPlusLES/yPlusLES.C             | 116 +++++++++++++--
 .../utilities/yPlusLES/yPlusLES.H             |  17 ++-
 .../utilities/yPlusRAS/yPlusRAS.C             | 136 ++++++++++++++----
 .../utilities/yPlusRAS/yPlusRAS.H             |  25 ++--
 4 files changed, 239 insertions(+), 55 deletions(-)

diff --git a/src/postProcessing/functionObjects/utilities/yPlusLES/yPlusLES.C b/src/postProcessing/functionObjects/utilities/yPlusLES/yPlusLES.C
index 59436ba7da..c93f42c3e8 100644
--- a/src/postProcessing/functionObjects/utilities/yPlusLES/yPlusLES.C
+++ b/src/postProcessing/functionObjects/utilities/yPlusLES/yPlusLES.C
@@ -39,12 +39,57 @@ defineTypeNameAndDebug(Foam::yPlusLES, 0);
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
+void Foam::yPlusLES::makeFile()
+{
+    // Create the output file if not already created
+    if (outputFilePtr_.empty())
+    {
+        if (debug)
+        {
+            Info<< "Creating output file." << endl;
+        }
+
+        // File update
+        if (Pstream::master())
+        {
+            fileName outputDir;
+            word startTimeName =
+                obr_.time().timeName(obr_.time().startTime().value());
+
+            if (Pstream::parRun())
+            {
+                // Put in undecomposed case (Note: gives problems for
+                // distributed data running)
+                outputDir =
+                    obr_.time().path()/".."/name_/startTimeName;
+            }
+            else
+            {
+                outputDir = obr_.time().path()/name_/startTimeName;
+            }
+
+            // Create directory if does not exist
+            mkDir(outputDir);
+
+            // Open new file at start up
+            outputFilePtr_.reset(new OFstream(outputDir/(type() + ".dat")));
+
+            // Add headers to output data
+            outputFilePtr_() << "# y+ (LES)" << nl
+                << "# time " << token::TAB << "patch" << token::TAB
+                << "min" << token::TAB << "max" << token::TAB << "average"
+                << endl;
+        }
+    }
+}
+
+
 void Foam::yPlusLES::calcIncompressibleYPlus
 (
     const fvMesh& mesh,
     const volVectorField& U,
     volScalarField& yPlus
-) const
+)
 {
     const incompressible::LESModel& model =
         mesh.lookupObject<incompressible::LESModel>("LESProperties");
@@ -56,8 +101,6 @@ void Foam::yPlusLES::calcIncompressibleYPlus
 
     const volScalarField nuLam(model.nu());
 
-    Info<< type() << " output:" << nl;
-
     bool foundPatch = false;
     forAll(patches, patchI)
     {
@@ -77,13 +120,28 @@ void Foam::yPlusLES::calcIncompressibleYPlus
 
             const scalarField& Yp = yPlus.boundaryField()[patchI];
 
-            Info<< "    patch " << currPatch.name()
-                << " y+ : min = " << min(Yp) << ", max = " << max(Yp)
-                << ", average = " << average(Yp) << nl;
+            scalar minYp = min(Yp);
+            scalar maxYp = max(Yp);
+            scalar avgYp = average(Yp);
+
+            if (log_)
+            {
+                Info<< "    patch " << currPatch.name()
+                    << " y+ : min = " << min(Yp) << ", max = " << max(Yp)
+                    << ", average = " << average(Yp) << nl;
+            }
+
+            if (Pstream::master())
+            {
+                outputFilePtr_() << obr_.time().value() << token::TAB
+                    << currPatch.name() << token::TAB
+                    << minYp << token::TAB << maxYp << token::TAB
+                    << avgYp << endl;
+            }
         }
     }
 
-    if (!foundPatch)
+    if (log_ && !foundPatch)
     {
         Info<< "    no " << wallFvPatch::typeName << " patches" << endl;
     }
@@ -95,7 +153,7 @@ void Foam::yPlusLES::calcCompressibleYPlus
     const fvMesh& mesh,
     const volVectorField& U,
     volScalarField& yPlus
-) const
+)
 {
     const compressible::LESModel& model =
         mesh.lookupObject<compressible::LESModel>("LESProperties");
@@ -128,13 +186,28 @@ void Foam::yPlusLES::calcCompressibleYPlus
 
             const scalarField& Yp = yPlus.boundaryField()[patchI];
 
-            Info<< "    patch " << currPatch.name()
-                << " y+ : min = " << min(Yp) << ", max = " << max(Yp)
-                << ", average = " << average(Yp) << nl;
-        }
+            scalar minYp = min(Yp);
+            scalar maxYp = max(Yp);
+            scalar avgYp = average(Yp);
+
+            if (log_)
+            {
+                Info<< "    patch " << currPatch.name()
+                    << " y+ : min = " << min(Yp) << ", max = " << max(Yp)
+                    << ", average = " << average(Yp) << nl;
+            }
+
+            if (Pstream::master())
+            {
+                outputFilePtr_() << obr_.time().value() << token::TAB
+                    << currPatch.name() << token::TAB
+                    << minYp << token::TAB << maxYp << token::TAB
+                    << avgYp << endl;
+            }
+         }
     }
 
-    if (!foundPatch)
+    if (log_ && !foundPatch)
     {
         Info<< "    no " << wallFvPatch::typeName << " patches" << endl;
     }
@@ -154,8 +227,10 @@ Foam::yPlusLES::yPlusLES
     name_(name),
     obr_(obr),
     active_(true),
+    log_(false),
     phiName_("phi"),
-    UName_("U")
+    UName_("U"),
+    outputFilePtr_(NULL)
 {
     // Check if the available mesh is an fvMesh, otherwise deactivate
     if (!isA<fvMesh>(obr_))
@@ -173,6 +248,8 @@ Foam::yPlusLES::yPlusLES
         )   << "No fvMesh available, deactivating." << nl
             << endl;
     }
+
+    makeFile();
 }
 
 
@@ -188,6 +265,7 @@ void Foam::yPlusLES::read(const dictionary& dict)
 {
     if (active_)
     {
+        log_ = dict.lookupOrDefault<Switch>("log", false);
         phiName_ = dict.lookupOrDefault<word>("phiName", "phi");
     }
 }
@@ -229,6 +307,11 @@ void Foam::yPlusLES::write()
             dimensionedScalar("0", dimless, 0.0)
         );
 
+        if (log_)
+        {
+            Info<< type() << " output:" << nl;
+        }
+
         if (phi.dimensions() == dimMass/dimTime)
         {
             calcCompressibleYPlus(mesh, U, yPlusLES);
@@ -238,7 +321,10 @@ void Foam::yPlusLES::write()
             calcIncompressibleYPlus(mesh, U, yPlusLES);
         }
 
-        Info<< endl;
+        if (log_)
+        {
+            Info<< endl;
+        }
 
         yPlusLES.write();
     }
diff --git a/src/postProcessing/functionObjects/utilities/yPlusLES/yPlusLES.H b/src/postProcessing/functionObjects/utilities/yPlusLES/yPlusLES.H
index 48b9a1186a..5ab936ab7e 100644
--- a/src/postProcessing/functionObjects/utilities/yPlusLES/yPlusLES.H
+++ b/src/postProcessing/functionObjects/utilities/yPlusLES/yPlusLES.H
@@ -39,7 +39,8 @@ SourceFiles
 
 #include "volFieldsFwd.H"
 #include "pointFieldFwd.H"
-#include "fvMesh.H"
+#include "Switch.H"
+#include "OFstream.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -50,6 +51,7 @@ namespace Foam
 class objectRegistry;
 class dictionary;
 class mapPolyMesh;
+class fvMesh;
 
 /*---------------------------------------------------------------------------*\
                           Class yPlusLES Declaration
@@ -67,22 +69,31 @@ class yPlusLES
         //- on/off switch
         bool active_;
 
+        //- Switch to send output to Info as well as to file
+        Switch log_;
+
         //- Name of mass/volume flux field (optional, default = phi)
         word phiName_;
 
         //- Name of velocity field
         word UName_;
 
+        //- Output file pointer
+        autoPtr<OFstream> outputFilePtr_;
+
 
     // Private Member Functions
 
+        //- Make the output file
+        virtual void makeFile();
+
         //- Calculate incompressible form of y+
         void calcIncompressibleYPlus
         (
             const fvMesh& mesh,
             const volVectorField& U,
             volScalarField& yPlus
-        ) const;
+        );
 
         //- Calculate compressible form of y+
         void calcCompressibleYPlus
@@ -90,7 +101,7 @@ class yPlusLES
             const fvMesh& mesh,
             const volVectorField& U,
             volScalarField& yPlus
-        ) const;
+        );
 
         //- Disallow default bitwise copy construct
         yPlusLES(const yPlusLES&);
diff --git a/src/postProcessing/functionObjects/utilities/yPlusRAS/yPlusRAS.C b/src/postProcessing/functionObjects/utilities/yPlusRAS/yPlusRAS.C
index 188c79bba5..81bb1df7ec 100644
--- a/src/postProcessing/functionObjects/utilities/yPlusRAS/yPlusRAS.C
+++ b/src/postProcessing/functionObjects/utilities/yPlusRAS/yPlusRAS.C
@@ -41,11 +41,56 @@ defineTypeNameAndDebug(Foam::yPlusRAS, 0);
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
+void Foam::yPlusRAS::makeFile()
+{
+    // Create the output file if not already created
+    if (outputFilePtr_.empty())
+    {
+        if (debug)
+        {
+            Info<< "Creating output file." << endl;
+        }
+
+        // File update
+        if (Pstream::master())
+        {
+            fileName outputDir;
+            word startTimeName =
+                obr_.time().timeName(obr_.time().startTime().value());
+
+            if (Pstream::parRun())
+            {
+                // Put in undecomposed case (Note: gives problems for
+                // distributed data running)
+                outputDir =
+                    obr_.time().path()/".."/name_/startTimeName;
+            }
+            else
+            {
+                outputDir = obr_.time().path()/name_/startTimeName;
+            }
+
+            // Create directory if does not exist
+            mkDir(outputDir);
+
+            // Open new file at start up
+            outputFilePtr_.reset(new OFstream(outputDir/(type() + ".dat")));
+
+            // Add headers to output data
+            outputFilePtr_() << "# y+ (RAS)" << nl
+                << "# time " << token::TAB << "patch" << token::TAB
+                << "min" << token::TAB << "max" << token::TAB << "average"
+                << endl;
+        }
+    }
+}
+
+
 void Foam::yPlusRAS::calcIncompressibleYPlus
 (
     const fvMesh& mesh,
     volScalarField& yPlus
-) const
+)
 {
     typedef incompressible::RASModels::nutkWallFunctionFvPatchScalarField
         wallFunctionPatchField;
@@ -57,28 +102,41 @@ void Foam::yPlusRAS::calcIncompressibleYPlus
     const volScalarField::GeometricBoundaryField& nutPatches =
         nut.boundaryField();
 
-    Info<< type() << " output:" << nl;
-
     bool foundPatch = false;
-    forAll(nutPatches, patchi)
+    forAll(nutPatches, patchI)
     {
-        if (isA<wallFunctionPatchField>(nutPatches[patchi]))
+        if (isA<wallFunctionPatchField>(nutPatches[patchI]))
         {
             foundPatch = true;
 
             const wallFunctionPatchField& nutPw =
-                dynamic_cast<const wallFunctionPatchField&>(nutPatches[patchi]);
+                dynamic_cast<const wallFunctionPatchField&>(nutPatches[patchI]);
 
-            yPlus.boundaryField()[patchi] = nutPw.yPlus();
-            const scalarField& Yp = yPlus.boundaryField()[patchi];
+            yPlus.boundaryField()[patchI] = nutPw.yPlus();
+            const scalarField& Yp = yPlus.boundaryField()[patchI];
 
-            Info<< "    patch " << nutPw.patch().name()
-                << " y+ : min = " << min(Yp) << ", max = " << max(Yp)
-                << ", average = " << average(Yp) << nl;
+            scalar minYp = min(Yp);
+            scalar maxYp = max(Yp);
+            scalar avgYp = average(Yp);
+
+            if (log_)
+            {
+                Info<< "    patch " << nutPw.patch().name()
+                    << " y+ : min = " << minYp << ", max = " << maxYp
+                    << ", average = " << avgYp << nl;
+            }
+
+            if (Pstream::master())
+            {
+                outputFilePtr_() << obr_.time().value() << token::TAB
+                    << nutPw.patch().name() << token::TAB
+                    << minYp << token::TAB << maxYp << token::TAB
+                    << avgYp << endl;
+            }
         }
     }
 
-    if (!foundPatch)
+    if (log_ && !foundPatch)
     {
         Info<< "    no " << wallFunctionPatchField::typeName << " patches"
             << endl;
@@ -90,7 +148,7 @@ void Foam::yPlusRAS::calcCompressibleYPlus
 (
     const fvMesh& mesh,
     volScalarField& yPlus
-) const
+)
 {
     typedef compressible::RASModels::mutkWallFunctionFvPatchScalarField
         wallFunctionPatchField;
@@ -102,28 +160,41 @@ void Foam::yPlusRAS::calcCompressibleYPlus
     const volScalarField::GeometricBoundaryField& mutPatches =
         mut.boundaryField();
 
-    Info<< type() << " output:" << nl;
-
     bool foundPatch = false;
-    forAll(mutPatches, patchi)
+    forAll(mutPatches, patchI)
     {
-        if (isA<wallFunctionPatchField>(mutPatches[patchi]))
+        if (isA<wallFunctionPatchField>(mutPatches[patchI]))
         {
             foundPatch = true;
 
             const wallFunctionPatchField& mutPw =
-                dynamic_cast<const wallFunctionPatchField&>(mutPatches[patchi]);
+                dynamic_cast<const wallFunctionPatchField&>(mutPatches[patchI]);
 
-            yPlus.boundaryField()[patchi] = mutPw.yPlus();
-            const scalarField& Yp = yPlus.boundaryField()[patchi];
+            yPlus.boundaryField()[patchI] = mutPw.yPlus();
+            const scalarField& Yp = yPlus.boundaryField()[patchI];
 
-            Info<< "    patch " << mutPw.patch().name()
-                << " y+ : min = " << min(Yp) << ", max = " << max(Yp)
-                << ", average = " << average(Yp) << nl;
+            scalar minYp = min(Yp);
+            scalar maxYp = max(Yp);
+            scalar avgYp = average(Yp);
+
+            if (log_)
+            {
+                Info<< "    patch " << mutPw.patch().name()
+                    << " y+ : min = " << minYp << ", max = " << maxYp
+                    << ", average = " << avgYp << nl;
+            }
+
+            if (Pstream::master())
+            {
+                outputFilePtr_() << obr_.time().value() << token::TAB
+                    << mutPw.patch().name() << token::TAB
+                    << minYp << token::TAB << maxYp << token::TAB
+                    << avgYp << endl;
+            }
         }
     }
 
-    if (!foundPatch)
+    if (log_ && !foundPatch)
     {
         Info<< "    no " << wallFunctionPatchField::typeName << " patches"
             << endl;
@@ -144,7 +215,9 @@ Foam::yPlusRAS::yPlusRAS
     name_(name),
     obr_(obr),
     active_(true),
-    phiName_("phi")
+    log_(false),
+    phiName_("phi"),
+    outputFilePtr_(NULL)
 {
     // Check if the available mesh is an fvMesh, otherwise deactivate
     if (!isA<fvMesh>(obr_))
@@ -162,6 +235,8 @@ Foam::yPlusRAS::yPlusRAS
         )   << "No fvMesh available, deactivating." << nl
             << endl;
     }
+
+    makeFile();
 }
 
 
@@ -177,6 +252,7 @@ void Foam::yPlusRAS::read(const dictionary& dict)
 {
     if (active_)
     {
+        log_ = dict.lookupOrDefault<Switch>("log", false);
         phiName_ = dict.lookupOrDefault<word>("phiName", "phi");
     }
 }
@@ -216,6 +292,11 @@ void Foam::yPlusRAS::write()
             dimensionedScalar("0", dimless, 0.0)
         );
 
+        if (log_)
+        {
+            Info<< type() << " output:" << nl;
+        }
+
         if (phi.dimensions() == dimMass/dimTime)
         {
             calcCompressibleYPlus(mesh, yPlusRAS);
@@ -225,7 +306,10 @@ void Foam::yPlusRAS::write()
             calcIncompressibleYPlus(mesh, yPlusRAS);
         }
 
-        Info<< endl;
+        if (log_)
+        {
+            Info<< endl;
+        }
 
         yPlusRAS.write();
     }
diff --git a/src/postProcessing/functionObjects/utilities/yPlusRAS/yPlusRAS.H b/src/postProcessing/functionObjects/utilities/yPlusRAS/yPlusRAS.H
index 040e6f86bb..2be6293424 100644
--- a/src/postProcessing/functionObjects/utilities/yPlusRAS/yPlusRAS.H
+++ b/src/postProcessing/functionObjects/utilities/yPlusRAS/yPlusRAS.H
@@ -39,7 +39,8 @@ SourceFiles
 
 #include "volFieldsFwd.H"
 #include "pointFieldFwd.H"
-#include "fvMesh.H"
+#include "Switch.H"
+#include "OFstream.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -50,6 +51,7 @@ namespace Foam
 class objectRegistry;
 class dictionary;
 class mapPolyMesh;
+class fvMesh;
 
 /*---------------------------------------------------------------------------*\
                           Class yPlusRAS Declaration
@@ -67,25 +69,26 @@ class yPlusRAS
         //- on/off switch
         bool active_;
 
+        //- Switch to send output to Info as well as to file
+        Switch log_;
+
         //- Name of mass/volume flux field (optional, default = phi)
         word phiName_;
 
+        //- Output file pointer
+        autoPtr<OFstream> outputFilePtr_;
+
 
     // Private Member Functions
 
+        //- Make the output file
+        virtual void makeFile();
+
         //- Calculate incompressible form of y+
-        void calcIncompressibleYPlus
-        (
-            const fvMesh& mesh,
-            volScalarField& yPlus
-        ) const;
+        void calcIncompressibleYPlus(const fvMesh& mesh, volScalarField& yPlus);
 
         //- Calculate compressible form of y+
-        void calcCompressibleYPlus
-        (
-            const fvMesh& mesh,
-            volScalarField& yPlus
-        ) const;
+        void calcCompressibleYPlus(const fvMesh& mesh, volScalarField& yPlus);
 
         //- Disallow default bitwise copy construct
         yPlusRAS(const yPlusRAS&);

From 6ac73b7d5810e2925ebe362d180c8984f4ebc5aa Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Tue, 20 Mar 2012 17:27:09 +0000
Subject: [PATCH 072/317] STYLE:topoSetDict: make consistent with code

---
 applications/utilities/mesh/manipulation/topoSet/topoSetDict | 1 -
 1 file changed, 1 deletion(-)

diff --git a/applications/utilities/mesh/manipulation/topoSet/topoSetDict b/applications/utilities/mesh/manipulation/topoSet/topoSetDict
index 2bbe8ec55a..4c2180f21d 100644
--- a/applications/utilities/mesh/manipulation/topoSet/topoSetDict
+++ b/applications/utilities/mesh/manipulation/topoSet/topoSetDict
@@ -85,7 +85,6 @@ FoamFile
 //    {
 //        set p0;
 //        option any;         // cell with any point in pointSet
-//        //option all;       // cell with all points in pointSet
 //        //option edge;      // cell with an edge with both points in pointSet
 //    }
 //

From 3159127b884fa57776821949cee25d8f530997e2 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Tue, 20 Mar 2012 17:28:05 +0000
Subject: [PATCH 073/317] STYLE: writeCellCentres: comment out unused code

---
 .../writeCellCentres/writeCellCentres.C       | 33 +++++++++----------
 1 file changed, 16 insertions(+), 17 deletions(-)

diff --git a/applications/utilities/postProcessing/miscellaneous/writeCellCentres/writeCellCentres.C b/applications/utilities/postProcessing/miscellaneous/writeCellCentres/writeCellCentres.C
index 3c9277c546..5bce3be0c2 100644
--- a/applications/utilities/postProcessing/miscellaneous/writeCellCentres/writeCellCentres.C
+++ b/applications/utilities/postProcessing/miscellaneous/writeCellCentres/writeCellCentres.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -61,23 +61,22 @@ int main(int argc, char *argv[])
         // Check for new mesh
         mesh.readUpdate();
 
-        volVectorField cc
-        (
-            IOobject
-            (
-                "cellCentres",
-                runTime.timeName(),
-                mesh,
-                IOobject::NO_READ,
-                IOobject::AUTO_WRITE
-            ),
-            mesh.C()
-        );
-
-        // Info<< "Writing cellCentre positions to " << cc.name() << " in "
-        //     << runTime.timeName() << endl;
+        //volVectorField cc
+        //(
+        //    IOobject
+        //    (
+        //        "cellCentres",
+        //        runTime.timeName(),
+        //        mesh,
+        //        IOobject::NO_READ,
+        //        IOobject::AUTO_WRITE
+        //    ),
+        //    1.0*mesh.C()
+        //);
         //
-        // cc.write();
+        //Info<< "Writing cellCentre positions to " << cc.name() << " in "
+        //     << runTime.timeName() << endl;
+        //cc.write();
 
         Info<< "Writing components of cellCentre positions to volScalarFields"
             << " ccx, ccy, ccz in " <<  runTime.timeName() << endl;

From d1a4239478316739bcae14c35263a30538bd02f2 Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Wed, 21 Mar 2012 09:17:47 +0000
Subject: [PATCH 074/317] ENH: Added position output to fieldMinMax function
 object

---
 .../field/fieldMinMax/fieldMinMax.C           |  53 +++-----
 .../field/fieldMinMax/fieldMinMax.H           |  11 +-
 .../field/fieldMinMax/fieldMinMaxTemplates.C  | 117 +++++++++++++-----
 3 files changed, 109 insertions(+), 72 deletions(-)

diff --git a/src/postProcessing/functionObjects/field/fieldMinMax/fieldMinMax.C b/src/postProcessing/functionObjects/field/fieldMinMax/fieldMinMax.C
index b2b03af70d..5a9e4b1d1e 100644
--- a/src/postProcessing/functionObjects/field/fieldMinMax/fieldMinMax.C
+++ b/src/postProcessing/functionObjects/field/fieldMinMax/fieldMinMax.C
@@ -156,7 +156,9 @@ void Foam::fieldMinMax::writeFileHeader()
     if (fieldMinMaxFilePtr_.valid())
     {
         fieldMinMaxFilePtr_()
-            << "# Time" << tab << "field" << tab << "min" << tab << "max"
+            << "# Time" << token::TAB << "field" << token::TAB
+            << "min" << token::TAB << "position(min)" << token::TAB
+            << "max" << token::TAB << "position(max)" << token::TAB
             << endl;
     }
 }
@@ -184,50 +186,27 @@ void Foam::fieldMinMax::write()
             makeFile();
         }
 
+        if (log_)
+        {
+            Info<< type() << " output:" << nl;
+        }
+
         forAll(fieldSet_, fieldI)
         {
-            calcMinMaxFields<scalar>(fieldSet_[fieldI]);
-            calcMinMaxFields<vector>(fieldSet_[fieldI]);
-            calcMinMaxFields<sphericalTensor>(fieldSet_[fieldI]);
-            calcMinMaxFields<symmTensor>(fieldSet_[fieldI]);
-            calcMinMaxFields<tensor>(fieldSet_[fieldI]);
+            calcMinMaxFields<scalar>(fieldSet_[fieldI], mdCmpt);
+            calcMinMaxFields<vector>(fieldSet_[fieldI], mode_);
+            calcMinMaxFields<sphericalTensor>(fieldSet_[fieldI], mode_);
+            calcMinMaxFields<symmTensor>(fieldSet_[fieldI], mode_);
+            calcMinMaxFields<tensor>(fieldSet_[fieldI], mode_);
         }
-    }
-}
 
-
-template<>
-void Foam::fieldMinMax::calcMinMaxFields<Foam::scalar>
-(
-    const word& fieldName
-)
-{
-    if (obr_.foundObject<volScalarField>(fieldName))
-    {
-        const volScalarField& field =
-            obr_.lookupObject<volScalarField>(fieldName);
-        const scalar minValue = min(field).value();
-        const scalar maxValue = max(field).value();
-
-        if (Pstream::master())
+        if (log_)
         {
-            if (write_)
-            {
-                fieldMinMaxFilePtr_()
-                    << obr_.time().value() << tab
-                    << fieldName << tab << minValue << tab << maxValue << endl;
-            }
-
-            if (log_)
-            {
-                Info<< "fieldMinMax output:" << nl
-                    << "    min(" << fieldName << ") = " << minValue << nl
-                    << "    max(" << fieldName << ") = " << maxValue << nl
-                    << endl;
-            }
+            Info<< endl;
         }
     }
 }
 
 
+
 // ************************************************************************* //
diff --git a/src/postProcessing/functionObjects/field/fieldMinMax/fieldMinMax.H b/src/postProcessing/functionObjects/field/fieldMinMax/fieldMinMax.H
index 8971a5b1d4..3cccb9668d 100644
--- a/src/postProcessing/functionObjects/field/fieldMinMax/fieldMinMax.H
+++ b/src/postProcessing/functionObjects/field/fieldMinMax/fieldMinMax.H
@@ -163,7 +163,11 @@ public:
 
         //- Calculate the field min/max
         template<class Type>
-        void calcMinMaxFields(const word& fieldName);
+        void calcMinMaxFields
+        (
+            const word& fieldName,
+            const modeType& mode
+        );
 
         //- Write the fieldMinMax
         virtual void write();
@@ -178,11 +182,6 @@ public:
 };
 
 
-// Template specialisation for scalar fields
-template<>
-void fieldMinMax::calcMinMaxFields<scalar>(const word& fieldName);
-
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
diff --git a/src/postProcessing/functionObjects/field/fieldMinMax/fieldMinMaxTemplates.C b/src/postProcessing/functionObjects/field/fieldMinMax/fieldMinMaxTemplates.C
index 5f74bcc28a..c2e9674329 100644
--- a/src/postProcessing/functionObjects/field/fieldMinMax/fieldMinMaxTemplates.C
+++ b/src/postProcessing/functionObjects/field/fieldMinMax/fieldMinMaxTemplates.C
@@ -27,81 +27,140 @@ License
 #include "volFields.H"
 #include "dictionary.H"
 #include "Time.H"
+#include "ListOps.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 template<class Type>
-void Foam::fieldMinMax::calcMinMaxFields(const word& fieldName)
+void Foam::fieldMinMax::calcMinMaxFields
+(
+    const word& fieldName,
+    const modeType& mode
+)
 {
     typedef GeometricField<Type, fvPatchField, volMesh> fieldType;
 
     if (obr_.foundObject<fieldType>(fieldName))
     {
+        const label procI = Pstream::myProcNo();
+
         const fieldType& field = obr_.lookupObject<fieldType>(fieldName);
-        switch (mode_)
+        switch (mode)
         {
             case mdMag:
             {
-                const scalar minValue = min(mag(field)).value();
-                const scalar maxValue = max(mag(field)).value();
+                const scalarField magField(mag(field));
+
+                labelList minIs(Pstream::nProcs());
+                scalarList minVs(Pstream::nProcs());
+                List<vector> minCs(Pstream::nProcs());
+                minIs[procI] = findMin(magField);
+                minVs[procI] = magField[minIs[procI]];
+                minCs[procI] = field.mesh().C()[minIs[procI]];
+
+                Pstream::gatherList(minIs);
+                Pstream::gatherList(minVs);
+                Pstream::gatherList(minCs);
+
+                labelList maxIs(Pstream::nProcs());
+                scalarList maxVs(Pstream::nProcs());
+                List<vector> maxCs(Pstream::nProcs());
+                maxIs[procI] = findMax(magField);
+                maxVs[procI] = magField[maxIs[procI]];
+                maxCs[procI] = field.mesh().C()[maxIs[procI]];
+
+                Pstream::gatherList(maxIs);
+                Pstream::gatherList(maxVs);
+                Pstream::gatherList(maxCs);
+
+                label minI = findMin(minVs);
+                scalar minValue = minVs[minI];
+                const vector& minC = minCs[minI];
+
+                label maxI = findMax(maxVs);
+                scalar maxValue = maxVs[maxI];
+                const vector& maxC = maxCs[maxI];
 
                 if (Pstream::master())
                 {
                     if (write_)
                     {
                         fieldMinMaxFilePtr_()
-                            << obr_.time().value() << tab
-                            << fieldName << tab << minValue << tab << maxValue
-                            << endl;
+                            << obr_.time().value() << token::TAB
+                            << fieldName << token::TAB
+                            << minValue << token::TAB << minC << token::TAB
+                            << maxValue << token::TAB << maxC << endl;
                     }
 
                     if (log_)
                     {
-                        Info<< "fieldMinMax output:" << nl
-                            << "    min(mag(" << fieldName << ")) = "
-                            << minValue << nl
+                        Info<< "    min(mag(" << fieldName << ")) = "
+                            << minValue << " at position " << minC << nl
                             << "    max(mag(" << fieldName << ")) = "
-                            << maxValue << nl
-                            << endl;
+                            << maxValue << " at position " << maxC << nl;
                     }
                 }
                 break;
             }
             case mdCmpt:
             {
-                const Type minValue = min(field).value();
-                const Type maxValue = max(field).value();
+                List<Type> minVs(Pstream::nProcs());
+                labelList minIs(Pstream::nProcs());
+                List<vector> minCs(Pstream::nProcs());
+                minIs[procI] = findMin(field);
+                minVs[procI] = field[minIs[procI]];
+                minCs[procI] = field.mesh().C()[minIs[procI]];
+
+                Pstream::gatherList(minIs);
+                Pstream::gatherList(minVs);
+                Pstream::gatherList(minCs);
+
+                List<Type> maxVs(Pstream::nProcs());
+                labelList maxIs(Pstream::nProcs());
+                List<vector> maxCs(Pstream::nProcs());
+                maxIs[procI] = findMax(field);
+                maxVs[procI] = field[maxIs[procI]];
+                maxCs[procI] = field.mesh().C()[maxIs[procI]];
+
+                Pstream::gatherList(maxIs);
+                Pstream::gatherList(maxVs);
+                Pstream::gatherList(maxCs);
+
+                label minI = findMin(minVs);
+                Type minValue = minVs[minI];
+                const vector& minC = minCs[minI];
+
+                label maxI = findMax(maxVs);
+                Type maxValue = maxVs[maxI];
+                const vector& maxC = maxCs[maxI];
+
 
                 if (Pstream::master())
                 {
                     if (write_)
                     {
                         fieldMinMaxFilePtr_()
-                            << obr_.time().value() << tab
-                            << fieldName << tab << minValue << tab << maxValue
-                            << endl;
+                            << obr_.time().value() << token::TAB
+                            << fieldName << token::TAB
+                            << minValue << token::TAB << minC << token::TAB
+                            << maxValue << token::TAB << maxC << endl;
                     }
 
                     if (log_)
                     {
-                        Info<< "fieldMinMax output:" << nl
-                            << "    cmptMin(" << fieldName << ") = "
-                            << minValue << nl
-                            << "    cmptMax(" << fieldName << ") = "
-                            << maxValue << nl
-                            << endl;
+                        Info<< "    min(" << fieldName << ") = "
+                            << minValue << " at position " << minC << nl
+                            << "    max(" << fieldName << ") = "
+                            << maxValue << " at position " << maxC << nl;
                     }
                 }
                 break;
             }
             default:
             {
-                FatalErrorIn
-                (
-                    "Foam::fieldMinMax::calcMinMaxFields"
-                    "(const word& fieldName)"
-                )<< "Unknown min/max mode: " << modeTypeNames_[mode_]
-                 << exit(FatalError);
+                FatalErrorIn("Foam::fieldMinMax::calcMinMaxFields(const word&)")
+                    << "Unknown min/max mode: " << modeTypeNames_[mode_]
+                    << exit(FatalError);
             }
         }
     }

From c407d396c133e0316aae80ae2210b0b4831449fc Mon Sep 17 00:00:00 2001
From: laurence <laurence>
Date: Wed, 21 Mar 2012 11:07:41 +0000
Subject: [PATCH 075/317] COMP: Update CGAL version to 4.0

---
 etc/config/settings.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/etc/config/settings.sh b/etc/config/settings.sh
index 60dfbfd60f..abb7030617 100644
--- a/etc/config/settings.sh
+++ b/etc/config/settings.sh
@@ -366,7 +366,7 @@ fi
 # ~~~~~~~~~~~~~~
 
 boost_version=boost_1_45_0
-cgal_version=CGAL-3.9
+cgal_version=CGAL-4.0
 
 export BOOST_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$boost_version
 export CGAL_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$cgal_version

From 1564d0c3704300e583d68787492f5ba806738e6f Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Wed, 21 Mar 2012 17:30:59 +0000
Subject: [PATCH 076/317] multiphaseEulerFoam/mixerVessel2D: new tutorial to
 test MRF capability in multiphaseEulerFoam

---
 .../multiphaseEulerFoam/mixerVessel2D/0/Theta |  44 +
 .../multiphaseEulerFoam/mixerVessel2D/0/Uair  |  46 +
 .../mixerVessel2D/0/Umercury                  |  46 +
 .../multiphaseEulerFoam/mixerVessel2D/0/Uoil  |  46 +
 .../mixerVessel2D/0/Uwater                    |  46 +
 .../mixerVessel2D/0/alphaair                  |  44 +
 .../mixerVessel2D/0/alphamercury              |  44 +
 .../mixerVessel2D/0/alphaoil                  |  44 +
 .../mixerVessel2D/0/alphas                    |  43 +
 .../mixerVessel2D/0/alphawater                |  44 +
 .../mixerVessel2D/0/epsilon                   |  48 +
 .../multiphaseEulerFoam/mixerVessel2D/0/k     |  48 +
 .../multiphaseEulerFoam/mixerVessel2D/0/p     |  46 +
 .../multiphaseEulerFoam/mixerVessel2D/Allrun  |  12 +
 .../mixerVessel2D/constant/LESProperties      |  29 +
 .../mixerVessel2D/constant/MRFZones           |  31 +
 .../mixerVessel2D/constant/g                  |  22 +
 .../constant/interfacialProperties            |  30 +
 .../constant/polyMesh/blockMeshDict.m4        | 818 ++++++++++++++++++
 .../mixerVessel2D/constant/polyMesh/boundary  |  46 +
 .../constant/transportProperties              | 248 ++++++
 .../mixerVessel2D/makeMesh                    |   6 +
 .../mixerVessel2D/system/controlDict          |  55 ++
 .../mixerVessel2D/system/fvSchemes            |  61 ++
 .../mixerVessel2D/system/fvSolution           |  97 +++
 .../mixerVessel2D/system/topoSetDict          |  32 +
 26 files changed, 2076 insertions(+)
 create mode 100644 tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/Theta
 create mode 100644 tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/Uair
 create mode 100644 tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/Umercury
 create mode 100644 tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/Uoil
 create mode 100644 tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/Uwater
 create mode 100644 tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/alphaair
 create mode 100644 tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/alphamercury
 create mode 100644 tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/alphaoil
 create mode 100644 tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/alphas
 create mode 100644 tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/alphawater
 create mode 100644 tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/epsilon
 create mode 100644 tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/k
 create mode 100644 tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/p
 create mode 100755 tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/Allrun
 create mode 100644 tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/constant/LESProperties
 create mode 100644 tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/constant/MRFZones
 create mode 100644 tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/constant/g
 create mode 100644 tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/constant/interfacialProperties
 create mode 100644 tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/constant/polyMesh/blockMeshDict.m4
 create mode 100644 tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/constant/polyMesh/boundary
 create mode 100644 tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/constant/transportProperties
 create mode 100755 tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/makeMesh
 create mode 100644 tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/system/controlDict
 create mode 100644 tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/system/fvSchemes
 create mode 100644 tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/system/fvSolution
 create mode 100644 tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/system/topoSetDict

diff --git a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/Theta b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/Theta
new file mode 100644
index 0000000000..b18d202df8
--- /dev/null
+++ b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/Theta
@@ -0,0 +1,44 @@
+/*--------------------------------*- 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;
+    object      Theta;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 2 -2 0 0 0 0];
+
+internalField   uniform 0;
+
+boundaryField
+{
+    rotor
+    {
+        type            zeroGradient;
+    }
+
+    stator
+    {
+        type            zeroGradient;
+    }
+
+    front
+    {
+        type            empty;
+    }
+
+    back
+    {
+        type            empty;
+    }
+}
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/Uair b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/Uair
new file mode 100644
index 0000000000..5826f86061
--- /dev/null
+++ b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/Uair
@@ -0,0 +1,46 @@
+/*--------------------------------*- 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       volVectorField;
+    object      Uair;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 1 -1 0 0 0 0];
+
+internalField   uniform (0 0 0);
+
+boundaryField
+{
+    rotor
+    {
+        type            fixedValue;
+        value           uniform (0 0 0);
+    }
+
+    stator
+    {
+        type            fixedValue;
+        value           uniform (0 0 0);
+    }
+
+    front
+    {
+        type            empty;
+    }
+
+    back
+    {
+        type            empty;
+    }
+}
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/Umercury b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/Umercury
new file mode 100644
index 0000000000..964d72357e
--- /dev/null
+++ b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/Umercury
@@ -0,0 +1,46 @@
+/*--------------------------------*- 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       volVectorField;
+    object      Umercury;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 1 -1 0 0 0 0];
+
+internalField   uniform (0 0 0);
+
+boundaryField
+{
+    rotor
+    {
+        type            fixedValue;
+        value           uniform (0 0 0);
+    }
+
+    stator
+    {
+        type            fixedValue;
+        value           uniform (0 0 0);
+    }
+
+    front
+    {
+        type            empty;
+    }
+
+    back
+    {
+        type            empty;
+    }
+}
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/Uoil b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/Uoil
new file mode 100644
index 0000000000..1b069b2057
--- /dev/null
+++ b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/Uoil
@@ -0,0 +1,46 @@
+/*--------------------------------*- 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       volVectorField;
+    object      Uoil;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 1 -1 0 0 0 0];
+
+internalField   uniform (0 0 0);
+
+boundaryField
+{
+    rotor
+    {
+        type            fixedValue;
+        value           uniform (0 0 0);
+    }
+
+    stator
+    {
+        type            fixedValue;
+        value           uniform (0 0 0);
+    }
+
+    front
+    {
+        type            empty;
+    }
+
+    back
+    {
+        type            empty;
+    }
+}
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/Uwater b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/Uwater
new file mode 100644
index 0000000000..c6e99512cd
--- /dev/null
+++ b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/Uwater
@@ -0,0 +1,46 @@
+/*--------------------------------*- 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       volVectorField;
+    object      Uwater;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 1 -1 0 0 0 0];
+
+internalField   uniform (0 0 0);
+
+boundaryField
+{
+    rotor
+    {
+        type            fixedValue;
+        value           uniform (0 0 0);
+    }
+
+    stator
+    {
+        type            fixedValue;
+        value           uniform (0 0 0);
+    }
+
+    front
+    {
+        type            empty;
+    }
+
+    back
+    {
+        type            empty;
+    }
+}
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/alphaair b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/alphaair
new file mode 100644
index 0000000000..c09ba884ec
--- /dev/null
+++ b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/alphaair
@@ -0,0 +1,44 @@
+/*--------------------------------*- 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;
+    object      alphaair;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 0 0 0 0 0 0];
+
+internalField   uniform 0.25;
+
+boundaryField
+{
+    rotor
+    {
+        type            zeroGradient;
+    }
+
+    stator
+    {
+        type            zeroGradient;
+    }
+
+    front
+    {
+        type            empty;
+    }
+
+    back
+    {
+        type            empty;
+    }
+}
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/alphamercury b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/alphamercury
new file mode 100644
index 0000000000..f444c16775
--- /dev/null
+++ b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/alphamercury
@@ -0,0 +1,44 @@
+/*--------------------------------*- 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;
+    object      alphamercury;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 0 0 0 0 0 0];
+
+internalField   uniform 0.25;
+
+boundaryField
+{
+    rotor
+    {
+        type            zeroGradient;
+    }
+
+    stator
+    {
+        type            zeroGradient;
+    }
+
+    front
+    {
+        type            empty;
+    }
+
+    back
+    {
+        type            empty;
+    }
+}
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/alphaoil b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/alphaoil
new file mode 100644
index 0000000000..73fe2520c9
--- /dev/null
+++ b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/alphaoil
@@ -0,0 +1,44 @@
+/*--------------------------------*- 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;
+    object      alphaoil;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 0 0 0 0 0 0];
+
+internalField   uniform 0.25;
+
+boundaryField
+{
+    rotor
+    {
+        type            zeroGradient;
+    }
+
+    stator
+    {
+        type            zeroGradient;
+    }
+
+    front
+    {
+        type            empty;
+    }
+
+    back
+    {
+        type            empty;
+    }
+}
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/alphas b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/alphas
new file mode 100644
index 0000000000..ed12f62ed6
--- /dev/null
+++ b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/alphas
@@ -0,0 +1,43 @@
+/*--------------------------------*- 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      alphas;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 0 0 0 0 0 0];
+
+internalField   uniform 1.5;
+
+boundaryField
+{
+    rotor
+    {
+        type            zeroGradient;
+    }
+    stator
+    {
+        type            zeroGradient;
+    }
+    front
+    {
+        type            empty;
+    }
+    back
+    {
+        type            empty;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/alphawater b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/alphawater
new file mode 100644
index 0000000000..25b317fcff
--- /dev/null
+++ b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/alphawater
@@ -0,0 +1,44 @@
+/*--------------------------------*- 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;
+    object      alphawater;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 0 0 0 0 0 0];
+
+internalField   uniform 0.25;
+
+boundaryField
+{
+    rotor
+    {
+        type            zeroGradient;
+    }
+
+    stator
+    {
+        type            zeroGradient;
+    }
+
+    front
+    {
+        type            empty;
+    }
+
+    back
+    {
+        type            empty;
+    }
+}
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/epsilon b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/epsilon
new file mode 100644
index 0000000000..3f507afed8
--- /dev/null
+++ b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/epsilon
@@ -0,0 +1,48 @@
+/*--------------------------------*- 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      epsilon;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [ 0 2 -3 0 0 0 0 ];
+
+internalField   uniform 20;
+
+boundaryField
+{
+    rotor
+    {
+        type            zeroGradient;
+        value           uniform 20;
+    }
+
+    stator
+    {
+        type            zeroGradient;
+        value           uniform 20;
+    }
+
+    front
+    {
+        type            empty;
+    }
+
+    back
+    {
+        type            empty;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/k b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/k
new file mode 100644
index 0000000000..4704b49c83
--- /dev/null
+++ b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/k
@@ -0,0 +1,48 @@
+/*--------------------------------*- 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      k;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [ 0 2 -2 0 0 0 0 ];
+
+internalField   uniform 0;
+
+boundaryField
+{
+    rotor
+    {
+        type            zeroGradient;
+        value           uniform 0;
+    }
+
+    stator
+    {
+        type            zeroGradient;
+        value           uniform 0;
+    }
+
+    front
+    {
+        type            empty;
+    }
+
+    back
+    {
+        type            empty;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/p b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/p
new file mode 100644
index 0000000000..75717ab275
--- /dev/null
+++ b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/p
@@ -0,0 +1,46 @@
+/*--------------------------------*- 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;
+    object      p;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [1 -1 -2 0 0 0 0];
+
+internalField   uniform 0;
+
+boundaryField
+{
+    rotor
+    {
+        type            multiphaseFixedFluxPressure;
+        value           $internalField;
+    }
+
+    stator
+    {
+        type            multiphaseFixedFluxPressure;
+        value           $internalField;
+    }
+
+    front
+    {
+        type            empty;
+    }
+
+    back
+    {
+        type            empty;
+    }
+}
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/Allrun b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/Allrun
new file mode 100755
index 0000000000..a718eaf7e6
--- /dev/null
+++ b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/Allrun
@@ -0,0 +1,12 @@
+#!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
+
+# Source tutorial run functions
+. $WM_PROJECT_DIR/bin/tools/RunFunctions
+
+application=`getApplication`
+
+runApplication ./makeMesh
+runApplication $application
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/constant/LESProperties b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/constant/LESProperties
new file mode 100644
index 0000000000..ec20bc01dc
--- /dev/null
+++ b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/constant/LESProperties
@@ -0,0 +1,29 @@
+/*--------------------------------*- 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      LESProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+LESModel        laminar;
+
+printCoeffs     on;
+
+delta           cubeRootVol;
+
+cubeRootVolCoeffs
+{
+    deltaCoeff      1;
+}
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/constant/MRFZones b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/constant/MRFZones
new file mode 100644
index 0000000000..25c3311d0b
--- /dev/null
+++ b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/constant/MRFZones
@@ -0,0 +1,31 @@
+/*--------------------------------*- 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      MRFZones;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+1
+(
+    rotor
+    {
+        // Fixed patches (by default they 'move' with the MRF zone)
+        nonRotatingPatches ();
+
+        origin    origin [0 1 0 0 0 0 0]  (0 0 0);
+        axis      axis   [0 0 0 0 0 0 0]  (0 0 1);
+        omega     omega  [0 0 -1 0 0 0 0] 10.472;
+    }
+)
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/constant/g b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/constant/g
new file mode 100644
index 0000000000..508d658494
--- /dev/null
+++ b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/constant/g
@@ -0,0 +1,22 @@
+/*--------------------------------*- 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       uniformDimensionedVectorField;
+    location    "constant";
+    object      g;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 1 -2 0 0 0 0];
+value           (0 0 0);
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/constant/interfacialProperties b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/constant/interfacialProperties
new file mode 100644
index 0000000000..41159fe9de
--- /dev/null
+++ b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/constant/interfacialProperties
@@ -0,0 +1,30 @@
+/*--------------------------------*- 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      interfacialProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dragModel1          SchillerNaumann;
+dragModel2          SchillerNaumann;
+
+heatTransferModel1  RanzMarshall;
+heatTransferModel2  RanzMarshall;
+
+dispersedPhase      both;
+dragPhase           blended;
+
+residualSlip        1e-2;
+minInterfaceAlpha   1e-3;
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/constant/polyMesh/blockMeshDict.m4 b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/constant/polyMesh/blockMeshDict.m4
new file mode 100644
index 0000000000..a93868498b
--- /dev/null
+++ b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/constant/polyMesh/blockMeshDict.m4
@@ -0,0 +1,818 @@
+/*--------------------------------*- 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;
+    object      blockMeshDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// General macros to create 2D/extruded-2D meshes
+
+changecom(//)changequote([,])
+define(calc, [esyscmd(perl -e 'print ($1)')])
+define(VCOUNT, 0)
+define(vlabel, [[// ]Vertex $1 = VCOUNT define($1, VCOUNT)define([VCOUNT], incr(VCOUNT))])
+define(pi, 3.14159265)
+
+define(hex2D, hex ($1b $2b $3b $4b $1t $2t $3t $4t))
+define(quad2D, ($1b $2b $2t $1t))
+define(frontQuad, ($1t $2t $3t $4t))
+define(backQuad, ($1b $4b $3b $2b))
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+convertToMeters 0.1;
+
+// Hub radius
+define(r, 0.2)
+
+// Impeller-tip radius
+define(rb, 0.5)
+
+// Baffle-tip radius
+define(Rb, 0.7)
+
+// Tank radius
+define(R, 1)
+
+// MRF region radius
+define(ri, calc(0.5*(rb + Rb)))
+
+// Thickness of 2D slab
+define(z, 0.1)
+
+// Base z
+define(Zb, 0)
+
+// Top z
+define(Zt, calc(Zb + z))
+
+// Number of cells radially between hub and impeller tip
+define(Nr, 12)
+
+// Number of cells radially in each of the two regions between
+// impeller and baffle tips
+define(Ni, 4)
+
+// Number of cells radially between baffle tip and tank
+define(NR, 12)
+
+// Number of cells azimuthally in each of the 8 blocks
+define(Na, 12)
+
+// Number of cells in the thickness of the slab
+define(Nz, 1)
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+define(vert, (x$1$2 y$1$2 $3))
+define(evert, (ex$1$2 ey$1$2 $3))
+
+define(a0, 0)
+define(a1, -45)
+define(a2, -90)
+define(a3, -135)
+define(a4, 180)
+define(a5, 135)
+define(a6, 90)
+define(a7, 45)
+
+define(ea0, -22.5)
+define(ea1, -67.5)
+define(ea2, -112.5)
+define(ea3, -157.5)
+define(ea4, 157.5)
+define(ea5, 112.5)
+define(ea6, 67.5)
+define(ea7, 22.5)
+
+define(ca0, calc(cos((pi/180)*a0)))
+define(ca1, calc(cos((pi/180)*a1)))
+define(ca2, calc(cos((pi/180)*a2)))
+define(ca3, calc(cos((pi/180)*a3)))
+define(ca4, calc(cos((pi/180)*a4)))
+define(ca5, calc(cos((pi/180)*a5)))
+define(ca6, calc(cos((pi/180)*a6)))
+define(ca7, calc(cos((pi/180)*a7)))
+
+define(sa0, calc(sin((pi/180)*a0)))
+define(sa1, calc(sin((pi/180)*a1)))
+define(sa2, calc(sin((pi/180)*a2)))
+define(sa3, calc(sin((pi/180)*a3)))
+define(sa4, calc(sin((pi/180)*a4)))
+define(sa5, calc(sin((pi/180)*a5)))
+define(sa6, calc(sin((pi/180)*a6)))
+define(sa7, calc(sin((pi/180)*a7)))
+
+define(cea0, calc(cos((pi/180)*ea0)))
+define(cea1, calc(cos((pi/180)*ea1)))
+define(cea2, calc(cos((pi/180)*ea2)))
+define(cea3, calc(cos((pi/180)*ea3)))
+define(cea4, calc(cos((pi/180)*ea4)))
+define(cea5, calc(cos((pi/180)*ea5)))
+define(cea6, calc(cos((pi/180)*ea6)))
+define(cea7, calc(cos((pi/180)*ea7)))
+
+define(sea0, calc(sin((pi/180)*ea0)))
+define(sea1, calc(sin((pi/180)*ea1)))
+define(sea2, calc(sin((pi/180)*ea2)))
+define(sea3, calc(sin((pi/180)*ea3)))
+define(sea4, calc(sin((pi/180)*ea4)))
+define(sea5, calc(sin((pi/180)*ea5)))
+define(sea6, calc(sin((pi/180)*ea6)))
+define(sea7, calc(sin((pi/180)*ea7)))
+
+define(x00, calc(r*ca0))
+define(x01, calc(r*ca1))
+define(x02, calc(r*ca2))
+define(x03, calc(r*ca3))
+define(x04, calc(r*ca4))
+define(x05, calc(r*ca5))
+define(x06, calc(r*ca6))
+define(x07, calc(r*ca7))
+
+define(x10, calc(rb*ca0))
+define(x11, calc(rb*ca1))
+define(x12, calc(rb*ca2))
+define(x13, calc(rb*ca3))
+define(x14, calc(rb*ca4))
+define(x15, calc(rb*ca5))
+define(x16, calc(rb*ca6))
+define(x17, calc(rb*ca7))
+
+define(x20, calc(ri*ca0))
+define(x21, calc(ri*ca1))
+define(x22, calc(ri*ca2))
+define(x23, calc(ri*ca3))
+define(x24, calc(ri*ca4))
+define(x25, calc(ri*ca5))
+define(x26, calc(ri*ca6))
+define(x27, calc(ri*ca7))
+
+define(x30, calc(Rb*ca0))
+define(x31, calc(Rb*ca1))
+define(x32, calc(Rb*ca2))
+define(x33, calc(Rb*ca3))
+define(x34, calc(Rb*ca4))
+define(x35, calc(Rb*ca5))
+define(x36, calc(Rb*ca6))
+define(x37, calc(Rb*ca7))
+
+define(x40, calc(R*ca0))
+define(x41, calc(R*ca1))
+define(x42, calc(R*ca2))
+define(x43, calc(R*ca3))
+define(x44, calc(R*ca4))
+define(x45, calc(R*ca5))
+define(x46, calc(R*ca6))
+define(x47, calc(R*ca7))
+
+define(y00, calc(r*sa0))
+define(y01, calc(r*sa1))
+define(y02, calc(r*sa2))
+define(y03, calc(r*sa3))
+define(y04, calc(r*sa4))
+define(y05, calc(r*sa5))
+define(y06, calc(r*sa6))
+define(y07, calc(r*sa7))
+
+define(y10, calc(rb*sa0))
+define(y11, calc(rb*sa1))
+define(y12, calc(rb*sa2))
+define(y13, calc(rb*sa3))
+define(y14, calc(rb*sa4))
+define(y15, calc(rb*sa5))
+define(y16, calc(rb*sa6))
+define(y17, calc(rb*sa7))
+
+define(y20, calc(ri*sa0))
+define(y21, calc(ri*sa1))
+define(y22, calc(ri*sa2))
+define(y23, calc(ri*sa3))
+define(y24, calc(ri*sa4))
+define(y25, calc(ri*sa5))
+define(y26, calc(ri*sa6))
+define(y27, calc(ri*sa7))
+
+define(y30, calc(Rb*sa0))
+define(y31, calc(Rb*sa1))
+define(y32, calc(Rb*sa2))
+define(y33, calc(Rb*sa3))
+define(y34, calc(Rb*sa4))
+define(y35, calc(Rb*sa5))
+define(y36, calc(Rb*sa6))
+define(y37, calc(Rb*sa7))
+
+define(y40, calc(R*sa0))
+define(y41, calc(R*sa1))
+define(y42, calc(R*sa2))
+define(y43, calc(R*sa3))
+define(y44, calc(R*sa4))
+define(y45, calc(R*sa5))
+define(y46, calc(R*sa6))
+define(y47, calc(R*sa7))
+
+define(ex00, calc(r*cea0))
+define(ex01, calc(r*cea1))
+define(ex02, calc(r*cea2))
+define(ex03, calc(r*cea3))
+define(ex04, calc(r*cea4))
+define(ex05, calc(r*cea5))
+define(ex06, calc(r*cea6))
+define(ex07, calc(r*cea7))
+
+define(ex10, calc(rb*cea0))
+define(ex11, calc(rb*cea1))
+define(ex12, calc(rb*cea2))
+define(ex13, calc(rb*cea3))
+define(ex14, calc(rb*cea4))
+define(ex15, calc(rb*cea5))
+define(ex16, calc(rb*cea6))
+define(ex17, calc(rb*cea7))
+
+define(ex20, calc(ri*cea0))
+define(ex21, calc(ri*cea1))
+define(ex22, calc(ri*cea2))
+define(ex23, calc(ri*cea3))
+define(ex24, calc(ri*cea4))
+define(ex25, calc(ri*cea5))
+define(ex26, calc(ri*cea6))
+define(ex27, calc(ri*cea7))
+
+define(ex30, calc(Rb*cea0))
+define(ex31, calc(Rb*cea1))
+define(ex32, calc(Rb*cea2))
+define(ex33, calc(Rb*cea3))
+define(ex34, calc(Rb*cea4))
+define(ex35, calc(Rb*cea5))
+define(ex36, calc(Rb*cea6))
+define(ex37, calc(Rb*cea7))
+
+define(ex40, calc(R*cea0))
+define(ex41, calc(R*cea1))
+define(ex42, calc(R*cea2))
+define(ex43, calc(R*cea3))
+define(ex44, calc(R*cea4))
+define(ex45, calc(R*cea5))
+define(ex46, calc(R*cea6))
+define(ex47, calc(R*cea7))
+
+define(ey00, calc(r*sea0))
+define(ey01, calc(r*sea1))
+define(ey02, calc(r*sea2))
+define(ey03, calc(r*sea3))
+define(ey04, calc(r*sea4))
+define(ey05, calc(r*sea5))
+define(ey06, calc(r*sea6))
+define(ey07, calc(r*sea7))
+
+define(ey10, calc(rb*sea0))
+define(ey11, calc(rb*sea1))
+define(ey12, calc(rb*sea2))
+define(ey13, calc(rb*sea3))
+define(ey14, calc(rb*sea4))
+define(ey15, calc(rb*sea5))
+define(ey16, calc(rb*sea6))
+define(ey17, calc(rb*sea7))
+
+define(ey20, calc(ri*sea0))
+define(ey21, calc(ri*sea1))
+define(ey22, calc(ri*sea2))
+define(ey23, calc(ri*sea3))
+define(ey24, calc(ri*sea4))
+define(ey25, calc(ri*sea5))
+define(ey26, calc(ri*sea6))
+define(ey27, calc(ri*sea7))
+
+define(ey30, calc(Rb*sea0))
+define(ey31, calc(Rb*sea1))
+define(ey32, calc(Rb*sea2))
+define(ey33, calc(Rb*sea3))
+define(ey34, calc(Rb*sea4))
+define(ey35, calc(Rb*sea5))
+define(ey36, calc(Rb*sea6))
+define(ey37, calc(Rb*sea7))
+
+define(ey40, calc(R*sea0))
+define(ey41, calc(R*sea1))
+define(ey42, calc(R*sea2))
+define(ey43, calc(R*sea3))
+define(ey44, calc(R*sea4))
+define(ey45, calc(R*sea5))
+define(ey46, calc(R*sea6))
+define(ey47, calc(R*sea7))
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+vertices
+(
+    vert(0, 0, Zb) vlabel(r0b)
+    vert(0, 0, Zb) vlabel(r0sb)
+    vert(0, 1, Zb) vlabel(r1b)
+    vert(0, 2, Zb) vlabel(r2b)
+    vert(0, 2, Zb) vlabel(r2sb)
+    vert(0, 3, Zb) vlabel(r3b)
+    vert(0, 4, Zb) vlabel(r4b)
+    vert(0, 4, Zb) vlabel(r4sb)
+    vert(0, 5, Zb) vlabel(r5b)
+    vert(0, 6, Zb) vlabel(r6b)
+    vert(0, 6, Zb) vlabel(r6sb)
+    vert(0, 7, Zb) vlabel(r7b)
+
+    vert(1, 0, Zb) vlabel(rb0b)
+    vert(1, 1, Zb) vlabel(rb1b)
+    vert(1, 2, Zb) vlabel(rb2b)
+    vert(1, 3, Zb) vlabel(rb3b)
+    vert(1, 4, Zb) vlabel(rb4b)
+    vert(1, 5, Zb) vlabel(rb5b)
+    vert(1, 6, Zb) vlabel(rb6b)
+    vert(1, 7, Zb) vlabel(rb7b)
+
+    vert(2, 0, Zb) vlabel(ri0b)
+    vert(2, 1, Zb) vlabel(ri1b)
+    vert(2, 2, Zb) vlabel(ri2b)
+    vert(2, 3, Zb) vlabel(ri3b)
+    vert(2, 4, Zb) vlabel(ri4b)
+    vert(2, 5, Zb) vlabel(ri5b)
+    vert(2, 6, Zb) vlabel(ri6b)
+    vert(2, 7, Zb) vlabel(ri7b)
+
+    vert(3, 0, Zb) vlabel(Rb0b)
+    vert(3, 1, Zb) vlabel(Rb1b)
+    vert(3, 2, Zb) vlabel(Rb2b)
+    vert(3, 3, Zb) vlabel(Rb3b)
+    vert(3, 4, Zb) vlabel(Rb4b)
+    vert(3, 5, Zb) vlabel(Rb5b)
+    vert(3, 6, Zb) vlabel(Rb6b)
+    vert(3, 7, Zb) vlabel(Rb7b)
+
+    vert(4, 0, Zb) vlabel(R0b)
+    vert(4, 1, Zb) vlabel(R1b)
+    vert(4, 1, Zb) vlabel(R1sb)
+    vert(4, 2, Zb) vlabel(R2b)
+    vert(4, 3, Zb) vlabel(R3b)
+    vert(4, 3, Zb) vlabel(R3sb)
+    vert(4, 4, Zb) vlabel(R4b)
+    vert(4, 5, Zb) vlabel(R5b)
+    vert(4, 5, Zb) vlabel(R5sb)
+    vert(4, 6, Zb) vlabel(R6b)
+    vert(4, 7, Zb) vlabel(R7b)
+    vert(4, 7, Zb) vlabel(R7sb)
+
+    vert(0, 0, Zt) vlabel(r0t)
+    vert(0, 0, Zt) vlabel(r0st)
+    vert(0, 1, Zt) vlabel(r1t)
+    vert(0, 2, Zt) vlabel(r2t)
+    vert(0, 2, Zt) vlabel(r2st)
+    vert(0, 3, Zt) vlabel(r3t)
+    vert(0, 4, Zt) vlabel(r4t)
+    vert(0, 4, Zt) vlabel(r4st)
+    vert(0, 5, Zt) vlabel(r5t)
+    vert(0, 6, Zt) vlabel(r6t)
+    vert(0, 6, Zt) vlabel(r6st)
+    vert(0, 7, Zt) vlabel(r7t)
+
+    vert(1, 0, Zt) vlabel(rb0t)
+    vert(1, 1, Zt) vlabel(rb1t)
+    vert(1, 2, Zt) vlabel(rb2t)
+    vert(1, 3, Zt) vlabel(rb3t)
+    vert(1, 4, Zt) vlabel(rb4t)
+    vert(1, 5, Zt) vlabel(rb5t)
+    vert(1, 6, Zt) vlabel(rb6t)
+    vert(1, 7, Zt) vlabel(rb7t)
+
+    vert(2, 0, Zt) vlabel(ri0t)
+    vert(2, 1, Zt) vlabel(ri1t)
+    vert(2, 2, Zt) vlabel(ri2t)
+    vert(2, 3, Zt) vlabel(ri3t)
+    vert(2, 4, Zt) vlabel(ri4t)
+    vert(2, 5, Zt) vlabel(ri5t)
+    vert(2, 6, Zt) vlabel(ri6t)
+    vert(2, 7, Zt) vlabel(ri7t)
+
+    vert(3, 0, Zt) vlabel(Rb0t)
+    vert(3, 1, Zt) vlabel(Rb1t)
+    vert(3, 2, Zt) vlabel(Rb2t)
+    vert(3, 3, Zt) vlabel(Rb3t)
+    vert(3, 4, Zt) vlabel(Rb4t)
+    vert(3, 5, Zt) vlabel(Rb5t)
+    vert(3, 6, Zt) vlabel(Rb6t)
+    vert(3, 7, Zt) vlabel(Rb7t)
+
+    vert(4, 0, Zt) vlabel(R0t)
+    vert(4, 1, Zt) vlabel(R1t)
+    vert(4, 1, Zt) vlabel(R1st)
+    vert(4, 2, Zt) vlabel(R2t)
+    vert(4, 3, Zt) vlabel(R3t)
+    vert(4, 3, Zt) vlabel(R3st)
+    vert(4, 4, Zt) vlabel(R4t)
+    vert(4, 5, Zt) vlabel(R5t)
+    vert(4, 5, Zt) vlabel(R5st)
+    vert(4, 6, Zt) vlabel(R6t)
+    vert(4, 7, Zt) vlabel(R7t)
+    vert(4, 7, Zt) vlabel(R7st)
+);
+
+blocks
+(
+    // block0
+    hex2D(r0, r1, rb1, rb0)
+    rotor
+    (Na Nr Nz)
+    simpleGrading (1 1 1)
+
+    // block1
+    hex2D(r1, r2s, rb2, rb1)
+    rotor
+    (Na Nr Nz)
+    simpleGrading (1 1 1)
+
+    // block2
+    hex2D(r2, r3, rb3, rb2)
+    rotor
+    (Na Nr Nz)
+    simpleGrading (1 1 1)
+
+    // block3
+    hex2D(r3, r4s, rb4, rb3)
+    rotor
+    (Na Nr Nz)
+    simpleGrading (1 1 1)
+
+    // block4
+    hex2D(r4, r5, rb5, rb4)
+    rotor
+    (Na Nr Nz)
+    simpleGrading (1 1 1)
+
+    // block5
+    hex2D(r5, r6s, rb6, rb5)
+    rotor
+    (Na Nr Nz)
+    simpleGrading (1 1 1)
+
+    // block6
+    hex2D(r6, r7, rb7, rb6)
+    rotor
+    (Na Nr Nz)
+    simpleGrading (1 1 1)
+
+    // block7
+    hex2D(r7, r0s, rb0, rb7)
+    rotor
+    (Na Nr Nz)
+    simpleGrading (1 1 1)
+
+    // block0
+    hex2D(rb0, rb1, ri1, ri0)
+    rotor
+    (Na Ni Nz)
+    simpleGrading (1 1 1)
+
+    // block1
+    hex2D(rb1, rb2, ri2, ri1)
+    rotor
+    (Na Ni Nz)
+    simpleGrading (1 1 1)
+
+    // block2
+    hex2D(rb2, rb3, ri3, ri2)
+    rotor
+    (Na Ni Nz)
+    simpleGrading (1 1 1)
+
+    // block3
+    hex2D(rb3, rb4, ri4, ri3)
+    rotor
+    (Na Ni Nz)
+    simpleGrading (1 1 1)
+
+    // block4
+    hex2D(rb4, rb5, ri5, ri4)
+    rotor
+    (Na Ni Nz)
+    simpleGrading (1 1 1)
+
+    // block5
+    hex2D(rb5, rb6, ri6, ri5)
+    rotor
+    (Na Ni Nz)
+    simpleGrading (1 1 1)
+
+    // block6
+    hex2D(rb6, rb7, ri7, ri6)
+    rotor
+    (Na Ni Nz)
+    simpleGrading (1 1 1)
+
+    // block7
+    hex2D(rb7, rb0, ri0, ri7)
+    rotor
+    (Na Ni Nz)
+    simpleGrading (1 1 1)
+
+    // block0
+    hex2D(ri0, ri1, Rb1, Rb0)
+    (Na Ni Nz)
+    simpleGrading (1 1 1)
+
+    // block1
+    hex2D(ri1, ri2, Rb2, Rb1)
+    (Na Ni Nz)
+    simpleGrading (1 1 1)
+
+    // block2
+    hex2D(ri2, ri3, Rb3, Rb2)
+    (Na Ni Nz)
+    simpleGrading (1 1 1)
+
+    // block3
+    hex2D(ri3, ri4, Rb4, Rb3)
+    (Na Ni Nz)
+    simpleGrading (1 1 1)
+
+    // block4
+    hex2D(ri4, ri5, Rb5, Rb4)
+    (Na Ni Nz)
+    simpleGrading (1 1 1)
+
+    // block5
+    hex2D(ri5, ri6, Rb6, Rb5)
+    (Na Ni Nz)
+    simpleGrading (1 1 1)
+
+    // block6
+    hex2D(ri6, ri7, Rb7, Rb6)
+    (Na Ni Nz)
+    simpleGrading (1 1 1)
+
+    // block7
+    hex2D(ri7, ri0, Rb0, Rb7)
+    (Na Ni Nz)
+    simpleGrading (1 1 1)
+
+    // block0
+    hex2D(Rb0, Rb1, R1s, R0)
+    (Na NR Nz)
+    simpleGrading (1 1 1)
+
+    // block1
+    hex2D(Rb1, Rb2, R2, R1)
+    (Na NR Nz)
+    simpleGrading (1 1 1)
+
+    // block2
+    hex2D(Rb2, Rb3, R3s, R2)
+    (Na NR Nz)
+    simpleGrading (1 1 1)
+
+    // block3
+    hex2D(Rb3, Rb4, R4, R3)
+    (Na NR Nz)
+    simpleGrading (1 1 1)
+
+    // block4
+    hex2D(Rb4, Rb5, R5s, R4)
+    (Na NR Nz)
+    simpleGrading (1 1 1)
+
+    // block5
+    hex2D(Rb5, Rb6, R6, R5)
+    (Na NR Nz)
+    simpleGrading (1 1 1)
+
+    // block6
+    hex2D(Rb6, Rb7, R7s, R6)
+    (Na NR Nz)
+    simpleGrading (1 1 1)
+
+    // block7
+    hex2D(Rb7, Rb0, R0, R7)
+    (Na NR Nz)
+    simpleGrading (1 1 1)
+);
+
+edges
+(
+    arc r0b r1b evert(0, 0, Zb)
+    arc r1b r2sb evert(0, 1, Zb)
+    arc r2b r3b evert(0, 2, Zb)
+    arc r3b r4sb evert(0, 3, Zb)
+    arc r4b r5b evert(0, 4, Zb)
+    arc r5b r6sb evert(0, 5, Zb)
+    arc r6b r7b evert(0, 6, Zb)
+    arc r7b r0sb evert(0, 7, Zb)
+
+    arc rb0b rb1b evert(1, 0, Zb)
+    arc rb1b rb2b evert(1, 1, Zb)
+    arc rb2b rb3b evert(1, 2, Zb)
+    arc rb3b rb4b evert(1, 3, Zb)
+    arc rb4b rb5b evert(1, 4, Zb)
+    arc rb5b rb6b evert(1, 5, Zb)
+    arc rb6b rb7b evert(1, 6, Zb)
+    arc rb7b rb0b evert(1, 7, Zb)
+
+    arc ri0b ri1b evert(2, 0, Zb)
+    arc ri1b ri2b evert(2, 1, Zb)
+    arc ri2b ri3b evert(2, 2, Zb)
+    arc ri3b ri4b evert(2, 3, Zb)
+    arc ri4b ri5b evert(2, 4, Zb)
+    arc ri5b ri6b evert(2, 5, Zb)
+    arc ri6b ri7b evert(2, 6, Zb)
+    arc ri7b ri0b evert(2, 7, Zb)
+
+    arc Rb0b Rb1b evert(3, 0, Zb)
+    arc Rb1b Rb2b evert(3, 1, Zb)
+    arc Rb2b Rb3b evert(3, 2, Zb)
+    arc Rb3b Rb4b evert(3, 3, Zb)
+    arc Rb4b Rb5b evert(3, 4, Zb)
+    arc Rb5b Rb6b evert(3, 5, Zb)
+    arc Rb6b Rb7b evert(3, 6, Zb)
+    arc Rb7b Rb0b evert(3, 7, Zb)
+
+    arc R0b R1sb evert(4, 0, Zb)
+    arc R1b R2b evert(4, 1, Zb)
+    arc R2b R3sb evert(4, 2, Zb)
+    arc R3b R4b evert(4, 3, Zb)
+    arc R4b R5sb evert(4, 4, Zb)
+    arc R5b R6b evert(4, 5, Zb)
+    arc R6b R7sb evert(4, 6, Zb)
+    arc R7b R0b evert(4, 7, Zb)
+
+    arc r0t r1t evert(0, 0, Zt)
+    arc r1t r2st evert(0, 1, Zt)
+    arc r2t r3t evert(0, 2, Zt)
+    arc r3t r4st evert(0, 3, Zt)
+    arc r4t r5t evert(0, 4, Zt)
+    arc r5t r6st evert(0, 5, Zt)
+    arc r6t r7t evert(0, 6, Zt)
+    arc r7t r0st evert(0, 7, Zt)
+
+    arc rb0t rb1t evert(1, 0, Zt)
+    arc rb1t rb2t evert(1, 1, Zt)
+    arc rb2t rb3t evert(1, 2, Zt)
+    arc rb3t rb4t evert(1, 3, Zt)
+    arc rb4t rb5t evert(1, 4, Zt)
+    arc rb5t rb6t evert(1, 5, Zt)
+    arc rb6t rb7t evert(1, 6, Zt)
+    arc rb7t rb0t evert(1, 7, Zt)
+
+    arc ri0t ri1t evert(2, 0, Zt)
+    arc ri1t ri2t evert(2, 1, Zt)
+    arc ri2t ri3t evert(2, 2, Zt)
+    arc ri3t ri4t evert(2, 3, Zt)
+    arc ri4t ri5t evert(2, 4, Zt)
+    arc ri5t ri6t evert(2, 5, Zt)
+    arc ri6t ri7t evert(2, 6, Zt)
+    arc ri7t ri0t evert(2, 7, Zt)
+
+    arc Rb0t Rb1t evert(3, 0, Zt)
+    arc Rb1t Rb2t evert(3, 1, Zt)
+    arc Rb2t Rb3t evert(3, 2, Zt)
+    arc Rb3t Rb4t evert(3, 3, Zt)
+    arc Rb4t Rb5t evert(3, 4, Zt)
+    arc Rb5t Rb6t evert(3, 5, Zt)
+    arc Rb6t Rb7t evert(3, 6, Zt)
+    arc Rb7t Rb0t evert(3, 7, Zt)
+
+    arc R0t R1st evert(4, 0, Zt)
+    arc R1t R2t evert(4, 1, Zt)
+    arc R2t R3st evert(4, 2, Zt)
+    arc R3t R4t evert(4, 3, Zt)
+    arc R4t R5st evert(4, 4, Zt)
+    arc R5t R6t evert(4, 5, Zt)
+    arc R6t R7st evert(4, 6, Zt)
+    arc R7t R0t evert(4, 7, Zt)
+);
+
+patches
+(
+    wall rotor
+    (
+        quad2D(r0, r1)
+        quad2D(r1, r2s)
+        quad2D(r2, r3)
+        quad2D(r3, r4s)
+        quad2D(r4, r5)
+        quad2D(r5, r6s)
+        quad2D(r6, r7)
+        quad2D(r7, r0s)
+
+        quad2D(r0, rb0)
+        quad2D(r0s, rb0)
+
+        quad2D(r2, rb2)
+        quad2D(r2s, rb2)
+
+        quad2D(r4, rb4)
+        quad2D(r4s, rb4)
+
+        quad2D(r6, rb6)
+        quad2D(r6s, rb6)
+    )
+
+    wall stator
+    (
+        quad2D(R0, R1s)
+        quad2D(R1, R2)
+        quad2D(R2, R3s)
+        quad2D(R3, R4)
+        quad2D(R4, R5s)
+        quad2D(R5, R6)
+        quad2D(R6, R7s)
+        quad2D(R7, R0)
+
+        quad2D(R1, Rb1)
+        quad2D(R1s, Rb1)
+
+        quad2D(R3, Rb3)
+        quad2D(R3s, Rb3)
+
+        quad2D(R5, Rb5)
+        quad2D(R5s, Rb5)
+
+        quad2D(R7, Rb7)
+        quad2D(R7s, Rb7)
+    )
+
+    empty front
+    (
+        frontQuad(r0, r1, rb1, rb0)
+        frontQuad(r1, r2s, rb2, rb1)
+        frontQuad(r2, r3, rb3, rb2)
+        frontQuad(r3, r4s, rb4, rb3)
+        frontQuad(r4, r5, rb5, rb4)
+        frontQuad(r5, r6s, rb6, rb5)
+        frontQuad(r6, r7, rb7, rb6)
+        frontQuad(r7, r0s, rb0, rb7)
+        frontQuad(rb0, rb1, ri1, ri0)
+        frontQuad(rb1, rb2, ri2, ri1)
+        frontQuad(rb2, rb3, ri3, ri2)
+        frontQuad(rb3, rb4, ri4, ri3)
+        frontQuad(rb4, rb5, ri5, ri4)
+        frontQuad(rb5, rb6, ri6, ri5)
+        frontQuad(rb6, rb7, ri7, ri6)
+        frontQuad(rb7, rb0, ri0, ri7)
+        frontQuad(ri0, ri1, Rb1, Rb0)
+        frontQuad(ri1, ri2, Rb2, Rb1)
+        frontQuad(ri2, ri3, Rb3, Rb2)
+        frontQuad(ri3, ri4, Rb4, Rb3)
+        frontQuad(ri4, ri5, Rb5, Rb4)
+        frontQuad(ri5, ri6, Rb6, Rb5)
+        frontQuad(ri6, ri7, Rb7, Rb6)
+        frontQuad(ri7, ri0, Rb0, Rb7)
+        frontQuad(Rb0, Rb1, R1s, R0)
+        frontQuad(Rb1, Rb2, R2, R1)
+        frontQuad(Rb2, Rb3, R3s, R2)
+        frontQuad(Rb3, Rb4, R4, R3)
+        frontQuad(Rb4, Rb5, R5s, R4)
+        frontQuad(Rb5, Rb6, R6, R5)
+        frontQuad(Rb6, Rb7, R7s, R6)
+        frontQuad(Rb7, Rb0, R0, R7)
+    )
+
+    empty back
+    (
+        backQuad(r0, r1, rb1, rb0)
+        backQuad(r1, r2s, rb2, rb1)
+        backQuad(r2, r3, rb3, rb2)
+        backQuad(r3, r4s, rb4, rb3)
+        backQuad(r4, r5, rb5, rb4)
+        backQuad(r5, r6s, rb6, rb5)
+        backQuad(r6, r7, rb7, rb6)
+        backQuad(r7, r0s, rb0, rb7)
+        backQuad(rb0, rb1, ri1, ri0)
+        backQuad(rb1, rb2, ri2, ri1)
+        backQuad(rb2, rb3, ri3, ri2)
+        backQuad(rb3, rb4, ri4, ri3)
+        backQuad(rb4, rb5, ri5, ri4)
+        backQuad(rb5, rb6, ri6, ri5)
+        backQuad(rb6, rb7, ri7, ri6)
+        backQuad(rb7, rb0, ri0, ri7)
+        backQuad(ri0, ri1, Rb1, Rb0)
+        backQuad(ri1, ri2, Rb2, Rb1)
+        backQuad(ri2, ri3, Rb3, Rb2)
+        backQuad(ri3, ri4, Rb4, Rb3)
+        backQuad(ri4, ri5, Rb5, Rb4)
+        backQuad(ri5, ri6, Rb6, Rb5)
+        backQuad(ri6, ri7, Rb7, Rb6)
+        backQuad(ri7, ri0, Rb0, Rb7)
+        backQuad(Rb0, Rb1, R1s, R0)
+        backQuad(Rb1, Rb2, R2, R1)
+        backQuad(Rb2, Rb3, R3s, R2)
+        backQuad(Rb3, Rb4, R4, R3)
+        backQuad(Rb4, Rb5, R5s, R4)
+        backQuad(Rb5, Rb6, R6, R5)
+        backQuad(Rb6, Rb7, R7s, R6)
+        backQuad(Rb7, Rb0, R0, R7)
+    )
+);
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/constant/polyMesh/boundary b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/constant/polyMesh/boundary
new file mode 100644
index 0000000000..292f25b806
--- /dev/null
+++ b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/constant/polyMesh/boundary
@@ -0,0 +1,46 @@
+/*--------------------------------*- 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
+(
+    rotor
+    {
+        type            wall;
+        nFaces          192;
+        startFace       5952;
+    }
+    stator
+    {
+        type            wall;
+        nFaces          192;
+        startFace       6144;
+    }
+    front
+    {
+        type            empty;
+        nFaces          3072;
+        startFace       6336;
+    }
+    back
+    {
+        type            empty;
+        nFaces          3072;
+        startFace       9408;
+    }
+)
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/constant/transportProperties b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/constant/transportProperties
new file mode 100644
index 0000000000..5cefec5d5a
--- /dev/null
+++ b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/constant/transportProperties
@@ -0,0 +1,248 @@
+/*--------------------------------*- 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;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+phases
+(
+     water
+     {
+         nu         1e-06;
+         kappa      1e-06;
+         Cp         4195;
+         rho        1000;
+
+         diameterModel constant;
+         constantCoeffs
+         {
+             d               1e-3;
+         }
+     }
+
+     oil
+     {
+         nu         1e-06;
+         kappa      1e-06;
+         Cp         4195;
+         rho        500;
+
+         diameterModel constant;
+         constantCoeffs
+         {
+             d               1e-3;
+         }
+     }
+
+     mercury
+     {
+         nu         1.125e-07;
+         kappa      1e-06;
+         Cp         4195;
+         rho        13529;
+
+         diameterModel constant;
+         constantCoeffs
+         {
+             d               1e-3;
+         }
+     }
+
+     air
+     {
+         nu         1.48e-05;
+         kappa      2.63e-2;
+         Cp         1007;
+         rho        1;
+
+         diameterModel constant;
+         constantCoeffs
+         {
+             d              3e-3;
+         }
+     }
+);
+
+sigmas
+(
+    (air water)     0.07
+    (air oil)       0.07
+    (air mercury)   0.07
+    (water oil)     0
+    (water mercury) 0
+    (oil mercury)   0
+);
+
+interfaceCompression
+(
+    (air water)     0
+    (air oil)       0
+    (air mercury)   0
+    (water oil)     0
+    (water mercury) 0
+    (oil mercury)   0
+);
+
+virtualMass
+(
+    (air water)     0.5
+    (air oil)       0.5
+    (air mercury)   0.5
+    (water oil)     0.5
+    (water mercury) 0.5
+    (oil mercury)   0.5
+);
+
+drag
+(
+    (air water)
+    {
+        type blended;
+
+        air
+        {
+            type SchillerNaumann;
+            residualPhaseFraction 0;
+            residualSlip 0;
+        }
+
+        water
+        {
+            type SchillerNaumann;
+            residualPhaseFraction 0;
+            residualSlip 0;
+        }
+
+        residualPhaseFraction 1e-2;
+        residualSlip 1e-2;
+    }
+
+    (air oil)
+    {
+        type blended;
+
+        air
+        {
+            type SchillerNaumann;
+            residualPhaseFraction 0;
+            residualSlip 0;
+        }
+
+        oil
+        {
+            type SchillerNaumann;
+            residualPhaseFraction 0;
+            residualSlip 0;
+        }
+
+        residualPhaseFraction 1e-2;
+        residualSlip 1e-2;
+    }
+
+    (air mercury)
+    {
+        type blended;
+
+        air
+        {
+            type SchillerNaumann;
+            residualPhaseFraction 0;
+            residualSlip 0;
+        }
+
+        mercury
+        {
+            type SchillerNaumann;
+            residualPhaseFraction 0;
+            residualSlip 0;
+        }
+
+        residualPhaseFraction 1e-2;
+        residualSlip 1e-2;
+    }
+
+    (water oil)
+    {
+        type blended;
+
+        water
+        {
+            type SchillerNaumann;
+            residualPhaseFraction 0;
+            residualSlip 0;
+        }
+
+        oil
+        {
+            type SchillerNaumann;
+            residualPhaseFraction 0;
+            residualSlip 0;
+        }
+
+        residualPhaseFraction 1e-2;
+        residualSlip 1e-2;
+    }
+
+    (water mercury)
+    {
+        type blended;
+
+        water
+        {
+            type SchillerNaumann;
+            residualPhaseFraction 0;
+            residualSlip 0;
+        }
+
+        mercury
+        {
+            type SchillerNaumann;
+            residualPhaseFraction 0;
+            residualSlip 0;
+        }
+
+        residualPhaseFraction 1e-2;
+        residualSlip 1e-2;
+    }
+
+    (oil mercury)
+    {
+        type blended;
+
+        oil
+        {
+            type SchillerNaumann;
+            residualPhaseFraction 0;
+            residualSlip 0;
+        }
+
+        mercury
+        {
+            type SchillerNaumann;
+            residualPhaseFraction 0;
+            residualSlip 0;
+        }
+
+        residualPhaseFraction 1e-2;
+        residualSlip 1e-2;
+    }
+);
+
+
+// This is a dummy to support the Smagorinsky model
+transportModel  Newtonian;
+nu              nu [ 0 2 -1 0 0 0 0 ] 0;
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/makeMesh b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/makeMesh
new file mode 100755
index 0000000000..8ef4993fde
--- /dev/null
+++ b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/makeMesh
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+m4 < constant/polyMesh/blockMeshDict.m4 > constant/polyMesh/blockMeshDict
+blockMesh
+topoSet
+setsToZones -noFlipMap
diff --git a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/system/controlDict b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/system/controlDict
new file mode 100644
index 0000000000..189a9ea087
--- /dev/null
+++ b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/system/controlDict
@@ -0,0 +1,55 @@
+/*--------------------------------*- 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    "system";
+    object      controlDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+application     multiphaseEulerFoam;
+
+startFrom       latestTime;
+
+startTime       0;
+
+stopAt          endTime;
+
+endTime         20;
+
+deltaT          1e-4;
+
+writeControl    adjustableRunTime;
+
+writeInterval   0.1;
+
+purgeWrite      0;
+
+writeFormat     ascii;
+
+writePrecision  6;
+
+writeCompression uncompressed;
+
+timeFormat      general;
+
+timePrecision   6;
+
+runTimeModifiable yes;
+
+adjustTimeStep  yes;
+
+maxCo           0.5;
+
+maxDeltaT       1;
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/system/fvSchemes b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/system/fvSchemes
new file mode 100644
index 0000000000..5a4bb79d96
--- /dev/null
+++ b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/system/fvSchemes
@@ -0,0 +1,61 @@
+/*--------------------------------*- 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    "system";
+    object      fvSchemes;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+ddtSchemes
+{
+    default         Euler;
+}
+
+gradSchemes
+{
+    default         Gauss linear;
+}
+
+divSchemes
+{
+    "div\(phi,alpha.*\)"    Gauss vanLeer;
+    "div\(phir,alpha.*,alpha.*\)"   Gauss vanLeer;
+
+    "div\(phiAlpha.*,U.*\)" Gauss limitedLinearV 1;
+    div(Rc)                 Gauss linear;
+    "div\(phi.*,U.*\)"      Gauss limitedLinearV 1;
+}
+
+laplacianSchemes
+{
+    default         Gauss linear corrected;
+}
+
+interpolationSchemes
+{
+    default         linear;
+}
+
+snGradSchemes
+{
+    default         corrected;
+}
+
+fluxRequired
+{
+    default         no;
+    p;
+    pcorr;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/system/fvSolution b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/system/fvSolution
new file mode 100644
index 0000000000..89fe68c6fb
--- /dev/null
+++ b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/system/fvSolution
@@ -0,0 +1,97 @@
+/*--------------------------------*- 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    "system";
+    object      fvSolution;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+solvers
+{
+    p
+    {
+        solver          GAMG;
+        tolerance       1e-7;
+        relTol          0.01;
+        smoother        GaussSeidel;
+        nPreSweeps      0;
+        nPostSweeps     2;
+        nFinestSweeps   2;
+        cacheAgglomeration on;
+        nCellsInCoarsestLevel 10;
+        agglomerator    faceAreaPair;
+        mergeLevels     1;
+    }
+
+    pFinal
+    {
+        solver          PCG;
+        preconditioner
+        {
+            preconditioner  GAMG;
+            tolerance       1e-7;
+            relTol          0;
+            nVcycles        2;
+            smoother        GaussSeidel;
+            nPreSweeps      0;
+            nPostSweeps     2;
+            nFinestSweeps   2;
+            cacheAgglomeration on;
+            nCellsInCoarsestLevel 10;
+            agglomerator    faceAreaPair;
+            mergeLevels     1;
+        }
+        tolerance       1e-7;
+        relTol          0;
+        maxIter         30;
+    }
+
+    pcorr
+    {
+        $pFinal;
+        tolerance       1e-5;
+        relTol          0;
+    }
+
+    U
+    {
+        solver          smoothSolver;
+        smoother        GaussSeidel;
+        tolerance       1e-8;
+        relTol          0.1;
+        nSweeps         1;
+    }
+
+    UFinal
+    {
+        $U;
+        tolerance       1e-7;
+        relTol          0;
+    }
+}
+
+PIMPLE
+{
+    nOuterCorrectors     1;
+    nCorrectors     3;
+    nNonOrthogonalCorrectors 0;
+    nAlphaSubCycles 2;
+    pRefCell        0;
+    pRefValue       0;
+}
+
+relaxationFactors
+{
+    "U.*"           1;
+}
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/system/topoSetDict b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/system/topoSetDict
new file mode 100644
index 0000000000..bf749449bf
--- /dev/null
+++ b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/system/topoSetDict
@@ -0,0 +1,32 @@
+/*--------------------------------*- 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    "system";
+    object      topoSetDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+actions
+(
+    {
+        name    rotor;
+        type    cellSet;
+        action  new;
+        source  zoneToCell;
+        sourceInfo
+        {
+            name rotor;
+        }
+    }
+);
+
+// ************************************************************************* //

From d318bf6f5bf13398eab7bb274d21ed4e6773fe79 Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Wed, 21 Mar 2012 17:31:31 +0000
Subject: [PATCH 077/317] twoPhaseEulerFoam/bed2/0/alpha1.org: initial alpha1
 field

---
 .../twoPhaseEulerFoam/bed2/0/alpha1.org       | 46 +++++++++++++++++++
 1 file changed, 46 insertions(+)
 create mode 100644 tutorials/multiphase/twoPhaseEulerFoam/bed2/0/alpha1.org

diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed2/0/alpha1.org b/tutorials/multiphase/twoPhaseEulerFoam/bed2/0/alpha1.org
new file mode 100644
index 0000000000..21a248c82e
--- /dev/null
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bed2/0/alpha1.org
@@ -0,0 +1,46 @@
+/*--------------------------------*- 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;
+    object      alpha1;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 0 0 0 0 0 0];
+
+internalField   uniform 0;
+
+boundaryField
+{
+    inlet
+    {
+        type            fixedValue;
+        value           uniform 0;
+    }
+
+    outlet
+    {
+        type            inletOutlet;
+        inletValue      uniform 0;
+    }
+
+    walls
+    {
+        type            zeroGradient;
+    }
+
+    frontAndBackPlanes
+    {
+        type            empty;
+    }
+}
+
+// ************************************************************************* //

From 503eefc3256b38986864e8e067de2b2a55473ff7 Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Wed, 21 Mar 2012 17:34:41 +0000
Subject: [PATCH 078/317] MRF: new function to add Coriolis contribution to the
 given field

---
 .../cfdTools/general/MRF/MRFZone.C            | 25 +++++++++++++++++++
 .../cfdTools/general/MRF/MRFZone.H            |  3 +++
 .../cfdTools/general/MRF/MRFZones.C           | 13 ++++++++++
 .../cfdTools/general/MRF/MRFZones.H           |  3 +++
 4 files changed, 44 insertions(+)

diff --git a/src/finiteVolume/cfdTools/general/MRF/MRFZone.C b/src/finiteVolume/cfdTools/general/MRF/MRFZone.C
index 4e3cd2354a..a909154ee1 100644
--- a/src/finiteVolume/cfdTools/general/MRF/MRFZone.C
+++ b/src/finiteVolume/cfdTools/general/MRF/MRFZone.C
@@ -292,6 +292,31 @@ Foam::MRFZone::MRFZone(const fvMesh& mesh, Istream& is)
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
+void Foam::MRFZone::addCoriolis
+(
+    const volVectorField& U,
+    volVectorField& ddtU
+) const
+{
+    if (cellZoneID_ == -1)
+    {
+        return;
+    }
+
+    const labelList& cells = mesh_.cellZones()[cellZoneID_];
+    const scalarField& V = mesh_.V();
+    vectorField& ddtUc = ddtU.internalField();
+    const vectorField& Uc = U.internalField();
+    const vector& Omega = Omega_.value();
+
+    forAll(cells, i)
+    {
+        label celli = cells[i];
+        ddtUc[celli] += V[celli]*(Omega ^ Uc[celli]);
+    }
+}
+
+
 void Foam::MRFZone::addCoriolis(fvVectorMatrix& UEqn) const
 {
     if (cellZoneID_ == -1)
diff --git a/src/finiteVolume/cfdTools/general/MRF/MRFZone.H b/src/finiteVolume/cfdTools/general/MRF/MRFZone.H
index c110eb4400..d9f2fa979a 100644
--- a/src/finiteVolume/cfdTools/general/MRF/MRFZone.H
+++ b/src/finiteVolume/cfdTools/general/MRF/MRFZone.H
@@ -166,6 +166,9 @@ public:
             setMRFFaces();
         }
 
+        //- Add the Coriolis force contribution to the acceleration field
+        void addCoriolis(const volVectorField& U, volVectorField& ddtU) const;
+
         //- Add the Coriolis force contribution to the momentum equation
         void addCoriolis(fvVectorMatrix& UEqn) const;
 
diff --git a/src/finiteVolume/cfdTools/general/MRF/MRFZones.C b/src/finiteVolume/cfdTools/general/MRF/MRFZones.C
index 52d26b3108..b915c9c65b 100644
--- a/src/finiteVolume/cfdTools/general/MRF/MRFZones.C
+++ b/src/finiteVolume/cfdTools/general/MRF/MRFZones.C
@@ -55,6 +55,19 @@ Foam::MRFZones::MRFZones(const fvMesh& mesh)
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
+void Foam::MRFZones::addCoriolis
+(
+    const volVectorField& U,
+    volVectorField& ddtU
+) const
+{
+    forAll(*this, i)
+    {
+        operator[](i).addCoriolis(U, ddtU);
+    }
+}
+
+
 void Foam::MRFZones::addCoriolis(fvVectorMatrix& UEqn) const
 {
     forAll(*this, i)
diff --git a/src/finiteVolume/cfdTools/general/MRF/MRFZones.H b/src/finiteVolume/cfdTools/general/MRF/MRFZones.H
index 139d45d256..db973dcc80 100644
--- a/src/finiteVolume/cfdTools/general/MRF/MRFZones.H
+++ b/src/finiteVolume/cfdTools/general/MRF/MRFZones.H
@@ -72,6 +72,9 @@ public:
 
     // Member Functions
 
+        //- Add the Coriolis force contribution to the acceleration field
+        void addCoriolis(const volVectorField& U, volVectorField& ddtU) const;
+
         //- Add the Coriolis force contribution to the momentum equation
         void addCoriolis(fvVectorMatrix& UEqn) const;
 

From 78522ae3c6d771804d6a3e82d6fa172f4035bea6 Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Wed, 21 Mar 2012 17:35:54 +0000
Subject: [PATCH 079/317] multiphase MRF solvers: added Coriolis contribution
 to the virtual-mass force

---
 .../solvers/multiphase/compressibleTwoPhaseEulerFoam/DDtU.H | 2 ++
 .../multiphase/compressibleTwoPhaseEulerFoam/UEqns.H        | 4 ++--
 applications/solvers/multiphase/multiphaseEulerFoam/DDtU.H  | 2 ++
 applications/solvers/multiphase/multiphaseEulerFoam/UEqns.H | 6 +++++-
 applications/solvers/multiphase/twoPhaseEulerFoam/DDtU.H    | 2 ++
 applications/solvers/multiphase/twoPhaseEulerFoam/UEqns.H   | 4 ++--
 src/finiteVolume/cfdTools/general/MRF/MRFZone.C             | 2 +-
 src/finiteVolume/cfdTools/general/MRF/MRFZone.H             | 2 +-
 src/finiteVolume/cfdTools/general/MRF/MRFZones.C            | 2 +-
 src/finiteVolume/cfdTools/general/MRF/MRFZones.H            | 2 +-
 10 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/DDtU.H b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/DDtU.H
index 96b6a63a43..1685caa588 100644
--- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/DDtU.H
+++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/DDtU.H
@@ -3,9 +3,11 @@
         fvc::ddt(U1)
       + fvc::div(phi1, U1)
       - fvc::div(phi1)*U1;
+    mrfZones.addCoriolis(U1, DDtU1);
 
     DDtU2 =
         fvc::ddt(U2)
       + fvc::div(phi2, U2)
       - fvc::div(phi2)*U2;
+    mrfZones.addCoriolis(U2, DDtU2);
 }
diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/UEqns.H b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/UEqns.H
index fe40ce2f49..5d61f0eaf7 100644
--- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/UEqns.H
+++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/UEqns.H
@@ -45,7 +45,7 @@ fvVectorMatrix U2Eqn(U2, U2.dimensions()*dimVol/dimTime);
           - fvm::Sp(dragCoeff/rho1, U1)
           - alpha1*alpha2/rho1*(liftForce - Cvm*rho2*DDtU2)
         );
-        mrfZones.addCoriolis(alpha1, U1Eqn);
+        mrfZones.addCoriolis(alpha1*(1 + Cvm*rho2*alpha2/rho1), U1Eqn);
         U1Eqn.relax();
     }
 
@@ -76,7 +76,7 @@ fvVectorMatrix U2Eqn(U2, U2.dimensions()*dimVol/dimTime);
           - fvm::Sp(dragCoeff/rho2, U2)
           + alpha1*alpha2/rho2*(liftForce + Cvm*rho2*DDtU1)
         );
-        mrfZones.addCoriolis(alpha2, U2Eqn);
+        mrfZones.addCoriolis(alpha2*(1 + Cvm*rho2*alpha1/rho2), U2Eqn);
         U2Eqn.relax();
     }
 }
diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/DDtU.H b/applications/solvers/multiphase/multiphaseEulerFoam/DDtU.H
index f0f5bad356..dc39b70863 100644
--- a/applications/solvers/multiphase/multiphaseEulerFoam/DDtU.H
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/DDtU.H
@@ -6,4 +6,6 @@ forAllIter(PtrDictionary<phaseModel>, fluid.phases(), iter)
         fvc::ddt(phase.U())
       + fvc::div(phase.phi(), phase.U())
       - fvc::div(phase.phi())*phase.U();
+
+    mrfZones.addCoriolis(phase.U(), phase.DDtU());
 }
diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/UEqns.H b/applications/solvers/multiphase/multiphaseEulerFoam/UEqns.H
index b612e6b5d9..d4b371915c 100644
--- a/applications/solvers/multiphase/multiphaseEulerFoam/UEqns.H
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/UEqns.H
@@ -49,7 +49,11 @@ forAllIter(PtrDictionary<phaseModel>, fluid.phases(), iter)
             )
         )
     );
-    mrfZones.addCoriolis(alpha, UEqns[phasei]);
+    mrfZones.addCoriolis
+    (
+        alpha*(1 + (1/phase.rho())*fluid.Cvm(phase)),
+        UEqns[phasei]
+    );
     UEqns[phasei].relax();
 
     phasei++;
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/DDtU.H b/applications/solvers/multiphase/twoPhaseEulerFoam/DDtU.H
index 96b6a63a43..1685caa588 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/DDtU.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/DDtU.H
@@ -3,9 +3,11 @@
         fvc::ddt(U1)
       + fvc::div(phi1, U1)
       - fvc::div(phi1)*U1;
+    mrfZones.addCoriolis(U1, DDtU1);
 
     DDtU2 =
         fvc::ddt(U2)
       + fvc::div(phi2, U2)
       - fvc::div(phi2)*U2;
+    mrfZones.addCoriolis(U2, DDtU2);
 }
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/UEqns.H b/applications/solvers/multiphase/twoPhaseEulerFoam/UEqns.H
index 0c0cc1543a..6fae832a21 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/UEqns.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/UEqns.H
@@ -53,7 +53,7 @@ fvVectorMatrix U2Eqn(U2, U2.dimensions()*dimVol/dimTime);
         //+ alpha2/rho1*K*U2           // Explicit drag transfered to p-equation
           - alpha2/rho1*(liftCoeff - Cvm*rho2*DDtU2)
         );
-        mrfZones.addCoriolis(U1Eqn);
+        mrfZones.addCoriolis(scalar(1) + Cvm*rho2*alpha2/rho1, U1Eqn);
         U1Eqn.relax();
     }
 
@@ -93,7 +93,7 @@ fvVectorMatrix U2Eqn(U2, U2.dimensions()*dimVol/dimTime);
         //+ alpha1/rho2*K*U1           // Explicit drag transfered to p-equation
           + alpha1/rho2*(liftCoeff + Cvm*rho2*DDtU1)
         );
-        mrfZones.addCoriolis(U2Eqn);
+        mrfZones.addCoriolis(scalar(1) + Cvm*rho2*alpha1/rho2, U2Eqn);
         U2Eqn.relax();
     }
 }
diff --git a/src/finiteVolume/cfdTools/general/MRF/MRFZone.C b/src/finiteVolume/cfdTools/general/MRF/MRFZone.C
index a909154ee1..d2f8caeb23 100644
--- a/src/finiteVolume/cfdTools/general/MRF/MRFZone.C
+++ b/src/finiteVolume/cfdTools/general/MRF/MRFZone.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/finiteVolume/cfdTools/general/MRF/MRFZone.H b/src/finiteVolume/cfdTools/general/MRF/MRFZone.H
index d9f2fa979a..0a4f21bf65 100644
--- a/src/finiteVolume/cfdTools/general/MRF/MRFZone.H
+++ b/src/finiteVolume/cfdTools/general/MRF/MRFZone.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/finiteVolume/cfdTools/general/MRF/MRFZones.C b/src/finiteVolume/cfdTools/general/MRF/MRFZones.C
index b915c9c65b..d1c961afec 100644
--- a/src/finiteVolume/cfdTools/general/MRF/MRFZones.C
+++ b/src/finiteVolume/cfdTools/general/MRF/MRFZones.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/finiteVolume/cfdTools/general/MRF/MRFZones.H b/src/finiteVolume/cfdTools/general/MRF/MRFZones.H
index db973dcc80..8df9d428be 100644
--- a/src/finiteVolume/cfdTools/general/MRF/MRFZones.H
+++ b/src/finiteVolume/cfdTools/general/MRF/MRFZones.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

From 674cffc9bab94949deaff4b460021277af5775d1 Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Wed, 21 Mar 2012 17:36:07 +0000
Subject: [PATCH 080/317] minor cleanup

---
 .../slidingInterface/slidingInterfaceProjectPoints.C       | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/src/dynamicMesh/slidingInterface/slidingInterfaceProjectPoints.C b/src/dynamicMesh/slidingInterface/slidingInterfaceProjectPoints.C
index 958fc4e09c..9f160b9a35 100644
--- a/src/dynamicMesh/slidingInterface/slidingInterfaceProjectPoints.C
+++ b/src/dynamicMesh/slidingInterface/slidingInterfaceProjectPoints.C
@@ -763,13 +763,6 @@ bool Foam::slidingInterface::projectPoints() const
     {
         const edge& curEdge = slaveEdges[edgeI];
 
-        //HJ: check for all edges even if both ends have missed
-        //    Experimental.
-//         if
-//         (
-//             slavePointFaceHits[curEdge.start()].hit()
-//          || slavePointFaceHits[curEdge.end()].hit()
-//         )
         {
             // Clear the maps
             curFaceMap.clear();

From b971f9257c0b8d9a7fb36ba7d2b62a122df21438 Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Wed, 21 Mar 2012 17:36:18 +0000
Subject: [PATCH 081/317] Updated header

---
 .../slidingInterface/slidingInterfaceProjectPoints.C            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/dynamicMesh/slidingInterface/slidingInterfaceProjectPoints.C b/src/dynamicMesh/slidingInterface/slidingInterfaceProjectPoints.C
index 9f160b9a35..fd8f913e1f 100644
--- a/src/dynamicMesh/slidingInterface/slidingInterfaceProjectPoints.C
+++ b/src/dynamicMesh/slidingInterface/slidingInterfaceProjectPoints.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

From 061511e3dee3a0452debbbb08224e3bf8acc092b Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Wed, 21 Mar 2012 17:36:42 +0000
Subject: [PATCH 082/317] compressibleTwoPhaseEulerFoam/pEqn.H: minor reformat

---
 .../compressibleTwoPhaseEulerFoam/pEqn.H           | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/pEqn.H b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/pEqn.H
index 1f1b308715..11f3d4ddb5 100644
--- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/pEqn.H
+++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/pEqn.H
@@ -122,16 +122,22 @@
             U1 = HbyA1
                + fvc::reconstruct
                  (
-                     rAlphaAU1f*(g & mesh.Sf())
-                   + rAlphaAU1f*mSfGradp/fvc::interpolate(rho1)
+                     rAlphaAU1f
+                    *(
+                         (g & mesh.Sf())
+                       + mSfGradp/fvc::interpolate(rho1)
+                     )
                  );
             U1.correctBoundaryConditions();
 
             U2 = HbyA2
                + fvc::reconstruct
                  (
-                     rAlphaAU2f*(g & mesh.Sf())
-                   + rAlphaAU2f*mSfGradp/fvc::interpolate(rho2)
+                     rAlphaAU2f
+                    *(
+                        (g & mesh.Sf())
+                      + mSfGradp/fvc::interpolate(rho2)
+                    )
                  );
             U2.correctBoundaryConditions();
 

From 89acb1900cf786a65c9d54741a04ea49b9936c9c Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Wed, 21 Mar 2012 17:37:37 +0000
Subject: [PATCH 083/317] Heat transfer BCs: changed messages to avoid
 confusion about heat-flux

---
 .../greyDiffusiveViewFactorFixedValueFvPatchScalarField.C     | 4 ++--
 .../radiationModels/radiationModel/viewFactor/viewFactor.C    | 4 ++--
 .../externalWallHeatFluxTemperatureFvPatchScalarField.C       | 2 +-
 ...turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/thermophysicalModels/radiationModels/derivedFvPatchFields/greyDiffusiveViewFactor/greyDiffusiveViewFactorFixedValueFvPatchScalarField.C b/src/thermophysicalModels/radiationModels/derivedFvPatchFields/greyDiffusiveViewFactor/greyDiffusiveViewFactorFixedValueFvPatchScalarField.C
index 77092be071..b048dbde0f 100644
--- a/src/thermophysicalModels/radiationModels/derivedFvPatchFields/greyDiffusiveViewFactor/greyDiffusiveViewFactorFixedValueFvPatchScalarField.C
+++ b/src/thermophysicalModels/radiationModels/derivedFvPatchFields/greyDiffusiveViewFactor/greyDiffusiveViewFactorFixedValueFvPatchScalarField.C
@@ -132,7 +132,7 @@ greyDiffusiveViewFactorFixedValueFvPatchScalarField
 void Foam::radiation::greyDiffusiveViewFactorFixedValueFvPatchScalarField::
 updateCoeffs()
 {
-    //Do nothing
+    // Do nothing
 
     if (debug)
     {
@@ -141,7 +141,7 @@ updateCoeffs()
         Info<< patch().boundaryMesh().mesh().name() << ':'
             << patch().name() << ':'
             << this->dimensionedInternalField().name() << " <- "
-            << " heat[W]:" << Q
+            << " heat transfer rate:" << Q
             << " wall radiative heat flux "
             << " min:" << gMin(*this)
             << " max:" << gMax(*this)
diff --git a/src/thermophysicalModels/radiationModels/radiationModel/viewFactor/viewFactor.C b/src/thermophysicalModels/radiationModels/radiationModel/viewFactor/viewFactor.C
index dab5973fba..86820d7ac7 100644
--- a/src/thermophysicalModels/radiationModels/radiationModel/viewFactor/viewFactor.C
+++ b/src/thermophysicalModels/radiationModels/radiationModel/viewFactor/viewFactor.C
@@ -590,9 +590,9 @@ void Foam::radiation::viewFactor::calculate()
             const scalarField& Qrp = Qr_.boundaryField()[patchID];
             const scalarField& magSf = mesh_.magSf().boundaryField()[patchID];
             scalar heatFlux = gSum(Qrp*magSf);
-            Info<< "Total heat flux at patch: "
+            Info<< "Total heat transfer rate at patch: "
                 << patchID << " "
-                << heatFlux << " [W]" << endl;
+                << heatFlux << endl;
         }
     }
 
diff --git a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.C b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.C
index d611c882ce..b52baebd36 100644
--- a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.C
+++ b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.C
@@ -244,7 +244,7 @@ void Foam::externalWallHeatFluxTemperatureFvPatchScalarField::updateCoeffs()
         Info<< patch().boundaryMesh().mesh().name() << ':'
             << patch().name() << ':'
             << this->dimensionedInternalField().name() << " :"
-            << " heatFlux:" << Q
+            << " heat transfer rate:" << Q
             << " walltemperature "
             << " min:" << gMin(*this)
             << " max:" << gMax(*this)
diff --git a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C
index ca9f52aaeb..74cc684fdd 100644
--- a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C
+++ b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C
@@ -227,7 +227,7 @@ void turbulentTemperatureCoupledBaffleMixedFvPatchScalarField::updateCoeffs()
             << nbrMesh.name() << ':'
             << nbrPatch.name() << ':'
             << this->dimensionedInternalField().name() << " :"
-            << " heat[W]:" << Q
+            << " heat transfer rate:" << Q
             << " walltemperature "
             << " min:" << gMin(*this)
             << " max:" << gMax(*this)

From 22fd47192f6f63bf819a8806b5c1541b690c02ff Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Wed, 21 Mar 2012 17:37:52 +0000
Subject: [PATCH 084/317] Updated headers

---
 .../greyDiffusiveViewFactorFixedValueFvPatchScalarField.C       | 2 +-
 .../radiationModels/radiationModel/viewFactor/viewFactor.C      | 2 +-
 .../turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/thermophysicalModels/radiationModels/derivedFvPatchFields/greyDiffusiveViewFactor/greyDiffusiveViewFactorFixedValueFvPatchScalarField.C b/src/thermophysicalModels/radiationModels/derivedFvPatchFields/greyDiffusiveViewFactor/greyDiffusiveViewFactorFixedValueFvPatchScalarField.C
index b048dbde0f..642d2aeee8 100644
--- a/src/thermophysicalModels/radiationModels/derivedFvPatchFields/greyDiffusiveViewFactor/greyDiffusiveViewFactorFixedValueFvPatchScalarField.C
+++ b/src/thermophysicalModels/radiationModels/derivedFvPatchFields/greyDiffusiveViewFactor/greyDiffusiveViewFactorFixedValueFvPatchScalarField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/thermophysicalModels/radiationModels/radiationModel/viewFactor/viewFactor.C b/src/thermophysicalModels/radiationModels/radiationModel/viewFactor/viewFactor.C
index 86820d7ac7..97f220b44f 100644
--- a/src/thermophysicalModels/radiationModels/radiationModel/viewFactor/viewFactor.C
+++ b/src/thermophysicalModels/radiationModels/radiationModel/viewFactor/viewFactor.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C
index 74cc684fdd..a61959a976 100644
--- a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C
+++ b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

From 97e659a5c6b98dc719764bf724f2e343cc630feb Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Wed, 21 Mar 2012 17:38:23 +0000
Subject: [PATCH 085/317] multiphaseEulerFoam/pEqn.H: Improved handling of
 negative alpha for the creation of Dp

---
 .../solvers/multiphase/multiphaseEulerFoam/pEqn.H      | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/pEqn.H b/applications/solvers/multiphase/multiphaseEulerFoam/pEqn.H
index 9c8c2d4f18..6dc67ce353 100644
--- a/applications/solvers/multiphase/multiphaseEulerFoam/pEqn.H
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/pEqn.H
@@ -159,11 +159,10 @@
     forAllIter(PtrDictionary<phaseModel>, fluid.phases(), iter)
     {
         phaseModel& phase = iter();
-        Dp += alphafs[phasei]*rAlphaAUfs[phasei]/phase.rho();
+        Dp += mag(alphafs[phasei]*rAlphaAUfs[phasei])/phase.rho();
 
         phasei++;
     }
-    Dp = mag(Dp);
 
     while (pimple.correctNonOrthogonal())
     {
@@ -173,6 +172,8 @@
           - fvm::laplacian(Dp, p)
         );
 
+        pEqnIncomp.setReference(pRefCell, pRefValue);
+
         solve
         (
             // (
@@ -196,7 +197,10 @@
                 phase.phi() =
                     phiHbyAs[phasei]
                   + rAlphaAUfs[phasei]*mSfGradp/phase.rho();
-                phi += alphafs[phasei]*phase.phi();
+                phi +=
+                    alphafs[phasei]*phiHbyAs[phasei]
+                  + mag(alphafs[phasei]*rAlphaAUfs[phasei])
+                   *mSfGradp/phase.rho();
 
                 phasei++;
             }

From 61a0fb168ae03c187e68e3de638ecd0597e08daa Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Wed, 21 Mar 2012 17:39:07 +0000
Subject: [PATCH 086/317] twoPhaseEulerFoam/pEqn.H: use cell-based drag in
 momentum corrector

---
 .../multiphase/twoPhaseEulerFoam/pEqn.H       |  53 ++++----
 .../multiphase/twoPhaseEulerFoam/pEqn.H.old   | 118 ++++++++++++++++++
 2 files changed, 142 insertions(+), 29 deletions(-)
 create mode 100644 applications/solvers/multiphase/twoPhaseEulerFoam/pEqn.H.old

diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/pEqn.H b/applications/solvers/multiphase/twoPhaseEulerFoam/pEqn.H
index 348cc847d7..9b543bcd25 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/pEqn.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/pEqn.H
@@ -5,8 +5,8 @@
     volScalarField rAU1(1.0/U1Eqn.A());
     volScalarField rAU2(1.0/U2Eqn.A());
 
-    rAU1f = fvc::interpolate(rAU1);
-    surfaceScalarField rAU2f(fvc::interpolate(rAU2));
+    rAU1f = 1.0/fvc::interpolate(U1Eqn.A());
+    surfaceScalarField rAU2f(1.0/fvc::interpolate(U2Eqn.A()));
 
     volVectorField HbyA1("HbyA1", U1);
     HbyA1 = rAU1*U1Eqn.H();
@@ -16,39 +16,19 @@
 
     mrfZones.absoluteFlux(phi1.oldTime());
     mrfZones.absoluteFlux(phi1);
-
     mrfZones.absoluteFlux(phi2.oldTime());
     mrfZones.absoluteFlux(phi2);
 
-    surfaceScalarField phiDrag1
-    (
-        fvc::interpolate(alpha2/rho1*K*rAU1)*phi2 + rAU1f*(g & mesh.Sf())
-    );
+    surfaceScalarField ppDrag("ppDrag", 0.0*phi1);
 
     if (g0.value() > 0.0)
     {
-        phiDrag1 -= ppMagf*fvc::snGrad(alpha1)*mesh.magSf();
+        ppDrag -= ppMagf*fvc::snGrad(alpha1)*mesh.magSf();
     }
 
     if (kineticTheory.on())
     {
-        phiDrag1 -= rAU1f*fvc::snGrad(kineticTheory.pa()/rho1)*mesh.magSf();
-    }
-
-
-    surfaceScalarField phiDrag2
-    (
-        fvc::interpolate(alpha1/rho2*K*rAU2)*phi1 + rAU2f*(g & mesh.Sf())
-    );
-
-    // Fix for gravity on outlet boundary.
-    forAll(p.boundaryField(), patchi)
-    {
-        if (isA<zeroGradientFvPatchScalarField>(p.boundaryField()[patchi]))
-        {
-            phiDrag1.boundaryField()[patchi] = 0.0;
-            phiDrag2.boundaryField()[patchi] = 0.0;
-        }
+        ppDrag -= rAU1f*fvc::snGrad(kineticTheory.pa()/rho1)*mesh.magSf();
     }
 
     surfaceScalarField phiHbyA1
@@ -56,7 +36,9 @@
         "phiHbyA1",
         (fvc::interpolate(HbyA1) & mesh.Sf())
       + fvc::ddtPhiCorr(rAU1, U1, phi1)
-      + phiDrag1
+      + fvc::interpolate(alpha2/rho1*K*rAU1)*phi2
+      + ppDrag
+      + rAU1f*(g & mesh.Sf())
     );
     mrfZones.relativeFlux(phiHbyA1);
 
@@ -65,7 +47,8 @@
         "phiHbyA2",
         (fvc::interpolate(HbyA2) & mesh.Sf())
       + fvc::ddtPhiCorr(rAU2, U2, phi2)
-      + phiDrag2
+      + fvc::interpolate(alpha1/rho2*K*rAU2)*phi1
+      + rAU2f*(g & mesh.Sf())
     );
     mrfZones.relativeFlux(phiHbyA2);
 
@@ -76,6 +59,9 @@
 
     surfaceScalarField phiHbyA("phiHbyA", alpha1f*phiHbyA1 + alpha2f*phiHbyA2);
 
+    HbyA1 += alpha2*(1.0/rho1)*rAU1*K*U2;
+    HbyA2 += alpha1*(1.0/rho2)*rAU2*K*U1;
+
     surfaceScalarField Dp
     (
         "Dp",
@@ -104,10 +90,19 @@
             p.relax();
             SfGradp = pEqn.flux()/Dp;
 
-            U1 = HbyA1 + fvc::reconstruct(phiDrag1 - rAU1f*SfGradp/rho1);
+            U1 = HbyA1
+               + fvc::reconstruct
+                 (
+                     ppDrag
+                   + rAU1f*((g & mesh.Sf()) - SfGradp/rho1)
+                 );
             U1.correctBoundaryConditions();
 
-            U2 = HbyA2 + fvc::reconstruct(phiDrag2 - rAU2f*SfGradp/rho2);
+            U2 = HbyA2
+               + fvc::reconstruct
+                 (
+                     rAU2f*((g & mesh.Sf()) - SfGradp/rho2)
+                 );
             U2.correctBoundaryConditions();
 
             U = alpha1*U1 + alpha2*U2;
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/pEqn.H.old b/applications/solvers/multiphase/twoPhaseEulerFoam/pEqn.H.old
new file mode 100644
index 0000000000..348cc847d7
--- /dev/null
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/pEqn.H.old
@@ -0,0 +1,118 @@
+{
+    surfaceScalarField alpha1f(fvc::interpolate(alpha1));
+    surfaceScalarField alpha2f(scalar(1) - alpha1f);
+
+    volScalarField rAU1(1.0/U1Eqn.A());
+    volScalarField rAU2(1.0/U2Eqn.A());
+
+    rAU1f = fvc::interpolate(rAU1);
+    surfaceScalarField rAU2f(fvc::interpolate(rAU2));
+
+    volVectorField HbyA1("HbyA1", U1);
+    HbyA1 = rAU1*U1Eqn.H();
+
+    volVectorField HbyA2("HbyA2", U2);
+    HbyA2 = rAU2*U2Eqn.H();
+
+    mrfZones.absoluteFlux(phi1.oldTime());
+    mrfZones.absoluteFlux(phi1);
+
+    mrfZones.absoluteFlux(phi2.oldTime());
+    mrfZones.absoluteFlux(phi2);
+
+    surfaceScalarField phiDrag1
+    (
+        fvc::interpolate(alpha2/rho1*K*rAU1)*phi2 + rAU1f*(g & mesh.Sf())
+    );
+
+    if (g0.value() > 0.0)
+    {
+        phiDrag1 -= ppMagf*fvc::snGrad(alpha1)*mesh.magSf();
+    }
+
+    if (kineticTheory.on())
+    {
+        phiDrag1 -= rAU1f*fvc::snGrad(kineticTheory.pa()/rho1)*mesh.magSf();
+    }
+
+
+    surfaceScalarField phiDrag2
+    (
+        fvc::interpolate(alpha1/rho2*K*rAU2)*phi1 + rAU2f*(g & mesh.Sf())
+    );
+
+    // Fix for gravity on outlet boundary.
+    forAll(p.boundaryField(), patchi)
+    {
+        if (isA<zeroGradientFvPatchScalarField>(p.boundaryField()[patchi]))
+        {
+            phiDrag1.boundaryField()[patchi] = 0.0;
+            phiDrag2.boundaryField()[patchi] = 0.0;
+        }
+    }
+
+    surfaceScalarField phiHbyA1
+    (
+        "phiHbyA1",
+        (fvc::interpolate(HbyA1) & mesh.Sf())
+      + fvc::ddtPhiCorr(rAU1, U1, phi1)
+      + phiDrag1
+    );
+    mrfZones.relativeFlux(phiHbyA1);
+
+    surfaceScalarField phiHbyA2
+    (
+        "phiHbyA2",
+        (fvc::interpolate(HbyA2) & mesh.Sf())
+      + fvc::ddtPhiCorr(rAU2, U2, phi2)
+      + phiDrag2
+    );
+    mrfZones.relativeFlux(phiHbyA2);
+
+    mrfZones.relativeFlux(phi1.oldTime());
+    mrfZones.relativeFlux(phi1);
+    mrfZones.relativeFlux(phi2.oldTime());
+    mrfZones.relativeFlux(phi2);
+
+    surfaceScalarField phiHbyA("phiHbyA", alpha1f*phiHbyA1 + alpha2f*phiHbyA2);
+
+    surfaceScalarField Dp
+    (
+        "Dp",
+        alpha1f*rAU1f/rho1 + alpha2f*rAU2f/rho2
+    );
+
+    while (pimple.correctNonOrthogonal())
+    {
+        fvScalarMatrix pEqn
+        (
+            fvm::laplacian(Dp, p) == fvc::div(phiHbyA)
+        );
+
+        pEqn.setReference(pRefCell, pRefValue);
+
+        pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter())));
+
+        if (pimple.finalNonOrthogonalIter())
+        {
+            surfaceScalarField SfGradp(pEqn.flux()/Dp);
+
+            phi1 = phiHbyA1 - rAU1f*SfGradp/rho1;
+            phi2 = phiHbyA2 - rAU2f*SfGradp/rho2;
+            phi = alpha1f*phi1 + alpha2f*phi2;
+
+            p.relax();
+            SfGradp = pEqn.flux()/Dp;
+
+            U1 = HbyA1 + fvc::reconstruct(phiDrag1 - rAU1f*SfGradp/rho1);
+            U1.correctBoundaryConditions();
+
+            U2 = HbyA2 + fvc::reconstruct(phiDrag2 - rAU2f*SfGradp/rho2);
+            U2.correctBoundaryConditions();
+
+            U = alpha1*U1 + alpha2*U2;
+        }
+    }
+}
+
+#include "continuityErrs.H"

From 97ffec39cc01bd16371be03e489ea48be0d632dd Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Wed, 21 Mar 2012 17:39:26 +0000
Subject: [PATCH 087/317] woPhaseEulerFoam/bed2: Correct BCs

---
 tutorials/multiphase/twoPhaseEulerFoam/bed2/0/alpha1 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed2/0/alpha1 b/tutorials/multiphase/twoPhaseEulerFoam/bed2/0/alpha1
index 0efa9947df..488a51bf18 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/bed2/0/alpha1
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bed2/0/alpha1
@@ -6030,7 +6030,8 @@ boundaryField
     }
     outlet
     {
-        type            zeroGradient;
+        type            inletOutlet;
+        inletValue      uniform 0;
     }
     inlet
     {

From dd3b4452c7b3d7ed5bd7d607294b2628afb29c45 Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Wed, 21 Mar 2012 17:43:59 +0000
Subject: [PATCH 088/317] twoPhaseEulerFoam/mixerVessel2D tutorial: make
 laminar and clean-up

---
 .../mixerVessel2D/0/k                         |  6 ++---
 .../mixerVessel2D/constant/RASProperties      |  2 +-
 .../twoPhaseEulerFoam/mixerVessel2D/0/p       |  2 +-
 .../constant/transportProperties              | 23 +------------------
 4 files changed, 6 insertions(+), 27 deletions(-)

diff --git a/tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/0/k b/tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/0/k
index b8c3e8cc99..4704b49c83 100644
--- a/tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/0/k
+++ b/tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/0/k
@@ -17,20 +17,20 @@ FoamFile
 
 dimensions      [ 0 2 -2 0 0 0 0 ];
 
-internalField   uniform 0.1;
+internalField   uniform 0;
 
 boundaryField
 {
     rotor
     {
         type            zeroGradient;
-        value           uniform 0.1;
+        value           uniform 0;
     }
 
     stator
     {
         type            zeroGradient;
-        value           uniform 0.1;
+        value           uniform 0;
     }
 
     front
diff --git a/tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/constant/RASProperties b/tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/constant/RASProperties
index a4937b503a..41b54318fe 100644
--- a/tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/constant/RASProperties
+++ b/tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/constant/RASProperties
@@ -17,7 +17,7 @@ FoamFile
 
 RASModel        kEpsilon;
 
-turbulence      on;
+turbulence      off;
 
 printCoeffs     on;
 
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/mixerVessel2D/0/p b/tutorials/multiphase/twoPhaseEulerFoam/mixerVessel2D/0/p
index 9c4de0da51..75717ab275 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/mixerVessel2D/0/p
+++ b/tutorials/multiphase/twoPhaseEulerFoam/mixerVessel2D/0/p
@@ -16,7 +16,7 @@ FoamFile
 
 dimensions      [1 -1 -2 0 0 0 0];
 
-internalField   uniform 1e5;
+internalField   uniform 0;
 
 boundaryField
 {
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/mixerVessel2D/constant/transportProperties b/tutorials/multiphase/twoPhaseEulerFoam/mixerVessel2D/constant/transportProperties
index 9ea9ed2189..98c39c54c1 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/mixerVessel2D/constant/transportProperties
+++ b/tutorials/multiphase/twoPhaseEulerFoam/mixerVessel2D/constant/transportProperties
@@ -17,37 +17,16 @@ FoamFile
 
 phase1
 {
-    rho0            0;
     rho             0.88;
-    R               287;
-    Cp              1007;
     nu              2.46e-05;
-    d               4e-3;
-
-    kappa           2.63e-2;
-    diameterModel   isothermal;
-    isothermalCoeffs
-    {
-        d0              3e-3;
-        p0              1e5;
-    }
+    d               3e-3;
 }
 
 phase2
 {
     rho             733;
-    rho0            733;
-    R               1e10;
-    Cp              4195;
     nu              2.73e-6;
     d               1e-4;
-
-    kappa           0.668;
-    diameterModel constant;
-    constantCoeffs
-    {
-        d               1e-4;
-    }
 }
 
 // Virtual-mass ceofficient

From 405ed91b21a9306e2ffe2f5f40d62bdfa607c72d Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Thu, 22 Mar 2012 09:49:47 +0000
Subject: [PATCH 089/317] rhoCentralFoam: corrected reading of Pr

---
 .../rhoCentralFoam/readThermophysicalProperties.H     | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/applications/solvers/compressible/rhoCentralFoam/readThermophysicalProperties.H b/applications/solvers/compressible/rhoCentralFoam/readThermophysicalProperties.H
index f9e309ffec..e0b16f0f39 100644
--- a/applications/solvers/compressible/rhoCentralFoam/readThermophysicalProperties.H
+++ b/applications/solvers/compressible/rhoCentralFoam/readThermophysicalProperties.H
@@ -16,11 +16,8 @@ IOdictionary thermophysicalProperties
 
 dimensionedScalar Pr
 (
-    dimensionedScalar::lookupOrDefault
-    (
-        "Pr",
-        thermophysicalProperties,
-        1.0
-    )
+    "Pr",
+    dimless,
+    thermophysicalProperties.subDict("mixture").subDict("transport")
+   .lookup("Pr")
 );
-

From ce3fdbece731785c952b31c3b5fcc660e53e93fd Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Thu, 22 Mar 2012 10:39:57 +0000
Subject: [PATCH 090/317] ENH: blob: demonstrate adding extrusion through
 snappyHexMesh

---
 tutorials/mesh/cvMesh/blob/Allrun             |   6 +-
 tutorials/mesh/cvMesh/blob/system/cvMeshDict  |  12 +-
 .../mesh/cvMesh/blob/system/snappyHexMeshDict | 357 ++++++++++++++++++
 3 files changed, 370 insertions(+), 5 deletions(-)
 create mode 100644 tutorials/mesh/cvMesh/blob/system/snappyHexMeshDict

diff --git a/tutorials/mesh/cvMesh/blob/Allrun b/tutorials/mesh/cvMesh/blob/Allrun
index 9ca0b5a48f..1812d8e273 100755
--- a/tutorials/mesh/cvMesh/blob/Allrun
+++ b/tutorials/mesh/cvMesh/blob/Allrun
@@ -5,7 +5,9 @@ cd ${0%/*} || exit 1    # run from this directory
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
 runApplication blockMesh
-runApplication cvMesh $nProc
-runApplication checkMesh $nProc -constant -allGeometry -allTopology
+runApplication cvMesh
+runApplication collapseEdges 1e-3 45
+runApplication snappyHexMesh
+runApplication checkMesh -constant -allGeometry -allTopology
 
 # ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/mesh/cvMesh/blob/system/cvMeshDict b/tutorials/mesh/cvMesh/blob/system/cvMeshDict
index 20997fe9ea..b92aa466de 100644
--- a/tutorials/mesh/cvMesh/blob/system/cvMeshDict
+++ b/tutorials/mesh/cvMesh/blob/system/cvMeshDict
@@ -85,7 +85,7 @@ surfaceConformation
 
     featureEdgeExclusionDistanceCoeff   0.2;
 
-    surfaceSearchDistanceCoeff  2.5;
+    surfaceSearchDistanceCoeff  5;
 
     maxSurfaceProtrusionCoeff   0.1;
 
@@ -97,7 +97,7 @@ surfaceConformation
     {
         initial
         {
-            edgeSearchDistCoeff             2;
+            edgeSearchDistCoeff             5;
             surfacePtReplaceDistCoeff       0.5;
             surfacePtExclusionDistanceCoeff 0.5;
         }
@@ -150,10 +150,16 @@ motionControl
         {
             priority            1;
             mode                bothSides;
+            surfaceCellSizeFunction uniformValue;
+            uniformValueCoeffs
+            {
+                surfaceCellSize 0.04;
+            }
+            refinementFactor    1;
+
             cellSizeFunction    uniformDistance;
             uniformDistanceCoeffs
             {
-                cellSize        0.04;
                 distance        0.1;
             }
             linearDistanceCoeffs
diff --git a/tutorials/mesh/cvMesh/blob/system/snappyHexMeshDict b/tutorials/mesh/cvMesh/blob/system/snappyHexMeshDict
new file mode 100644
index 0000000000..3ac70912b4
--- /dev/null
+++ b/tutorials/mesh/cvMesh/blob/system/snappyHexMeshDict
@@ -0,0 +1,357 @@
+/*--------------------------------*- 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;
+    object      snappyHexMeshDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// Which of the steps to run
+castellatedMesh false;
+snap            false;
+addLayers       true;
+
+
+// Geometry. Definition of all surfaces. All surfaces are of class
+// searchableSurface.
+// Surfaces are used
+// - to specify refinement for any mesh cell intersecting it
+// - to specify refinement for any mesh cell inside/outside/near
+// - to 'snap' the mesh boundary to the surface
+geometry
+{
+//    motorBike.obj
+//    {
+//        type triSurfaceMesh;
+//        name motorBike;
+//    }
+//
+//    refinementBox
+//    {
+//        type searchableBox;
+//        min (-1.0 -0.7 0.0);
+//        max ( 8.0  0.7 2.5);
+//    }
+};
+
+
+
+// Settings for the castellatedMesh generation.
+castellatedMeshControls
+{
+
+    // Refinement parameters
+    // ~~~~~~~~~~~~~~~~~~~~~
+
+    // If local number of cells is >= maxLocalCells on any processor
+    // switches from from refinement followed by balancing
+    // (current method) to (weighted) balancing before refinement.
+    maxLocalCells 100000;
+
+    // Overall cell limit (approximately). Refinement will stop immediately
+    // upon reaching this number so a refinement level might not complete.
+    // Note that this is the number of cells before removing the part which
+    // is not 'visible' from the keepPoint. The final number of cells might
+    // actually be a lot less.
+    maxGlobalCells 2000000;
+
+    // The surface refinement loop might spend lots of iterations refining just a
+    // few cells. This setting will cause refinement to stop if <= minimumRefine
+    // are selected for refinement. Note: it will at least do one iteration
+    // (unless the number of cells to refine is 0)
+    minRefinementCells 10;
+
+    // Allow a certain level of imbalance during refining
+    // (since balancing is quite expensive)
+    // Expressed as fraction of perfect balance (= overall number of cells /
+    // nProcs). 0=balance always.
+    maxLoadUnbalance 0.10;
+
+
+    // Number of buffer layers between different levels.
+    // 1 means normal 2:1 refinement restriction, larger means slower
+    // refinement.
+    nCellsBetweenLevels 3;
+
+
+
+    // Explicit feature edge refinement
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    // Specifies a level for any cell intersected by its edges.
+    // This is a featureEdgeMesh, read from constant/triSurface for now.
+    features
+    (
+        //{
+        //    file "someLine.eMesh";
+        //    level 2;
+        //}
+    );
+
+
+
+    // Surface based refinement
+    // ~~~~~~~~~~~~~~~~~~~~~~~~
+
+    // Specifies two levels for every surface. The first is the minimum level,
+    // every cell intersecting a surface gets refined up to the minimum level.
+    // The second level is the maximum level. Cells that 'see' multiple
+    // intersections where the intersections make an
+    // angle > resolveFeatureAngle get refined up to the maximum level.
+
+    refinementSurfaces
+    {
+//        motorBike
+//        {
+//            // Surface-wise min and max refinement level
+//            level (5 6);
+//
+//            // Optional specification of patch type (default is wall). No
+//            // constraint types (cyclic, symmetry) etc. are allowed.
+//            patchInfo
+//            {
+//                type wall;
+//                inGroups (motorBike);
+//            }
+//        }
+    }
+
+    // Resolve sharp angles
+    resolveFeatureAngle 30;
+
+
+    // Region-wise refinement
+    // ~~~~~~~~~~~~~~~~~~~~~~
+
+    // Specifies refinement level for cells in relation to a surface. One of
+    // three modes
+    // - distance. 'levels' specifies per distance to the surface the
+    //   wanted refinement level. The distances need to be specified in
+    //   descending order.
+    // - inside. 'levels' is only one entry and only the level is used. All
+    //   cells inside the surface get refined up to the level. The surface
+    //   needs to be closed for this to be possible.
+    // - outside. Same but cells outside.
+
+    refinementRegions
+    {
+//        refinementBox
+//        {
+//            mode inside;
+//            levels ((1E15 4));
+//        }
+    }
+
+
+    // Mesh selection
+    // ~~~~~~~~~~~~~~
+
+    // After refinement patches get added for all refinementSurfaces and
+    // all cells intersecting the surfaces get put into these patches. The
+    // section reachable from the locationInMesh is kept.
+    // NOTE: This point should never be on a face, always inside a cell, even
+    // after refinement.
+    locationInMesh (-1 0 0);
+
+
+    // Whether any faceZones (as specified in the refinementSurfaces)
+    // are only on the boundary of corresponding cellZones or also allow
+    // free-standing zone faces. Not used if there are no faceZones.
+    allowFreeStandingZoneFaces true;
+}
+
+
+
+// Settings for the snapping.
+snapControls
+{
+    //- Number of patch smoothing iterations before finding correspondence
+    //  to surface
+    nSmoothPatch 3;
+
+    //- Relative distance for points to be attracted by surface feature point
+    //  or edge. True distance is this factor times local
+    //  maximum edge length.
+    tolerance 4.0;
+
+    //- Number of mesh displacement relaxation iterations.
+    nSolveIter 0;
+
+    //- Maximum number of snapping relaxation iterations. Should stop
+    //  before upon reaching a correct mesh.
+    nRelaxIter 5;
+
+    //- Highly experimental and wip: number of feature edge snapping
+    //  iterations. Leave out altogether to disable.
+    //  Do not use here since mesh resolution too low and baffles present
+    //nFeatureSnapIter 10;
+}
+
+
+
+// Settings for the layer addition.
+addLayersControls
+{
+    // Are the thickness parameters below relative to the undistorted
+    // size of the refined cell outside layer (true) or absolute sizes (false).
+    relativeSizes false;
+
+    // Per final patch (so not geometry!) the layer information
+    layers
+    {
+        blob.stl_patch1
+        {
+            nSurfaceLayers 4;
+        }
+    }
+
+    // Expansion factor for layer mesh
+    expansionRatio 1.5;
+
+    //- Wanted thickness of final added cell layer. If multiple layers
+    //  is the
+    //  thickness of the layer furthest away from the wall.
+    //  Relative to undistorted size of cell outside layer.
+    //  is the thickness of the layer furthest away from the wall.
+    //  See relativeSizes parameter.
+    finalLayerThickness 0.02;
+
+    //- Minimum thickness of cell layer. If for any reason layer
+    //  cannot be above minThickness do not add layer.
+    //  Relative to undistorted size of cell outside layer.
+    minThickness 0.005;
+
+    //- If points get not extruded do nGrow layers of connected faces that are
+    //  also not grown. This helps convergence of the layer addition process
+    //  close to features.
+    // Note: changed(corrected) w.r.t 17x! (didn't do anything in 17x)
+    nGrow 0;
+
+    // Advanced settings
+
+    //- When not to extrude surface. 0 is flat surface, 90 is when two faces
+    //  make straight angle.
+    featureAngle 90;
+
+    //- Maximum number of snapping relaxation iterations. Should stop
+    //  before upon reaching a correct mesh.
+    nRelaxIter 3;
+
+    // Number of smoothing iterations of surface normals
+    nSmoothSurfaceNormals 1;
+
+    // Number of smoothing iterations of interior mesh movement direction
+    nSmoothNormals 3;
+
+    // Smooth layer thickness over surface patches
+    nSmoothThickness 10;
+
+    // Stop layer growth on highly warped cells
+    maxFaceThicknessRatio 1000;
+
+    // Reduce layer growth where ratio thickness to medial
+    // distance is large
+    maxThicknessToMedialRatio 0.3;
+
+    // Angle used to pick up medial axis points
+    // Note: changed(corrected) w.r.t 17x! 90 degrees corresponds to 130 in 17x.
+    minMedianAxisAngle 90;
+
+
+    // Create buffer region for new layer terminations
+    nBufferCellsNoExtrude 0;
+
+
+    // Overall max number of layer addition iterations. The mesher will exit
+    // if it reaches this number of iterations; possibly with an illegal
+    // mesh.
+    nLayerIter 50;
+}
+
+
+
+// Generic mesh quality settings. At any undoable phase these determine
+// where to undo.
+meshQualityControls
+{
+    //- Maximum non-orthogonality allowed. Set to 180 to disable.
+    maxNonOrtho 65;
+
+    //- Max skewness allowed. Set to <0 to disable.
+    maxBoundarySkewness 20;
+    maxInternalSkewness 4;
+
+    //- Max concaveness allowed. Is angle (in degrees) below which concavity
+    //  is allowed. 0 is straight face, <0 would be convex face.
+    //  Set to 180 to disable.
+    maxConcave 80;
+
+    //- Minimum pyramid volume. Is absolute volume of cell pyramid.
+    //  Set to a sensible fraction of the smallest cell volume expected.
+    //  Set to very negative number (e.g. -1E30) to disable.
+    minVol 1e-13;
+
+    //- Minimum quality of the tet formed by the face-centre
+    //  and variable base point minimum decomposition triangles and
+    //  the cell centre. This has to be a positive number for tracking
+    //  to work. Set to very negative number (e.g. -1E30) to
+    //  disable.
+    //     <0 = inside out tet,
+    //      0 = flat tet
+    //      1 = regular tet
+    minTetQuality -1;   //1e-30;
+
+    //- Minimum face area. Set to <0 to disable.
+    minArea -1;
+
+    //- Minimum face twist. Set to <-1 to disable. dot product of face normal
+    //- and face centre triangles normal
+    minTwist 0.02;
+
+    //- minimum normalised cell determinant
+    //- 1 = hex, <= 0 = folded or flattened illegal cell
+    minDeterminant 0.001;
+
+    //- minFaceWeight (0 -> 0.5)
+    minFaceWeight 0.02;
+
+    //- minVolRatio (0 -> 1)
+    minVolRatio 0.01;
+
+    //must be >0 for Fluent compatibility
+    minTriangleTwist -1;
+
+
+    // Advanced
+
+    //- Number of error distribution iterations
+    nSmoothScale 4;
+    //- amount to scale back displacement at error points
+    errorReduction 0.75;
+}
+
+
+// Advanced
+
+// Flags for optional output
+// 0 : only write final meshes
+// 1 : write intermediate meshes
+// 2 : write volScalarField with cellLevel for postprocessing
+// 4 : write current intersections as .obj files
+debug 0;
+
+
+// Merge tolerance. Is fraction of overall bounding box of initial mesh.
+// Note: the write tolerance needs to be higher than this.
+mergeTolerance 1e-6;
+
+
+// ************************************************************************* //

From bf5149463633cd891f221309b459a7880dc930c6 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Thu, 22 Mar 2012 10:41:36 +0000
Subject: [PATCH 091/317] BUG: settings.*: manpath adapted for openmpi

---
 etc/config/settings.csh | 2 +-
 etc/config/settings.sh  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/etc/config/settings.csh b/etc/config/settings.csh
index af7d2d7e91..179d145140 100644
--- a/etc/config/settings.csh
+++ b/etc/config/settings.csh
@@ -383,7 +383,7 @@ case OPENMPI:
 
     _foamAddPath    $MPI_ARCH_PATH/bin
     _foamAddLib     $MPI_ARCH_PATH/lib
-    _foamAddMan     $MPI_ARCH_PATH/man
+    _foamAddMan     $MPI_ARCH_PATH/share/man
     breaksw
 
 case SYSTEMOPENMPI:
diff --git a/etc/config/settings.sh b/etc/config/settings.sh
index 60dfbfd60f..1b4a130f56 100644
--- a/etc/config/settings.sh
+++ b/etc/config/settings.sh
@@ -413,7 +413,7 @@ OPENMPI)
 
     _foamAddPath    $MPI_ARCH_PATH/bin
     _foamAddLib     $MPI_ARCH_PATH/lib
-    _foamAddMan     $MPI_ARCH_PATH/man
+    _foamAddMan     $MPI_ARCH_PATH/share/man
     ;;
 
 SYSTEMOPENMPI)

From 06bbf06c5b489f90ec3e66213acb3e406c09b300 Mon Sep 17 00:00:00 2001
From: sergio <sergio>
Date: Thu, 22 Mar 2012 10:56:01 +0000
Subject: [PATCH 092/317] BUG: Fix the calculation on max delta normal to the
 wall on each cell.It loops over all faces

---
 .../SpalartAllmarasIDDES/IDDESDelta/IDDESDelta.C   | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/turbulenceModels/incompressible/LES/SpalartAllmarasIDDES/IDDESDelta/IDDESDelta.C b/src/turbulenceModels/incompressible/LES/SpalartAllmarasIDDES/IDDESDelta/IDDESDelta.C
index 4cd85a7cf6..5a680bc56b 100644
--- a/src/turbulenceModels/incompressible/LES/SpalartAllmarasIDDES/IDDESDelta/IDDESDelta.C
+++ b/src/turbulenceModels/incompressible/LES/SpalartAllmarasIDDES/IDDESDelta/IDDESDelta.C
@@ -74,16 +74,20 @@ void Foam::IDDESDelta::calcDelta()
     {
         scalar deltaMaxTmp = 0.0;
         const labelList& cFaces = cells[cellI];
-        const point& faceCentre = faceCentres[cFaces[0]];
         const vector nCell = n[cellI];
         forAll(cFaces, cFaceI)
         {
             label faceI = cFaces[cFaceI];
-            const point& faceCentreTwo = faceCentres[faceI];
-            scalar tmp = (faceCentre - faceCentreTwo) & nCell;
-            if (tmp > deltaMaxTmp)
+            const point& faceCentreI = faceCentres[faceI];
+            forAll(cFaces, cFaceJ)
             {
-                deltaMaxTmp = tmp;
+                label faceJ = cFaces[cFaceJ];
+                const point& faceCentreJ = faceCentres[faceJ];
+                scalar tmp = (faceCentreJ - faceCentreI) & nCell;
+                if (tmp > deltaMaxTmp)
+                {
+                    deltaMaxTmp = tmp;
+                }
             }
         }
         faceToFacenMax[cellI] = deltaMaxTmp;

From 1ebe55d95b6409b2c34674bc800d24e21e19e348 Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Thu, 22 Mar 2012 11:48:09 +0000
Subject: [PATCH 093/317] multiphase solvers: remove lift and drag at
 fixed-flux BCs, i.e. inlets

---
 .../compressibleTwoPhaseEulerFoam.C           |  1 +
 .../interfacialCoeffs.H                       | 11 +++++
 .../multiphaseSystem/multiphaseSystem.C       | 40 ++++++++++++++++---
 .../twoPhaseEulerFoam/liftDragCoeffs.H        | 10 +++++
 .../twoPhaseEulerFoam/twoPhaseEulerFoam.C     |  1 +
 5 files changed, 58 insertions(+), 5 deletions(-)

diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/compressibleTwoPhaseEulerFoam.C b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/compressibleTwoPhaseEulerFoam.C
index 78d70a1537..94548090b1 100644
--- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/compressibleTwoPhaseEulerFoam.C
+++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/compressibleTwoPhaseEulerFoam.C
@@ -33,6 +33,7 @@ Description
 #include "fvCFD.H"
 #include "nearWallDist.H"
 #include "wallFvPatch.H"
+#include "fixedValueFvsPatchFields.H"
 #include "Switch.H"
 
 #include "IFstream.H"
diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialCoeffs.H b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialCoeffs.H
index 0f28f2330d..3b4d2be679 100644
--- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialCoeffs.H
+++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialCoeffs.H
@@ -77,4 +77,15 @@ volScalarField heatTransferCoeff
     heatTransferCoeff *= alpha1Coeff;
 
     liftForce = Cl*(alpha1*rho1 + alpha2*rho2)*(Ur ^ fvc::curl(U));
+
+    // Remove lift, drag and phase heat-transfer at fixed-flux boundaries
+    forAll(phi1.boundaryField(), patchi)
+    {
+        if (isA<fixedValueFvsPatchScalarField>(phi1.boundaryField()[patchi]))
+        {
+            dragCoeff.boundaryField()[patchi] = 0.0;
+            heatTransferCoeff.boundaryField()[patchi] = 0.0;
+            liftForce.boundaryField()[patchi] = vector::zero;
+        }
+    }
 }
diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C
index 2224030613..41b79f77b9 100644
--- a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C
@@ -25,6 +25,7 @@ License
 
 #include "multiphaseSystem.H"
 #include "alphaContactAngleFvPatchScalarField.H"
+#include "fixedValueFvsPatchFields.H"
 #include "Time.H"
 #include "subCycle.H"
 #include "MULES.H"
@@ -610,6 +611,21 @@ Foam::tmp<Foam::volVectorField> Foam::multiphaseSystem::Svm
         }
     }
 
+    // Remove lift at fixed-flux boundaries
+    forAll(phase.phi().boundaryField(), patchi)
+    {
+        if
+        (
+            isA<fixedValueFvsPatchScalarField>
+            (
+                phase.phi().boundaryField()[patchi]
+            )
+        )
+        {
+            tSvm().boundaryField()[patchi] = vector::zero;
+        }
+    }
+
     return tSvm;
 }
 
@@ -623,9 +639,7 @@ Foam::multiphaseSystem::dragCoeffs() const
     {
         const dragModel& dm = *iter();
 
-        dragCoeffsPtr().insert
-        (
-            iter.key(),
+        volScalarField* Kptr =
             (
                 max
                 (
@@ -642,8 +656,24 @@ Foam::multiphaseSystem::dragCoeffs() const
                         dm.residualSlip()
                     )
                 )
-            ).ptr()
-        );
+            ).ptr();
+
+        // Remove drag at fixed-flux boundaries
+        forAll(dm.phase1().phi().boundaryField(), patchi)
+        {
+            if
+            (
+                isA<fixedValueFvsPatchScalarField>
+                (
+                    dm.phase1().phi().boundaryField()[patchi]
+                )
+            )
+            {
+                Kptr->boundaryField()[patchi] = 0.0;
+            }
+        }
+
+        dragCoeffsPtr().insert(iter.key(), Kptr);
     }
 
     return dragCoeffsPtr;
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/liftDragCoeffs.H b/applications/solvers/multiphase/twoPhaseEulerFoam/liftDragCoeffs.H
index 097123378c..415afe9483 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/liftDragCoeffs.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/liftDragCoeffs.H
@@ -19,3 +19,13 @@
     (
         Cl*(alpha2*rho2 + alpha1*rho1)*(Ur ^ fvc::curl(U))
     );
+
+    // Remove lift and drag at fixed-flux boundaries
+    forAll(phi1.boundaryField(), patchi)
+    {
+        if (isA<fixedValueFvsPatchScalarField>(phi1.boundaryField()[patchi]))
+        {
+            K.boundaryField()[patchi] = 0.0;
+            liftCoeff.boundaryField()[patchi] = vector::zero;
+        }
+    }
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseEulerFoam.C b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseEulerFoam.C
index d9da532aef..178032db6f 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseEulerFoam.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseEulerFoam.C
@@ -35,6 +35,7 @@ Description
 #include "subCycle.H"
 #include "nearWallDist.H"
 #include "wallFvPatch.H"
+#include "fixedValueFvsPatchFields.H"
 #include "Switch.H"
 
 #include "IFstream.H"

From 9d7cb91af14afafe10fc4fe3c5561f64e79c329c Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Thu, 22 Mar 2012 11:48:29 +0000
Subject: [PATCH 094/317] Update headers

---
 .../compressibleTwoPhaseEulerFoam.C                             | 2 +-
 .../multiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/compressibleTwoPhaseEulerFoam.C b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/compressibleTwoPhaseEulerFoam.C
index 94548090b1..c736f8194d 100644
--- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/compressibleTwoPhaseEulerFoam.C
+++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/compressibleTwoPhaseEulerFoam.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C
index 41b79f77b9..620499a2e7 100644
--- a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

From 7605c01260fb53ff7e98f8d53d74328febef46bf Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Thu, 22 Mar 2012 12:39:59 +0000
Subject: [PATCH 095/317] ENH: gAverage: (used in normFactor) : use single
 reduction

---
 .../db/IOstreams/Pstreams/PstreamReduceOps.H  |  21 +++
 .../fields/Fields/Field/FieldFunctions.C      |   7 +-
 src/Pstream/dummy/UPstream.C                  |   9 ++
 src/Pstream/mpi/UPstream.C                    | 138 +++++++++++++++++-
 4 files changed, 171 insertions(+), 4 deletions(-)

diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/PstreamReduceOps.H b/src/OpenFOAM/db/IOstreams/Pstreams/PstreamReduceOps.H
index b04e77a514..f6f69bba9e 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/PstreamReduceOps.H
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/PstreamReduceOps.H
@@ -96,6 +96,20 @@ T returnReduce
 }
 
 
+// Reduce with sum of both value and count (for averaging)
+template <class T>
+void sumReduce
+(
+    T& Value,
+    label& Count,
+    const int tag = Pstream::msgType()
+)
+{
+    reduce(Value, sumOp<T>(), tag);
+    reduce(Count, sumOp<label>(), tag);
+}
+
+
 // Non-blocking version of reduce. Sets request.
 template <class T, class BinaryOp>
 void reduce
@@ -125,6 +139,13 @@ void reduce
     const int tag = Pstream::msgType()
 );
 
+void sumReduce
+(
+    scalar& Value,
+    label& Count,
+    const int tag = Pstream::msgType()
+);
+
 void reduce
 (
     scalar& Value,
diff --git a/src/OpenFOAM/fields/Fields/Field/FieldFunctions.C b/src/OpenFOAM/fields/Fields/Field/FieldFunctions.C
index 193651b520..9397411ec4 100644
--- a/src/OpenFOAM/fields/Fields/Field/FieldFunctions.C
+++ b/src/OpenFOAM/fields/Fields/Field/FieldFunctions.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -514,11 +514,12 @@ template<class Type>
 Type gAverage(const UList<Type>& f)
 {
     label n = f.size();
-    reduce(n, sumOp<label>());
+    Type s = sum(f);
+    sumReduce(s, n);
 
     if (n > 0)
     {
-        Type avrg = gSum(f)/n;
+        Type avrg = s/n;
 
         return avrg;
     }
diff --git a/src/Pstream/dummy/UPstream.C b/src/Pstream/dummy/UPstream.C
index 3c1bd813c6..d787291f1d 100644
--- a/src/Pstream/dummy/UPstream.C
+++ b/src/Pstream/dummy/UPstream.C
@@ -63,6 +63,15 @@ void Foam::reduce(vector2D&, const sumOp<vector2D>&, const int)
 {}
 
 
+void Foam::sumReduce
+(
+    scalar& Value,
+    label& Count,
+    const int tag
+)
+{}
+
+
 void Foam::reduce(scalar&, const sumOp<scalar>&, const int, label&)
 {}
 
diff --git a/src/Pstream/mpi/UPstream.C b/src/Pstream/mpi/UPstream.C
index 11d654b61f..e5b2808ca6 100644
--- a/src/Pstream/mpi/UPstream.C
+++ b/src/Pstream/mpi/UPstream.C
@@ -41,7 +41,38 @@ License
 #   define MPI_SCALAR MPI_DOUBLE
 #endif
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    typedef struct
+    {
+        scalar value;
+        label count;
+    } CountAndValue;
+
+    void reduceSum
+    (
+        void *in,
+        void *inOut,
+        int *len,
+        MPI_Datatype *dptr
+    )
+    {
+        CountAndValue* inPtr =
+            reinterpret_cast<CountAndValue*>(in);
+        CountAndValue* inOutPtr =
+            reinterpret_cast<CountAndValue*>(inOut);
+
+        for (int i=0; i< *len; ++i)
+        {
+            inOutPtr->value += inPtr->value;
+            inOutPtr->count += inPtr->count;
+            inPtr++;
+            inOutPtr++;
+        }
+    }
+}
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -455,6 +486,111 @@ void Foam::reduce(vector2D& Value, const sumOp<vector2D>& bop, const int tag)
 }
 
 
+void Foam::sumReduce
+(
+    scalar& Value,
+    label& Count,
+    const int tag
+)
+{
+    static bool hasDataType_ = false;
+    static MPI_Datatype mesg_mpi_strct_;
+    static MPI_Op myOp_;
+
+    if (Pstream::debug)
+    {
+        Pout<< "Foam::sumReduce : value:" << Value
+            << " count:" << Count << endl;
+    }
+
+    if (!UPstream::parRun())
+    {
+        return;
+    }
+
+    if (UPstream::nProcs() <= UPstream::nProcsSimpleSum)
+    {
+        reduce(Value, sumOp<scalar>(), tag);
+        reduce(Count, sumOp<label>(), tag);
+    }
+    else
+    {
+        CountAndValue in,out;
+
+        if (!hasDataType_)
+        {
+            int lengths[2];
+            lengths[0] = 1;
+            lengths[1] = 1;
+            MPI_Datatype types[2];
+            types[0] = MPI_DOUBLE;
+            types[1] = MPI_INT;
+            MPI_Aint addresses[2];
+            MPI_Address(&in.value, &addresses[0]);
+            MPI_Address(&in.count, &addresses[1]);
+            MPI_Aint offsets[2];
+            offsets[0] = 0;
+            offsets[1] = addresses[1]-addresses[0];
+
+            if
+            (
+                MPI_Type_create_struct
+                (
+                    2,
+                    lengths,
+                    offsets,
+                    types,
+                    &mesg_mpi_strct_
+                )
+            )
+            {
+                FatalErrorIn("Foam::sumReduce()")
+                    << "MPI_Type_create_struct" << abort(FatalError);
+            }
+            if (MPI_Type_commit(&mesg_mpi_strct_))
+            {
+                FatalErrorIn("Foam::sumReduce()")
+                    << "MPI_Type_commit" << abort(FatalError);
+            }
+            if (MPI_Op_create(reduceSum, true, &myOp_))
+            {
+                FatalErrorIn("Foam::sumReduce()")
+                    << "MPI_Op_create" << abort(FatalError);
+            }
+
+            hasDataType_ = true;
+        }
+
+        in.value = Value;
+        in.count = Count;
+        if
+        (
+            MPI_Allreduce
+            (
+                &in,
+                &out,
+                1,
+                mesg_mpi_strct_,
+                myOp_,
+                MPI_COMM_WORLD
+            )
+        )
+        {
+            FatalErrorIn("Foam::sumReduce(..)")
+                << "Problem." << abort(FatalError);
+        }
+        Value = out.value;
+        Count = out.count;
+    }
+
+    if (Pstream::debug)
+    {
+        Pout<< "Foam::reduce : reduced value:" << Value
+            << " reduced count:" << Count << endl;
+    }
+}
+
+
 void Foam::reduce
 (
     scalar& Value,

From 79062e3fa20f9917f48cecad2e769ee4e4ec66ae Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Thu, 22 Mar 2012 14:48:27 +0000
Subject: [PATCH 096/317] ENH: Updated fluent3DMeshToFoam Flex rules for
 reading header information

---
 .../conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.L     | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/applications/utilities/mesh/conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.L b/applications/utilities/mesh/conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.L
index 5f6a49ab3b..c67f5b289b 100644
--- a/applications/utilities/mesh/conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.L
+++ b/applications/utilities/mesh/conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.L
@@ -163,6 +163,7 @@ hexLabel                   {hexDigit}+
 zeroLabel                  {digit}*
 signedInteger              [-+]?{integer}
 word                       ({alpha}|{digit}|{dotColonDash})*
+wordBraces                 ({word}|{lbrac}|{rbrac})*
 
 exponent_part              [eE][-+]?{digit}+
 fractional_constant        [-+]?(({digit}*"."{digit}+)|({digit}+".")|({digit}))
@@ -184,6 +185,7 @@ schemeSymbolList           ({schemeSymbolListElement}+{space})
 
 starStar                   ("**")
 text                       ({space}({word}*{space})*)
+textBraces                 ({space}({wordBraces}*{space})*)
 anythingInBlock            ([^)]*)
 
 dateDDMMYYYY               ({digit}{digit}"/"{digit}{digit}"/"{digit}{digit}{digit}{digit})
@@ -276,11 +278,10 @@ endOfSection               {space}")"{space}
         BEGIN(readHeader);
     }
 
-<readHeader>{anythingInBlock} {
-        Info<< "Header: " << YYText() << endl;
+<readHeader>{quote}{textBraces}{quote} {
+        Info<< "Reading header: " << YYText() << endl;
     }
 
-
 {dimension} {
         BEGIN(readDimension);
     }

From 6c6ac0ef109256ac1d078de709f74041a7b6747d Mon Sep 17 00:00:00 2001
From: sergio <sergio>
Date: Fri, 23 Mar 2012 11:53:38 +0000
Subject: [PATCH 097/317] ENH: Adding region option

---
 .../utilities/mesh/manipulation/subsetMesh/subsetMesh.C   | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/applications/utilities/mesh/manipulation/subsetMesh/subsetMesh.C b/applications/utilities/mesh/manipulation/subsetMesh/subsetMesh.C
index a6556f143d..f95b906f5f 100644
--- a/applications/utilities/mesh/manipulation/subsetMesh/subsetMesh.C
+++ b/applications/utilities/mesh/manipulation/subsetMesh/subsetMesh.C
@@ -156,6 +156,7 @@ int main(int argc, char *argv[])
     );
 
     #include "addOverwriteOption.H"
+    #include "addRegionOption.H"
     argList::validArgs.append("cellSet");
     argList::addOption
     (
@@ -167,7 +168,12 @@ int main(int argc, char *argv[])
     #include "setRootCase.H"
     #include "createTime.H"
     runTime.functionObjects().off();
-    #include "createMesh.H"
+
+    Foam::word meshRegionName = polyMesh::defaultRegion;
+    args.optionReadIfPresent("region", meshRegionName);
+
+    #include "createNamedMesh.H"
+
 
     const word oldInstance = mesh.pointsInstance();
 

From 7cbf62f4d6cb18992f3db2f9b36f085b57494da6 Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Fri, 23 Mar 2012 14:50:03 +0000
Subject: [PATCH 098/317] STYLE: wrapped extrudeToRegionMesh header doc in
 verbatim/endverbatim

---
 .../extrude/extrudeToRegionMesh/extrudeToRegionMesh.C          | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C b/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C
index ff4780b65b..a0873ab4c9 100644
--- a/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C
+++ b/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C
@@ -38,6 +38,7 @@ Description
       if flipMap is false)
     - not parallel
 
+\verbatim
 
 Internal face extrusion
 -----------------------
@@ -109,6 +110,8 @@ Notes:
       only work if the coupled edge extrudes a different face so if there
       are more than 1 cell inbetween.
 
+\endverbatim
+
 \*---------------------------------------------------------------------------*/
 
 #include "argList.H"

From 3180339163c966c72a002d78663ea8c249590a49 Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Mon, 26 Mar 2012 09:29:32 +0100
Subject: [PATCH 099/317] STYLE: Corrected typos in header file comments

---
 .../icoUncoupledKinematicParcelDyMFoam.C                    | 6 +++---
 .../icoUncoupledKinematicParcelFoam.C                       | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/applications/solvers/lagrangian/icoUncoupledKinematicParcelDyMFoam/icoUncoupledKinematicParcelDyMFoam.C b/applications/solvers/lagrangian/icoUncoupledKinematicParcelDyMFoam/icoUncoupledKinematicParcelDyMFoam.C
index 166afa67b6..557344fa62 100644
--- a/applications/solvers/lagrangian/icoUncoupledKinematicParcelDyMFoam/icoUncoupledKinematicParcelDyMFoam.C
+++ b/applications/solvers/lagrangian/icoUncoupledKinematicParcelDyMFoam/icoUncoupledKinematicParcelDyMFoam.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -22,11 +22,11 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Application
-    uncoupledKinematicParcelFoam
+    uncoupledKinematicParcelDyMFoam
 
 Description
     Transient solver for the passive transport of a single kinematic
-    particle could.
+    particle cloud.
 
     Uses a pre-calculated velocity field to evolve the cloud.
 
diff --git a/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelFoam.C b/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelFoam.C
index 12043167d0..79436625e2 100644
--- a/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelFoam.C
+++ b/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelFoam.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -26,7 +26,7 @@ Application
 
 Description
     Transient solver for the passive transport of a single kinematic
-    particle could.
+    particle cloud.
 
     Uses a pre-calculated velocity field to evolve the cloud.
 

From 716374286dd35bf977c1f93096a16e79c9ec3ad9 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Mon, 26 Mar 2012 12:13:31 +0100
Subject: [PATCH 100/317] BUG: createBaffles: duplicate command line option
 specification

---
 .../mesh/manipulation/createBaffles/createBaffles.C    | 10 +---------
 .../surfaceFeatureExtract/surfaceFeatureExtract.C      |  7 +------
 2 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/applications/utilities/mesh/manipulation/createBaffles/createBaffles.C b/applications/utilities/mesh/manipulation/createBaffles/createBaffles.C
index b3d9d3f515..6fb57aa027 100644
--- a/applications/utilities/mesh/manipulation/createBaffles/createBaffles.C
+++ b/applications/utilities/mesh/manipulation/createBaffles/createBaffles.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -142,14 +142,6 @@ int main(int argc, char *argv[])
         "additionalPatches",
         "((master2 slave2) .. (masterN slaveN))"
     );
-    argList::addBoolOption("internalFacesOnly");
-
-    argList::addOption
-    (
-        "additionalPatches",
-        "(patch2 .. patchN)",
-        "specify additional patches for creating baffles"
-    );
     argList::addBoolOption
     (
         "internalFacesOnly",
diff --git a/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtract.C b/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtract.C
index c2baec519e..da71cafc90 100644
--- a/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtract.C
+++ b/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtract.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -564,11 +564,6 @@ int main(int argc, char *argv[])
         "distance to look for close features"
     );
     argList::addBoolOption
-    (
-        "writeVTK",
-        "write surface property VTK files"
-    );
-    argList::addBoolOption
     (
         "manifoldEdgesOnly",
         "remove any non-manifold (open or more than two connected faces) edges"

From 5ff955752df29a484e470301efab99be0934606b Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Mon, 26 Mar 2012 12:14:55 +0100
Subject: [PATCH 101/317] STYLE: meshToMeshAddressing: typo

---
 .../meshToMesh/calculateMeshToMeshAddressing.C                | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/sampling/meshToMeshInterpolation/meshToMesh/calculateMeshToMeshAddressing.C b/src/sampling/meshToMeshInterpolation/meshToMesh/calculateMeshToMeshAddressing.C
index 831565bd13..fda5525f09 100644
--- a/src/sampling/meshToMeshInterpolation/meshToMesh/calculateMeshToMeshAddressing.C
+++ b/src/sampling/meshToMeshInterpolation/meshToMesh/calculateMeshToMeshAddressing.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -202,7 +202,7 @@ void Foam::meshToMesh::calcAddressing()
     if (debug)
     {
         Info<< "meshToMesh::calculateAddressing() : "
-            << "finished calculating mesh-to-mesh acell ddressing" << endl;
+            << "finished calculating mesh-to-mesh cell addressing" << endl;
     }
 }
 

From d7fb2360e50f55c15180122e22a20597d4d0a9db Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Mon, 26 Mar 2012 12:15:32 +0100
Subject: [PATCH 102/317] ENH: structuredDecomp: use patchSet

---
 .../structuredDecomp/structuredDecomp.C       | 29 +++++++------------
 .../structuredDecomp/structuredDecomp.H       |  8 ++---
 2 files changed, 14 insertions(+), 23 deletions(-)

diff --git a/src/parallel/decompose/decompositionMethods/structuredDecomp/structuredDecomp.C b/src/parallel/decompose/decompositionMethods/structuredDecomp/structuredDecomp.C
index 072345df2d..1672e53d21 100644
--- a/src/parallel/decompose/decompositionMethods/structuredDecomp/structuredDecomp.C
+++ b/src/parallel/decompose/decompositionMethods/structuredDecomp/structuredDecomp.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -49,11 +49,11 @@ namespace Foam
 Foam::structuredDecomp::structuredDecomp(const dictionary& decompositionDict)
 :
     decompositionMethod(decompositionDict),
-    methodDict_(decompositionDict_.subDict(typeName + "Coeffs"))
+    methodDict_(decompositionDict_.subDict(typeName + "Coeffs")),
+    patches_(methodDict_.lookup("patches"))
 {
     methodDict_.set("numberOfSubdomains", nDomains());
     method_ = decompositionMethod::New(methodDict_);
-    patches_ = wordList(methodDict_.lookup("patches"));
 }
 
 
@@ -72,29 +72,20 @@ Foam::labelList Foam::structuredDecomp::decompose
     const scalarField& cWeights
 )
 {
-    labelList patchIDs(patches_.size());
     const polyBoundaryMesh& pbm = mesh.boundaryMesh();
+    const labelHashSet patchIDs(pbm.patchSet(patches_));
 
     label nFaces = 0;
-    forAll(patches_, i)
+    forAllConstIter(labelHashSet, patchIDs, iter)
     {
-        patchIDs[i] = pbm.findPatchID(patches_[i]);
-
-        if (patchIDs[i] == -1)
-        {
-            FatalErrorIn("structuredDecomp::decompose(..)")
-                << "Cannot find patch " << patches_[i] << endl
-                << "Valid patches are " << pbm.names()
-                << exit(FatalError);
-        }
-        nFaces += pbm[patchIDs[i]].size();
+        nFaces += pbm[iter.key()].size();
     }
 
     // Extract a submesh.
     labelHashSet patchCells(2*nFaces);
-    forAll(patchIDs, i)
+    forAllConstIter(labelHashSet, patchIDs, iter)
     {
-        const labelUList& fc = pbm[patchIDs[i]].faceCells();
+        const labelUList& fc = pbm[iter.key()].faceCells();
         forAll(fc, i)
         {
             patchCells.insert(fc[i]);
@@ -127,9 +118,9 @@ Foam::labelList Foam::structuredDecomp::decompose
     labelList patchFaces(nFaces);
     List<topoDistanceData> patchData(nFaces);
     nFaces = 0;
-    forAll(patchIDs, i)
+    forAllConstIter(labelHashSet, patchIDs, iter)
     {
-        const polyPatch& pp = pbm[patchIDs[i]];
+        const polyPatch& pp = pbm[iter.key()];
         const labelUList& fc = pp.faceCells();
         forAll(fc, i)
         {
diff --git a/src/parallel/decompose/decompositionMethods/structuredDecomp/structuredDecomp.H b/src/parallel/decompose/decompositionMethods/structuredDecomp/structuredDecomp.H
index 259102ac79..a2374f40a0 100644
--- a/src/parallel/decompose/decompositionMethods/structuredDecomp/structuredDecomp.H
+++ b/src/parallel/decompose/decompositionMethods/structuredDecomp/structuredDecomp.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -25,7 +25,7 @@ Class
     Foam::structuredDecomp
 
 Description
-    Decomposition given using consecutive application of decomposers.
+    Decomposition by walking out decomposition of patch cells mesh.
 
 SourceFiles
     structuredDecomp.C
@@ -52,9 +52,9 @@ class structuredDecomp
 
         dictionary methodDict_;
 
-        autoPtr<decompositionMethod> method_;
+        wordReList patches_;
 
-        wordList patches_;
+        autoPtr<decompositionMethod> method_;
 
 
     // Private Member Functions

From ec257834101f4d35f338a12fc9a3a8cb62c1b348 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Mon, 26 Mar 2012 12:17:46 +0100
Subject: [PATCH 103/317] ENH: splitMeshRegions, autoHexMesh: allocate
 face-decomp structure before doing findCell

---
 .../mesh/manipulation/splitMeshRegions/splitMeshRegions.C    | 4 +++-
 .../refinementParameters/refinementParameters.C              | 5 ++++-
 .../autoMesh/autoHexMesh/meshRefinement/meshRefinement.C     | 5 ++++-
 .../autoHexMesh/meshRefinement/meshRefinementBaffles.C       | 5 ++++-
 4 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C b/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C
index b34676fac5..d129efde6d 100644
--- a/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C
+++ b/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -2194,6 +2194,8 @@ int main(int argc, char *argv[])
 
             label regionI = -1;
 
+            (void)mesh.tetBasePtIs();
+
             label cellI = mesh.findCell(insidePoint);
 
             Info<< nl << "Found point " << insidePoint << " in cell " << cellI
diff --git a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/refinementParameters/refinementParameters.C b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/refinementParameters/refinementParameters.C
index ba8d0f4200..ab2140a4ec 100644
--- a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/refinementParameters/refinementParameters.C
+++ b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/refinementParameters/refinementParameters.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -76,6 +76,9 @@ Foam::refinementParameters::refinementParameters(const dictionary& dict)
 Foam::labelList Foam::refinementParameters::findCells(const polyMesh& mesh)
  const
 {
+    // Force calculation of tet-diag decomposition (for use in findCell)
+    (void)mesh.tetBasePtIs();
+
     // Global calculation engine
     globalIndex globalCells(mesh.nCells());
 
diff --git a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinement.C b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinement.C
index 79df04781e..5503e6d2a8 100644
--- a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinement.C
+++ b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinement.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -1819,6 +1819,9 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::meshRefinement::splitMeshRegions
     const point& keepPoint
 )
 {
+    // Force calculation of face decomposition (used in findCell)
+    (void)mesh_.tetBasePtIs();
+
     // Determine connected regions. regionSplit is the labelList with the
     // region per cell.
     regionSplit cellRegion(mesh_);
diff --git a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementBaffles.C b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementBaffles.C
index c6877bbd8d..5ec9065955 100644
--- a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementBaffles.C
+++ b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementBaffles.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -1235,6 +1235,9 @@ void Foam::meshRefinement::findCellZoneInsideWalk
     blockedFace.clear();
 
 
+    // Force calculation of face decomposition (used in findCell)
+    (void)mesh_.tetBasePtIs();
+
     // For all locationSurface find the cell
     forAll(locationSurfaces, i)
     {

From 6198cfc36976350097b8c1e3874ea6424f198d1e Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Mon, 26 Mar 2012 14:06:02 +0100
Subject: [PATCH 104/317] ENH: VTKSurfaceFormat: read STLSolidLabelling for
 region info

---
 src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormat.C | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormat.C b/src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormat.C
index 3dad786857..cc3741da12 100644
--- a/src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormat.C
+++ b/src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormat.C
@@ -128,6 +128,18 @@ bool Foam::fileFormats::VTKsurfaceFormat<Face>::read
             zones[i] = label(region[i]);
         }
     }
+    else if (reader.cellData().foundObject<scalarIOField>("STLSolidLabeling"))
+    {
+        const scalarIOField& region =
+            reader.cellData().lookupObject<scalarIOField>
+            (
+                "STLSolidLabeling"
+            );
+        forAll(region, i)
+        {
+            zones[i] = label(region[i]);
+        }
+    }
 
     // Create zone names
     const label nZones = max(zones)+1;

From cbbcfd387892e8307963b15426e7624412cc5c85 Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Tue, 27 Mar 2012 13:44:11 +0100
Subject: [PATCH 105/317] BUG: deltaTChem field not resized on mesh.changing()
 in chemistry models

---
 .../ODEChemistryModel/ODEChemistryModel.C     |  4 +++-
 .../basicChemistryModel/basicChemistryModel.C | 21 +++++++++++++------
 .../basicChemistryModel/basicChemistryModel.H |  6 ++++++
 3 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/ODEChemistryModel/ODEChemistryModel.C b/src/thermophysicalModels/chemistryModel/chemistryModel/ODEChemistryModel/ODEChemistryModel.C
index 117412407c..f0807eb725 100644
--- a/src/thermophysicalModels/chemistryModel/chemistryModel/ODEChemistryModel/ODEChemistryModel.C
+++ b/src/thermophysicalModels/chemistryModel/chemistryModel/ODEChemistryModel/ODEChemistryModel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -743,6 +743,8 @@ Foam::scalar Foam::ODEChemistryModel<CompType, ThermoType>::solve
     const scalar deltaT
 )
 {
+    CompType::correct();
+
     scalar deltaTMin = GREAT;
 
     const volScalarField rho
diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/basicChemistryModel/basicChemistryModel.C b/src/thermophysicalModels/chemistryModel/chemistryModel/basicChemistryModel/basicChemistryModel.C
index 3b2aafecd8..38efa9e858 100644
--- a/src/thermophysicalModels/chemistryModel/chemistryModel/basicChemistryModel/basicChemistryModel.C
+++ b/src/thermophysicalModels/chemistryModel/chemistryModel/basicChemistryModel/basicChemistryModel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -34,6 +34,18 @@ namespace Foam
     defineTypeNameAndDebug(basicChemistryModel, 0);
 }
 
+// * * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * //
+
+void Foam::basicChemistryModel::correct()
+{
+    if (mesh_.changing())
+    {
+        deltaTChem_.setSize(mesh_.nCells());
+        deltaTChem_ = deltaTChemIni_;
+    }
+}
+
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 Foam::basicChemistryModel::basicChemistryModel(const fvMesh& mesh)
@@ -51,11 +63,8 @@ Foam::basicChemistryModel::basicChemistryModel(const fvMesh& mesh)
     ),
     mesh_(mesh),
     chemistry_(lookup("chemistry")),
-    deltaTChem_
-    (
-        mesh.nCells(),
-        readScalar(lookup("initialChemicalTimeStep"))
-    )
+    deltaTChemIni_(readScalar(lookup("initialChemicalTimeStep"))),
+    deltaTChem_(mesh.nCells(), deltaTChemIni_)
 {}
 
 
diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/basicChemistryModel/basicChemistryModel.H b/src/thermophysicalModels/chemistryModel/chemistryModel/basicChemistryModel/basicChemistryModel.H
index 607133ce7e..2f27d59f70 100644
--- a/src/thermophysicalModels/chemistryModel/chemistryModel/basicChemistryModel/basicChemistryModel.H
+++ b/src/thermophysicalModels/chemistryModel/chemistryModel/basicChemistryModel/basicChemistryModel.H
@@ -76,6 +76,9 @@ protected:
         //- Chemistry activation switch
         Switch chemistry_;
 
+        //- Initial chemical time step
+        const scalar deltaTChemIni_;
+
         //- Latest estimation of integration step
         scalarField deltaTChem_;
 
@@ -86,6 +89,9 @@ protected:
         //  step, e.g. for multi-chemistry model
         scalarField& deltaTChem();
 
+        //- Correct function - updates due to mesh changes
+        void correct();
+
 
 public:
 

From 5661ae33f6d4c0380c6c3f4d814ad8141d853e7a Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Tue, 27 Mar 2012 13:53:49 +0100
Subject: [PATCH 106/317] STYLE: Corrected typo in error message

---
 src/finiteVolume/fvMesh/fvMeshGeometry.C | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/finiteVolume/fvMesh/fvMeshGeometry.C b/src/finiteVolume/fvMesh/fvMeshGeometry.C
index 8006caf0a9..0a06ef7364 100644
--- a/src/finiteVolume/fvMesh/fvMeshGeometry.C
+++ b/src/finiteVolume/fvMesh/fvMeshGeometry.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -398,7 +398,7 @@ const surfaceScalarField& fvMesh::phi() const
     if (!phiPtr_)
     {
         FatalErrorIn("fvMesh::phi()")
-            << "mesh flux field does not exists, is the mesh actually moving?"
+            << "mesh flux field does not exist, is the mesh actually moving?"
             << exit(FatalError);
     }
 
@@ -418,7 +418,7 @@ surfaceScalarField& fvMesh::setPhi()
     if (!phiPtr_)
     {
         FatalErrorIn("fvMesh::setPhi()")
-            << "mesh flux field does not exists, is the mesh actually moving?"
+            << "mesh flux field does not exist, is the mesh actually moving?"
             << exit(FatalError);
     }
 

From 55d5c1b2d7db437295461a8c9c67d8f66c43f3db Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Tue, 27 Mar 2012 16:30:28 +0100
Subject: [PATCH 107/317] fixedMeanFvPatchField: New BC

Extrapolates field to the patch using the near-cell values and adjusts the
distribution to match the specified meanValue.
---
 src/finiteVolume/Make/files                   |   1 +
 .../derived/fixedMean/fixedMeanFvPatchField.C | 142 ++++++++++++++++
 .../derived/fixedMean/fixedMeanFvPatchField.H | 158 ++++++++++++++++++
 .../fixedMean/fixedMeanFvPatchFields.C        |  43 +++++
 .../fixedMean/fixedMeanFvPatchFields.H        |  49 ++++++
 .../fixedMean/fixedMeanFvPatchFieldsFwd.H     |  50 ++++++
 6 files changed, 443 insertions(+)
 create mode 100644 src/finiteVolume/fields/fvPatchFields/derived/fixedMean/fixedMeanFvPatchField.C
 create mode 100644 src/finiteVolume/fields/fvPatchFields/derived/fixedMean/fixedMeanFvPatchField.H
 create mode 100644 src/finiteVolume/fields/fvPatchFields/derived/fixedMean/fixedMeanFvPatchFields.C
 create mode 100644 src/finiteVolume/fields/fvPatchFields/derived/fixedMean/fixedMeanFvPatchFields.H
 create mode 100644 src/finiteVolume/fields/fvPatchFields/derived/fixedMean/fixedMeanFvPatchFieldsFwd.H

diff --git a/src/finiteVolume/Make/files b/src/finiteVolume/Make/files
index 3652bea89a..0e2de76c07 100644
--- a/src/finiteVolume/Make/files
+++ b/src/finiteVolume/Make/files
@@ -124,6 +124,7 @@ $(derivedFvPatchFields)/mappedFixedPushedInternalValue/mappedFixedPushedInternal
 $(derivedFvPatchFields)/mappedFixedValue/mappedFixedValueFvPatchFields.C
 $(derivedFvPatchFields)/mappedVelocityFluxFixedValue/mappedVelocityFluxFixedValueFvPatchField.C
 $(derivedFvPatchFields)/mappedFlowRate/mappedFlowRateFvPatchVectorField.C
+$(derivedFvPatchFields)/fixedMean/fixedMeanFvPatchFields.C
 $(derivedFvPatchFields)/fan/fanFvPatchFields.C
 $(derivedFvPatchFields)/fanPressure/fanPressureFvPatchScalarField.C
 $(derivedFvPatchFields)/buoyantPressure/buoyantPressureFvPatchScalarField.C
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedMean/fixedMeanFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/fixedMean/fixedMeanFvPatchField.C
new file mode 100644
index 0000000000..e59f98910e
--- /dev/null
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedMean/fixedMeanFvPatchField.C
@@ -0,0 +1,142 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "fixedMeanFvPatchField.H"
+#include "volFields.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template<class Type>
+fixedMeanFvPatchField<Type>::fixedMeanFvPatchField
+(
+    const fvPatch& p,
+    const DimensionedField<Type, volMesh>& iF
+)
+:
+    fixedValueFvPatchField<Type>(p, iF),
+    meanValue_(pTraits<Type>::zero)
+{}
+
+
+template<class Type>
+fixedMeanFvPatchField<Type>::fixedMeanFvPatchField
+(
+    const fixedMeanFvPatchField<Type>& ptf,
+    const fvPatch& p,
+    const DimensionedField<Type, volMesh>& iF,
+    const fvPatchFieldMapper& mapper
+)
+:
+    fixedValueFvPatchField<Type>(ptf, p, iF, mapper),
+    meanValue_(ptf.meanValue_)
+{}
+
+
+template<class Type>
+fixedMeanFvPatchField<Type>::fixedMeanFvPatchField
+(
+    const fvPatch& p,
+    const DimensionedField<Type, volMesh>& iF,
+    const dictionary& dict
+)
+:
+    fixedValueFvPatchField<Type>(p, iF, dict),
+    meanValue_(pTraits<Type>(dict.lookup("meanValue")))
+{}
+
+
+template<class Type>
+fixedMeanFvPatchField<Type>::fixedMeanFvPatchField
+(
+    const fixedMeanFvPatchField<Type>& ptf
+)
+:
+    fixedValueFvPatchField<Type>(ptf),
+    meanValue_(ptf.meanValue_)
+{}
+
+
+template<class Type>
+fixedMeanFvPatchField<Type>::fixedMeanFvPatchField
+(
+    const fixedMeanFvPatchField<Type>& ptf,
+    const DimensionedField<Type, volMesh>& iF
+)
+:
+    fixedValueFvPatchField<Type>(ptf, iF),
+    meanValue_(ptf.meanValue_)
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class Type>
+void fixedMeanFvPatchField<Type>::updateCoeffs()
+{
+    if (this->updated())
+    {
+        return;
+    }
+
+    Field<Type> newValues(this->patchInternalField());
+
+    Type meanValuePsi =
+        gSum(this->patch().magSf()*newValues)
+       /gSum(this->patch().magSf());
+
+    if (mag(meanValue_) > SMALL && mag(meanValuePsi)/mag(meanValue_) > 0.5)
+    {
+        newValues *= mag(meanValue_)/mag(meanValuePsi);
+    }
+    else
+    {
+        newValues += (meanValue_ - meanValuePsi);
+    }
+
+    this->operator==(newValues);
+
+    fixedValueFvPatchField<Type>::updateCoeffs();
+}
+
+
+template<class Type>
+void fixedMeanFvPatchField<Type>::write(Ostream& os) const
+{
+    fvPatchField<Type>::write(os);
+    os.writeKeyword("meanValue") << meanValue_ << token::END_STATEMENT << nl;
+    this->writeEntry("value", os);
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedMean/fixedMeanFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/fixedMean/fixedMeanFvPatchField.H
new file mode 100644
index 0000000000..b59969a967
--- /dev/null
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedMean/fixedMeanFvPatchField.H
@@ -0,0 +1,158 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::fixedMeanFvPatchField
+
+Description
+    Extrapolates field to the patch using the near-cell values and adjusts
+    the distribution to match the specified meanValue.
+
+SourceFiles
+    fixedMeanFvPatchField.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef fixedMeanFvPatchField_H
+#define fixedMeanFvPatchField_H
+
+#include "fixedValueFvPatchFields.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                  Class fixedMeanFvPatch Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class Type>
+class fixedMeanFvPatchField
+:
+    public fixedValueFvPatchField<Type>
+{
+
+protected:
+
+    // Protected data
+
+        //- MeanValue value the field is adjusted to maintain
+        Type meanValue_;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("fixedMean");
+
+
+    // Constructors
+
+        //- Construct from patch and internal field
+        fixedMeanFvPatchField
+        (
+            const fvPatch&,
+            const DimensionedField<Type, volMesh>&
+        );
+
+        //- Construct from patch, internal field and dictionary
+        fixedMeanFvPatchField
+        (
+            const fvPatch&,
+            const DimensionedField<Type, volMesh>&,
+            const dictionary&
+        );
+
+        //- Construct by mapping given fixedMeanFvPatchField
+        //  onto a new patch
+        fixedMeanFvPatchField
+        (
+            const fixedMeanFvPatchField<Type>&,
+            const fvPatch&,
+            const DimensionedField<Type, volMesh>&,
+            const fvPatchFieldMapper&
+        );
+
+        //- Construct as copy
+        fixedMeanFvPatchField
+        (
+            const fixedMeanFvPatchField<Type>&
+        );
+
+        //- Construct and return a clone
+        virtual tmp<fvPatchField<Type> > clone() const
+        {
+            return tmp<fvPatchField<Type> >
+            (
+                new fixedMeanFvPatchField<Type>(*this)
+            );
+        }
+
+        //- Construct as copy setting internal field reference
+        fixedMeanFvPatchField
+        (
+            const fixedMeanFvPatchField<Type>&,
+            const DimensionedField<Type, volMesh>&
+        );
+
+        //- Construct and return a clone setting internal field reference
+        virtual tmp<fvPatchField<Type> > clone
+        (
+            const DimensionedField<Type, volMesh>& iF
+        ) const
+        {
+            return tmp<fvPatchField<Type> >
+            (
+                new fixedMeanFvPatchField<Type>(*this, iF)
+            );
+        }
+
+
+    // Member functions
+
+        // Evaluation functions
+
+            //- Update the coefficients associated with the patch field
+            virtual void updateCoeffs();
+
+        //- Write
+        virtual void write(Ostream&) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+#   include "fixedMeanFvPatchField.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedMean/fixedMeanFvPatchFields.C b/src/finiteVolume/fields/fvPatchFields/derived/fixedMean/fixedMeanFvPatchFields.C
new file mode 100644
index 0000000000..e8e269c8a5
--- /dev/null
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedMean/fixedMeanFvPatchFields.C
@@ -0,0 +1,43 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "fixedMeanFvPatchFields.H"
+#include "volMesh.H"
+#include "addToRunTimeSelectionTable.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+makePatchFields(fixedMean);
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedMean/fixedMeanFvPatchFields.H b/src/finiteVolume/fields/fvPatchFields/derived/fixedMean/fixedMeanFvPatchFields.H
new file mode 100644
index 0000000000..64996c3a68
--- /dev/null
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedMean/fixedMeanFvPatchFields.H
@@ -0,0 +1,49 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef fixedMeanFvPatchFields_H
+#define fixedMeanFvPatchFields_H
+
+#include "fixedMeanFvPatchField.H"
+#include "fieldTypes.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+makePatchTypeFieldTypedefs(fixedMean);
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedMean/fixedMeanFvPatchFieldsFwd.H b/src/finiteVolume/fields/fvPatchFields/derived/fixedMean/fixedMeanFvPatchFieldsFwd.H
new file mode 100644
index 0000000000..9f04dc965b
--- /dev/null
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedMean/fixedMeanFvPatchFieldsFwd.H
@@ -0,0 +1,50 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef fixedMeanFvPatchFieldsFwd_H
+#define fixedMeanFvPatchFieldsFwd_H
+
+#include "fieldTypes.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+template<class Type> class fixedMeanFvPatchField;
+
+makePatchTypeFieldTypedefs(fixedMean);
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //

From 95cead86d889c407b0f166ac029b1ebbc4abf55d Mon Sep 17 00:00:00 2001
From: laurence <laurence>
Date: Tue, 27 Mar 2012 17:07:47 +0100
Subject: [PATCH 108/317] COMP: cvMesh: link to ptscotch instead of scotch

---
 applications/utilities/mesh/generation/cvMesh/Make/options     | 3 ++-
 .../mesh/generation/cvMesh/conformalVoronoiMesh/Make/options   | 1 -
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/applications/utilities/mesh/generation/cvMesh/Make/options b/applications/utilities/mesh/generation/cvMesh/Make/options
index a0a776d977..5efdb12572 100644
--- a/applications/utilities/mesh/generation/cvMesh/Make/options
+++ b/applications/utilities/mesh/generation/cvMesh/Make/options
@@ -20,7 +20,8 @@ EXE_LIBS = \
     $(CGAL_LIBS) \
     -lconformalVoronoiMesh \
     -lmeshTools \
-    -ldecompositionMethods -L$(FOAM_LIBBIN)/dummy -lscotchDecomp \
+    -ldecompositionMethods \
+    -L$(FOAM_LIBBIN)/dummy -lptscotchDecomp \
     -ledgeMesh \
     -ltriSurface \
     -ldynamicMesh
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/Make/options b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/Make/options
index 1a1902b559..2d2d1a1178 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/Make/options
+++ b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/Make/options
@@ -19,7 +19,6 @@ EXE_INC = \
 
 EXE_LIBS = \
     -lmeshTools \
-    -ldecompositionMethods -L$(FOAM_LIBBIN)/dummy -lscotchDecomp \
     -ledgeMesh \
     -ltriSurface \
     -ldynamicMesh

From bb8c271262b209f9c897b5acf40520d437670c21 Mon Sep 17 00:00:00 2001
From: laurence <laurence>
Date: Tue, 27 Mar 2012 17:08:16 +0100
Subject: [PATCH 109/317] ENH: cvMesh: Set refinementFactor default to 1.0

---
 .../surfaceCellSizeFunction/surfaceCellSizeFunction.C        | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/surfaceCellSizeFunction/surfaceCellSizeFunction.C b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/surfaceCellSizeFunction/surfaceCellSizeFunction.C
index 7022511c4c..04d9af824f 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/surfaceCellSizeFunction/surfaceCellSizeFunction.C
+++ b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/surfaceCellSizeFunction/surfaceCellSizeFunction.C
@@ -46,7 +46,10 @@ Foam::surfaceCellSizeFunction::surfaceCellSizeFunction
     dictionary(surfaceCellSizeFunctionDict),
     surface_(surface),
     coeffsDict_(subDict(type + "Coeffs")),
-    refinementFactor_(readScalar(lookup("refinementFactor")))
+    refinementFactor_
+    (
+        lookupOrDefault<scalar>("refinementFactor", 1.0)
+    )
 {}
 
 

From b2b12835fa7a049502fb53152bc4c2e479a9d304 Mon Sep 17 00:00:00 2001
From: laurence <laurence>
Date: Tue, 27 Mar 2012 17:09:03 +0100
Subject: [PATCH 110/317] ENH: cvMesh: Add edgeMergeAngle to cvMeshDict

---
 .../cvMesh/conformalVoronoiMesh/cvControls/cvControls.C   | 5 +++++
 .../cvMesh/conformalVoronoiMesh/cvControls/cvControls.H   | 8 ++++++++
 .../cvMesh/conformalVoronoiMesh/cvControls/cvControlsI.H  | 6 ++++++
 3 files changed, 19 insertions(+)

diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cvControls/cvControls.C b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cvControls/cvControls.C
index c99f9324ff..996aa71abf 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cvControls/cvControls.C
+++ b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cvControls/cvControls.C
@@ -291,6 +291,11 @@ Foam::cvControls::cvControls
         filteringDict.lookup("mergeClosenessCoeff")
     );
 
+    edgeMergeAngle_ = readScalar
+    (
+        filteringDict.lookup("edgeMergeAngle")
+    );
+
     continueFilteringOnBadInitialPolyMesh_ = Switch
     (
         filteringDict.lookupOrDefault<Switch>
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cvControls/cvControls.H b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cvControls/cvControls.H
index dae83ed06d..58dd06fc74 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cvControls/cvControls.H
+++ b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cvControls/cvControls.H
@@ -234,6 +234,11 @@ class cvControls
         //  being merged, fraction of the local target cell size
         scalar mergeClosenessCoeff_;
 
+        //- If the angle between two dual edges that are connected by a single
+        //  point is less than this angle, then the edges will be merged into a
+        //  single edge.
+        scalar edgeMergeAngle_;
+
         //- If the mesh quality criteria cannot be satisfied, continue
         //  with filtering anyway?
         Switch continueFilteringOnBadInitialPolyMesh_;
@@ -405,6 +410,9 @@ public:
             //- Return the mergeClosenessCoeff
             inline scalar mergeClosenessCoeff() const;
 
+            //- Return the edgeMergeAngle
+            inline scalar edgeMergeAngle() const;
+
             //- Return the continueFilteringOnBadInitialPolyMesh Switch
             inline Switch continueFilteringOnBadInitialPolyMesh() const;
 
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cvControls/cvControlsI.H b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cvControls/cvControlsI.H
index ce45e5f522..50df7e8f58 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cvControls/cvControlsI.H
+++ b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cvControls/cvControlsI.H
@@ -166,6 +166,12 @@ inline Foam::scalar Foam::cvControls::mergeClosenessCoeff() const
 }
 
 
+inline Foam::scalar Foam::cvControls::edgeMergeAngle() const
+{
+    return edgeMergeAngle_;
+}
+
+
 inline Foam::Switch
 Foam::cvControls::continueFilteringOnBadInitialPolyMesh() const
 {

From 3b00da1488e79c7d1badc0015c525fe567178e81 Mon Sep 17 00:00:00 2001
From: laurence <laurence>
Date: Tue, 27 Mar 2012 17:10:14 +0100
Subject: [PATCH 111/317] ENH: cvMesh: add filter function to remove nearly
 parallel edges

The edges are connected by a single point only.
---
 .../conformalVoronoiMesh.H                    |  12 +
 .../conformalVoronoiMeshCalcDualMesh.C        | 325 +++++++++++++++++-
 .../conformalVoronoiMeshI.H                   |  43 +++
 3 files changed, 363 insertions(+), 17 deletions(-)

diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.H b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.H
index cde15d0662..f9648dc1e7 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.H
+++ b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.H
@@ -536,6 +536,11 @@ private:
             const Delaunay::Finite_edges_iterator& eit
         ) const;
 
+        boolList dualFaceBoundaryPoints
+        (
+            const Delaunay::Finite_edges_iterator& eit
+        ) const;
+
         //- Finds the maximum filterCount of the dual vertices
         //  (Delaunay cells) that form the dual face produced by the
         //  supplied edge
@@ -842,6 +847,13 @@ private:
             const Delaunay::Finite_facets_iterator& fit
         ) const;
 
+        //- Merge adjacent edges that are not attached to other faces
+        label mergeNearlyParallelEdges
+        (
+            const pointField& pts,
+            const scalar maxCosAngle
+        );
+
         //- Merge vertices that are very close together
         void mergeCloseDualVertices
         (
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshCalcDualMesh.C b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshCalcDualMesh.C
index 7cc8957de0..85b4ba7b27 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshCalcDualMesh.C
+++ b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshCalcDualMesh.C
@@ -212,6 +212,20 @@ void Foam::conformalVoronoiMesh::calcDualMesh
                     Info<< nl << "Collapsing unnecessary faces" << endl;
 
                     collapseFaces(points, boundaryPts, deferredCollapseFaces);
+
+                    const scalar maxCosAngle
+                        = cos(degToRad(cvMeshControls().edgeMergeAngle()));
+
+                    Info<< nl << "Merging adjacent edges which have an angle "
+                        << "of greater than "
+                        << cvMeshControls().edgeMergeAngle() << ": " << endl;
+
+                    label nRemovedEdges =
+                        mergeNearlyParallelEdges(points, maxCosAngle);
+
+                    reduce(nRemovedEdges, sumOp<label>());
+
+                    Info<< "    Merged " << nRemovedEdges << " edges" << endl;
                 }
 
                 labelHashSet wrongFaces = checkPolyMeshQuality(points);
@@ -652,6 +666,113 @@ Foam::label Foam::conformalVoronoiMesh::mergeCloseDualVertices
 }
 
 
+Foam::label Foam::conformalVoronoiMesh::mergeNearlyParallelEdges
+(
+    const pointField& pts,
+    const scalar maxCosAngle
+)
+{
+    List<HashSet<label> > pointFaceCount(number_of_cells());
+    labelList pointNeighbour(number_of_cells(), -1);
+
+    Map<label> dualPtIndexMap;
+
+    for
+    (
+        Delaunay::Finite_edges_iterator eit = finite_edges_begin();
+        eit != finite_edges_end();
+        ++eit
+    )
+    {
+        Cell_handle c = eit->first;
+        Vertex_handle vA = c->vertex(eit->second);
+        Vertex_handle vB = c->vertex(eit->third);
+
+        if (isBoundaryDualFace(eit))
+        {
+            const face f = buildDualFace(eit);
+
+            forAll(f, pI)
+            {
+                const label pIndex = f[pI];
+
+                const label prevPointI = f.prevLabel(pI);
+                const label nextPointI = f.nextLabel(pI);
+
+                pointFaceCount[pIndex].insert(prevPointI);
+                pointFaceCount[pIndex].insert(nextPointI);
+                pointNeighbour[pIndex] = nextPointI;
+            }
+        }
+        else if
+        (
+            vA->internalOrBoundaryPoint()
+         || vB->internalOrBoundaryPoint()
+        )
+        {
+            const face f = buildDualFace(eit);
+            const boolList faceBoundaryPoints = dualFaceBoundaryPoints(eit);
+
+            forAll(f, pI)
+            {
+                const label pIndex = f[pI];
+
+                const label prevPointI = f.prevLabel(pI);
+                const label nextPointI = f.nextLabel(pI);
+
+                pointFaceCount[pIndex].insert(prevPointI);
+                pointFaceCount[pIndex].insert(nextPointI);
+
+                if (faceBoundaryPoints[pI] == false)
+                {
+                    pointNeighbour[pIndex] = nextPointI;
+                }
+                else
+                {
+                    if (faceBoundaryPoints[prevPointI] == true)
+                    {
+                        pointNeighbour[pIndex] = prevPointI;
+                    }
+                    else if (faceBoundaryPoints[nextPointI] == true)
+                    {
+                        pointNeighbour[pIndex] = nextPointI;
+                    }
+                    else
+                    {
+                        pointNeighbour[pIndex] = pIndex;
+                    }
+                }
+            }
+        }
+    }
+
+    forAll(pointFaceCount, pI)
+    {
+        if (pointFaceCount[pI].size() == 2)
+        {
+            List<vector> edges(2, vector(0, 0, 0));
+
+            label count = 0;
+            forAllConstIter(HashSet<label>, pointFaceCount[pI], iter)
+            {
+                edges[count] = pts[pI] - pts[iter.key()];
+                edges[count] /= mag(edges[count]) + VSMALL;
+                count++;
+            }
+
+            if (mag(edges[0] & edges[1]) > maxCosAngle)
+            {
+                dualPtIndexMap.insert(pI, pointNeighbour[pI]);
+            }
+        }
+    }
+
+    reindexDualVertices(dualPtIndexMap);
+
+    return dualPtIndexMap.size();
+}
+
+
 void Foam::conformalVoronoiMesh::smoothSurface
 (
     pointField& pts,
@@ -696,7 +817,6 @@ void Foam::conformalVoronoiMesh::smoothSurface
     } while (nCollapsedFaces > 0);
 
     // Force all points of boundary faces to be on the surface
-
     for
     (
         Delaunay::Finite_cells_iterator cit = finite_cells_begin();
@@ -917,6 +1037,7 @@ void Foam::conformalVoronoiMesh::collapseFaces
 
         mergeCloseDualVertices(pts, boundaryPts);
 
+
         if (nCollapsedFaces > 0)
         {
             Info<< "    Collapsed " << nCollapsedFaces << " faces" << endl;
@@ -932,6 +1053,7 @@ void Foam::conformalVoronoiMesh::collapseFaces
         }
 
     } while (nCollapsedFaces > 0);
+
 }
 
 
@@ -1064,6 +1186,25 @@ Foam::conformalVoronoiMesh::collapseFace
 
     bool allowEarlyCollapseToPoint = true;
 
+
+//    // Quick exit
+//    label smallEdges = 0;
+//    const edgeList& fEdges = f.edges();
+//    forAll(fEdges, eI)
+//    {
+//        const edge& e = fEdges[eI];
+//
+//        if (e.mag(pts) < 0.2*targetFaceSize)
+//        {
+//            smallEdges++;
+//        }
+//    }
+//    if (smallEdges == 0)
+//    {
+//        return fcmNone;
+//    }
+
+
     // if (maxFC > cvMeshControls().filterCountSkipThreshold() - 3)
     // {
     //     limitToQuadsOrTris = true;
@@ -1071,6 +1212,7 @@ Foam::conformalVoronoiMesh::collapseFace
     //     allowEarlyCollapseToPoint = false;
     // }
 
+
     collapseSizeLimitCoeff *= pow
     (
         cvMeshControls().filterErrorReductionCoeff(),
@@ -1158,6 +1300,91 @@ Foam::conformalVoronoiMesh::collapseFace
         }
     }
 
+
+    scalar maxDist = 0;
+    scalar minDist = GREAT;
+//
+//    if (f.size() <= 3)
+//    {
+//        const edgeList& fEdges = f.edges();
+//
+//        forAll(fEdges, eI)
+//        {
+//            const edge& e = fEdges[eI];
+//            const scalar d = e.mag(pts);
+//
+//            if (d > maxDist)
+//            {
+//                maxDist = d;
+//                collapseAxis = e.vec(pts);
+//            }
+//            else if (d < minDist && d != 0)
+//            {
+//                minDist = d;
+//            }
+//        }
+//    }
+//    else
+//    {
+//        forAll(f, pI)
+//        {
+//            for (label i = pI + 1; i < f.size(); ++i)
+//            {
+//                if
+//                (
+//                    f[i] != f.nextLabel(pI)
+//                 && f[i] != f.prevLabel(pI)
+//                )
+//                {
+//                    scalar d = mag(pts[f[pI]] - pts[f[i]]);
+//
+//                    if (d > maxDist)
+//                    {
+//                        maxDist = d;
+//                        collapseAxis = pts[f[pI]] - pts[f[i]];
+//                    }
+//                    else if (d < minDist && d != 0)
+//                    {
+//                        minDist = d;
+//                    }
+//                }
+//            }
+//        }
+//    }
+//
+//    const edgeList& fEdges = f.edges();
+//
+//    scalar perimeter = 0;
+//
+//    forAll(fEdges, eI)
+//    {
+//        const edge& e = fEdges[eI];
+//        const scalar d = e.mag(pts);
+//
+//        perimeter += d;
+//
+////        collapseAxis += e.vec(pts);
+//
+//        if (d > maxDist)
+//        {
+//            collapseAxis = e.vec(pts);
+//            maxDist = d;
+//        }
+//        else if (d < minDist && d != 0)
+//        {
+//            minDist = d;
+//        }
+//    }
+//
+//    collapseAxis /= mag(collapseAxis);
+//
+////    Info<< f.size() << " " << minDist << " " << maxDist << " | "
+////        << collapseAxis << endl;
+//
+//    aspectRatio = maxDist/minDist;
+//
+//    aspectRatio = min(aspectRatio, sqr(perimeter)/(16.0*fA));
+
     if (magSqr(collapseAxis) < VSMALL)
     {
         WarningIn
@@ -1170,9 +1397,9 @@ Foam::conformalVoronoiMesh::collapseFace
         // Output face and collapse axis for visualisation
 
         Pout<< "# Aspect ratio = " << aspectRatio << nl
-            << "# inertia = " << J << nl
-            << "# determinant = " << detJ << nl
-            << "# eigenvalues = " << eigenValues(J) << nl
+//            << "# inertia = " << J << nl
+//            << "# determinant = " << detJ << nl
+//            << "# eigenvalues = " << eigenValues(J) << nl
             << "# collapseAxis = " << collapseAxis << nl
             << "# facePts = " << facePts << nl
             << endl;
@@ -1280,8 +1507,6 @@ Foam::conformalVoronoiMesh::collapseFace
     {
         scalar guardFraction = cvMeshControls().edgeCollapseGuardFraction();
 
-        cvMeshControls().maxCollapseFaceToPointSideLengthCoeff();
-
         if
         (
             allowEarlyCollapseToPoint
@@ -1337,6 +1562,8 @@ Foam::conformalVoronoiMesh::collapseFace
             Foam::point collapseToPt =
                 collapseAxis*(sum(dNeg)/dNeg.size() - dShift) + fC;
 
+//            DynamicList<label> faceBoundaryPts(f.size());
+
             forAll(facePtsNeg, fPtI)
             {
                 if (boundaryPts[facePtsNeg[fPtI]] == true)
@@ -1351,9 +1578,32 @@ Foam::conformalVoronoiMesh::collapseFace
                     collapseToPt = pts[collapseToPtI];
 
                     break;
+
+//                    faceBoundaryPts.append(facePtsNeg[fPtI]);
                 }
             }
 
+//            if (!faceBoundaryPts.empty())
+//            {
+//                if (faceBoundaryPts.size() == 2)
+//                {
+//                    collapseToPtI = faceBoundaryPts[0];
+//
+//                    collapseToPt =
+//                        0.5*(pts[faceBoundaryPts[0]] + pts[faceBoundaryPts[1]]);
+//                }
+//                else if (faceBoundaryPts.size() < f.size())
+//                {
+//                    face bFace(faceBoundaryPts);
+//
+//                    collapseToPtI = faceBoundaryPts.first();
+//
+//                    collapseToPt = bFace.centre(pts);
+//                }
+//            }
+//
+//            faceBoundaryPts.clear();
+
             // ...otherwise arbitrarily choosing the most distant
             // point as the index to collapse to.
 
@@ -1384,9 +1634,30 @@ Foam::conformalVoronoiMesh::collapseFace
                     collapseToPt = pts[collapseToPtI];
 
                     break;
+
+//                    faceBoundaryPts.append(facePtsNeg[fPtI]);
                 }
             }
 
+//            if (!faceBoundaryPts.empty())
+//            {
+//                if (faceBoundaryPts.size() == 2)
+//                {
+//                    collapseToPtI = faceBoundaryPts[0];
+//
+//                    collapseToPt =
+//                        0.5*(pts[faceBoundaryPts[0]] + pts[faceBoundaryPts[1]]);
+//                }
+//                else if (faceBoundaryPts.size() < f.size())
+//                {
+//                    face bFace(faceBoundaryPts);
+//
+//                    collapseToPtI = faceBoundaryPts.first();
+//
+//                    collapseToPt = bFace.centre(pts);
+//                }
+//            }
+
             // ...otherwise arbitrarily choosing the most distant
             // point as the index to collapse to.
 
@@ -1406,6 +1677,8 @@ Foam::conformalVoronoiMesh::collapseFace
 
             Foam::point collapseToPt = fC;
 
+            DynamicList<label> faceBoundaryPts(f.size());
+
             forAll(facePts, fPtI)
             {
                 if (boundaryPts[facePts[fPtI]] == true)
@@ -1415,11 +1688,32 @@ Foam::conformalVoronoiMesh::collapseFace
                     // use the first boundary point encountered if
                     // there are multiple boundary points.
 
-                    collapseToPtI = facePts[fPtI];
+//                    collapseToPtI = facePts[fPtI];
+//
+//                    collapseToPt = pts[collapseToPtI];
+//
+//                    break;
 
-                    collapseToPt = pts[collapseToPtI];
+                    faceBoundaryPts.append(facePts[fPtI]);
+                }
+            }
 
-                    break;
+            if (!faceBoundaryPts.empty())
+            {
+                if (faceBoundaryPts.size() == 2)
+                {
+                    collapseToPtI = faceBoundaryPts[0];
+
+                    collapseToPt =
+                        0.5*(pts[faceBoundaryPts[0]] + pts[faceBoundaryPts[1]]);
+                }
+                else if (faceBoundaryPts.size() < f.size())
+                {
+                    face bFace(faceBoundaryPts);
+
+                    collapseToPtI = faceBoundaryPts.first();
+
+                    collapseToPt = bFace.centre(pts);
                 }
             }
 
@@ -1858,7 +2152,10 @@ Foam::labelHashSet Foam::conformalVoronoiMesh::findOffsetPatchFaces
         }
     }
 
-    offsetBoundaryCells.write();
+    if (cvMeshControls().objOutput())
+    {
+        offsetBoundaryCells.write();
+    }
 
     return offsetBoundaryCells;
 }
@@ -2092,13 +2389,7 @@ void Foam::conformalVoronoiMesh::indexDualVertices
 
             pts[dualVertI] = cit->dual();
 
-            if
-            (
-                !cit->vertex(0)->internalOrBoundaryPoint()
-             || !cit->vertex(1)->internalOrBoundaryPoint()
-             || !cit->vertex(2)->internalOrBoundaryPoint()
-             || !cit->vertex(3)->internalOrBoundaryPoint()
-            )
+            if (cit->boundaryDualVertex())
             {
                 // This is a boundary dual vertex
                 boundaryPts[dualVertI] = true;
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshI.H b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshI.H
index 1e24b7d8ef..43d8c077fc 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshI.H
+++ b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshI.H
@@ -366,6 +366,49 @@ inline bool Foam::conformalVoronoiMesh::isBoundaryDualFace
 }
 
 
+inline Foam::List<bool> Foam::conformalVoronoiMesh::dualFaceBoundaryPoints
+(
+    const Delaunay::Finite_edges_iterator& eit
+) const
+{
+    Cell_circulator ccStart = incident_cells(*eit);
+    Cell_circulator cc1 = ccStart;
+    Cell_circulator cc2 = cc1;
+
+    // Advance the second circulator so that it always stays on the next
+    // cell around the edge;
+    cc2++;
+
+    DynamicList<bool> tmpFaceBoundaryPoints;
+
+    do
+    {
+        label cc1I = cc1->cellIndex();
+
+        label cc2I = cc2->cellIndex();
+
+        if (cc1I != cc2I)
+        {
+            if (cc1->boundaryDualVertex())
+            {
+                tmpFaceBoundaryPoints.append(true);
+            }
+            else
+            {
+                tmpFaceBoundaryPoints.append(false);
+            }
+        }
+
+        cc1++;
+
+        cc2++;
+
+    } while (cc1 != ccStart);
+
+    return tmpFaceBoundaryPoints;
+}
+
+
 inline Foam::List<Foam::label> Foam::conformalVoronoiMesh::processorsAttached
 (
     const Delaunay::Finite_facets_iterator& fit

From 6f459d646c4e9bdf1ccd34a9d5c970023d10e806 Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Tue, 27 Mar 2012 17:40:02 +0100
Subject: [PATCH 112/317] ENH: Code clean-up and improved messages

---
 src/combustionModels/PaSR/PaSR.C | 52 ++++++++++++++++----------------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/src/combustionModels/PaSR/PaSR.C b/src/combustionModels/PaSR/PaSR.C
index 286b9f3f0c..16720de35b 100644
--- a/src/combustionModels/PaSR/PaSR.C
+++ b/src/combustionModels/PaSR/PaSR.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -53,10 +53,15 @@ Foam::combustionModels::PaSR<CombThermoType>::PaSR
         dimensionedScalar("kappa", dimless, 0.0)
     ),
     useReactionRate_(this->coeffs().lookupOrDefault("useReactionRate", false))
-{}
+{
+    if (useReactionRate_)
+    {
+        Info<< "    using reaction rate" << endl;
+    }
+}
 
 
-// * * * * * * * * * * * * * * * * Destructors * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
 template<class CombThermoType>
 Foam::combustionModels::PaSR<CombThermoType>::~PaSR()
@@ -79,13 +84,12 @@ void Foam::combustionModels::PaSR<CombThermoType>::correct()
 {
     if (this->active())
     {
+        const scalar t = this->mesh().time().value();
+        const scalar dt = this->mesh().time().deltaTValue();
+
         if (!useReactionRate_)
         {
-            this->pChemistry_->solve
-            (
-                this->mesh().time().value()-this->mesh().time().deltaTValue(),
-                this->mesh().time().deltaTValue()
-            );
+            this->pChemistry_->solve(t - dt, dt);
         }
         else
         {
@@ -94,35 +98,35 @@ void Foam::combustionModels::PaSR<CombThermoType>::correct()
 
         if (turbulentReaction_)
         {
+            tmp<volScalarField> trho(this->rho());
+            const volScalarField& rho = trho();
             tmp<volScalarField> tepsilon(this->turbulence().epsilon());
             const volScalarField& epsilon = tepsilon();
             tmp<volScalarField> tmuEff(this->turbulence().muEff());
             const volScalarField& muEff = tmuEff();
+
             tmp<volScalarField> ttc(tc());
             const volScalarField& tc = ttc();
+
+            const dimensionedScalar e0
+            (
+                "e0",
+                sqr(dimLength)/pow3(dimTime),
+                SMALL
+            );
+
             forAll(epsilon, i)
             {
                 if (epsilon[i] > 0)
                 {
-                    const dimensionedScalar e0
-                    (
-                        "e0",
-                        sqr(dimLength)/pow3(dimTime), SMALL
-                    );
-
                     scalar tk =
                         Cmix_.value()
-                       *Foam::sqrt
-                       (
-                            muEff[i]/this->rho()()[i]/(epsilon[i] + e0.value())
-                       );
+                       *Foam::sqrt(muEff[i]/rho[i]/(epsilon[i] + e0.value()));
 
                     // Chalmers PaSR model
                     if (!useReactionRate_)
                     {
-                        kappa_[i] =
-                            ( this->mesh().time().deltaTValue() + tc[i])
-                        /( this->mesh().time().deltaTValue() + tc[i] + tk);
+                        kappa_[i] = (dt + tc[i])/(dt + tc[i] + tk);
                     }
                     else
                     {
@@ -148,11 +152,7 @@ template<class CombThermoType>
 Foam::tmp<Foam::fvScalarMatrix>
 Foam::combustionModels::PaSR<CombThermoType>::R(const volScalarField& Y) const
 {
-
-    tmp<fvScalarMatrix> tSu
-    (
-        new fvScalarMatrix(Y, dimMass/dimTime)
-    );
+    tmp<fvScalarMatrix> tSu(new fvScalarMatrix(Y, dimMass/dimTime));
 
     fvScalarMatrix& Su = tSu();
 

From 3c6c6750810ea282ce0120b0b9a1c8435a3d6a88 Mon Sep 17 00:00:00 2001
From: laurence <laurence>
Date: Fri, 30 Mar 2012 08:53:47 +0100
Subject: [PATCH 113/317] STYLE: Remove trailing whitespace

---
 .../chemFoam/readInitialConditions.H          |  2 +-
 .../test/vectorTools/Test-vectorTools.C       |  2 +-
 .../cv2DControls/cv2DControls.H               |  2 +-
 .../cv2DMesh/insertSurfaceNearPointPairs.C    |  2 +-
 .../uniformValue/uniformValue.H               |  2 +-
 .../patchToPoly2DMesh/patchToPoly2DMesh.C     |  2 +-
 .../patchToPoly2DMesh/patchToPoly2DMesh.H     |  2 +-
 .../manipulation/checkMesh/checkTopology.C    |  2 +-
 .../surfaceFeatureExtract.C                   |  2 +-
 .../surfaceFeatureExtractDict                 | 20 +++++++++----------
 .../explicitSource/ExplicitSource.H           |  2 +-
 .../pressureGradientExplicitSource.H          |  2 +-
 .../rotorDiskSource/rotorDiskSource.H         |  4 ++--
 .../ParticleErosion/ParticleErosion.C         |  2 +-
 .../VoidFraction/VoidFraction.H               |  2 +-
 .../PairCollision/PairCollision.C             |  2 +-
 .../field/turbulenceFields/postProcessingDict |  2 +-
 .../pressureCoefficient/pressureCoefficient.H |  2 +-
 18 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/applications/solvers/combustion/chemFoam/readInitialConditions.H b/applications/solvers/combustion/chemFoam/readInitialConditions.H
index 3fbb13a0fc..08050be816 100644
--- a/applications/solvers/combustion/chemFoam/readInitialConditions.H
+++ b/applications/solvers/combustion/chemFoam/readInitialConditions.H
@@ -99,7 +99,7 @@
     scalar u0 = hs0 - p0/rho0;
     scalar R0 = p0/(rho0*T0);
     Rspecific[0] = R0;
- 
+
     scalar integratedHeat = 0.0;
 
     Info << constProp << " will be held constant." << nl
diff --git a/applications/test/vectorTools/Test-vectorTools.C b/applications/test/vectorTools/Test-vectorTools.C
index 0c85ac935b..85d18ed989 100644
--- a/applications/test/vectorTools/Test-vectorTools.C
+++ b/applications/test/vectorTools/Test-vectorTools.C
@@ -8,7 +8,7 @@ using namespace Foam;
 
 void test(const vector& a, const vector& b, const scalar tolerance)
 {
-    Info<< "Vectors " << a << " and " << b 
+    Info<< "Vectors " << a << " and " << b
         << " are (to tolerance of " << tolerance << "): ";
 
     if (vectorTools::areParallel(a, b, tolerance))
diff --git a/applications/utilities/mesh/generation/cv2DMesh/conformalVoronoi2DMesh/cv2DControls/cv2DControls.H b/applications/utilities/mesh/generation/cv2DMesh/conformalVoronoi2DMesh/cv2DControls/cv2DControls.H
index 4ab8bdb167..0b3cf0b4f2 100644
--- a/applications/utilities/mesh/generation/cv2DMesh/conformalVoronoi2DMesh/cv2DControls/cv2DControls.H
+++ b/applications/utilities/mesh/generation/cv2DMesh/conformalVoronoi2DMesh/cv2DControls/cv2DControls.H
@@ -252,4 +252,4 @@ public:
 
 #endif
 
-// ************************************************************************* // 
+// ************************************************************************* //
diff --git a/applications/utilities/mesh/generation/cv2DMesh/insertSurfaceNearPointPairs.C b/applications/utilities/mesh/generation/cv2DMesh/insertSurfaceNearPointPairs.C
index a1d1919f12..3d4ac7cf2a 100644
--- a/applications/utilities/mesh/generation/cv2DMesh/insertSurfaceNearPointPairs.C
+++ b/applications/utilities/mesh/generation/cv2DMesh/insertSurfaceNearPointPairs.C
@@ -93,7 +93,7 @@ void Foam::CV2D::insertSurfaceNearPointPairs()
 
                         nNearPoints++;
 
-                        // Correct the edge iterator for the change in the 
+                        // Correct the edge iterator for the change in the
                         // number of edges following the point-pair insertion
                         eit = Finite_edges_iterator
                         (
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/uniformValue/uniformValue.H b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/uniformValue/uniformValue.H
index 9e54e86b48..3677837933 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/uniformValue/uniformValue.H
+++ b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/uniformValue/uniformValue.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation 
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMesh/patchToPoly2DMesh/patchToPoly2DMesh.C b/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMesh/patchToPoly2DMesh/patchToPoly2DMesh.C
index 30c7a0334a..055b910282 100644
--- a/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMesh/patchToPoly2DMesh/patchToPoly2DMesh.C
+++ b/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMesh/patchToPoly2DMesh/patchToPoly2DMesh.C
@@ -330,4 +330,4 @@ void Foam::patchToPoly2DMesh::createMesh()
 // * * * * * * * * * * * * * * Friend Operators * * * * * * * * * * * * * * //
 
 
-// ************************************************************************* // 
+// ************************************************************************* //
diff --git a/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMesh/patchToPoly2DMesh/patchToPoly2DMesh.H b/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMesh/patchToPoly2DMesh/patchToPoly2DMesh.H
index a07f73f0d4..df03ebe4d8 100644
--- a/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMesh/patchToPoly2DMesh/patchToPoly2DMesh.H
+++ b/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMesh/patchToPoly2DMesh/patchToPoly2DMesh.H
@@ -162,4 +162,4 @@ public:
 
 #endif
 
-// ************************************************************************* // 
+// ************************************************************************* //
diff --git a/applications/utilities/mesh/manipulation/checkMesh/checkTopology.C b/applications/utilities/mesh/manipulation/checkMesh/checkTopology.C
index a01fa988d2..28930c573f 100644
--- a/applications/utilities/mesh/manipulation/checkMesh/checkTopology.C
+++ b/applications/utilities/mesh/manipulation/checkMesh/checkTopology.C
@@ -82,7 +82,7 @@ Foam::label Foam::checkTopology
                 if (cFaces[i] < 0 || cFaces[i] >= mesh.nFaces())
                 {
                     cells.insert(cellI);
-                    break;  
+                    break;
                 }
             }
         }
diff --git a/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtract.C b/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtract.C
index b02c4c815d..3856d52ada 100644
--- a/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtract.C
+++ b/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtract.C
@@ -488,7 +488,7 @@ int main(int argc, char *argv[])
         "word",
         "name of dictionary to provide feature extraction information"
     );
-    
+
 #   include "setRootCase.H"
 #   include "createTime.H"
 
diff --git a/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtractDict b/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtractDict
index 3621d64a29..ef97d13889 100644
--- a/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtractDict
+++ b/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtractDict
@@ -24,40 +24,40 @@ surface1.stl
         // Load from an existing feature edge file
         featureEdgeFile "constant/triSurface/featureEdges.nas";
     }
-    
+
     trimFeatures
     {
         // Remove features with fewer than the specified number of edges
         minElem         0;
-        
+
         // Remove features shorter than the specified cumulative length
         minLen          0.0;
-    }  
-    
+    }
+
     subsetFeatures
-    {        
+    {
         // Use a plane to select feature edges
         // (normal)(basePoint)
         plane               (1 0 0)(0 0 0);
-        
+
         // Select feature edges using a box
         // (minPt)(maxPt)
         insideBox           (0 0 0)(1 1 1);
         outsideBox          (0 0 0)(1 1 1);
-        
+
         // Remove any non-manifold (open or > 2 connected faces) edges
         manifoldEdges       no;
     }
-    
+
     // Output the curvature of the surface
     curvature               no;
-    
+
     // Output the proximity of feature points and edges to each other
     featureProximity        no;
     // The maximum search distance to use when looking for other feature
     // points and edges
     maxFeatureProximity     1;
-    
+
     // Out put the closeness of surface elements to other surface elements.
     closeness               no;
 
diff --git a/src/fieldSources/basicSource/explicitSource/ExplicitSource.H b/src/fieldSources/basicSource/explicitSource/ExplicitSource.H
index e53e6004be..95e752d17b 100644
--- a/src/fieldSources/basicSource/explicitSource/ExplicitSource.H
+++ b/src/fieldSources/basicSource/explicitSource/ExplicitSource.H
@@ -39,7 +39,7 @@ Description
             }
         }
 
-    If volumeMode = 
+    If volumeMode =
         - absolute: values are given as <quantity>
         - specific: values are given as <quantity>/m3
 
diff --git a/src/fieldSources/basicSource/pressureGradientExplicitSource/pressureGradientExplicitSource.H b/src/fieldSources/basicSource/pressureGradientExplicitSource/pressureGradientExplicitSource.H
index bf760254af..48b4bf2c24 100644
--- a/src/fieldSources/basicSource/pressureGradientExplicitSource/pressureGradientExplicitSource.H
+++ b/src/fieldSources/basicSource/pressureGradientExplicitSource/pressureGradientExplicitSource.H
@@ -38,7 +38,7 @@ Description
             gradPini    gradPini [0 2 -2 0 0] 0; // initial pressure gradient
             flowDir     (1 0 0);    // flow direction
         }
-        
+
 
 SourceFiles
     pressureGradientExplicitSource.C
diff --git a/src/fieldSources/basicSource/rotorDiskSource/rotorDiskSource.H b/src/fieldSources/basicSource/rotorDiskSource/rotorDiskSource.H
index ae2d8a2a47..946c752999 100644
--- a/src/fieldSources/basicSource/rotorDiskSource/rotorDiskSource.H
+++ b/src/fieldSources/basicSource/rotorDiskSource/rotorDiskSource.H
@@ -202,7 +202,7 @@ protected:
         //- Maximum radius
         scalar rMax_;
 
-        
+
     // Protected Member Functions
 
         //- Check data
@@ -247,7 +247,7 @@ public:
 
     // Constructors
 
-        
+
         //- Construct from components
         rotorDiskSource
         (
diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleErosion/ParticleErosion.C b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleErosion/ParticleErosion.C
index 4d4f4dc3ca..87d03eade7 100644
--- a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleErosion/ParticleErosion.C
+++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleErosion/ParticleErosion.C
@@ -181,7 +181,7 @@ void Foam::ParticleErosion<CloudType>::postPatch
 
         // particle direction of travel
         const vector& U = p.U();
-        
+
         // quick reject if particle travelling away from the patch
         if ((-nw & U) < 0)
         {
diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/VoidFraction/VoidFraction.H b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/VoidFraction/VoidFraction.H
index 0b15a6f620..26f0f65018 100644
--- a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/VoidFraction/VoidFraction.H
+++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/VoidFraction/VoidFraction.H
@@ -112,7 +112,7 @@ public:
 
             //- Post-move hook
             virtual void postMove
-            (   
+            (
                 const parcelType& p,
                 const label cellI,
                 const scalar dt
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairCollision.C b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairCollision.C
index 4910faa51c..d5e459ddc0 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairCollision.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairCollision.C
@@ -285,7 +285,7 @@ void Foam::PairCollision<CloudType>::wallInteraction()
                             );
 
                             flatSiteData.append(wSD);
- 
+
                             particleHit = true;
                         }
                     }
diff --git a/src/postProcessing/functionObjects/field/turbulenceFields/postProcessingDict b/src/postProcessing/functionObjects/field/turbulenceFields/postProcessingDict
index 6d4b0409fa..bc35e7dc0f 100644
--- a/src/postProcessing/functionObjects/field/turbulenceFields/postProcessingDict
+++ b/src/postProcessing/functionObjects/field/turbulenceFields/postProcessingDict
@@ -26,7 +26,7 @@ functions
 
         fields
         (
-            R 
+            R
         );
     }
 }
diff --git a/src/postProcessing/functionObjects/utilities/pressureCoefficient/pressureCoefficient.H b/src/postProcessing/functionObjects/utilities/pressureCoefficient/pressureCoefficient.H
index 5f0379aa7f..7d72e3b784 100644
--- a/src/postProcessing/functionObjects/utilities/pressureCoefficient/pressureCoefficient.H
+++ b/src/postProcessing/functionObjects/utilities/pressureCoefficient/pressureCoefficient.H
@@ -28,7 +28,7 @@ Description
     Calculates pressure coefficient, c_p
 
         c_p = p/p_dyn,inf
-    
+
     where:
 
         p_dyn,inf = 0.5*rho*mag(U_inf)^2

From 29d7526d32d708a5fb3eea31f7e6887bb76b96bc Mon Sep 17 00:00:00 2001
From: laurence <laurence>
Date: Fri, 30 Mar 2012 09:00:01 +0100
Subject: [PATCH 114/317] STYLE: Change header dates

---
 .../extrude2DMesh/extrude2DMesh/extrude2DMesh/extrude2DMesh.C   | 2 +-
 .../extrude2DMesh/extrude2DMesh/extrude2DMesh/extrude2DMesh.H   | 2 +-
 .../extrude2DMesh/patchToPoly2DMesh/patchToPoly2DMesh.C         | 2 +-
 .../extrude2DMesh/patchToPoly2DMesh/patchToPoly2DMesh.H         | 2 +-
 .../utilities/mesh/generation/extrude2DMesh/extrude2DMeshApp.C  | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMesh/extrude2DMesh/extrude2DMesh.C b/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMesh/extrude2DMesh/extrude2DMesh.C
index f7c1026542..0bbe7d926a 100644
--- a/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMesh/extrude2DMesh/extrude2DMesh.C
+++ b/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMesh/extrude2DMesh/extrude2DMesh.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMesh/extrude2DMesh/extrude2DMesh.H b/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMesh/extrude2DMesh/extrude2DMesh.H
index 0733b5e236..3b6efd267e 100644
--- a/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMesh/extrude2DMesh/extrude2DMesh.H
+++ b/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMesh/extrude2DMesh/extrude2DMesh.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMesh/patchToPoly2DMesh/patchToPoly2DMesh.C b/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMesh/patchToPoly2DMesh/patchToPoly2DMesh.C
index 055b910282..7979fa966a 100644
--- a/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMesh/patchToPoly2DMesh/patchToPoly2DMesh.C
+++ b/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMesh/patchToPoly2DMesh/patchToPoly2DMesh.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMesh/patchToPoly2DMesh/patchToPoly2DMesh.H b/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMesh/patchToPoly2DMesh/patchToPoly2DMesh.H
index df03ebe4d8..ea27dc6f53 100644
--- a/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMesh/patchToPoly2DMesh/patchToPoly2DMesh.H
+++ b/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMesh/patchToPoly2DMesh/patchToPoly2DMesh.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2011 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMeshApp.C b/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMeshApp.C
index 4bb6b97b16..5381c0b57a 100644
--- a/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMeshApp.C
+++ b/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMeshApp.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

From 04bacc14d55436c14857999e0fdd54312b4f911a Mon Sep 17 00:00:00 2001
From: laurence <laurence>
Date: Wed, 28 Mar 2012 08:43:27 +0100
Subject: [PATCH 115/317] ENH: cvMesh blob tutorial updated

---
 tutorials/mesh/cvMesh/blob/Allrun                  |  1 -
 tutorials/mesh/cvMesh/blob/system/cvMeshDict       | 11 +++++------
 tutorials/mesh/cvMesh/blob/system/decomposeParDict |  4 ++--
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/tutorials/mesh/cvMesh/blob/Allrun b/tutorials/mesh/cvMesh/blob/Allrun
index 1812d8e273..aafdcec484 100755
--- a/tutorials/mesh/cvMesh/blob/Allrun
+++ b/tutorials/mesh/cvMesh/blob/Allrun
@@ -6,7 +6,6 @@ cd ${0%/*} || exit 1    # run from this directory
 
 runApplication blockMesh
 runApplication cvMesh
-runApplication collapseEdges 1e-3 45
 runApplication snappyHexMesh
 runApplication checkMesh -constant -allGeometry -allTopology
 
diff --git a/tutorials/mesh/cvMesh/blob/system/cvMeshDict b/tutorials/mesh/cvMesh/blob/system/cvMeshDict
index b92aa466de..ca2fd3ccd6 100644
--- a/tutorials/mesh/cvMesh/blob/system/cvMeshDict
+++ b/tutorials/mesh/cvMesh/blob/system/cvMeshDict
@@ -59,7 +59,6 @@ initialPoints
 
     autoDensityCoeffs
     {
-        minCellSizeLimit 0.04;
         minLevels 0;
         maxSizeRatio 5.0;
         sampleResolution 5;
@@ -150,21 +149,20 @@ motionControl
         {
             priority            1;
             mode                bothSides;
+            
             surfaceCellSizeFunction uniformValue;
             uniformValueCoeffs
             {
                 surfaceCellSize 0.04;
             }
-            refinementFactor    1;
 
-            cellSizeFunction    uniformDistance;
+            cellSizeFunction        uniformDistance;
             uniformDistanceCoeffs
             {
                 distance        0.1;
             }
             linearDistanceCoeffs
             {
-                surfaceCellSize         0.02;
                 distanceCellSize        $defaultCellSize;
                 distance                0.1;
             }
@@ -217,14 +215,15 @@ polyMeshFiltering
 {
     writeTetDualMesh                        false;
     filterSizeCoeff                         0.2;
-    mergeClosenessCoeff                     1e-9;
+    mergeClosenessCoeff                     1e-3;
+    edgeMergeAngle                          45;
     continueFilteringOnBadInitialPolyMesh   true;
     filterErrorReductionCoeff               0.5;
     filterCountSkipThreshold                4;
     surfaceStepFaceAngle                    80;
     maxCollapseIterations                   25;
     maxConsecutiveEqualFaceSets             5;
-    edgeCollapseGuardFraction               0.3;
+    edgeCollapseGuardFraction               0.1;
     maxCollapseFaceToPointSideLengthCoeff   0.35;
 }
 
diff --git a/tutorials/mesh/cvMesh/blob/system/decomposeParDict b/tutorials/mesh/cvMesh/blob/system/decomposeParDict
index c347636c49..58cbdde811 100644
--- a/tutorials/mesh/cvMesh/blob/system/decomposeParDict
+++ b/tutorials/mesh/cvMesh/blob/system/decomposeParDict
@@ -17,8 +17,8 @@ FoamFile
 
 numberOfSubdomains 8;
 
-method          scotch;
-// method          ptscotch;
+//method          scotch;
+ method          ptscotch;
 // method          hierarchical;
 
 simpleCoeffs

From 39426e88dd6e2bbe5792934204aebf43eecd4548 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Wed, 28 Mar 2012 18:00:37 +0100
Subject: [PATCH 116/317] BUG: vtkUnstructuredReader: update faceMap consistent
 with faces.

---
 src/fileFormats/vtk/vtkUnstructuredReader.C | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/fileFormats/vtk/vtkUnstructuredReader.C b/src/fileFormats/vtk/vtkUnstructuredReader.C
index 3d80e1ccec..049f68f89b 100644
--- a/src/fileFormats/vtk/vtkUnstructuredReader.C
+++ b/src/fileFormats/vtk/vtkUnstructuredReader.C
@@ -704,6 +704,7 @@ void Foam::vtkUnstructuredReader::read(ISstream& inFile)
             labelList faceVerts;
             readBlock(inFile, nNumbers, faceVerts);
             faces_.setSize(nFaces);
+            faceMap_.setSize(nFaces);
             label elemI = 0;
             forAll(faces_, faceI)
             {

From 6aecbac20f6cd8353959279365efe323fd55213c Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Wed, 28 Mar 2012 18:01:24 +0100
Subject: [PATCH 117/317] ENH: UniformDimensionedField: do READ_IF_PRESENT for
 2 argument constructor

---
 .../UniformDimensionedField.C                 | 19 +++++++++++++++++--
 .../UniformDimensionedField.H                 |  4 ++--
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/src/OpenFOAM/fields/UniformDimensionedFields/UniformDimensionedField.C b/src/OpenFOAM/fields/UniformDimensionedFields/UniformDimensionedField.C
index 54db26a30c..2879e28f10 100644
--- a/src/OpenFOAM/fields/UniformDimensionedFields/UniformDimensionedField.C
+++ b/src/OpenFOAM/fields/UniformDimensionedFields/UniformDimensionedField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -36,7 +36,22 @@ Foam::UniformDimensionedField<Type>::UniformDimensionedField
 :
     regIOobject(io),
     dimensioned<Type>(dt)
-{}
+{
+    // Read value
+    if
+    (
+        (
+            io.readOpt() == IOobject::MUST_READ
+         || io.readOpt() == IOobject::MUST_READ_IF_MODIFIED
+        )
+     || (io.readOpt() == IOobject::READ_IF_PRESENT && headerOk())
+    )
+    {
+        dictionary dict(readStream(typeName));
+        this->dimensions().reset(dict.lookup("dimensions"));
+        dict.lookup("value") >> this->value();
+    }
+}
 
 
 template<class Type>
diff --git a/src/OpenFOAM/fields/UniformDimensionedFields/UniformDimensionedField.H b/src/OpenFOAM/fields/UniformDimensionedFields/UniformDimensionedField.H
index 62461df280..bab30a55ff 100644
--- a/src/OpenFOAM/fields/UniformDimensionedFields/UniformDimensionedField.H
+++ b/src/OpenFOAM/fields/UniformDimensionedFields/UniformDimensionedField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -64,7 +64,7 @@ public:
 
     // Constructors
 
-        //- Construct from components
+        //- Construct from components. Either reads or uses supplied value.
         UniformDimensionedField(const IOobject&, const dimensioned<Type>&);
 
         //- Construct as copy

From 9e017c724deee1bc15003e0b7d168ef486366a93 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Wed, 28 Mar 2012 18:09:42 +0100
Subject: [PATCH 118/317] STYLE: sampleDict: improved comment

---
 .../utilities/postProcessing/sampling/sample/sampleDict   | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/applications/utilities/postProcessing/sampling/sample/sampleDict b/applications/utilities/postProcessing/sampling/sample/sampleDict
index b55b190bf7..7a9b6f7f0a 100644
--- a/applications/utilities/postProcessing/sampling/sample/sampleDict
+++ b/applications/utilities/postProcessing/sampling/sample/sampleDict
@@ -47,12 +47,14 @@ formatOptions
 }
 
 // interpolationScheme. choice of
-//      cell          : use cell-centre value only; constant over cells (default)
+//      cell          : use cell-centre value only; constant over cells
+//                      (default)
 //      cellPoint     : use cell-centre and vertex values
 //      cellPointFace : use cell-centre, vertex and face values.
 //      pointMVC      : use point values only (Mean Value Coordinates)
-//      cellPatchConstrained : use cell-centre except on boundary faces where
-//        it uses the boundary value. For use with e.g. patchCloudSet.
+//      cellPatchConstrained : like 'cell' but uses cell-centre except on
+//                             boundary faces where it uses the boundary value.
+//                             For use with e.g. patchCloudSet.
 // 1] vertex values determined from neighbouring cell-centre values
 // 2] face values determined using the current face interpolation scheme
 //    for the field (linear, gamma, etc.)

From 4d57d3c568e439cbff704b5ac983074731731c0d Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Wed, 28 Mar 2012 18:10:13 +0100
Subject: [PATCH 119/317] STYLE: extrudeToRegionMesh: comment

---
 .../generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C | 1 -
 1 file changed, 1 deletion(-)

diff --git a/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C b/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C
index a0873ab4c9..b1bcf33d82 100644
--- a/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C
+++ b/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C
@@ -36,7 +36,6 @@ Description
       (nonuniformTransform)cyclic \<zoneA\>_\<zoneB\>
     - extrudes into master direction (i.e. away from the owner cell
       if flipMap is false)
-    - not parallel
 
 \verbatim
 

From f9b7b4b445109650c06526f8691b13948f641b6c Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Wed, 28 Mar 2012 18:59:26 +0100
Subject: [PATCH 120/317] ENH: hexRef8: perfect restart

---
 .../polyTopoChange/polyTopoChange/hexRef8.C   | 83 ++++++++++++++++---
 .../polyTopoChange/polyTopoChange/hexRef8.H   | 24 ++++--
 .../meshRefinement/meshRefinement.C           | 44 +---------
 3 files changed, 88 insertions(+), 63 deletions(-)

diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8.C
index 560010c31a..b577a17177 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -1745,6 +1745,7 @@ void Foam::hexRef8::setInstance(const fileName& inst)
 
     cellLevel_.instance() = inst;
     pointLevel_.instance() = inst;
+    level0Edge_.instance() = inst;
     history_.instance() = inst;
 }
 
@@ -1752,7 +1753,7 @@ void Foam::hexRef8::setInstance(const fileName& inst)
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 // Construct from mesh, read refinement data
-Foam::hexRef8::hexRef8(const polyMesh& mesh)
+Foam::hexRef8::hexRef8(const polyMesh& mesh, const bool readHistory)
 :
     mesh_(mesh),
     cellLevel_
@@ -1781,7 +1782,19 @@ Foam::hexRef8::hexRef8(const polyMesh& mesh)
         ),
         labelList(mesh_.nPoints(), 0)
     ),
-    level0Edge_(getLevel0EdgeLength()),
+    level0Edge_
+    (
+        IOobject
+        (
+            "level0Edge",
+            mesh_.facesInstance(),
+            polyMesh::meshSubDir,
+            mesh_,
+            IOobject::READ_IF_PRESENT,
+            IOobject::AUTO_WRITE
+        ),
+        dimensionedScalar("level0Edge", dimLength, getLevel0EdgeLength())
+    ),
     history_
     (
         IOobject
@@ -1790,15 +1803,24 @@ Foam::hexRef8::hexRef8(const polyMesh& mesh)
             mesh_.facesInstance(),
             polyMesh::meshSubDir,
             mesh_,
-            IOobject::READ_IF_PRESENT,
+            IOobject::NO_READ,
             IOobject::AUTO_WRITE
         ),
-        mesh_.nCells()    // All cells visible if could not be read
+        (readHistory ? mesh_.nCells() : 0)  // All cells visible if not be read
     ),
     faceRemover_(mesh_, GREAT),     // merge boundary faces wherever possible
     savedPointLevel_(0),
     savedCellLevel_(0)
 {
+    if (readHistory)
+    {
+        history_.readOpt() = IOobject::READ_IF_PRESENT;
+        if (history_.headerOk())
+        {
+            history_.read();
+        }
+    }
+
     if (history_.active() && history_.visibleCells().size() != mesh_.nCells())
     {
         FatalErrorIn
@@ -1849,7 +1871,8 @@ Foam::hexRef8::hexRef8
     const polyMesh& mesh,
     const labelList& cellLevel,
     const labelList& pointLevel,
-    const refinementHistory& history
+    const refinementHistory& history,
+    const scalar level0Edge
 )
 :
     mesh_(mesh),
@@ -1879,7 +1902,24 @@ Foam::hexRef8::hexRef8
         ),
         pointLevel
     ),
-    level0Edge_(getLevel0EdgeLength()),
+    level0Edge_
+    (
+        IOobject
+        (
+            "level0Edge",
+            mesh_.facesInstance(),
+            polyMesh::meshSubDir,
+            mesh_,
+            IOobject::NO_READ,
+            IOobject::AUTO_WRITE
+        ),
+        dimensionedScalar
+        (
+            "level0Edge",
+            dimLength,
+            (level0Edge >= 0 ? level0Edge : getLevel0EdgeLength())
+        )
+    ),
     history_
     (
         IOobject
@@ -1945,7 +1985,8 @@ Foam::hexRef8::hexRef8
 (
     const polyMesh& mesh,
     const labelList& cellLevel,
-    const labelList& pointLevel
+    const labelList& pointLevel,
+    const scalar level0Edge
 )
 :
     mesh_(mesh),
@@ -1975,7 +2016,24 @@ Foam::hexRef8::hexRef8
         ),
         pointLevel
     ),
-    level0Edge_(getLevel0EdgeLength()),
+    level0Edge_
+    (
+        IOobject
+        (
+            "level0Edge",
+            mesh_.facesInstance(),
+            polyMesh::meshSubDir,
+            mesh_,
+            IOobject::NO_READ,
+            IOobject::AUTO_WRITE
+        ),
+        dimensionedScalar
+        (
+            "level0Edge",
+            dimLength,
+            (level0Edge >= 0 ? level0Edge : getLevel0EdgeLength())
+        )
+    ),
     history_
     (
         IOobject
@@ -2621,7 +2679,7 @@ Foam::labelList Foam::hexRef8::consistentSlowRefinement2
             << "Value should be >= 1" << exit(FatalError);
     }
 
-    const scalar level0Size = 2*maxFaceDiff*level0Edge_;
+    const scalar level0Size = 2*maxFaceDiff*level0EdgeLength();
 
 
     // Bit tricky. Say we want a distance of three cells between two
@@ -5514,7 +5572,10 @@ void Foam::hexRef8::setUnrefinement
 // Write refinement to polyMesh directory.
 bool Foam::hexRef8::write() const
 {
-    bool writeOk = cellLevel_.write() && pointLevel_.write();
+    bool writeOk =
+        cellLevel_.write()
+     && pointLevel_.write()
+     && level0Edge_.write();
 
     if (history_.active())
     {
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8.H b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8.H
index 36980f7320..503412dd38 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8.H
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -43,6 +43,7 @@ SourceFiles
 #include "removeFaces.H"
 #include "refinementHistory.H"
 #include "PackedBoolList.H"
+#include "uniformDimensionedFields.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -74,7 +75,7 @@ class hexRef8
         labelIOList pointLevel_;
 
         //- Typical edge length between unrefined points
-        const scalar level0Edge_;
+        uniformDimensionedScalarField level0Edge_;
 
         //- Refinement history
         refinementHistory history_;
@@ -319,24 +320,29 @@ public:
     // Constructors
 
         //- Construct from mesh, read_if_present refinement data
-        //  (from write below)
-        hexRef8(const polyMesh& mesh);
+        //  (from write below). If readHistory is true does read_if_present
+        //  of refinement history. If false clears all history
+        hexRef8(const polyMesh& mesh, const bool readHistory = true);
 
-        //- Construct from mesh and un/refinement data.
+        //- Construct from mesh and un/refinement data and optional size of
+        //  starting cells
         hexRef8
         (
             const polyMesh& mesh,
             const labelList& cellLevel,
             const labelList& pointLevel,
-            const refinementHistory& history
+            const refinementHistory& history,
+            const scalar level0Edge = -GREAT
         );
 
-        //- Construct from mesh and refinement data.
+        //- Construct from mesh and refinement data and optional size of
+        //  starting cells
         hexRef8
         (
             const polyMesh& mesh,
             const labelList& cellLevel,
-            const labelList& pointLevel
+            const labelList& pointLevel,
+            const scalar level0Edge = -GREAT
         );
 
 
@@ -367,7 +373,7 @@ public:
             //- Typical edge length between unrefined points
             scalar level0EdgeLength() const
             {
-                return level0Edge_;
+                return level0Edge_.value();
             }
 
         // Refinement
diff --git a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinement.C b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinement.C
index 5503e6d2a8..c2565fc670 100644
--- a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinement.C
+++ b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinement.C
@@ -877,49 +877,7 @@ Foam::meshRefinement::meshRefinement
     meshCutter_
     (
         mesh,
-        labelIOList
-        (
-            IOobject
-            (
-                "cellLevel",
-                mesh_.facesInstance(),
-                fvMesh::meshSubDir,
-                mesh,
-                IOobject::READ_IF_PRESENT,
-                IOobject::NO_WRITE,
-                false
-            ),
-            labelList(mesh_.nCells(), 0)
-        ),
-        labelIOList
-        (
-            IOobject
-            (
-                "pointLevel",
-                mesh_.facesInstance(),
-                fvMesh::meshSubDir,
-                mesh,
-                IOobject::READ_IF_PRESENT,
-                IOobject::NO_WRITE,
-                false
-            ),
-            labelList(mesh_.nPoints(), 0)
-        ),
-        refinementHistory
-        (
-            IOobject
-            (
-                "refinementHistory",
-                mesh_.facesInstance(),
-                fvMesh::meshSubDir,
-                mesh_,
-                IOobject::NO_READ,
-                IOobject::NO_WRITE,
-                false
-            ),
-            List<refinementHistory::splitCell8>(0),
-            labelList(0)
-        )   // no unrefinement
+        false   // do not try to read history.
     ),
     surfaceIndex_
     (

From e48b238c013dd8ae58b842aae37c9832b7eba3e8 Mon Sep 17 00:00:00 2001
From: sergio <sergio>
Date: Thu, 29 Mar 2012 15:17:52 +0100
Subject: [PATCH 121/317] ENH: Modifying eCont returning aCont form
 greyMeanAbsEmission and wideBandAbsorptionEmission models and tutorials

---
 .../greyMeanAbsorptionEmission.C              | 19 +------
 .../wideBandAbsorptionEmission.C              | 19 +------
 .../constant/radiationProperties              | 55 ++++++++++++++++++
 .../constant/radiationProperties              | 57 ++++++++++++++++++-
 .../constant/radiationProperties              | 55 ++++++++++++++++++
 5 files changed, 168 insertions(+), 37 deletions(-)

diff --git a/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/greyMeanAbsorptionEmission/greyMeanAbsorptionEmission.C b/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/greyMeanAbsorptionEmission/greyMeanAbsorptionEmission.C
index 49d23cc84a..d1a924ad11 100644
--- a/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/greyMeanAbsorptionEmission/greyMeanAbsorptionEmission.C
+++ b/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/greyMeanAbsorptionEmission/greyMeanAbsorptionEmission.C
@@ -284,24 +284,7 @@ Foam::radiation::greyMeanAbsorptionEmission::aCont(const label bandI) const
 Foam::tmp<Foam::volScalarField>
 Foam::radiation::greyMeanAbsorptionEmission::eCont(const label bandI) const
 {
-    tmp<volScalarField> e
-    (
-        new volScalarField
-        (
-            IOobject
-            (
-                "eCont" + name(bandI),
-                mesh().time().timeName(),
-                mesh(),
-                IOobject::NO_READ,
-                IOobject::NO_WRITE
-            ),
-            mesh(),
-            dimensionedScalar("e", dimless/dimLength, 0.0)
-        )
-    );
-
-    return e;
+   return aCont(bandI);
 }
 
 
diff --git a/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/wideBandAbsorptionEmission/wideBandAbsorptionEmission.C b/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/wideBandAbsorptionEmission/wideBandAbsorptionEmission.C
index c2640f402a..dcaf7f01f6 100644
--- a/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/wideBandAbsorptionEmission/wideBandAbsorptionEmission.C
+++ b/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/wideBandAbsorptionEmission/wideBandAbsorptionEmission.C
@@ -231,24 +231,7 @@ Foam::radiation::wideBandAbsorptionEmission::aCont(const label bandI) const
 Foam::tmp<Foam::volScalarField>
 Foam::radiation::wideBandAbsorptionEmission::eCont(const label bandI) const
 {
-    tmp<volScalarField> e
-    (
-        new volScalarField
-        (
-            IOobject
-            (
-                "e",
-                mesh().time().timeName(),
-                mesh(),
-                IOobject::NO_READ,
-                IOobject::NO_WRITE
-            ),
-            mesh(),
-            dimensionedScalar("e", dimless/dimLength, 0.0)
-        )
-    );
-
-    return e;
+    return aCont(bandI);
 }
 
 
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/radiationProperties b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/radiationProperties
index 3282b1b075..ca98125036 100644
--- a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/radiationProperties
+++ b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/radiationProperties
@@ -137,6 +137,61 @@ greyMeanAbsorptionEmissionCoeffs
         );
     }
 
+    O2
+    {
+        Tcommon         300;
+        invTemp         true;
+        Tlow            200;
+        Thigh           2500;
+
+        loTcoeffs
+        (
+            0
+            0
+            0
+            0
+            0
+            0
+        );
+        hiTcoeffs
+        (
+            0.1
+            0
+            0
+            0
+            0
+            0
+        );
+    }
+
+
+    N2
+    {
+        Tcommon         300;
+        invTemp         true;
+        Tlow            200;
+        Thigh           2500;
+
+        loTcoeffs
+        (
+            0
+            0
+            0
+            0
+            0
+            0
+        );
+        hiTcoeffs
+        (
+            0.1
+            0
+            0
+            0
+            0
+            0
+        );
+    }
+
 }
 
 scatterModel    constantScatter;
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/radiationProperties b/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/radiationProperties
index 54fb40ca34..f9ff27414e 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/radiationProperties
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/radiationProperties
@@ -43,7 +43,7 @@ absorptionEmissionModel greyMeanAbsorptionEmission;
 constantAbsorptionEmissionCoeffs
 {
     a               a [ 0 -1 0 0 0 0 0 ] 0.01;
-    e               e [ 0 -1 0 0 0 0 0 ] 0;
+    e               e [ 0 -1 0 0 0 0 0 ] 0.01;
     E               E [ 1 -1 -3 0 0 0 0 ] 0;
 }
 
@@ -134,6 +134,61 @@ greyMeanAbsorptionEmissionCoeffs
             0
         );
     }
+
+    O2
+    {
+        Tcommon         300;
+        invTemp         true;
+        Tlow            200;
+        Thigh           2500;
+
+        loTcoeffs
+        (
+            0
+            0
+            0
+            0
+            0
+            0
+        );
+        hiTcoeffs
+        (
+            0.1
+            0
+            0
+            0
+            0
+            0
+        );
+    }
+
+
+    N2
+    {
+        Tcommon         300;
+        invTemp         true;
+        Tlow            200;
+        Thigh           2500;
+
+        loTcoeffs
+        (
+            0
+            0
+            0
+            0
+            0
+            0
+        );
+        hiTcoeffs
+        (
+            0.1
+            0
+            0
+            0
+            0
+            0
+        );
+    }
 }
 
 scatterModel    constantScatter;
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/radiationProperties b/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/radiationProperties
index 05fda138af..60bbcc81c4 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/radiationProperties
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/radiationProperties
@@ -135,6 +135,61 @@ greyMeanAbsorptionEmissionCoeffs
             0
         );
     }
+
+    O2
+    {
+        Tcommon         300;
+        invTemp         true;
+        Tlow            200;
+        Thigh           2500;
+
+        loTcoeffs
+        (
+            0
+            0
+            0
+            0
+            0
+            0
+        );
+        hiTcoeffs
+        (
+            0.1
+            0
+            0
+            0
+            0
+            0
+        );
+    }
+
+
+    N2
+    {
+        Tcommon         300;
+        invTemp         true;
+        Tlow            200;
+        Thigh           2500;
+
+        loTcoeffs
+        (
+            0
+            0
+            0
+            0
+            0
+            0
+        );
+        hiTcoeffs
+        (
+            0.1
+            0
+            0
+            0
+            0
+            0
+        );
+    }
 }
 
 scatterModel    constantScatter;

From 7c66d8a2a0341d09208d97f7442bb4818b276dd8 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Thu, 29 Mar 2012 18:07:24 +0100
Subject: [PATCH 122/317] STYLE: surfaceFeautreExtract: indentation and comment

---
 .../surfaceFeatureExtract.C                   |  2 +-
 .../surfaceFeatureExtractDict                 | 20 +++++++++----------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtract.C b/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtract.C
index b02c4c815d..2221fd5532 100644
--- a/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtract.C
+++ b/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtract.C
@@ -486,7 +486,7 @@ int main(int argc, char *argv[])
     (
         "dict",
         "word",
-        "name of dictionary to provide feature extraction information"
+        "specify alternative dictionary for the feature extraction information"
     );
     
 #   include "setRootCase.H"
diff --git a/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtractDict b/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtractDict
index 3621d64a29..ef97d13889 100644
--- a/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtractDict
+++ b/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtractDict
@@ -24,40 +24,40 @@ surface1.stl
         // Load from an existing feature edge file
         featureEdgeFile "constant/triSurface/featureEdges.nas";
     }
-    
+
     trimFeatures
     {
         // Remove features with fewer than the specified number of edges
         minElem         0;
-        
+
         // Remove features shorter than the specified cumulative length
         minLen          0.0;
-    }  
-    
+    }
+
     subsetFeatures
-    {        
+    {
         // Use a plane to select feature edges
         // (normal)(basePoint)
         plane               (1 0 0)(0 0 0);
-        
+
         // Select feature edges using a box
         // (minPt)(maxPt)
         insideBox           (0 0 0)(1 1 1);
         outsideBox          (0 0 0)(1 1 1);
-        
+
         // Remove any non-manifold (open or > 2 connected faces) edges
         manifoldEdges       no;
     }
-    
+
     // Output the curvature of the surface
     curvature               no;
-    
+
     // Output the proximity of feature points and edges to each other
     featureProximity        no;
     // The maximum search distance to use when looking for other feature
     // points and edges
     maxFeatureProximity     1;
-    
+
     // Out put the closeness of surface elements to other surface elements.
     closeness               no;
 

From 84160060017cedb4e4a2205ec02e7edf9e1fb930 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Fri, 30 Mar 2012 09:19:50 +0100
Subject: [PATCH 123/317] COMP: phaseHydrostaticPressureFvPatchScalarField.C:
 single precision build

---
 .../phaseHydrostaticPressureFvPatchScalarField.C              | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/finiteVolume/fields/fvPatchFields/derived/phaseHydrostaticPressure/phaseHydrostaticPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/phaseHydrostaticPressure/phaseHydrostaticPressureFvPatchScalarField.C
index 6b9a22da0f..09da151f98 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/phaseHydrostaticPressure/phaseHydrostaticPressureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/phaseHydrostaticPressure/phaseHydrostaticPressureFvPatchScalarField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -148,7 +148,7 @@ void Foam::phaseHydrostaticPressureFvPatchScalarField::updateCoeffs()
     // scalar rhor = 1000;
     // scalarField alphap1 = max(min(alphap, 1.0), 0.0);
     // valueFraction() = alphap1/(alphap1 + rhor*(1.0 - alphap1));
-    valueFraction() = max(min(alphap, 1.0), 0.0);
+    valueFraction() = max(min(alphap, scalar(1.0)), scalar(0.0));
 
     refValue() =
         pRefValue_

From 50bddce02e9194e60402cff6b23169ef5f51f729 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Fri, 30 Mar 2012 09:21:57 +0100
Subject: [PATCH 124/317] STYLE: redistributeParMesh: split off mesh loading

---
 .../redistributePar/loadOrCreateMesh.C        | 323 ++++++++++++++++++
 .../redistributePar/loadOrCreateMesh.H        |  58 ++++
 2 files changed, 381 insertions(+)
 create mode 100644 applications/utilities/parallelProcessing/redistributePar/loadOrCreateMesh.C
 create mode 100644 applications/utilities/parallelProcessing/redistributePar/loadOrCreateMesh.H

diff --git a/applications/utilities/parallelProcessing/redistributePar/loadOrCreateMesh.C b/applications/utilities/parallelProcessing/redistributePar/loadOrCreateMesh.C
new file mode 100644
index 0000000000..9e68e1f726
--- /dev/null
+++ b/applications/utilities/parallelProcessing/redistributePar/loadOrCreateMesh.C
@@ -0,0 +1,323 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "loadOrCreateMesh.H"
+#include "processorPolyPatch.H"
+#include "Time.H"
+
+// * * * * * * * * * * * * * * * Global Functions  * * * * * * * * * * * * * //
+
+// Read mesh if available. Otherwise create empty mesh with same non-proc
+// patches as proc0 mesh. Requires all processors to have all patches
+// (and in same order).
+Foam::autoPtr<Foam::fvMesh> Foam::loadOrCreateMesh
+(
+    const IOobject& io
+)
+{
+    fileName meshSubDir;
+
+    if (io.name() == polyMesh::defaultRegion)
+    {
+        meshSubDir = polyMesh::meshSubDir;
+    }
+    else
+    {
+        meshSubDir = io.name()/polyMesh::meshSubDir;
+    }
+
+    // Check who has a mesh
+    const bool haveMesh = isDir(io.time().path()/io.instance()/meshSubDir);
+
+Pout<< "meshpath:" << io.time().path()/io.instance()/meshSubDir << endl;
+Pout<< "haveMesh:" << haveMesh << endl;
+
+    if (!haveMesh)
+    {
+        // Create dummy mesh. Only used on procs that don't have mesh.
+        IOobject noReadIO(io);
+        noReadIO.readOpt() = IOobject::NO_READ;
+        fvMesh dummyMesh
+        (
+            noReadIO,
+            xferCopy(pointField()),
+            xferCopy(faceList()),
+            xferCopy(labelList()),
+            xferCopy(labelList()),
+            false
+        );
+        // Add some dummy zones so upon reading it does not read them
+        // from the undecomposed case. Should be done as extra argument to
+        // regIOobject::readStream?
+        List<pointZone*> pz
+        (
+            1,
+            new pointZone
+            (
+                "dummyPointZone",
+                labelList(0),
+                0,
+                dummyMesh.pointZones()
+            )
+        );
+        List<faceZone*> fz
+        (
+            1,
+            new faceZone
+            (
+                "dummyFaceZone",
+                labelList(0),
+                boolList(0),
+                0,
+                dummyMesh.faceZones()
+            )
+        );
+        List<cellZone*> cz
+        (
+            1,
+            new cellZone
+            (
+                "dummyCellZone",
+                labelList(0),
+                0,
+                dummyMesh.cellZones()
+            )
+        );
+        dummyMesh.addZones(pz, fz, cz);
+        //Pout<< "Writing dummy mesh to " << dummyMesh.polyMesh::objectPath()
+        //    << endl;
+        dummyMesh.write();
+    }
+
+    //Pout<< "Reading mesh from " << io.objectPath() << endl;
+    autoPtr<fvMesh> meshPtr(new fvMesh(io));
+    fvMesh& mesh = meshPtr();
+
+
+    // Sync patches
+    // ~~~~~~~~~~~~
+
+    if (Pstream::master())
+    {
+        // Send patches
+        for
+        (
+            int slave=Pstream::firstSlave();
+            slave<=Pstream::lastSlave();
+            slave++
+        )
+        {
+            OPstream toSlave(Pstream::scheduled, slave);
+            toSlave << mesh.boundaryMesh();
+        }
+    }
+    else
+    {
+        // Receive patches
+        IPstream fromMaster(Pstream::scheduled, Pstream::masterNo());
+        PtrList<entry> patchEntries(fromMaster);
+
+        if (haveMesh)
+        {
+            // Check master names against mine
+
+            const polyBoundaryMesh& patches = mesh.boundaryMesh();
+
+            forAll(patchEntries, patchI)
+            {
+                const entry& e = patchEntries[patchI];
+                const word type(e.dict().lookup("type"));
+                const word& name = e.keyword();
+
+                if (type == processorPolyPatch::typeName)
+                {
+                    break;
+                }
+
+                if (patchI >= patches.size())
+                {
+                    FatalErrorIn
+                    (
+                        "createMesh(const Time&, const fileName&, const bool)"
+                    )   << "Non-processor patches not synchronised."
+                        << endl
+                        << "Processor " << Pstream::myProcNo()
+                        << " has only " << patches.size()
+                        << " patches, master has "
+                        << patchI
+                        << exit(FatalError);
+                }
+
+                if
+                (
+                    type != patches[patchI].type()
+                 || name != patches[patchI].name()
+                )
+                {
+                    FatalErrorIn
+                    (
+                        "createMesh(const Time&, const fileName&, const bool)"
+                    )   << "Non-processor patches not synchronised."
+                        << endl
+                        << "Master patch " << patchI
+                        << " name:" << type
+                        << " type:" << type << endl
+                        << "Processor " << Pstream::myProcNo()
+                        << " patch " << patchI
+                        << " has name:" << patches[patchI].name()
+                        << " type:" << patches[patchI].type()
+                        << exit(FatalError);
+                }
+            }
+        }
+        else
+        {
+            // Add patch
+            List<polyPatch*> patches(patchEntries.size());
+            label nPatches = 0;
+
+            forAll(patchEntries, patchI)
+            {
+                const entry& e = patchEntries[patchI];
+                const word type(e.dict().lookup("type"));
+                const word& name = e.keyword();
+
+                if (type == processorPolyPatch::typeName)
+                {
+                    break;
+                }
+
+                //Pout<< "Adding patch:" << nPatches
+                //    << " name:" << name << " type:" << type << endl;
+
+                dictionary patchDict(e.dict());
+                patchDict.remove("nFaces");
+                patchDict.add("nFaces", 0);
+                patchDict.remove("startFace");
+                patchDict.add("startFace", 0);
+
+                patches[patchI] = polyPatch::New
+                (
+                    name,
+                    patchDict,
+                    nPatches++,
+                    mesh.boundaryMesh()
+                ).ptr();
+            }
+            patches.setSize(nPatches);
+            mesh.addFvPatches(patches, false);  // no parallel comms
+
+            //// Write empty mesh now we have correct patches
+            //meshPtr().write();
+        }
+    }
+
+
+    // Determine zones
+    // ~~~~~~~~~~~~~~~
+
+    wordList pointZoneNames(mesh.pointZones().names());
+    Pstream::scatter(pointZoneNames);
+    wordList faceZoneNames(mesh.faceZones().names());
+    Pstream::scatter(faceZoneNames);
+    wordList cellZoneNames(mesh.cellZones().names());
+    Pstream::scatter(cellZoneNames);
+
+    if (!haveMesh)
+    {
+        // Add the zones. Make sure to remove the old dummy ones first
+        mesh.pointZones().clear();
+        mesh.faceZones().clear();
+        mesh.cellZones().clear();
+
+        List<pointZone*> pz(pointZoneNames.size());
+        forAll(pointZoneNames, i)
+        {
+            pz[i] = new pointZone
+            (
+                pointZoneNames[i],
+                labelList(0),
+                i,
+                mesh.pointZones()
+            );
+        }
+        List<faceZone*> fz(faceZoneNames.size());
+        forAll(faceZoneNames, i)
+        {
+            fz[i] = new faceZone
+            (
+                faceZoneNames[i],
+                labelList(0),
+                boolList(0),
+                i,
+                mesh.faceZones()
+            );
+        }
+        List<cellZone*> cz(cellZoneNames.size());
+        forAll(cellZoneNames, i)
+        {
+            cz[i] = new cellZone
+            (
+                cellZoneNames[i],
+                labelList(0),
+                i,
+                mesh.cellZones()
+            );
+        }
+        mesh.addZones(pz, fz, cz);
+    }
+
+
+    if (!haveMesh)
+    {
+        // We created a dummy mesh file above. Delete it.
+        //Pout<< "Removing dummy mesh " << io.objectPath() << endl;
+        rmDir(io.objectPath());
+    }
+
+    // Force recreation of globalMeshData.
+    mesh.clearOut();
+    mesh.globalData();
+
+
+    // Do some checks.
+
+    // Check if the boundary definition is unique
+    mesh.boundaryMesh().checkDefinition(true);
+    // Check if the boundary processor patches are correct
+    mesh.boundaryMesh().checkParallelSync(true);
+    // Check names of zones are equal
+    mesh.cellZones().checkDefinition(true);
+    mesh.cellZones().checkParallelSync(true);
+    mesh.faceZones().checkDefinition(true);
+    mesh.faceZones().checkParallelSync(true);
+    mesh.pointZones().checkDefinition(true);
+    mesh.pointZones().checkParallelSync(true);
+
+    return meshPtr;
+}
+
+
+// ************************************************************************* //
diff --git a/applications/utilities/parallelProcessing/redistributePar/loadOrCreateMesh.H b/applications/utilities/parallelProcessing/redistributePar/loadOrCreateMesh.H
new file mode 100644
index 0000000000..73d6dfd1c7
--- /dev/null
+++ b/applications/utilities/parallelProcessing/redistributePar/loadOrCreateMesh.H
@@ -0,0 +1,58 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+InNamespace
+    Foam
+
+Description
+    Load or create (0 size) a mesh. Used in distributing meshes to a
+    larger number of processors
+
+SourceFiles
+    loadOrCreateMesh.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef loadOrCreateMesh_H
+#define loadOrCreateMesh_H
+
+#include "fvMesh.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+//- Load (if it exists) or create zero cell mesh given an IOobject:
+//      name     : regionName
+//      instance : exact directory where to find mesh (i.e. does not
+//                 do a findInstance
+autoPtr<fvMesh> loadOrCreateMesh(const IOobject& io);
+
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //

From 928d81c2829c1a642c724018b83b260a02344790 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Fri, 30 Mar 2012 09:23:34 +0100
Subject: [PATCH 125/317] ENH: cvMeshSurfaceSimplify: make robust for open
 surfaces

---
 .../cvMeshSurfaceSimplify.C                   |  2 ++
 .../searchableSurfacesQueries.C               | 30 +++++++++++++++++--
 .../searchableSurfacesQueries.H               |  7 ++++-
 3 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/cvMeshSurfaceSimplify.C b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/cvMeshSurfaceSimplify.C
index adc46f7623..c3518ef1a0 100644
--- a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/cvMeshSurfaceSimplify.C
+++ b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/cvMeshSurfaceSimplify.C
@@ -173,6 +173,8 @@ int main(int argc, char *argv[])
         surfaces,
         points,
         scalarField(points.size(), sqr(GREAT)),
+        searchableSurface::OUTSIDE,     // for non-closed surfaces treat as
+                                        // outside
         nearestSurfaces,
         signedDist
     );
diff --git a/src/meshTools/searchableSurface/searchableSurfacesQueries.C b/src/meshTools/searchableSurface/searchableSurfacesQueries.C
index 4db8f9acf3..26f0a45324 100644
--- a/src/meshTools/searchableSurface/searchableSurfacesQueries.C
+++ b/src/meshTools/searchableSurface/searchableSurfacesQueries.C
@@ -693,6 +693,7 @@ void Foam::searchableSurfacesQueries::signedDistance
     const labelList& surfacesToTest,
     const pointField& samples,
     const scalarField& nearestDistSqr,
+    const searchableSurface::volumeType illegalHandling,
     labelList& nearestSurfaces,
     scalarField& distance
 )
@@ -753,9 +754,32 @@ void Foam::searchableSurfacesQueries::signedDistance
             }
             else
             {
-                FatalErrorIn("signedDistance()")
-                    << "getVolumeType failure, neither INSIDE or OUTSIDE"
-                    << exit(FatalError);
+                switch (illegalHandling)
+                {
+                    case searchableSurface::OUTSIDE:
+                    {
+                        distance[pointI] = dist;
+                        break;
+                    }
+                    case searchableSurface::INSIDE:
+                    {
+                        distance[pointI] = -dist;
+                        break;
+                    }
+                    default:
+                    {
+                        FatalErrorIn("signedDistance()")
+                            << "getVolumeType failure,"
+                            << " neither INSIDE or OUTSIDE."
+                            << " point:" << surfPoints[i]
+                            << " surface:"
+                            << allSurfaces[surfacesToTest[testI]].name()
+                            << " volType:"
+                            << searchableSurface::volumeTypeNames[vT]
+                            << exit(FatalError);
+                        break;
+                    }
+                }
             }
         }
     }
diff --git a/src/meshTools/searchableSurface/searchableSurfacesQueries.H b/src/meshTools/searchableSurface/searchableSurfacesQueries.H
index a2dba23cb5..9f2ebfbadb 100644
--- a/src/meshTools/searchableSurface/searchableSurfacesQueries.H
+++ b/src/meshTools/searchableSurface/searchableSurfacesQueries.H
@@ -184,13 +184,18 @@ public:
                 List<pointIndexHit>&
             );
 
-            //- Find signed distance to nearest surface
+            //- Find signed distance to nearest surface. Outside is positive.
+            //  illegalHandling: how to handle non-inside or outside
+            //      OUTSIDE : treat as outside
+            //      INSIDE  : treat as inside
+            //      UNKNOWN : throw fatal error
             static void signedDistance
             (
                 const PtrList<searchableSurface>& allSurfaces,
                 const labelList& surfacesToTest,
                 const pointField& samples,
                 const scalarField& nearestDistSqr,
+                const searchableSurface::volumeType illegalHandling,
                 labelList& nearestSurfaces,
                 scalarField& distance
             );

From fbf03b524caa09d1e5de4bc3b621d63e1e1a0b13 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Fri, 30 Mar 2012 09:25:32 +0100
Subject: [PATCH 126/317] ENH: CleanFunctions: remove level 0 length file

---
 bin/tools/CleanFunctions | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/tools/CleanFunctions b/bin/tools/CleanFunctions
index 9973503e52..be1c3723b4 100644
--- a/bin/tools/CleanFunctions
+++ b/bin/tools/CleanFunctions
@@ -2,7 +2,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+#   \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
 # License
@@ -88,7 +88,7 @@ cleanCase()
             rm -rf \
             allOwner* cell* face* meshModifiers* \
             owner* neighbour* point* edge* \
-            cellLevel* pointLevel* refinementHistory* surfaceIndex* sets \
+            cellLevel* pointLevel* refinementHistory* level0Edge surfaceIndex* sets \
             > /dev/null 2>&1 \
         )
     fi

From 160f1b52b63eee26a2aa3c7f84f30ccd5d4c6dea Mon Sep 17 00:00:00 2001
From: laurence <laurence>
Date: Fri, 30 Mar 2012 09:40:26 +0100
Subject: [PATCH 127/317] BUG: cvMesh: Correct removal of out-of-bound shape in
 octree

---
 .../conformalVoronoiMeshConformToSurface.C             | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshConformToSurface.C b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshConformToSurface.C
index 989fe2cf95..bf077cece0 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshConformToSurface.C
+++ b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshConformToSurface.C
@@ -440,6 +440,10 @@ void Foam::conformalVoronoiMesh::buildSurfaceConformation
                         existingSurfacePtLocations
                     );
                 }
+//                else
+//                {
+//                    vit->setInternal();
+//                }
             }
             else if (vit->ppSlave() || vit->referredExternal())
             {
@@ -477,6 +481,10 @@ void Foam::conformalVoronoiMesh::buildSurfaceConformation
                         existingSurfacePtLocations
                     );
                 }
+//                else
+//                {
+//                    vit->setInternal();
+//                }
             }
         }
 
@@ -2697,7 +2705,7 @@ void Foam::conformalVoronoiMesh::addSurfaceAndEdgeHits
                             // NEED TO REMOVE FROM THE SURFACE TREE...
                             surfacePtLocationTreePtr_().remove
                             (
-                                existingSurfacePtLocations.size()
+                                existingSurfacePtLocations.size() - 1
                             );
                         }
 

From b8eb3cae7d0d1fc719727d181007986a03c9daa7 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Fri, 30 Mar 2012 09:56:25 +0100
Subject: [PATCH 128/317] ENH: renumberMesh: do not print frontWidth if not
 calculated

---
 .../mesh/manipulation/renumberMesh/renumberMesh.C        | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C b/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C
index 8910645b5c..5f724095ca 100644
--- a/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C
+++ b/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C
@@ -641,9 +641,12 @@ int main(int argc, char *argv[])
     Info<< "Mesh size: " << mesh.globalData().nTotalCells() << nl
         << "Before renumbering :" << nl
         << "    band           : " << band << nl
-        << "    profile        : " << profile << nl
-        << "    rms frontwidth : " << rmsFrontwidth << nl
-        << endl;
+        << "    profile        : " << profile << nl;
+    if (doFrontWidth)
+    {
+        Info<< "    rms frontwidth : " << rmsFrontwidth << nl;
+    }
+    Info<< endl;
 
     bool sortCoupledFaceCells = false;
     bool writeMaps = false;

From e684b76771f4038c881546b7c2c892057a43e5ef Mon Sep 17 00:00:00 2001
From: sergio <sergio>
Date: Fri, 30 Mar 2012 10:53:14 +0100
Subject: [PATCH 129/317] BUG: Keeping kOmegaSST compressible and
 incompressible on the same formulation for nut and mut

---
 src/turbulenceModels/compressible/RAS/kOmegaSST/kOmegaSST.C | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/turbulenceModels/compressible/RAS/kOmegaSST/kOmegaSST.C b/src/turbulenceModels/compressible/RAS/kOmegaSST/kOmegaSST.C
index 51120e89d7..e4032d854c 100644
--- a/src/turbulenceModels/compressible/RAS/kOmegaSST/kOmegaSST.C
+++ b/src/turbulenceModels/compressible/RAS/kOmegaSST/kOmegaSST.C
@@ -268,7 +268,7 @@ kOmegaSST::kOmegaSST
       / max
         (
             a1_*omega_,
-            F2()*sqrt(2.0*magSqr(symm(fvc::grad(U_))))
+            F2()*sqrt(2.0)*mag(symm(fvc::grad(U_)))
         )
     );
     mut_.correctBoundaryConditions();
@@ -365,7 +365,7 @@ void kOmegaSST::correct()
         // Re-calculate viscosity
         mut_ =
             a1_*rho_*k_
-           /max(a1_*omega_, F2()*sqrt(2.0*magSqr(symm(fvc::grad(U_)))));
+           /max(a1_*omega_, F2()*sqrt(2.0)*mag(symm(fvc::grad(U_))));
         mut_.correctBoundaryConditions();
 
         // Re-calculate thermal diffusivity

From 747ba9dd296532e30415fb7b8d8a83be5a87fd7f Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Fri, 30 Mar 2012 12:02:43 +0100
Subject: [PATCH 130/317] ENH: functionObjectTemplate: moved include files to
 header file since $codeData might need them

---
 etc/codeTemplates/dynamicCode/functionObjectTemplate.C | 6 +-----
 etc/codeTemplates/dynamicCode/functionObjectTemplate.H | 6 +++++-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/etc/codeTemplates/dynamicCode/functionObjectTemplate.C b/etc/codeTemplates/dynamicCode/functionObjectTemplate.C
index a747b528b6..b44bdfb8dc 100644
--- a/etc/codeTemplates/dynamicCode/functionObjectTemplate.C
+++ b/etc/codeTemplates/dynamicCode/functionObjectTemplate.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -28,10 +28,6 @@ License
 #include "fvCFD.H"
 #include "unitConversion.H"
 
-//{{{ begin codeInclude
-${codeInclude}
-//}}} end codeInclude
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
diff --git a/etc/codeTemplates/dynamicCode/functionObjectTemplate.H b/etc/codeTemplates/dynamicCode/functionObjectTemplate.H
index bac8354124..bd07fff034 100644
--- a/etc/codeTemplates/dynamicCode/functionObjectTemplate.H
+++ b/etc/codeTemplates/dynamicCode/functionObjectTemplate.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -36,6 +36,10 @@ SourceFiles
 #include "stringList.H"
 #include "pointField.H"
 
+//{{{ begin codeInclude
+${codeInclude}
+//}}} end codeInclude
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam

From 143b4b70397befac1f4ff21b77b5747538d51419 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Fri, 30 Mar 2012 16:02:47 +0100
Subject: [PATCH 131/317] ENH: flange: run snappyHexMesh to add layers

---
 .../mesh/cvMesh/flange/system/cvMeshDict      |  30 +-
 .../cvMesh/flange/system/meshQualityControls  |  76 +++++
 .../cvMesh/flange/system/snappyHexMeshDict    | 309 ++++++++++++++++++
 3 files changed, 396 insertions(+), 19 deletions(-)
 create mode 100644 tutorials/mesh/cvMesh/flange/system/meshQualityControls
 create mode 100644 tutorials/mesh/cvMesh/flange/system/snappyHexMeshDict

diff --git a/tutorials/mesh/cvMesh/flange/system/cvMeshDict b/tutorials/mesh/cvMesh/flange/system/cvMeshDict
index 91a1c4ad0d..cbd86c379d 100644
--- a/tutorials/mesh/cvMesh/flange/system/cvMeshDict
+++ b/tutorials/mesh/cvMesh/flange/system/cvMeshDict
@@ -113,7 +113,7 @@ initialPoints
     minimumSurfaceDistanceCoeff 0.55;
 
     initialPointsMethod         autoDensity;
-    // initialPointsMethod         pointFile;
+    //initialPointsMethod         pointFile;
 
     autoDensityCoeffs
     {
@@ -143,10 +143,15 @@ motionControl
         {
             priority            1;
             mode                inside;
+            surfaceCellSizeFunction uniformValue;
+            uniformValueCoeffs
+            {
+                surfaceCellSize     0.0005;
+            }
+
             cellSizeFunction    linearDistance;
             linearDistanceCoeffs
             {
-                surfaceCellSize     0.0005;
                 distanceCellSize    $defaultCellSize;
                 distance            0.004;
             }
@@ -205,27 +210,14 @@ polyMeshFiltering
     filterCountSkipThreshold                4;
     maxCollapseIterations                   25;
     maxConsecutiveEqualFaceSets             5;
-    surfaceStepFaceAngle                    80;
-    edgeCollapseGuardFraction               0.3;
+    surfaceStepFaceAngle                    90;
+    edgeCollapseGuardFraction               0.0;    //0.3;
     maxCollapseFaceToPointSideLengthCoeff   0.35;
+    edgeMergeAngle                          30;
 }
 
 
-meshQualityControls
-{
-    maxNonOrtho         65;
-    maxBoundarySkewness 50;
-    maxInternalSkewness 10;
-    maxConcave          80;
-    minTetQuality       1e-30;
-    minVol              0;
-    minArea             -1;
-    minTwist            0.001;
-    minDeterminant      0.001;
-    minFaceWeight       0.02;
-    minVolRatio         0.01;
-    minTriangleTwist    -1;
-}
+#include "meshQualityControls"
 
 
 // ************************************************************************* //
diff --git a/tutorials/mesh/cvMesh/flange/system/meshQualityControls b/tutorials/mesh/cvMesh/flange/system/meshQualityControls
new file mode 100644
index 0000000000..09ebbb2458
--- /dev/null
+++ b/tutorials/mesh/cvMesh/flange/system/meshQualityControls
@@ -0,0 +1,76 @@
+/*--------------------------------*- 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;
+
+    root            "";
+    case            "";
+    instance        "";
+    local           "";
+
+    class           dictionary;
+    object          meshQualityControls;
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+meshQualityControls
+{
+    //- Maximum non-orthogonality allowed. Set to 180 to disable.
+    maxNonOrtho         65;
+
+    //- Max skewness allowed. Set to <0 to disable.
+    maxBoundarySkewness 50;
+    maxInternalSkewness 10;
+
+    //- Max concaveness allowed. Is angle (in degrees) below which concavity
+    //  is allowed. 0 is straight face, <0 would be convex face.
+    //  Set to 180 to disable.
+    maxConcave          80;
+
+    //- Minimum quality of the tet formed by the face-centre
+    //  and variable base point minimum decomposition triangles and
+    //  the cell centre. This has to be a positive number for tracking
+    //  to work. Set to very negative number (e.g. -1E30) to
+    //  disable.
+    //     <0 = inside out tet,
+    //      0 = flat tet
+    //      1 = regular tet
+    minTetQuality       1e-30;
+
+    //- Minimum pyramid volume. Is absolute volume of cell pyramid.
+    //  Set to a sensible fraction of the smallest cell volume expected.
+    //  Set to very negative number (e.g. -1E30) to disable.
+    minVol              0;
+
+    //- Minimum face area. Set to <0 to disable.
+    minArea             -1;
+
+    //- Minimum face twist. Set to <-1 to disable. dot product of face normal
+    //- and face centre triangles normal
+    minTwist            0.001;
+
+    //- minimum normalised cell determinant
+    //- 1 = hex, <= 0 = folded or flattened illegal cell
+    minDeterminant      0.001;
+
+    //- minFaceWeight (0 -> 0.5)
+    minFaceWeight       0.02;
+
+    //- minVolRatio (0 -> 1)
+    minVolRatio         0.01;
+
+    //must be >0 for Fluent compatibility
+    minTriangleTwist    -1;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/mesh/cvMesh/flange/system/snappyHexMeshDict b/tutorials/mesh/cvMesh/flange/system/snappyHexMeshDict
new file mode 100644
index 0000000000..034e3c0e74
--- /dev/null
+++ b/tutorials/mesh/cvMesh/flange/system/snappyHexMeshDict
@@ -0,0 +1,309 @@
+/*--------------------------------*- 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;
+    object      snappyHexMeshDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// Which of the steps to run
+castellatedMesh false;
+snap            false;
+addLayers       true;
+
+
+// Geometry. Definition of all surfaces. All surfaces are of class
+// searchableSurface.
+// Surfaces are used
+// - to specify refinement for any mesh cell intersecting it
+// - to specify refinement for any mesh cell inside/outside/near
+// - to 'snap' the mesh boundary to the surface
+geometry
+{
+//    motorBike.obj
+//    {
+//        type triSurfaceMesh;
+//        name motorBike;
+//    }
+//
+//    refinementBox
+//    {
+//        type searchableBox;
+//        min (-1.0 -0.7 0.0);
+//        max ( 8.0  0.7 2.5);
+//    }
+};
+
+
+
+// Settings for the castellatedMesh generation.
+castellatedMeshControls
+{
+
+    // Refinement parameters
+    // ~~~~~~~~~~~~~~~~~~~~~
+
+    // If local number of cells is >= maxLocalCells on any processor
+    // switches from from refinement followed by balancing
+    // (current method) to (weighted) balancing before refinement.
+    maxLocalCells 100000;
+
+    // Overall cell limit (approximately). Refinement will stop immediately
+    // upon reaching this number so a refinement level might not complete.
+    // Note that this is the number of cells before removing the part which
+    // is not 'visible' from the keepPoint. The final number of cells might
+    // actually be a lot less.
+    maxGlobalCells 2000000;
+
+    // The surface refinement loop might spend lots of iterations refining just a
+    // few cells. This setting will cause refinement to stop if <= minimumRefine
+    // are selected for refinement. Note: it will at least do one iteration
+    // (unless the number of cells to refine is 0)
+    minRefinementCells 10;
+
+    // Allow a certain level of imbalance during refining
+    // (since balancing is quite expensive)
+    // Expressed as fraction of perfect balance (= overall number of cells /
+    // nProcs). 0=balance always.
+    maxLoadUnbalance 0.10;
+
+
+    // Number of buffer layers between different levels.
+    // 1 means normal 2:1 refinement restriction, larger means slower
+    // refinement.
+    nCellsBetweenLevels 3;
+
+
+
+    // Explicit feature edge refinement
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    // Specifies a level for any cell intersected by its edges.
+    // This is a featureEdgeMesh, read from constant/triSurface for now.
+    features
+    (
+        //{
+        //    file "someLine.eMesh";
+        //    level 2;
+        //}
+    );
+
+
+
+    // Surface based refinement
+    // ~~~~~~~~~~~~~~~~~~~~~~~~
+
+    // Specifies two levels for every surface. The first is the minimum level,
+    // every cell intersecting a surface gets refined up to the minimum level.
+    // The second level is the maximum level. Cells that 'see' multiple
+    // intersections where the intersections make an
+    // angle > resolveFeatureAngle get refined up to the maximum level.
+
+    refinementSurfaces
+    {
+//        motorBike
+//        {
+//            // Surface-wise min and max refinement level
+//            level (5 6);
+//
+//            // Optional specification of patch type (default is wall). No
+//            // constraint types (cyclic, symmetry) etc. are allowed.
+//            patchInfo
+//            {
+//                type wall;
+//                inGroups (motorBike);
+//            }
+//        }
+    }
+
+    // Resolve sharp angles
+    resolveFeatureAngle 30;
+
+
+    // Region-wise refinement
+    // ~~~~~~~~~~~~~~~~~~~~~~
+
+    // Specifies refinement level for cells in relation to a surface. One of
+    // three modes
+    // - distance. 'levels' specifies per distance to the surface the
+    //   wanted refinement level. The distances need to be specified in
+    //   descending order.
+    // - inside. 'levels' is only one entry and only the level is used. All
+    //   cells inside the surface get refined up to the level. The surface
+    //   needs to be closed for this to be possible.
+    // - outside. Same but cells outside.
+
+    refinementRegions
+    {
+//        refinementBox
+//        {
+//            mode inside;
+//            levels ((1E15 4));
+//        }
+    }
+
+
+    // Mesh selection
+    // ~~~~~~~~~~~~~~
+
+    // After refinement patches get added for all refinementSurfaces and
+    // all cells intersecting the surfaces get put into these patches. The
+    // section reachable from the locationInMesh is kept.
+    // NOTE: This point should never be on a face, always inside a cell, even
+    // after refinement.
+    locationInMesh (-1 0 0);
+
+
+    // Whether any faceZones (as specified in the refinementSurfaces)
+    // are only on the boundary of corresponding cellZones or also allow
+    // free-standing zone faces. Not used if there are no faceZones.
+    allowFreeStandingZoneFaces true;
+}
+
+
+
+// Settings for the snapping.
+snapControls
+{
+    //- Number of patch smoothing iterations before finding correspondence
+    //  to surface
+    nSmoothPatch 3;
+
+    //- Relative distance for points to be attracted by surface feature point
+    //  or edge. True distance is this factor times local
+    //  maximum edge length.
+    tolerance 4.0;
+
+    //- Number of mesh displacement relaxation iterations.
+    nSolveIter 0;
+
+    //- Maximum number of snapping relaxation iterations. Should stop
+    //  before upon reaching a correct mesh.
+    nRelaxIter 5;
+
+    //- Highly experimental and wip: number of feature edge snapping
+    //  iterations. Leave out altogether to disable.
+    //  Do not use here since mesh resolution too low and baffles present
+    //nFeatureSnapIter 10;
+}
+
+
+
+// Settings for the layer addition.
+addLayersControls
+{
+    // Are the thickness parameters below relative to the undistorted
+    // size of the refined cell outside layer (true) or absolute sizes (false).
+    relativeSizes false;
+
+    // Per final patch (so not geometry!) the layer information
+    layers
+    {
+        "flange.obj.*"
+        {
+            nSurfaceLayers 1;
+        }
+    }
+
+    // Expansion factor for layer mesh
+    expansionRatio 1.5;
+
+    //- Wanted thickness of final added cell layer. If multiple layers
+    //  is the
+    //  thickness of the layer furthest away from the wall.
+    //  Relative to undistorted size of cell outside layer.
+    //  is the thickness of the layer furthest away from the wall.
+    //  See relativeSizes parameter.
+    finalLayerThickness 0.0003;
+
+    //- Minimum thickness of cell layer. If for any reason layer
+    //  cannot be above minThickness do not add layer.
+    //  Relative to undistorted size of cell outside layer.
+    minThickness 0.0001;
+
+    //- If points get not extruded do nGrow layers of connected faces that are
+    //  also not grown. This helps convergence of the layer addition process
+    //  close to features.
+    // Note: changed(corrected) w.r.t 17x! (didn't do anything in 17x)
+    nGrow 0;
+
+    // Advanced settings
+
+    //- When not to extrude surface. 0 is flat surface, 90 is when two faces
+    //  make straight angle.
+    featureAngle 90;
+
+    //- Maximum number of snapping relaxation iterations. Should stop
+    //  before upon reaching a correct mesh.
+    nRelaxIter 3;
+
+    // Number of smoothing iterations of surface normals
+    nSmoothSurfaceNormals 1;
+
+    // Number of smoothing iterations of interior mesh movement direction
+    nSmoothNormals 3;
+
+    // Smooth layer thickness over surface patches
+    nSmoothThickness 10;
+
+    // Stop layer growth on highly warped cells
+    maxFaceThicknessRatio 1000;
+
+    // Reduce layer growth where ratio thickness to medial
+    // distance is large
+    maxThicknessToMedialRatio 0.3;
+
+    // Angle used to pick up medial axis points
+    // Note: changed(corrected) w.r.t 17x! 90 degrees corresponds to 130 in 17x.
+    minMedianAxisAngle 90;
+
+
+    // Create buffer region for new layer terminations
+    nBufferCellsNoExtrude 0;
+
+
+    // Overall max number of layer addition iterations. The mesher will exit
+    // if it reaches this number of iterations; possibly with an illegal
+    // mesh.
+    nLayerIter 50;
+}
+
+
+
+// Generic mesh quality settings. At any undoable phase these determine
+// where to undo.
+#include "meshQualityControls"
+
+meshQualityControls
+{
+    //- Number of error distribution iterations
+    nSmoothScale 4;
+    //- amount to scale back displacement at error points
+    errorReduction 0.75;
+}
+
+
+// Advanced
+
+// Flags for optional output
+// 0 : only write final meshes
+// 1 : write intermediate meshes
+// 2 : write volScalarField with cellLevel for postprocessing
+// 4 : write current intersections as .obj files
+debug 0;
+
+
+// Merge tolerance. Is fraction of overall bounding box of initial mesh.
+// Note: the write tolerance needs to be higher than this.
+mergeTolerance 1e-6;
+
+
+// ************************************************************************* //

From ccbc6b03f956980eb75e8310cbd8c32679a6905a Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Fri, 30 Mar 2012 16:09:19 +0100
Subject: [PATCH 132/317] ENH: surfaceFeatureExtract: extract features

---
 .../flange/system/surfaceFeatureExtractDict   | 37 +++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 tutorials/mesh/cvMesh/flange/system/surfaceFeatureExtractDict

diff --git a/tutorials/mesh/cvMesh/flange/system/surfaceFeatureExtractDict b/tutorials/mesh/cvMesh/flange/system/surfaceFeatureExtractDict
new file mode 100644
index 0000000000..053b4210cb
--- /dev/null
+++ b/tutorials/mesh/cvMesh/flange/system/surfaceFeatureExtractDict
@@ -0,0 +1,37 @@
+/*--------------------------------*- 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;
+    object      surfaceFeatureExtractDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+flange.obj
+{
+    extractionMethod    extractFromSurface;
+
+    extractFromSurface
+    {
+        // Mark edges whose adjacent surface normals are at an angle less
+        // than includedAngle as features
+        // - 0  : selects no edges
+        // - 180: selects all edges
+        includedAngle   155;
+    }
+
+    // Write options
+    writeVTK                no;
+    writeObj                yes;
+    writeFeatureEdgeMesh    no;
+}
+
+
+// ************************************************************************* //

From 8e4af30958bd15a5b4c52c1806e76d79320f2dea Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Fri, 30 Mar 2012 16:11:26 +0100
Subject: [PATCH 133/317] ENH: flange: add snappyHexMesh

---
 tutorials/mesh/cvMesh/flange/Allrun             | 1 +
 tutorials/mesh/cvMesh/flange/system/controlDict | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/tutorials/mesh/cvMesh/flange/Allrun b/tutorials/mesh/cvMesh/flange/Allrun
index f35e96c706..d4e853bb3f 100755
--- a/tutorials/mesh/cvMesh/flange/Allrun
+++ b/tutorials/mesh/cvMesh/flange/Allrun
@@ -28,6 +28,7 @@ do
 done
 
 runParallel cvMesh $nProc
+#runParallel snappyHexMesh $nProc
 
 runApplication reconstructParMesh -constant -mergeTol 1e-6
 
diff --git a/tutorials/mesh/cvMesh/flange/system/controlDict b/tutorials/mesh/cvMesh/flange/system/controlDict
index ff948a6e05..66a4bab34e 100644
--- a/tutorials/mesh/cvMesh/flange/system/controlDict
+++ b/tutorials/mesh/cvMesh/flange/system/controlDict
@@ -22,13 +22,13 @@ FoamFile
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-startFrom       latestTime;
+startFrom       startTime;
 
 startTime       0;
 
 stopAt          endTime;
 
-endTime         80;
+endTime         0;
 
 deltaT          1;
 

From 30c6e0c77f0e0aa908955ed1fc5febdf34315eeb Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Fri, 30 Mar 2012 16:31:12 +0100
Subject: [PATCH 134/317] multiphaseEulerFoam/correctPhi.H: Remove adjustPhi

---
 .../solvers/multiphase/multiphaseEulerFoam/correctPhi.H         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/correctPhi.H b/applications/solvers/multiphase/multiphaseEulerFoam/correctPhi.H
index 78f93384b0..57a79b6091 100644
--- a/applications/solvers/multiphase/multiphaseEulerFoam/correctPhi.H
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/correctPhi.H
@@ -32,7 +32,7 @@
 
     dimensionedScalar rAUf("(1|A(U))", dimTime/rho.dimensions(), 1.0);
 
-    adjustPhi(phi, U, pcorr);
+    //adjustPhi(phi, U, pcorr);
 
     while (pimple.correctNonOrthogonal())
     {

From 31408f8003aa6c71212c886861578c318cbbd929 Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Fri, 30 Mar 2012 17:41:51 +0100
Subject: [PATCH 135/317] fvMatrix: Improved relaxation of the boundary
 contributions to the diagonal

---
 .../EulerDdtScheme/EulerDdtScheme.C           | 22 ++++++++++---
 .../fvMatrices/fvMatrix/fvMatrix.C            | 18 +++++++----
 .../fvMatrices/solvers/MULES/MULESTemplates.C | 31 +++++++++++++------
 3 files changed, 51 insertions(+), 20 deletions(-)

diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/EulerDdtScheme/EulerDdtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/EulerDdtScheme/EulerDdtScheme.C
index 81559df141..d48a634491 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/EulerDdtScheme/EulerDdtScheme.C
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/EulerDdtScheme/EulerDdtScheme.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -389,6 +389,8 @@ EulerDdtScheme<Type>::fvcDdtPhiCorr
     tmp<fluxFieldType> phiCorr =
         phiAbs.oldTime() - (fvc::interpolate(U.oldTime()) & mesh().Sf());
 
+    phiCorr().boundaryField() = pTraits<typename flux<Type>::type>::zero;
+
     return tmp<fluxFieldType>
     (
         new fluxFieldType
@@ -430,7 +432,7 @@ EulerDdtScheme<Type>::fvcDdtPhiCorr
      && phiAbs.dimensions() == dimVelocity*dimArea
     )
     {
-        return tmp<fluxFieldType>
+        tmp<fluxFieldType> ddtPhiCorr
         (
             new fluxFieldType
             (
@@ -446,6 +448,10 @@ EulerDdtScheme<Type>::fvcDdtPhiCorr
                 )
             )
         );
+
+        ddtPhiCorr().boundaryField() = pTraits<typename flux<Type>::type>::zero;
+
+        return ddtPhiCorr;
     }
     else if
     (
@@ -453,7 +459,7 @@ EulerDdtScheme<Type>::fvcDdtPhiCorr
      && phiAbs.dimensions() == rho.dimensions()*dimVelocity*dimArea
     )
     {
-        return tmp<fluxFieldType>
+        tmp<fluxFieldType> ddtPhiCorr
         (
             new fluxFieldType
             (
@@ -476,6 +482,10 @@ EulerDdtScheme<Type>::fvcDdtPhiCorr
                 )
             )
         );
+
+        ddtPhiCorr().boundaryField() = pTraits<typename flux<Type>::type>::zero;
+
+        return ddtPhiCorr;
     }
     else if
     (
@@ -483,7 +493,7 @@ EulerDdtScheme<Type>::fvcDdtPhiCorr
      && phiAbs.dimensions() == rho.dimensions()*dimVelocity*dimArea
     )
     {
-        return tmp<fluxFieldType>
+        tmp<fluxFieldType> ddtPhiCorr
         (
             new fluxFieldType
             (
@@ -497,6 +507,10 @@ EulerDdtScheme<Type>::fvcDdtPhiCorr
                 )
             )
         );
+
+        ddtPhiCorr().boundaryField() = pTraits<typename flux<Type>::type>::zero;
+
+        return ddtPhiCorr;
     }
     else
     {
diff --git a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C
index f9937b532c..a69f7f5add 100644
--- a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C
+++ b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C
@@ -576,12 +576,18 @@ void Foam::fvMatrix<Type>::relax(const scalar alpha)
                 // Also add the source contribution from the relaxation
                 forAll(pa, face)
                 {
-                    Type iCoeff0 = iCoeffs[face];
-                    iCoeffs[face] = cmptMag(iCoeffs[face]);
-                    sumOff[pa[face]] -= cmptMin(iCoeffs[face]);
-                    iCoeffs[face] /= alpha;
-                    S[pa[face]] +=
-                        cmptMultiply(iCoeffs[face] - iCoeff0, psi_[pa[face]]);
+                    // Type iCoeff0 = iCoeffs[face];
+                    // iCoeffs[face] = cmptMag(iCoeffs[face]);
+                    // sumOff[pa[face]] -= cmptMin(iCoeffs[face]);
+                    // iCoeffs[face] /= alpha;
+                    D[pa[face]] +=
+                        cmptMag(cmptMin(iCoeffs[face]))
+                      - cmptMin(iCoeffs[face]);
+                    sumOff[pa[face]] +=
+                        cmptMag(cmptMin(iCoeffs[face]))
+                      - cmptMin(iCoeffs[face]);
+                    // S[pa[face]] +=
+                    // cmptMultiply(iCoeffs[face] - iCoeff0, psi_[pa[face]]);
                 }
             }
         }
diff --git a/src/finiteVolume/fvMatrices/solvers/MULES/MULESTemplates.C b/src/finiteVolume/fvMatrices/solvers/MULES/MULESTemplates.C
index 98ed536860..73a7ef99cc 100644
--- a/src/finiteVolume/fvMatrices/solvers/MULES/MULESTemplates.C
+++ b/src/finiteVolume/fvMatrices/solvers/MULES/MULESTemplates.C
@@ -32,6 +32,7 @@ License
 #include "surfaceInterpolate.H"
 #include "fvcSurfaceIntegrate.H"
 #include "slicedSurfaceFields.H"
+#include "wedgeFvPatch.H"
 #include "syncTools.H"
 
 #include "fvm.H"
@@ -567,19 +568,29 @@ void Foam::MULES::limiter
             fvsPatchScalarField& lambdaPf = lambdaBf[patchi];
             const scalarField& phiCorrfPf = phiCorrBf[patchi];
 
-            const labelList& pFaceCells = mesh.boundary()[patchi].faceCells();
-
-            forAll(lambdaPf, pFacei)
+            if (isA<wedgeFvPatch>(mesh.boundary()[patchi]))
             {
-                label pfCelli = pFaceCells[pFacei];
+                lambdaPf = 0;
+            }
+            else
+            {
+                const labelList& pFaceCells =
+                    mesh.boundary()[patchi].faceCells();
 
-                if (phiCorrfPf[pFacei] > 0.0)
+                forAll(lambdaPf, pFacei)
                 {
-                    lambdaPf[pFacei] = min(lambdaPf[pFacei], lambdap[pfCelli]);
-                }
-                else
-                {
-                    lambdaPf[pFacei] = min(lambdaPf[pFacei], lambdam[pfCelli]);
+                    label pfCelli = pFaceCells[pFacei];
+
+                    if (phiCorrfPf[pFacei] > 0.0)
+                    {
+                        lambdaPf[pFacei] =
+                            min(lambdaPf[pFacei], lambdap[pfCelli]);
+                    }
+                    else
+                    {
+                        lambdaPf[pFacei] =
+                            min(lambdaPf[pFacei], lambdam[pfCelli]);
+                    }
                 }
             }
         }

From a9cca0d67a97258e69907d57437a10ed2b47d561 Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Fri, 30 Mar 2012 17:42:16 +0100
Subject: [PATCH 136/317] Updated header

---
 src/finiteVolume/fvMatrices/solvers/MULES/MULESTemplates.C | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/finiteVolume/fvMatrices/solvers/MULES/MULESTemplates.C b/src/finiteVolume/fvMatrices/solvers/MULES/MULESTemplates.C
index 73a7ef99cc..c16288ea35 100644
--- a/src/finiteVolume/fvMatrices/solvers/MULES/MULESTemplates.C
+++ b/src/finiteVolume/fvMatrices/solvers/MULES/MULESTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

From f42be0fb42405cce93141661d8cae2ddfaed061d Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Mon, 2 Apr 2012 10:47:22 +0100
Subject: [PATCH 137/317] ENH: polyMeshFromShapeMesh: construct parallel

---
 .../meshes/polyMesh/polyMeshFromShapeMesh.C   | 23 +++++++++++++++----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/src/OpenFOAM/meshes/polyMesh/polyMeshFromShapeMesh.C b/src/OpenFOAM/meshes/polyMesh/polyMeshFromShapeMesh.C
index bf8c028ccc..18a725bbec 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyMeshFromShapeMesh.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyMeshFromShapeMesh.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -614,10 +614,17 @@ Foam::polyMesh::polyMesh
 
     label nAllPatches = boundaryFaces.size();
 
-    if (nFaces > defaultPatchStart)
+
+    label nDefaultFaces = nFaces - defaultPatchStart;
+    if (syncPar)
+    {
+        reduce(nDefaultFaces, sumOp<label>());
+    }
+
+    if (nDefaultFaces > 0)
     {
         WarningIn("polyMesh::polyMesh(... construct from shapes...)")
-            << "Found " << nFaces - defaultPatchStart
+            << "Found " << nDefaultFaces
             << " undefined faces in mesh; adding to default patch." << endl;
 
         // Check if there already exists a defaultFaces patch as last patch
@@ -883,10 +890,16 @@ Foam::polyMesh::polyMesh
 
     label nAllPatches = boundaryFaces.size();
 
-    if (nFaces > defaultPatchStart)
+    label nDefaultFaces = nFaces - defaultPatchStart;
+    if (syncPar)
+    {
+        reduce(nDefaultFaces, sumOp<label>());
+    }
+
+    if (nDefaultFaces > 0)
     {
         WarningIn("polyMesh::polyMesh(... construct from shapes...)")
-            << "Found " << nFaces - defaultPatchStart
+            << "Found " << nDefaultFaces
             << " undefined faces in mesh; adding to default patch." << endl;
 
         // Check if there already exists a defaultFaces patch as last patch

From 13b90eb6ac73141cce056e4cdbfe055dbfefd0f9 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Mon, 2 Apr 2012 10:47:50 +0100
Subject: [PATCH 138/317] ENH: labelledTri: specialisation for offsetOp

---
 .../tools/labelledTri/labelledTri.H           | 25 ++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/src/triSurface/tools/labelledTri/labelledTri.H b/src/triSurface/tools/labelledTri/labelledTri.H
index d36934dceb..a4bd26f825 100644
--- a/src/triSurface/tools/labelledTri/labelledTri.H
+++ b/src/triSurface/tools/labelledTri/labelledTri.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -114,6 +114,29 @@ public:
 template<>
 inline bool contiguous<labelledTri>()  {return true;}
 
+//- Used to offset faces in ListListOps::combineOffset
+template<>
+class offsetOp<labelledTri>
+{
+
+public:
+
+    labelledTri operator()
+    (
+        const labelledTri& x,
+        const label offset
+    ) const
+    {
+        labelledTri result(x);
+
+        forAll(x, xI)
+        {
+            result[xI] = x[xI] + offset;
+        }
+        return result;
+    }
+};
+
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 

From cf0fc76a7017788d230539876bd45584a51f3000 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Mon, 2 Apr 2012 10:49:28 +0100
Subject: [PATCH 139/317] STYLE: sampledSurfaces: extracted merging
 functionality to Patchtools

---
 .../primitiveMesh/PatchTools/PatchTools.C     |   3 +-
 .../primitiveMesh/PatchTools/PatchTools.H     |  22 ++-
 .../PatchTools/PatchToolsGatherAndMerge.C     | 181 ++++++++++++++++++
 .../sampledSurfaces/sampledSurfaces.C         | 113 ++---------
 4 files changed, 215 insertions(+), 104 deletions(-)
 create mode 100644 src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchToolsGatherAndMerge.C

diff --git a/src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchTools.C b/src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchTools.C
index 793411c162..9335ba0f8f 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchTools.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchTools.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -27,6 +27,7 @@ License
 
 #include "PatchToolsCheck.C"
 #include "PatchToolsEdgeOwner.C"
+#include "PatchToolsGatherAndMerge.C"
 #include "PatchToolsSearch.C"
 #include "PatchToolsSortEdges.C"
 #include "PatchToolsNormals.C"
diff --git a/src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchTools.H b/src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchTools.H
index e4ade383ef..968b0b5244 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchTools.H
+++ b/src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchTools.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -33,6 +33,7 @@ SourceFiles
     PatchTools.C
     PatchToolsCheck.C
     PatchToolsEdgeOwner.C
+    PatchToolsGatherAndMerge.C
     PatchToolsSearch.C
     PatchToolsSortEdges.C
     PatchToolsNormals.C
@@ -236,6 +237,25 @@ public:
         const labelList& meshFaces
     );
 
+
+    //- Gather points and faces onto master and merge (geometrically) into
+    //  single patch.
+    template
+    <
+        class Face,
+        template<class> class FaceList,
+        class PointField,
+        class PointType
+    >
+    static void gatherAndMerge
+    (
+        const scalar mergeDist,
+        const PrimitivePatch<Face, FaceList, PointField, PointType>& p,
+        Field<PointType>& mergedPoints,
+        List<Face>& mergedFaces,
+        labelList& pointMergeMap
+    );
+
 };
 
 
diff --git a/src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchToolsGatherAndMerge.C b/src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchToolsGatherAndMerge.C
new file mode 100644
index 0000000000..1d759d3783
--- /dev/null
+++ b/src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchToolsGatherAndMerge.C
@@ -0,0 +1,181 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "PatchTools.H"
+#include "ListListOps.H"
+#include "mergePoints.H"
+#include "face.H"
+#include "triFace.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    //- Used to offset faces in Pstream::combineOffset
+    template<>
+    class offsetOp<face>
+    {
+
+    public:
+
+        face operator()
+        (
+            const face& x,
+            const label offset
+        ) const
+        {
+            face result(x.size());
+
+            forAll(x, xI)
+            {
+                result[xI] = x[xI] + offset;
+            }
+            return result;
+        }
+    };
+
+    //- Used to offset faces in Pstream::combineOffset
+    template<>
+    class offsetOp<triFace>
+    {
+
+    public:
+
+        triFace operator()
+        (
+            const triFace& x,
+            const label offset
+        ) const
+        {
+            triFace result(x);
+
+            forAll(x, xI)
+            {
+                result[xI] = x[xI] + offset;
+            }
+            return result;
+        }
+    };
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template
+<
+    class Face,
+    template<class> class FaceList,
+    class PointField,
+    class PointType
+>
+void Foam::PatchTools::gatherAndMerge
+(
+    const scalar mergeDist,
+    const PrimitivePatch<Face, FaceList, PointField, PointType>& p,
+    Field<PointType>& mergedPoints,
+    List<Face>& mergedFaces,
+    labelList& pointMergeMap
+)
+{
+    // Collect points from all processors
+    labelList pointSizes;
+    {
+        List<Field<PointType> > gatheredPoints(Pstream::nProcs());
+        gatheredPoints[Pstream::myProcNo()] = p.localPoints();
+        Pstream::gatherList(gatheredPoints);
+
+        if (Pstream::master())
+        {
+            pointSizes = ListListOps::subSizes
+            (
+                gatheredPoints,
+                accessOp<Field<PointType> >()
+            );
+
+            mergedPoints = ListListOps::combine<Field<PointType> >
+            (
+                gatheredPoints,
+                accessOp<Field<PointType> >()
+            );
+        }
+    }
+
+    // Collect faces from all processors and renumber using sizes of
+    // gathered points
+    {
+        List<List<Face> > gatheredFaces(Pstream::nProcs());
+        gatheredFaces[Pstream::myProcNo()] = p.localFaces();
+        Pstream::gatherList(gatheredFaces);
+
+        if (Pstream::master())
+        {
+            mergedFaces = static_cast<const List<Face>&>
+            (
+                ListListOps::combineOffset<List<Face> >
+                (
+                    gatheredFaces,
+                    pointSizes,
+                    accessOp<List<Face> >(),
+                    offsetOp<Face>()
+                )
+            );
+        }
+    }
+
+    if (Pstream::master())
+    {
+        Field<PointType> newPoints;
+        labelList oldToNew;
+
+        bool hasMerged = mergePoints
+        (
+            mergedPoints,
+            mergeDist,
+            false,                  // verbosity
+            oldToNew,
+            newPoints
+        );
+
+        if (hasMerged)
+        {
+            // Store point mapping
+            pointMergeMap.transfer(oldToNew);
+
+            // Copy points
+            mergedPoints.transfer(newPoints);
+
+            // Relabel faces
+            List<Face>& faces = mergedFaces;
+
+            forAll(faces, faceI)
+            {
+                inplaceRenumber(pointMergeMap, faces[faceI]);
+            }
+        }
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.C b/src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.C
index 332e933417..a8dfaebdfc 100644
--- a/src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.C
+++ b/src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -28,9 +28,8 @@ License
 #include "dictionary.H"
 #include "Time.H"
 #include "IOmanip.H"
-#include "ListListOps.H"
-#include "mergePoints.H"
 #include "volPointInterpolation.H"
+#include "PatchTools.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
@@ -38,34 +37,6 @@ defineTypeNameAndDebug(Foam::sampledSurfaces, 0);
 bool Foam::sampledSurfaces::verbose_ = false;
 Foam::scalar Foam::sampledSurfaces::mergeTol_ = 1e-10;
 
-namespace Foam
-{
-    //- Used to offset faces in Pstream::combineOffset
-    template <>
-    class offsetOp<face>
-    {
-
-    public:
-
-        face operator()
-        (
-            const face& x,
-            const label offset
-        ) const
-        {
-            face result(x.size());
-
-            forAll(x, xI)
-            {
-                result[xI] = x[xI] + offset;
-            }
-            return result;
-        }
-    };
-
-}
-
-
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
 void Foam::sampledSurfaces::writeGeometry() const
@@ -379,80 +350,18 @@ bool Foam::sampledSurfaces::update()
             continue;
         }
 
-
-        // Collect points from all processors
-        List<pointField> gatheredPoints(Pstream::nProcs());
-        gatheredPoints[Pstream::myProcNo()] = s.points();
-        Pstream::gatherList(gatheredPoints);
-
-        if (Pstream::master())
-        {
-            mergeList_[surfI].points = ListListOps::combine<pointField>
-            (
-                gatheredPoints,
-                accessOp<pointField>()
-            );
-        }
-
-        // Collect faces from all processors and renumber using sizes of
-        // gathered points
-        List<faceList> gatheredFaces(Pstream::nProcs());
-        gatheredFaces[Pstream::myProcNo()] = s.faces();
-        Pstream::gatherList(gatheredFaces);
-
-        if (Pstream::master())
-        {
-            mergeList_[surfI].faces = static_cast<const faceList&>
-            (
-                ListListOps::combineOffset<faceList>
-                (
-                    gatheredFaces,
-                    ListListOps::subSizes
-                    (
-                        gatheredPoints,
-                        accessOp<pointField>()
-                    ),
-                    accessOp<faceList>(),
-                    offsetOp<face>()
-                )
-            );
-        }
-
-        pointField newPoints;
-        labelList oldToNew;
-
-        bool hasMerged = mergePoints
+        PatchTools::gatherAndMerge
         (
-            mergeList_[surfI].points,
             mergeDim,
-            false,                  // verbosity
-            oldToNew,
-            newPoints
+            primitivePatch
+            (
+                SubList<face>(s.faces(), s.faces().size()),
+                s.points()
+            ),
+            mergeList_[surfI].points,
+            mergeList_[surfI].faces,
+            mergeList_[surfI].pointsMap
         );
-
-        if (hasMerged)
-        {
-            // Store point mapping
-            mergeList_[surfI].pointsMap.transfer(oldToNew);
-
-            // Copy points
-            mergeList_[surfI].points.transfer(newPoints);
-
-            // Relabel faces
-            faceList& faces = mergeList_[surfI].faces;
-
-            forAll(faces, faceI)
-            {
-                inplaceRenumber(mergeList_[surfI].pointsMap, faces[faceI]);
-            }
-
-            if (Pstream::master() && debug)
-            {
-                Pout<< "For surface " << surfI << " merged from "
-                    << mergeList_[surfI].pointsMap.size() << " points down to "
-                    << mergeList_[surfI].points.size()    << " points" << endl;
-            }
-        }
     }
 
     return updated;

From 5beb857d8ea0e8929d5065befc5ab07ab8794087 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Mon, 2 Apr 2012 10:50:40 +0100
Subject: [PATCH 140/317] BUG: surfaceBooleanFeatures: extraneous command-line
 clearing

---
 .../surface/surfaceBooleanFeatures/surfaceBooleanFeatures.C    | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/applications/utilities/surface/surfaceBooleanFeatures/surfaceBooleanFeatures.C b/applications/utilities/surface/surfaceBooleanFeatures/surfaceBooleanFeatures.C
index 419b8568e0..d1a9b8f028 100644
--- a/applications/utilities/surface/surfaceBooleanFeatures/surfaceBooleanFeatures.C
+++ b/applications/utilities/surface/surfaceBooleanFeatures/surfaceBooleanFeatures.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -216,7 +216,6 @@ bool intersectSurfaces
 
 int main(int argc, char *argv[])
 {
-    argList::validArgs.clear();
     argList::noParallel();
     argList::validArgs.append("action");
     argList::validArgs.append("surface file");

From f3bb0c7b29bdaa40a83108aaf35a644433d5a09c Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Mon, 2 Apr 2012 10:51:32 +0100
Subject: [PATCH 141/317] ENH: redistributePar: split off mesh creation/loading

---
 .../redistributePar/Make/files                |   1 +
 .../redistributePar/redistributePar.C         | 596 +++++++++---------
 2 files changed, 305 insertions(+), 292 deletions(-)

diff --git a/applications/utilities/parallelProcessing/redistributePar/Make/files b/applications/utilities/parallelProcessing/redistributePar/Make/files
index ce0b6760d4..8bf23d0895 100644
--- a/applications/utilities/parallelProcessing/redistributePar/Make/files
+++ b/applications/utilities/parallelProcessing/redistributePar/Make/files
@@ -1,3 +1,4 @@
+loadOrCreateMesh.C
 redistributePar.C
 
 EXE = $(FOAM_APPBIN)/redistributePar
diff --git a/applications/utilities/parallelProcessing/redistributePar/redistributePar.C b/applications/utilities/parallelProcessing/redistributePar/redistributePar.C
index cde7f5b12d..4d02655955 100644
--- a/applications/utilities/parallelProcessing/redistributePar/redistributePar.C
+++ b/applications/utilities/parallelProcessing/redistributePar/redistributePar.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -54,6 +54,7 @@ Description
 #include "mapDistributePolyMesh.H"
 #include "IOobjectList.H"
 #include "globalIndex.H"
+#include "loadOrCreateMesh.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -62,292 +63,292 @@ Description
 static const scalar defaultMergeTol = 1E-6;
 
 
-// Read mesh if available. Otherwise create empty mesh with same non-proc
-// patches as proc0 mesh. Requires all processors to have all patches
-// (and in same order).
-autoPtr<fvMesh> createMesh
-(
-    const Time& runTime,
-    const word& regionName,
-    const fileName& instDir,
-    const bool haveMesh
-)
-{
-    //Pout<< "Create mesh for time = "
-    //    << runTime.timeName() << nl << endl;
-
-    IOobject io
-    (
-        regionName,
-        instDir,
-        runTime,
-        IOobject::MUST_READ
-    );
-
-    if (!haveMesh)
-    {
-        // Create dummy mesh. Only used on procs that don't have mesh.
-        IOobject noReadIO(io);
-        noReadIO.readOpt() = IOobject::NO_READ;
-        fvMesh dummyMesh
-        (
-            noReadIO,
-            xferCopy(pointField()),
-            xferCopy(faceList()),
-            xferCopy(labelList()),
-            xferCopy(labelList()),
-            false
-        );
-        // Add some dummy zones so upon reading it does not read them
-        // from the undecomposed case. Should be done as extra argument to
-        // regIOobject::readStream?
-        List<pointZone*> pz
-        (
-            1,
-            new pointZone
-            (
-                "dummyPointZone",
-                labelList(0),
-                0,
-                dummyMesh.pointZones()
-            )
-        );
-        List<faceZone*> fz
-        (
-            1,
-            new faceZone
-            (
-                "dummyFaceZone",
-                labelList(0),
-                boolList(0),
-                0,
-                dummyMesh.faceZones()
-            )
-        );
-        List<cellZone*> cz
-        (
-            1,
-            new cellZone
-            (
-                "dummyCellZone",
-                labelList(0),
-                0,
-                dummyMesh.cellZones()
-            )
-        );
-        dummyMesh.addZones(pz, fz, cz);
-        //Pout<< "Writing dummy mesh to " << dummyMesh.polyMesh::objectPath()
-        //    << endl;
-        dummyMesh.write();
-    }
-
-    //Pout<< "Reading mesh from " << io.objectPath() << endl;
-    autoPtr<fvMesh> meshPtr(new fvMesh(io));
-    fvMesh& mesh = meshPtr();
-
-
-    // Sync patches
-    // ~~~~~~~~~~~~
-
-    if (Pstream::master())
-    {
-        // Send patches
-        for
-        (
-            int slave=Pstream::firstSlave();
-            slave<=Pstream::lastSlave();
-            slave++
-        )
-        {
-            OPstream toSlave(Pstream::scheduled, slave);
-            toSlave << mesh.boundaryMesh();
-        }
-    }
-    else
-    {
-        // Receive patches
-        IPstream fromMaster(Pstream::scheduled, Pstream::masterNo());
-        PtrList<entry> patchEntries(fromMaster);
-
-        if (haveMesh)
-        {
-            // Check master names against mine
-
-            const polyBoundaryMesh& patches = mesh.boundaryMesh();
-
-            forAll(patchEntries, patchI)
-            {
-                const entry& e = patchEntries[patchI];
-                const word type(e.dict().lookup("type"));
-                const word& name = e.keyword();
-
-                if (type == processorPolyPatch::typeName)
-                {
-                    break;
-                }
-
-                if (patchI >= patches.size())
-                {
-                    FatalErrorIn
-                    (
-                        "createMesh(const Time&, const fileName&, const bool)"
-                    )   << "Non-processor patches not synchronised."
-                        << endl
-                        << "Processor " << Pstream::myProcNo()
-                        << " has only " << patches.size()
-                        << " patches, master has "
-                        << patchI
-                        << exit(FatalError);
-                }
-
-                if
-                (
-                    type != patches[patchI].type()
-                 || name != patches[patchI].name()
-                )
-                {
-                    FatalErrorIn
-                    (
-                        "createMesh(const Time&, const fileName&, const bool)"
-                    )   << "Non-processor patches not synchronised."
-                        << endl
-                        << "Master patch " << patchI
-                        << " name:" << type
-                        << " type:" << type << endl
-                        << "Processor " << Pstream::myProcNo()
-                        << " patch " << patchI
-                        << " has name:" << patches[patchI].name()
-                        << " type:" << patches[patchI].type()
-                        << exit(FatalError);
-                }
-            }
-        }
-        else
-        {
-            // Add patch
-            List<polyPatch*> patches(patchEntries.size());
-            label nPatches = 0;
-
-            forAll(patchEntries, patchI)
-            {
-                const entry& e = patchEntries[patchI];
-                const word type(e.dict().lookup("type"));
-                const word& name = e.keyword();
-
-                if (type == processorPolyPatch::typeName)
-                {
-                    break;
-                }
-
-                //Pout<< "Adding patch:" << nPatches
-                //    << " name:" << name << " type:" << type << endl;
-
-                dictionary patchDict(e.dict());
-                patchDict.remove("nFaces");
-                patchDict.add("nFaces", 0);
-                patchDict.remove("startFace");
-                patchDict.add("startFace", 0);
-
-                patches[patchI] = polyPatch::New
-                (
-                    name,
-                    patchDict,
-                    nPatches++,
-                    mesh.boundaryMesh()
-                ).ptr();
-            }
-            patches.setSize(nPatches);
-            mesh.addFvPatches(patches, false);  // no parallel comms
-
-            //// Write empty mesh now we have correct patches
-            //meshPtr().write();
-        }
-    }
-
-
-    // Determine zones
-    // ~~~~~~~~~~~~~~~
-
-    wordList pointZoneNames(mesh.pointZones().names());
-    Pstream::scatter(pointZoneNames);
-    wordList faceZoneNames(mesh.faceZones().names());
-    Pstream::scatter(faceZoneNames);
-    wordList cellZoneNames(mesh.cellZones().names());
-    Pstream::scatter(cellZoneNames);
-
-    if (!haveMesh)
-    {
-        // Add the zones. Make sure to remove the old dummy ones first
-        mesh.pointZones().clear();
-        mesh.faceZones().clear();
-        mesh.cellZones().clear();
-
-        List<pointZone*> pz(pointZoneNames.size());
-        forAll(pointZoneNames, i)
-        {
-            pz[i] = new pointZone
-            (
-                pointZoneNames[i],
-                labelList(0),
-                i,
-                mesh.pointZones()
-            );
-        }
-        List<faceZone*> fz(faceZoneNames.size());
-        forAll(faceZoneNames, i)
-        {
-            fz[i] = new faceZone
-            (
-                faceZoneNames[i],
-                labelList(0),
-                boolList(0),
-                i,
-                mesh.faceZones()
-            );
-        }
-        List<cellZone*> cz(cellZoneNames.size());
-        forAll(cellZoneNames, i)
-        {
-            cz[i] = new cellZone
-            (
-                cellZoneNames[i],
-                labelList(0),
-                i,
-                mesh.cellZones()
-            );
-        }
-        mesh.addZones(pz, fz, cz);
-    }
-
-
-    if (!haveMesh)
-    {
-        // We created a dummy mesh file above. Delete it.
-        //Pout<< "Removing dummy mesh " << io.objectPath() << endl;
-        rmDir(io.objectPath());
-    }
-
-    // Force recreation of globalMeshData.
-    mesh.clearOut();
-    mesh.globalData();
-
-
-    // Do some checks.
-
-    // Check if the boundary definition is unique
-    mesh.boundaryMesh().checkDefinition(true);
-    // Check if the boundary processor patches are correct
-    mesh.boundaryMesh().checkParallelSync(true);
-    // Check names of zones are equal
-    mesh.cellZones().checkDefinition(true);
-    mesh.cellZones().checkParallelSync(true);
-    mesh.faceZones().checkDefinition(true);
-    mesh.faceZones().checkParallelSync(true);
-    mesh.pointZones().checkDefinition(true);
-    mesh.pointZones().checkParallelSync(true);
-
-    return meshPtr;
-}
+//// Read mesh if available. Otherwise create empty mesh with same non-proc
+//// patches as proc0 mesh. Requires all processors to have all patches
+//// (and in same order).
+//autoPtr<fvMesh> createMesh
+//(
+//    const Time& runTime,
+//    const word& regionName,
+//    const fileName& instDir,
+//    const bool haveMesh
+//)
+//{
+//    //Pout<< "Create mesh for time = "
+//    //    << runTime.timeName() << nl << endl;
+//
+//    IOobject io
+//    (
+//        regionName,
+//        instDir,
+//        runTime,
+//        IOobject::MUST_READ
+//    );
+//
+//    if (!haveMesh)
+//    {
+//        // Create dummy mesh. Only used on procs that don't have mesh.
+//        IOobject noReadIO(io);
+//        noReadIO.readOpt() = IOobject::NO_READ;
+//        fvMesh dummyMesh
+//        (
+//            noReadIO,
+//            xferCopy(pointField()),
+//            xferCopy(faceList()),
+//            xferCopy(labelList()),
+//            xferCopy(labelList()),
+//            false
+//        );
+//        // Add some dummy zones so upon reading it does not read them
+//        // from the undecomposed case. Should be done as extra argument to
+//        // regIOobject::readStream?
+//        List<pointZone*> pz
+//        (
+//            1,
+//            new pointZone
+//            (
+//                "dummyPointZone",
+//                labelList(0),
+//                0,
+//                dummyMesh.pointZones()
+//            )
+//        );
+//        List<faceZone*> fz
+//        (
+//            1,
+//            new faceZone
+//            (
+//                "dummyFaceZone",
+//                labelList(0),
+//                boolList(0),
+//                0,
+//                dummyMesh.faceZones()
+//            )
+//        );
+//        List<cellZone*> cz
+//        (
+//            1,
+//            new cellZone
+//            (
+//                "dummyCellZone",
+//                labelList(0),
+//                0,
+//                dummyMesh.cellZones()
+//            )
+//        );
+//        dummyMesh.addZones(pz, fz, cz);
+//        //Pout<< "Writing dummy mesh to " << dummyMesh.polyMesh::objectPath()
+//        //    << endl;
+//        dummyMesh.write();
+//    }
+//
+//    //Pout<< "Reading mesh from " << io.objectPath() << endl;
+//    autoPtr<fvMesh> meshPtr(new fvMesh(io));
+//    fvMesh& mesh = meshPtr();
+//
+//
+//    // Sync patches
+//    // ~~~~~~~~~~~~
+//
+//    if (Pstream::master())
+//    {
+//        // Send patches
+//        for
+//        (
+//            int slave=Pstream::firstSlave();
+//            slave<=Pstream::lastSlave();
+//            slave++
+//        )
+//        {
+//            OPstream toSlave(Pstream::scheduled, slave);
+//            toSlave << mesh.boundaryMesh();
+//        }
+//    }
+//    else
+//    {
+//        // Receive patches
+//        IPstream fromMaster(Pstream::scheduled, Pstream::masterNo());
+//        PtrList<entry> patchEntries(fromMaster);
+//
+//        if (haveMesh)
+//        {
+//            // Check master names against mine
+//
+//            const polyBoundaryMesh& patches = mesh.boundaryMesh();
+//
+//            forAll(patchEntries, patchI)
+//            {
+//                const entry& e = patchEntries[patchI];
+//                const word type(e.dict().lookup("type"));
+//                const word& name = e.keyword();
+//
+//                if (type == processorPolyPatch::typeName)
+//                {
+//                    break;
+//                }
+//
+//                if (patchI >= patches.size())
+//                {
+//                    FatalErrorIn
+//                    (
+//                        "createMesh(const Time&, const fileName&, const bool)"
+//                    )   << "Non-processor patches not synchronised."
+//                        << endl
+//                        << "Processor " << Pstream::myProcNo()
+//                        << " has only " << patches.size()
+//                        << " patches, master has "
+//                        << patchI
+//                        << exit(FatalError);
+//                }
+//
+//                if
+//                (
+//                    type != patches[patchI].type()
+//                 || name != patches[patchI].name()
+//                )
+//                {
+//                    FatalErrorIn
+//                    (
+//                        "createMesh(const Time&, const fileName&, const bool)"
+//                    )   << "Non-processor patches not synchronised."
+//                        << endl
+//                        << "Master patch " << patchI
+//                        << " name:" << type
+//                        << " type:" << type << endl
+//                        << "Processor " << Pstream::myProcNo()
+//                        << " patch " << patchI
+//                        << " has name:" << patches[patchI].name()
+//                        << " type:" << patches[patchI].type()
+//                        << exit(FatalError);
+//                }
+//            }
+//        }
+//        else
+//        {
+//            // Add patch
+//            List<polyPatch*> patches(patchEntries.size());
+//            label nPatches = 0;
+//
+//            forAll(patchEntries, patchI)
+//            {
+//                const entry& e = patchEntries[patchI];
+//                const word type(e.dict().lookup("type"));
+//                const word& name = e.keyword();
+//
+//                if (type == processorPolyPatch::typeName)
+//                {
+//                    break;
+//                }
+//
+//                //Pout<< "Adding patch:" << nPatches
+//                //    << " name:" << name << " type:" << type << endl;
+//
+//                dictionary patchDict(e.dict());
+//                patchDict.remove("nFaces");
+//                patchDict.add("nFaces", 0);
+//                patchDict.remove("startFace");
+//                patchDict.add("startFace", 0);
+//
+//                patches[patchI] = polyPatch::New
+//                (
+//                    name,
+//                    patchDict,
+//                    nPatches++,
+//                    mesh.boundaryMesh()
+//                ).ptr();
+//            }
+//            patches.setSize(nPatches);
+//            mesh.addFvPatches(patches, false);  // no parallel comms
+//
+//            //// Write empty mesh now we have correct patches
+//            //meshPtr().write();
+//        }
+//    }
+//
+//
+//    // Determine zones
+//    // ~~~~~~~~~~~~~~~
+//
+//    wordList pointZoneNames(mesh.pointZones().names());
+//    Pstream::scatter(pointZoneNames);
+//    wordList faceZoneNames(mesh.faceZones().names());
+//    Pstream::scatter(faceZoneNames);
+//    wordList cellZoneNames(mesh.cellZones().names());
+//    Pstream::scatter(cellZoneNames);
+//
+//    if (!haveMesh)
+//    {
+//        // Add the zones. Make sure to remove the old dummy ones first
+//        mesh.pointZones().clear();
+//        mesh.faceZones().clear();
+//        mesh.cellZones().clear();
+//
+//        List<pointZone*> pz(pointZoneNames.size());
+//        forAll(pointZoneNames, i)
+//        {
+//            pz[i] = new pointZone
+//            (
+//                pointZoneNames[i],
+//                labelList(0),
+//                i,
+//                mesh.pointZones()
+//            );
+//        }
+//        List<faceZone*> fz(faceZoneNames.size());
+//        forAll(faceZoneNames, i)
+//        {
+//            fz[i] = new faceZone
+//            (
+//                faceZoneNames[i],
+//                labelList(0),
+//                boolList(0),
+//                i,
+//                mesh.faceZones()
+//            );
+//        }
+//        List<cellZone*> cz(cellZoneNames.size());
+//        forAll(cellZoneNames, i)
+//        {
+//            cz[i] = new cellZone
+//            (
+//                cellZoneNames[i],
+//                labelList(0),
+//                i,
+//                mesh.cellZones()
+//            );
+//        }
+//        mesh.addZones(pz, fz, cz);
+//    }
+//
+//
+//    if (!haveMesh)
+//    {
+//        // We created a dummy mesh file above. Delete it.
+//        //Pout<< "Removing dummy mesh " << io.objectPath() << endl;
+//        rmDir(io.objectPath());
+//    }
+//
+//    // Force recreation of globalMeshData.
+//    mesh.clearOut();
+//    mesh.globalData();
+//
+//
+//    // Do some checks.
+//
+//    // Check if the boundary definition is unique
+//    mesh.boundaryMesh().checkDefinition(true);
+//    // Check if the boundary processor patches are correct
+//    mesh.boundaryMesh().checkParallelSync(true);
+//    // Check names of zones are equal
+//    mesh.cellZones().checkDefinition(true);
+//    mesh.cellZones().checkParallelSync(true);
+//    mesh.faceZones().checkDefinition(true);
+//    mesh.faceZones().checkParallelSync(true);
+//    mesh.pointZones().checkDefinition(true);
+//    mesh.pointZones().checkParallelSync(true);
+//
+//    return meshPtr;
+//}
 
 
 // Get merging distance when matching face centres
@@ -786,13 +787,24 @@ int main(int argc, char *argv[])
     const bool allHaveMesh = (findIndex(haveMesh, false) == -1);
 
     // Create mesh
-    autoPtr<fvMesh> meshPtr = createMesh
+    //autoPtr<fvMesh> meshPtr = createMesh
+    //(
+    //    runTime,
+    //    regionName,
+    //    masterInstDir,
+    //    haveMesh[Pstream::myProcNo()]
+    //);
+    autoPtr<fvMesh> meshPtr = loadOrCreateMesh
     (
-        runTime,
-        regionName,
-        masterInstDir,
-        haveMesh[Pstream::myProcNo()]
+        IOobject
+        (
+            regionName,
+            masterInstDir,
+            runTime,
+            Foam::IOobject::MUST_READ
+        )
     );
+
     fvMesh& mesh = meshPtr();
 
     // Print some statistics

From 4a0729523877bbe606648900bd71b5bf8b19c904 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Mon, 2 Apr 2012 10:52:42 +0100
Subject: [PATCH 142/317] ENH: cvMeshBackgroundMesh: new application to get a
 background mesh

---
 .../mesh/generation/cvMesh/Allwclean          |   2 +
 .../utilities/mesh/generation/cvMesh/Allwmake |   1 +
 .../backgroundMeshDecomposition.C             | 107 +++++++++++++++---
 .../backgroundMeshDecomposition.H             |  47 +++++++-
 .../backgroundMeshDecompositionI.H            |  25 +++-
 5 files changed, 157 insertions(+), 25 deletions(-)

diff --git a/applications/utilities/mesh/generation/cvMesh/Allwclean b/applications/utilities/mesh/generation/cvMesh/Allwclean
index 6dd3690c25..3eff84006a 100755
--- a/applications/utilities/mesh/generation/cvMesh/Allwclean
+++ b/applications/utilities/mesh/generation/cvMesh/Allwclean
@@ -4,5 +4,7 @@ set -x
 
 wclean libso conformalVoronoiMesh
 wclean
+wclean cvMeshSurfaceSimplify
+wclean cvMeshBackgroundMesh
 
 # ----------------------------------------------------------------- end-of-file
diff --git a/applications/utilities/mesh/generation/cvMesh/Allwmake b/applications/utilities/mesh/generation/cvMesh/Allwmake
index f059754bab..2a998cb690 100755
--- a/applications/utilities/mesh/generation/cvMesh/Allwmake
+++ b/applications/utilities/mesh/generation/cvMesh/Allwmake
@@ -5,5 +5,6 @@ set -x
 wmake libso conformalVoronoiMesh
 wmake
 wmake cvMeshSurfaceSimplify
+wmake cvMeshBackgroundMesh
 
 # ----------------------------------------------------------------- end-of-file
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.C b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.C
index 395b6c78b2..cf7a1eb902 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.C
+++ b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -142,7 +142,7 @@ void Foam::backgroundMeshDecomposition::initialRefinement()
         zeroGradientFvPatchScalarField::typeName
     );
 
-    const conformationSurfaces& geometry = cvMesh_.geometryToConformTo();
+    const conformationSurfaces& geometry = geometryToConformTo_;
 
     decompositionMethod& decomposer = decomposerPtr_();
 
@@ -512,7 +512,7 @@ bool Foam::backgroundMeshDecomposition::refineCell
     // Sample the box to find an estimate of the min size, and a volume
     // estimate when overlapping == true.
 
-    const conformationSurfaces& geometry = cvMesh_.geometryToConformTo();
+    const conformationSurfaces& geometry = geometryToConformTo_;
 
     treeBoundBox cellBb
     (
@@ -578,7 +578,7 @@ bool Foam::backgroundMeshDecomposition::refineCell
 
         forAll(samplePoints, i)
         {
-            scalar s = cvMesh_.cellSizeControl().cellSize
+            scalar s = cellSizeControl_.cellSize
             (
                 hitInfo[i].hitPoint()
             );
@@ -693,7 +693,7 @@ void Foam::backgroundMeshDecomposition::buildPatchAndTree()
     // Overall bb
     treeBoundBox overallBb(boundaryFacesPtr_().localPoints());
 
-    Random& rnd = cvMesh_.rndGen();
+    Random& rnd = rndGen_;
 
     bFTreePtr_.reset
     (
@@ -726,11 +726,11 @@ void Foam::backgroundMeshDecomposition::buildPatchAndTree()
 
     octreeNearestDistances_ = bFTreePtr_().calcNearestDistance();
 
-    if (cvMesh_.cvMeshControls().objOutput())
+    if (cvMeshControls_.objOutput())
     {
         OFstream fStr
         (
-            cvMesh_.time().path()
+            mesh_.time().path()
            /"backgroundMeshDecomposition_proc_"
           + name(Pstream::myProcNo())
           + "_boundaryFaces.obj"
@@ -777,15 +777,18 @@ Foam::backgroundMeshDecomposition::backgroundMeshDecomposition
     const conformalVoronoiMesh& cvMesh
 )
 :
-    coeffsDict_(coeffsDict),
-    cvMesh_(cvMesh),
+    runTime_(cvMesh.time()),
+    geometryToConformTo_(cvMesh.geometryToConformTo()),
+    cellSizeControl_(cvMesh.cellSizeControl()),
+    rndGen_(cvMesh.rndGen()),
+    cvMeshControls_(cvMesh.cvMeshControls()),
     mesh_
     (
         IOobject
         (
             fvMesh::defaultRegion,
-            cvMesh_.time().timeName(),
-            cvMesh_.time(),
+            runTime_.timeName(),
+            runTime_,
             IOobject::MUST_READ
         )
     ),
@@ -805,22 +808,22 @@ Foam::backgroundMeshDecomposition::backgroundMeshDecomposition
         IOobject
         (
             "decomposeParDict",
-            cvMesh_.time().system(),
-            cvMesh_.time(),
+            runTime_.system(),
+            runTime_,
             IOobject::MUST_READ_IF_MODIFIED,
             IOobject::NO_WRITE
         )
     ),
     decomposerPtr_(decompositionMethod::New(decomposeDict_)),
     mergeDist_(1e-6*mesh_.bounds().mag()),
-    spanScale_(readScalar(coeffsDict_.lookup("spanScale"))),
+    spanScale_(readScalar(coeffsDict.lookup("spanScale"))),
     minCellSizeLimit_
     (
-        coeffsDict_.lookupOrDefault<scalar>("minCellSizeLimit", 0.0)
+        coeffsDict.lookupOrDefault<scalar>("minCellSizeLimit", 0.0)
     ),
-    minLevels_(readLabel(coeffsDict_.lookup("minLevels"))),
-    volRes_(readLabel(coeffsDict_.lookup("sampleResolution"))),
-    maxCellWeightCoeff_(readScalar(coeffsDict_.lookup("maxCellWeightCoeff")))
+    minLevels_(readLabel(coeffsDict.lookup("minLevels"))),
+    volRes_(readLabel(coeffsDict.lookup("sampleResolution"))),
+    maxCellWeightCoeff_(readScalar(coeffsDict.lookup("maxCellWeightCoeff")))
 {
     if (!Pstream::parRun())
     {
@@ -854,6 +857,74 @@ Foam::backgroundMeshDecomposition::backgroundMeshDecomposition
 }
 
 
+Foam::backgroundMeshDecomposition::backgroundMeshDecomposition
+(
+    const scalar spanScale,
+    const scalar minCellSizeLimit,
+    const label minLevels,
+    const label volRes,
+    const scalar maxCellWeightCoeff,
+
+    const Time& runTime,
+    const conformationSurfaces& geometryToConformTo,
+    const cellSizeControlSurfaces& cellSizeControl,
+    Random& rndGen,
+    const cvControls& cvMeshControls
+)
+:
+    runTime_(runTime),
+    geometryToConformTo_(geometryToConformTo),
+    cellSizeControl_(cellSizeControl),
+    rndGen_(rndGen),
+    cvMeshControls_(cvMeshControls),
+    mesh_
+    (
+        IOobject
+        (
+            fvMesh::defaultRegion,
+            runTime_.timeName(),
+            runTime_,
+            IOobject::MUST_READ
+        )
+    ),
+    meshCutter_
+    (
+        mesh_,
+        labelList(mesh_.nCells(), 0),
+        labelList(mesh_.nPoints(), 0)
+    ),
+    boundaryFacesPtr_(),
+    bFTreePtr_(),
+    octreeNearestDistances_(),
+    allBackgroundMeshBounds_(Pstream::nProcs()),
+    globalBackgroundBounds_(),
+    decomposeDict_
+    (
+        IOobject
+        (
+            "decomposeParDict",
+            runTime_.system(),
+            runTime_,
+            IOobject::MUST_READ_IF_MODIFIED,
+            IOobject::NO_WRITE
+        )
+    ),
+    decomposerPtr_(decompositionMethod::New(decomposeDict_)),
+    mergeDist_(1e-6*mesh_.bounds().mag()),
+    spanScale_(spanScale),
+    minCellSizeLimit_(minCellSizeLimit),
+    minLevels_(minLevels),
+    volRes_(volRes),
+    maxCellWeightCoeff_(maxCellWeightCoeff)
+{
+    // Stand-alone operation
+
+    Info<< nl << "Building initial background mesh decomposition" << endl;
+
+    initialRefinement();
+}
+
+
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
 Foam::backgroundMeshDecomposition::~backgroundMeshDecomposition()
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.H b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.H
index 01572a48f9..910732fa7a 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.H
+++ b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -92,10 +92,22 @@ class backgroundMeshDecomposition
     // Private data
 
         //- Method details dictionary
-        dictionary coeffsDict_;
+        //dictionary coeffsDict_;
 
-        //- Reference to the conformalVoronoiMesh holding this object
-        const conformalVoronoiMesh& cvMesh_;
+        //- Reference to runtime
+        const Time& runTime_;
+
+        //- Reference to surface
+        const conformationSurfaces& geometryToConformTo_;
+
+        //- The cell size control object
+        const cellSizeControlSurfaces& cellSizeControl_;
+
+        //- Random number generator
+        Random& rndGen_;
+
+        //- Controls
+        const cvControls& cvMeshControls_;
 
         //- Mesh stored on for this processor, specifiying the domain that it
         //  is responsible for.
@@ -191,13 +203,29 @@ public:
 
     // Constructors
 
-        //- Construct from components
+        //- Construct from components in cvMesh operation
         backgroundMeshDecomposition
         (
             const dictionary& coeffsDict,
             const conformalVoronoiMesh& cvMesh
         );
 
+        //- Construct from components for standalone operation
+        backgroundMeshDecomposition
+        (
+            const scalar spanScale,
+            const scalar minCellSizeLimit,
+            const label minLevels,
+            const label volRes,
+            const scalar maxCellWeightCoeff,
+
+            const Time& runTime,
+            const conformationSurfaces& geometryToConformTo,
+            const cellSizeControlSurfaces& cellSizeControl,
+            Random& rndGen,
+            const cvControls& cvMeshControls
+        );
+
 
     //- Destructor
     ~backgroundMeshDecomposition();
@@ -299,6 +327,15 @@ public:
 
             //- Return the boundBox of this processor
             inline const treeBoundBox& procBounds() const;
+
+            //- Return the cell level of the underlying mesh
+            inline const labelList& cellLevel() const;
+
+            //- Return the point level of the underlying mesh
+            inline const labelList& pointLevel() const;
+
+            //- Return the current decomposition method
+            inline const decompositionMethod& decomposer() const;
 };
 
 
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecompositionI.H b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecompositionI.H
index 94a05c4134..44a007193d 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecompositionI.H
+++ b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecompositionI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -43,9 +43,30 @@ Foam::backgroundMeshDecomposition::octreeNearestDistances() const
 }
 
 
-const Foam::treeBoundBox& Foam::backgroundMeshDecomposition::procBounds() const
+const Foam::treeBoundBox&
+Foam::backgroundMeshDecomposition::procBounds() const
 {
     return allBackgroundMeshBounds_[Pstream::myProcNo()];
 }
 
+
+const Foam::labelList& Foam::backgroundMeshDecomposition::cellLevel() const
+{
+    return meshCutter_.cellLevel();
+}
+
+
+const Foam::labelList& Foam::backgroundMeshDecomposition::pointLevel() const
+{
+    return meshCutter_.pointLevel();
+}
+
+
+const Foam::decompositionMethod&
+Foam::backgroundMeshDecomposition::decomposer() const
+{
+    return decomposerPtr_();
+}
+
+
 // ************************************************************************* //

From 92a66ebc61dcb3fb3fca95909f84260a0111703c Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Mon, 2 Apr 2012 10:56:59 +0100
Subject: [PATCH 143/317] ENH: cvMeshbackgroundMesh: cleaned up building

---
 .../cvMesh/cvMeshBackgroundMesh/Make/files    |   3 +
 .../cvMesh/cvMeshBackgroundMesh/Make/options  |  31 +
 .../cvMeshBackgroundMesh.C                    | 920 ++++++++++++++++++
 3 files changed, 954 insertions(+)
 create mode 100644 applications/utilities/mesh/generation/cvMesh/cvMeshBackgroundMesh/Make/files
 create mode 100644 applications/utilities/mesh/generation/cvMesh/cvMeshBackgroundMesh/Make/options
 create mode 100644 applications/utilities/mesh/generation/cvMesh/cvMeshBackgroundMesh/cvMeshBackgroundMesh.C

diff --git a/applications/utilities/mesh/generation/cvMesh/cvMeshBackgroundMesh/Make/files b/applications/utilities/mesh/generation/cvMesh/cvMeshBackgroundMesh/Make/files
new file mode 100644
index 0000000000..58406b931a
--- /dev/null
+++ b/applications/utilities/mesh/generation/cvMesh/cvMeshBackgroundMesh/Make/files
@@ -0,0 +1,3 @@
+cvMeshBackgroundMesh.C
+
+EXE = $(FOAM_APPBIN)/cvMeshBackgroundMesh
diff --git a/applications/utilities/mesh/generation/cvMesh/cvMeshBackgroundMesh/Make/options b/applications/utilities/mesh/generation/cvMesh/cvMeshBackgroundMesh/Make/options
new file mode 100644
index 0000000000..0e2d0c9f0a
--- /dev/null
+++ b/applications/utilities/mesh/generation/cvMesh/cvMeshBackgroundMesh/Make/options
@@ -0,0 +1,31 @@
+/*
+EXE_DEBUG = -DFULLDEBUG -g -O0
+EXE_FROUNDING_MATH = -frounding-math
+EXE_NDEBUG = -DNDEBUG
+*/
+
+include $(GENERAL_RULES)/CGAL
+
+EXE_INC = \
+    ${EXE_FROUNDING_MATH} \
+    ${EXE_NDEBUG} \
+    ${CGAL_INC} \
+    -I../conformalVoronoiMesh/lnInclude \
+    -I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude \
+    -I$(LIB_SRC)/edgeMesh/lnInclude \
+    -I$(LIB_SRC)/sampling/lnInclude \
+    -I$(LIB_SRC)/triSurface/lnInclude \
+    -I$(LIB_SRC)/finiteVolume/lnInclude \
+    -I$(LIB_SRC)/meshTools/lnInclude \
+    -I$(LIB_SRC)/dynamicMesh/lnInclude
+
+EXE_LIBS = \
+    $(CGAL_LIBS) \
+    -lconformalVoronoiMesh \
+    -ldecompositionMethods /* -L$(FOAM_LIBBIN)/dummy -lscotchDecomp */ \
+    -ledgeMesh \
+    -ltriSurface \
+    -lmeshTools \
+    -ldynamicMesh \
+    -lsampling \
+    -lfiniteVolume
diff --git a/applications/utilities/mesh/generation/cvMesh/cvMeshBackgroundMesh/cvMeshBackgroundMesh.C b/applications/utilities/mesh/generation/cvMesh/cvMeshBackgroundMesh/cvMeshBackgroundMesh.C
new file mode 100644
index 0000000000..c2642366a9
--- /dev/null
+++ b/applications/utilities/mesh/generation/cvMesh/cvMeshBackgroundMesh/cvMeshBackgroundMesh.C
@@ -0,0 +1,920 @@
+/*---------------------------------------------------------------------------*\
+ =========                   |
+ \\      /   F ield          | OpenFOAM: The Open Source CFD Toolbox
+  \\    /    O peration      |
+   \\  /     A nd            | Copyright (C) 2012 OpenFOAM Foundation
+    \\/      M anipulation   |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Application
+    cvMeshBackGroundMesh
+
+Description
+    Writes out background mesh as constructed by cvMesh and constructs
+    distanceSurface.
+
+\*---------------------------------------------------------------------------*/
+
+#include "PatchTools.H"
+#include "argList.H"
+#include "Time.H"
+#include "triSurface.H"
+#include "searchableSurfaces.H"
+#include "conformationSurfaces.H"
+#include "cellSizeControlSurfaces.H"
+#include "backgroundMeshDecomposition.H"
+#include "cellShape.H"
+#include "cellModeller.H"
+#include "DynamicField.H"
+#include "isoSurfaceCell.H"
+#include "vtkSurfaceWriter.H"
+#include "syncTools.H"
+
+using namespace Foam;
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// Tolerance (as fraction of the bounding box). Needs to be fairly lax since
+// usually meshes get written with limited precision (6 digits)
+static const scalar defaultMergeTol = 1E-6;
+
+// Get merging distance when matching face centres
+scalar getMergeDistance
+(
+    const argList& args,
+    const Time& runTime,
+    const boundBox& bb
+)
+{
+    scalar mergeTol = defaultMergeTol;
+    args.optionReadIfPresent("mergeTol", mergeTol);
+
+    scalar writeTol =
+        Foam::pow(scalar(10.0), -scalar(IOstream::defaultPrecision()));
+
+    Info<< "Merge tolerance : " << mergeTol << nl
+        << "Write tolerance : " << writeTol << endl;
+
+    if (runTime.writeFormat() == IOstream::ASCII && mergeTol < writeTol)
+    {
+        FatalErrorIn("getMergeDistance")
+            << "Your current settings specify ASCII writing with "
+            << IOstream::defaultPrecision() << " digits precision." << endl
+            << "Your merging tolerance (" << mergeTol << ") is finer than this."
+            << endl
+            << "Please change your writeFormat to binary"
+            << " or increase the writePrecision" << endl
+            << "or adjust the merge tolerance (-mergeTol)."
+            << exit(FatalError);
+    }
+
+    scalar mergeDist = mergeTol * bb.mag();
+
+    Info<< "Overall meshes bounding box : " << bb << nl
+        << "Relative tolerance          : " << mergeTol << nl
+        << "Absolute matching distance  : " << mergeDist << nl
+        << endl;
+
+    return mergeDist;
+}
+
+
+void printMeshData(const polyMesh& mesh)
+{
+    // Collect all data on master
+
+    globalIndex globalCells(mesh.nCells());
+    labelListList patchNeiProcNo(Pstream::nProcs());
+    labelListList patchSize(Pstream::nProcs());
+    const labelList& pPatches = mesh.globalData().processorPatches();
+    patchNeiProcNo[Pstream::myProcNo()].setSize(pPatches.size());
+    patchSize[Pstream::myProcNo()].setSize(pPatches.size());
+    forAll(pPatches, i)
+    {
+        const processorPolyPatch& ppp = refCast<const processorPolyPatch>
+        (
+            mesh.boundaryMesh()[pPatches[i]]
+        );
+        patchNeiProcNo[Pstream::myProcNo()][i] = ppp.neighbProcNo();
+        patchSize[Pstream::myProcNo()][i] = ppp.size();
+    }
+    Pstream::gatherList(patchNeiProcNo);
+    Pstream::gatherList(patchSize);
+
+
+    // Print stats
+
+    globalIndex globalBoundaryFaces(mesh.nFaces()-mesh.nInternalFaces());
+
+    label maxProcCells = 0;
+    label totProcFaces = 0;
+    label maxProcPatches = 0;
+    label totProcPatches = 0;
+    label maxProcFaces = 0;
+
+    for (label procI = 0; procI < Pstream::nProcs(); procI++)
+    {
+        Info<< endl
+            << "Processor " << procI << nl
+            << "    Number of cells = " << globalCells.localSize(procI)
+            << endl;
+
+        label nProcFaces = 0;
+
+        const labelList& nei = patchNeiProcNo[procI];
+
+        forAll(patchNeiProcNo[procI], i)
+        {
+            Info<< "    Number of faces shared with processor "
+                << patchNeiProcNo[procI][i] << " = " << patchSize[procI][i]
+                << endl;
+
+            nProcFaces += patchSize[procI][i];
+        }
+
+        Info<< "    Number of processor patches = " << nei.size() << nl
+            << "    Number of processor faces = " << nProcFaces << nl
+            << "    Number of boundary faces = "
+            << globalBoundaryFaces.localSize(procI) << endl;
+
+        maxProcCells = max(maxProcCells, globalCells.localSize(procI));
+        totProcFaces += nProcFaces;
+        totProcPatches += nei.size();
+        maxProcPatches = max(maxProcPatches, nei.size());
+        maxProcFaces = max(maxProcFaces, nProcFaces);
+    }
+
+    // Stats
+
+    scalar avgProcCells = scalar(globalCells.size())/Pstream::nProcs();
+    scalar avgProcPatches = scalar(totProcPatches)/Pstream::nProcs();
+    scalar avgProcFaces = scalar(totProcFaces)/Pstream::nProcs();
+
+    // In case of all faces on one processor. Just to avoid division by 0.
+    if (totProcPatches == 0)
+    {
+        avgProcPatches = 1;
+    }
+    if (totProcFaces == 0)
+    {
+        avgProcFaces = 1;
+    }
+
+    Info<< nl
+        << "Number of processor faces = " << totProcFaces/2 << nl
+        << "Max number of cells = " << maxProcCells
+        << " (" << 100.0*(maxProcCells-avgProcCells)/avgProcCells
+        << "% above average " << avgProcCells << ")" << nl
+        << "Max number of processor patches = " << maxProcPatches
+        << " (" << 100.0*(maxProcPatches-avgProcPatches)/avgProcPatches
+        << "% above average " << avgProcPatches << ")" << nl
+        << "Max number of faces between processors = " << maxProcFaces
+        << " (" << 100.0*(maxProcFaces-avgProcFaces)/avgProcFaces
+        << "% above average " << avgProcFaces << ")" << nl
+        << endl;
+}
+
+
+// Return cellID
+label cellLabel
+(
+    const Vector<label>& nCells,
+    const label i,
+    const label j,
+    const label k
+)
+{
+    return i*nCells[1]*nCells[2]+j*nCells[2]+k;
+}
+
+label vtxLabel
+(
+    const Vector<label>& nCells,
+    const label i,
+    const label j,
+    const label k
+)
+{
+    Vector<label> nPoints
+    (
+        nCells[0]+1,
+        nCells[1]+1,
+        nCells[2]+1
+    );
+    return i*nPoints[1]*nPoints[2]+j*nPoints[2]+k;
+}
+
+
+//// Generate hex mesh around surface.
+//void setRefinement
+//(
+//    const vector& cellSize,
+//    const Vector<label>& nCells
+//    polyTopoChange& meshMod
+//)
+//{
+//    const treeBoundBox& bb = geometryToConformTo.globalBounds();
+//
+//    // Determine the number of cells in each direction.
+//    vector nScalarCells = bb.span()/cellSizeControl.defaultCellSize();
+//    Vector<label> nCells
+//    (
+//        label(nScalarCells[0]),
+//        label(nScalarCells[1]),
+//        label(nScalarCells[2])
+//    );
+//    vector cellSize(bb.span()/nCells);
+//
+//    const label nPatches = 1;
+//    polyTopoChange meshMod(nPatches);
+//
+//    // Generate points
+//    for (label i = 0; i <= nCells[0]; i++)
+//    {
+//        for (label j = 0; j <= nCells[1]; j++)
+//        {
+//            for (label k = 0; k <= nCells[2]; k++)
+//            {
+//                meshMod.addPoint
+//                (
+//                    bb.min()+i*cellSize[0]+j*cellSize[1]+k*cellSize[2],
+//                    -1, // masterPointID,
+//                    -1, // zoneID,
+//                    true
+//                );
+//            }
+//        }
+//    }
+//
+//    // Generate cells such that cell
+//    for (label i = 0; i < nCells[0]; i++)
+//    {
+//        for (label j = 0; j < nCells[1]; j++)
+//        {
+//            for (label k = 0; k < nCells[2]; k++)
+//            {
+//                meshMod.addCell
+//                (
+//                    -1, // masterPointID,
+//                    -1, // masterEdgeID,
+//                    -1, // masterFaceID,
+//                    -1, // masterCellID,
+//                    -1  //zoneID
+//                );
+//            }
+//        }
+//    }
+//
+//    // Generate internal faces
+//    face f(4);
+//
+//    // Internal faces between i and i+1
+//    for (label i = 0; i < nCells[0]-1; i++)
+//    {
+//        for (label j = 0; j < nCells[1]-1; j++)
+//        {
+//            for (label k = 0; k < nCells[2]-1; k++)
+//            {
+//                face[0] = vertexID(nCells, i, j, k);
+//                face[1] = vertexID(nCells, i, j+1, k);
+//                face[2] = vertexID(nCells, i, j+1, k+1);
+//                face[3] = vertexID(nCells, i, j, k+1);
+//
+//                meshMod.addFace
+//                (
+//                    f,
+//                    cellID(nCells, i,j, k),     //own
+//                    cellID(nCells, i+1,j, k+1), //nei
+//                    -1,     //masterPointID,
+//                    -1,     //masterEdgeID,
+//                    -1,     //masterFaceID,
+//                    false,  //flipFaceFlux,
+//                    -1,     //patchID,
+//                    -1,       //zoneID,
+//                    false   //zoneFlip
+//                );
+//            }
+//        }
+//    }
+//    // Internal faces between j and j+1
+//    for (label i = 0; i < nCells[0]-1; i++)
+//    {
+//        for (label j = 0; j < nCells[1]-1; j++)
+//        {
+//            for (label k = 0; k < nCells[2]-1; k++)
+//            {
+//                face[0] = vertexID(nCells, i, j, k);
+//                face[1] = vertexID(nCells, i, j, k+1);
+//                face[2] = vertexID(nCells, i+1, j, k+1);
+//                face[3] = vertexID(nCells, i+1, j, k);
+//
+//                meshMod.addFace
+//                (
+//                    f,
+//                    cellID(nCells, i,j, k),     //own
+//                    cellID(nCells, i,j+1, k+1), //nei
+//                    -1,     //masterPointID,
+//                    -1,     //masterEdgeID,
+//                    -1,     //masterFaceID,
+//                    false,  //flipFaceFlux,
+//                    -1,     //patchID,
+//                    -1,       //zoneID,
+//                    false   //zoneFlip
+//                );
+//            }
+//        }
+//    }
+//    // Internal faces between k and k+1
+//    for (label i = 0; i < nCells[0]-1; i++)
+//    {
+//        for (label j = 0; j < nCells[1]-1; j++)
+//        {
+//            for (label k = 0; k < nCells[2]-1; k++)
+//            {
+//                face[0] = vertexID(nCells, i, j, k);
+//                face[1] = vertexID(nCells, i+1, j, k);
+//                face[2] = vertexID(nCells, i+1, j+1, k);
+//                face[3] = vertexID(nCells, i, j+1, k);
+//
+//                meshMod.addFace
+//                (
+//                    f,
+//                    cellID(nCells, i,j, k),     //own
+//                    cellID(nCells, i,j, k+1),   //nei
+//                    -1,     //masterPointID,
+//                    -1,     //masterEdgeID,
+//                    -1,     //masterFaceID,
+//                    false,  //flipFaceFlux,
+//                    -1,     //patchID,
+//                    -1,       //zoneID,
+//                    false   //zoneFlip
+//                );
+//            }
+//        }
+//    }
+//}
+
+
+autoPtr<polyMesh> generateHexMesh
+(
+    const IOobject& io,
+    const point& origin,
+    const vector& cellSize,
+    const Vector<label>& nCells
+)
+{
+    pointField points;
+    if (nCells[0]+nCells[1]+nCells[2] > 0)
+    {
+        points.setSize((nCells[0]+1)*(nCells[1]+1)*(nCells[2]+1));
+
+        // Generate points
+        for (label i = 0; i <= nCells[0]; i++)
+        {
+            for (label j = 0; j <= nCells[1]; j++)
+            {
+                for (label k = 0; k <= nCells[2]; k++)
+                {
+                    point pt = origin;
+                    pt.x() += i*cellSize[0];
+                    pt.y() += j*cellSize[1];
+                    pt.z() += k*cellSize[2];
+                    points[vtxLabel(nCells, i, j, k)] = pt;
+                }
+            }
+        }
+    }
+
+
+    const cellModel& hex = *(cellModeller::lookup("hex"));
+    cellShapeList cellShapes(nCells[0]*nCells[1]*nCells[2]);
+
+    labelList hexPoints(8);
+    label cellI = 0;
+    for (label i = 0; i < nCells[0]; i++)
+    {
+        for (label j = 0; j < nCells[1]; j++)
+        {
+            for (label k = 0; k < nCells[2]; k++)
+            {
+                hexPoints[0] = vtxLabel(nCells, i,   j,   k);
+                hexPoints[1] = vtxLabel(nCells, i+1, j,   k);
+                hexPoints[2] = vtxLabel(nCells, i+1, j+1, k);
+                hexPoints[3] = vtxLabel(nCells, i,   j+1, k);
+                hexPoints[4] = vtxLabel(nCells, i,   j,   k+1);
+                hexPoints[5] = vtxLabel(nCells, i+1, j,   k+1);
+                hexPoints[6] = vtxLabel(nCells, i+1, j+1, k+1);
+                hexPoints[7] = vtxLabel(nCells, i,   j+1, k+1);
+                cellShapes[cellI++] = cellShape(hex, hexPoints);
+            }
+        }
+    }
+
+    faceListList boundary(0);
+    wordList patchNames(0);
+    wordList patchTypes(0);
+    word defaultFacesName = "defaultFaces";
+    word defaultFacesType = polyPatch::typeName;
+    wordList patchPhysicalTypes(0);
+
+    return autoPtr<polyMesh>
+    (
+        new polyMesh
+        (
+            io,
+            xferMoveTo<pointField>(points),
+            cellShapes,
+            boundary,
+            patchNames,
+            patchTypes,
+            defaultFacesName,
+            defaultFacesType,
+            patchPhysicalTypes
+        )
+    );
+}
+
+
+// Determine for every point a signed distance to the nearest surface
+// (outside is positive)
+tmp<scalarField> signedDistance
+(
+    const scalarField& distSqr,
+    const pointField& points,
+    const searchableSurfaces& geometry,
+    const labelList& surfaces
+)
+{
+    tmp<scalarField> tfld(new scalarField(points.size(), Foam::sqr(GREAT)));
+    scalarField& fld = tfld();
+
+    // Find nearest
+    List<pointIndexHit> nearest;
+    labelList nearestSurfaces;
+    searchableSurfacesQueries::findNearest
+    (
+        geometry,
+        surfaces,
+        points,
+        scalarField(points.size(), Foam::sqr(GREAT)),//distSqr
+        nearestSurfaces,
+        nearest
+    );
+
+    // Determine sign of nearest. Sort by surface to do this.
+    DynamicField<point> surfPoints(points.size());
+    DynamicList<label> surfIndices(points.size());
+
+    forAll(surfaces, surfI)
+    {
+        // Extract points on this surface
+        surfPoints.clear();
+        surfIndices.clear();
+        forAll(nearestSurfaces, i)
+        {
+            if (nearestSurfaces[i] == surfI)
+            {
+                surfPoints.append(points[i]);
+                surfIndices.append(i);
+            }
+        }
+
+        // Calculate sideness of these surface points
+        label geomI = surfaces[surfI];
+        List<searchableSurface::volumeType> volType;
+        geometry[geomI].getVolumeType(surfPoints, volType);
+
+        // Push back to original
+        forAll(volType, i)
+        {
+            label pointI = surfIndices[i];
+            scalar dist = mag(points[pointI] - nearest[pointI].hitPoint());
+
+            searchableSurface::volumeType vT = volType[i];
+
+            if (vT == searchableSurface::OUTSIDE)
+            {
+                fld[pointI] = dist;
+            }
+            else if (vT == searchableSurface::INSIDE)
+            {
+                fld[i] = -dist;
+            }
+            else
+            {
+                FatalErrorIn("signedDistance()")
+                    << "getVolumeType failure, neither INSIDE or OUTSIDE"
+                    << exit(FatalError);
+            }
+        }
+    }
+
+    return tfld;
+}
+
+
+
+// Main program:
+
+int main(int argc, char *argv[])
+{
+    argList::addNote
+    (
+        "Generate cvMesh-consistent representation of surfaces"
+    );
+    argList::addBoolOption
+    (
+        "writeMesh",
+        "write the resulting mesh and distance fields"
+    );
+    argList::addOption
+    (
+        "mergeTol",
+        "scalar",
+        "specify the merge distance relative to the bounding box size "
+        "(default 1E-6)"
+    );
+
+    #include "setRootCase.H"
+    #include "createTime.H"
+    runTime.functionObjects().off();
+
+    const bool writeMesh = args.optionFound("writeMesh");
+
+    if (writeMesh)
+    {
+        Info<< "Writing resulting mesh and cellDistance, pointDistance fields."
+            << nl << endl;
+    }
+
+
+    IOdictionary cvMeshDict
+    (
+        IOobject
+        (
+            "cvMeshDict",
+            runTime.system(),
+            runTime,
+            IOobject::MUST_READ_IF_MODIFIED,
+            IOobject::NO_WRITE
+        )
+    );
+
+    // Define/load all geometry
+    searchableSurfaces allGeometry
+    (
+        IOobject
+        (
+            "cvSearchableSurfaces",
+            runTime.constant(),
+            "triSurface",
+            runTime,
+            IOobject::MUST_READ,
+            IOobject::NO_WRITE
+        ),
+        cvMeshDict.subDict("geometry")
+    );
+
+    Random rndGen(64293*Pstream::myProcNo());
+
+    conformationSurfaces geometryToConformTo
+    (
+        runTime,
+        rndGen,
+        allGeometry,
+        cvMeshDict.subDict("surfaceConformation")
+    );
+
+    cellSizeControlSurfaces cellSizeControl
+    (
+        allGeometry,
+        cvMeshDict.subDict("motionControl")
+    );
+
+
+    // Generate starting block mesh
+    vector cellSize;
+    {
+        const treeBoundBox& bb = geometryToConformTo.globalBounds();
+
+        // Determine the number of cells in each direction.
+        const vector span = bb.span();
+        vector nScalarCells = span/cellSizeControl.defaultCellSize();
+
+        // Calculate initial cell size to be a little bit smaller than the
+        // defaultCellSize to avoid initial refinement triggering.
+        Vector<label> nCells = Vector<label>
+        (
+            label(nScalarCells.x())+2,
+            label(nScalarCells.y())+2,
+            label(nScalarCells.z())+2
+        );
+        cellSize = vector
+        (
+            span[0]/nCells[0],
+            span[1]/nCells[1],
+            span[2]/nCells[2]
+        );
+
+        Info<< "Generating initial hex mesh with" << nl
+            << "    bounding box : " << bb << nl
+            << "    nCells       : " << nCells << nl
+            << "    cellSize     : " << cellSize << nl
+            << endl;
+
+        autoPtr<polyMesh> meshPtr
+        (
+            generateHexMesh
+            (
+                IOobject
+                (
+                    polyMesh::defaultRegion,
+                    runTime.constant(),
+                    runTime
+                ),
+                bb.min(),
+                cellSize,
+                (
+                    Pstream::master()
+                  ? nCells
+                  : Vector<label>(0, 0, 0)
+                )
+            )
+        );
+        Info<< "Writing initial hex mesh to " << meshPtr().instance() << nl
+            << endl;
+        meshPtr().write();
+    }
+
+    // Distribute the initial mesh
+    if (Pstream::parRun())
+    {
+#       include "createMesh.H"
+        Info<< "Loaded mesh:" << endl;
+        printMeshData(mesh);
+
+        // Allocate a decomposer
+        IOdictionary decompositionDict
+        (
+            IOobject
+            (
+                "decomposeParDict",
+                runTime.system(),
+                mesh,
+                IOobject::MUST_READ_IF_MODIFIED,
+                IOobject::NO_WRITE
+            )
+        );
+
+        autoPtr<decompositionMethod> decomposer
+        (
+            decompositionMethod::New
+            (
+                decompositionDict
+            )
+        );
+
+        labelList decomp = decomposer().decompose(mesh, mesh.cellCentres());
+
+        // Global matching tolerance
+        const scalar tolDim = getMergeDistance
+        (
+            args,
+            runTime,
+            mesh.bounds()
+        );
+
+        // Mesh distribution engine
+        fvMeshDistribute distributor(mesh, tolDim);
+
+        Info<< "Wanted distribution:"
+            << distributor.countCells(decomp) << nl << endl;
+
+        // Do actual sending/receiving of mesh
+        autoPtr<mapDistributePolyMesh> map = distributor.distribute(decomp);
+
+        // Print some statistics
+        //Info<< "After distribution:" << endl;
+        //printMeshData(mesh);
+
+        mesh.setInstance(runTime.constant());
+        Info<< "Writing redistributed mesh" << nl << endl;
+        mesh.write();
+    }
+
+
+    Info<< "Refining backgroud mesh according to cell size specification" << nl
+        << endl;
+
+    backgroundMeshDecomposition backgroundMesh
+    (
+        1.0,    //spanScale,ratio of poly cell size v.s. hex cell size
+        0.0,    //minCellSizeLimit
+        0,      //minLevels
+        4,      //volRes, check multiple points per cell
+        20.0,   //maxCellWeightCoeff
+        runTime,
+        geometryToConformTo,
+        cellSizeControl,
+        rndGen,
+        cvMeshDict
+    );
+
+    if (writeMesh)
+    {
+        runTime++;
+        Info<< "Writing mesh to " << runTime.timeName() << endl;
+        backgroundMesh.mesh().write();
+    }
+
+    const scalar tolDim = getMergeDistance
+    (
+        args,
+        runTime,
+        backgroundMesh.mesh().bounds()
+    );
+
+
+    faceList isoFaces;
+    pointField isoPoints;
+
+    {
+        // Apply a distanceSurface to it.
+        const fvMesh& fvm = backgroundMesh.mesh();
+
+        volScalarField cellDistance
+        (
+            IOobject
+            (
+                "cellDistance",
+                fvm.time().timeName(),
+                fvm.time(),
+                IOobject::NO_READ,
+                IOobject::NO_WRITE,
+                false
+            ),
+            fvm,
+            dimensionedScalar("zero", dimLength, 0)
+        );
+
+        const searchableSurfaces& geometry = geometryToConformTo.geometry();
+        const labelList& surfaces = geometryToConformTo.surfaces();
+
+
+        // Get maximum search size per cell
+        scalarField distSqr(cellDistance.size());
+
+        const labelList& cellLevel = backgroundMesh.cellLevel();
+        forAll(cellLevel, cellI)
+        {
+            // The largest edge of the cell will always be less than the
+            // span of the bounding box of the cell.
+            distSqr[cellI] = magSqr(cellSize)/pow(2, cellLevel[cellI]);
+        }
+
+        {
+            // Internal field
+            cellDistance.internalField() = signedDistance
+            (
+                distSqr,
+                fvm.C(),
+                geometry,
+                surfaces
+            );
+            // Patch fields
+            forAll(fvm.C().boundaryField(), patchI)
+            {
+                const pointField& cc = fvm.C().boundaryField()[patchI];
+                fvPatchScalarField& fld = cellDistance.boundaryField()[patchI];
+                scalarField patchDistSqr
+                (
+                    fld.patch().patchInternalField(distSqr)
+                );
+                fld = signedDistance(patchDistSqr, cc, geometry, surfaces);
+            }
+
+            // On processor patches the fvm.C() will already be the cell centre
+            // on the opposite side so no need to swap cellDistance.
+
+            if (writeMesh)
+            {
+                cellDistance.write();
+            }
+        }
+
+
+        // Distance to points
+        pointScalarField pointDistance
+        (
+            IOobject
+            (
+                "pointDistance",
+                fvm.time().timeName(),
+                fvm.time(),
+                IOobject::NO_READ,
+                IOobject::NO_WRITE,
+                false
+            ),
+            pointMesh::New(fvm),
+            dimensionedScalar("zero", dimLength, 0)
+        );
+        {
+            scalarField pointDistSqr(fvm.nPoints(), -sqr(GREAT));
+            for (label faceI = 0; faceI < fvm.nInternalFaces(); faceI++)
+            {
+                label own = fvm.faceOwner()[faceI];
+                label ownDistSqr = distSqr[own];
+
+                const face& f = fvm.faces()[faceI];
+                forAll(f, fp)
+                {
+                    pointDistSqr[f[fp]] = max(pointDistSqr[f[fp]], ownDistSqr);
+                }
+            }
+            syncTools::syncPointList
+            (
+                fvm,
+                pointDistSqr,
+                maxEqOp<scalar>(),
+                -sqr(GREAT)             // null value
+            );
+
+            pointDistance.internalField() = signedDistance
+            (
+                pointDistSqr,
+                fvm.points(),
+                geometry,
+                surfaces
+            );
+
+            if (writeMesh)
+            {
+                pointDistance.write();
+            }
+        }
+
+        isoSurfaceCell iso
+        (
+            fvm,
+            cellDistance,
+            pointDistance,
+            0,      //distance,
+            false   //regularise
+        );
+
+        isoFaces.setSize(iso.size());
+        forAll(isoFaces, i)
+        {
+            isoFaces[i] = iso[i].triFaceFace();
+        }
+        isoPoints = iso.points();
+    }
+
+
+    pointField mergedPoints;
+    faceList mergedFaces;
+    labelList pointMergeMap;
+    PatchTools::gatherAndMerge
+    (
+        tolDim,
+        primitivePatch
+        (
+            SubList<face>(isoFaces, isoFaces.size()),
+            isoPoints
+        ),
+        mergedPoints,
+        mergedFaces,
+        pointMergeMap
+    );
+
+    vtkSurfaceWriter writer;
+    writer.write
+    (
+        runTime.path(),
+        "iso",
+        mergedPoints,
+        mergedFaces
+    );
+
+    Info<< "End\n" << endl;
+
+    return 0;
+}
+
+
+// ************************************************************************* //

From 2ff62ebccdec38bca9c9347d7cc1a981d6ad1f3c Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Mon, 2 Apr 2012 11:30:26 +0100
Subject: [PATCH 144/317] STYLE: quadraticFitSnGrad: removed unused,
 uncompilable code

---
 src/finiteVolume/Make/files                   |   4 -
 .../quadraticFitSnGrad/quadraticFitSnGrad.H   | 159 ---------
 .../quadraticFitSnGradData.C                  | 321 ------------------
 .../quadraticFitSnGradData.H                  | 129 -------
 .../quadraticFitSnGrad/quadraticFitSnGrads.C  |  43 ---
 5 files changed, 656 deletions(-)
 delete mode 100644 src/finiteVolume/finiteVolume/snGradSchemes/quadraticFitSnGrad/quadraticFitSnGrad.H
 delete mode 100644 src/finiteVolume/finiteVolume/snGradSchemes/quadraticFitSnGrad/quadraticFitSnGradData.C
 delete mode 100644 src/finiteVolume/finiteVolume/snGradSchemes/quadraticFitSnGrad/quadraticFitSnGradData.H
 delete mode 100644 src/finiteVolume/finiteVolume/snGradSchemes/quadraticFitSnGrad/quadraticFitSnGrads.C

diff --git a/src/finiteVolume/Make/files b/src/finiteVolume/Make/files
index 0e2de76c07..a50e855520 100644
--- a/src/finiteVolume/Make/files
+++ b/src/finiteVolume/Make/files
@@ -338,10 +338,6 @@ $(snGradSchemes)/correctedSnGrad/correctedSnGrads.C
 $(snGradSchemes)/limitedSnGrad/limitedSnGrads.C
 $(snGradSchemes)/uncorrectedSnGrad/uncorrectedSnGrads.C
 $(snGradSchemes)/orthogonalSnGrad/orthogonalSnGrads.C
-/*
-$(snGradSchemes)/quadraticFitSnGrad/quadraticFitSnGradData.C
-$(snGradSchemes)/quadraticFitSnGrad/quadraticFitSnGrads.C
-*/
 
 convectionSchemes = finiteVolume/convectionSchemes
 $(convectionSchemes)/convectionScheme/convectionSchemes.C
diff --git a/src/finiteVolume/finiteVolume/snGradSchemes/quadraticFitSnGrad/quadraticFitSnGrad.H b/src/finiteVolume/finiteVolume/snGradSchemes/quadraticFitSnGrad/quadraticFitSnGrad.H
deleted file mode 100644
index b489209577..0000000000
--- a/src/finiteVolume/finiteVolume/snGradSchemes/quadraticFitSnGrad/quadraticFitSnGrad.H
+++ /dev/null
@@ -1,159 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-Class
-    quadraticFitSnGrad
-
-Description
-    Simple central-difference snGrad scheme with quadratic fit correction from
-    a larger stencil.
-
-SourceFiles
-    quadraticFitSnGrad.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef quadraticFitSnGrad_H
-#define quadraticFitSnGrad_H
-
-#include "snGradScheme.H"
-#include "quadraticFitSnGradData.H"
-#include "extendedCellToFaceStencil.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace fv
-{
-
-/*---------------------------------------------------------------------------*\
-                 Class quadraticFitSnGrad Declaration
-\*---------------------------------------------------------------------------*/
-
-template<class Type>
-class quadraticFitSnGrad
-:
-    public snGradScheme<Type>
-{
-    // Private Data
-        //- weights for central stencil
-        const scalar centralWeight_;
-
-    // Private Member Functions
-
-        //- Disallow default bitwise assignment
-        void operator=(const quadraticFitSnGrad&);
-
-
-public:
-
-    //- Runtime type information
-    TypeName("quadraticFit");
-
-
-    // Constructors
-
-        //- Construct from mesh and scheme data
-        quadraticFitSnGrad
-        (
-            const fvMesh& mesh,
-            const scalar centralWeight
-        )
-        :
-            snGradScheme<Type>(mesh),
-            centralWeight_(centralWeight)
-        {}
-
-
-        //- Construct from mesh and data stream
-        quadraticFitSnGrad(const fvMesh& mesh, Istream& is)
-        :
-            snGradScheme<Type>(mesh),
-            centralWeight_(readScalar(is))
-        {}
-
-
-    //- Destructor
-    virtual ~quadraticFitSnGrad() {}
-
-
-    // Member Functions
-
-        //- Return the interpolation weighting factors for the given field
-        virtual tmp<surfaceScalarField> deltaCoeffs
-        (
-            const GeometricField<Type, fvPatchField, volMesh>&
-        ) const
-        {
-            return this->mesh().nonOrthDeltaCoeffs();
-        }
-
-        //- Return true if this scheme uses an explicit correction
-        virtual bool corrected() const
-        {
-            return true;
-        }
-
-        //- Return the explicit correction to the quadraticFitSnGrad
-        //  for the given field
-        virtual tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >
-        correction(const GeometricField<Type, fvPatchField, volMesh>& vf) const
-        {
-            const fvMesh& mesh = this->mesh();
-
-            const quadraticFitSnGradData& qfd = quadraticFitSnGradData::New
-            (
-                mesh,
-                centralWeight_
-            );
-
-            const extendedCellToFaceStencil& stencil = qfd.stencil();
-            const List<scalarList>& f = qfd.fit();
-
-            tmp<GeometricField<Type, fvsPatchField, surfaceMesh> > sft
-                = stencil.weightedSum(vf, f);
-
-            sft().dimensions() /= dimLength;
-
-            return sft;
-        }
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace fv
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/finiteVolume/finiteVolume/snGradSchemes/quadraticFitSnGrad/quadraticFitSnGradData.C b/src/finiteVolume/finiteVolume/snGradSchemes/quadraticFitSnGrad/quadraticFitSnGradData.C
deleted file mode 100644
index fe0858e1c6..0000000000
--- a/src/finiteVolume/finiteVolume/snGradSchemes/quadraticFitSnGrad/quadraticFitSnGradData.C
+++ /dev/null
@@ -1,321 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "quadraticFitSnGradData.H"
-#include "surfaceFields.H"
-#include "volFields.H"
-#include "SVD.H"
-#include "syncTools.H"
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-defineTypeNameAndDebug(Foam::quadraticFitSnGradData, 0);
-
-
-// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-
-Foam::quadraticFitSnGradData::quadraticFitSnGradData
-(
-    const fvMesh& mesh,
-    const scalar cWeight
-)
-:
-    MeshObject<fvMesh, quadraticFitSnGradData>(mesh),
-    centralWeight_(cWeight),
-    #ifdef SPHERICAL_GEOMETRY
-        dim_(2),
-    #else
-        dim_(mesh.nGeometricD()),
-    #endif
-    minSize_
-    (
-        dim_ == 1 ? 3 :
-        dim_ == 2 ? 6 :
-        dim_ == 3 ? 9 : 0
-    ),
-    stencil_(mesh),
-    fit_(mesh.nInternalFaces())
-{
-    if (debug)
-    {
-        Info<< "Contructing quadraticFitSnGradData" << endl;
-    }
-
-    // check input
-    if (centralWeight_ < 1 - SMALL)
-    {
-        FatalErrorIn("quadraticFitSnGradData::quadraticFitSnGradData")
-            << "centralWeight requested = " << centralWeight_
-            << " should not be less than one"
-            << exit(FatalError);
-    }
-
-    if (minSize_ == 0)
-    {
-        FatalErrorIn("quadraticFitSnGradData")
-            << " dimension must be 1,2 or 3, not" << dim_ << exit(FatalError);
-    }
-
-    // store the polynomial size for each face to write out
-    surfaceScalarField snGradPolySize
-    (
-        IOobject
-        (
-            "quadraticFitSnGradPolySize",
-            "constant",
-            mesh,
-            IOobject::NO_READ,
-            IOobject::NO_WRITE
-        ),
-        mesh,
-        dimensionedScalar("quadraticFitSnGradPolySize", dimless, scalar(0))
-    );
-
-    // Get the cell/face centres in stencil order.
-    // Centred face stencils no good for triangles of tets. Need bigger stencils
-    List<List<point> > stencilPoints(stencil_.stencil().size());
-    stencil_.collectData
-    (
-        mesh.C(),
-        stencilPoints
-    );
-
-    // find the fit coefficients for every face in the mesh
-
-    for (label faci = 0; faci < mesh.nInternalFaces(); faci++)
-    {
-        snGradPolySize[faci] = calcFit(stencilPoints[faci], faci);
-    }
-
-    if (debug)
-    {
-        snGradPolySize.write();
-        Info<< "quadraticFitSnGradData::quadraticFitSnGradData() :"
-            << "Finished constructing polynomialFit data"
-            << endl;
-    }
-}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-void Foam::quadraticFitSnGradData::findFaceDirs
-(
-    vector& idir,        // value changed in return
-    vector& jdir,        // value changed in return
-    vector& kdir,        // value changed in return
-    const fvMesh& mesh,
-    const label faci
-)
-{
-    idir = mesh.Sf()[faci];
-    idir /= mag(idir);
-
-    #ifndef SPHERICAL_GEOMETRY
-        if (mesh.nGeometricD() <= 2) // find the normal direcion
-        {
-            if (mesh.geometricD()[0] == -1)
-            {
-                kdir = vector(1, 0, 0);
-            }
-            else if (mesh.geometricD()[1] == -1)
-            {
-                kdir = vector(0, 1, 0);
-            }
-            else
-            {
-                kdir = vector(0, 0, 1);
-            }
-        }
-        else // 3D so find a direction in the plane of the face
-        {
-            const face& f = mesh.faces()[faci];
-            kdir = mesh.points()[f[0]] - mesh.points()[f[1]];
-        }
-    #else
-        // Spherical geometry so kdir is the radial direction
-        kdir = mesh.Cf()[faci];
-    #endif
-
-    if (mesh.nGeometricD() == 3)
-    {
-        // Remove the idir component from kdir and normalise
-        kdir -= (idir & kdir)*idir;
-
-        scalar magk = mag(kdir);
-
-        if (magk < SMALL)
-        {
-            FatalErrorIn("findFaceDirs") << " calculated kdir = zero"
-                << exit(FatalError);
-        }
-        else
-        {
-            kdir /= magk;
-        }
-    }
-
-    jdir = kdir ^ idir;
-}
-
-
-Foam::label Foam::quadraticFitSnGradData::calcFit
-(
-    const List<point>& C,
-    const label faci
-)
-{
-    vector idir(1,0,0);
-    vector jdir(0,1,0);
-    vector kdir(0,0,1);
-    findFaceDirs(idir, jdir, kdir, mesh(), faci);
-
-    scalarList wts(C.size(), scalar(1));
-    wts[0] = centralWeight_;
-    wts[1] = centralWeight_;
-
-    point p0 = mesh().faceCentres()[faci];
-    scalar scale = 0;
-
-    // calculate the matrix of the polynomial components
-    scalarRectangularMatrix B(C.size(), minSize_, scalar(0));
-
-    forAll(C, ip)
-    {
-        const point& p = C[ip];
-
-        scalar px = (p - p0)&idir;
-        scalar py = (p - p0)&jdir;
-        #ifdef SPHERICAL_GEOMETRY
-            scalar pz = mag(p) - mag(p0);
-        #else
-            scalar pz = (p - p0)&kdir;
-        #endif
-
-        if (ip == 0) scale = max(max(mag(px), mag(py)), mag(pz));
-
-        px /= scale;
-        py /= scale;
-        pz /= scale;
-
-        label is = 0;
-
-        B[ip][is++] = wts[0]*wts[ip];
-        B[ip][is++] = wts[0]*wts[ip]*px;
-        B[ip][is++] = wts[ip]*sqr(px);
-
-        if (dim_ >= 2)
-        {
-            B[ip][is++] = wts[ip]*py;
-            B[ip][is++] = wts[ip]*px*py;
-            B[ip][is++] = wts[ip]*sqr(py);
-        }
-        if (dim_ == 3)
-        {
-            B[ip][is++] = wts[ip]*pz;
-            B[ip][is++] = wts[ip]*px*pz;
-            //B[ip][is++] = wts[ip]*py*pz;
-            B[ip][is++] = wts[ip]*sqr(pz);
-        }
-    }
-
-    // Set the fit
-    label stencilSize = C.size();
-    fit_[faci].setSize(stencilSize);
-    scalarList singVals(minSize_);
-    label nSVDzeros = 0;
-
-    const scalar deltaCoeff = deltaCoeffs()[faci];
-
-    bool goodFit = false;
-    for (int iIt = 0; iIt < 10 && !goodFit; iIt++)
-    {
-        SVD svd(B, SMALL);
-
-        scalar fit0 = wts[0]*wts[0]*svd.VSinvUt()[1][0]/scale;
-        scalar fit1 = wts[0]*wts[1]*svd.VSinvUt()[1][1]/scale;
-
-        goodFit =
-            fit0 < 0 && fit1 > 0
-         && mag(fit0 + deltaCoeff) < 0.5*deltaCoeff
-         && mag(fit1 - deltaCoeff) < 0.5*deltaCoeff;
-
-        if (goodFit)
-        {
-            fit_[faci][0] = fit0;
-            fit_[faci][1] = fit1;
-            for (label i = 2; i < stencilSize; i++)
-            {
-                fit_[faci][i] = wts[0]*wts[i]*svd.VSinvUt()[1][i]/scale;
-            }
-            singVals = svd.S();
-            nSVDzeros = svd.nZeros();
-        }
-        else // (not good fit so increase weight in the centre and for linear)
-        {
-            wts[0] *= 10;
-            wts[1] *= 10;
-
-            for (label i = 0; i < B.n(); i++)
-            {
-                B[i][0] *= 10;
-                B[i][1] *= 10;
-            }
-
-            for (label j = 0; j < B.m(); j++)
-            {
-                B[0][j] *= 10;
-                B[1][j] *= 10;
-            }
-        }
-    }
-
-    if (goodFit)
-    {
-        // remove the uncorrected snGradScheme coefficients
-        fit_[faci][0] += deltaCoeff;
-        fit_[faci][1] -= deltaCoeff;
-    }
-    else
-    {
-        Pout<< "quadratifFitSnGradData could not fit face " << faci
-            << " fit_[faci][0] =  " << fit_[faci][0]
-            << " fit_[faci][1] =  " << fit_[faci][1]
-            << " deltaCoeff =  " << deltaCoeff << endl;
-        fit_[faci] = 0;
-    }
-
-    return minSize_ - nSVDzeros;
-}
-
-bool Foam::quadraticFitSnGradData::movePoints()
-{
-    notImplemented("quadraticFitSnGradData::movePoints()");
-
-    return true;
-}
-
-
-// ************************************************************************* //
diff --git a/src/finiteVolume/finiteVolume/snGradSchemes/quadraticFitSnGrad/quadraticFitSnGradData.H b/src/finiteVolume/finiteVolume/snGradSchemes/quadraticFitSnGrad/quadraticFitSnGradData.H
deleted file mode 100644
index 40f24c7c70..0000000000
--- a/src/finiteVolume/finiteVolume/snGradSchemes/quadraticFitSnGrad/quadraticFitSnGradData.H
+++ /dev/null
@@ -1,129 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-Class
-    quadraticFitSnGradData
-
-Description
-    Data for the quadratic fit correction snGrad scheme
-
-SourceFiles
-    quadraticFitSnGradData.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef quadraticFitSnGradData_H
-#define quadraticFitSnGradData_H
-
-#include "MeshObject.H"
-#include "fvMesh.H"
-#include "extendedCellToFaceStencil.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-/*---------------------------------------------------------------------------*\
-                    Class quadraticFitSnGradData Declaration
-\*---------------------------------------------------------------------------*/
-
-class quadraticFitSnGradData
-:
-    public MeshObject<fvMesh, quadraticFitSnGradData>
-{
-    // Private data
-
-        const scalar centralWeight_;
-        const label dim_;
-
-        //- minimum stencil size
-        const label minSize_;
-
-        //- Extended stencil addressing
-        extendedCellToFaceStencil stencil_;
-
-        //- For each cell in the mesh store the values which multiply the
-        //  values of the stencil to obtain the gradient for each direction
-        List<scalarList> fit_;
-
-
-    // Private Member Functions
-
-        //- Find the normal direction and i, j and k directions for face faci
-        static void findFaceDirs
-        (
-            vector& idir,        // value changed in return
-            vector& jdir,        // value changed in return
-            vector& kdir,        // value changed in return
-            const fvMesh& mesh,
-            const label faci
-        );
-
-        label calcFit(const List<point>&, const label faci);
-
-
-public:
-
-    TypeName("quadraticFitSnGradData");
-
-
-    // Constructors
-
-        explicit quadraticFitSnGradData
-        (
-            const fvMesh& mesh,
-            const scalar cWeight
-        );
-
-
-    //- Destructor
-    virtual ~quadraticFitSnGradData()
-    {};
-
-
-    // Member functions
-
-        //- Return reference to the stencil
-        const extendedCellToFaceStencil& stencil() const
-        {
-            return stencil_;
-        }
-
-        //- Return reference to fit coefficients
-        const List<scalarList>& fit() const { return fit_; }
-
-        //- Delete the data when the mesh moves not implemented
-        virtual bool movePoints();
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/finiteVolume/finiteVolume/snGradSchemes/quadraticFitSnGrad/quadraticFitSnGrads.C b/src/finiteVolume/finiteVolume/snGradSchemes/quadraticFitSnGrad/quadraticFitSnGrads.C
deleted file mode 100644
index 00185cd16c..0000000000
--- a/src/finiteVolume/finiteVolume/snGradSchemes/quadraticFitSnGrad/quadraticFitSnGrads.C
+++ /dev/null
@@ -1,43 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-Description
-    Simple central-difference snGrad scheme with quadratic fit correction from
-    a larger stencil.
-
-\*---------------------------------------------------------------------------*/
-
-#include "quadraticFitSnGrad.H"
-#include "fvMesh.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace fv
-{
-    makeSnGradScheme(quadraticFitSnGrad)
-}
-}
-
-// ************************************************************************* //

From 374babde39642eb388d764898a8ea4e00bf133d0 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Mon, 2 Apr 2012 11:52:58 +0100
Subject: [PATCH 145/317] ENH: accessOp: move to classes

---
 .../Lists/ListListOps/ListListOps.C           |  3 +-
 .../Lists/ListListOps/ListListOps.H           | 10 ++--
 src/OpenFOAM/meshes/meshShapes/face/face.H    | 27 +++++++++-
 .../meshes/meshShapes/triFace/triFace.H       | 27 +++++++++-
 .../PatchTools/PatchToolsGatherAndMerge.C     | 53 +------------------
 .../tools/labelledTri/labelledTri.H           |  6 ++-
 6 files changed, 63 insertions(+), 63 deletions(-)

diff --git a/src/OpenFOAM/containers/Lists/ListListOps/ListListOps.C b/src/OpenFOAM/containers/Lists/ListListOps/ListListOps.C
index 443e188ed1..d83b4a9f3a 100644
--- a/src/OpenFOAM/containers/Lists/ListListOps/ListListOps.C
+++ b/src/OpenFOAM/containers/Lists/ListListOps/ListListOps.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -106,6 +106,7 @@ AccessType ListListOps::combineOffset
     return result;
 }
 
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
diff --git a/src/OpenFOAM/containers/Lists/ListListOps/ListListOps.H b/src/OpenFOAM/containers/Lists/ListListOps/ListListOps.H
index c35fc714c6..05cef4a723 100644
--- a/src/OpenFOAM/containers/Lists/ListListOps/ListListOps.H
+++ b/src/OpenFOAM/containers/Lists/ListListOps/ListListOps.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -92,10 +92,8 @@ SourceFiles
 
 namespace Foam
 {
-//
-//template <class T> class accessOp;
-//template <class T> class offsetOp;
-// Dummy access operator for combine()
+
+// Dummy access operator for ListListOps::combine()
 template <class T>
 class accessOp
 {
@@ -108,7 +106,7 @@ public:
 };
 
 
-// Offset operator for combineOffset()
+// Offset operator for ListListOps::combineOffset()
 template <class T>
 class offsetOp
 {
diff --git a/src/OpenFOAM/meshes/meshShapes/face/face.H b/src/OpenFOAM/meshes/meshShapes/face/face.H
index 3b2ffcc757..c9cd3724dc 100644
--- a/src/OpenFOAM/meshes/meshShapes/face/face.H
+++ b/src/OpenFOAM/meshes/meshShapes/face/face.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -50,6 +50,7 @@ SourceFiles
 #include "faceListFwd.H"
 #include "intersection.H"
 #include "pointHit.H"
+#include "ListListOps.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -386,6 +387,30 @@ public:
 };
 
 
+//- Hash specialization to offset faces in ListListOps::combineOffset
+template<>
+class offsetOp<face>
+{
+
+public:
+
+    inline face operator()
+    (
+        const face& x,
+        const label offset
+    ) const
+    {
+        face result(x.size());
+
+        forAll(x, xI)
+        {
+            result[xI] = x[xI] + offset;
+        }
+        return result;
+    }
+};
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
diff --git a/src/OpenFOAM/meshes/meshShapes/triFace/triFace.H b/src/OpenFOAM/meshes/meshShapes/triFace/triFace.H
index 8e5103ac2c..24ad5d3d1c 100644
--- a/src/OpenFOAM/meshes/meshShapes/triFace/triFace.H
+++ b/src/OpenFOAM/meshes/meshShapes/triFace/triFace.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -46,6 +46,7 @@ SourceFiles
 #include "intersection.H"
 #include "pointField.H"
 #include "triPointRef.H"
+#include "ListListOps.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -249,6 +250,30 @@ template<>
 inline bool contiguous<triFace>()  {return true;}
 
 
+//- Hash specialization to offset faces in ListListOps::combineOffset
+template<>
+class offsetOp<triFace>
+{
+
+public:
+
+    inline triFace operator()
+    (
+        const triFace& x,
+        const label offset
+    ) const
+    {
+        triFace result(x);
+
+        forAll(x, xI)
+        {
+            result[xI] = x[xI] + offset;
+        }
+        return result;
+    }
+};
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
diff --git a/src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchToolsGatherAndMerge.C b/src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchToolsGatherAndMerge.C
index 1d759d3783..89ffdec2ae 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchToolsGatherAndMerge.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchToolsGatherAndMerge.C
@@ -28,58 +28,7 @@ License
 #include "mergePoints.H"
 #include "face.H"
 #include "triFace.H"
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-namespace Foam
-{
-    //- Used to offset faces in Pstream::combineOffset
-    template<>
-    class offsetOp<face>
-    {
-
-    public:
-
-        face operator()
-        (
-            const face& x,
-            const label offset
-        ) const
-        {
-            face result(x.size());
-
-            forAll(x, xI)
-            {
-                result[xI] = x[xI] + offset;
-            }
-            return result;
-        }
-    };
-
-    //- Used to offset faces in Pstream::combineOffset
-    template<>
-    class offsetOp<triFace>
-    {
-
-    public:
-
-        triFace operator()
-        (
-            const triFace& x,
-            const label offset
-        ) const
-        {
-            triFace result(x);
-
-            forAll(x, xI)
-            {
-                result[xI] = x[xI] + offset;
-            }
-            return result;
-        }
-    };
-}
-
+#include "ListListOps.H"
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
diff --git a/src/triSurface/tools/labelledTri/labelledTri.H b/src/triSurface/tools/labelledTri/labelledTri.H
index a4bd26f825..6f0c13065d 100644
--- a/src/triSurface/tools/labelledTri/labelledTri.H
+++ b/src/triSurface/tools/labelledTri/labelledTri.H
@@ -36,6 +36,7 @@ SourceFiles
 #define labelledTri_H
 
 #include "triFace.H"
+#include "ListListOps.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -114,14 +115,15 @@ public:
 template<>
 inline bool contiguous<labelledTri>()  {return true;}
 
-//- Used to offset faces in ListListOps::combineOffset
+
+//- Hash specialization to offset faces in ListListOps::combineOffset
 template<>
 class offsetOp<labelledTri>
 {
 
 public:
 
-    labelledTri operator()
+    inline labelledTri operator()
     (
         const labelledTri& x,
         const label offset

From e53728643587a7ca40e149a81fbd8ed441783cd5 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Mon, 2 Apr 2012 12:00:57 +0100
Subject: [PATCH 146/317] ENH: cvMeshBrackgroundMesh: cleaned up code

---
 .../cvMesh/cvMeshBackgroundMesh/Make/options  |   4 +-
 .../cvMeshBackgroundMesh.C                    | 150 ------------------
 2 files changed, 1 insertion(+), 153 deletions(-)

diff --git a/applications/utilities/mesh/generation/cvMesh/cvMeshBackgroundMesh/Make/options b/applications/utilities/mesh/generation/cvMesh/cvMeshBackgroundMesh/Make/options
index 0e2d0c9f0a..3c9ef8cd4b 100644
--- a/applications/utilities/mesh/generation/cvMesh/cvMeshBackgroundMesh/Make/options
+++ b/applications/utilities/mesh/generation/cvMesh/cvMeshBackgroundMesh/Make/options
@@ -1,8 +1,6 @@
-/*
 EXE_DEBUG = -DFULLDEBUG -g -O0
 EXE_FROUNDING_MATH = -frounding-math
 EXE_NDEBUG = -DNDEBUG
-*/
 
 include $(GENERAL_RULES)/CGAL
 
@@ -24,8 +22,8 @@ EXE_LIBS = \
     -lconformalVoronoiMesh \
     -ldecompositionMethods /* -L$(FOAM_LIBBIN)/dummy -lscotchDecomp */ \
     -ledgeMesh \
+    -lsampling \
     -ltriSurface \
     -lmeshTools \
     -ldynamicMesh \
-    -lsampling \
     -lfiniteVolume
diff --git a/applications/utilities/mesh/generation/cvMesh/cvMeshBackgroundMesh/cvMeshBackgroundMesh.C b/applications/utilities/mesh/generation/cvMesh/cvMeshBackgroundMesh/cvMeshBackgroundMesh.C
index c2642366a9..72d05293b9 100644
--- a/applications/utilities/mesh/generation/cvMesh/cvMeshBackgroundMesh/cvMeshBackgroundMesh.C
+++ b/applications/utilities/mesh/generation/cvMesh/cvMeshBackgroundMesh/cvMeshBackgroundMesh.C
@@ -220,156 +220,6 @@ label vtxLabel
 }
 
 
-//// Generate hex mesh around surface.
-//void setRefinement
-//(
-//    const vector& cellSize,
-//    const Vector<label>& nCells
-//    polyTopoChange& meshMod
-//)
-//{
-//    const treeBoundBox& bb = geometryToConformTo.globalBounds();
-//
-//    // Determine the number of cells in each direction.
-//    vector nScalarCells = bb.span()/cellSizeControl.defaultCellSize();
-//    Vector<label> nCells
-//    (
-//        label(nScalarCells[0]),
-//        label(nScalarCells[1]),
-//        label(nScalarCells[2])
-//    );
-//    vector cellSize(bb.span()/nCells);
-//
-//    const label nPatches = 1;
-//    polyTopoChange meshMod(nPatches);
-//
-//    // Generate points
-//    for (label i = 0; i <= nCells[0]; i++)
-//    {
-//        for (label j = 0; j <= nCells[1]; j++)
-//        {
-//            for (label k = 0; k <= nCells[2]; k++)
-//            {
-//                meshMod.addPoint
-//                (
-//                    bb.min()+i*cellSize[0]+j*cellSize[1]+k*cellSize[2],
-//                    -1, // masterPointID,
-//                    -1, // zoneID,
-//                    true
-//                );
-//            }
-//        }
-//    }
-//
-//    // Generate cells such that cell
-//    for (label i = 0; i < nCells[0]; i++)
-//    {
-//        for (label j = 0; j < nCells[1]; j++)
-//        {
-//            for (label k = 0; k < nCells[2]; k++)
-//            {
-//                meshMod.addCell
-//                (
-//                    -1, // masterPointID,
-//                    -1, // masterEdgeID,
-//                    -1, // masterFaceID,
-//                    -1, // masterCellID,
-//                    -1  //zoneID
-//                );
-//            }
-//        }
-//    }
-//
-//    // Generate internal faces
-//    face f(4);
-//
-//    // Internal faces between i and i+1
-//    for (label i = 0; i < nCells[0]-1; i++)
-//    {
-//        for (label j = 0; j < nCells[1]-1; j++)
-//        {
-//            for (label k = 0; k < nCells[2]-1; k++)
-//            {
-//                face[0] = vertexID(nCells, i, j, k);
-//                face[1] = vertexID(nCells, i, j+1, k);
-//                face[2] = vertexID(nCells, i, j+1, k+1);
-//                face[3] = vertexID(nCells, i, j, k+1);
-//
-//                meshMod.addFace
-//                (
-//                    f,
-//                    cellID(nCells, i,j, k),     //own
-//                    cellID(nCells, i+1,j, k+1), //nei
-//                    -1,     //masterPointID,
-//                    -1,     //masterEdgeID,
-//                    -1,     //masterFaceID,
-//                    false,  //flipFaceFlux,
-//                    -1,     //patchID,
-//                    -1,       //zoneID,
-//                    false   //zoneFlip
-//                );
-//            }
-//        }
-//    }
-//    // Internal faces between j and j+1
-//    for (label i = 0; i < nCells[0]-1; i++)
-//    {
-//        for (label j = 0; j < nCells[1]-1; j++)
-//        {
-//            for (label k = 0; k < nCells[2]-1; k++)
-//            {
-//                face[0] = vertexID(nCells, i, j, k);
-//                face[1] = vertexID(nCells, i, j, k+1);
-//                face[2] = vertexID(nCells, i+1, j, k+1);
-//                face[3] = vertexID(nCells, i+1, j, k);
-//
-//                meshMod.addFace
-//                (
-//                    f,
-//                    cellID(nCells, i,j, k),     //own
-//                    cellID(nCells, i,j+1, k+1), //nei
-//                    -1,     //masterPointID,
-//                    -1,     //masterEdgeID,
-//                    -1,     //masterFaceID,
-//                    false,  //flipFaceFlux,
-//                    -1,     //patchID,
-//                    -1,       //zoneID,
-//                    false   //zoneFlip
-//                );
-//            }
-//        }
-//    }
-//    // Internal faces between k and k+1
-//    for (label i = 0; i < nCells[0]-1; i++)
-//    {
-//        for (label j = 0; j < nCells[1]-1; j++)
-//        {
-//            for (label k = 0; k < nCells[2]-1; k++)
-//            {
-//                face[0] = vertexID(nCells, i, j, k);
-//                face[1] = vertexID(nCells, i+1, j, k);
-//                face[2] = vertexID(nCells, i+1, j+1, k);
-//                face[3] = vertexID(nCells, i, j+1, k);
-//
-//                meshMod.addFace
-//                (
-//                    f,
-//                    cellID(nCells, i,j, k),     //own
-//                    cellID(nCells, i,j, k+1),   //nei
-//                    -1,     //masterPointID,
-//                    -1,     //masterEdgeID,
-//                    -1,     //masterFaceID,
-//                    false,  //flipFaceFlux,
-//                    -1,     //patchID,
-//                    -1,       //zoneID,
-//                    false   //zoneFlip
-//                );
-//            }
-//        }
-//    }
-//}
-
-
 autoPtr<polyMesh> generateHexMesh
 (
     const IOobject& io,

From 917301d62bfeb7775925556cf2317ff897940135 Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Mon, 2 Apr 2012 12:06:36 +0100
Subject: [PATCH 147/317] Corrected headers and formatting

---
 .../createFields.H                            |  11 +-
 .../interfacialCoeffs.H                       |  11 +-
 src/finiteVolume/Make/files                   |   2 +
 .../variableHeightFlowRateFvPatchField.C      | 196 ++++++++++++++++++
 .../variableHeightFlowRateFvPatchField.H      | 174 ++++++++++++++++
 ...tFlowRateInletVelocityFvPatchVectorField.C | 147 +++++++++++++
 ...tFlowRateInletVelocityFvPatchVectorField.H | 189 +++++++++++++++++
 .../constant/interfacialProperties            |   3 +-
 .../constant/interfacialProperties            |   3 +-
 .../constant/interfacialProperties            |   4 +-
 tutorials/multiphase/interFoam/ras/Allclean   |   2 +-
 tutorials/multiphase/interFoam/ras/Allrun     |   3 +
 .../interFoam/ras/weirOverflow/0.org/U        |  56 +++++
 .../ras/weirOverflow/0.org/alpha1.org         |  56 +++++
 .../interFoam/ras/weirOverflow/0.org/epsilon  |  59 ++++++
 .../0.org/include/initialConditions           |  15 ++
 .../interFoam/ras/weirOverflow/0.org/k        |  59 ++++++
 .../interFoam/ras/weirOverflow/0.org/nut      |  52 +++++
 .../interFoam/ras/weirOverflow/0.org/p_rgh    |  58 ++++++
 .../interFoam/ras/weirOverflow/Allclean       |   8 +
 .../interFoam/ras/weirOverflow/Allrun         |  14 ++
 .../ras/weirOverflow/constant/RASProperties   |  25 +++
 .../interFoam/ras/weirOverflow/constant/g     |  22 ++
 .../constant/polyMesh/blockMeshDict           |  93 +++++++++
 .../weirOverflow/constant/polyMesh/boundary   |  52 +++++
 .../weirOverflow/constant/transportProperties |  72 +++++++
 .../constant/turbulenceProperties             |  21 ++
 .../ras/weirOverflow/system/controlDict       |  55 +++++
 .../ras/weirOverflow/system/fvSchemes         |  65 ++++++
 .../ras/weirOverflow/system/fvSolution        |  67 ++++++
 .../ras/weirOverflow/system/setFieldsDict     |  35 ++++
 31 files changed, 1615 insertions(+), 14 deletions(-)
 create mode 100644 src/finiteVolume/fields/fvPatchFields/derived/variableHeightFlowRate/variableHeightFlowRateFvPatchField.C
 create mode 100644 src/finiteVolume/fields/fvPatchFields/derived/variableHeightFlowRate/variableHeightFlowRateFvPatchField.H
 create mode 100644 src/finiteVolume/fields/fvPatchFields/derived/variableHeightFlowRateInletVelocity/variableHeightFlowRateInletVelocityFvPatchVectorField.C
 create mode 100644 src/finiteVolume/fields/fvPatchFields/derived/variableHeightFlowRateInletVelocity/variableHeightFlowRateInletVelocityFvPatchVectorField.H
 create mode 100644 tutorials/multiphase/interFoam/ras/weirOverflow/0.org/U
 create mode 100644 tutorials/multiphase/interFoam/ras/weirOverflow/0.org/alpha1.org
 create mode 100644 tutorials/multiphase/interFoam/ras/weirOverflow/0.org/epsilon
 create mode 100644 tutorials/multiphase/interFoam/ras/weirOverflow/0.org/include/initialConditions
 create mode 100644 tutorials/multiphase/interFoam/ras/weirOverflow/0.org/k
 create mode 100644 tutorials/multiphase/interFoam/ras/weirOverflow/0.org/nut
 create mode 100644 tutorials/multiphase/interFoam/ras/weirOverflow/0.org/p_rgh
 create mode 100755 tutorials/multiphase/interFoam/ras/weirOverflow/Allclean
 create mode 100755 tutorials/multiphase/interFoam/ras/weirOverflow/Allrun
 create mode 100644 tutorials/multiphase/interFoam/ras/weirOverflow/constant/RASProperties
 create mode 100644 tutorials/multiphase/interFoam/ras/weirOverflow/constant/g
 create mode 100644 tutorials/multiphase/interFoam/ras/weirOverflow/constant/polyMesh/blockMeshDict
 create mode 100644 tutorials/multiphase/interFoam/ras/weirOverflow/constant/polyMesh/boundary
 create mode 100644 tutorials/multiphase/interFoam/ras/weirOverflow/constant/transportProperties
 create mode 100644 tutorials/multiphase/interFoam/ras/weirOverflow/constant/turbulenceProperties
 create mode 100644 tutorials/multiphase/interFoam/ras/weirOverflow/system/controlDict
 create mode 100644 tutorials/multiphase/interFoam/ras/weirOverflow/system/fvSchemes
 create mode 100644 tutorials/multiphase/interFoam/ras/weirOverflow/system/fvSolution
 create mode 100644 tutorials/multiphase/interFoam/ras/weirOverflow/system/setFieldsDict

diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/createFields.H b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/createFields.H
index 93c35ee1e1..c773650be2 100644
--- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/createFields.H
+++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/createFields.H
@@ -310,14 +310,21 @@
 
     Info << "dispersedPhase is " << dispersedPhase << endl;
 
-    scalar minInterfaceAlpha
+    scalar residualPhaseFraction
     (
         readScalar
         (
-            interfacialProperties.lookup("minInterfaceAlpha")
+            interfacialProperties.lookup("residualPhaseFraction")
         )
     );
 
+    dimensionedScalar residualSlip
+    (
+        "residualSlip",
+        dimVelocity,
+        interfacialProperties.lookup("residualSlip")
+    );
+
     kineticTheoryModel kineticTheory
     (
         phase1,
diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialCoeffs.H b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialCoeffs.H
index 3b4d2be679..d6ccf90289 100644
--- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialCoeffs.H
+++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialCoeffs.H
@@ -36,7 +36,7 @@ volScalarField heatTransferCoeff
 
 {
     volVectorField Ur(U1 - U2);
-    volScalarField magUr(mag(Ur));
+    volScalarField magUr(mag(Ur) + residualSlip);
 
     if (dispersedPhase == "1")
     {
@@ -69,12 +69,9 @@ volScalarField heatTransferCoeff
             << exit(FatalError);
     }
 
-    volScalarField alpha1Coeff
-    (
-        (alpha1 + minInterfaceAlpha)*(alpha2 + minInterfaceAlpha)
-    );
-    dragCoeff *= alpha1Coeff;
-    heatTransferCoeff *= alpha1Coeff;
+    volScalarField alphaCoeff(max(alpha1*alpha2, residualPhaseFraction));
+    dragCoeff *= alphaCoeff;
+    heatTransferCoeff *= alphaCoeff;
 
     liftForce = Cl*(alpha1*rho1 + alpha2*rho2)*(Ur ^ fvc::curl(U));
 
diff --git a/src/finiteVolume/Make/files b/src/finiteVolume/Make/files
index 0e2de76c07..90f9d44c3d 100644
--- a/src/finiteVolume/Make/files
+++ b/src/finiteVolume/Make/files
@@ -173,6 +173,8 @@ $(derivedFvPatchFields)/cylindricalInletVelocity/cylindricalInletVelocityFvPatch
 $(derivedFvPatchFields)/outletMappedUniformInlet/outletMappedUniformInletFvPatchFields.C
 $(derivedFvPatchFields)/waveSurfacePressure/waveSurfacePressureFvPatchScalarField.C
 $(derivedFvPatchFields)/phaseHydrostaticPressure/phaseHydrostaticPressureFvPatchScalarField.C
+$(derivedFvPatchFields)/variableHeightFlowRate/variableHeightFlowRateFvPatchField.C
+$(derivedFvPatchFields)/variableHeightFlowRateInletVelocity/variableHeightFlowRateInletVelocityFvPatchVectorField.C
 
 fvsPatchFields = fields/fvsPatchFields
 $(fvsPatchFields)/fvsPatchField/fvsPatchFields.C
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/variableHeightFlowRate/variableHeightFlowRateFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/variableHeightFlowRate/variableHeightFlowRateFvPatchField.C
new file mode 100644
index 0000000000..8c293d4a99
--- /dev/null
+++ b/src/finiteVolume/fields/fvPatchFields/derived/variableHeightFlowRate/variableHeightFlowRateFvPatchField.C
@@ -0,0 +1,196 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "variableHeightFlowRateFvPatchField.H"
+#include "fvPatchFieldMapper.H"
+#include "addToRunTimeSelectionTable.H"
+#include "volFields.H"
+#include "surfaceFields.H"
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::variableHeightFlowRateFvPatchScalarField
+::variableHeightFlowRateFvPatchScalarField
+(
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF
+)
+:
+    mixedFvPatchField<scalar>(p, iF),
+    phiName_("phi"),
+    lowerBound_(0.0),
+    upperBound_(1.0)
+{
+    this->refValue() = 0.0;
+    this->refGrad() = 0.0;
+    this->valueFraction() = 0.0;
+}
+
+
+Foam::variableHeightFlowRateFvPatchScalarField
+::variableHeightFlowRateFvPatchScalarField
+(
+    const variableHeightFlowRateFvPatchScalarField& ptf,
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF,
+    const fvPatchFieldMapper& mapper
+)
+:
+    mixedFvPatchScalarField(ptf, p, iF, mapper),
+    phiName_(ptf.phiName_),
+    lowerBound_(ptf.lowerBound_),
+    upperBound_(ptf.upperBound_)
+{}
+
+
+Foam::variableHeightFlowRateFvPatchScalarField
+::variableHeightFlowRateFvPatchScalarField
+(
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF,
+    const dictionary& dict
+)
+:
+    mixedFvPatchScalarField(p, iF),
+    phiName_(dict.lookupOrDefault<word>("phi", "phi")),
+    lowerBound_(readScalar(dict.lookup("lowerBound"))),
+    upperBound_(readScalar(dict.lookup("upperBound")))
+{
+    this->refValue() = 0.0;
+
+    if (dict.found("value"))
+    {
+        fvPatchScalarField::operator=
+        (
+            scalarField("value", dict, p.size())
+        );
+    }
+    else
+    {
+        fvPatchScalarField::operator=(this->patchInternalField());
+    }
+
+    this->refGrad() = 0.0;
+    this->valueFraction() = 0.0;
+}
+
+
+Foam::variableHeightFlowRateFvPatchScalarField
+    ::variableHeightFlowRateFvPatchScalarField
+(
+    const variableHeightFlowRateFvPatchScalarField& ptf
+)
+:
+    mixedFvPatchScalarField(ptf),
+    phiName_(ptf.phiName_),
+    lowerBound_(ptf.lowerBound_),
+    upperBound_(ptf.upperBound_)
+{}
+
+
+Foam::variableHeightFlowRateFvPatchScalarField
+    ::variableHeightFlowRateFvPatchScalarField
+(
+    const variableHeightFlowRateFvPatchScalarField& ptf,
+    const DimensionedField<scalar, volMesh>& iF
+)
+:
+    mixedFvPatchScalarField(ptf, iF),
+    phiName_(ptf.phiName_),
+    lowerBound_(ptf.lowerBound_),
+    upperBound_(ptf.upperBound_)
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::variableHeightFlowRateFvPatchScalarField::updateCoeffs()
+{
+    if (this->updated())
+    {
+        return;
+    }
+
+    const fvsPatchField<scalar>& phip =
+        patch().lookupPatchField<surfaceScalarField, scalar>(phiName_);
+
+    scalarField alphap = this->patchInternalField();
+
+
+    forAll(phip, i)
+    {
+        if (phip[i] < -SMALL)
+        {
+            if (alphap[i] < lowerBound_)
+            {
+                this->refValue()[i] = 0.0;
+            }
+            else if (alphap[i] > upperBound_)
+            {
+                this->refValue()[i] = 1.0;
+            }
+            else
+            {
+                this->refValue()[i] = alphap[i];
+            }
+
+            this->valueFraction()[i] = 1.0;
+        }
+        else
+        {
+            this->refValue()[i] = 0.0;
+            this->valueFraction()[i] = 0.0;
+        }
+    }
+
+    mixedFvPatchScalarField::updateCoeffs();
+}
+
+
+void Foam::variableHeightFlowRateFvPatchScalarField::write(Ostream& os) const
+{
+    fvPatchScalarField::write(os);
+    if (phiName_ != "phi")
+    {
+        os.writeKeyword("phi") << phiName_ << token::END_STATEMENT << nl;
+    }
+    os.writeKeyword("lowerBound") << lowerBound_ << token::END_STATEMENT << nl;
+    os.writeKeyword("upperBound") << upperBound_ << token::END_STATEMENT << nl;
+    this->writeEntry("value", os);
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    makePatchTypeField
+    (
+        fvPatchScalarField,
+        variableHeightFlowRateFvPatchScalarField
+    );
+}
+
+// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/variableHeightFlowRate/variableHeightFlowRateFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/variableHeightFlowRate/variableHeightFlowRateFvPatchField.H
new file mode 100644
index 0000000000..51e8c87899
--- /dev/null
+++ b/src/finiteVolume/fields/fvPatchFields/derived/variableHeightFlowRate/variableHeightFlowRateFvPatchField.H
@@ -0,0 +1,174 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::variableHeightFlowRateFvPatchScalarField
+
+Description
+    This boundary condition uses zeroGradient within a specified range of
+    values for phase fraction alpha. The range is defined within the
+    boundary condition by the lowerBound and upperBound.
+
+    alpha > upperBound: fixedValue with uniform value of upperBound
+    lowerBound <= alpha <= upperBound: zeroGradient
+    alpha < lowerBound: fixedValue with uniform value of lowerBound
+
+    Example:
+    \verbatim
+        inlet
+        {
+            type            clippedZeroGradient;
+            lowerBound      0.0;
+            upperBound      0.9;
+            value           uniform 0;
+        }
+    \verbatim
+
+SourceFiles
+    variableHeightFlowRateFvPatchScalarField.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef variableHeightFlowRateFvPatchScalarField_H
+#define variableHeightFlowRateFvPatchScalarField_H
+
+#include "mixedFvPatchFields.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                     Class variableHeightFlowRateFvPatchScalar Declaration
+\*---------------------------------------------------------------------------*/
+
+class variableHeightFlowRateFvPatchScalarField
+:
+    public mixedFvPatchScalarField
+{
+
+protected:
+
+    // Protected data
+
+        //- Name of flux field
+        word phiName_;
+
+        //- Lower bound for alpha1
+        scalar lowerBound_;
+
+        //- Upper bound for alpha1
+        scalar upperBound_;
+
+public:
+
+    //- Runtime scalar information
+    TypeName("variableHeightFlowRate");
+
+
+    // Constructors
+
+        //- Construct from patch and internal field
+        variableHeightFlowRateFvPatchScalarField
+        (
+            const fvPatch&,
+            const DimensionedField<scalar, volMesh>&
+        );
+
+        //- Construct from patch, internal field and dictionary
+        variableHeightFlowRateFvPatchScalarField
+        (
+            const fvPatch&,
+            const DimensionedField<scalar, volMesh>&,
+            const dictionary&
+        );
+
+        //- Construct by mapping given
+        //  variableHeightFlowRateFvPatchScalarField onto a new patch
+        variableHeightFlowRateFvPatchScalarField
+        (
+            const variableHeightFlowRateFvPatchScalarField&,
+            const fvPatch&,
+            const DimensionedField<scalar, volMesh>&,
+            const fvPatchFieldMapper&
+        );
+
+        //- Construct as copy
+        variableHeightFlowRateFvPatchScalarField
+        (
+            const variableHeightFlowRateFvPatchScalarField&
+        );
+
+        //- Construct and return a clone
+        virtual tmp<fvPatchField<scalar> > clone() const
+        {
+            return tmp<fvPatchField<scalar> >
+            (
+                new variableHeightFlowRateFvPatchScalarField(*this)
+            );
+        }
+
+        //- Construct as copy setting internal field reference
+        variableHeightFlowRateFvPatchScalarField
+        (
+            const variableHeightFlowRateFvPatchScalarField&,
+            const DimensionedField<scalar, volMesh>&
+        );
+
+        //- Construct and return a clone setting internal field reference
+        virtual tmp<fvPatchField<scalar> > clone
+        (
+            const DimensionedField<scalar, volMesh>& iF
+        ) const
+        {
+            return tmp<fvPatchField<scalar> >
+            (
+                new variableHeightFlowRateFvPatchScalarField(*this, iF)
+            );
+        }
+
+
+    // Member functions
+
+        //- Update the coefficients associated with the patch field
+        virtual void updateCoeffs();
+
+        //- Write
+        virtual void write(Ostream&) const;
+
+
+    // Member operators
+
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/variableHeightFlowRateInletVelocity/variableHeightFlowRateInletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/variableHeightFlowRateInletVelocity/variableHeightFlowRateInletVelocityFvPatchVectorField.C
new file mode 100644
index 0000000000..2e289ad6c3
--- /dev/null
+++ b/src/finiteVolume/fields/fvPatchFields/derived/variableHeightFlowRateInletVelocity/variableHeightFlowRateInletVelocityFvPatchVectorField.C
@@ -0,0 +1,147 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2012 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 "variableHeightFlowRateInletVelocityFvPatchVectorField.H"
+#include "volFields.H"
+#include "addToRunTimeSelectionTable.H"
+#include "fvPatchFieldMapper.H"
+#include "surfaceFields.H"
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::variableHeightFlowRateInletVelocityFvPatchVectorField
+::variableHeightFlowRateInletVelocityFvPatchVectorField
+(
+    const fvPatch& p,
+    const DimensionedField<vector, volMesh>& iF
+)
+:
+    fixedValueFvPatchField<vector>(p, iF),
+    flowRate_(0)
+{}
+
+
+Foam::variableHeightFlowRateInletVelocityFvPatchVectorField
+::variableHeightFlowRateInletVelocityFvPatchVectorField
+(
+    const variableHeightFlowRateInletVelocityFvPatchVectorField& ptf,
+    const fvPatch& p,
+    const DimensionedField<vector, volMesh>& iF,
+    const fvPatchFieldMapper& mapper
+)
+:
+    fixedValueFvPatchField<vector>(ptf, p, iF, mapper),
+    flowRate_(ptf.flowRate_)
+{}
+
+
+Foam::variableHeightFlowRateInletVelocityFvPatchVectorField
+::variableHeightFlowRateInletVelocityFvPatchVectorField
+(
+    const fvPatch& p,
+    const DimensionedField<vector, volMesh>& iF,
+    const dictionary& dict
+)
+:
+    fixedValueFvPatchField<vector>(p, iF, dict),
+    flowRate_(readScalar(dict.lookup("flowRate")))
+{}
+
+
+Foam::variableHeightFlowRateInletVelocityFvPatchVectorField
+::variableHeightFlowRateInletVelocityFvPatchVectorField
+(
+    const variableHeightFlowRateInletVelocityFvPatchVectorField& ptf
+)
+:
+    fixedValueFvPatchField<vector>(ptf),
+    flowRate_(ptf.flowRate_)
+{}
+
+
+Foam::variableHeightFlowRateInletVelocityFvPatchVectorField
+::variableHeightFlowRateInletVelocityFvPatchVectorField
+(
+    const variableHeightFlowRateInletVelocityFvPatchVectorField& ptf,
+    const DimensionedField<vector, volMesh>& iF
+)
+:
+    fixedValueFvPatchField<vector>(ptf, iF),
+    flowRate_(ptf.flowRate_)
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::variableHeightFlowRateInletVelocityFvPatchVectorField
+::updateCoeffs()
+{
+    if (updated())
+    {
+        return;
+    }
+
+    scalarField alphap =
+        patch().lookupPatchField<volScalarField, scalar>("alpha1");
+
+    alphap = max(alphap, 0.0);
+    alphap = min(alphap, 1.0);
+
+    // a simpler way of doing this would be nice
+    scalar avgU = -flowRate_/gSum(patch().magSf()*alphap);
+
+    vectorField n = patch().nf();
+
+    operator==(n*avgU*alphap);
+
+    fixedValueFvPatchField<vector>::updateCoeffs();
+}
+
+
+void Foam::variableHeightFlowRateInletVelocityFvPatchVectorField
+::write(Ostream& os) const
+{
+    fvPatchField<vector>::write(os);
+
+    os.writeKeyword("flowRate") << flowRate_
+        << token::END_STATEMENT << nl;
+    writeEntry("value", os);
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+   makePatchTypeField
+   (
+       fvPatchVectorField,
+       variableHeightFlowRateInletVelocityFvPatchVectorField
+   );
+}
+
+
+// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/variableHeightFlowRateInletVelocity/variableHeightFlowRateInletVelocityFvPatchVectorField.H b/src/finiteVolume/fields/fvPatchFields/derived/variableHeightFlowRateInletVelocity/variableHeightFlowRateInletVelocityFvPatchVectorField.H
new file mode 100644
index 0000000000..d94924b171
--- /dev/null
+++ b/src/finiteVolume/fields/fvPatchFields/derived/variableHeightFlowRateInletVelocity/variableHeightFlowRateInletVelocityFvPatchVectorField.H
@@ -0,0 +1,189 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2012 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::variableHeightFlowRateInletVelocityFvPatchVectorField
+
+Description
+    Describes a volumetric/mass flow normal vector boundary condition by its
+    magnitude as an integral over its area.
+
+    The basis of the patch (volumetric or mass) is determined by the
+    dimensions of the flux, phi.
+    The current density is used to correct the velocity when applying the
+    mass basis.
+
+    The flow rate is made proportional to the phase fraction alpha at each face
+    of the patch and alpha is ensured to be bound between 0 and 1.
+
+    Example of the boundary condition specification:
+    \verbatim
+    inlet
+    {
+        type            variableHeightFlowRateInletVelocity;
+        flowRate        0.2;        // Volumetric/mass flow rate [m3/s or kg/s]
+        value           uniform (0 0 0); // placeholder
+    }
+    \endverbatim
+
+Note
+    - The value is positive inwards
+    - May not work correctly for transonic inlets
+    - Strange behaviour with potentialFoam since the U equation is not solved
+
+SourceFiles
+    variableHeightFlowRateInletVelocityFvPatchVectorField.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef variableHeightFlowRateInletVelocityFvPatchVectorField_H
+#define variableHeightFlowRateInletVelocityFvPatchVectorField_H
+
+#include "fixedValueFvPatchFields.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+/*---------------------------------------------------------------------------*\
+          Class variableHeightFlowRateInletVelocityFvPatch Declaration
+\*---------------------------------------------------------------------------*/
+
+class variableHeightFlowRateInletVelocityFvPatchVectorField
+:
+    public fixedValueFvPatchVectorField
+{
+    // Private data
+
+        //- Inlet integral flow rate
+        scalar flowRate_;
+
+public:
+
+   //- Runtime type information
+   TypeName("variableHeightFlowRateInletVelocity");
+
+
+   // Constructors
+
+        //- Construct from patch and internal field
+        variableHeightFlowRateInletVelocityFvPatchVectorField
+        (
+            const fvPatch&,
+            const DimensionedField<vector, volMesh>&
+        );
+
+        //- Construct from patch, internal field and dictionary
+        variableHeightFlowRateInletVelocityFvPatchVectorField
+        (
+            const fvPatch&,
+            const DimensionedField<vector, volMesh>&,
+            const dictionary&
+        );
+
+        //- Construct by mapping given
+        //  variableHeightFlowRateInletVelocityFvPatchVectorField
+        //  onto a new patch
+        variableHeightFlowRateInletVelocityFvPatchVectorField
+        (
+            const variableHeightFlowRateInletVelocityFvPatchVectorField&,
+            const fvPatch&,
+            const DimensionedField<vector, volMesh>&,
+            const fvPatchFieldMapper&
+        );
+
+        //- Construct as copy
+        variableHeightFlowRateInletVelocityFvPatchVectorField
+        (
+            const variableHeightFlowRateInletVelocityFvPatchVectorField&
+        );
+
+        //- Construct and return a clone
+        virtual tmp<fvPatchVectorField> clone() const
+        {
+            return tmp<fvPatchVectorField>
+            (
+                new variableHeightFlowRateInletVelocityFvPatchVectorField(*this)
+            );
+        }
+
+        //- Construct as copy setting internal field reference
+        variableHeightFlowRateInletVelocityFvPatchVectorField
+        (
+            const variableHeightFlowRateInletVelocityFvPatchVectorField&,
+            const DimensionedField<vector, volMesh>&
+        );
+
+        //- Construct and return a clone setting internal field reference
+        virtual tmp<fvPatchVectorField> clone
+        (
+            const DimensionedField<vector, volMesh>& iF
+        ) const
+        {
+            return tmp<fvPatchVectorField>
+            (
+                new variableHeightFlowRateInletVelocityFvPatchVectorField
+                (
+                    *this,
+                    iF
+                )
+            );
+        }
+
+
+    // Member functions
+
+        // Access
+
+            //- Return the flux
+            scalar flowRate() const
+            {
+                return flowRate_;
+            }
+
+            //- Return reference to the flux to allow adjustment
+            scalar& flowRate()
+            {
+                return flowRate_;
+            }
+
+
+        //- Update the coefficients associated with the patch field
+        virtual void updateCoeffs();
+
+        //- Write
+        virtual void write(Ostream&) const;
+
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/compressibleTwoPhaseEulerFoam/bubbleColumn/constant/interfacialProperties b/tutorials/multiphase/compressibleTwoPhaseEulerFoam/bubbleColumn/constant/interfacialProperties
index c48ea4b91f..03a3a667a3 100644
--- a/tutorials/multiphase/compressibleTwoPhaseEulerFoam/bubbleColumn/constant/interfacialProperties
+++ b/tutorials/multiphase/compressibleTwoPhaseEulerFoam/bubbleColumn/constant/interfacialProperties
@@ -23,6 +23,7 @@ heatTransferModel2  RanzMarshall;
 
 dispersedPhase      both;
 
-minInterfaceAlpha   1e-2;
+residualPhaseFraction   1e-3;
+residualSlip            1e-2;
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/compressibleTwoPhaseEulerFoam/fluidisedBed/constant/interfacialProperties b/tutorials/multiphase/compressibleTwoPhaseEulerFoam/fluidisedBed/constant/interfacialProperties
index a8f0a288a0..63efa66a33 100644
--- a/tutorials/multiphase/compressibleTwoPhaseEulerFoam/fluidisedBed/constant/interfacialProperties
+++ b/tutorials/multiphase/compressibleTwoPhaseEulerFoam/fluidisedBed/constant/interfacialProperties
@@ -23,6 +23,7 @@ heatTransferModel2  RanzMarshall;
 
 dispersedPhase      "1";
 
-minInterfaceAlpha   1e-2;
+residualPhaseFraction   1e-3;
+residualSlip            1e-2;
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/constant/interfacialProperties b/tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/constant/interfacialProperties
index 41159fe9de..06b13a7b3c 100644
--- a/tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/constant/interfacialProperties
+++ b/tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/constant/interfacialProperties
@@ -24,7 +24,7 @@ heatTransferModel2  RanzMarshall;
 dispersedPhase      both;
 dragPhase           blended;
 
-residualSlip        1e-2;
-minInterfaceAlpha   1e-3;
+residualPhaseFraction   1e-3;
+residualSlip            1e-2;
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/ras/Allclean b/tutorials/multiphase/interFoam/ras/Allclean
index fdd2e7c83e..bd5bed3856 100755
--- a/tutorials/multiphase/interFoam/ras/Allclean
+++ b/tutorials/multiphase/interFoam/ras/Allclean
@@ -4,7 +4,7 @@ cd ${0%/*} || exit 1    # run from this directory
 # Source tutorial clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
-keepCases="damBreak damBreakPorousBaffle"
+keepCases="damBreak damBreakPorousBaffle weirOverflow"
 loseCases="damBreakFine"
 
 for case in $keepCases
diff --git a/tutorials/multiphase/interFoam/ras/Allrun b/tutorials/multiphase/interFoam/ras/Allrun
index c34b360834..85cfa0fbfb 100755
--- a/tutorials/multiphase/interFoam/ras/Allrun
+++ b/tutorials/multiphase/interFoam/ras/Allrun
@@ -49,4 +49,7 @@ cloneCase damBreak damBreakFine
 # Do damBreakPorousBaffle
 (cd damBreakPorousBaffle && foamRunTutorials)
 
+# Do weirOverflow
+(cd weirOverflow && foamRunTutorials)
+
 # ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/multiphase/interFoam/ras/weirOverflow/0.org/U b/tutorials/multiphase/interFoam/ras/weirOverflow/0.org/U
new file mode 100644
index 0000000000..92b06fe0a6
--- /dev/null
+++ b/tutorials/multiphase/interFoam/ras/weirOverflow/0.org/U
@@ -0,0 +1,56 @@
+/*--------------------------------*- 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       volVectorField;
+    object      U;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#include        "include/initialConditions"
+
+dimensions      [0 1 -1 0 0 0 0];
+
+internalField   uniform (0 0 0);
+
+boundaryField
+{
+    inlet
+    {
+        type            variableHeightFlowRateInletVelocity;
+        flowRate        $inletFlowRate;
+        value           uniform (0 0 0);
+    }
+
+    outlet
+    {
+        type            zeroGradient;
+    }
+
+    lowerWall
+    {
+        type            fixedValue;
+        value           uniform (0 0 0);
+    }
+
+    atmosphere
+    {
+        type            pressureInletOutletVelocity;
+        phi             phi;
+        value           uniform (0 0 0);
+    }
+
+    defaultFaces
+    {
+        type            empty;
+    }
+}
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/ras/weirOverflow/0.org/alpha1.org b/tutorials/multiphase/interFoam/ras/weirOverflow/0.org/alpha1.org
new file mode 100644
index 0000000000..deeaf2f3df
--- /dev/null
+++ b/tutorials/multiphase/interFoam/ras/weirOverflow/0.org/alpha1.org
@@ -0,0 +1,56 @@
+/*--------------------------------*- 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;
+    object      alpha1;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#include        "include/initialConditions"
+
+dimensions      [0 0 0 0 0 0 0];
+
+internalField   uniform 0;
+
+boundaryField
+{
+    inlet
+    {
+        type            variableHeightFlowRate;
+        lowerBound      0.0;
+        upperBound      0.9;
+        value           uniform 0;
+    }
+
+    outlet
+    {
+        type            zeroGradient;
+    }
+
+    lowerWall
+    {
+        type            zeroGradient;
+    }
+
+    atmosphere
+    {
+        type            inletOutlet;
+        inletValue      uniform 0;
+        value           uniform 0;
+    }
+
+    defaultFaces
+    {
+        type            empty;
+    }
+}
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/ras/weirOverflow/0.org/epsilon b/tutorials/multiphase/interFoam/ras/weirOverflow/0.org/epsilon
new file mode 100644
index 0000000000..7d98d9ac02
--- /dev/null
+++ b/tutorials/multiphase/interFoam/ras/weirOverflow/0.org/epsilon
@@ -0,0 +1,59 @@
+/*--------------------------------*- 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      epsilon;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#include        "include/initialConditions"
+
+dimensions      [0 2 -3 0 0 0 0];
+
+internalField   uniform $turbulentEpsilon;
+
+boundaryField
+{
+    inlet
+    {
+        type            fixedValue;
+        value           $internalField;
+    }
+
+    outlet
+    {
+        type            inletOutlet;
+        inletValue      $internalField;
+        value           $internalField;
+    }
+
+    lowerWall
+    {
+        type            epsilonWallFunction;
+        value           $internalField;
+    }
+
+    atmosphere
+    {
+        type            inletOutlet;
+        inletValue      $internalField;
+        value           $internalField;
+    }
+
+    defaultFaces
+    {
+        type            empty;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/ras/weirOverflow/0.org/include/initialConditions b/tutorials/multiphase/interFoam/ras/weirOverflow/0.org/include/initialConditions
new file mode 100644
index 0000000000..1d05333331
--- /dev/null
+++ b/tutorials/multiphase/interFoam/ras/weirOverflow/0.org/include/initialConditions
@@ -0,0 +1,15 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+
+inletFlowRate        75;
+pressure             0;
+turbulentKE          4.14e-03;
+turbulentEpsilon     4.39e-05;
+#inputMode           merge
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/ras/weirOverflow/0.org/k b/tutorials/multiphase/interFoam/ras/weirOverflow/0.org/k
new file mode 100644
index 0000000000..18dafe0a9a
--- /dev/null
+++ b/tutorials/multiphase/interFoam/ras/weirOverflow/0.org/k
@@ -0,0 +1,59 @@
+/*--------------------------------*- 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      k;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#include        "include/initialConditions"
+
+dimensions      [0 2 -2 0 0 0 0];
+
+internalField   uniform $turbulentKE;
+
+boundaryField
+{
+    inlet
+    {
+        type            fixedValue;
+        value           $internalField;
+    }
+
+    outlet
+    {
+        type            inletOutlet;
+        inletValue      $internalField;
+        value           $internalField;
+    }
+
+    lowerWall
+    {
+        type            kqRWallFunction;
+        value           $internalField;
+    }
+
+    atmosphere
+    {
+        type            inletOutlet;
+        inletValue      $internalField;
+        value           $internalField;
+    }
+
+    defaultFaces
+    {
+        type            empty;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/ras/weirOverflow/0.org/nut b/tutorials/multiphase/interFoam/ras/weirOverflow/0.org/nut
new file mode 100644
index 0000000000..2d6b6f0067
--- /dev/null
+++ b/tutorials/multiphase/interFoam/ras/weirOverflow/0.org/nut
@@ -0,0 +1,52 @@
+/*--------------------------------*- 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      nut;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 2 -1 0 0 0 0];
+
+internalField   uniform 0;
+
+boundaryField
+{
+    inlet
+    {
+        type            calculated;
+        value           uniform 0;
+    }
+    outlet
+    {
+        type            calculated;
+        value           uniform 0;
+    }
+    lowerWall
+    {
+        type            nutkWallFunction;
+        value           uniform 0;
+    }
+    atmosphere
+    {
+        type            calculated;
+        value           uniform 0;
+    }
+
+    defaultFaces
+    {
+        type            empty;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/ras/weirOverflow/0.org/p_rgh b/tutorials/multiphase/interFoam/ras/weirOverflow/0.org/p_rgh
new file mode 100644
index 0000000000..026164723a
--- /dev/null
+++ b/tutorials/multiphase/interFoam/ras/weirOverflow/0.org/p_rgh
@@ -0,0 +1,58 @@
+/*--------------------------------*- 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;
+    object      p_rgh;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#include        "include/initialConditions"
+
+dimensions      [1 -1 -2 0 0 0 0];
+
+internalField   uniform $pressure;
+
+boundaryField
+{
+    inlet
+    {
+        type            zeroGradient;
+    }
+
+    outlet
+    {
+        type            zeroGradient;
+    }
+
+    lowerWall
+    {
+        type            zeroGradient;
+    }
+
+    atmosphere
+    {
+        type            totalPressure;
+        p0              uniform 0;
+        U               U;
+        phi             phi;
+        rho             none;
+        psi             none;
+        gamma           1;
+        value           uniform $pressure;
+    }
+
+    defaultFaces
+    {
+        type            empty;
+    }
+}
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/ras/weirOverflow/Allclean b/tutorials/multiphase/interFoam/ras/weirOverflow/Allclean
new file mode 100755
index 0000000000..2c5a008802
--- /dev/null
+++ b/tutorials/multiphase/interFoam/ras/weirOverflow/Allclean
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+# Source tutorial clean functions
+. $WM_PROJECT_DIR/bin/tools/CleanFunctions
+
+rm -rf 0 > /dev/null 2>&1
+
+cleanCase
diff --git a/tutorials/multiphase/interFoam/ras/weirOverflow/Allrun b/tutorials/multiphase/interFoam/ras/weirOverflow/Allrun
new file mode 100755
index 0000000000..da58c047f1
--- /dev/null
+++ b/tutorials/multiphase/interFoam/ras/weirOverflow/Allrun
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+# Source tutorial run functions
+. $WM_PROJECT_DIR/bin/tools/RunFunctions
+
+cp -r 0.org 0 > /dev/null 2>&1
+
+runApplication blockMesh
+
+cp 0/alpha1.org 0/alpha1
+
+runApplication setFields
+
+runApplication `getApplication`
diff --git a/tutorials/multiphase/interFoam/ras/weirOverflow/constant/RASProperties b/tutorials/multiphase/interFoam/ras/weirOverflow/constant/RASProperties
new file mode 100644
index 0000000000..a4937b503a
--- /dev/null
+++ b/tutorials/multiphase/interFoam/ras/weirOverflow/constant/RASProperties
@@ -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      RASProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+RASModel        kEpsilon;
+
+turbulence      on;
+
+printCoeffs     on;
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/ras/weirOverflow/constant/g b/tutorials/multiphase/interFoam/ras/weirOverflow/constant/g
new file mode 100644
index 0000000000..e0ac2653b5
--- /dev/null
+++ b/tutorials/multiphase/interFoam/ras/weirOverflow/constant/g
@@ -0,0 +1,22 @@
+/*--------------------------------*- 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       uniformDimensionedVectorField;
+    location    "constant";
+    object      g;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 1 -2 0 0 0 0];
+value           ( 0 -9.81 0 );
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/ras/weirOverflow/constant/polyMesh/blockMeshDict b/tutorials/multiphase/interFoam/ras/weirOverflow/constant/polyMesh/blockMeshDict
new file mode 100644
index 0000000000..cc77285f11
--- /dev/null
+++ b/tutorials/multiphase/interFoam/ras/weirOverflow/constant/polyMesh/blockMeshDict
@@ -0,0 +1,93 @@
+/*--------------------------------*- 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;
+    object      blockMeshDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+convertToMeters 1;
+
+vertices
+(
+    (-18  0 -0.5)
+    (  0  0 -0.5)
+    ( 30  0 -0.5)
+    ( 90  0 -0.5)
+    (-18 30 -0.5)
+    (  0 30 -0.5)
+    ( 15 30 -0.5)
+    ( 90 30 -0.5)
+    (-18 54 -0.5)
+    (  0 54 -0.5)
+    ( 15 54 -0.5)
+    ( 90 54 -0.5)
+
+    (-18  0 0.5)
+    (  0  0 0.5)
+    ( 30  0 0.5)
+    ( 90  0 0.5)
+    (-18 30 0.5)
+    (  0 30 0.5)
+    ( 15 30 0.5)
+    ( 90 30 0.5)
+    (-18 54 0.5)
+    (  0 54 0.5)
+    ( 15 54 0.5)
+    ( 90 54 0.5)
+);
+
+blocks
+(
+    hex (0 1 5 4 12 13 17 16) (20 20 1) simpleGrading (1 0.5 1)
+    hex (2 3 7 6 14 15 19 18) (60 40 1) simpleGrading (1 2 1)
+    hex (4 5 9 8 16 17 21 20) (20 24 1) simpleGrading (1 1 1)
+    hex (5 6 10 9 17 18 22 21) (15 24 1) simpleGrading (1 1 1)
+    hex (6 7 11 10 18 19 23 22) (60 24 1) simpleGrading (1 1 1)
+);
+
+edges
+(
+);
+
+patches
+(
+    patch inlet
+    (
+        (0 12 16 4)
+        (4 16 20 8)
+    )
+    patch outlet
+    (
+        (7 19 15 3)
+        (11 23 19 7)
+    )
+    wall lowerWall
+    (
+        (0 1 13 12)
+        (1 5 17 13)
+        (5 6 18 17)
+        (2 14 18 6)
+        (2 3 15 14)
+    )
+    patch atmosphere
+    (
+        (8 20 21 9)
+        (9 21 22 10)
+        (10 22 23 11)
+    )
+);
+
+mergePatchPairs
+(
+);
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/ras/weirOverflow/constant/polyMesh/boundary b/tutorials/multiphase/interFoam/ras/weirOverflow/constant/polyMesh/boundary
new file mode 100644
index 0000000000..e7fe171353
--- /dev/null
+++ b/tutorials/multiphase/interFoam/ras/weirOverflow/constant/polyMesh/boundary
@@ -0,0 +1,52 @@
+/*--------------------------------*- 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;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+5
+(
+    inlet
+    {
+        type            patch;
+        nFaces          44;
+        startFace       9981;
+    }
+    outlet
+    {
+        type            patch;
+        nFaces          64;
+        startFace       10025;
+    }
+    lowerWall
+    {
+        type            wall;
+        nFaces          155;
+        startFace       10089;
+    }
+    atmosphere
+    {
+        type            patch;
+        nFaces          95;
+        startFace       10244;
+    }
+    defaultFaces
+    {
+        type            empty;
+        nFaces          10160;
+        startFace       10339;
+    }
+)
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/ras/weirOverflow/constant/transportProperties b/tutorials/multiphase/interFoam/ras/weirOverflow/constant/transportProperties
new file mode 100644
index 0000000000..ef3e8c7b4b
--- /dev/null
+++ b/tutorials/multiphase/interFoam/ras/weirOverflow/constant/transportProperties
@@ -0,0 +1,72 @@
+/*--------------------------------*- 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;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+twoPhase
+{
+    transportModel  twoPhase;
+    phase1          phase1;
+    phase2          phase2;
+}
+
+phase1
+{
+    transportModel  Newtonian;
+    nu              nu [ 0 2 -1 0 0 0 0 ] 1e-06;
+    rho             rho [ 1 -3 0 0 0 0 0 ] 1000;
+    CrossPowerLawCoeffs
+    {
+        nu0             nu0 [ 0 2 -1 0 0 0 0 ] 1e-06;
+        nuInf           nuInf [ 0 2 -1 0 0 0 0 ] 1e-06;
+        m               m [ 0 0 1 0 0 0 0 ] 1;
+        n               n [ 0 0 0 0 0 0 0 ] 0;
+    }
+
+    BirdCarreauCoeffs
+    {
+        nu0             nu0 [ 0 2 -1 0 0 0 0 ] 0.0142515;
+        nuInf           nuInf [ 0 2 -1 0 0 0 0 ] 1e-06;
+        k               k [ 0 0 1 0 0 0 0 ] 99.6;
+        n               n [ 0 0 0 0 0 0 0 ] 0.1003;
+    }
+}
+
+phase2
+{
+    transportModel  Newtonian;
+    nu              nu [ 0 2 -1 0 0 0 0 ] 1.48e-05;
+    rho             rho [ 1 -3 0 0 0 0 0 ] 1;
+    CrossPowerLawCoeffs
+    {
+        nu0             nu0 [ 0 2 -1 0 0 0 0 ] 1e-06;
+        nuInf           nuInf [ 0 2 -1 0 0 0 0 ] 1e-06;
+        m               m [ 0 0 1 0 0 0 0 ] 1;
+        n               n [ 0 0 0 0 0 0 0 ] 0;
+    }
+
+    BirdCarreauCoeffs
+    {
+        nu0             nu0 [ 0 2 -1 0 0 0 0 ] 0.0142515;
+        nuInf           nuInf [ 0 2 -1 0 0 0 0 ] 1e-06;
+        k               k [ 0 0 1 0 0 0 0 ] 99.6;
+        n               n [ 0 0 0 0 0 0 0 ] 0.1003;
+    }
+}
+
+sigma           sigma [ 1 0 -2 0 0 0 0 ] 0.07;
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/ras/weirOverflow/constant/turbulenceProperties b/tutorials/multiphase/interFoam/ras/weirOverflow/constant/turbulenceProperties
new file mode 100644
index 0000000000..3721a46a2e
--- /dev/null
+++ b/tutorials/multiphase/interFoam/ras/weirOverflow/constant/turbulenceProperties
@@ -0,0 +1,21 @@
+/*--------------------------------*- 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      turbulenceProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+simulationType  RASModel;
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/ras/weirOverflow/system/controlDict b/tutorials/multiphase/interFoam/ras/weirOverflow/system/controlDict
new file mode 100644
index 0000000000..85c6938c48
--- /dev/null
+++ b/tutorials/multiphase/interFoam/ras/weirOverflow/system/controlDict
@@ -0,0 +1,55 @@
+/*--------------------------------*- 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    "system";
+    object      controlDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+application     interFoam;
+
+startFrom       latestTime;
+
+startTime       0;
+
+stopAt          endTime;
+
+endTime         60;
+
+deltaT          0.001;
+
+writeControl    adjustableRunTime;
+
+writeInterval   2;
+
+purgeWrite      0;
+
+writeFormat     ascii;
+
+writePrecision  6;
+
+writeCompression uncompressed;
+
+timeFormat      general;
+
+timePrecision   6;
+
+runTimeModifiable yes;
+
+adjustTimeStep  on;
+
+maxCo           0.2;
+maxAlphaCo      0.2;
+
+maxDeltaT       1;
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/ras/weirOverflow/system/fvSchemes b/tutorials/multiphase/interFoam/ras/weirOverflow/system/fvSchemes
new file mode 100644
index 0000000000..28b3d7d20a
--- /dev/null
+++ b/tutorials/multiphase/interFoam/ras/weirOverflow/system/fvSchemes
@@ -0,0 +1,65 @@
+/*--------------------------------*- 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    "system";
+    object      fvSchemes;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+ddtSchemes
+{
+    default         Euler;
+}
+
+gradSchemes
+{
+    default         Gauss linear;
+}
+
+divSchemes
+{
+    div(rho*phi,U)  Gauss linear;
+    div(phi,alpha)  Gauss vanLeer;
+    div(phirb,alpha) Gauss interfaceCompression;
+    div(phi,k)      Gauss upwind;
+    div(phi,epsilon) Gauss upwind;
+    div(phi,R)      Gauss upwind;
+    div(R)          Gauss linear;
+    div(phi,nuTilda) Gauss upwind;
+    div((nuEff*dev(T(grad(U))))) Gauss linear;
+}
+
+laplacianSchemes
+{
+    default         Gauss linear corrected;
+}
+
+interpolationSchemes
+{
+    default         linear;
+}
+
+snGradSchemes
+{
+    default         corrected;
+}
+
+fluxRequired
+{
+    default         no;
+    p_rgh;
+    pcorr;
+    alpha;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/ras/weirOverflow/system/fvSolution b/tutorials/multiphase/interFoam/ras/weirOverflow/system/fvSolution
new file mode 100644
index 0000000000..b8d411303f
--- /dev/null
+++ b/tutorials/multiphase/interFoam/ras/weirOverflow/system/fvSolution
@@ -0,0 +1,67 @@
+/*--------------------------------*- 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;
+    object      fvSolution;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+solvers
+{
+    pcorr
+    {
+        solver          PCG;
+        preconditioner  DIC;
+        tolerance       1e-10;
+        relTol          0;
+    }
+
+    p_rgh
+    {
+        solver          PCG;
+        preconditioner  DIC;
+        tolerance       1e-07;
+        relTol          0.05;
+    }
+
+    p_rghFinal
+    {
+        $p_rgh;
+        relTol          0;
+    }
+
+    "(U|k|epsilon)"
+    {
+        solver          PBiCG;
+        preconditioner  DILU;
+        tolerance       1e-8;
+        relTol          0.1;
+    }
+
+    "(U|k|epsilon)Final"
+    {
+        $U;
+        relTol          0;
+    }
+}
+
+PIMPLE
+{
+    momentumPredictor no;
+    nCorrectors     3;
+    nNonOrthogonalCorrectors 0;
+    nAlphaCorr      1;
+    nAlphaSubCycles 2;
+    cAlpha          1;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/ras/weirOverflow/system/setFieldsDict b/tutorials/multiphase/interFoam/ras/weirOverflow/system/setFieldsDict
new file mode 100644
index 0000000000..26d6b7f2a6
--- /dev/null
+++ b/tutorials/multiphase/interFoam/ras/weirOverflow/system/setFieldsDict
@@ -0,0 +1,35 @@
+/*--------------------------------*- 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;
+    object      setFieldsDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+defaultFieldValues
+(
+    volScalarFieldValue alpha1 0
+);
+
+regions
+(
+    boxToCell
+    {
+        box (-100 0 -100) (0 20 100);
+
+        fieldValues
+        (
+            volScalarFieldValue alpha1 1
+        );
+    }
+);
+
+// ************************************************************************* //

From c4bfeb6d39c5c939d6b01101505164a4958686c5 Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Mon, 2 Apr 2012 13:46:20 +0100
Subject: [PATCH 148/317] Correct headers

---
 .../variableHeightFlowRateInletVelocityFvPatchVectorField.C     | 2 +-
 .../variableHeightFlowRateInletVelocityFvPatchVectorField.H     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/finiteVolume/fields/fvPatchFields/derived/variableHeightFlowRateInletVelocity/variableHeightFlowRateInletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/variableHeightFlowRateInletVelocity/variableHeightFlowRateInletVelocityFvPatchVectorField.C
index 2e289ad6c3..98d98f07ba 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/variableHeightFlowRateInletVelocity/variableHeightFlowRateInletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/variableHeightFlowRateInletVelocity/variableHeightFlowRateInletVelocityFvPatchVectorField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/variableHeightFlowRateInletVelocity/variableHeightFlowRateInletVelocityFvPatchVectorField.H b/src/finiteVolume/fields/fvPatchFields/derived/variableHeightFlowRateInletVelocity/variableHeightFlowRateInletVelocityFvPatchVectorField.H
index d94924b171..d1bc1ac62f 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/variableHeightFlowRateInletVelocity/variableHeightFlowRateInletVelocityFvPatchVectorField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/variableHeightFlowRateInletVelocity/variableHeightFlowRateInletVelocityFvPatchVectorField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

From a10bc9b62c4b9527c8647ba741de821807800b84 Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Mon, 2 Apr 2012 13:52:46 +0100
Subject: [PATCH 149/317] dimensionedType: Add support for optional
 dimensionSet input on construction from dimensionSet and stream

The read dimensionSet is checked against the dimensionSet provided as an
argument and a FatalError is generated if they do not match.
---
 .../dimensionedType/dimensionedType.C         | 30 +++++++++++++++++--
 1 file changed, 27 insertions(+), 3 deletions(-)

diff --git a/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.C b/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.C
index 1d65b22fd6..acaed52ac9 100644
--- a/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.C
+++ b/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -126,8 +126,32 @@ dimensioned<Type>::dimensioned
 :
     name_(name),
     dimensions_(dimSet),
-    value_(pTraits<Type>(is))
-{}
+    value_(pTraits<Type>::zero)
+{
+    Info<< "dimensioned<Type>::dimensioned" << endl;
+
+    token nextToken(is);
+    is.putBack(nextToken);
+
+    if (nextToken == token::BEGIN_SQR)
+    {
+        dimensionSet dims(is);
+
+        if (dims != dimensions_)
+        {
+            FatalErrorIn
+            (
+                "dimensioned<Type>::dimensioned"
+                "(const word&, const dimensionSet&, Istream&)"
+            ) << "The dimensions " << dims
+              << " provided do not match the required dimensions "
+              << dimensions_
+              << abort(FatalError);
+        }
+    }
+
+    is >> value_;
+}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //

From 9821123c86f17d3c4c0dbb5d86a1345214fc7886 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Mon, 2 Apr 2012 17:58:45 +0100
Subject: [PATCH 150/317] ENH: snappyMultiRegionHeater: adapt for
 surfaceFeatureExtractDict

---
 .../snappyMultiRegionHeater/Allrun            | 11 +--
 .../system/surfaceFeatureExtractDict          | 99 +++++++++++++++++++
 2 files changed, 100 insertions(+), 10 deletions(-)
 create mode 100644 tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/surfaceFeatureExtractDict

diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/Allrun b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/Allrun
index e6b1c579ee..7fa0f0dc78 100755
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/Allrun
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/Allrun
@@ -8,16 +8,7 @@ cd ${0%/*} || exit 1    # run from this directory
 rm -rf constant/polyMesh/sets
 
 runApplication blockMesh
-runApplication surfaceFeatureExtract -includedAngle 150 constant/triSurface/bottomAir.stl bottomAir
-mv log.surfaceFeatureExtract log.surfaceFeatureExtract.bottom
-runApplication surfaceFeatureExtract -includedAngle 150 constant/triSurface/heater.stl heater
-mv log.surfaceFeatureExtract log.surfaceFeatureExtract.heater
-runApplication surfaceFeatureExtract -includedAngle 150 constant/triSurface/leftSolid.stl leftSolid
-mv log.surfaceFeatureExtract log.surfaceFeatureExtract.leftSolid
-runApplication surfaceFeatureExtract -includedAngle 150 constant/triSurface/rightSolid.stl rightSolid
-mv log.surfaceFeatureExtract log.surfaceFeatureExtract.rightSolid
-runApplication surfaceFeatureExtract -includedAngle 150 constant/triSurface/topAir.stl topAir
-mv log.surfaceFeatureExtract log.surfaceFeatureExtract.topAir
+runApplication surfaceFeatureExtract
 
 runApplication snappyHexMesh -overwrite
 runApplication splitMeshRegions -cellZones -overwrite
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/surfaceFeatureExtractDict b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/surfaceFeatureExtractDict
new file mode 100644
index 0000000000..58e3443201
--- /dev/null
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/surfaceFeatureExtractDict
@@ -0,0 +1,99 @@
+/*--------------------------------*- 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;
+    object      surfaceFeatureExtractDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+bottomAir.stl
+{
+    extractionMethod    extractFromSurface;
+
+    extractFromSurface
+    {
+        // Mark edges whose adjacent surface normals are at an angle less
+        // than includedAngle as features
+        // - 0  : selects no edges
+        // - 180: selects all edges
+        includedAngle   150;
+    }
+
+    // Write options
+    writeFeatureEdgeMesh    yes;
+}
+heater.stl
+{
+    extractionMethod    extractFromSurface;
+
+    extractFromSurface
+    {
+        // Mark edges whose adjacent surface normals are at an angle less
+        // than includedAngle as features
+        // - 0  : selects no edges
+        // - 180: selects all edges
+        includedAngle   150;
+    }
+
+    // Write options
+    writeFeatureEdgeMesh    yes;
+}
+leftSolid.stl
+{
+    extractionMethod    extractFromSurface;
+
+    extractFromSurface
+    {
+        // Mark edges whose adjacent surface normals are at an angle less
+        // than includedAngle as features
+        // - 0  : selects no edges
+        // - 180: selects all edges
+        includedAngle   150;
+    }
+
+    // Write options
+    writeFeatureEdgeMesh    yes;
+}
+rightSolid.stl
+{
+    extractionMethod    extractFromSurface;
+
+    extractFromSurface
+    {
+        // Mark edges whose adjacent surface normals are at an angle less
+        // than includedAngle as features
+        // - 0  : selects no edges
+        // - 180: selects all edges
+        includedAngle   150;
+    }
+
+    // Write options
+    writeFeatureEdgeMesh    yes;
+}
+topAir.stl
+{
+    extractionMethod    extractFromSurface;
+
+    extractFromSurface
+    {
+        // Mark edges whose adjacent surface normals are at an angle less
+        // than includedAngle as features
+        // - 0  : selects no edges
+        // - 180: selects all edges
+        includedAngle   150;
+    }
+
+    // Write options
+    writeFeatureEdgeMesh    yes;
+}
+
+
+// ************************************************************************* //

From 124295b3c9a5b7081f254432bf17305728a43a06 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Mon, 2 Apr 2012 18:02:16 +0100
Subject: [PATCH 151/317] ENH: autoSnapDriver: preserve baffles on faceZone
 surfaces

---
 .../snappyHexMesh/snappyHexMeshDict           |   6 +
 .../autoHexMeshDriver/autoSnapDriver.C        | 118 +++++++++++++++++-
 .../meshRefinement/meshRefinement.H           |  25 ++--
 .../meshRefinement/meshRefinementBaffles.C    |  20 ++-
 .../refinementSurfaces/refinementSurfaces.C   |  33 ++++-
 .../refinementSurfaces/refinementSurfaces.H   |  22 +++-
 6 files changed, 204 insertions(+), 20 deletions(-)

diff --git a/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMeshDict b/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMeshDict
index d3aefb6445..1ca6b3f29a 100644
--- a/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMeshDict
+++ b/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMeshDict
@@ -154,6 +154,12 @@ castellatedMeshControls
             //faceZone sphere;
             //cellZone sphere;
             //cellZoneInside inside;  //outside/insidePoint
+            //- Optional specification of what to do with faceZone faces:
+            //      internal : keep them as internal faces (default)
+            //      baffle   : create baffles from them. This gives more
+            //                 freedom in mesh motion
+            //      boundary : create loose-standing boundary faces.
+            //faceType internal;
         }
     }
 
diff --git a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriver.C b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriver.C
index ea29efbb84..41769eb935 100644
--- a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriver.C
+++ b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriver.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -40,6 +40,7 @@ Description
 #include "snapParameters.H"
 #include "refinementSurfaces.H"
 #include "unitConversion.H"
+#include "localPointRegion.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
@@ -1267,6 +1268,121 @@ void Foam::autoSnapDriver::doSnap
     meshRefiner_.createZoneBaffles(globalToPatch_, baffles);
 
 
+    // Selectively 'forget' about the baffles, i.e. not check across them
+    // or merge across them.
+    {
+        const faceZoneMesh& fZones = mesh.faceZones();
+        const refinementSurfaces& surfaces = meshRefiner_.surfaces();
+        const wordList& faceZoneNames = surfaces.faceZoneNames();
+        const List<refinementSurfaces::faceZoneType>& faceType =
+            surfaces.faceType();
+
+        // Determine which
+        //  - faces to remove from list of baffles (so not merge)
+        //  - points to duplicate
+        labelList filterFace(mesh.nFaces(), -1);
+        label nFilterFaces = 0;
+        PackedBoolList duplicatePoint(mesh.nPoints());
+        label nDuplicatePoints = 0;
+        forAll(faceZoneNames, surfI)
+        {
+            if
+            (
+                faceType[surfI] == refinementSurfaces::BAFFLE
+             || faceType[surfI] == refinementSurfaces::BOUNDARY
+            )
+            {
+                if (faceZoneNames[surfI].size())
+                {
+                    // Filter out all faces for this zone.
+                    label zoneI = fZones.findZoneID(faceZoneNames[surfI]);
+                    const faceZone& fZone = fZones[zoneI];
+                    forAll(fZone, i)
+                    {
+                        label faceI = fZone[i];
+                        filterFace[faceI] = zoneI;
+                        nFilterFaces++;
+                    }
+
+                    if (faceType[surfI] == refinementSurfaces::BOUNDARY)
+                    {
+                        forAll(fZone, i)
+                        {
+                            label faceI = fZone[i];
+                            const face& f = mesh.faces()[faceI];
+                            forAll(f, fp)
+                            {
+                                if (!duplicatePoint[f[fp]])
+                                {
+                                    duplicatePoint[f[fp]] = 1;
+                                    nDuplicatePoints++;
+                                }
+                            }
+                        }
+                    }
+
+                    Info<< "Surface : " << surfaces.names()[surfI] << nl
+                        << "    faces to become baffle : "
+                        << returnReduce(nFilterFaces, sumOp<label>()) << nl
+                        << "    points to duplicate    : "
+                        << returnReduce(nDuplicatePoints, sumOp<label>())
+                        << endl;
+                }
+            }
+        }
+
+
+        // Duplicate points
+        if (returnReduce(nDuplicatePoints, sumOp<label>()) > 0)
+        {
+            // Collect all points
+            labelList candidatePoints(nDuplicatePoints);
+            nDuplicatePoints = 0;
+            forAll(duplicatePoint, pointI)
+            {
+                if (duplicatePoint[pointI])
+                {
+                    candidatePoints[nDuplicatePoints++] = pointI;
+                }
+            }
+
+
+            localPointRegion regionSide(mesh, candidatePoints);
+            autoPtr<mapPolyMesh> mapPtr = meshRefiner_.dupNonManifoldPoints
+            (
+                regionSide
+            );
+            meshRefinement::updateList(mapPtr().faceMap(), -1, filterFace);
+        }
+
+
+        // Forget about baffles in a BAFFLE/BOUNDARY type zone
+        DynamicList<labelPair> newBaffles(baffles.size());
+        forAll(baffles, i)
+        {
+            const labelPair& baffle = baffles[i];
+            if
+            (
+                filterFace[baffle.first()] == -1
+             && filterFace[baffles[i].second()] == -1
+            )
+            {
+                newBaffles.append(baffle);
+            }
+        }
+
+        if (newBaffles.size() < baffles.size())
+        {
+            //Info<< "Splitting baffles into" << nl
+            //    << "    internal : " << newBaffles.size() << nl
+            //    << "    baffle   : " << baffles.size()-newBaffles.size()
+            //    << nl << endl;
+            baffles.transfer(newBaffles);
+        }
+        Info<< endl;
+    }
+
+
     bool doFeatures = false;
     label nFeatIter = 1;
     if (snapParams.nFeatureSnap() > 0)
diff --git a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinement.H b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinement.H
index be9994523a..4deb6f3eed 100644
--- a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinement.H
+++ b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinement.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -70,6 +70,7 @@ class searchableSurface;
 class regionSplit;
 class globalIndex;
 class removePoints;
+class localPointRegion;
 
 /*---------------------------------------------------------------------------*\
                            Class meshRefinement Declaration
@@ -141,15 +142,6 @@ private:
 
     // Private Member Functions
 
-        //- Reorder list according to map.
-        template<class T>
-        static void updateList
-        (
-            const labelList& newToOld,
-            const T& nullValue,
-            List<T>& elems
-        );
-
         //- Add patchfield of given type to all fields on mesh
         template<class GeoField>
         static void addPatchFields(fvMesh&, const word& patchFieldType);
@@ -707,6 +699,10 @@ public:
                 const point& keepPoint
             );
 
+            //- Find boundary points that connect to more than one cell
+            //  region and split them.
+            autoPtr<mapPolyMesh> dupNonManifoldPoints(const localPointRegion&);
+
             //- Find boundary points that connect to more than one cell
             //  region and split them.
             autoPtr<mapPolyMesh> dupNonManifoldPoints();
@@ -780,6 +776,15 @@ public:
                 const labelList& changedFaces
             );
 
+            //- Helper: reorder list according to map.
+            template<class T>
+            static void updateList
+            (
+                const labelList& newToOld,
+                const T& nullValue,
+                List<T>& elems
+            );
+
 
             // Restoring : is where other processes delete and reinsert data.
 
diff --git a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementBaffles.C b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementBaffles.C
index 5ec9065955..076fd11e2f 100644
--- a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementBaffles.C
+++ b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementBaffles.C
@@ -2206,15 +2206,14 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::meshRefinement::splitMesh
 
 // Find boundary points that connect to more than one cell region and
 // split them.
-Foam::autoPtr<Foam::mapPolyMesh> Foam::meshRefinement::dupNonManifoldPoints()
+Foam::autoPtr<Foam::mapPolyMesh> Foam::meshRefinement::dupNonManifoldPoints
+(
+    const localPointRegion& regionSide
+)
 {
     // Topochange container
     polyTopoChange meshMod(mesh_);
 
-
-    // Analyse which points need to be duplicated
-    localPointRegion regionSide(mesh_);
-
     label nNonManifPoints = returnReduce
     (
         regionSide.meshPointMap().size(),
@@ -2260,6 +2259,17 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::meshRefinement::dupNonManifoldPoints()
 }
 
 
+// Find boundary points that connect to more than one cell region and
+// split them.
+Foam::autoPtr<Foam::mapPolyMesh> Foam::meshRefinement::dupNonManifoldPoints()
+{
+    // Analyse which points need to be duplicated
+    localPointRegion regionSide(mesh_);
+
+    return dupNonManifoldPoints(regionSide);
+}
+
+
 // Zoning
 Foam::autoPtr<Foam::mapPolyMesh> Foam::meshRefinement::zonify
 (
diff --git a/src/mesh/autoMesh/autoHexMesh/refinementSurfaces/refinementSurfaces.C b/src/mesh/autoMesh/autoHexMesh/refinementSurfaces/refinementSurfaces.C
index a1cb5efdf7..52b2cd1b5b 100644
--- a/src/mesh/autoMesh/autoHexMesh/refinementSurfaces/refinementSurfaces.C
+++ b/src/mesh/autoMesh/autoHexMesh/refinementSurfaces/refinementSurfaces.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -49,12 +49,28 @@ namespace Foam
         "none"
     };
 }
-
-
 const Foam::NamedEnum<Foam::refinementSurfaces::areaSelectionAlgo, 4>
     Foam::refinementSurfaces::areaSelectionAlgoNames;
 
 
+namespace Foam
+{
+    template<>
+    const char* Foam::NamedEnum
+    <
+        Foam::refinementSurfaces::faceZoneType,
+        3
+    >::names[] =
+    {
+        "internal",
+        "baffle",
+        "boundary"
+    };
+}
+const Foam::NamedEnum<Foam::refinementSurfaces::faceZoneType, 3>
+    Foam::refinementSurfaces::faceZoneTypeNames;
+
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 Foam::refinementSurfaces::refinementSurfaces
@@ -70,6 +86,7 @@ Foam::refinementSurfaces::refinementSurfaces
     cellZoneNames_(surfacesDict.size()),
     zoneInside_(surfacesDict.size(), NONE),
     zoneInsidePoints_(surfacesDict.size()),
+    faceType_(surfacesDict.size(), INTERNAL),
     regionOffset_(surfacesDict.size())
 {
     // Wilcard specification : loop over all surface, all regions
@@ -93,6 +110,7 @@ Foam::refinementSurfaces::refinementSurfaces
     faceZoneNames_.setSize(surfI);
     cellZoneNames_.setSize(surfI);
     zoneInside_.setSize(surfI, NONE);
+    faceType_.setSize(surfI, INTERNAL),
     regionOffset_.setSize(surfI);
 
     labelList globalMinLevel(surfI, 0);
@@ -183,8 +201,17 @@ Foam::refinementSurfaces::refinementSurfaces
                         << " since no cellZone specified."
                         << endl;
                 }
+
+                // How to handle faces on faceZone
+                word faceTypeMethod;
+                if (dict.readIfPresent("faceType", faceTypeMethod))
+                {
+                    faceType_[surfI] = faceZoneTypeNames[faceTypeMethod];
+                }
             }
 
+
+
             // Global perpendicular angle
             if (dict.found("patchInfo"))
             {
diff --git a/src/mesh/autoMesh/autoHexMesh/refinementSurfaces/refinementSurfaces.H b/src/mesh/autoMesh/autoHexMesh/refinementSurfaces/refinementSurfaces.H
index c0bb6facc9..b0edaec614 100644
--- a/src/mesh/autoMesh/autoHexMesh/refinementSurfaces/refinementSurfaces.H
+++ b/src/mesh/autoMesh/autoHexMesh/refinementSurfaces/refinementSurfaces.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -70,6 +70,16 @@ public:
 
     static const NamedEnum<areaSelectionAlgo, 4> areaSelectionAlgoNames;
 
+    //- What to do with faceZone faces
+    enum faceZoneType
+    {
+        INTERNAL,
+        BAFFLE,
+        BOUNDARY
+    };
+
+    static const NamedEnum<faceZoneType, 3> faceZoneTypeNames;
+
 private:
 
     // Private data
@@ -97,6 +107,10 @@ private:
         //- If zoneInside=location gives the corresponding inside point
         pointField zoneInsidePoints_;
 
+        //- Per 'interface' surface :
+        //  Waht to do with outside
+        List<faceZoneType> faceType_;
+
         //- From local region number to global region number
         labelList regionOffset_;
 
@@ -187,6 +201,12 @@ public:
                 return zoneInsidePoints_;
             }
 
+            //- How to handle face of surfaces with a faceZone
+            const List<faceZoneType>& faceType() const
+            {
+                return faceType_;
+            }
+
             //- From local region number to global region number
             const labelList& regionOffset() const
             {

From 69569cc45eb2b7e2d8b11562a10da0dac54b6724 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Tue, 3 Apr 2012 10:36:23 +0100
Subject: [PATCH 152/317] STYLE: surfaceFeatureExtract: get info from Coeffs
 dictionary. Added comment

---
 .../surfaceFeatureExtract.C                   | 14 ++---
 .../surfaceFeatureExtractDict                 | 55 ++++++++++++-------
 .../system/surfaceFeatureExtractDict          | 10 ++--
 .../flange/system/surfaceFeatureExtractDict   | 12 ++--
 4 files changed, 56 insertions(+), 35 deletions(-)

diff --git a/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtract.C b/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtract.C
index 5b2e78ca96..144196edf8 100644
--- a/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtract.C
+++ b/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtract.C
@@ -592,7 +592,7 @@ int main(int argc, char *argv[])
         if (extractionMethod == "extractFromFile")
         {
             const fileName featureEdgeFile =
-                surfaceDict.subDict("extractFromFile").lookup
+                surfaceDict.subDict("extractFromFileCoeffs").lookup
                 (
                     "featureEdgeFile"
                 );
@@ -612,7 +612,7 @@ int main(int argc, char *argv[])
             const scalar includedAngle =
                 readScalar
                 (
-                    surfaceDict.subDict("extractFromSurface").lookup
+                    surfaceDict.subDict("extractFromSurfaceCoeffs").lookup
                     (
                         "includedAngle"
                     )
@@ -747,10 +747,10 @@ int main(int argc, char *argv[])
         surfaceFeatures newSet(surf);
         newSet.setFromStatus(edgeStat);
 
-        if (writeObj)
-        {
-            newSet.writeObj("final");
-        }
+        //if (writeObj)
+        //{
+        //    newSet.writeObj("final");
+        //}
 
         Info<< nl
             << "Final feature set after trimming and subsetting:" << nl
@@ -775,7 +775,7 @@ int main(int argc, char *argv[])
 
         if (writeObj)
         {
-            feMesh.writeObj(surfFileName.lessExt().name());
+            feMesh.writeObj(feMesh.path()/surfFileName.lessExt().name());
         }
 
         feMesh.write();
diff --git a/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtractDict b/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtractDict
index ef97d13889..f201e49413 100644
--- a/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtractDict
+++ b/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtractDict
@@ -16,10 +16,34 @@ FoamFile
 
 surface1.stl
 {
-    // extractFromFile || extractFromSurface
+    // How to obtain raw features (extractFromFile || extractFromSurface)
+    extractionMethod    extractFromSurface;
+
+    extractFromSurfaceCoeffs
+    {
+        // Mark edges whose adjacent surface normals are at an angle less
+        // than includedAngle as features
+        // - 0  : selects no edges
+        // - 180: selects all edges
+        includedAngle   120;
+    }
+
+    // Write options
+
+        // Write .eMesh file (for snappyHexMesh)
+        writeFeatureEdgeMesh    yes;
+
+        // Write features to obj format for postprocessing
+        writeObj                yes;
+}
+
+
+surface2.nas
+{
+    // How to obtain raw features (extractFromFile || extractFromSurface)
     extractionMethod    extractFromFile;
 
-    extractFromFile
+    extractFromFileCoeffs
     {
         // Load from an existing feature edge file
         featureEdgeFile "constant/triSurface/featureEdges.nas";
@@ -62,25 +86,18 @@ surface1.stl
     closeness               no;
 
     // Write options
-    writeVTK                no;
-    writeObj                yes;
-    writeFeatureEdgeMesh    no;
+
+        // Write .eMesh file (for snappyHexMesh)
+        writeFeatureEdgeMesh    no;
+
+        // Write features to obj format for postprocessing
+        writeObj                yes;
+
+        // Write surface proximity and curvature fields to vtk format
+        // for postprocessing
+        writeVTK                no;
 }
 
 
-surface2.nas
-{
-    extractionMethod    extractFromSurface;
-
-    extractFromSurface
-    {
-        // Mark edges whose adjacent surface normals are at an angle less
-        // than includedAngle as features
-        // - 0  : selects no edges
-        // - 180: selects all edges
-        includedAngle   120;
-    }
-}
-
 
 // ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/surfaceFeatureExtractDict b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/surfaceFeatureExtractDict
index 58e3443201..f33e016252 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/surfaceFeatureExtractDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/surfaceFeatureExtractDict
@@ -18,7 +18,7 @@ bottomAir.stl
 {
     extractionMethod    extractFromSurface;
 
-    extractFromSurface
+    extractFromSurfaceCoeffs
     {
         // Mark edges whose adjacent surface normals are at an angle less
         // than includedAngle as features
@@ -34,7 +34,7 @@ heater.stl
 {
     extractionMethod    extractFromSurface;
 
-    extractFromSurface
+    extractFromSurfaceCoeffs
     {
         // Mark edges whose adjacent surface normals are at an angle less
         // than includedAngle as features
@@ -50,7 +50,7 @@ leftSolid.stl
 {
     extractionMethod    extractFromSurface;
 
-    extractFromSurface
+    extractFromSurfaceCoeffs
     {
         // Mark edges whose adjacent surface normals are at an angle less
         // than includedAngle as features
@@ -66,7 +66,7 @@ rightSolid.stl
 {
     extractionMethod    extractFromSurface;
 
-    extractFromSurface
+    extractFromSurfaceCoeffs
     {
         // Mark edges whose adjacent surface normals are at an angle less
         // than includedAngle as features
@@ -82,7 +82,7 @@ topAir.stl
 {
     extractionMethod    extractFromSurface;
 
-    extractFromSurface
+    extractFromSurfaceCoeffs
     {
         // Mark edges whose adjacent surface normals are at an angle less
         // than includedAngle as features
diff --git a/tutorials/mesh/cvMesh/flange/system/surfaceFeatureExtractDict b/tutorials/mesh/cvMesh/flange/system/surfaceFeatureExtractDict
index 053b4210cb..a4c24aa610 100644
--- a/tutorials/mesh/cvMesh/flange/system/surfaceFeatureExtractDict
+++ b/tutorials/mesh/cvMesh/flange/system/surfaceFeatureExtractDict
@@ -18,7 +18,7 @@ flange.obj
 {
     extractionMethod    extractFromSurface;
 
-    extractFromSurface
+    extractFromSurfaceCoeffs
     {
         // Mark edges whose adjacent surface normals are at an angle less
         // than includedAngle as features
@@ -27,10 +27,14 @@ flange.obj
         includedAngle   155;
     }
 
+
     // Write options
-    writeVTK                no;
-    writeObj                yes;
-    writeFeatureEdgeMesh    no;
+
+        // Write .eMesh file (for snappyHexMesh)
+        writeFeatureEdgeMesh    no;
+
+        // Write features to obj format for postprocessing
+        writeObj                yes;
 }
 
 

From 421a2b8520a887d82e99c8e50fc8eb1aca5b4fab Mon Sep 17 00:00:00 2001
From: laurence <laurence>
Date: Tue, 3 Apr 2012 11:36:38 +0100
Subject: [PATCH 153/317] COMP: cvMesh: Add CGAL_INEXACT flag

---
 applications/utilities/mesh/generation/cvMesh/Make/options    | 4 ++++
 .../mesh/generation/cvMesh/conformalVoronoiMesh/Make/options  | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/applications/utilities/mesh/generation/cvMesh/Make/options b/applications/utilities/mesh/generation/cvMesh/Make/options
index 5efdb12572..e7a3c9e0e3 100644
--- a/applications/utilities/mesh/generation/cvMesh/Make/options
+++ b/applications/utilities/mesh/generation/cvMesh/Make/options
@@ -2,11 +2,15 @@ EXE_DEBUG = -DFULLDEBUG -g -O0
 EXE_FROUNDING_MATH = -frounding-math
 EXE_NDEBUG = -DNDEBUG
 
+CGAL_EXACT =
+CGAL_INEXACT = -DCGAL_INEXACT
+
 include $(GENERAL_RULES)/CGAL
 
 EXE_INC = \
     ${EXE_FROUNDING_MATH} \
     ${EXE_NDEBUG} \
+    ${CGAL_INEXACT} \
     ${CGAL_INC} \
     -IconformalVoronoiMesh/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/Make/options b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/Make/options
index 2d2d1a1178..97e045f305 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/Make/options
+++ b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/Make/options
@@ -2,12 +2,16 @@ EXE_DEBUG = -DFULLDEBUG -g -O0
 EXE_FROUNDING_MATH = -frounding-math
 EXE_NDEBUG = -DNDEBUG
 
+CGAL_EXACT =
+CGAL_INEXACT = -DCGAL_INEXACT
+
 include $(GENERAL_RULES)/CGAL
 FFLAGS = -DCGAL_FILES='"${CGAL_ARCH_PATH}/share/files"'
 
 EXE_INC = \
     ${EXE_FROUNDING_MATH} \
     ${EXE_NDEBUG} \
+    ${CGAL_INEXACT} \
     ${CGAL_INC} \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \

From e161131dc452227b8da714a60cb83b44b361eafa Mon Sep 17 00:00:00 2001
From: laurence <laurence>
Date: Tue, 3 Apr 2012 11:39:47 +0100
Subject: [PATCH 154/317] ENH: surfaceFeatureExtract: Always write a
 featureEdgeMesh

---
 .../surfaceFeatureExtract.C                   | 43 ++++++++-----------
 .../surfaceFeatureExtractDict                 |  4 --
 2 files changed, 17 insertions(+), 30 deletions(-)

diff --git a/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtract.C b/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtract.C
index 144196edf8..1494fadab0 100644
--- a/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtract.C
+++ b/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtract.C
@@ -525,12 +525,6 @@ int main(int argc, char *argv[])
             surfaceDict.lookupOrAddDefault<Switch>("writeVTK", "off");
         const Switch writeObj =
             surfaceDict.lookupOrAddDefault<Switch>("writeObj", "off");
-        const Switch writeFeatureEdgeMesh =
-            surfaceDict.lookupOrAddDefault<Switch>
-            (
-                "writeFeatureEdgeMesh",
-                "off"
-            );
 
         const Switch curvature =
             surfaceDict.lookupOrAddDefault<Switch>("curvature", "off");
@@ -781,29 +775,26 @@ int main(int argc, char *argv[])
         feMesh.write();
 
         // Write a featureEdgeMesh for backwards compatibility
-        if (writeFeatureEdgeMesh)
-        {
-            featureEdgeMesh bfeMesh
+        featureEdgeMesh bfeMesh
+        (
+            IOobject
             (
-                IOobject
-                (
-                    surfFileName.lessExt().name() + ".eMesh",   // name
-                    runTime.constant(),                         // instance
-                    "triSurface",
-                    runTime,                                    // registry
-                    IOobject::NO_READ,
-                    IOobject::AUTO_WRITE,
-                    false
-                ),
-                feMesh.points(),
-                feMesh.edges()
-            );
+                surfFileName.lessExt().name() + ".eMesh",   // name
+                runTime.constant(),                         // instance
+                "triSurface",
+                runTime,                                    // registry
+                IOobject::NO_READ,
+                IOobject::AUTO_WRITE,
+                false
+            ),
+            feMesh.points(),
+            feMesh.edges()
+        );
 
-            Info<< nl << "Writing featureEdgeMesh to "
-                << bfeMesh.objectPath() << endl;
+        Info<< nl << "Writing featureEdgeMesh to "
+            << bfeMesh.objectPath() << endl;
 
-            bfeMesh.regIOobject::write();
-        }
+        bfeMesh.regIOobject::write();
 
         triSurfaceMesh searchSurf
         (
diff --git a/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtractDict b/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtractDict
index f201e49413..b5084ec103 100644
--- a/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtractDict
+++ b/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtractDict
@@ -87,9 +87,6 @@ surface2.nas
 
     // Write options
 
-        // Write .eMesh file (for snappyHexMesh)
-        writeFeatureEdgeMesh    no;
-
         // Write features to obj format for postprocessing
         writeObj                yes;
 
@@ -99,5 +96,4 @@ surface2.nas
 }
 
 
-
 // ************************************************************************* //

From 4fe27dffa16bfd6cbd2d7ddc263bf3ede4e17eda Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Wed, 4 Apr 2012 09:48:19 +0100
Subject: [PATCH 155/317] ENH: tetTetOverlap: test for tet-tet overlap

---
 applications/test/tetTetOverlap/Make/files    |   3 +
 applications/test/tetTetOverlap/Make/options  |   5 +
 .../test/tetTetOverlap/Test-tetTetOverlap.C   | 164 ++++++++++++++++++
 3 files changed, 172 insertions(+)
 create mode 100644 applications/test/tetTetOverlap/Make/files
 create mode 100644 applications/test/tetTetOverlap/Make/options
 create mode 100644 applications/test/tetTetOverlap/Test-tetTetOverlap.C

diff --git a/applications/test/tetTetOverlap/Make/files b/applications/test/tetTetOverlap/Make/files
new file mode 100644
index 0000000000..0092ff8771
--- /dev/null
+++ b/applications/test/tetTetOverlap/Make/files
@@ -0,0 +1,3 @@
+Test-tetTetOverlap.C
+
+EXE = $(FOAM_USER_APPBIN)/Test-tetTetOverlap
diff --git a/applications/test/tetTetOverlap/Make/options b/applications/test/tetTetOverlap/Make/options
new file mode 100644
index 0000000000..54c035b8f5
--- /dev/null
+++ b/applications/test/tetTetOverlap/Make/options
@@ -0,0 +1,5 @@
+EXE_INC = \
+    -I$(LIB_SRC)/meshTools/lnInclude
+
+EXE_LIBS = \
+    -lmeshTools
diff --git a/applications/test/tetTetOverlap/Test-tetTetOverlap.C b/applications/test/tetTetOverlap/Test-tetTetOverlap.C
new file mode 100644
index 0000000000..df6f2b8f83
--- /dev/null
+++ b/applications/test/tetTetOverlap/Test-tetTetOverlap.C
@@ -0,0 +1,164 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Application
+    Test-tetTetOverlap
+
+Description
+    Overlap volume of two tets
+
+\*---------------------------------------------------------------------------*/
+
+#include "tetrahedron.H"
+#include "OFstream.H"
+#include "meshTools.H"
+
+using namespace Foam;
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+void writeOBJ
+(
+    Ostream& os,
+    label& vertI,
+    const tetPoints& tet
+)
+{
+    forAll(tet, fp)
+    {
+        meshTools::writeOBJ(os, tet[fp]);
+    }
+    os  << "l " << vertI+1 << ' ' << vertI+2 << nl
+        << "l " << vertI+1 << ' ' << vertI+3 << nl
+        << "l " << vertI+1 << ' ' << vertI+4 << nl
+        << "l " << vertI+2 << ' ' << vertI+3 << nl
+        << "l " << vertI+2 << ' ' << vertI+4 << nl
+        << "l " << vertI+3 << ' ' << vertI+4 << nl;
+    vertI += 4;
+}
+
+
+int main(int argc, char *argv[])
+{
+    tetPoints A
+    (
+        point(0, 0, 0),
+        point(1, 0, 0),
+        point(1, 1, 0),
+        point(1, 1, 1)
+    );
+    const tetPointRef tetA = A.tet();
+
+    tetPoints B
+    (
+        point(0.1, 0.1, 0.1),
+        point(1.1, 0.1, 0.1),
+        point(1.1, 1.1, 0.1),
+        point(1.1, 1.1, 1.1)
+    );
+    const tetPointRef tetB = B.tet();
+
+
+    tetPointRef::tetIntersectionList insideTets;
+    label nInside = 0;
+    tetPointRef::tetIntersectionList outsideTets;
+    label nOutside = 0;
+
+    tetA.tetOverlap
+    (
+        tetB,
+        insideTets,
+        nInside,
+        outsideTets,
+        nOutside
+    );
+
+
+    // Dump to file
+    // ~~~~~~~~~~~~
+
+    {
+        OFstream str("tetA.obj");
+        Info<< "Writing A to " << str.name() << endl;
+        label vertI = 0;
+        writeOBJ(str, vertI, A);
+    }
+    {
+        OFstream str("tetB.obj");
+        Info<< "Writing B to " << str.name() << endl;
+        label vertI = 0;
+        writeOBJ(str, vertI, B);
+    }
+    {
+        OFstream str("inside.obj");
+        Info<< "Writing parts of A inside B to " << str.name() << endl;
+        label vertI = 0;
+        for (label i = 0; i < nInside; ++i)
+        {
+            writeOBJ(str, vertI, insideTets[i]);
+        }
+    }
+    {
+        OFstream str("outside.obj");
+        Info<< "Writing parts of A outside B to " << str.name() << endl;
+        label vertI = 0;
+        for (label i = 0; i < nOutside; ++i)
+        {
+            writeOBJ(str, vertI, outsideTets[i]);
+        }
+    }
+
+
+    // Check
+    // ~~~~~
+
+    Info<< "Vol A:" << tetA.mag() << endl;
+
+    scalar volInside = 0;
+    for (label i = 0; i < nInside; ++i)
+    {
+        volInside += insideTets[i].tet().mag();
+    }
+    Info<< "Vol A inside B:" << volInside << endl;
+
+    scalar volOutside = 0;
+    for (label i = 0; i < nOutside; ++i)
+    {
+        volOutside += outsideTets[i].tet().mag();
+    }
+    Info<< "Vol A outside B:" << volOutside << endl;
+
+    Info<< "Sum inside and outside:" << volInside+volOutside << endl;
+
+    if (mag(volInside+volOutside-tetA.mag()) > SMALL)
+    {
+        FatalErrorIn("Test-tetetOverlap")
+            << "Tet volumes do not sum up to input tet."
+            << exit(FatalError);
+    }
+
+    return 0;
+}
+
+
+// ************************************************************************* //

From 76cc55c36c6bf3f936228c4564e1ed42e4562e18 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Wed, 4 Apr 2012 09:49:14 +0100
Subject: [PATCH 156/317] STYLE: calculateMeshToMeshWeights: cleanup

---
 .../meshToMesh/calculateMeshToMeshWeights.C   | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/src/sampling/meshToMeshInterpolation/meshToMesh/calculateMeshToMeshWeights.C b/src/sampling/meshToMeshInterpolation/meshToMesh/calculateMeshToMeshWeights.C
index c3db6586ad..5ffd6de0e1 100644
--- a/src/sampling/meshToMeshInterpolation/meshToMesh/calculateMeshToMeshWeights.C
+++ b/src/sampling/meshToMeshInterpolation/meshToMesh/calculateMeshToMeshWeights.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -118,7 +118,7 @@ void Foam::meshToMesh::calculateInverseVolumeWeights() const
     inverseVolumeWeightsPtr_ = new scalarListList(toMesh_.nCells());
     scalarListList& invVolCoeffs = *inverseVolumeWeightsPtr_;
 
-    labelListList& cellToCell = *cellToCellAddressingPtr_;
+    const labelListList& cellToCell = cellToCellAddressing();
 
     tetOverlapVolume overlapEngine;
 
@@ -129,8 +129,8 @@ void Foam::meshToMesh::calculateInverseVolumeWeights() const
         if (overlapCells.size() > 0)
         {
             invVolCoeffs[celli].setSize(overlapCells.size());
-            scalar v(0);
-            forAll (overlapCells, j)
+
+            forAll(overlapCells, j)
             {
                 label cellFrom = overlapCells[j];
                 treeBoundBox bbFromMesh
@@ -142,7 +142,7 @@ void Foam::meshToMesh::calculateInverseVolumeWeights() const
                     )
                 );
 
-                v = overlapEngine.cellCellOverlapVolumeMinDecomp
+                scalar v = overlapEngine.cellCellOverlapVolumeMinDecomp
                 (
                     toMesh_,
                     celli,
@@ -151,19 +151,14 @@ void Foam::meshToMesh::calculateInverseVolumeWeights() const
                     cellFrom,
                     bbFromMesh
                 );
-                invVolCoeffs[celli][j] =  v/toMesh_.V()[celli];
-            }
-            if (celli == 2)
-            {
-                Info << "cellToCell :" << cellToCell[celli] << endl;
-                Info << "invVolCoeffs :" << invVolCoeffs[celli] << endl;
+                invVolCoeffs[celli][j] = v/toMesh_.V()[celli];
             }
         }
     }
 }
 
 
-void  Foam::meshToMesh::calculateCellToCellAddressing() const
+void Foam::meshToMesh::calculateCellToCellAddressing() const
 {
     if (debug)
     {

From 0847117142ca9a1ba79340f1bb6c8ac45957ed6e Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Wed, 4 Apr 2012 09:50:33 +0100
Subject: [PATCH 157/317] ENH: tetrahedron: add tet-tet overlap

---
 .../primitiveShapes/tetrahedron/tetrahedron.C | 95 ++++++++++++++++++-
 .../primitiveShapes/tetrahedron/tetrahedron.H | 21 +++-
 .../tetrahedron/tetrahedronI.H                |  2 +-
 .../tetOverlapVolume/tetOverlapVolume.C       | 12 +--
 .../tetOverlapVolume/tetOverlapVolume.H       |  6 +-
 5 files changed, 120 insertions(+), 16 deletions(-)

diff --git a/src/OpenFOAM/meshes/primitiveShapes/tetrahedron/tetrahedron.C b/src/OpenFOAM/meshes/primitiveShapes/tetrahedron/tetrahedron.C
index 6a16d0df73..9180eb0986 100644
--- a/src/OpenFOAM/meshes/primitiveShapes/tetrahedron/tetrahedron.C
+++ b/src/OpenFOAM/meshes/primitiveShapes/tetrahedron/tetrahedron.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -21,9 +21,6 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
-Description
-    Calculation of shape function product for a tetrahedron
-
 \*---------------------------------------------------------------------------*/
 
 #include "tetrahedron.H"
@@ -32,6 +29,96 @@ Description
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
+template<class Point, class PointRef>
+void Foam::tetrahedron<Point, PointRef>::tetOverlap
+(
+    const tetrahedron<Point, PointRef>& tetB,
+    tetIntersectionList& insideTets,
+    label& nInside,
+    tetIntersectionList& outsideTets,
+    label& nOutside
+) const
+{
+    // Work storage
+    tetIntersectionList cutInsideTets;
+    label nCutInside = 0;
+
+    nInside = 0;
+    storeOp inside(insideTets, nInside);
+    storeOp cutInside(cutInsideTets, nCutInside);
+
+    nOutside = 0;
+    storeOp outside(outsideTets, nOutside);
+
+
+    // Cut tetA with all inwards pointing faces of tetB. Any tets remaining
+    // in aboveTets are inside tetB.
+
+    {
+        // face0
+        plane pl0(tetB.b_, tetB.d_, tetB.c_);
+
+        // Cut and insert subtets into cutInsideTets (either by getting
+        // an index from freeSlots or by appending to insideTets) or
+        // insert into outsideTets
+        sliceWithPlane(pl0, cutInside, outside);
+    }
+
+    if (nCutInside == 0)
+    {
+        nInside = nCutInside;
+        return;
+    }
+
+    {
+        // face1
+        plane pl1(tetB.a_, tetB.c_, tetB.d_);
+
+        nInside = 0;
+
+        for (label i = 0; i < nCutInside; i++)
+        {
+            cutInsideTets[i].tet().sliceWithPlane(pl1, inside, outside);
+        }
+
+        if (nInside == 0)
+        {
+            return;
+        }
+    }
+
+    {
+        // face2
+        plane pl2(tetB.a_, tetB.d_, tetB.b_);
+
+        nCutInside = 0;
+
+        for (label i = 0; i < nInside; i++)
+        {
+            insideTets[i].tet().sliceWithPlane(pl2, cutInside, outside);
+        }
+
+        if (nCutInside == 0)
+        {
+            nInside = nCutInside;
+            return;
+        }
+    }
+
+    {
+        // face3
+        plane pl3(tetB.a_, tetB.b_, tetB.c_);
+
+        nInside = 0;
+
+        for (label i = 0; i < nCutInside; i++)
+        {
+            cutInsideTets[i].tet().sliceWithPlane(pl3, inside, outside);
+        }
+    }
+}
+
+
 // (Probably very inefficient) minimum containment sphere calculation.
 // From http://www.imr.sandia.gov/papers/imr11/shewchuk2.pdf:
 // Sphere ctr is smallest one of
diff --git a/src/OpenFOAM/meshes/primitiveShapes/tetrahedron/tetrahedron.H b/src/OpenFOAM/meshes/primitiveShapes/tetrahedron/tetrahedron.H
index 5ff25795b2..803cc7599e 100644
--- a/src/OpenFOAM/meshes/primitiveShapes/tetrahedron/tetrahedron.H
+++ b/src/OpenFOAM/meshes/primitiveShapes/tetrahedron/tetrahedron.H
@@ -87,6 +87,13 @@ class tetrahedron
 {
 public:
 
+    // Public typedefs
+
+        //- Storage type for tets originating from intersecting tets.
+        //  (can possibly be smaller than 200)
+        typedef FixedList<tetPoints, 200> tetIntersectionList;
+
+
         // Classes for use in sliceWithPlane. What to do with decomposition
         // of tet.
 
@@ -111,11 +118,11 @@ public:
             //- Store resulting tets
             class storeOp
             {
-                FixedList<tetPoints, 200>& tets_;
+                tetIntersectionList& tets_;
                 label& nTets_;
 
             public:
-                inline storeOp(FixedList<tetPoints, 200>&, label&);
+                inline storeOp(tetIntersectionList&, label&);
 
                 inline void operator()(const tetPoints&);
             };
@@ -261,6 +268,16 @@ public:
                 BelowTetOp& belowOp
             ) const;
 
+            //- Decompose tet into tets inside and outside other tet
+            inline void tetOverlap
+            (
+                const tetrahedron<Point, PointRef>& tetB,
+                tetIntersectionList& insideTets,
+                label& nInside,
+                tetIntersectionList& outsideTets,
+                label& nOutside
+            ) const;
+
 
             //- Return (min)containment sphere, i.e. the smallest sphere with
             //  all points inside. Returns pointHit with:
diff --git a/src/OpenFOAM/meshes/primitiveShapes/tetrahedron/tetrahedronI.H b/src/OpenFOAM/meshes/primitiveShapes/tetrahedron/tetrahedronI.H
index 5a6787be83..7831e2614b 100644
--- a/src/OpenFOAM/meshes/primitiveShapes/tetrahedron/tetrahedronI.H
+++ b/src/OpenFOAM/meshes/primitiveShapes/tetrahedron/tetrahedronI.H
@@ -556,7 +556,7 @@ inline void Foam::tetrahedron<Point, PointRef>::sumVolOp::operator()
 template<class Point, class PointRef>
 inline Foam::tetrahedron<Point, PointRef>::storeOp::storeOp
 (
-    FixedList<tetPoints, 200>& tets,
+    tetIntersectionList& tets,
     label& nTets
 )
 :
diff --git a/src/sampling/meshToMeshInterpolation/tetOverlapVolume/tetOverlapVolume.C b/src/sampling/meshToMeshInterpolation/tetOverlapVolume/tetOverlapVolume.C
index 16d311815c..a16a386f8a 100644
--- a/src/sampling/meshToMeshInterpolation/tetOverlapVolume/tetOverlapVolume.C
+++ b/src/sampling/meshToMeshInterpolation/tetOverlapVolume/tetOverlapVolume.C
@@ -49,14 +49,14 @@ void Foam::tetOverlapVolume::tetTetOverlap
 (
     const tetPoints& tetA,
     const tetPoints& tetB,
-    FixedList<tetPoints, 200>& insideTets,
+    tetIntersectionList& insideTets,
     label& nInside,
-    FixedList<tetPoints, 200>& outsideTets,
+    tetIntersectionList& outsideTets,
     label& nOutside
 ) const
 {
     // Work storage
-    FixedList<tetPoints, 200> cutInsideTets;
+    tetIntersectionList cutInsideTets;
     label nCutInside = 0;
 
     tetPointRef::storeOp inside(insideTets, nInside);
@@ -138,9 +138,9 @@ Foam::scalar Foam::tetOverlapVolume::tetTetOverlapVol
     const tetPoints& tetB
 ) const
 {
-    FixedList<tetPoints, 200> insideTets;
+    tetIntersectionList insideTets;
     label nInside = 0;
-    FixedList<tetPoints, 200> cutInsideTets;
+    tetIntersectionList cutInsideTets;
     label nCutInside = 0;
 
     tetPointRef::storeOp inside(insideTets, nInside);
@@ -222,7 +222,7 @@ Foam::scalar Foam::tetOverlapVolume::cellCellOverlapVolumeMinDecomp
     const primitiveMesh& meshB,
     const label cellBI,
     const treeBoundBox& cellBbB
-)
+) const
 {
     const cell& cFacesA = meshA.cells()[cellAI];
     const point& ccA = meshA.cellCentres()[cellAI];
diff --git a/src/sampling/meshToMeshInterpolation/tetOverlapVolume/tetOverlapVolume.H b/src/sampling/meshToMeshInterpolation/tetOverlapVolume/tetOverlapVolume.H
index 388f645f3f..c898f427d1 100644
--- a/src/sampling/meshToMeshInterpolation/tetOverlapVolume/tetOverlapVolume.H
+++ b/src/sampling/meshToMeshInterpolation/tetOverlapVolume/tetOverlapVolume.H
@@ -60,9 +60,9 @@ class tetOverlapVolume
         (
             const tetPoints& tetA,
             const tetPoints& tetB,
-            FixedList<tetPoints, 200>& insideTets,
+            tetIntersectionList& insideTets,
             label& nInside,
-            FixedList<tetPoints, 200>& outsideTets,
+            tetIntersectionList& outsideTets,
             label& nOutside
         ) const;
 
@@ -115,7 +115,7 @@ public:
             const primitiveMesh& meshB,
             const label cellBI,
             const treeBoundBox& cellBbB
-        );
+        ) const;
 };
 
 

From 3a066beebb24e090f23a31a20ed12a1a15e759ee Mon Sep 17 00:00:00 2001
From: sergio <sergio>
Date: Wed, 4 Apr 2012 15:15:24 +0100
Subject: [PATCH 158/317] ENH: Adding run time modifiable for MRFZone
 dictionary

---
 .../cfdTools/general/MRF/MRFZone.C            | 32 +++++++++++++++++--
 .../cfdTools/general/MRF/MRFZone.H            | 13 ++++----
 .../cfdTools/general/MRF/MRFZones.C           | 29 ++++++++++++++++-
 .../cfdTools/general/MRF/MRFZones.H           | 12 +++++++
 4 files changed, 76 insertions(+), 10 deletions(-)

diff --git a/src/finiteVolume/cfdTools/general/MRF/MRFZone.C b/src/finiteVolume/cfdTools/general/MRF/MRFZone.C
index d2f8caeb23..ab1837b1f6 100644
--- a/src/finiteVolume/cfdTools/general/MRF/MRFZone.C
+++ b/src/finiteVolume/cfdTools/general/MRF/MRFZone.C
@@ -32,6 +32,7 @@ License
 #include "faceSet.H"
 #include "geometricOneField.H"
 
+
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 defineTypeNameAndDebug(Foam::MRFZone, 0);
@@ -273,8 +274,8 @@ Foam::MRFZone::MRFZone(const fvMesh& mesh, Istream& is)
         }
     }
 
-
     bool cellZoneFound = (cellZoneID_ != -1);
+
     reduce(cellZoneFound, orOp<bool>());
 
     if (!cellZoneFound)
@@ -307,6 +308,7 @@ void Foam::MRFZone::addCoriolis
     const scalarField& V = mesh_.V();
     vectorField& ddtUc = ddtU.internalField();
     const vectorField& Uc = U.internalField();
+
     const vector& Omega = Omega_.value();
 
     forAll(cells, i)
@@ -328,6 +330,7 @@ void Foam::MRFZone::addCoriolis(fvVectorMatrix& UEqn) const
     const scalarField& V = mesh_.V();
     vectorField& Usource = UEqn.source();
     const vectorField& U = UEqn.psi();
+
     const vector& Omega = Omega_.value();
 
     forAll(cells, i)
@@ -353,6 +356,7 @@ void Foam::MRFZone::addCoriolis
     const scalarField& V = mesh_.V();
     vectorField& Usource = UEqn.source();
     const vectorField& U = UEqn.psi();
+
     const vector& Omega = Omega_.value();
 
     forAll(cells, i)
@@ -368,6 +372,7 @@ void Foam::MRFZone::relativeVelocity(volVectorField& U) const
     const volVectorField& C = mesh_.C();
 
     const vector& origin = origin_.value();
+
     const vector& Omega = Omega_.value();
 
     const labelList& cells = mesh_.cellZones()[cellZoneID_];
@@ -395,7 +400,8 @@ void Foam::MRFZone::relativeVelocity(volVectorField& U) const
         {
             label patchFacei = excludedFaces_[patchi][i];
             U.boundaryField()[patchi][patchFacei] -=
-                (Omega ^ (C.boundaryField()[patchi][patchFacei] - origin));
+                (Omega
+              ^ (C.boundaryField()[patchi][patchFacei] - origin));
         }
     }
 }
@@ -406,6 +412,7 @@ void Foam::MRFZone::absoluteVelocity(volVectorField& U) const
     const volVectorField& C = mesh_.C();
 
     const vector& origin = origin_.value();
+
     const vector& Omega = Omega_.value();
 
     const labelList& cells = mesh_.cellZones()[cellZoneID_];
@@ -475,6 +482,7 @@ void Foam::MRFZone::absoluteFlux
 void Foam::MRFZone::correctBoundaryVelocity(volVectorField& U) const
 {
     const vector& origin = origin_.value();
+
     const vector& Omega = Omega_.value();
 
     // Included patches
@@ -496,4 +504,24 @@ void Foam::MRFZone::correctBoundaryVelocity(volVectorField& U) const
 }
 
 
+Foam::Ostream& Foam::operator<<(Ostream& os, const MRFZone& MRF)
+{
+    os  << indent << nl;
+    os.write(MRF.name_) << nl;
+    os  << token::BEGIN_BLOCK << incrIndent << nl;
+    os.writeKeyword("origin") << MRF.origin_ << token::END_STATEMENT << nl;
+    os.writeKeyword("axis") << MRF.axis_ << token::END_STATEMENT << nl;
+    os.writeKeyword("omega") << MRF.omega_ << token::END_STATEMENT << nl;
+
+    if (MRF.excludedPatchNames_.size())
+    {
+        os.writeKeyword("nonRotatingPatches") << MRF.excludedPatchNames_
+            << token::END_STATEMENT << nl;
+    }
+
+    os  << decrIndent << token::END_BLOCK << nl;
+
+    return os;
+}
+
 // ************************************************************************* //
diff --git a/src/finiteVolume/cfdTools/general/MRF/MRFZone.H b/src/finiteVolume/cfdTools/general/MRF/MRFZone.H
index 0a4f21bf65..5c5cd245c0 100644
--- a/src/finiteVolume/cfdTools/general/MRF/MRFZone.H
+++ b/src/finiteVolume/cfdTools/general/MRF/MRFZone.H
@@ -48,6 +48,7 @@ SourceFiles
 #include "surfaceFieldsFwd.H"
 #include "fvMatricesFwd.H"
 #include "fvMatrices.H"
+#include "DataEntry.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -87,7 +88,7 @@ class MRFZone
 
         const dimensionedVector origin_;
         dimensionedVector axis_;
-        const dimensionedScalar omega_;
+        dimensionedScalar omega_;
         dimensionedVector Omega_;
 
 
@@ -205,13 +206,11 @@ public:
         void correctBoundaryVelocity(volVectorField& U) const;
 
 
-    // Ostream Operator
+    // IOstream operator
+
+        friend Ostream& operator<<(Ostream& os, const MRFZone& MRF);
+
 
-        friend Ostream& operator<<(Ostream& os, const MRFZone&)
-        {
-            notImplemented("Ostream& operator<<(Ostream& os, const MRFZone&)");
-            return os;
-        }
 };
 
 
diff --git a/src/finiteVolume/cfdTools/general/MRF/MRFZones.C b/src/finiteVolume/cfdTools/general/MRF/MRFZones.C
index d1c961afec..fa35898f0e 100644
--- a/src/finiteVolume/cfdTools/general/MRF/MRFZones.C
+++ b/src/finiteVolume/cfdTools/general/MRF/MRFZones.C
@@ -49,8 +49,28 @@ Foam::MRFZones::MRFZones(const fvMesh& mesh)
             IOobject::NO_WRITE
         ),
         MRFZone::iNew(mesh)
+    ),
+    mesh_(mesh)
+{
+    if
+    (
+        Pstream::parRun()
+     &&
+     (
+        regIOobject::fileModificationChecking == timeStampMaster
+     || regIOobject::fileModificationChecking == inotifyMaster
+     )
     )
-{}
+    {
+        WarningIn("MRFZones(const fvMesh&)")
+            << "The MRFZones are not run time modifiable\n"
+            << "    using 'timeStampMaster' or 'inotifyMaster'\n"
+            << "    for the entry fileModificationChecking\n"
+            << "    in the etc/controlDict.\n"
+            << "    Use 'timeStamp' instead."
+            << endl;
+    }
+}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
@@ -161,4 +181,11 @@ void Foam::MRFZones::correctBoundaryVelocity(volVectorField& U) const
 }
 
 
+bool Foam::MRFZones::readData(Istream& is)
+{
+    PtrList<MRFZone>::read(is, MRFZone::iNew(mesh_));
+    return is.good();
+}
+
+
 // ************************************************************************* //
diff --git a/src/finiteVolume/cfdTools/general/MRF/MRFZones.H b/src/finiteVolume/cfdTools/general/MRF/MRFZones.H
index 8df9d428be..f5b43bce29 100644
--- a/src/finiteVolume/cfdTools/general/MRF/MRFZones.H
+++ b/src/finiteVolume/cfdTools/general/MRF/MRFZones.H
@@ -52,6 +52,11 @@ class MRFZones
 :
     public IOPtrList<MRFZone>
 {
+    // Private data
+
+        //- Reference to mesh
+        const fvMesh& mesh_;
+
 
     // Private Member Functions
 
@@ -109,6 +114,13 @@ public:
 
         //- Correct the boundary velocity for the roation of the MRF region
         void correctBoundaryVelocity(volVectorField& U) const;
+
+
+    // I-O
+
+        //- Read from Istream
+        virtual bool readData(Istream&);
+
 };
 
 

From 64a73cb45eb79d9e8d4a6e15122bfa536711e57d Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Wed, 4 Apr 2012 16:03:39 +0100
Subject: [PATCH 159/317] ENH: cvMeshSurfaceSimplify: use octree version

---
 .../cvMesh/cvMeshSurfaceSimplify/Make/files   |    18 +-
 .../cvMesh/cvMeshSurfaceSimplify/Make/options |     8 +-
 .../MarchingCubes/MarchingCubes.h             |   343 -
 .../cvMeshSurfaceSimplify/MarchingCubes/ply.c |  3325 -----
 .../cvMeshSurfaceSimplify/MarchingCubes/ply.h |   233 -
 .../cvMeshSurfaceSimplify.C                   |   497 +-
 .../cvMeshSurfaceSimplify_non_octree.C        |   352 +
 .../fastdualoctree_sgp/.DS_Store              |   Bin 0 -> 6148 bytes
 .../fastdualoctree_sgp/CMakeLists.txt         |    96 +
 .../fastdualoctree_sgp/Doxyfile               |  1551 +++
 .../LookUpTable.h                             |   107 +-
 .../MarchingCubes.cpp                         |  2152 ++-
 .../fastdualoctree_sgp/MarchingCubes.h        |   182 +
 .../fastdualoctree_sgp/README.txt             |   123 +
 .../fastdualoctree_sgp/cube.h                 |   256 +
 .../fastdualoctree_sgp/data_access.cpp        |   266 +
 .../fastdualoctree_sgp/data_access.h          |   192 +
 .../fp_identifier_parser.inc                  |   292 +
 .../fastdualoctree_sgp/fp_opcode_add.inc      |  4279 ++++++
 .../fastdualoctree_sgp/fparser.cpp            |  3070 +++++
 .../fastdualoctree_sgp/fparser.h              |   159 +
 .../fastdualoctree_sgp/fpaux.h                |   599 +
 .../fastdualoctree_sgp/fpconfig.h             |   139 +
 .../fastdualoctree_sgp/fpoptimizer.cpp        | 10948 ++++++++++++++++
 .../fastdualoctree_sgp/fptypes.h              |   267 +
 .../fastdualoctree_sgp/hash.h                 |    46 +
 .../fastdualoctree_sgp/hash_noptr.h           |   251 +
 .../fastdualoctree_sgp/hash_octree.cpp        |  1356 ++
 .../fastdualoctree_sgp/hash_octree.h          |   352 +
 .../fastdualoctree_sgp/hash_ptr.h             |   292 +
 .../fastdualoctree_sgp/implfuns.h             |   101 +
 .../fastdualoctree_sgp/leaf_octree.cpp        |  1120 ++
 .../fastdualoctree_sgp/leaf_octree.h          |   332 +
 .../fastdualoctree_sgp/mc_draw.cpp            |   695 +
 .../fastdualoctree_sgp/mc_draw.h              |   116 +
 .../fastdualoctree_sgp/mem_octree.cpp         |  1111 ++
 .../fastdualoctree_sgp/mem_octree.h           |   367 +
 .../fastdualoctree_sgp/mlist.h                |   502 +
 .../fastdualoctree_sgp/morton.cpp             |   458 +
 .../fastdualoctree_sgp/morton.h               |    62 +
 .../fastdualoctree_sgp/mvector.h              |   261 +
 .../fastdualoctree_sgp/opt_octree.cpp         |  1121 ++
 .../fastdualoctree_sgp/opt_octree.h           |   376 +
 .../fastdualoctree_sgp/perf_main.cpp          |   265 +
 .../fastdualoctree_sgp/point.h                |   289 +
 .../fastdualoctree_sgp/ptr_octree.cpp         |  1289 ++
 .../fastdualoctree_sgp/ptr_octree.h           |   400 +
 .../fastdualoctree_sgp/viz_glui_cmdline.cpp   |    71 +
 .../fastdualoctree_sgp/viz_glui_controls.cpp  |   346 +
 .../fastdualoctree_sgp/viz_glui_defs.h        |   361 +
 .../fastdualoctree_sgp/viz_glui_draws.cpp     |   321 +
 .../fastdualoctree_sgp/viz_glui_export.cpp    |   323 +
 .../fastdualoctree_sgp/viz_glui_main.cpp      |   189 +
 .../fastdualoctree_sgp/viz_glui_mouse.cpp     |   312 +
 .../marching_cubes_jgt.zip                    |   Bin 170157 -> 0 bytes
 55 files changed, 37172 insertions(+), 5367 deletions(-)
 delete mode 100755 applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/MarchingCubes/MarchingCubes.h
 delete mode 100755 applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/MarchingCubes/ply.c
 delete mode 100755 applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/MarchingCubes/ply.h
 create mode 100644 applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/cvMeshSurfaceSimplify_non_octree.C
 create mode 100644 applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/.DS_Store
 create mode 100644 applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/CMakeLists.txt
 create mode 100644 applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/Doxyfile
 rename applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/{MarchingCubes => fastdualoctree_sgp}/LookUpTable.h (99%)
 mode change 100755 => 100644
 rename applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/{MarchingCubes => fastdualoctree_sgp}/MarchingCubes.cpp (50%)
 mode change 100755 => 100644
 create mode 100644 applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/MarchingCubes.h
 create mode 100644 applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/README.txt
 create mode 100644 applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/cube.h
 create mode 100644 applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/data_access.cpp
 create mode 100644 applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/data_access.h
 create mode 100644 applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/fp_identifier_parser.inc
 create mode 100644 applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/fp_opcode_add.inc
 create mode 100644 applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/fparser.cpp
 create mode 100644 applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/fparser.h
 create mode 100644 applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/fpaux.h
 create mode 100644 applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/fpconfig.h
 create mode 100644 applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/fpoptimizer.cpp
 create mode 100644 applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/fptypes.h
 create mode 100644 applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/hash.h
 create mode 100644 applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/hash_noptr.h
 create mode 100644 applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/hash_octree.cpp
 create mode 100644 applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/hash_octree.h
 create mode 100644 applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/hash_ptr.h
 create mode 100644 applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/implfuns.h
 create mode 100644 applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/leaf_octree.cpp
 create mode 100644 applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/leaf_octree.h
 create mode 100644 applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/mc_draw.cpp
 create mode 100644 applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/mc_draw.h
 create mode 100644 applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/mem_octree.cpp
 create mode 100644 applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/mem_octree.h
 create mode 100644 applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/mlist.h
 create mode 100644 applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/morton.cpp
 create mode 100644 applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/morton.h
 create mode 100644 applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/mvector.h
 create mode 100644 applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/opt_octree.cpp
 create mode 100644 applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/opt_octree.h
 create mode 100644 applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/perf_main.cpp
 create mode 100644 applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/point.h
 create mode 100644 applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/ptr_octree.cpp
 create mode 100644 applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/ptr_octree.h
 create mode 100644 applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/viz_glui_cmdline.cpp
 create mode 100644 applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/viz_glui_controls.cpp
 create mode 100644 applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/viz_glui_defs.h
 create mode 100644 applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/viz_glui_draws.cpp
 create mode 100644 applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/viz_glui_export.cpp
 create mode 100644 applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/viz_glui_main.cpp
 create mode 100644 applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/viz_glui_mouse.cpp
 delete mode 100644 applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/marching_cubes_jgt.zip

diff --git a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/Make/files b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/Make/files
index a0fcd8f0bf..3d9e676a3e 100644
--- a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/Make/files
+++ b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/Make/files
@@ -1,6 +1,20 @@
-cvMeshSurfaceSimplify.C
-
+/*
+cvMeshSurfaceSimplify_non_octree.C
 MarchingCubes/MarchingCubes.cpp
 MarchingCubes/ply.c
+*/
+
+MarchingCubes = fastdualoctree_sgp
+
+$(MarchingCubes)/data_access.cpp
+$(MarchingCubes)/fparser.cpp
+$(MarchingCubes)/fpoptimizer.cpp
+$(MarchingCubes)/MarchingCubes.cpp
+$(MarchingCubes)/mc_draw.cpp
+$(MarchingCubes)/morton.cpp
+$(MarchingCubes)/opt_octree.cpp
+$(MarchingCubes)/hash_octree.cpp
+
+cvMeshSurfaceSimplify.C
 
 EXE = $(FOAM_APPBIN)/cvMeshSurfaceSimplify
diff --git a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/Make/options b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/Make/options
index 1711b9ba61..5118e3d004 100644
--- a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/Make/options
+++ b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/Make/options
@@ -1,7 +1,12 @@
+MarchingCubes = fastdualoctree_sgp
+
 include $(GENERAL_RULES)/CGAL
 
 EXE_INC = \
-    -IMarchingCubes \
+    -DUNIX \
+    -Wno-old-style-cast \
+    /* -IMarchingCubes */ \
+    -I$(MarchingCubes) \
     -I../conformalVoronoiMesh/lnInclude \
     -I$(LIB_SRC)/edgeMesh/lnInclude \
     -I$(LIB_SRC)/triSurface/lnInclude \
@@ -9,6 +14,7 @@ EXE_INC = \
 
 EXE_LIBS = \
     $(CGAL_LIBS) \
+    -lGL \
     -lconformalVoronoiMesh \
     -ldecompositionMethods -L$(FOAM_LIBBIN)/dummy -lscotchDecomp \
     -ledgeMesh \
diff --git a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/MarchingCubes/MarchingCubes.h b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/MarchingCubes/MarchingCubes.h
deleted file mode 100755
index c589bffb7f..0000000000
--- a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/MarchingCubes/MarchingCubes.h
+++ /dev/null
@@ -1,343 +0,0 @@
-/**
- * @file    MarchingCubes.h
- * @author  Thomas Lewiner <thomas.lewiner@polytechnique.org>
- * @author  Math Dept, PUC-Rio
- * @version 0.2
- * @date    12/08/2002
- *
- * @brief   MarchingCubes Algorithm
- */
-//________________________________________________
-
-
-#ifndef _MARCHINGCUBES_H_
-#define _MARCHINGCUBES_H_
-
-#if !defined(WIN32) || defined(__CYGWIN__)
-#pragma interface
-#endif // WIN32
-
-
-//_____________________________________________________________________________
-// types
-/** unsigned char alias */
-typedef unsigned char uchar ;
-/** signed char alias */
-typedef   signed char schar ;
-/** isovalue alias */
-typedef        float real  ;
-
-//-----------------------------------------------------------------------------
-// Vertex structure
-/** \struct Vertex "MarchingCubes.h" MarchingCubes
- * Position and normal of a vertex
- * \brief vertex structure
- * \param x X coordinate
- * \param y Y coordinate
- * \param z Z coordinate
- * \param nx X component of the normal
- * \param ny Y component of the normal
- * \param nz Z component of the normal
- */
-typedef struct
-{
-  real  x,  y,  z ;  /**< Vertex coordinates */
-  real nx, ny, nz ;  /**< Vertex normal */
-} Vertex ;
-
-//-----------------------------------------------------------------------------
-// Triangle structure
-/** \struct Triangle "MarchingCubes.h" MarchingCubes
- * Indices of the oriented triange vertices
- * \brief triangle structure
- * \param v1 First vertex index
- * \param v2 Second vertex index
- * \param v3 Third vertex index
- */
-typedef struct
-{
-  int v1,v2,v3 ;  /**< Triangle vertices */
-} Triangle ;
-//_____________________________________________________________________________
-
-
-
-//_____________________________________________________________________________
-/** Marching Cubes algorithm wrapper */
-/** \class MarchingCubes
-  * \brief Marching Cubes algorithm.
-  */
-class MarchingCubes
-//-----------------------------------------------------------------------------
-{
-// Constructors
-public :
-  /**
-   * Main and default constructor
-   * \brief constructor
-   * \param size_x width  of the grid
-   * \param size_y depth  of the grid
-   * \param size_z height of the grid
-   */
-  MarchingCubes ( const int size_x = -1, const int size_y = -1, const int size_z = -1 ) ;
-  /** Destructor */
-  ~MarchingCubes() ;
-
-//-----------------------------------------------------------------------------
-// Accessors
-public :
-  /** accesses the number of vertices of the generated mesh */
-  inline const int nverts() const { return _nverts ; }
-  /** accesses the number of triangles of the generated mesh */
-  inline const int ntrigs() const { return _ntrigs ; }
-  /** accesses a specific vertex of the generated mesh */
-  inline Vertex   * vert( const int i ) const { if( i < 0  || i >= _nverts ) return ( Vertex *)NULL ; return _vertices  + i ; }
-  /** accesses a specific triangle of the generated mesh */
-  inline Triangle * trig( const int i ) const { if( i < 0  || i >= _ntrigs ) return (Triangle*)NULL ; return _triangles + i ; }
-
-  /** accesses the vertex buffer of the generated mesh */
-  inline Vertex   *vertices () { return _vertices  ; }
-  /** accesses the triangle buffer of the generated mesh */
-  inline Triangle *triangles() { return _triangles ; }
-
-  /**  accesses the width  of the grid */
-  inline const int size_x() const { return _size_x ; }
-  /**  accesses the depth  of the grid */
-  inline const int size_y() const { return _size_y ; }
-  /**  accesses the height of the grid */
-  inline const int size_z() const { return _size_z ; }
-
-  /**
-   * changes the size of the grid
-   * \param size_x width  of the grid
-   * \param size_y depth  of the grid
-   * \param size_z height of the grid
-   */
-  inline void set_resolution( const int size_x, const int size_y, const int size_z ) { _size_x = size_x ;  _size_y = size_y ;  _size_z = size_z ; }
-  /**
-   * selects wether the algorithm will use the enhanced topologically controlled lookup table or the original MarchingCubes
-   * \param originalMC true for the original Marching Cubes
-   */
-  inline void set_method    ( const bool originalMC = false ) { _originalMC = originalMC ; }
-  /**
-   * selects to use data from another class
-   * \param data is the pointer to the external data, allocated as a size_x*size_y*size_z vector running in x first
-   */
-  inline void set_ext_data  ( real *data )
-  { if( !_ext_data ) delete [] _data ;  _ext_data = data != NULL ;  if( _ext_data ) _data = data ; }
-  /**
-   * selects to allocate data
-   */
-  inline void set_int_data  () { _ext_data = false ;  _data = NULL ; }
-
-  // Data access
-  /**
-   * accesses a specific cube of the grid
-   * \param i abscisse of the cube
-   * \param j ordinate of the cube
-   * \param k height of the cube
-   */
-  inline const real get_data  ( const int i, const int j, const int k ) const { return _data[ i + j*_size_x + k*_size_x*_size_y] ; }
-  /**
-   * sets a specific cube of the grid
-   * \param val new value for the cube
-   * \param i abscisse of the cube
-   * \param j ordinate of the cube
-   * \param k height of the cube
-   */
-  inline void  set_data  ( const real val, const int i, const int j, const int k ) { _data[ i + j*_size_x + k*_size_x*_size_y] = val ; }
-
-  // Data initialization
-  /** inits temporary structures (must set sizes before call) : the grid and the vertex index per cube */
-  void init_temps () ;
-  /** inits all structures (must set sizes before call) : the temporary structures and the mesh buffers */
-  void init_all   () ;
-  /** clears temporary structures : the grid and the main */
-  void clean_temps() ;
-  /** clears all structures : the temporary structures and the mesh buffers */
-  void clean_all  () ;
-
-
-//-----------------------------------------------------------------------------
-// Exportation
-public :
-  /**
-   * PLY exportation of the generated mesh
-   * \param fn  name of the PLY file to create
-   * \param bin if true, the PLY will be written in binary mode
-   */
-  void writePLY( const char *fn, bool bin = false ) ;
-
-  /**
-   * PLY importation of a mesh
-   * \param fn  name of the PLY file to read from
-   */
-  void readPLY( const char *fn ) ;
-
-  /**
-   * VRML / Open Inventor exportation of the generated mesh
-   * \param fn  name of the IV file to create
-   */
-  void writeIV ( const char *fn ) ;
-
-  /**
-   * ISO exportation of the input grid
-   * \param fn  name of the ISO file to create
-   */
-  void writeISO( const char *fn ) ;
-
-
-//-----------------------------------------------------------------------------
-// Algorithm
-public :
-  /**
-   * Main algorithm : must be called after init_all
-   * \param iso isovalue
-   */
-  void run( real iso = (real)0.0 ) ;
-
-protected :
-  /** tesselates one cube */
-  void process_cube ()             ;
-  /** tests if the components of the tesselation of the cube should be connected by the interior of an ambiguous face */
-  bool test_face    ( schar face ) ;
-  /** tests if the components of the tesselation of the cube should be connected through the interior of the cube */
-  bool test_interior( schar s )    ;
-
-
-//-----------------------------------------------------------------------------
-// Operations
-protected :
-  /**
-   * computes almost all the vertices of the mesh by interpolation along the cubes edges
-   * \param iso isovalue
-   */
-  void compute_intersection_points( real iso ) ;
-
-  /**
-   * routine to add a triangle to the mesh
-   * \param trig the code for the triangle as a sequence of edges index
-   * \param n    the number of triangles to produce
-   * \param v12  the index of the interior vertex to use, if necessary
-   */
-  void add_triangle ( const char* trig, char n, int v12 = -1 ) ;
-
-  /** tests and eventually doubles the vertex buffer capacity for a new vertex insertion */
-  void test_vertex_addition() ;
-  /** adds a vertex on the current horizontal edge */
-  int add_x_vertex() ;
-  /** adds a vertex on the current longitudinal edge */
-  int add_y_vertex() ;
-  /** adds a vertex on the current vertical edge */
-  int add_z_vertex() ;
-  /** adds a vertex inside the current cube */
-  int add_c_vertex() ;
-
-  /**
-   * interpolates the horizontal gradient of the implicit function at the lower vertex of the specified cube
-   * \param i abscisse of the cube
-   * \param j ordinate of the cube
-   * \param k height of the cube
-   */
-  real get_x_grad( const int i, const int j, const int k ) const ;
-  /**
-   * interpolates the longitudinal gradient of the implicit function at the lower vertex of the specified cube
-   * \param i abscisse of the cube
-   * \param j ordinate of the cube
-   * \param k height of the cube
-   */
-  real get_y_grad( const int i, const int j, const int k ) const ;
-  /**
-   * interpolates the vertical gradient of the implicit function at the lower vertex of the specified cube
-   * \param i abscisse of the cube
-   * \param j ordinate of the cube
-   * \param k height of the cube
-   */
-  real get_z_grad( const int i, const int j, const int k ) const ;
-
-  /**
-   * accesses the pre-computed vertex index on the lower horizontal edge of a specific cube
-   * \param i abscisse of the cube
-   * \param j ordinate of the cube
-   * \param k height of the cube
-   */
-  inline int   get_x_vert( const int i, const int j, const int k ) const { return _x_verts[ i + j*_size_x + k*_size_x*_size_y] ; }
-  /**
-   * accesses the pre-computed vertex index on the lower longitudinal edge of a specific cube
-   * \param i abscisse of the cube
-   * \param j ordinate of the cube
-   * \param k height of the cube
-   */
-  inline int   get_y_vert( const int i, const int j, const int k ) const { return _y_verts[ i + j*_size_x + k*_size_x*_size_y] ; }
-  /**
-   * accesses the pre-computed vertex index on the lower vertical edge of a specific cube
-   * \param i abscisse of the cube
-   * \param j ordinate of the cube
-   * \param k height of the cube
-   */
-  inline int   get_z_vert( const int i, const int j, const int k ) const { return _z_verts[ i + j*_size_x + k*_size_x*_size_y] ; }
-
-  /**
-   * sets the pre-computed vertex index on the lower horizontal edge of a specific cube
-   * \param val the index of the new vertex
-   * \param i abscisse of the cube
-   * \param j ordinate of the cube
-   * \param k height of the cube
-   */
-  inline void  set_x_vert( const int val, const int i, const int j, const int k ) { _x_verts[ i + j*_size_x + k*_size_x*_size_y] = val ; }
-  /**
-   * sets the pre-computed vertex index on the lower longitudinal edge of a specific cube
-   * \param val the index of the new vertex
-   * \param i abscisse of the cube
-   * \param j ordinate of the cube
-   * \param k height of the cube
-   */
-  inline void  set_y_vert( const int val, const int i, const int j, const int k ) { _y_verts[ i + j*_size_x + k*_size_x*_size_y] = val ; }
-  /**
-   * sets the pre-computed vertex index on the lower vertical edge of a specific cube
-   * \param val the index of the new vertex
-   * \param i abscisse of the cube
-   * \param j ordinate of the cube
-   * \param k height of the cube
-   */
-  inline void  set_z_vert( const int val, const int i, const int j, const int k ) { _z_verts[ i + j*_size_x + k*_size_x*_size_y] = val ; }
-
-  /** prints cube for debug */
-  void print_cube() ;
-
-//-----------------------------------------------------------------------------
-// Elements
-protected :
-  bool      _originalMC ;   /**< selects wether the algorithm will use the enhanced topologically controlled lookup table or the original MarchingCubes */
-  bool      _ext_data   ;   /**< selects wether to allocate data or use data from another class */
-
-  int       _size_x     ;  /**< width  of the grid */
-  int       _size_y     ;  /**< depth  of the grid */
-  int       _size_z     ;  /**< height of the grid */
-  real     *_data       ;  /**< implicit function values sampled on the grid */
-
-  int      *_x_verts    ;  /**< pre-computed vertex indices on the lower horizontal   edge of each cube */
-  int      *_y_verts    ;  /**< pre-computed vertex indices on the lower longitudinal edge of each cube */
-  int      *_z_verts    ;  /**< pre-computed vertex indices on the lower vertical     edge of each cube */
-
-  int       _nverts     ;  /**< number of allocated vertices  in the vertex   buffer */
-  int       _ntrigs     ;  /**< number of allocated triangles in the triangle buffer */
-  int       _Nverts     ;  /**< size of the vertex   buffer */
-  int       _Ntrigs     ;  /**< size of the triangle buffer */
-  Vertex   *_vertices   ;  /**< vertex   buffer */
-  Triangle *_triangles  ;  /**< triangle buffer */
-
-  int       _i          ;  /**< abscisse of the active cube */
-  int       _j          ;  /**< height of the active cube */
-  int       _k          ;  /**< ordinate of the active cube */
-
-  real      _cube[8]    ;  /**< values of the implicit function on the active cube */
-  uchar     _lut_entry  ;  /**< cube sign representation in [0..255] */
-  uchar     _case       ;  /**< case of the active cube in [0..15] */
-  uchar     _config     ;  /**< configuration of the active cube */
-  uchar     _subconfig  ;  /**< subconfiguration of the active cube */
-};
-//_____________________________________________________________________________
-
-
-#endif // _MARCHINGCUBES_H_
diff --git a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/MarchingCubes/ply.c b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/MarchingCubes/ply.c
deleted file mode 100755
index 06c60f4dbb..0000000000
--- a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/MarchingCubes/ply.c
+++ /dev/null
@@ -1,3325 +0,0 @@
-/*
-
-The interface routines for reading and writing PLY polygon files.
-
-Greg Turk
-
----------------------------------------------------------------
-
-A PLY file contains a single polygonal _object_.
-
-An object is composed of lists of _elements_.  Typical elements are
-vertices, faces, edges and materials.
-
-Each type of element for a given object has one or more _properties_
-associated with the element type.  For instance, a vertex element may
-have as properties the floating-point values x,y,z and the three unsigned
-chars representing red, green and blue.
-
------------------------------------------------------------------------
-
-Copyright (c) 1998 Georgia Institute of Technology.  All rights reserved.
-
-Permission to use, copy, modify and distribute this software and its
-documentation for any purpose is hereby granted without fee, provided
-that the above copyright notice and this permission notice appear in
-all copies of this software and that you do not sell the software.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND WITHOUT WARRANTY OF ANY KIND,
-EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
-WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
-
-*/
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <math.h>
-#include <string.h>
-#include "ply.h"
-
-char *type_names[]      = {  /* names of scalar types */
-"invalid",
-"int8", "int16", "int32", "uint8", "uint16", "uint32", "float32", "float64",
-};
-
-char *old_type_names[]  = {  /* old names of types for backward compatability */
-"invalid",
-"char", "short", "int", "uchar", "ushort", "uint", "float", "double",
-};
-
-int   ply_type_size[]   = {
-0, 1, 2, 4, 1, 2, 4, 4, 8
-};
-
-#define NO_OTHER_PROPS  -1
-
-#define DONT_STORE_PROP  0
-#define STORE_PROP       1
-
-#define OTHER_PROP       0
-#define NAMED_PROP       1
-
-/* returns 1 if strings are equal, 0 if not */
-int           equal_strings( char * , char * );
-
-/* find an element in a plyfile's list */
-PlyElement   *find_element( PlyFile * , char * );
-
-/* find a property in an element's list */
-PlyProperty  *find_property( PlyElement * , char * , int * );
-
-/* write to a file the word describing a PLY file data type */
-void          write_scalar_type( FILE * , int );
-
-/* read a line from a file and break it up into separate words */
-char*        *get_words( FILE * , int * , char ** );
-
-/* write an item to a file */
-void          write_binary_item( FILE * , int, unsigned int, double, int );
-void          write_ascii_item( FILE * , int, unsigned int, double, int );
-
-/* add information to a PLY file descriptor */
-void          add_element( PlyFile * , char ** , int );
-void          add_property( PlyFile * , char ** , int );
-void          add_comment( PlyFile * , char * );
-void          add_obj_info( PlyFile * , char * );
-
-/* copy a property */
-void          copy_property( PlyProperty * , PlyProperty * );
-
-/* store a value into where a pointer and a type specify */
-void          store_item( char * , int, int, unsigned int, double );
-
-/* return the value of a stored item */
-void          get_stored_item( void * , int, int * , unsigned int * , double * );
-
-/* return the value stored in an item, given ptr to it and its type */
-double        get_item_value( char * , int );
-
-/* get binary or ascii item and store it according to ptr and type */
-void          get_ascii_item( char * , int, int * , unsigned int * , double * );
-void          get_binary_item( FILE * , int, int * , unsigned int * , double * );
-
-/* get a bunch of elements from a file */
-void          ascii_get_element( PlyFile * , char * );
-void          binary_get_element( PlyFile * , char * );
-
-/* memory allocation */
-static char  *my_alloc( int, int, char * );
-
-
-/*************/
-/*  Writing  */
-/*************/
-
-
-/******************************************************************************
-Given a file pointer, get ready to write PLY data to the file.
-
-Entry:
-fp         - the given file pointer
-nelems     - number of elements in object
-elem_names - list of element names
-file_type  - file type, either ascii or binary
-
-Exit:
-returns a pointer to a PlyFile, used to refer to this file, or NULL if error
-******************************************************************************/
-
-PlyFile *ply_write( FILE *fp, int nelems, char **elem_names, int file_type )
-{
-  int         i;
-  PlyFile    *plyfile;
-  PlyElement *elem;
-
-  /* check for NULL file pointer */
-  if ( fp == NULL )
-    return ( NULL );
-
-  /* create a record for this object */
-
-  plyfile = ( PlyFile *  ) myalloc ( sizeof ( PlyFile ) );
-  plyfile->file_type = file_type;
-  plyfile->num_comments = 0;
-  plyfile->num_obj_info = 0;
-  plyfile->num_elem_types = nelems;
-  plyfile->version = 1.0;
-  plyfile->fp = fp;
-  plyfile->other_elems = NULL;
-
-  /* tuck aside the names of the elements */
-
-  plyfile->elems = ( PlyElement *  *  ) myalloc ( sizeof ( PlyElement *  ) * nelems );
-  for ( i = 0; i < nelems; i++ )
-  {
-    elem = ( PlyElement *  ) myalloc ( sizeof ( PlyElement ) );
-    plyfile->elems[i] = elem;
-    elem->name = strdup ( elem_names[i] );
-    elem->num = 0;
-    elem->nprops = 0;
-  }
-
-  /* return pointer to the file descriptor */
-  return ( plyfile );
-}
-
-
-/******************************************************************************
-Open a polygon file for writing.
-
-Entry:
-filename   - name of file to read from
-nelems     - number of elements in object
-elem_names - list of element names
-file_type  - file type, either ascii or binary
-
-Exit:
-returns a file identifier, used to refer to this file, or NULL if error
-******************************************************************************/
-
-PlyFile *open_for_writing_ply( char *filename, int nelems, char **elem_names, int file_type )
-{
-  PlyFile  *plyfile;
-  char     *name;
-  FILE     *fp;
-
-  /* tack on the extension .ply, if necessary */
-
-  name = ( char * ) myalloc ( sizeof ( char ) * ( strlen ( filename ) + 5 ) );
-  strcpy ( name, filename );
-  if ( strlen ( name ) < 4 || strcmp ( name + strlen ( name ) - 4, ".ply" ) != 0 )
-    strcat ( name, ".ply" );
-
-  /* open the file for writing */
-
-  fp = fopen ( name, "w" );
-  if ( fp == NULL )
-  {
-    return ( NULL );
-  }
-
-  /* create the actual PlyFile structure */
-
-  plyfile = ply_write ( fp, nelems, elem_names, file_type );
-  if ( plyfile == NULL )
-    return ( NULL );
-
-  /* return pointer to the file descriptor */
-  return ( plyfile );
-}
-
-
-/******************************************************************************
-Describe an element, including its properties and how many will be written
-to the file.
-
-Entry:
-plyfile   - file identifier
-elem_name - name of element that information is being specified about
-nelems    - number of elements of this type to be written
-nprops    - number of properties contained in the element
-prop_list - list of properties
-******************************************************************************/
-
-void element_layout_ply( PlyFile *plyfile, char *elem_name, int nelems, int nprops, PlyProperty *prop_list )
-{
-  int           i;
-  PlyElement   *elem;
-  PlyProperty  *prop;
-
-  /* look for appropriate element */
-  elem = find_element ( plyfile, elem_name );
-  if ( elem == NULL )
-  {
-    fprintf( stderr,"element_layout_ply: can't find element '%s'\n",elem_name );
-    exit ( -1 );
-  }
-
-  elem->num = nelems;
-
-  /* copy the list of properties */
-
-  elem->nprops = nprops;
-  elem->props = ( PlyProperty *  *  ) myalloc ( sizeof ( PlyProperty *  ) * nprops );
-  elem->store_prop = ( char * ) myalloc ( sizeof ( char ) * nprops );
-
-  for ( i = 0; i < nprops; i++ )
-  {
-    prop = ( PlyProperty *  ) myalloc ( sizeof ( PlyProperty ) );
-    elem->props[i] = prop;
-    elem->store_prop[i] = NAMED_PROP;
-    copy_property ( prop, &prop_list[i] );
-  }
-}
-
-
-/******************************************************************************
-Describe a property of an element.
-
-Entry:
-plyfile   - file identifier
-elem_name - name of element that information is being specified about
-prop      - the new property
-******************************************************************************/
-
-void ply_describe_property( PlyFile *plyfile, char *elem_name, PlyProperty *prop )
-{
-  PlyElement   *elem;
-  PlyProperty  *elem_prop;
-
-  /* look for appropriate element */
-  elem = find_element ( plyfile, elem_name );
-  if ( elem == NULL )
-  {
-    fprintf( stderr, "ply_describe_property: can't find element '%s'\n",
-    elem_name );
-    return;
-  }
-
-  /* create room for new property */
-
-  if ( elem->nprops == 0 )
-  {
-    elem->props = ( PlyProperty *  *  ) myalloc ( sizeof ( PlyProperty *  ) );
-    elem->store_prop = ( char * ) myalloc ( sizeof ( char ) );
-    elem->nprops = 1;
-  }
-  else
-  {
-    elem->nprops++;
-    elem->props = ( PlyProperty *  *  )
-    realloc ( elem->props, sizeof ( PlyProperty *  ) * elem->nprops );
-    elem->store_prop = ( char * )
-    realloc ( elem->store_prop, sizeof ( char ) * elem->nprops );
-  }
-
-  /* copy the new property */
-
-  elem_prop = ( PlyProperty *  ) myalloc ( sizeof ( PlyProperty ) );
-  elem->props[elem->nprops - 1] = elem_prop;
-  elem->store_prop[elem->nprops - 1] = NAMED_PROP;
-  copy_property ( elem_prop, prop );
-}
-
-
-/******************************************************************************
-State how many of a given element will be written.
-
-Entry:
-plyfile   - file identifier
-elem_name - name of element that information is being specified about
-nelems    - number of elements of this type to be written
-******************************************************************************/
-
-void element_count_ply( PlyFile *plyfile, char *elem_name, int nelems )
-{
-  PlyElement *elem;
-
-  /* look for appropriate element */
-  elem = find_element ( plyfile, elem_name );
-  if ( elem == NULL )
-  {
-    fprintf( stderr,"element_count_ply: can't find element '%s'\n",elem_name );
-    exit ( -1 );
-  }
-
-  elem->num = nelems;
-}
-
-
-/******************************************************************************
-Signal that we've described everything a PLY file's header and that the
-header should be written to the file.
-
-Entry:
-plyfile - file identifier
-******************************************************************************/
-
-void header_complete_ply( PlyFile *plyfile )
-{
-  int           i,j;
-  FILE         *fp  = plyfile->fp;
-  PlyElement   *elem;
-  PlyProperty  *prop;
-
-  fprintf ( fp, "ply\n" );
-
-  switch ( plyfile->file_type )
-  {
-    case PLY_ASCII:
-      fprintf ( fp, "format ascii 1.0\n" );
-      break;
-    case PLY_BINARY_BE:
-      fprintf ( fp, "format binary_big_endian 1.0\n" );
-      break;
-    case PLY_BINARY_LE:
-      fprintf ( fp, "format binary_little_endian 1.0\n" );
-      break;
-    default:
-      fprintf ( stderr, "ply_header_complete: bad file type = %d\n",
-      plyfile->file_type );
-      exit ( -1 );
-  }
-
-  /* write out the comments */
-
-  for ( i = 0; i < plyfile->num_comments; i++ )
-    fprintf ( fp, "comment %s\n", plyfile->comments[i] );
-
-  /* write out object information */
-
-  for ( i = 0; i < plyfile->num_obj_info; i++ )
-    fprintf ( fp, "obj_info %s\n", plyfile->obj_info[i] );
-
-  /* write out information about each element */
-
-  for ( i = 0; i < plyfile->num_elem_types; i++ )
-  {
-    elem = plyfile->elems[i];
-    fprintf ( fp, "element %s %d\n", elem->name, elem->num );
-
-    /* write out each property */
-    for ( j = 0; j < elem->nprops; j++ )
-    {
-      prop = elem->props[j];
-      if ( prop->is_list == PLY_LIST )
-      {
-        fprintf ( fp, "property list " );
-        write_scalar_type ( fp, prop->count_external );
-        fprintf ( fp, " " );
-        write_scalar_type ( fp, prop->external_type );
-        fprintf ( fp, " %s\n", prop->name );
-      }
-      else if ( prop->is_list == PLY_STRING )
-      {
-        fprintf ( fp, "property string" );
-        fprintf ( fp, " %s\n", prop->name );
-      }
-      else
-      {
-        fprintf ( fp, "property " );
-        write_scalar_type ( fp, prop->external_type );
-        fprintf ( fp, " %s\n", prop->name );
-      }
-    }
-  }
-
-  fprintf ( fp, "end_header\n" );
-}
-
-
-/******************************************************************************
-Specify which elements are going to be written.  This should be called
-before a call to the routine ply_put_element().
-
-Entry:
-plyfile   - file identifier
-elem_name - name of element we're talking about
-******************************************************************************/
-
-void put_element_setup_ply( PlyFile *plyfile, char *elem_name )
-{
-  PlyElement *elem;
-
-  elem = find_element ( plyfile, elem_name );
-  if ( elem == NULL )
-  {
-    fprintf( stderr, "put_element_setup_ply: can't find element '%s'\n", elem_name );
-    exit ( -1 );
-  }
-
-  plyfile->which_elem = elem;
-}
-
-
-/******************************************************************************
-Write an element to the file.  This routine assumes that we're
-writing the type of element specified in the last call to the routine
-put_element_setup_ply().
-
-Entry:
-plyfile  - file identifier
-elem_ptr - pointer to the element
-******************************************************************************/
-
-void put_element_ply( PlyFile *plyfile, void *elem_ptr )
-{
-  int           j,k;
-  FILE         *fp  = plyfile->fp;
-  PlyElement   *elem;
-  PlyProperty  *prop;
-  char         *item;
-  char         *elem_data;
-  char*        *item_ptr;
-  int           list_count;
-  int           item_size;
-  int           int_val;
-  unsigned int uint_val;
-  double  double_val;
-  char*  *other_ptr;
-
-  elem = plyfile->which_elem;
-  elem_data = ( char * ) elem_ptr;
-  other_ptr = ( char * *  ) ( ( ( char * ) elem_ptr ) + elem->other_offset );
-
-  /* write out either to an ascii or binary file */
-
-  if ( plyfile->file_type == PLY_ASCII )
-  {
-    /* write an ascii file */
-
-    /* write out each property of the element */
-    for ( j = 0; j < elem->nprops; j++ )
-    {
-      prop = elem->props[j];
-
-      if ( elem->store_prop[j] == OTHER_PROP )
-        elem_data = *other_ptr;
-      else
-        elem_data = ( char * ) elem_ptr;
-
-      if ( prop->is_list == PLY_LIST )
-      {
-        /* list */
-        item = elem_data + prop->count_offset;
-        get_stored_item ( ( void * ) item, prop->count_internal,
-        &int_val, &uint_val, &double_val );
-        write_ascii_item ( fp, int_val, uint_val, double_val,
-        prop->count_external );
-        list_count = uint_val;
-        item_ptr = ( char * *  ) ( elem_data + prop->offset );
-        item = item_ptr[0];
-        item_size = ply_type_size[prop->internal_type];
-        for ( k = 0; k < list_count; k++ )
-        {
-          get_stored_item ( ( void * ) item, prop->internal_type,
-          &int_val, &uint_val, &double_val );
-          write_ascii_item ( fp, int_val, uint_val, double_val,
-          prop->external_type );
-          item += item_size;
-        }
-      }
-      else if ( prop->is_list == PLY_STRING )
-      {
-        /* string */
-        char*  *str;
-        item = elem_data + prop->offset;
-        str = ( char * *  ) item;
-        fprintf ( fp, "\"%s\"", *str );
-      }
-      else
-      {
-        /* scalar */
-        item = elem_data + prop->offset;
-        get_stored_item ( ( void * ) item, prop->internal_type,
-        &int_val, &uint_val, &double_val );
-        write_ascii_item ( fp, int_val, uint_val, double_val,
-        prop->external_type );
-      }
-    }
-
-    fprintf ( fp, "\n" );
-  }
-  else
-  {
-    /* write a binary file */
-
-    /* write out each property of the element */
-    for ( j = 0; j < elem->nprops; j++ )
-    {
-      prop = elem->props[j];
-      if ( elem->store_prop[j] == OTHER_PROP )
-        elem_data = *other_ptr;
-      else
-        elem_data = ( char * ) elem_ptr;
-      if ( prop->is_list == PLY_LIST )
-      {
-        /* list */
-        item = elem_data + prop->count_offset;
-        item_size = ply_type_size[prop->count_internal];
-        get_stored_item ( ( void * ) item, prop->count_internal,
-        &int_val, &uint_val, &double_val );
-        write_binary_item ( fp, int_val, uint_val, double_val,
-        prop->count_external );
-        list_count = uint_val;
-        item_ptr = ( char * *  ) ( elem_data + prop->offset );
-        item = item_ptr[0];
-        item_size = ply_type_size[prop->internal_type];
-        for ( k = 0; k < list_count; k++ )
-        {
-          get_stored_item ( ( void * ) item, prop->internal_type,
-          &int_val, &uint_val, &double_val );
-          write_binary_item ( fp, int_val, uint_val, double_val,
-          prop->external_type );
-          item += item_size;
-        }
-      }
-      else if ( prop->is_list == PLY_STRING )
-      {
-        /* string */
-        int     len;
-        char*  *str;
-        item = elem_data + prop->offset;
-        str = ( char * *  ) item;
-
-        /* write the length */
-        len = strlen( *str ) + 1;
-        fwrite ( &len, sizeof( int ), 1, fp );
-
-        /* write the string, including the null character */
-        fwrite ( *str, len, 1, fp );
-      }
-      else
-      {
-        /* scalar */
-        item = elem_data + prop->offset;
-        item_size = ply_type_size[prop->internal_type];
-        get_stored_item ( ( void * ) item, prop->internal_type,
-        &int_val, &uint_val, &double_val );
-        write_binary_item ( fp, int_val, uint_val, double_val,
-        prop->external_type );
-      }
-    }
-  }
-}
-
-
-
-
-
-
-/*************/
-/*  Reading  */
-/*************/
-
-
-
-/******************************************************************************
-Given a file pointer, get ready to read PLY data from the file.
-
-Entry:
-fp - the given file pointer
-
-Exit:
-nelems     - number of elements in object
-elem_names - list of element names
-returns a pointer to a PlyFile, used to refer to this file, or NULL if error
-******************************************************************************/
-
-PlyFile *ply_read( FILE *fp, int *nelems, char ***elem_names )
-{
-  int         i,j;
-  PlyFile    *plyfile;
-  int         nwords;
-  char*      *words;
-  int         found_format  = 0;
-  char*      *elist;
-  PlyElement *elem;
-  char       *orig_line;
-
-  /* check for NULL file pointer */
-  if ( fp == NULL )
-    return ( NULL );
-
-  /* create record for this object */
-
-  plyfile = ( PlyFile *  ) myalloc ( sizeof ( PlyFile ) );
-  plyfile->num_elem_types = 0;
-  plyfile->comments = NULL;
-  plyfile->num_comments = 0;
-  plyfile->obj_info = NULL;
-  plyfile->num_obj_info = 0;
-  plyfile->fp = fp;
-  plyfile->other_elems = NULL;
-  plyfile->rule_list = NULL;
-
-  /* read and parse the file's header */
-
-  words = get_words ( plyfile->fp, &nwords, &orig_line );
-  if ( !words || !equal_strings ( words[0], "ply" ) )
-    return ( NULL );
-
-  while ( words )
-  {
-    /* parse words */
-
-    if ( equal_strings ( words[0], "format" ) )
-    {
-      if ( nwords != 3 )
-        return ( NULL );
-      if ( equal_strings ( words[1], "ascii" ) )
-        plyfile->file_type = PLY_ASCII;
-      else if ( equal_strings ( words[1], "binary_big_endian" ) )
-        plyfile->file_type = PLY_BINARY_BE;
-      else if ( equal_strings ( words[1], "binary_little_endian" ) )
-        plyfile->file_type = PLY_BINARY_LE;
-      else
-        return ( NULL );
-      plyfile->version = ( float ) atof ( words[2] );
-      found_format = 1;
-    }
-    else if ( equal_strings ( words[0], "element" ) )
-      add_element ( plyfile, words, nwords );
-    else if ( equal_strings ( words[0], "property" ) )
-      add_property ( plyfile, words, nwords );
-    else if ( equal_strings ( words[0], "comment" ) )
-      add_comment ( plyfile, orig_line );
-    else if ( equal_strings ( words[0], "obj_info" ) )
-      add_obj_info ( plyfile, orig_line );
-    else if ( equal_strings ( words[0], "end_header" ) )
-      break;
-
-    /* free up words space */
-    free ( words );
-
-    words = get_words ( plyfile->fp, &nwords, &orig_line );
-  }
-
-  /* create tags for each property of each element, to be used */
-  /* later to say whether or not to store each property for the user */
-
-  for ( i = 0; i < plyfile->num_elem_types; i++ )
-  {
-    elem = plyfile->elems[i];
-    elem->store_prop = ( char * ) myalloc ( sizeof ( char ) * elem->nprops );
-    for ( j = 0; j < elem->nprops; j++ )
-      elem->store_prop[j] = DONT_STORE_PROP;
-    elem->other_offset = NO_OTHER_PROPS; /* no "other" props by default */
-  }
-
-  /* set return values about the elements */
-
-  elist = ( char * *  ) myalloc ( sizeof ( char * ) * plyfile->num_elem_types );
-  for ( i = 0; i < plyfile->num_elem_types; i++ )
-    elist[i] = strdup ( plyfile->elems[i]->name );
-
-  *elem_names = elist;
-  *nelems = plyfile->num_elem_types;
-
-  /* return a pointer to the file's information */
-
-  return ( plyfile );
-}
-
-
-/******************************************************************************
-Open a polygon file for reading.
-
-Entry:
-filename - name of file to read from
-
-Exit:
-nelems     - number of elements in object
-elem_names - list of element names
-file_type  - file type, either ascii or binary
-version    - version number of PLY file
-returns a file identifier, used to refer to this file, or NULL if error
-******************************************************************************/
-
-PlyFile *ply_open_for_reading( char *filename, int *nelems, char ***elem_names, int *file_type, float *version )
-{
-  FILE     *fp;
-  PlyFile  *plyfile;
-  char     *name;
-
-  /* tack on the extension .ply, if necessary */
-
-  name = ( char * ) myalloc ( sizeof ( char ) * ( strlen ( filename ) + 5 ) );
-  strcpy ( name, filename );
-  if ( strlen ( name ) < 4 || strcmp ( name + strlen ( name ) - 4, ".ply" ) != 0 )
-    strcat ( name, ".ply" );
-
-  /* open the file for reading */
-
-  fp = fopen ( name, "r" );
-  if ( fp == NULL )
-    return ( NULL );
-
-  /* create the PlyFile data structure */
-
-  plyfile = ply_read ( fp, nelems, elem_names );
-
-  /* determine the file type and version */
-
-  *file_type = plyfile->file_type;
-  *version = plyfile->version;
-
-  /* return a pointer to the file's information */
-
-  return ( plyfile );
-}
-
-
-/******************************************************************************
-Get information about a particular element.
-
-Entry:
-plyfile   - file identifier
-elem_name - name of element to get information about
-
-Exit:
-nelems   - number of elements of this type in the file
-nprops   - number of properties
-returns a list of properties, or NULL if the file doesn't contain that elem
-******************************************************************************/
-
-PlyProperty **get_element_description_ply( PlyFile *plyfile, char *elem_name, int *nelems, int *nprops )
-{
-  int             i;
-  PlyElement     *elem;
-  PlyProperty    *prop;
-  PlyProperty*   *prop_list;
-
-  /* find information about the element */
-  elem = find_element ( plyfile, elem_name );
-  if ( elem == NULL )
-    return ( NULL );
-
-  *nelems = elem->num;
-  *nprops = elem->nprops;
-
-  /* make a copy of the element's property list */
-  prop_list = ( PlyProperty *  *  ) myalloc ( sizeof ( PlyProperty *  ) * elem->nprops );
-  for ( i = 0; i < elem->nprops; i++ )
-  {
-    prop = ( PlyProperty *  ) myalloc ( sizeof ( PlyProperty ) );
-    copy_property ( prop, elem->props[i] );
-    prop_list[i] = prop;
-  }
-
-  /* return this duplicate property list */
-  return ( prop_list );
-}
-
-
-/******************************************************************************
-Specify which properties of an element are to be returned.  This should be
-called before a call to the routine get_element_ply().
-
-Entry:
-plyfile   - file identifier
-elem_name - which element we're talking about
-nprops    - number of properties
-prop_list - list of properties
-******************************************************************************/
-
-void get_element_setup_ply( PlyFile *plyfile, char *elem_name, int nprops, PlyProperty *prop_list )
-{
-  int           i;
-  PlyElement   *elem;
-  PlyProperty  *prop;
-  int           index;
-
-  /* find information about the element */
-  elem = find_element ( plyfile, elem_name );
-  plyfile->which_elem = elem;
-
-  /* deposit the property information into the element's description */
-  for ( i = 0; i < nprops; i++ )
-  {
-    /* look for actual property */
-    prop = find_property ( elem, prop_list[i].name, &index );
-    if ( prop == NULL )
-    {
-      fprintf ( stderr, "Warning:  Can't find property '%s' in element '%s'\n",
-      prop_list[i].name, elem_name );
-      continue;
-    }
-
-    /* store its description */
-    prop->internal_type = prop_list[i].internal_type;
-    prop->offset = prop_list[i].offset;
-    prop->count_internal = prop_list[i].count_internal;
-    prop->count_offset = prop_list[i].count_offset;
-
-    /* specify that the user wants this property */
-    elem->store_prop[index] = STORE_PROP;
-  }
-}
-
-
-/******************************************************************************
-Specify a property of an element that is to be returned.  This should be
-called (usually multiple times) before a call to the routine ply_get_element().
-This routine should be used in preference to the less flexible old routine
-called ply_get_element_setup().
-
-Entry:
-plyfile   - file identifier
-elem_name - which element we're talking about
-prop      - property to add to those that will be returned
-******************************************************************************/
-
-void ply_get_property( PlyFile *plyfile, char *elem_name, PlyProperty *prop )
-{
-  PlyElement   *elem;
-  PlyProperty  *prop_ptr;
-  int           index;
-
-  /* find information about the element */
-  elem = find_element ( plyfile, elem_name );
-  plyfile->which_elem = elem;
-
-  /* deposit the property information into the element's description */
-
-  prop_ptr = find_property ( elem, prop->name, &index );
-  if ( prop_ptr == NULL )
-  {
-    fprintf ( stderr, "Warning:  Can't find property '%s' in element '%s'\n",
-    prop->name, elem_name );
-    return;
-  }
-  prop_ptr->internal_type = prop->internal_type;
-  prop_ptr->offset = prop->offset;
-  prop_ptr->count_internal = prop->count_internal;
-  prop_ptr->count_offset = prop->count_offset;
-
-  /* specify that the user wants this property */
-  elem->store_prop[index] = STORE_PROP;
-}
-
-
-/******************************************************************************
-Read one element from the file.  This routine assumes that we're reading
-the type of element specified in the last call to the routine
-ply_get_element_setup().
-
-Entry:
-plyfile  - file identifier
-elem_ptr - pointer to location where the element information should be put
-******************************************************************************/
-
-void ply_get_element( PlyFile *plyfile, void *elem_ptr )
-{
-  if ( plyfile->file_type == PLY_ASCII )
-    ascii_get_element ( plyfile, ( char * ) elem_ptr );
-  else
-    binary_get_element ( plyfile, ( char * ) elem_ptr );
-}
-
-
-/******************************************************************************
-Extract the comments from the header information of a PLY file.
-
-Entry:
-plyfile - file identifier
-
-Exit:
-num_comments - number of comments returned
-returns a pointer to a list of comments
-******************************************************************************/
-
-char **get_comments_ply( PlyFile *plyfile, int *num_comments )
-{
-  *num_comments = plyfile->num_comments;
-  return ( plyfile->comments );
-}
-
-
-/******************************************************************************
-Extract the object information (arbitrary text) from the header information
-of a PLY file.
-
-Entry:
-plyfile - file identifier
-
-Exit:
-num_obj_info - number of lines of text information returned
-returns a pointer to a list of object info lines
-******************************************************************************/
-
-char **get_obj_info_ply( PlyFile *plyfile, int *num_obj_info )
-{
-  *num_obj_info = plyfile->num_obj_info;
-  return ( plyfile->obj_info );
-}
-
-
-/******************************************************************************
-ake ready for "other" properties of an element-- those properties that
-the user has not explicitly asked for, but that are to be stashed away
-in a special structure to be carried along with the element's other
-information.
-
-Entry:
-plyfile - file identifier
-elem    - element for which we want to save away other properties
-******************************************************************************/
-
-void setup_other_props( PlyFile *plyfile, PlyElement *elem )
-{
-  int           i;
-  PlyProperty  *prop;
-  int           size  = 0;
-  int           type_size;
-
-  /* Examine each property in decreasing order of size. */
-  /* We do this so that all data types will be aligned by */
-  /* word, half-word, or whatever within the structure. */
-
-  for ( type_size = 8; type_size > 0; type_size /= 2 )
-  {
-    /* add up the space taken by each property, and save this information */
-    /* away in the property descriptor */
-
-    for ( i = 0; i < elem->nprops; i++ )
-    {
-      /* don't bother with properties we've been asked to store explicitly */
-      if ( elem->store_prop[i] )
-        continue;
-
-      prop = elem->props[i];
-
-      /* internal types will be same as external */
-      prop->internal_type = prop->external_type;
-      prop->count_internal = prop->count_external;
-
-      /* list case */
-      if ( prop->is_list == PLY_LIST )
-      {
-        /* pointer to list */
-        if ( type_size == sizeof ( void * ) )
-        {
-          prop->offset = size;
-          size += sizeof ( void * );    /* always use size of a pointer here */
-        }
-
-        /* count of number of list elements */
-        if ( type_size == ply_type_size[prop->count_external] )
-        {
-          prop->count_offset = size;
-          size += ply_type_size[prop->count_external];
-        }
-      }
-      /* string */
-      else if ( prop->is_list == PLY_STRING )
-      {
-        /* pointer to string */
-        if ( type_size == sizeof ( char * ) )
-        {
-          prop->offset = size;
-          size += sizeof ( char * );
-        }
-      }
-      /* scalar */
-      else if ( type_size == ply_type_size[prop->external_type] )
-      {
-        prop->offset = size;
-        size += ply_type_size[prop->external_type];
-      }
-    }
-  }
-
-  /* save the size for the other_props structure */
-  elem->other_size = size;
-}
-
-
-/******************************************************************************
-Specify that we want the "other" properties of an element to be tucked
-away within the user's structure.
-
-Entry:
-plyfile - file identifier
-elem    - the element that we want to store other_props in
-offset  - offset to where other_props will be stored inside user's structure
-
-Exit:
-returns pointer to structure containing description of other_props
-******************************************************************************/
-
-static PlyOtherProp *get_other_properties( PlyFile *plyfile, PlyElement *elem, int offset )
-{
-  int           i;
-  PlyOtherProp *other;
-  PlyProperty  *prop;
-  int           nprops;
-
-  /* remember that this is the "current" element */
-  plyfile->which_elem = elem;
-
-  /* save the offset to where to store the other_props */
-  elem->other_offset = offset;
-
-  /* place the appropriate pointers, etc. in the element's property list */
-  setup_other_props ( plyfile, elem );
-
-  /* create structure for describing other_props */
-  other = ( PlyOtherProp *  ) myalloc ( sizeof ( PlyOtherProp ) );
-  other->name = strdup ( elem->name );
-#if 0
-if (elem->other_offset == NO_OTHER_PROPS) {
-other->size = 0;
-other->props = NULL;
-other->nprops = 0;
-return (other);
-}
-#endif
-  other->size = elem->other_size;
-  other->props = ( PlyProperty *  *  ) myalloc ( sizeof( PlyProperty ) * elem->nprops );
-
-  /* save descriptions of each "other" property */
-  nprops = 0;
-  for ( i = 0; i < elem->nprops; i++ )
-  {
-    if ( elem->store_prop[i] )
-      continue;
-    prop = ( PlyProperty *  ) myalloc ( sizeof ( PlyProperty ) );
-    copy_property ( prop, elem->props[i] );
-    other->props[nprops] = prop;
-    nprops++;
-  }
-  other->nprops = nprops;
-
-  /* set other_offset pointer appropriately if there are NO other properties */
-  if ( other->nprops == 0 )
-  {
-    elem->other_offset = NO_OTHER_PROPS;
-  }
-
-  /* return structure */
-  return ( other );
-}
-
-
-/******************************************************************************
-Specify that we want the "other" properties of an element to be tucked
-away within the user's structure.  The user needn't be concerned for how
-these properties are stored.
-
-Entry:
-plyfile   - file identifier
-elem_name - name of element that we want to store other_props in
-offset    - offset to where other_props will be stored inside user's structure
-
-Exit:
-returns pointer to structure containing description of other_props
-******************************************************************************/
-
-PlyOtherProp *ply_get_other_properties( PlyFile *plyfile, char *elem_name, int offset )
-{
-  PlyElement   *elem;
-  PlyOtherProp *other;
-
-  /* find information about the element */
-  elem = find_element ( plyfile, elem_name );
-  if ( elem == NULL )
-  {
-    fprintf ( stderr, "ply_get_other_properties: Can't find element '%s'\n",
-    elem_name );
-    return ( NULL );
-  }
-
-  other = get_other_properties ( plyfile, elem, offset );
-  return ( other );
-}
-
-
-
-
-/*************************/
-/*  Other Element Stuff  */
-/*************************/
-
-
-
-
-
-/******************************************************************************
-Grab all the data for the current element that a user does not want to
-explicitly read in.  Stores this in the PLY object's data structure.
-
-Entry:
-plyfile - pointer to file
-
-Exit:
-returns pointer to ALL the "other" element data for this PLY file
-******************************************************************************/
-
-PlyOtherElems *get_other_element_ply( PlyFile *plyfile )
-{
-  int             i;
-  PlyElement     *elem;
-  char           *elem_name;
-  int             elem_count;
-  PlyOtherElems  *other_elems;
-  OtherElem      *other;
-
-  elem = plyfile->which_elem;
-  elem_name = elem->name;
-  elem_count = elem->num;
-
-  /* create room for the new "other" element, initializing the */
-  /* other data structure if necessary */
-
-  if ( plyfile->other_elems == NULL )
-  {
-    plyfile->other_elems = ( PlyOtherElems *  ) myalloc ( sizeof ( PlyOtherElems ) );
-    other_elems = plyfile->other_elems;
-    other_elems->other_list = ( OtherElem *  ) myalloc ( sizeof ( OtherElem ) );
-    other = &( other_elems->other_list[0] );
-    other_elems->num_elems = 1;
-  }
-  else
-  {
-    other_elems = plyfile->other_elems;
-    other_elems->other_list = ( OtherElem *  ) realloc ( other_elems->other_list,
-    sizeof ( OtherElem ) * other_elems->num_elems + 1 );
-    other = &( other_elems->other_list[other_elems->num_elems] );
-    other_elems->num_elems++;
-  }
-
-  /* count of element instances in file */
-  other->elem_count = elem_count;
-
-  /* save name of element */
-  other->elem_name = strdup ( elem_name );
-
-  /* create a list to hold all the current elements */
-  other->other_data = ( OtherData *  *  )
-  malloc ( sizeof ( OtherData *  ) * other->elem_count );
-
-  /* set up for getting elements */
-  other->other_props = ply_get_other_properties ( plyfile, elem_name,
-  offsetof( OtherData,other_props ) );
-
-  /* grab all these elements */
-  for ( i = 0; i < other->elem_count; i++ )
-  {
-    /* grab and element from the file */
-    other->other_data[i] = ( OtherData *  ) malloc ( sizeof ( OtherData ) );
-    ply_get_element ( plyfile, ( void * ) other->other_data[i] );
-  }
-
-  /* return pointer to the other elements data */
-  return ( other_elems );
-}
-
-
-/******************************************************************************
-Write out the "other" elements specified for this PLY file.
-
-Entry:
-plyfile - pointer to PLY file to write out other elements for
-******************************************************************************/
-
-void put_other_elements_ply( PlyFile *plyfile )
-{
-  int         i,j;
-  OtherElem  *other;
-
-  /* make sure we have other elements to write */
-  if ( plyfile->other_elems == NULL )
-    return;
-
-  /* write out the data for each "other" element */
-
-  for ( i = 0; i < plyfile->other_elems->num_elems; i++ )
-  {
-    other = &( plyfile->other_elems->other_list[i] );
-    put_element_setup_ply ( plyfile, other->elem_name );
-
-    /* write out each instance of the current element */
-    for ( j = 0; j < other->elem_count; j++ )
-      put_element_ply ( plyfile, ( void * ) other->other_data[j] );
-  }
-}
-
-
-/******************************************************************************
-Free up storage used by an "other" elements data structure.
-
-Entry:
-other_elems - data structure to free up
-******************************************************************************/
-
-void free_other_elements_ply( PlyOtherElems *other_elems )
-{
-}
-
-
-
-/*******************/
-/*  Miscellaneous  */
-/*******************/
-
-
-
-/******************************************************************************
-Close a PLY file.
-
-Entry:
-plyfile - identifier of file to close
-******************************************************************************/
-
-void ply_close( PlyFile *plyfile )
-{
-  fclose ( plyfile->fp );
-
-  /* free up memory associated with the PLY file */
-  free ( plyfile );
-}
-
-
-/******************************************************************************
-Get version number and file type of a PlyFile.
-
-Entry:
-ply - pointer to PLY file
-
-Exit:
-version - version of the file
-file_type - PLY_ASCII, PLY_BINARY_BE, or PLY_BINARY_LE
-******************************************************************************/
-
-void get_info_ply( PlyFile *ply, float *version, int *file_type )
-{
-  if ( ply == NULL )
-    return;
-
-  *version = ply->version;
-  *file_type = ply->file_type;
-}
-
-
-/******************************************************************************
-Compare two strings.  Returns 1 if they are the same, 0 if not.
-******************************************************************************/
-
-int equal_strings( char *s1, char *s2 )
-{
-  while ( *s1 && *s2 )
-    if ( *s1++ != *s2++ )
-      return ( 0 );
-
-  if ( *s1 != *s2 )
-    return ( 0 );
-  else
-    return ( 1 );
-}
-
-
-/******************************************************************************
-Re-create the command line that was used to invoke this program.
-
-Entry:
-argc - number of words in argv
-argv - array of words in command line
-******************************************************************************/
-
-char *recreate_command_line( int argc, char *argv[] )
-{
-  int   i;
-  char *line;
-  int   len = 0;
-
-  /* count total number of characters needed, including separating spaces */
-  for ( i = 0; i < argc; i++ )
-    len += strlen( argv[i] ) + 1;
-
-  /* create empty line */
-  line = ( char * ) malloc ( sizeof( char ) * len );
-  line[0] = '\0';
-
-  /* repeatedly append argv */
-  for ( i = 0; i < argc; i++ )
-  {
-    strcat ( line, argv[i] );
-    if ( i != argc - 1 )
-      strcat ( line, " " );
-  }
-
-  return ( line );
-}
-
-
-/******************************************************************************
-Find an element from the element list of a given PLY object.
-
-Entry:
-plyfile - file id for PLY file
-element - name of element we're looking for
-
-Exit:
-returns the element, or NULL if not found
-******************************************************************************/
-
-PlyElement *find_element( PlyFile *plyfile, char *element )
-{
-  int i;
-
-  for ( i = 0; i < plyfile->num_elem_types; i++ )
-    if ( equal_strings ( element, plyfile->elems[i]->name ) )
-      return ( plyfile->elems[i] );
-
-  return ( NULL );
-}
-
-
-/******************************************************************************
-Find a property in the list of properties of a given element.
-
-Entry:
-elem      - pointer to element in which we want to find the property
-prop_name - name of property to find
-
-Exit:
-index - index to position in list
-returns a pointer to the property, or NULL if not found
-******************************************************************************/
-
-PlyProperty *find_property( PlyElement *elem, char *prop_name, int *index )
-{
-  int i;
-
-  for ( i = 0; i < elem->nprops; i++ )
-    if ( equal_strings ( prop_name, elem->props[i]->name ) )
-    {
-      *index = i;
-      return ( elem->props[i] );
-    }
-
-  *index = -1;
-  return ( NULL );
-}
-
-
-/******************************************************************************
-Read an element from an ascii file.
-
-Entry:
-plyfile  - file identifier
-elem_ptr - pointer to element
-******************************************************************************/
-
-void ascii_get_element( PlyFile *plyfile, char *elem_ptr )
-{
-  int           j,k;
-  PlyElement   *elem;
-  PlyProperty  *prop;
-  char*        *words;
-  int           nwords;
-  int           which_word;
-  char         *elem_data,*item;
-  char         *item_ptr;
-  int           item_size;
-  int           int_val;
-  unsigned int uint_val;
-  double  double_val;
-  int     list_count;
-  int     store_it;
-  char*  *store_array;
-  char   *orig_line;
-  char   *other_data;
-  int     other_flag;
-
-  item       = (char*) NULL ;
-  other_data = (char*) NULL ;
-
-  /* the kind of element we're reading currently */
-  elem = plyfile->which_elem;
-
-  /* do we need to setup for other_props? */
-
-  if ( elem->other_offset != NO_OTHER_PROPS )
-  {
-    char*  *ptr;
-    other_flag = 1;
-    /* make room for other_props */
-    other_data = ( char * ) myalloc ( elem->other_size );
-    /* store pointer in user's structure to the other_props */
-    ptr = ( char * *  ) ( elem_ptr + elem->other_offset );
-    *ptr = other_data;
-  }
-  else
-    other_flag = 0;
-
-  /* read in the element */
-
-  words = get_words ( plyfile->fp, &nwords, &orig_line );
-  if ( words == NULL )
-  {
-    fprintf ( stderr, "ply_get_element: unexpected end of file\n" );
-    exit ( -1 );
-  }
-
-  which_word = 0;
-
-  for ( j = 0; j < elem->nprops; j++ )
-  {
-    prop = elem->props[j];
-    store_it = ( elem->store_prop[j] | other_flag );
-
-    /* store either in the user's structure or in other_props */
-    if ( elem->store_prop[j] )
-      elem_data = elem_ptr;
-    else
-      elem_data = other_data;
-
-    if ( prop->is_list == PLY_LIST )
-    {
-      /* a list */
-
-      /* get and store the number of items in the list */
-      get_ascii_item ( words[which_word++], prop->count_external,
-      &int_val, &uint_val, &double_val );
-      if ( store_it )
-      {
-        item = elem_data + prop->count_offset;
-        store_item( item, prop->count_internal, int_val, uint_val, double_val );
-      }
-
-      /* allocate space for an array of items and store a ptr to the array */
-      list_count = int_val;
-      item_size = ply_type_size[prop->internal_type];
-      store_array = ( char * *  ) ( elem_data + prop->offset );
-
-      if ( list_count == 0 )
-      {
-        if ( store_it )
-          *store_array = NULL;
-      }
-      else
-      {
-        if ( store_it )
-        {
-          item_ptr = ( char * ) myalloc ( sizeof ( char ) * item_size * list_count );
-          item = item_ptr;
-          *store_array = item_ptr;
-        }
-
-        /* read items and store them into the array */
-        for ( k = 0; k < list_count; k++ )
-        {
-          get_ascii_item ( words[which_word++], prop->external_type,
-          &int_val, &uint_val, &double_val );
-          if ( store_it )
-          {
-            store_item ( item, prop->internal_type,
-            int_val, uint_val, double_val );
-            item += item_size;
-          }
-        }
-      }
-    }
-    else if ( prop->is_list == PLY_STRING )
-    {
-      /* a string */
-      if ( store_it )
-      {
-        char   *str;
-        char*  *str_ptr;
-        str = strdup ( words[which_word++] );
-        item = elem_data + prop->offset;
-        str_ptr = ( char * *  ) item;
-        *str_ptr = str;
-      }
-      else
-      {
-        which_word++;
-      }
-    }
-    else
-    {
-      /* a scalar */
-      get_ascii_item ( words[which_word++], prop->external_type,
-      &int_val, &uint_val, &double_val );
-      if ( store_it )
-      {
-        item = elem_data + prop->offset;
-        store_item ( item, prop->internal_type, int_val, uint_val, double_val );
-      }
-    }
-  }
-
-  free ( words );
-}
-
-
-/******************************************************************************
-Read an element from a binary file.
-
-Entry:
-plyfile  - file identifier
-elem_ptr - pointer to an element
-******************************************************************************/
-
-void binary_get_element( PlyFile *plyfile, char *elem_ptr )
-{
-  int           j,k;
-  PlyElement   *elem;
-  PlyProperty  *prop;
-  FILE         *fp  = plyfile->fp;
-  char         *elem_data;
-  char         *item;
-  char         *item_ptr;
-  int           item_size;
-  int           int_val;
-  unsigned int uint_val;
-  double  double_val;
-  int     list_count;
-  int     store_it;
-  char*  *store_array;
-  char   *other_data;
-  int     other_flag;
-
-  item       = (char*) NULL ;
-  other_data = (char*) NULL ;
-
-  /* the kind of element we're reading currently */
-  elem = plyfile->which_elem;
-
-  /* do we need to setup for other_props? */
-
-  if ( elem->other_offset != NO_OTHER_PROPS )
-  {
-    char*  *ptr;
-    other_flag = 1;
-    /* make room for other_props */
-    other_data = ( char * ) myalloc ( elem->other_size );
-    /* store pointer in user's structure to the other_props */
-    ptr = ( char * *  ) ( elem_ptr + elem->other_offset );
-    *ptr = other_data;
-  }
-  else
-    other_flag = 0;
-
-  /* read in a number of elements */
-
-  for ( j = 0; j < elem->nprops; j++ )
-  {
-    prop = elem->props[j];
-    store_it = ( elem->store_prop[j] | other_flag );
-
-    /* store either in the user's structure or in other_props */
-    if ( elem->store_prop[j] )
-      elem_data = elem_ptr;
-    else
-      elem_data = other_data;
-
-    if ( prop->is_list == PLY_LIST )
-    {
-      /* list */
-
-      /* get and store the number of items in the list */
-      get_binary_item ( fp, prop->count_external,
-      &int_val, &uint_val, &double_val );
-      if ( store_it )
-      {
-        item = elem_data + prop->count_offset;
-        store_item( item, prop->count_internal, int_val, uint_val, double_val );
-      }
-
-      /* allocate space for an array of items and store a ptr to the array */
-      list_count = int_val;
-      item_size = ply_type_size[prop->internal_type];
-      store_array = ( char * *  ) ( elem_data + prop->offset );
-      if ( list_count == 0 )
-      {
-        if ( store_it )
-          *store_array = NULL;
-      }
-      else
-      {
-        if ( store_it )
-        {
-          item_ptr = ( char * ) myalloc ( sizeof ( char ) * item_size * list_count );
-          item = item_ptr;
-          *store_array = item_ptr;
-        }
-
-        /* read items and store them into the array */
-        for ( k = 0; k < list_count; k++ )
-        {
-          get_binary_item ( fp, prop->external_type,
-          &int_val, &uint_val, &double_val );
-          if ( store_it )
-          {
-            store_item ( item, prop->internal_type,
-            int_val, uint_val, double_val );
-            item += item_size;
-          }
-        }
-      }
-    }
-    else if ( prop->is_list == PLY_STRING )
-    {
-      /* string */
-      int   len;
-      char *str;
-      fread ( &len, sizeof( int ), 1, fp );
-      str = ( char * ) myalloc ( len );
-      fread ( str, len, 1, fp );
-      if ( store_it )
-      {
-        char*  *str_ptr;
-        item = elem_data + prop->offset;
-        str_ptr = ( char * *  ) item;
-        *str_ptr = str;
-      }
-    }
-    else
-    {
-      /* scalar */
-      get_binary_item ( fp, prop->external_type,
-      &int_val, &uint_val, &double_val );
-      if ( store_it )
-      {
-        item = elem_data + prop->offset;
-        store_item ( item, prop->internal_type, int_val, uint_val, double_val );
-      }
-    }
-  }
-}
-
-
-/******************************************************************************
-Write to a file the word that represents a PLY data type.
-
-Entry:
-fp   - file pointer
-code - code for type
-******************************************************************************/
-
-void write_scalar_type( FILE *fp, int code )
-{
-  /* make sure this is a valid code */
-
-  if ( code <= StartType || code >= EndType )
-  {
-    fprintf ( stderr, "write_scalar_type: bad data code = %d\n", code );
-    exit ( -1 );
-  }
-
-  /* write the code to a file */
-
-  fprintf ( fp, "%s", type_names[code] );
-}
-
-
-/******************************************************************************
-Get a text line from a file and break it up into words.
-
-IMPORTANT: The calling routine should call "free" on the returned pointer once
-finished with it.
-
-Entry:
-fp - file to read from
-
-Exit:
-nwords    - number of words returned
-orig_line - the original line of characters
-returns a list of words from the line, or NULL if end-of-file
-******************************************************************************/
-
-char **get_words( FILE *fp, int *nwords, char **orig_line )
-{
-#define BIG_STRING 4096
-  static char str[BIG_STRING];
-  static char str_copy[BIG_STRING];
-  char*      *words;
-  int         max_words = 10;
-  int         num_words = 0;
-  char       *ptr,*ptr2;
-  char       *result;
-
-  words = ( char * *  ) myalloc ( sizeof ( char * ) * max_words );
-
-  /* read in a line */
-  result = fgets ( str, BIG_STRING, fp );
-  if ( result == NULL )
-  {
-    *nwords = 0;
-    *orig_line = NULL;
-    return ( NULL );
-  }
-
-  /* convert line-feed and tabs into spaces */
-  /* (this guarentees that there will be a space before the */
-  /*  null character at the end of the string) */
-
-  str[BIG_STRING - 2] = ' ';
-  str[BIG_STRING - 1] = '\0';
-
-  for ( ptr = str, ptr2 = str_copy; *ptr != '\0'; ptr++, ptr2++ )
-  {
-    *ptr2 = *ptr;
-    if ( *ptr == '\t' )
-    {
-      *ptr = ' ';
-      *ptr2 = ' ';
-    }
-    else if ( *ptr == '\n' )
-    {
-      *ptr = ' ';
-      *ptr2 = ' ';
-      break;
-    }
-    else if ( *ptr == '\r' )
-    {
-      *ptr = ' ';
-      *ptr2 = '\0';
-    }
-  }
-
-  /* find the words in the line */
-
-  ptr = str;
-  while ( *ptr != '\0' )
-  {
-    /* jump over leading spaces */
-    while ( *ptr == ' ' )
-      ptr++;
-
-    /* break if we reach the end */
-    if ( *ptr == '\0' )
-      break;
-
-    /* allocate more room for words if necessary */
-    if ( num_words >= max_words )
-    {
-      max_words += 10;
-      words = ( char * *  ) realloc ( words, sizeof ( char * ) * max_words );
-    }
-
-    if ( *ptr == '\"' )
-    {
-      /* a quote indidicates that we have a string */
-
-      /* skip over leading quote */
-      ptr++;
-
-      /* save pointer to beginning of word */
-      words[num_words++] = ptr;
-
-      /* find trailing quote or end of line */
-      while ( *ptr != '\"' && *ptr != '\0' )
-        ptr++;
-
-      /* replace quote with a null character to mark the end of the word */
-      /* if we are not already at the end of the line */
-      if ( *ptr != '\0' )
-        *ptr++ = '\0';
-    }
-    else
-    {
-      /* non-string */
-
-      /* save pointer to beginning of word */
-      words[num_words++] = ptr;
-
-      /* jump over non-spaces */
-      while ( *ptr != ' ' )
-        ptr++;
-
-      /* place a null character here to mark the end of the word */
-      *ptr++ = '\0';
-    }
-  }
-
-  /* return the list of words */
-  *nwords = num_words;
-  *orig_line = str_copy;
-  return ( words );
-}
-
-
-/******************************************************************************
-Return the value of an item, given a pointer to it and its type.
-
-Entry:
-item - pointer to item
-type - data type that "item" points to
-
-Exit:
-returns a double-precision float that contains the value of the item
-******************************************************************************/
-
-double get_item_value( char *item, int type )
-{
-  unsigned char *puchar;
-  char       *pchar;
-  short int  *pshort;
-  unsigned short int *pushort;
-  int  *pint;
-  unsigned int *puint;
-  float  *pfloat;
-  double *pdouble;
-  int     int_value;
-  unsigned int uint_value;
-  double  double_value;
-
-  switch ( type )
-  {
-    case Int8:
-      pchar = ( char * ) item;
-      int_value = *pchar;
-      return ( ( double ) int_value );
-    case Uint8:
-      puchar = ( unsigned char * ) item;
-      int_value = *puchar;
-      return ( ( double ) int_value );
-    case Int16:
-      pshort = ( short int * ) item;
-      int_value = *pshort;
-      return ( ( double ) int_value );
-    case Uint16:
-      pushort = ( unsigned short int * ) item;
-      int_value = *pushort;
-      return ( ( double ) int_value );
-    case Int32:
-      pint = ( int * ) item;
-      int_value = *pint;
-      return ( ( double ) int_value );
-    case Uint32:
-      puint = ( unsigned int * ) item;
-      uint_value = *puint;
-      return ( ( double ) uint_value );
-    case Float32:
-      pfloat = ( float * ) item;
-      double_value = *pfloat;
-      return ( double_value );
-    case Float64:
-      pdouble = ( double * ) item;
-      double_value = *pdouble;
-      return ( double_value );
-    default:
-      fprintf ( stderr, "get_item_value: bad type = %d\n", type );
-      exit ( -1 );
-  }
-
-  return ( 0.0 );  /* never actually gets here */
-}
-
-
-/******************************************************************************
-Write out an item to a file as raw binary bytes.
-
-Entry:
-fp         - file to write to
-int_val    - integer version of item
-uint_val   - unsigned integer version of item
-double_val - double-precision float version of item
-type       - data type to write out
-******************************************************************************/
-
-void write_binary_item( FILE *fp, int int_val, unsigned int uint_val, double double_val, int type )
-{
-  unsigned char uchar_val;
-  char  char_val;
-  unsigned short ushort_val;
-  short short_val;
-  float float_val;
-
-  switch ( type )
-  {
-    case Int8:
-      char_val = int_val;
-      fwrite ( &char_val, 1, 1, fp );
-      break;
-    case Int16:
-      short_val = int_val;
-      fwrite ( &short_val, 2, 1, fp );
-      break;
-    case Int32:
-      fwrite ( &int_val, 4, 1, fp );
-      break;
-    case Uint8:
-      uchar_val = uint_val;
-      fwrite ( &uchar_val, 1, 1, fp );
-      break;
-    case Uint16:
-      ushort_val = uint_val;
-      fwrite ( &ushort_val, 2, 1, fp );
-      break;
-    case Uint32:
-      fwrite ( &uint_val, 4, 1, fp );
-      break;
-    case Float32:
-      float_val = ( float ) double_val;
-      fwrite ( &float_val, 4, 1, fp );
-      break;
-    case Float64:
-      fwrite ( &double_val, 8, 1, fp );
-      break;
-    default:
-      fprintf ( stderr, "write_binary_item: bad type = %d\n", type );
-      exit ( -1 );
-  }
-}
-
-
-/******************************************************************************
-Write out an item to a file as ascii characters.
-
-Entry:
-fp         - file to write to
-int_val    - integer version of item
-uint_val   - unsigned integer version of item
-double_val - double-precision float version of item
-type       - data type to write out
-******************************************************************************/
-
-void write_ascii_item( FILE *fp, int int_val, unsigned int uint_val, double double_val, int type )
-{
-  switch ( type )
-  {
-    case Int8:
-    case Int16:
-    case Int32:
-      fprintf ( fp, "%d ", int_val );
-      break;
-    case Uint8:
-    case Uint16:
-    case Uint32:
-      fprintf ( fp, "%u ", uint_val );
-      break;
-    case Float32:
-    case Float64:
-      fprintf ( fp, "%12f ", double_val );
-      break;
-    default:
-      fprintf ( stderr, "write_ascii_item: bad type = %d\n", type );
-      exit ( -1 );
-  }
-}
-
-
-/******************************************************************************
-Get the value of an item that is in memory, and place the result
-into an integer, an unsigned integer and a double.
-
-Entry:
-ptr  - pointer to the item
-type - data type supposedly in the item
-
-Exit:
-int_val    - integer value
-uint_val   - unsigned integer value
-double_val - double-precision floating point value
-******************************************************************************/
-
-void get_stored_item( void *ptr, int type, int *int_val, unsigned int *uint_val, double *double_val )
-{
-  switch ( type )
-  {
-    case Int8:
-      *int_val = *( ( char * ) ptr );
-      *uint_val = *int_val;
-      *double_val = *int_val;
-      break;
-    case Uint8:
-      *uint_val = *( ( unsigned char * ) ptr );
-      *int_val = *uint_val;
-      *double_val = *uint_val;
-      break;
-    case Int16:
-      *int_val = *( ( short int * ) ptr );
-      *uint_val = *int_val;
-      *double_val = *int_val;
-      break;
-    case Uint16:
-      *uint_val = *( ( unsigned short int * ) ptr );
-      *int_val = *uint_val;
-      *double_val = *uint_val;
-      break;
-    case Int32:
-      *int_val = *( ( int * ) ptr );
-      *uint_val = *int_val;
-      *double_val = *int_val;
-      break;
-    case Uint32:
-      *uint_val = *( ( unsigned int * ) ptr );
-      *int_val = *uint_val;
-      *double_val = *uint_val;
-      break;
-    case Float32:
-      *double_val = *( ( float * ) ptr );
-      *int_val = ( int ) *double_val;
-      *uint_val = ( unsigned int ) *double_val;
-      break;
-    case Float64:
-      *double_val = *( ( double * ) ptr );
-      *int_val = ( int ) *double_val;
-      *uint_val = ( unsigned int ) *double_val;
-      break;
-    default:
-      fprintf ( stderr, "get_stored_item: bad type = %d\n", type );
-      exit ( -1 );
-  }
-}
-
-
-/******************************************************************************
-Get the value of an item from a binary file, and place the result
-into an integer, an unsigned integer and a double.
-
-Entry:
-fp   - file to get item from
-type - data type supposedly in the word
-
-Exit:
-int_val    - integer value
-uint_val   - unsigned integer value
-double_val - double-precision floating point value
-******************************************************************************/
-
-void get_binary_item( FILE *fp, int type, int *int_val, unsigned int *uint_val, double *double_val )
-{
-  char  c[8];
-  void *ptr;
-
-  ptr = ( void * ) c;
-
-  switch ( type )
-  {
-    case Int8:
-      fread ( ptr, 1, 1, fp );
-      *int_val = *( ( char * ) ptr );
-      *uint_val = *int_val;
-      *double_val = *int_val;
-      break;
-    case Uint8:
-      fread ( ptr, 1, 1, fp );
-      *uint_val = *( ( unsigned char * ) ptr );
-      *int_val = *uint_val;
-      *double_val = *uint_val;
-      break;
-    case Int16:
-      fread ( ptr, 2, 1, fp );
-      *int_val = *( ( short int * ) ptr );
-      *uint_val = *int_val;
-      *double_val = *int_val;
-      break;
-    case Uint16:
-      fread ( ptr, 2, 1, fp );
-      *uint_val = *( ( unsigned short int * ) ptr );
-      *int_val = *uint_val;
-      *double_val = *uint_val;
-      break;
-    case Int32:
-      fread ( ptr, 4, 1, fp );
-      *int_val = *( ( int * ) ptr );
-      *uint_val = *int_val;
-      *double_val = *int_val;
-      break;
-    case Uint32:
-      fread ( ptr, 4, 1, fp );
-      *uint_val = *( ( unsigned int * ) ptr );
-      *int_val = *uint_val;
-      *double_val = *uint_val;
-      break;
-    case Float32:
-      fread ( ptr, 4, 1, fp );
-      *double_val = *( ( float * ) ptr );
-      *int_val = ( int ) *double_val;
-      *uint_val = ( unsigned int ) *double_val;
-      break;
-    case Float64:
-      fread ( ptr, 8, 1, fp );
-      *double_val = *( ( double * ) ptr );
-      *int_val = ( int ) *double_val;
-      *uint_val = ( unsigned int ) *double_val;
-      break;
-    default:
-      fprintf ( stderr, "get_binary_item: bad type = %d\n", type );
-      exit ( -1 );
-  }
-}
-
-
-/******************************************************************************
-Extract the value of an item from an ascii word, and place the result
-into an integer, an unsigned integer and a double.
-
-Entry:
-word - word to extract value from
-type - data type supposedly in the word
-
-Exit:
-int_val    - integer value
-uint_val   - unsigned integer value
-double_val - double-precision floating point value
-******************************************************************************/
-
-void get_ascii_item( char *word, int type, int *int_val, unsigned int *uint_val, double *double_val )
-{
-  switch ( type )
-  {
-    case Int8:
-    case Uint8:
-    case Int16:
-    case Uint16:
-    case Int32:
-      *int_val = atoi ( word );
-      *uint_val = *int_val;
-      *double_val = *int_val;
-      break;
-
-    case Uint32:
-      *uint_val = strtoul ( word, ( char * *  ) NULL, 10 );
-      *int_val = *uint_val;
-      *double_val = *uint_val;
-      break;
-
-    case Float32:
-    case Float64:
-      *double_val = atof ( word );
-      *int_val = ( int ) *double_val;
-      *uint_val = ( unsigned int ) *double_val;
-      break;
-
-    default:
-      fprintf ( stderr, "get_ascii_item: bad type = %d\n", type );
-      exit ( -1 );
-  }
-}
-
-
-/******************************************************************************
-Store a value into a place being pointed to, guided by a data type.
-
-Entry:
-item       - place to store value
-type       - data type
-int_val    - integer version of value
-uint_val   - unsigned integer version of value
-double_val - double version of value
-
-Exit:
-item - pointer to stored value
-******************************************************************************/
-
-void store_item( char *item, int type, int int_val, unsigned int uint_val, double double_val )
-{
-  unsigned char *puchar;
-  short int  *pshort;
-  unsigned short int *pushort;
-  int  *pint;
-  unsigned int *puint;
-  float  *pfloat;
-  double *pdouble;
-
-  switch ( type )
-  {
-    case Int8:
-      *item = int_val;
-      break;
-    case Uint8:
-      puchar = ( unsigned char * ) item;
-      *puchar = uint_val;
-      break;
-    case Int16:
-      pshort = ( short * ) item;
-      *pshort = int_val;
-      break;
-    case Uint16:
-      pushort = ( unsigned short * ) item;
-      *pushort = uint_val;
-      break;
-    case Int32:
-      pint = ( int * ) item;
-      *pint = int_val;
-      break;
-    case Uint32:
-      puint = ( unsigned int * ) item;
-      *puint = uint_val;
-      break;
-    case Float32:
-      pfloat = ( float * ) item;
-      *pfloat = ( float ) double_val;
-      break;
-    case Float64:
-      pdouble = ( double * ) item;
-      *pdouble = double_val;
-      break;
-    default:
-      fprintf ( stderr, "store_item: bad type = %d\n", type );
-      exit ( -1 );
-  }
-}
-
-
-/******************************************************************************
-Add an element to a PLY file descriptor.
-
-Entry:
-plyfile - PLY file descriptor
-words   - list of words describing the element
-nwords  - number of words in the list
-******************************************************************************/
-
-void add_element( PlyFile *plyfile, char **words, int nwords )
-{
-  PlyElement *elem;
-
-  /* create the new element */
-  elem = ( PlyElement *  ) myalloc ( sizeof ( PlyElement ) );
-  elem->name = strdup ( words[1] );
-  elem->num = atoi ( words[2] );
-  elem->nprops = 0;
-
-  /* make room for new element in the object's list of elements */
-  if ( plyfile->num_elem_types == 0 )
-    plyfile->elems = ( PlyElement *  *  ) myalloc ( sizeof ( PlyElement *  ) );
-  else
-    plyfile->elems = ( PlyElement *  *  ) realloc ( plyfile->elems,
-    sizeof ( PlyElement *  ) * ( plyfile->num_elem_types + 1 ) );
-
-  /* add the new element to the object's list */
-  plyfile->elems[plyfile->num_elem_types] = elem;
-  plyfile->num_elem_types++;
-}
-
-
-/******************************************************************************
-Return the type of a property, given the name of the property.
-
-Entry:
-name - name of property type
-
-Exit:
-returns integer code for property, or 0 if not found
-******************************************************************************/
-
-int get_prop_type( char *type_name )
-{
-  int i;
-
-  /* try to match the type name */
-  for ( i = StartType + 1; i < EndType; i++ )
-    if ( equal_strings ( type_name, type_names[i] ) )
-      return ( i );
-
-  /* see if we can match an old type name */
-  for ( i = StartType + 1; i < EndType; i++ )
-    if ( equal_strings ( type_name, old_type_names[i] ) )
-      return ( i );
-
-  /* if we get here, we didn't find the type */
-  return ( 0 );
-}
-
-
-/******************************************************************************
-Add a property to a PLY file descriptor.
-
-Entry:
-plyfile - PLY file descriptor
-words   - list of words describing the property
-nwords  - number of words in the list
-******************************************************************************/
-
-void add_property( PlyFile *plyfile, char **words, int nwords )
-{
-  PlyProperty  *prop;
-  PlyElement   *elem;
-
-  /* create the new property */
-
-  prop = ( PlyProperty *  ) myalloc ( sizeof ( PlyProperty ) );
-
-  if ( equal_strings ( words[1], "list" ) )
-  {
-    /* list */
-    prop->count_external = get_prop_type ( words[2] );
-    prop->external_type = get_prop_type ( words[3] );
-    prop->name = strdup ( words[4] );
-    prop->is_list = PLY_LIST;
-  }
-  else if ( equal_strings ( words[1], "string" ) )
-  {
-    /* string */
-    prop->count_external = Int8;
-    prop->external_type = Int8;
-    prop->name = strdup ( words[2] );
-    prop->is_list = PLY_STRING;
-  }
-  else
-  {
-    /* scalar */
-    prop->external_type = get_prop_type ( words[1] );
-    prop->name = strdup ( words[2] );
-    prop->is_list = PLY_SCALAR;
-  }
-
-  /* add this property to the list of properties of the current element */
-
-  elem = plyfile->elems[plyfile->num_elem_types - 1];
-
-  if ( elem->nprops == 0 )
-    elem->props = ( PlyProperty *  *  ) myalloc ( sizeof ( PlyProperty *  ) );
-  else
-    elem->props = ( PlyProperty *  *  ) realloc ( elem->props,
-    sizeof ( PlyProperty *  ) * ( elem->nprops + 1 ) );
-
-  elem->props[elem->nprops] = prop;
-  elem->nprops++;
-}
-
-
-/******************************************************************************
-Add a comment to a PLY file descriptor.
-
-Entry:
-plyfile - PLY file descriptor
-line    - line containing comment
-******************************************************************************/
-
-void add_comment( PlyFile *plyfile, char *line )
-{
-  int i;
-
-  /* skip over "comment" and leading spaces and tabs */
-  i = 7;
-  while ( line[i] == ' ' || line[i] == '\t' )
-    i++;
-
-  append_comment_ply ( plyfile, &line[i] );
-}
-
-
-/******************************************************************************
-Add a some object information to a PLY file descriptor.
-
-Entry:
-plyfile - PLY file descriptor
-line    - line containing text info
-******************************************************************************/
-
-void add_obj_info( PlyFile *plyfile, char *line )
-{
-  int i;
-
-  /* skip over "obj_info" and leading spaces and tabs */
-  i = 8;
-  while ( line[i] == ' ' || line[i] == '\t' )
-    i++;
-
-  append_obj_info_ply ( plyfile, &line[i] );
-}
-
-
-/******************************************************************************
-Copy a property.
-******************************************************************************/
-
-void copy_property( PlyProperty *dest, PlyProperty *src )
-{
-  dest->name = strdup ( src->name );
-  dest->external_type = src->external_type;
-  dest->internal_type = src->internal_type;
-  dest->offset = src->offset;
-
-  dest->is_list = src->is_list;
-  dest->count_external = src->count_external;
-  dest->count_internal = src->count_internal;
-  dest->count_offset = src->count_offset;
-}
-
-
-/******************************************************************************
-Allocate some memory.
-
-Entry:
-size  - amount of memory requested (in bytes)
-lnum  - line number from which memory was requested
-fname - file name from which memory was requested
-******************************************************************************/
-
-static char *my_alloc( int size, int lnum, char *fname )
-{
-  char *ptr;
-
-  ptr = ( char * ) malloc ( size );
-
-  if ( ptr == 0 )
-  {
-    fprintf( stderr, "Memory allocation bombed on line %d in %s\n", lnum, fname );
-  }
-
-  return ( ptr );
-}
-
-
-/**** NEW STUFF ****/
-/**** NEW STUFF ****/
-/**** NEW STUFF ****/
-/**** NEW STUFF ****/
-
-
-
-/******************************************************************************
-Given a file pointer, get ready to read PLY data from the file.
-
-Entry:
-fp - the given file pointer
-
-Exit:
-nelems     - number of elements in object
-elem_names - list of element names
-returns a pointer to a PlyFile, used to refer to this file, or NULL if error
-******************************************************************************/
-
-PlyFile *read_ply( FILE *fp )
-{
-  PlyFile  *ply;
-  int       num_elems;
-  char*    *elem_names;
-
-  ply = ply_read ( fp, &num_elems, &elem_names );
-
-  return ( ply );
-}
-
-
-/******************************************************************************
-Given a file pointer, get ready to write PLY data to the file.
-
-Entry:
-fp         - the given file pointer
-nelems     - number of elements in object
-elem_names - list of element names
-file_type  - file type, either ascii or binary
-
-Exit:
-returns a pointer to a PlyFile, used to refer to this file, or NULL if error
-******************************************************************************/
-
-PlyFile *write_ply( FILE *fp, int nelems, char **elem_names, int file_type )
-{
-  PlyFile  *ply;
-
-  ply = ply_write ( fp, nelems, elem_names, file_type );
-
-  return ( ply );
-}
-
-
-/******************************************************************************
-Return a list of the names of the elements in a particular PLY file.
-
-Entry:
-ply - PLY file whose element name list we want
-
-Exit:
-num_elems  - the number of element names in the list
-returns the list of names
-******************************************************************************/
-
-char **get_element_list_ply( PlyFile *ply, int *num_elems )
-{
-  int     i;
-  char*  *elist;
-
-  /* create the list of element names */
-
-  elist = ( char * *  ) myalloc ( sizeof ( char * ) * ply->num_elem_types );
-  for ( i = 0; i < ply->num_elem_types; i++ )
-    elist[i] = strdup ( ply->elems[i]->name );
-
-  /* return the number of elements and the list of element names */
-  *num_elems = ply->num_elem_types;
-  return ( elist );
-}
-
-
-/******************************************************************************
-Append a comment to a PLY file.
-
-Entry:
-ply     - file to append comment to
-comment - the comment to append
-******************************************************************************/
-
-void append_comment_ply( PlyFile *ply, char *comment )
-{
-  /* (re)allocate space for new comment */
-  if ( ply->num_comments == 0 )
-    ply->comments = ( char * *  ) myalloc ( sizeof ( char * ) );
-  else
-    ply->comments = ( char * *  ) realloc ( ply->comments,
-    sizeof ( char * ) * ( ply->num_comments + 1 ) );
-
-  /* add comment to list */
-  ply->comments[ply->num_comments] = strdup ( comment );
-  ply->num_comments++;
-}
-
-
-/******************************************************************************
-Copy the comments from one PLY file to another.
-
-Entry:
-out_ply - destination file to copy comments to
-in_ply  - the source of the comments
-******************************************************************************/
-
-void copy_comments_ply( PlyFile *out_ply, PlyFile *in_ply )
-{
-  int i;
-
-  for ( i = 0; i < in_ply->num_comments; i++ )
-    append_comment_ply ( out_ply, in_ply->comments[i] );
-}
-
-
-/******************************************************************************
-Append object information (arbitrary text) to a PLY file.
-
-Entry:
-ply      - file to append object info to
-obj_info - the object info to append
-******************************************************************************/
-
-void append_obj_info_ply( PlyFile *ply, char *obj_info )
-{
-  /* (re)allocate space for new info */
-  if ( ply->num_obj_info == 0 )
-    ply->obj_info = ( char * *  ) myalloc ( sizeof ( char * ) );
-  else
-    ply->obj_info = ( char * *  ) realloc ( ply->obj_info,
-    sizeof ( char * ) * ( ply->num_obj_info + 1 ) );
-
-  /* add info to list */
-  ply->obj_info[ply->num_obj_info] = strdup ( obj_info );
-  ply->num_obj_info++;
-}
-
-
-/******************************************************************************
-Copy the object information from one PLY file to another.
-
-Entry:
-out_ply - destination file to copy object information to
-in_ply  - the source of the object information
-******************************************************************************/
-
-void copy_obj_info_ply( PlyFile *out_ply, PlyFile *in_ply )
-{
-  int i;
-
-  for ( i = 0; i < in_ply->num_obj_info; i++ )
-    append_obj_info_ply ( out_ply, in_ply->obj_info[i] );
-}
-
-
-/******************************************************************************
-Close a PLY file.
-
-Entry:
-plyfile - identifier of file to close
-******************************************************************************/
-
-void close_ply( PlyFile *plyfile )
-{
-  fclose ( plyfile->fp );
-}
-
-
-/******************************************************************************
-Free the memory used by a PLY file.
-
-Entry:
-plyfile - identifier of file
-******************************************************************************/
-
-void free_ply( PlyFile *plyfile )
-{
-  /* free up memory associated with the PLY file */
-  free ( plyfile );
-}
-
-
-/******************************************************************************
-Specify the index of the next element to be read in from a PLY file.
-
-Entry:
-ply - file to read from
-index - index of the element to be read
-
-Exit:
-elem_count - the number of elements in the file
-returns pointer to the name of this next element
-******************************************************************************/
-
-char *setup_element_read_ply( PlyFile *ply, int index, int *elem_count )
-{
-  PlyElement *elem;
-
-  if ( index < 0 || index > ply->num_elem_types )
-  {
-    fprintf ( stderr, "Warning:  No element with index %d\n", index );
-    return ( 0 );
-  }
-
-  elem = ply->elems[index];
-
-  /* set this to be the current element */
-  ply->which_elem = elem;
-
-  /* return the number of such elements in the file and the element's name */
-  *elem_count = elem->num;
-  return ( elem->name );
-}
-
-
-/******************************************************************************
-Read one element from the file.  This routine assumes that we're reading
-the type of element specified in the last call to the routine
-setup_element_read_ply().
-
-Entry:
-plyfile  - file identifier
-elem_ptr - pointer to location where the element information should be put
-******************************************************************************/
-
-void get_element_ply( PlyFile *plyfile, void *elem_ptr )
-{
-  if ( plyfile->file_type == PLY_ASCII )
-    ascii_get_element ( plyfile, ( char * ) elem_ptr );
-  else
-    binary_get_element ( plyfile, ( char * ) elem_ptr );
-}
-
-
-/******************************************************************************
-Specify one of several properties of the current element that is to be
-read from a file.  This should be called (usually multiple times) before a
-call to the routine get_element_ply().
-
-Entry:
-plyfile - file identifier
-prop    - property to add to those that will be returned
-
-Exit:
-0 if the property has not been found
-1 if the property has been found
-******************************************************************************/
-
-int setup_property_ply( PlyFile *plyfile, PlyProperty *prop )
-{
-  PlyElement   *elem;
-  PlyProperty  *prop_ptr;
-  int           index;
-
-  elem = plyfile->which_elem;
-
-  /* deposit the property information into the element's description */
-
-  prop_ptr = find_property ( elem, prop->name, &index );
-  if ( prop_ptr == NULL )
-  {
-    fprintf ( stderr, "Warning:  Can't find property '%s' in element '%s'\n",
-    prop->name, elem->name );
-    return 0;
-  }
-  prop_ptr->internal_type = prop->internal_type;
-  prop_ptr->offset = prop->offset;
-  prop_ptr->count_internal = prop->count_internal;
-  prop_ptr->count_offset = prop->count_offset;
-
-  /* specify that the user wants this property */
-  elem->store_prop[index] = STORE_PROP;
-  return 1 ;
-}
-
-
-/******************************************************************************
-Specify that we want the "other" properties of the current element to be tucked
-away within the user's structure.
-
-Entry:
-plyfile - file identifier
-offset  - offset to where other_props will be stored inside user's structure
-
-Exit:
-returns pointer to structure containing description of other_props
-******************************************************************************/
-
-PlyOtherProp *get_other_properties_ply( PlyFile *plyfile, int offset )
-{
-  PlyOtherProp *other;
-
-  other = get_other_properties ( plyfile, plyfile->which_elem, offset );
-  return ( other );
-}
-
-
-/******************************************************************************
-Describe which element is to be written next and state how many of them will
-be written.
-
-Entry:
-plyfile   - file identifier
-elem_name - name of element that information is being described
-nelems    - number of elements of this type to be written
-******************************************************************************/
-
-void describe_element_ply( PlyFile *plyfile, char *elem_name, int nelems )
-{
-  PlyElement *elem;
-
-  /* look for appropriate element */
-  elem = find_element ( plyfile, elem_name );
-  if ( elem == NULL )
-  {
-    fprintf( stderr,"describe_element_ply: can't find element '%s'\n",elem_name );
-    exit ( -1 );
-  }
-
-  elem->num = nelems;
-
-  /* now this element is the current element */
-  plyfile->which_elem = elem;
-}
-
-
-/******************************************************************************
-Describe a property of an element.
-
-Entry:
-plyfile   - file identifier
-prop      - the new property
-******************************************************************************/
-
-void describe_property_ply( PlyFile *plyfile, PlyProperty *prop )
-{
-  PlyElement   *elem;
-  PlyProperty  *elem_prop;
-
-  elem = plyfile->which_elem;
-
-  /* create room for new property */
-
-  if ( elem->nprops == 0 )
-  {
-    elem->props = ( PlyProperty *  *  ) myalloc ( sizeof ( PlyProperty *  ) );
-    elem->store_prop = ( char * ) myalloc ( sizeof ( char ) );
-    elem->nprops = 1;
-  }
-  else
-  {
-    elem->nprops++;
-    elem->props = ( PlyProperty *  *  )
-    realloc ( elem->props, sizeof ( PlyProperty *  ) * elem->nprops );
-    elem->store_prop = ( char * )
-    realloc ( elem->store_prop, sizeof ( char ) * elem->nprops );
-  }
-
-  /* copy the new property */
-
-  elem_prop = ( PlyProperty *  ) myalloc ( sizeof ( PlyProperty ) );
-  elem->props[elem->nprops - 1] = elem_prop;
-  elem->store_prop[elem->nprops - 1] = NAMED_PROP;
-  copy_property ( elem_prop, prop );
-}
-
-
-/******************************************************************************
-Describe what the "other" properties are that are to be stored, and where
-they are in an element.
-******************************************************************************/
-
-void describe_other_properties_ply( PlyFile *plyfile, PlyOtherProp *other, int offset )
-{
-  int           i;
-  PlyElement   *elem;
-  PlyProperty  *prop;
-
-  /* look for appropriate element */
-  elem = find_element ( plyfile, other->name );
-  if ( elem == NULL )
-  {
-    fprintf( stderr, "describe_other_properties_ply: can't find element '%s'\n",
-    other->name );
-    return;
-  }
-
-  /* create room for other properties */
-
-  if ( elem->nprops == 0 )
-  {
-    elem->props = ( PlyProperty *  *  )
-    myalloc ( sizeof ( PlyProperty *  ) * other->nprops );
-    elem->store_prop = ( char * ) myalloc ( sizeof ( char ) * other->nprops );
-    elem->nprops = 0;
-  }
-  else
-  {
-    int newsize;
-    newsize = elem->nprops + other->nprops;
-    elem->props = ( PlyProperty *  *  )
-    realloc ( elem->props, sizeof ( PlyProperty *  ) * newsize );
-    elem->store_prop = ( char * )
-    realloc ( elem->store_prop, sizeof ( char ) * newsize );
-  }
-
-  /* copy the other properties */
-
-  for ( i = 0; i < other->nprops; i++ )
-  {
-    prop = ( PlyProperty *  ) myalloc ( sizeof ( PlyProperty ) );
-    copy_property ( prop, other->props[i] );
-    elem->props[elem->nprops] = prop;
-    elem->store_prop[elem->nprops] = OTHER_PROP;
-    elem->nprops++;
-  }
-
-  /* save other info about other properties */
-  elem->other_size = other->size;
-  elem->other_offset = offset;
-}
-
-
-/******************************************************************************
-Pass along a pointer to "other" elements that we want to save in a given
-PLY file.  These other elements were presumably read from another PLY file.
-
-Entry:
-plyfile     - file pointer in which to store this other element info
-other_elems - info about other elements that we want to store
-******************************************************************************/
-
-void describe_other_elements_ply( PlyFile *plyfile, PlyOtherElems *other_elems )
-{
-  int         i;
-  OtherElem  *other;
-
-  /* ignore this call if there is no other element */
-  if ( other_elems == NULL )
-    return;
-
-  /* save pointer to this information */
-  plyfile->other_elems = other_elems;
-
-  /* describe the other properties of this element */
-
-  for ( i = 0; i < other_elems->num_elems; i++ )
-  {
-    other = &( other_elems->other_list[i] );
-    element_count_ply ( plyfile, other->elem_name, other->elem_count );
-    describe_other_properties_ply ( plyfile, other->other_props,
-    offsetof( OtherData,other_props ) );
-  }
-}
-
-
-
-/**** Property Propagation Rules ****/
-
-
-typedef struct RuleName {
-int code;
-char *name;
-} RuleName;
-
-RuleName  rule_name_list[]  = {
-{AVERAGE_RULE, "avg"},
-{RANDOM_RULE, "rnd"},
-{MINIMUM_RULE, "max"},
-{MAXIMUM_RULE, "min"},
-{MAJORITY_RULE, "major"},
-{SAME_RULE, "same"},
-{-1, "end_marker"},
-};
-
-
-
-/******************************************************************************
-Initialize the property propagation rules for an element.  Default is to
-use averaging (AVERAGE_RULE) for creating all new properties.
-
-Entry:
-ply       - PLY object that this is for
-elem_name - name of the element that we're making the rules for
-
-Exit:
-returns pointer to the default rules
-******************************************************************************/
-
-PlyPropRules *init_rule_ply( PlyFile *ply, char *elem_name )
-{
-  int           i,j;
-  PlyElement   *elem;
-  PlyPropRules *rules;
-  PlyRuleList  *list;
-  int           found_prop;
-
-  elem = find_element ( ply, elem_name );
-  if ( elem == NULL )
-  {
-    fprintf ( stderr, "init_rule_ply: Can't find element '%s'\n", elem_name );
-    exit ( -1 );
-  }
-
-  rules = ( PlyPropRules *  ) myalloc ( sizeof ( PlyPropRules ) );
-  rules->elem = elem;
-  rules->rule_list = ( int * ) myalloc ( sizeof( int ) * elem->nprops );
-  rules->max_props = 0;
-  rules->nprops = 0;
-
-  /* default is to use averaging rule */
-  for ( i = 0; i < elem->nprops; i++ )
-    rules->rule_list[i] = AVERAGE_RULE;
-
-  /* see if there are other rules we should use */
-
-  if ( ply->rule_list == NULL )
-    return ( rules );
-
-  /* try to match the element, property and rule name */
-
-  for ( list = ply->rule_list; list != NULL; list = list->next )
-  {
-    if ( !equal_strings ( list->element, elem->name ) )
-      continue;
-
-    found_prop = 0;
-
-    for ( i = 0; i < elem->nprops; i++ )
-      if ( equal_strings ( list->property, elem->props[i]->name ) )
-      {
-        found_prop = 1;
-
-        /* look for matching rule name */
-        for ( j = 0; rule_name_list[j].code != -1; j++ )
-          if ( equal_strings ( list->name, rule_name_list[j].name ) )
-          {
-            rules->rule_list[i] = rule_name_list[j].code;
-            break;
-          }
-      }
-
-    if ( !found_prop )
-    {
-      fprintf ( stderr, "Can't find property '%s' for rule '%s'\n",
-      list->property, list->name );
-      continue;
-    }
-  }
-
-  return ( rules );
-}
-
-
-/******************************************************************************
-odify a property propagation rule.
-
-Entry:
-rules - rules for the element
-prop_name - name of the property whose rule we're modifying
-rule_type - type of rule (MAXIMUM_RULE, MINIMUM_RULE, MAJORITY_RULE, etc.)
-******************************************************************************/
-
-void modify_rule_ply( PlyPropRules *rules, char *prop_name, int rule_type )
-{
-  int         i;
-  PlyElement *elem  = rules->elem;
-
-  /* find the property and modify its rule type */
-
-  for ( i = 0; i < elem->nprops; i++ )
-    if ( equal_strings ( elem->props[i]->name, prop_name ) )
-    {
-      rules->rule_list[i] = rule_type;
-      return;
-    }
-
-  /* we didn't find the property if we get here */
-  fprintf ( stderr, "modify_rule_ply: Can't find property '%s'\n", prop_name );
-  exit ( -1 );
-}
-
-
-/******************************************************************************
-Begin to create a set of properties from a set of propagation rules.
-
-Entry:
-ply   - PLY object whose rules we're preparing to use
-rules - rules for the element
-******************************************************************************/
-
-void start_props_ply( PlyFile *ply, PlyPropRules *rules )
-{
-  /*  PlyElement *elem  = rules->elem; */
-
-  /* save pointer to the rules in the PLY object */
-  ply->current_rules = rules;
-
-  /* get ready for new sets of properties to combine */
-  rules->nprops = 0;
-}
-
-
-/******************************************************************************
-Remember a set of properties and their weights for creating a new set of
-properties.
-
-Entry:
-weight      - weights for this set of properties
-other_props - the properties to use
-******************************************************************************/
-
-void weight_props_ply( PlyFile *ply, float weight, void *other_props )
-{
-  PlyPropRules *rules = ply->current_rules;
-
-  /* allocate space for properties and weights, if necessary */
-  if ( rules->max_props == 0 )
-  {
-    rules->max_props = 6;
-    rules->props = ( void * *  ) myalloc ( sizeof ( void * ) * rules->max_props );
-    rules->weights = ( float * ) myalloc ( sizeof ( float ) * rules->max_props );
-  }
-  if ( rules->nprops == rules->max_props )
-  {
-    rules->max_props *= 2;
-    rules->props = ( void * *  ) realloc ( rules->props,
-    sizeof ( void * ) * rules->max_props );
-    rules->weights = ( float * ) realloc ( rules->weights,
-    sizeof ( float ) * rules->max_props );
-  }
-
-  /* remember these new properties and their weights */
-
-  rules->props[rules->nprops] = other_props;
-  rules->weights[rules->nprops] = weight;
-  rules->nprops++;
-}
-
-
-/******************************************************************************
-Return a pointer to a new set of properties that have been created using
-a specified set of property combination rules and a given collection of
-"other" properties.
-
-Exit:
-returns a pointer to the new properties
-******************************************************************************/
-
-void *get_new_props_ply( PlyFile *ply )
-{
-  int             i,j;
-  static double  *vals;
-  static int      max_vals  = 0;
-  PlyPropRules   *rules     = ply->current_rules;
-  PlyElement     *elem      = rules->elem;
-  PlyProperty    *prop;
-  char           *data;
-  char           *new_data;
-  void           *ptr;
-  int             offset;
-  int             type;
-  double          double_val;
-  int             int_val;
-  unsigned int uint_val;
-  int random_pick;
-
-  /* return NULL if we've got no "other" properties */
-  if ( elem->other_size == 0 )
-  {
-    return ( NULL );
-  }
-
-  /* create room for combined other properties */
-  new_data = ( char * ) myalloc ( sizeof ( char ) * elem->other_size );
-
-  /* make sure there is enough room to store values we're to combine */
-
-  if ( max_vals == 0 )
-  {
-    max_vals = rules->nprops;
-    vals = ( double * ) myalloc ( sizeof ( double ) * rules->nprops );
-  }
-  if ( rules->nprops >= max_vals )
-  {
-    max_vals = rules->nprops;
-    vals = ( double * ) realloc ( vals, sizeof ( double ) * rules->nprops );
-  }
-
-  /* in case we need a random choice */
-  random_pick = ( int ) floor ( rules->nprops ); //* drand48());
-
-  /* calculate the combination for each "other" property of the element */
-
-  for ( i = 0; i < elem->nprops; i++ )
-  {
-    /* don't bother with properties we've been asked to store explicitly */
-    if ( elem->store_prop[i] )
-      continue;
-
-    prop = elem->props[i];
-    offset = prop->offset;
-    type = prop->external_type;
-
-    /* collect together all the values we're to combine */
-
-    for ( j = 0; j < rules->nprops; j++ )
-    {
-      data = ( char * ) rules->props[j];
-      ptr = ( void * ) ( data + offset );
-      get_stored_item ( ( void * ) ptr, type, &int_val, &uint_val, &double_val );
-      vals[j] = double_val;
-    }
-
-    /* calculate the combined value */
-
-    switch ( rules->rule_list[i] )
-    {
-      case AVERAGE_RULE:
-        {
-        double  sum         = 0;
-        double  weight_sum  = 0;
-        for ( j = 0; j < rules->nprops; j++ )
-        {
-          sum += vals[j] * rules->weights[j];
-          weight_sum += rules->weights[j];
-        }
-        double_val = sum / weight_sum;
-        break;
-      }
-      case MINIMUM_RULE:
-        {
-        double_val = vals[0];
-        for ( j = 1; j < rules->nprops; j++ )
-          if ( double_val > vals[j] )
-            double_val = vals[j];
-        break;
-      }
-      case MAXIMUM_RULE:
-        {
-        double_val = vals[0];
-        for ( j = 1; j < rules->nprops; j++ )
-          if ( double_val < vals[j] )
-            double_val = vals[j];
-        break;
-      }
-      case RANDOM_RULE:
-        {
-        double_val = vals[random_pick];
-        break;
-      }
-      case SAME_RULE:
-        {
-        double_val = vals[0];
-        for ( j = 1; j < rules->nprops; j++ )
-          if ( double_val != vals[j] )
-          {
-            fprintf ( stderr,
-            "get_new_props_ply: Error combining properties that should be the same.\n" );
-            exit ( -1 );
-          }
-        break;
-      }
-      default:
-        fprintf ( stderr, "get_new_props_ply: Bad rule = %d\n",
-        rules->rule_list[i] );
-        exit ( -1 );
-    }
-
-    /* store the combined value */
-
-    int_val = ( int ) double_val;
-    uint_val = ( unsigned int ) double_val;
-    ptr = ( void * ) ( new_data + offset );
-    store_item ( ( char * ) ptr, type, int_val, uint_val, double_val );
-  }
-
-  return ( ( void * ) new_data );
-}
-
-
-/******************************************************************************
-Set the list of user-specified property combination rules.
-******************************************************************************/
-
-void set_prop_rules_ply( PlyFile *ply, PlyRuleList *prop_rules )
-{
-  ply->rule_list = prop_rules;
-}
-
-
-/******************************************************************************
-Append a property rule to a growing list of user-specified rules.
-
-Entry:
-rule_list - current rule list
-name      - name of property combination rule
-property  - "element.property" says which property the rule affects
-
-Exit:
-returns pointer to the new rule list
-******************************************************************************/
-
-PlyRuleList *append_prop_rule( PlyRuleList *rule_list, char *name, char *property )
-{
-  PlyRuleList  *rule;
-  PlyRuleList  *rule_ptr;
-  char         *str,*str2;
-  char         *ptr;
-
-  /* find . */
-  str = strdup ( property );
-  for ( ptr = str; *ptr != '\0' && *ptr != '.'; ptr++ )
-    ;
-
-  /* split string at . */
-  if ( *ptr == '.' )
-  {
-    *ptr = '\0';
-    str2 = ptr + 1;
-  }
-  else
-  {
-    fprintf ( stderr, "Can't find property '%s' for rule '%s'\n",
-    property, name );
-    return ( rule_list );
-  }
-
-  rule = ( PlyRuleList *  ) malloc ( sizeof ( PlyRuleList ) );
-  rule->name = name;
-  rule->element = str;
-  rule->property = str2;
-  rule->next = NULL;
-
-  /* either start rule list or append to it */
-
-  if ( rule_list == NULL )
-    rule_list = rule;
-  else
-  {
-    /* append new rule to current list */
-    rule_ptr = rule_list;
-    while ( rule_ptr->next != NULL )
-      rule_ptr = rule_ptr->next;
-    rule_ptr->next = rule;
-  }
-
-  /* return pointer to list */
-
-  return ( rule_list );
-}
-
-
-/******************************************************************************
-See if a name matches the name of any property combination rules.
-
-Entry:
-name - name of rule we're trying to match
-
-Exit:
-returns 1 if we find a match, 0 if not
-******************************************************************************/
-
-int matches_rule_name( char *name )
-{
-  int i;
-
-  for ( i = 0; rule_name_list[i].code != -1; i++ )
-    if ( equal_strings ( rule_name_list[i].name, name ) )
-      return ( 1 );
-
-  return ( 0 );
-}
-
diff --git a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/MarchingCubes/ply.h b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/MarchingCubes/ply.h
deleted file mode 100755
index 1925d5e584..0000000000
--- a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/MarchingCubes/ply.h
+++ /dev/null
@@ -1,233 +0,0 @@
-/*
-
-Header for PLY polygon files.
-
-- Greg Turk
-
-A PLY file contains a single polygonal _object_.
-
-An object is composed of lists of _elements_.  Typical elements are
-vertices, faces, edges and materials.
-
-Each type of element for a given object has one or more _properties_
-associated with the element type.  For instance, a vertex element may
-have as properties three floating-point values x,y,z and three unsigned
-chars for red, green and blue.
-
------------------------------------------------------------------------
-
-Copyright (c) 1998 Georgia Institute of Technology.  All rights reserved.
-
-Permission to use, copy, modify and distribute this software and its
-documentation for any purpose is hereby granted without fee, provided
-that the above copyright notice and this permission notice appear in
-all copies of this software and that you do not sell the software.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND WITHOUT WARRANTY OF ANY KIND,
-EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
-WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
-
-*/
-
-#ifndef __PLY_H__
-#define __PLY_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <stdio.h>
-#include <stddef.h>
-
-#define PLY_ASCII      1        /* ascii PLY file */
-#define PLY_BINARY_BE  2        /* binary PLY file, big endian */
-#define PLY_BINARY_LE  3        /* binary PLY file, little endian */
-
-#define PLY_OKAY    0           /* ply routine worked okay */
-#define PLY_ERROR  -1           /* error in ply routine */
-
-/* scalar data types supported by PLY format */
-
-#define StartType  0
-#define Int8       1
-#define Int16      2
-#define Int32      3
-#define Uint8      4
-#define Uint16     5
-#define Uint32     6
-#define Float32    7
-#define Float64    8
-#define EndType    9
-
-#define  PLY_SCALAR  0
-#define  PLY_LIST    1
-#define  PLY_STRING  2
-
-
-typedef struct PlyProperty {    /* description of a property */
-
-char *name;                   /* property name */
-int external_type;            /* file's data type */
-int internal_type;            /* program's data type */
-int offset;                   /* offset bytes of prop in a struct */
-
-int is_list;                  /* 0 = scalar, 1 = list, 2 = char string */
-int count_external;           /* file's count type */
-int count_internal;           /* program's count type */
-int count_offset;             /* offset byte for list count */
-
-} PlyProperty;
-
-typedef struct PlyElement {     /* description of an element */
-char *name;                   /* element name */
-int num;                      /* number of elements in this object */
-int size;                     /* size of element (bytes) or -1 if variable */
-int nprops;                   /* number of properties for this element */
-PlyProperty **props;          /* list of properties in the file */
-char *store_prop;             /* flags: property wanted by user? */
-int other_offset;             /* offset to un-asked-for props, or -1 if none*/
-int other_size;               /* size of other_props structure */
-} PlyElement;
-
-typedef struct PlyOtherProp {   /* describes other properties in an element */
-char *name;                   /* element name */
-int size;                     /* size of other_props */
-int nprops;                   /* number of properties in other_props */
-PlyProperty **props;          /* list of properties in other_props */
-} PlyOtherProp;
-
-typedef struct OtherData { /* for storing other_props for an other element */
-void *other_props;
-} OtherData;
-
-typedef struct OtherElem {     /* data for one "other" element */
-char *elem_name;             /* names of other elements */
-int elem_count;              /* count of instances of each element */
-OtherData **other_data;      /* actual property data for the elements */
-PlyOtherProp *other_props;   /* description of the property data */
-} OtherElem;
-
-typedef struct PlyOtherElems {  /* "other" elements, not interpreted by user */
-int num_elems;                /* number of other elements */
-OtherElem *other_list;        /* list of data for other elements */
-} PlyOtherElems;
-
-#define AVERAGE_RULE  1
-#define MAJORITY_RULE 2
-#define MINIMUM_RULE  3
-#define MAXIMUM_RULE  4
-#define SAME_RULE     5
-#define RANDOM_RULE   6
-
-typedef struct PlyPropRules {   /* rules for combining "other" properties */
-PlyElement *elem;      /* element whose rules we are making */
-int *rule_list;        /* types of rules (AVERAGE_PLY, MAJORITY_PLY, etc.) */
-int nprops;            /* number of properties we're combining so far */
-int max_props;         /* maximum number of properties we have room for now */
-void **props;          /* list of properties we're combining */
-float *weights;        /* list of weights of the properties */
-} PlyPropRules;
-
-typedef struct PlyRuleList {
-char *name;                  /* name of the rule */
-char *element;               /* name of element that rule applies to */
-char *property;              /* name of property that rule applies to */
-struct PlyRuleList *next;    /* pointer for linked list of rules */
-} PlyRuleList;
-
-typedef struct PlyFile {        /* description of PLY file */
-FILE *fp;                     /* file pointer */
-int file_type;                /* ascii or binary */
-float version;                /* version number of file */
-int num_elem_types;           /* number of element types of object */
-PlyElement **elems;           /* list of elements */
-int num_comments;             /* number of comments */
-char **comments;              /* list of comments */
-int num_obj_info;             /* number of items of object information */
-char **obj_info;              /* list of object info items */
-PlyElement *which_elem;       /* element we're currently reading or writing */
-PlyOtherElems *other_elems;   /* "other" elements from a PLY file */
-PlyPropRules *current_rules;  /* current propagation rules */
-PlyRuleList *rule_list;       /* rule list from user */
-} PlyFile;
-
-/* memory allocation */
-/*
-extern char *my_alloc();
-*/
-#define myalloc(mem_size) my_alloc((mem_size), __LINE__, __FILE__)
-
-
-/* old routines */
-
-#if 0
-extern PlyFile *ply_write(FILE *, int, char **, int);
-extern PlyFile *ply_read(FILE *, int *, char ***);
-extern PlyFile *ply_open_for_reading( char *, int *, char ***, int *, float *);
-extern void ply_close(PlyFile *);
-extern PlyOtherProp *ply_get_other_properties(PlyFile *, char *, int);
-#endif
-
-extern void     ply_describe_property( PlyFile * , char * , PlyProperty * );
-extern void     ply_get_property( PlyFile * , char * , PlyProperty * );
-extern void     ply_get_element( PlyFile * , void * );
-
-
-/*** delcaration of routines ***/
-
-PlyOtherElems  *get_other_element_ply( PlyFile * );
-
-PlyFile        *read_ply( FILE * );
-PlyFile        *write_ply( FILE * , int, char ** , int );
-extern PlyFile *open_for_writing_ply( char * , int, char ** , int );
-void            close_ply( PlyFile * );
-void            free_ply( PlyFile * );
-
-void            get_info_ply( PlyFile * , float * , int * );
-void            free_other_elements_ply( PlyOtherElems * );
-
-void            append_comment_ply( PlyFile * , char * );
-void            append_obj_info_ply( PlyFile * , char * );
-void            copy_comments_ply( PlyFile * , PlyFile * );
-void            copy_obj_info_ply( PlyFile * , PlyFile * );
-char*          *get_comments_ply( PlyFile * , int * );
-char*          *get_obj_info_ply( PlyFile * , int * );
-
-char*          *get_element_list_ply( PlyFile * , int * );
-int             setup_property_ply( PlyFile * , PlyProperty * );
-void            get_element_ply( PlyFile * , void * );
-char           *setup_element_read_ply( PlyFile * , int, int * );
-PlyOtherProp   *get_other_properties_ply( PlyFile * , int );
-
-void            element_count_ply( PlyFile * , char * , int );
-void            describe_element_ply( PlyFile * , char * , int );
-void            describe_property_ply( PlyFile * , PlyProperty * );
-void            describe_other_properties_ply( PlyFile * , PlyOtherProp * , int );
-void            describe_other_elements_ply( PlyFile * , PlyOtherElems * );
-void            get_element_setup_ply( PlyFile * , char * , int, PlyProperty * );
-PlyProperty*   *get_element_description_ply( PlyFile * , char * , int * , int * );
-void            element_layout_ply( PlyFile * , char * , int, int, PlyProperty * );
-
-void            header_complete_ply( PlyFile * );
-void            put_element_setup_ply( PlyFile * , char * );
-void            put_element_ply( PlyFile * , void * );
-void            put_other_elements_ply( PlyFile * );
-
-PlyPropRules   *init_rule_ply( PlyFile * , char * );
-void            modify_rule_ply( PlyPropRules * , char * , int );
-void            start_props_ply( PlyFile * , PlyPropRules * );
-void            weight_props_ply( PlyFile * , float, void * );
-void           *get_new_props_ply( PlyFile * );
-void            set_prop_rules_ply( PlyFile * , PlyRuleList * );
-PlyRuleList    *append_prop_rule( PlyRuleList * , char * , char * );
-int             matches_rule_name( char * );
-
-int             equal_strings( char * , char * );
-char           *recreate_command_line( int, char *argv[] );
-
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !__PLY_H__ */
-
diff --git a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/cvMeshSurfaceSimplify.C b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/cvMeshSurfaceSimplify.C
index c3518ef1a0..ae4f8812f7 100644
--- a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/cvMeshSurfaceSimplify.C
+++ b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/cvMeshSurfaceSimplify.C
@@ -28,6 +28,7 @@ Description
     Simplifies surfaces by resampling.
 
     Uses Thomas Lewiner's topology preserving MarchingCubes.
+    (http://zeus.mat.puc-rio.br/tomlew/tomlew_uk.php)
 
 \*---------------------------------------------------------------------------*/
 
@@ -37,13 +38,328 @@ Description
 #include "conformationSurfaces.H"
 #include "triSurfaceMesh.H"
 
-#include "MarchingCubes.h"
-
+#include "opt_octree.h"
+#include "cube.h"
 
 using namespace Foam;
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+class pointConversion
+{
+    const vector scale_;
+
+    const vector offset_;
+
+public:
+
+    //- Construct from components
+    pointConversion
+    (
+        const vector scale,
+        const vector offset
+    )
+    :
+        scale_(scale),
+        offset_(offset)
+    {}
+
+    inline Point toLocal(const Foam::point& pt) const
+    {
+        Foam::point p = cmptMultiply(scale_, (pt + offset_));
+        return Point(p.x(), p.y(), p.z());
+    }
+
+    inline Foam::point toGlobal(const Point& pt) const
+    {
+        point p(pt.x(), pt.y(), pt.z());
+        return cmptDivide(p, scale_) - offset_;
+    }
+};
+
+
+
+
+// For use in Fast-Dual Octree from Thomas Lewiner
+class distanceCalc
+:
+    public ::data_access
+{
+
+    const Level min_level_;
+
+    const conformationSurfaces& geometryToConformTo_;
+
+    const pointConversion& converter_;
+
+
+    // Private Member Functions
+
+    scalar signedDistance(const Foam::point& pt) const
+    {
+        const searchableSurfaces& geometry = geometryToConformTo_.geometry();
+        const labelList& surfaces = geometryToConformTo_.surfaces();
+
+        static labelList nearestSurfaces;
+        static scalarField distance;
+
+        static pointField samples(1);
+        samples[0] = pt;
+
+        searchableSurfacesQueries::signedDistance
+        (
+            geometry,
+            surfaces,
+            samples,
+            scalarField(1, GREAT),
+            searchableSurface::OUTSIDE,
+            nearestSurfaces,
+            distance
+        );
+
+        return distance[0];
+    }
+
+
+public:
+
+    // Constructors
+
+        //- Construct from components
+        distanceCalc
+        (
+            Level max_level_,
+            real iso_val_,
+            Level min_level,
+            const conformationSurfaces& geometryToConformTo,
+            const pointConversion& converter
+        )
+        :
+            data_access(max_level_,iso_val_),
+            min_level_(min_level),
+            geometryToConformTo_(geometryToConformTo),
+            converter_(converter)
+        {}
+
+
+    //- Destructor
+    virtual ~distanceCalc()
+    {}
+
+
+    // Member Functions
+
+        //- test function
+        virtual bool need_refine( const Cube &c )
+        {
+            int l = c.lv() ;
+
+            if( l >= _max_level ) return false;
+            if( l < min_level_ ) return true;
+
+            treeBoundBox bb
+            (
+                converter_.toGlobal
+                (
+                    Point
+                    (
+                        c.xmin(),
+                        c.ymin(),
+                        c.zmin()
+                    )
+                ),
+                converter_.toGlobal
+                (
+                    Point
+                    (
+                        c.xmax(),
+                        c.ymax(),
+                        c.zmax()
+                    )
+                )
+            );
+
+            const searchableSurfaces& geometry =
+                geometryToConformTo_.geometry();
+            const labelList& surfaces =
+                geometryToConformTo_.surfaces();
+
+
+            //- Uniform refinement around surface
+            {
+                forAll(surfaces, i)
+                {
+                    if (geometry[surfaces[i]].overlaps(bb))
+                    {
+                        return true;
+                    }
+                }
+                return false;
+            }
+
+
+            ////- Surface intersects bb (but not using intersection test)
+            //scalar ccDist = signedDistance(bb.midpoint());
+            //scalar ccVal = ccDist - _iso_val;
+            //if (mag(ccVal) < SMALL)
+            //{
+            //    return true;
+            //}
+            //const pointField points(bb.points());
+            //forAll(points, pointI)
+            //{
+            //    scalar pointVal = signedDistance(points[pointI]) - _iso_val;
+            //    if (ccVal*pointVal < 0)
+            //    {
+            //        return true;
+            //    }
+            //}
+            //return false;
+
+
+            ////- Refinement based on intersection with multiple planes.
+            ////  Does not work well - too high a ratio between
+            ////  neighbouring cubes.
+            //const pointField points(bb.points());
+            //const edgeList& edges = treeBoundBox::edges;
+            //pointField start(edges.size());
+            //pointField end(edges.size());
+            //forAll(edges, i)
+            //{
+            //    start[i] = points[edges[i][0]];
+            //    end[i] = points[edges[i][1]];
+            //}
+            //Foam::List<Foam::List<pointIndexHit> > hitInfo;
+            //labelListList hitSurfaces;
+            //searchableSurfacesQueries::findAllIntersections
+            //(
+            //    geometry,
+            //    surfaces,
+            //    start,
+            //    end,
+            //    hitSurfaces,
+            //    hitInfo
+            //);
+            //
+            //// Count number of intersections
+            //label nInt = 0;
+            //forAll(hitSurfaces, edgeI)
+            //{
+            //    nInt += hitSurfaces[edgeI].size();
+            //}
+            //
+            //if (nInt == 0)
+            //{
+            //    // No surface intersected. See if there is one inside
+            //    forAll(surfaces, i)
+            //    {
+            //        if (geometry[surfaces[i]].overlaps(bb))
+            //        {
+            //            return true;
+            //        }
+            //    }
+            //    return false;
+            //}
+            //
+            //// Check multiple surfaces
+            //label baseSurfI = -1;
+            //forAll(hitSurfaces, edgeI)
+            //{
+            //    const labelList& hSurfs = hitSurfaces[edgeI];
+            //    forAll(hSurfs, i)
+            //    {
+            //        if (baseSurfI == -1)
+            //        {
+            //            baseSurfI = hSurfs[i];
+            //        }
+            //        else if (baseSurfI != hSurfs[i])
+            //        {
+            //            // Multiple surfaces
+            //            return true;
+            //        }
+            //    }
+            //}
+            //
+            //// Get normals
+            //DynamicList<pointIndexHit> baseInfo(nInt);
+            //forAll(hitInfo, edgeI)
+            //{
+            //    const Foam::List<pointIndexHit>& hits = hitInfo[edgeI];
+            //    forAll(hits, i)
+            //    {
+            //        (void)hits[i].hitPoint();
+            //        baseInfo.append(hits[i]);
+            //    }
+            //}
+            //vectorField normals;
+            //geometry[surfaces[baseSurfI]].getNormal(baseInfo, normals);
+            //for (label i = 1; i < normals.size(); ++i)
+            //{
+            //    if ((normals[0] & normals[i]) < 0.9)
+            //    {
+            //        return true;
+            //    }
+            //}
+            //labelList regions;
+            //geometry[surfaces[baseSurfI]].getRegion(baseInfo, regions);
+            //for (label i = 1; i < regions.size(); ++i)
+            //{
+            //    if (regions[0] != regions[i])
+            //    {
+            //        return true;
+            //    }
+            //}
+            //return false;
+
+
+
+            //samples[0] = point(c.xmin(), c.ymin(), c.zmin());
+            //samples[1] = point(c.xmax(), c.ymin(), c.zmin());
+            //samples[2] = point(c.xmax(), c.ymax(), c.zmin());
+            //samples[3] = point(c.xmin(), c.ymax(), c.zmin());
+            //
+            //samples[4] = point(c.xmin(), c.ymin(), c.zmax());
+            //samples[5] = point(c.xmax(), c.ymin(), c.zmax());
+            //samples[6] = point(c.xmax(), c.ymax(), c.zmax());
+            //samples[7] = point(c.xmin(), c.ymax(), c.zmax());
+
+            //scalarField nearestDistSqr(8, GREAT);
+            //
+            //Foam::List<pointIndexHit> nearestInfo;
+            //surf_.findNearest(samples, nearestDistSqr, nearestInfo);
+            //vectorField normals;
+            //surf_.getNormal(nearestInfo, normals);
+            //
+            //for (label i = 1; i < normals.size(); ++i)
+            //{
+            //    if ((normals[0] & normals[i]) < 0.5)
+            //    {
+            //        return true;
+            //    }
+            //}
+            //return false;
+
+            //// Check if surface octree same level
+            //const labelList elems(surf_.tree().findBox(bb));
+            //
+            //if (elems.size() > 1)
+            //{
+            //    return true;
+            //}
+            //else
+            //{
+            //  return false;
+            //}
+        }
+
+        //- data function
+        virtual real value_at( const Cube &c )
+        {
+            return signedDistance(converter_.toGlobal(c)) - _iso_val;
+        }
+};
+
+
 // Main program:
 
 int main(int argc, char *argv[])
@@ -52,19 +368,16 @@ int main(int argc, char *argv[])
     (
         "Re-sample surfaces used in cvMesh operation"
     );
-    //argList::validArgs.append("inputFile");
-    argList::validArgs.append("(nx ny nz)");
     argList::validArgs.append("outputName");
 
     #include "setRootCase.H"
     #include "createTime.H"
     runTime.functionObjects().off();
 
-    const Vector<label> n(IStringStream(args.args()[1])());
-    const fileName exportName = args.args()[2];
+    const fileName exportName = args.args()[1];
 
     Info<< "Reading surfaces as specified in the cvMeshDict and"
-        << " writing re-sampled " << n << " to " << exportName
+        << " writing a re-sampled surface to " << exportName
         << nl << endl;
 
     cpuTime timer;
@@ -114,126 +427,100 @@ int main(int argc, char *argv[])
         << timer.cpuTimeIncrement() << " s." << nl << endl;
 
 
-
-    // Extend
-    treeBoundBox bb = geometryToConformTo.globalBounds();
-    {
-        const vector smallVec = 0.1*bb.span();
-        bb.min() -= smallVec;
-        bb.max() += smallVec;
-    }
-
-    Info<< "Meshing to bounding box " << bb << nl << endl;
-
-    const vector span(bb.span());
-    const vector d
-    (
-        span.x()/(n.x()-1),
-        span.y()/(n.y()-1),
-        span.z()/(n.z()-1)
-    );
-
-    MarchingCubes mc(span.x(), span.y(), span.z() ) ;
-    mc.set_resolution(n.x(), n.y(), n.z());
-    mc.init_all() ;
-
-
-    // Generate points
-    pointField points(mc.size_x()*mc.size_y()*mc.size_z());
-    label pointI = 0;
-
-    point pt;
-    for( int k = 0 ; k < mc.size_z() ; k++ )
-    {
-        pt.z() = bb.min().z() + k*d.z();
-        for( int j = 0 ; j < mc.size_y() ; j++ )
-        {
-            pt.y() = bb.min().y() + j*d.y();
-            for( int i = 0 ; i < mc.size_x() ; i++ )
-            {
-                pt.x() = bb.min().x() + i*d.x();
-                points[pointI++] = pt;
-            }
-        }
-    }
-
-    Info<< "Generated " << points.size() << " sampling points in = "
-        << timer.cpuTimeIncrement() << " s." << nl << endl;
-
-
-    // Compute data
     const searchableSurfaces& geometry = geometryToConformTo.geometry();
     const labelList& surfaces = geometryToConformTo.surfaces();
 
-    scalarField signedDist;
-    labelList nearestSurfaces;
-    searchableSurfacesQueries::signedDistance
+
+    const label minLevel = 2;
+
+    // The max cube size follows from the minLevel and the default cube size
+    // (1)
+    const scalar maxSize = 1.0 / (1 << minLevel);
+    const scalar halfMaxSize = 0.5*maxSize;
+
+
+    // Scale the geometry to fit within
+    // halfMaxSize .. 1-halfMaxSize
+
+    scalar wantedRange = 1.0-maxSize;
+
+    const treeBoundBox bb = geometryToConformTo.globalBounds();
+
+    const vector scale = cmptDivide
     (
-        geometry,
-        surfaces,
-        points,
-        scalarField(points.size(), sqr(GREAT)),
-        searchableSurface::OUTSIDE,     // for non-closed surfaces treat as
-                                        // outside
-        nearestSurfaces,
-        signedDist
+        point(wantedRange, wantedRange, wantedRange),
+        bb.span()
+    );
+    const vector offset =
+        cmptDivide
+        (
+            point(halfMaxSize, halfMaxSize, halfMaxSize),
+            scale
+        )
+       -bb.min();
+
+
+    const pointConversion converter(scale, offset);
+
+
+    // Marching cubes
+
+    OptOctree octree;
+
+    distanceCalc ref
+    (
+        8,          //maxLevel
+        0.0,        //distance
+        minLevel,   //minLevel
+        geometryToConformTo,
+        converter
     );
 
-    // Fill elements
-    pointI = 0;
-    for( int k = 0 ; k < mc.size_z() ; k++ )
-    {
-        for( int j = 0 ; j < mc.size_y() ; j++ )
-        {
-            for( int i = 0 ; i < mc.size_x() ; i++ )
-            {
-                mc.set_data(float(signedDist[pointI++]), i, j, k);
-            }
-        }
-    }
+    octree.refine(&ref);
+    octree.set_impl(&ref);
 
-    Info<< "Determined signed distance in = "
+    Info<< "Calculated octree in = "
         << timer.cpuTimeIncrement() << " s." << nl << endl;
 
+    MarchingCubes& mc = octree.mc();
 
-    mc.run() ;
+    mc.clean_all() ;
+    octree.build_isosurface(&ref) ;
 
-    Info<< "Constructed iso surface in = "
+    Info<< "Constructed iso surface of distance in = "
         << timer.cpuTimeIncrement() << " s." << nl << endl;
 
-
-    mc.clean_temps() ;
-
-
-
     // Write output file
     if (mc.ntrigs() > 0)
     {
         Triangle* triangles = mc.triangles();
-        List<labelledTri> tris(mc.ntrigs());
-        forAll(tris, triI)
+        label nTris = mc.ntrigs();
+        Foam::DynamicList<labelledTri> tris(mc.ntrigs());
+        for (label triI = 0; triI < nTris; ++triI)
         {
-            tris[triI] = labelledTri
-            (
-                triangles[triI].v1,
-                triangles[triI].v2,
-                triangles[triI].v3,
-                0                       // region
-            );
+            const Triangle& t = triangles[triI];
+            if (t.v1 != t.v2 && t.v1 != t.v3 && t.v2 != t.v3)
+            {
+                tris.append
+                (
+                    labelledTri
+                    (
+                        triangles[triI].v1,
+                        triangles[triI].v2,
+                        triangles[triI].v3,
+                        0                       // region
+                    )
+                );
+            }
         }
 
 
-        Vertex* vertices = mc.vertices();
+        Point* vertices = mc.vertices();
         pointField points(mc.nverts());
         forAll(points, pointI)
         {
-            Vertex& v = vertices[pointI];
-            points[pointI] = point
-            (
-                bb.min().x() + v.x*span.x()/mc.size_x(),
-                bb.min().y() + v.y*span.y()/mc.size_y(),
-                bb.min().z() + v.z*span.z()/mc.size_z()
-            );
+            const Point& v = vertices[pointI];
+            points[pointI] = converter.toGlobal(v);
         }
 
 
@@ -267,6 +554,7 @@ int main(int argc, char *argv[])
         }
 
         triSurface s(tris, patches, points, true);
+        tris.clearStorage();
 
         Info<< "Extracted triSurface in = "
             << timer.cpuTimeIncrement() << " s." << nl << endl;
@@ -274,7 +562,7 @@ int main(int argc, char *argv[])
 
         // Find out region on local surface of nearest point
         {
-            List<pointIndexHit> hitInfo;
+            Foam::List<pointIndexHit> hitInfo;
             labelList hitSurfaces;
             geometryToConformTo.findSurfaceNearest
             (
@@ -342,7 +630,6 @@ int main(int argc, char *argv[])
 
     mc.clean_all() ;
 
-
     Info<< "End\n" << endl;
 
     return 0;
diff --git a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/cvMeshSurfaceSimplify_non_octree.C b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/cvMeshSurfaceSimplify_non_octree.C
new file mode 100644
index 0000000000..c3518ef1a0
--- /dev/null
+++ b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/cvMeshSurfaceSimplify_non_octree.C
@@ -0,0 +1,352 @@
+/*---------------------------------------------------------------------------*\
+ =========                   |
+ \\      /   F ield          | OpenFOAM: The Open Source CFD Toolbox
+  \\    /    O peration      |
+   \\  /     A nd            | Copyright (C) 2012 OpenFOAM Foundation
+    \\/      M anipulation   |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Application
+    cvMeshSurfaceSimplify
+
+Description
+    Simplifies surfaces by resampling.
+
+    Uses Thomas Lewiner's topology preserving MarchingCubes.
+
+\*---------------------------------------------------------------------------*/
+
+#include "argList.H"
+#include "Time.H"
+#include "searchableSurfaces.H"
+#include "conformationSurfaces.H"
+#include "triSurfaceMesh.H"
+
+#include "MarchingCubes.h"
+
+
+using namespace Foam;
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// Main program:
+
+int main(int argc, char *argv[])
+{
+    argList::addNote
+    (
+        "Re-sample surfaces used in cvMesh operation"
+    );
+    //argList::validArgs.append("inputFile");
+    argList::validArgs.append("(nx ny nz)");
+    argList::validArgs.append("outputName");
+
+    #include "setRootCase.H"
+    #include "createTime.H"
+    runTime.functionObjects().off();
+
+    const Vector<label> n(IStringStream(args.args()[1])());
+    const fileName exportName = args.args()[2];
+
+    Info<< "Reading surfaces as specified in the cvMeshDict and"
+        << " writing re-sampled " << n << " to " << exportName
+        << nl << endl;
+
+    cpuTime timer;
+
+    IOdictionary cvMeshDict
+    (
+        IOobject
+        (
+            "cvMeshDict",
+            runTime.system(),
+            runTime,
+            IOobject::MUST_READ_IF_MODIFIED,
+            IOobject::NO_WRITE
+        )
+    );
+
+    // Define/load all geometry
+    searchableSurfaces allGeometry
+    (
+        IOobject
+        (
+            "cvSearchableSurfaces",
+            runTime.constant(),
+            "triSurface",
+            runTime,
+            IOobject::MUST_READ,
+            IOobject::NO_WRITE
+        ),
+        cvMeshDict.subDict("geometry")
+    );
+
+    Info<< "Geometry read in = "
+        << timer.cpuTimeIncrement() << " s." << nl << endl;
+
+
+    Random rndGen(64293*Pstream::myProcNo());
+
+    conformationSurfaces geometryToConformTo
+    (
+        runTime,
+        rndGen,
+        allGeometry,
+        cvMeshDict.subDict("surfaceConformation")
+    );
+
+    Info<< "Set up geometry in = "
+        << timer.cpuTimeIncrement() << " s." << nl << endl;
+
+
+
+    // Extend
+    treeBoundBox bb = geometryToConformTo.globalBounds();
+    {
+        const vector smallVec = 0.1*bb.span();
+        bb.min() -= smallVec;
+        bb.max() += smallVec;
+    }
+
+    Info<< "Meshing to bounding box " << bb << nl << endl;
+
+    const vector span(bb.span());
+    const vector d
+    (
+        span.x()/(n.x()-1),
+        span.y()/(n.y()-1),
+        span.z()/(n.z()-1)
+    );
+
+    MarchingCubes mc(span.x(), span.y(), span.z() ) ;
+    mc.set_resolution(n.x(), n.y(), n.z());
+    mc.init_all() ;
+
+
+    // Generate points
+    pointField points(mc.size_x()*mc.size_y()*mc.size_z());
+    label pointI = 0;
+
+    point pt;
+    for( int k = 0 ; k < mc.size_z() ; k++ )
+    {
+        pt.z() = bb.min().z() + k*d.z();
+        for( int j = 0 ; j < mc.size_y() ; j++ )
+        {
+            pt.y() = bb.min().y() + j*d.y();
+            for( int i = 0 ; i < mc.size_x() ; i++ )
+            {
+                pt.x() = bb.min().x() + i*d.x();
+                points[pointI++] = pt;
+            }
+        }
+    }
+
+    Info<< "Generated " << points.size() << " sampling points in = "
+        << timer.cpuTimeIncrement() << " s." << nl << endl;
+
+
+    // Compute data
+    const searchableSurfaces& geometry = geometryToConformTo.geometry();
+    const labelList& surfaces = geometryToConformTo.surfaces();
+
+    scalarField signedDist;
+    labelList nearestSurfaces;
+    searchableSurfacesQueries::signedDistance
+    (
+        geometry,
+        surfaces,
+        points,
+        scalarField(points.size(), sqr(GREAT)),
+        searchableSurface::OUTSIDE,     // for non-closed surfaces treat as
+                                        // outside
+        nearestSurfaces,
+        signedDist
+    );
+
+    // Fill elements
+    pointI = 0;
+    for( int k = 0 ; k < mc.size_z() ; k++ )
+    {
+        for( int j = 0 ; j < mc.size_y() ; j++ )
+        {
+            for( int i = 0 ; i < mc.size_x() ; i++ )
+            {
+                mc.set_data(float(signedDist[pointI++]), i, j, k);
+            }
+        }
+    }
+
+    Info<< "Determined signed distance in = "
+        << timer.cpuTimeIncrement() << " s." << nl << endl;
+
+
+    mc.run() ;
+
+    Info<< "Constructed iso surface in = "
+        << timer.cpuTimeIncrement() << " s." << nl << endl;
+
+
+    mc.clean_temps() ;
+
+
+
+    // Write output file
+    if (mc.ntrigs() > 0)
+    {
+        Triangle* triangles = mc.triangles();
+        List<labelledTri> tris(mc.ntrigs());
+        forAll(tris, triI)
+        {
+            tris[triI] = labelledTri
+            (
+                triangles[triI].v1,
+                triangles[triI].v2,
+                triangles[triI].v3,
+                0                       // region
+            );
+        }
+
+
+        Vertex* vertices = mc.vertices();
+        pointField points(mc.nverts());
+        forAll(points, pointI)
+        {
+            Vertex& v = vertices[pointI];
+            points[pointI] = point
+            (
+                bb.min().x() + v.x*span.x()/mc.size_x(),
+                bb.min().y() + v.y*span.y()/mc.size_y(),
+                bb.min().z() + v.z*span.z()/mc.size_z()
+            );
+        }
+
+
+        // Find correspondence to original surfaces
+        labelList regionOffsets(surfaces.size());
+        label nRegions = 0;
+        forAll(surfaces, i)
+        {
+            const wordList& regions = geometry[surfaces[i]].regions();
+            regionOffsets[i] = nRegions;
+            nRegions += regions.size();
+        }
+
+
+        geometricSurfacePatchList patches(nRegions);
+        nRegions = 0;
+        forAll(surfaces, i)
+        {
+            const wordList& regions = geometry[surfaces[i]].regions();
+
+            forAll(regions, regionI)
+            {
+                patches[nRegions] = geometricSurfacePatch
+                (
+                    "patch",
+                    geometry[surfaces[i]].name() + "_" + regions[regionI],
+                    nRegions
+                );
+                nRegions++;
+            }
+        }
+
+        triSurface s(tris, patches, points, true);
+
+        Info<< "Extracted triSurface in = "
+            << timer.cpuTimeIncrement() << " s." << nl << endl;
+
+
+        // Find out region on local surface of nearest point
+        {
+            List<pointIndexHit> hitInfo;
+            labelList hitSurfaces;
+            geometryToConformTo.findSurfaceNearest
+            (
+                s.faceCentres(),
+                scalarField(s.size(), sqr(GREAT)),
+                hitInfo,
+                hitSurfaces
+            );
+
+            // Get region
+            DynamicList<pointIndexHit> surfInfo(hitSurfaces.size());
+            DynamicList<label> surfIndices(hitSurfaces.size());
+
+            forAll(surfaces, surfI)
+            {
+                // Extract info on this surface
+                surfInfo.clear();
+                surfIndices.clear();
+                forAll(hitSurfaces, triI)
+                {
+                    if (hitSurfaces[triI] == surfI)
+                    {
+                        surfInfo.append(hitInfo[triI]);
+                        surfIndices.append(triI);
+                    }
+                }
+
+                // Calculate sideness of these surface points
+                labelList region;
+                geometry[surfaces[surfI]].getRegion(surfInfo, region);
+
+                forAll(region, i)
+                {
+                    label triI = surfIndices[i];
+                    s[triI].region() = regionOffsets[surfI]+region[i];
+                }
+            }
+        }
+
+        Info<< "Re-patched surface in = "
+            << timer.cpuTimeIncrement() << " s." << nl << endl;
+
+        triSurfaceMesh smesh
+        (
+            IOobject
+            (
+                exportName,
+                runTime.constant(), // instance
+                "triSurface",
+                runTime,            // registry
+                IOobject::NO_READ,
+                IOobject::AUTO_WRITE,
+                false
+            ),
+            s
+        );
+
+        Info<< "writing surfMesh:\n  "
+            << smesh.searchableSurface::objectPath() << nl << endl;
+        smesh.searchableSurface::write();
+
+        Info<< "Written surface in = "
+            << timer.cpuTimeIncrement() << " s." << nl << endl;
+    }
+
+    mc.clean_all() ;
+
+
+    Info<< "End\n" << endl;
+
+    return 0;
+}
+
+
+// ************************************************************************* //
diff --git a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/.DS_Store b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..34e72fcf2de0672f41dfd605d7d75558556d0f43
GIT binary patch
literal 6148
zcmeHK-D(p-6h70gx@i@1Q|RT;>rhig+JF~Jh~R}tA(dWOsk?4%7T0dbOd26Z7hlL%
z@G1H{eskt%Eolluu|?*<%y;Je&VH~vJ4B?q<9v&#NklP*!)OK5CF1;U%*m2ioKv|P
z*~AR9vdXajJ{KJffq}rlZDYW_yAkD-lBM*|_ct4sg|Y4SnOa(o?%cf>$1CyugZ<(p
zuO{7Ue3F~j{XsS97x__^j^40tQ#&@@bi|(B)DGZbeXpuY=m!$LU*vXh*j%4ZJKH-g
z-PxJ7^mMEJXuGAKbRN%UjYiyP{)pE$HlIG<OFz%Pe62li3ZEI42ZF!g8<gLVk(+mA
zhK|m;O1pGKBg_STqD^`aJ*DHJ&0dU+9U)?kUXkG#Ll411MIWiedV*CCXy^l5hge@#
z@1@jR(D9PoV^l}CYun3ty}#efDKlWNZ7=8b7VSkMz)O&uVL)D{c=cx5hpvHvz`!kL
zz<nPyhQma#_Q;<OOne0ZMliELcXtVwqXiSe+9Ny=<x_z^Rml}Y`E=N|#3h2YN1slL
zJEM+tR&qm8+#Pn!;iM9eVGaxg1}-wN?3Yb<{y$rM|G$_NR)K-Qz<<SnihBKC7mp-o
y>)gY+vsPog#c<-{YLA?PNsePy+)=!a!2+Ll3NR6@J;DMBKLSicm;wX;l!2cve43#E

literal 0
HcmV?d00001

diff --git a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/CMakeLists.txt b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/CMakeLists.txt
new file mode 100644
index 0000000000..9140ecaa19
--- /dev/null
+++ b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/CMakeLists.txt
@@ -0,0 +1,96 @@
+PROJECT(fastDualOctree)
+
+cmake_minimum_required(VERSION 2.8)
+
+#---------------------------------------------------
+#----- Dependencies
+#---------------------------------------------------
+FIND_PACKAGE(OpenGL REQUIRED)
+if ( OPENGL_FOUND )
+   message( "-- OpenGL found. include=${OPENGL_INCLUDE_DIR}" )
+   include_directories( ${OPENGL_INCLUDE_DIR} )
+endif ( OPENGL_FOUND )
+
+FIND_PACKAGE(ZLIB REQUIRED)
+if ( ZLIB_FOUND )
+   message( "-- zlib found. include=${ZLIB_INCLUDE_DIR}" )
+   include_directories( ${ZLIB_INCLUDE_DIR} )
+endif ( ZLIB_FOUND )
+
+FIND_PACKAGE(PNG REQUIRED)
+if ( PNG_FOUND )
+   message( "-- PNG found. include=${PNG_INCLUDE_DIR}" )
+   include_directories( ${PNG_INCLUDE_DIR} )
+endif ( PNG_FOUND )
+
+##-- GLUI dependency 
+#FIND_PATH(GLUI_INCLUDE_DIR GL/glui.h ~/pub/system/glui-2.36/src/include)
+#FIND_LIBRARY(GLUI_LIBRARIES
+#      NAMES GLUI glui
+#            GLUT glut
+#      PATHS /usr/local/lib/
+#            /usr/lib/
+#            /opt/graphics/OpenGL/lib
+#            /usr/openwin/lib
+#            /usr/shlib
+#            /usr/X11R6/lib
+#            ~/pub/system/glui-2.36/src/lib
+#    )
+#if ( GLUI_INCLUDE_DIR )
+#   message( "-- GL/glui.h found. include=${GLUI_INCLUDE_DIR}" )
+#   include_directories( ${GLUI_INCLUDE_DIR} )
+#else ( GLUI_INCLUDE_DIR )
+#   message( "-- GL/glui.h not found." )
+#endif ( GLUI_INCLUDE_DIR )
+#if ( GLUI_LIBRARIES )
+#   message( "-- libglui found. include=${GLUI_LIBRARIES}" )
+#else( GLUI_LIBRARIES )
+#   message( "-- libglui not found." )
+#endif ( GLUI_LIBRARIES )
+
+#---------------------------------------------------
+# -- Environement variables
+#---------------------------------------------------
+if (UNIX)
+  add_definitions(-DUNIX)
+endif (UNIX)
+if (WIN32)
+  add_definitions(-DWIN32)
+endif (WIN32)
+if (APPLE)
+  add_definitions(-DAPPLE)
+endif (APPLE)
+
+#---------------------------------------------------
+# -- SRCs
+#---------------------------------------------------
+
+SET(Perf_SRC ${Perf_SRC}
+  data_access.cpp  
+  hash_octree.cpp    
+  mc_draw.cpp     
+  opt_octree.cpp  
+  fparser.cpp      
+  leaf_octree.cpp    
+  mem_octree.cpp  
+  fpoptimizer.cpp  
+  MarchingCubes.cpp  
+  morton.cpp      
+  ptr_octree.cpp
+)
+
+#SET(VIZ_SRC ${VIZ_SRC}
+# viz_glui_cmdline.cpp  
+# viz_glui_controls.cpp  
+# viz_glui_draws.cpp  
+# viz_glui_export.cpp  
+# viz_glui_mouse.cpp 
+#)
+
+
+add_executable(perf_main  perf_main ${Perf_SRC})
+target_link_libraries(perf_main ${OPENGL_LIBRARIES} ${ZLIB_LIBRARIES})
+
+
+#add_executable(viz_glui_main viz_glui_main ${Perf_SRC} ${VIZ_SRC} )
+#target_link_libraries(viz_glui_main ${OPENGL_LIBRARIES} ${ZLIB_LIBRARIES} ${PNG_LIBRARIES} ${GLUI_LIBRARIES})
diff --git a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/Doxyfile b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/Doxyfile
new file mode 100644
index 0000000000..2667a0f7b6
--- /dev/null
+++ b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/Doxyfile
@@ -0,0 +1,1551 @@
+# Doxyfile 1.6.1
+
+# This file describes the settings to be used by the documentation system
+# doxygen (www.doxygen.org) for a project
+#
+# All text after a hash (#) is considered a comment and will be ignored
+# The format is:
+#       TAG = value [value, ...]
+# For lists items can also be appended using:
+#       TAG += value [value, ...]
+# Values that contain spaces should be placed between quotes (" ")
+
+#---------------------------------------------------------------------------
+# Project related configuration options
+#---------------------------------------------------------------------------
+
+# This tag specifies the encoding used for all characters in the config file
+# that follow. The default is UTF-8 which is also the encoding used for all
+# text before the first occurrence of this tag. Doxygen uses libiconv (or the
+# iconv built into libc) for the transcoding. See
+# http://www.gnu.org/software/libiconv for the list of possible encodings.
+
+DOXYFILE_ENCODING      = UTF-8
+
+# The PROJECT_NAME tag is a single word (or a sequence of words surrounded
+# by quotes) that should identify the project.
+
+PROJECT_NAME           = DualOctree
+
+# The PROJECT_NUMBER tag can be used to enter a project or revision number.
+# This could be handy for archiving the generated documentation or
+# if some version control system is used.
+
+PROJECT_NUMBER         = 1.0
+
+# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
+# base path where the generated documentation will be put.
+# If a relative path is entered, it will be relative to the location
+# where doxygen was started. If left blank the current directory will be used.
+
+OUTPUT_DIRECTORY       = doc
+
+# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create
+# 4096 sub-directories (in 2 levels) under the output directory of each output
+# format and will distribute the generated files over these directories.
+# Enabling this option can be useful when feeding doxygen a huge amount of
+# source files, where putting all generated files in the same directory would
+# otherwise cause performance problems for the file system.
+
+CREATE_SUBDIRS         = NO
+
+# The OUTPUT_LANGUAGE tag is used to specify the language in which all
+# documentation generated by doxygen is written. Doxygen will use this
+# information to generate all constant output in the proper language.
+# The default language is English, other supported languages are:
+# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional,
+# Croatian, Czech, Danish, Dutch, Esperanto, Farsi, Finnish, French, German,
+# Greek, Hungarian, Italian, Japanese, Japanese-en (Japanese with English
+# messages), Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian,
+# Polish, Portuguese, Romanian, Russian, Serbian, Serbian-Cyrilic, Slovak,
+# Slovene, Spanish, Swedish, Ukrainian, and Vietnamese.
+
+OUTPUT_LANGUAGE        = English
+
+# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will
+# include brief member descriptions after the members that are listed in
+# the file and class documentation (similar to JavaDoc).
+# Set to NO to disable this.
+
+BRIEF_MEMBER_DESC      = YES
+
+# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend
+# the brief description of a member or function before the detailed description.
+# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
+# brief descriptions will be completely suppressed.
+
+REPEAT_BRIEF           = YES
+
+# This tag implements a quasi-intelligent brief description abbreviator
+# that is used to form the text in various listings. Each string
+# in this list, if found as the leading text of the brief description, will be
+# stripped from the text and the result after processing the whole list, is
+# used as the annotated text. Otherwise, the brief description is used as-is.
+# If left blank, the following values are used ("$name" is automatically
+# replaced with the name of the entity): "The $name class" "The $name widget"
+# "The $name file" "is" "provides" "specifies" "contains"
+# "represents" "a" "an" "the"
+
+ABBREVIATE_BRIEF       = "The $name class" \
+                         "The $name widget" \
+                         "The $name file" \
+                         is \
+                         provides \
+                         specifies \
+                         contains \
+                         represents \
+                         a \
+                         an \
+                         the
+
+# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
+# Doxygen will generate a detailed section even if there is only a brief
+# description.
+
+ALWAYS_DETAILED_SEC    = NO
+
+# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all
+# inherited members of a class in the documentation of that class as if those
+# members were ordinary class members. Constructors, destructors and assignment
+# operators of the base classes will not be shown.
+
+INLINE_INHERITED_MEMB  = NO
+
+# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full
+# path before files name in the file list and in the header files. If set
+# to NO the shortest path that makes the file name unique will be used.
+
+FULL_PATH_NAMES        = YES
+
+# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag
+# can be used to strip a user-defined part of the path. Stripping is
+# only done if one of the specified strings matches the left-hand part of
+# the path. The tag can be used to show relative paths in the file list.
+# If left blank the directory from which doxygen is run is used as the
+# path to strip.
+
+STRIP_FROM_PATH        = "."
+
+# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of
+# the path mentioned in the documentation of a class, which tells
+# the reader which header file to include in order to use a class.
+# If left blank only the name of the header file containing the class
+# definition is used. Otherwise one should specify the include paths that
+# are normally passed to the compiler using the -I flag.
+
+STRIP_FROM_INC_PATH    =
+
+# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter
+# (but less readable) file names. This can be useful is your file systems
+# doesn't support long names like on DOS, Mac, or CD-ROM.
+
+SHORT_NAMES            = NO
+
+# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen
+# will interpret the first line (until the first dot) of a JavaDoc-style
+# comment as the brief description. If set to NO, the JavaDoc
+# comments will behave just like regular Qt-style comments
+# (thus requiring an explicit @brief command for a brief description.)
+
+JAVADOC_AUTOBRIEF      = NO
+
+# If the QT_AUTOBRIEF tag is set to YES then Doxygen will
+# interpret the first line (until the first dot) of a Qt-style
+# comment as the brief description. If set to NO, the comments
+# will behave just like regular Qt-style comments (thus requiring
+# an explicit \brief command for a brief description.)
+
+QT_AUTOBRIEF           = NO
+
+# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen
+# treat a multi-line C++ special comment block (i.e. a block of //! or ///
+# comments) as a brief description. This used to be the default behaviour.
+# The new default is to treat a multi-line C++ comment block as a detailed
+# description. Set this tag to YES if you prefer the old behaviour instead.
+
+MULTILINE_CPP_IS_BRIEF = NO
+
+# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented
+# member inherits the documentation from any documented member that it
+# re-implements.
+
+INHERIT_DOCS           = YES
+
+# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce
+# a new page for each member. If set to NO, the documentation of a member will
+# be part of the file/class/namespace that contains it.
+
+SEPARATE_MEMBER_PAGES  = NO
+
+# The TAB_SIZE tag can be used to set the number of spaces in a tab.
+# Doxygen uses this value to replace tabs by spaces in code fragments.
+
+TAB_SIZE               = 4
+
+# This tag can be used to specify a number of aliases that acts
+# as commands in the documentation. An alias has the form "name=value".
+# For example adding "sideeffect=\par Side Effects:\n" will allow you to
+# put the command \sideeffect (or @sideeffect) in the documentation, which
+# will result in a user-defined paragraph with heading "Side Effects:".
+# You can put \n's in the value part of an alias to insert newlines.
+
+ALIASES                =
+
+# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C
+# sources only. Doxygen will then generate output that is more tailored for C.
+# For instance, some of the names that are used will be different. The list
+# of all members will be omitted, etc.
+
+OPTIMIZE_OUTPUT_FOR_C  = YES
+
+# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java
+# sources only. Doxygen will then generate output that is more tailored for
+# Java. For instance, namespaces will be presented as packages, qualified
+# scopes will look different, etc.
+
+OPTIMIZE_OUTPUT_JAVA   = NO
+
+# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran
+# sources only. Doxygen will then generate output that is more tailored for
+# Fortran.
+
+OPTIMIZE_FOR_FORTRAN   = NO
+
+# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL
+# sources. Doxygen will then generate output that is tailored for
+# VHDL.
+
+OPTIMIZE_OUTPUT_VHDL   = NO
+
+# Doxygen selects the parser to use depending on the extension of the files it parses.
+# With this tag you can assign which parser to use for a given extension.
+# Doxygen has a built-in mapping, but you can override or extend it using this tag.
+# The format is ext=language, where ext is a file extension, and language is one of
+# the parsers supported by doxygen: IDL, Java, Javascript, C#, C, C++, D, PHP,
+# Objective-C, Python, Fortran, VHDL, C, C++. For instance to make doxygen treat
+# .inc files as Fortran files (default is PHP), and .f files as C (default is Fortran),
+# use: inc=Fortran f=C. Note that for custom extensions you also need to set FILE_PATTERNS otherwise the files are not read by doxygen.
+
+EXTENSION_MAPPING      =
+
+# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want
+# to include (a tag file for) the STL sources as input, then you should
+# set this tag to YES in order to let doxygen match functions declarations and
+# definitions whose arguments contain STL classes (e.g. func(std::string); v.s.
+# func(std::string) {}). This also make the inheritance and collaboration
+# diagrams that involve STL classes more complete and accurate.
+
+BUILTIN_STL_SUPPORT    = NO
+
+# If you use Microsoft's C++/CLI language, you should set this option to YES to
+# enable parsing support.
+
+CPP_CLI_SUPPORT        = NO
+
+# Set the SIP_SUPPORT tag to YES if your project consists of sip sources only.
+# Doxygen will parse them like normal C++ but will assume all classes use public
+# instead of private inheritance when no explicit protection keyword is present.
+
+SIP_SUPPORT            = NO
+
+# For Microsoft's IDL there are propget and propput attributes to indicate getter
+# and setter methods for a property. Setting this option to YES (the default)
+# will make doxygen to replace the get and set methods by a property in the
+# documentation. This will only work if the methods are indeed getting or
+# setting a simple type. If this is not the case, or you want to show the
+# methods anyway, you should set this option to NO.
+
+IDL_PROPERTY_SUPPORT   = YES
+
+# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
+# tag is set to YES, then doxygen will reuse the documentation of the first
+# member in the group (if any) for the other members of the group. By default
+# all members of a group must be documented explicitly.
+
+DISTRIBUTE_GROUP_DOC   = NO
+
+# Set the SUBGROUPING tag to YES (the default) to allow class member groups of
+# the same type (for instance a group of public functions) to be put as a
+# subgroup of that type (e.g. under the Public Functions section). Set it to
+# NO to prevent subgrouping. Alternatively, this can be done per class using
+# the \nosubgrouping command.
+
+SUBGROUPING            = YES
+
+# When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or enum
+# is documented as struct, union, or enum with the name of the typedef. So
+# typedef struct TypeS {} TypeT, will appear in the documentation as a struct
+# with name TypeT. When disabled the typedef will appear as a member of a file,
+# namespace, or class. And the struct will be named TypeS. This can typically
+# be useful for C code in case the coding convention dictates that all compound
+# types are typedef'ed and only the typedef is referenced, never the tag name.
+
+TYPEDEF_HIDES_STRUCT   = NO
+
+# The SYMBOL_CACHE_SIZE determines the size of the internal cache use to
+# determine which symbols to keep in memory and which to flush to disk.
+# When the cache is full, less often used symbols will be written to disk.
+# For small to medium size projects (<1000 input files) the default value is
+# probably good enough. For larger projects a too small cache size can cause
+# doxygen to be busy swapping symbols to and from disk most of the time
+# causing a significant performance penality.
+# If the system has enough physical memory increasing the cache will improve the
+# performance by keeping more symbols in memory. Note that the value works on
+# a logarithmic scale so increasing the size by one will rougly double the
+# memory usage. The cache size is given by this formula:
+# 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0,
+# corresponding to a cache size of 2^16 = 65536 symbols
+
+SYMBOL_CACHE_SIZE      = 0
+
+#---------------------------------------------------------------------------
+# Build related configuration options
+#---------------------------------------------------------------------------
+
+# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in
+# documentation are documented, even if no documentation was available.
+# Private class members and static file members will be hidden unless
+# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES
+
+EXTRACT_ALL            = YES
+
+# If the EXTRACT_PRIVATE tag is set to YES all private members of a class
+# will be included in the documentation.
+
+EXTRACT_PRIVATE        = YES
+
+# If the EXTRACT_STATIC tag is set to YES all static members of a file
+# will be included in the documentation.
+
+EXTRACT_STATIC         = YES
+
+# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs)
+# defined locally in source files will be included in the documentation.
+# If set to NO only classes defined in header files are included.
+
+EXTRACT_LOCAL_CLASSES  = YES
+
+# This flag is only useful for Objective-C code. When set to YES local
+# methods, which are defined in the implementation section but not in
+# the interface are included in the documentation.
+# If set to NO (the default) only methods in the interface are included.
+
+EXTRACT_LOCAL_METHODS  = NO
+
+# If this flag is set to YES, the members of anonymous namespaces will be
+# extracted and appear in the documentation as a namespace called
+# 'anonymous_namespace{file}', where file will be replaced with the base
+# name of the file that contains the anonymous namespace. By default
+# anonymous namespace are hidden.
+
+EXTRACT_ANON_NSPACES   = NO
+
+# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all
+# undocumented members of documented classes, files or namespaces.
+# If set to NO (the default) these members will be included in the
+# various overviews, but no documentation section is generated.
+# This option has no effect if EXTRACT_ALL is enabled.
+
+HIDE_UNDOC_MEMBERS     = NO
+
+# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all
+# undocumented classes that are normally visible in the class hierarchy.
+# If set to NO (the default) these classes will be included in the various
+# overviews. This option has no effect if EXTRACT_ALL is enabled.
+
+HIDE_UNDOC_CLASSES     = NO
+
+# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all
+# friend (class|struct|union) declarations.
+# If set to NO (the default) these declarations will be included in the
+# documentation.
+
+HIDE_FRIEND_COMPOUNDS  = NO
+
+# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any
+# documentation blocks found inside the body of a function.
+# If set to NO (the default) these blocks will be appended to the
+# function's detailed documentation block.
+
+HIDE_IN_BODY_DOCS      = NO
+
+# The INTERNAL_DOCS tag determines if documentation
+# that is typed after a \internal command is included. If the tag is set
+# to NO (the default) then the documentation will be excluded.
+# Set it to YES to include the internal documentation.
+
+INTERNAL_DOCS          = NO
+
+# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate
+# file names in lower-case letters. If set to YES upper-case letters are also
+# allowed. This is useful if you have classes or files whose names only differ
+# in case and if your file system supports case sensitive file names. Windows
+# and Mac users are advised to set this option to NO.
+
+CASE_SENSE_NAMES       = NO
+
+# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen
+# will show members with their full class and namespace scopes in the
+# documentation. If set to YES the scope will be hidden.
+
+HIDE_SCOPE_NAMES       = NO
+
+# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen
+# will put a list of the files that are included by a file in the documentation
+# of that file.
+
+SHOW_INCLUDE_FILES     = YES
+
+# If the INLINE_INFO tag is set to YES (the default) then a tag [inline]
+# is inserted in the documentation for inline members.
+
+INLINE_INFO            = YES
+
+# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen
+# will sort the (detailed) documentation of file and class members
+# alphabetically by member name. If set to NO the members will appear in
+# declaration order.
+
+SORT_MEMBER_DOCS       = YES
+
+# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the
+# brief documentation of file, namespace and class members alphabetically
+# by member name. If set to NO (the default) the members will appear in
+# declaration order.
+
+SORT_BRIEF_DOCS        = YES
+
+# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen will sort the (brief and detailed) documentation of class members so that constructors and destructors are listed first. If set to NO (the default) the constructors will appear in the respective orders defined by SORT_MEMBER_DOCS and SORT_BRIEF_DOCS. This tag will be ignored for brief docs if SORT_BRIEF_DOCS is set to NO and ignored for detailed docs if SORT_MEMBER_DOCS is set to NO.
+
+SORT_MEMBERS_CTORS_1ST = YES
+
+# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the
+# hierarchy of group names into alphabetical order. If set to NO (the default)
+# the group names will appear in their defined order.
+
+SORT_GROUP_NAMES       = YES
+
+# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be
+# sorted by fully-qualified names, including namespaces. If set to
+# NO (the default), the class list will be sorted only by class name,
+# not including the namespace part.
+# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
+# Note: This option applies only to the class list, not to the
+# alphabetical list.
+
+SORT_BY_SCOPE_NAME     = YES
+
+# The GENERATE_TODOLIST tag can be used to enable (YES) or
+# disable (NO) the todo list. This list is created by putting \todo
+# commands in the documentation.
+
+GENERATE_TODOLIST      = YES
+
+# The GENERATE_TESTLIST tag can be used to enable (YES) or
+# disable (NO) the test list. This list is created by putting \test
+# commands in the documentation.
+
+GENERATE_TESTLIST      = YES
+
+# The GENERATE_BUGLIST tag can be used to enable (YES) or
+# disable (NO) the bug list. This list is created by putting \bug
+# commands in the documentation.
+
+GENERATE_BUGLIST       = YES
+
+# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or
+# disable (NO) the deprecated list. This list is created by putting
+# \deprecated commands in the documentation.
+
+GENERATE_DEPRECATEDLIST= YES
+
+# The ENABLED_SECTIONS tag can be used to enable conditional
+# documentation sections, marked by \if sectionname ... \endif.
+
+ENABLED_SECTIONS       =
+
+# The MAX_INITIALIZER_LINES tag determines the maximum number of lines
+# the initial value of a variable or define consists of for it to appear in
+# the documentation. If the initializer consists of more lines than specified
+# here it will be hidden. Use a value of 0 to hide initializers completely.
+# The appearance of the initializer of individual variables and defines in the
+# documentation can be controlled using \showinitializer or \hideinitializer
+# command in the documentation regardless of this setting.
+
+MAX_INITIALIZER_LINES  = 30
+
+# Set the SHOW_USED_FILES tag to NO to disable the list of files generated
+# at the bottom of the documentation of classes and structs. If set to YES the
+# list will mention the files that were used to generate the documentation.
+
+SHOW_USED_FILES        = YES
+
+# If the sources in your project are distributed over multiple directories
+# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy
+# in the documentation. The default is NO.
+
+SHOW_DIRECTORIES       = NO
+
+# Set the SHOW_FILES tag to NO to disable the generation of the Files page.
+# This will remove the Files entry from the Quick Index and from the
+# Folder Tree View (if specified). The default is YES.
+
+SHOW_FILES             = YES
+
+# Set the SHOW_NAMESPACES tag to NO to disable the generation of the
+# Namespaces page.
+# This will remove the Namespaces entry from the Quick Index
+# and from the Folder Tree View (if specified). The default is YES.
+
+SHOW_NAMESPACES        = YES
+
+# The FILE_VERSION_FILTER tag can be used to specify a program or script that
+# doxygen should invoke to get the current version for each file (typically from
+# the version control system). Doxygen will invoke the program by executing (via
+# popen()) the command <command> <input-file>, where <command> is the value of
+# the FILE_VERSION_FILTER tag, and <input-file> is the name of an input file
+# provided by doxygen. Whatever the program writes to standard output
+# is used as the file version. See the manual for examples.
+
+FILE_VERSION_FILTER    =
+
+# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed by
+# doxygen. The layout file controls the global structure of the generated output files
+# in an output format independent way. The create the layout file that represents
+# doxygen's defaults, run doxygen with the -l option. You can optionally specify a
+# file name after the option, if omitted DoxygenLayout.xml will be used as the name
+# of the layout file.
+
+LAYOUT_FILE            =
+
+#---------------------------------------------------------------------------
+# configuration options related to warning and progress messages
+#---------------------------------------------------------------------------
+
+# The QUIET tag can be used to turn on/off the messages that are generated
+# by doxygen. Possible values are YES and NO. If left blank NO is used.
+
+QUIET                  = NO
+
+# The WARNINGS tag can be used to turn on/off the warning messages that are
+# generated by doxygen. Possible values are YES and NO. If left blank
+# NO is used.
+
+WARNINGS               = YES
+
+# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings
+# for undocumented members. If EXTRACT_ALL is set to YES then this flag will
+# automatically be disabled.
+
+WARN_IF_UNDOCUMENTED   = YES
+
+# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for
+# potential errors in the documentation, such as not documenting some
+# parameters in a documented function, or documenting parameters that
+# don't exist or using markup commands wrongly.
+
+WARN_IF_DOC_ERROR      = YES
+
+# This WARN_NO_PARAMDOC option can be abled to get warnings for
+# functions that are documented, but have no documentation for their parameters
+# or return value. If set to NO (the default) doxygen will only warn about
+# wrong or incomplete parameter documentation, but not about the absence of
+# documentation.
+
+WARN_NO_PARAMDOC       = NO
+
+# The WARN_FORMAT tag determines the format of the warning messages that
+# doxygen can produce. The string should contain the $file, $line, and $text
+# tags, which will be replaced by the file and line number from which the
+# warning originated and the warning text. Optionally the format may contain
+# $version, which will be replaced by the version of the file (if it could
+# be obtained via FILE_VERSION_FILTER)
+
+WARN_FORMAT            = "$file:$line: $text"
+
+# The WARN_LOGFILE tag can be used to specify a file to which warning
+# and error messages should be written. If left blank the output is written
+# to stderr.
+
+WARN_LOGFILE           =
+
+#---------------------------------------------------------------------------
+# configuration options related to the input files
+#---------------------------------------------------------------------------
+
+# The INPUT tag can be used to specify the files and/or directories that contain
+# documented source files. You may enter file names like "myfile.cpp" or
+# directories like "/usr/src/myproject". Separate the files or directories
+# with spaces.
+
+INPUT                  = .
+
+# This tag can be used to specify the character encoding of the source files
+# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is
+# also the default input encoding. Doxygen uses libiconv (or the iconv built
+# into libc) for the transcoding. See http://www.gnu.org/software/libiconv for
+# the list of possible encodings.
+
+INPUT_ENCODING         = UTF-8
+
+# If the value of the INPUT tag contains directories, you can use the
+# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
+# and *.h) to filter out the source-files in the directories. If left
+# blank the following patterns are tested:
+# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx
+# *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py *.f90
+
+FILE_PATTERNS          = *.c \
+                         *.cc \
+                         *.cxx \
+                         *.cpp \
+                         *.c++ \
+                         *.d \
+                         *.java \
+                         *.ii \
+                         *.ixx \
+                         *.ipp \
+                         *.i++ \
+                         *.inl \
+                         *.h \
+                         *.hh \
+                         *.hxx \
+                         *.hpp \
+                         *.h++ \
+                         *.idl \
+                         *.odl \
+                         *.cs \
+                         *.php \
+                         *.php3 \
+                         *.inc \
+                         *.m \
+                         *.mm \
+                         *.dox \
+                         *.py
+
+# The RECURSIVE tag can be used to turn specify whether or not subdirectories
+# should be searched for input files as well. Possible values are YES and NO.
+# If left blank NO is used.
+
+RECURSIVE              = NO
+
+# The EXCLUDE tag can be used to specify files and/or directories that should
+# excluded from the INPUT source files. This way you can easily exclude a
+# subdirectory from a directory tree whose root is specified with the INPUT tag.
+
+EXCLUDE                =
+
+# The EXCLUDE_SYMLINKS tag can be used select whether or not files or
+# directories that are symbolic links (a Unix filesystem feature) are excluded
+# from the input.
+
+EXCLUDE_SYMLINKS       = NO
+
+# If the value of the INPUT tag contains directories, you can use the
+# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
+# certain files from those directories. Note that the wildcards are matched
+# against the file with absolute path, so to exclude all test directories
+# for example use the pattern */test/*
+
+EXCLUDE_PATTERNS       = *gl2ps* \
+                         *mathexpr*
+
+# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
+# (namespaces, classes, functions, etc.) that should be excluded from the
+# output. The symbol name can be a fully qualified name, a word, or if the
+# wildcard * is used, a substring. Examples: ANamespace, AClass,
+# AClass::ANamespace, ANamespace::*Test
+
+EXCLUDE_SYMBOLS        =
+
+# The EXAMPLE_PATH tag can be used to specify one or more files or
+# directories that contain example code fragments that are included (see
+# the \include command).
+
+EXAMPLE_PATH           =
+
+# If the value of the EXAMPLE_PATH tag contains directories, you can use the
+# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
+# and *.h) to filter out the source-files in the directories. If left
+# blank all files are included.
+
+EXAMPLE_PATTERNS       = *
+
+# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
+# searched for input files to be used with the \include or \dontinclude
+# commands irrespective of the value of the RECURSIVE tag.
+# Possible values are YES and NO. If left blank NO is used.
+
+EXAMPLE_RECURSIVE      = NO
+
+# The IMAGE_PATH tag can be used to specify one or more files or
+# directories that contain image that are included in the documentation (see
+# the \image command).
+
+IMAGE_PATH             =
+
+# The INPUT_FILTER tag can be used to specify a program that doxygen should
+# invoke to filter for each input file. Doxygen will invoke the filter program
+# by executing (via popen()) the command <filter> <input-file>, where <filter>
+# is the value of the INPUT_FILTER tag, and <input-file> is the name of an
+# input file. Doxygen will then use the output that the filter program writes
+# to standard output.
+# If FILTER_PATTERNS is specified, this tag will be
+# ignored.
+
+INPUT_FILTER           =
+
+# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
+# basis.
+# Doxygen will compare the file name with each pattern and apply the
+# filter if there is a match.
+# The filters are a list of the form:
+# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further
+# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER
+# is applied to all files.
+
+FILTER_PATTERNS        =
+
+# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
+# INPUT_FILTER) will be used to filter the input files when producing source
+# files to browse (i.e. when SOURCE_BROWSER is set to YES).
+
+FILTER_SOURCE_FILES    = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to source browsing
+#---------------------------------------------------------------------------
+
+# If the SOURCE_BROWSER tag is set to YES then a list of source files will
+# be generated. Documented entities will be cross-referenced with these sources.
+# Note: To get rid of all source code in the generated output, make sure also
+# VERBATIM_HEADERS is set to NO.
+
+SOURCE_BROWSER         = YES
+
+# Setting the INLINE_SOURCES tag to YES will include the body
+# of functions and classes directly in the documentation.
+
+INLINE_SOURCES         = NO
+
+# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct
+# doxygen to hide any special comment blocks from generated source code
+# fragments. Normal C and C++ comments will always remain visible.
+
+STRIP_CODE_COMMENTS    = YES
+
+# If the REFERENCED_BY_RELATION tag is set to YES
+# then for each documented function all documented
+# functions referencing it will be listed.
+
+REFERENCED_BY_RELATION = YES
+
+# If the REFERENCES_RELATION tag is set to YES
+# then for each documented function all documented entities
+# called/used by that function will be listed.
+
+REFERENCES_RELATION    = YES
+
+# If the REFERENCES_LINK_SOURCE tag is set to YES (the default)
+# and SOURCE_BROWSER tag is set to YES, then the hyperlinks from
+# functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will
+# link to the source code.
+# Otherwise they will link to the documentation.
+
+REFERENCES_LINK_SOURCE = YES
+
+# If the USE_HTAGS tag is set to YES then the references to source code
+# will point to the HTML generated by the htags(1) tool instead of doxygen
+# built-in source browser. The htags tool is part of GNU's global source
+# tagging system (see http://www.gnu.org/software/global/global.html). You
+# will need version 4.8.6 or higher.
+
+USE_HTAGS              = NO
+
+# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen
+# will generate a verbatim copy of the header file for each class for
+# which an include is specified. Set to NO to disable this.
+
+VERBATIM_HEADERS       = YES
+
+#---------------------------------------------------------------------------
+# configuration options related to the alphabetical class index
+#---------------------------------------------------------------------------
+
+# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index
+# of all compounds will be generated. Enable this if the project
+# contains a lot of classes, structs, unions or interfaces.
+
+ALPHABETICAL_INDEX     = NO
+
+# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then
+# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns
+# in which this list will be split (can be a number in the range [1..20])
+
+COLS_IN_ALPHA_INDEX    = 5
+
+# In case all classes in a project start with a common prefix, all
+# classes will be put under the same header in the alphabetical index.
+# The IGNORE_PREFIX tag can be used to specify one or more prefixes that
+# should be ignored while generating the index headers.
+
+IGNORE_PREFIX          =
+
+#---------------------------------------------------------------------------
+# configuration options related to the HTML output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_HTML tag is set to YES (the default) Doxygen will
+# generate HTML output.
+
+GENERATE_HTML          = YES
+
+# The HTML_OUTPUT tag is used to specify where the HTML docs will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+# put in front of it. If left blank `html' will be used as the default path.
+
+HTML_OUTPUT            = html
+
+# The HTML_FILE_EXTENSION tag can be used to specify the file extension for
+# each generated HTML page (for example: .htm,.php,.asp). If it is left blank
+# doxygen will generate files with .html extension.
+
+HTML_FILE_EXTENSION    = .html
+
+# The HTML_HEADER tag can be used to specify a personal HTML header for
+# each generated HTML page. If it is left blank doxygen will generate a
+# standard header.
+
+HTML_HEADER            =
+
+# The HTML_FOOTER tag can be used to specify a personal HTML footer for
+# each generated HTML page. If it is left blank doxygen will generate a
+# standard footer.
+
+HTML_FOOTER            =
+
+# The HTML_STYLESHEET tag can be used to specify a user-defined cascading
+# style sheet that is used by each HTML page. It can be used to
+# fine-tune the look of the HTML output. If the tag is left blank doxygen
+# will generate a default style sheet. Note that doxygen will try to copy
+# the style sheet file to the HTML output directory, so don't put your own
+# stylesheet in the HTML output directory as well, or it will be erased!
+
+HTML_STYLESHEET        =
+
+# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes,
+# files or namespaces will be aligned in HTML using tables. If set to
+# NO a bullet list will be used.
+
+HTML_ALIGN_MEMBERS     = YES
+
+# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
+# documentation will contain sections that can be hidden and shown after the
+# page has loaded. For this to work a browser that supports
+# JavaScript and DHTML is required (for instance Mozilla 1.0+, Firefox
+# Netscape 6.0+, Internet explorer 5.0+, Konqueror, or Safari).
+
+HTML_DYNAMIC_SECTIONS  = NO
+
+# If the GENERATE_DOCSET tag is set to YES, additional index files
+# will be generated that can be used as input for Apple's Xcode 3
+# integrated development environment, introduced with OSX 10.5 (Leopard).
+# To create a documentation set, doxygen will generate a Makefile in the
+# HTML output directory. Running make will produce the docset in that
+# directory and running "make install" will install the docset in
+# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find
+# it at startup.
+# See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html for more information.
+
+GENERATE_DOCSET        = NO
+
+# When GENERATE_DOCSET tag is set to YES, this tag determines the name of the
+# feed. A documentation feed provides an umbrella under which multiple
+# documentation sets from a single provider (such as a company or product suite)
+# can be grouped.
+
+DOCSET_FEEDNAME        = "Doxygen generated docs"
+
+# When GENERATE_DOCSET tag is set to YES, this tag specifies a string that
+# should uniquely identify the documentation set bundle. This should be a
+# reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen
+# will append .docset to the name.
+
+DOCSET_BUNDLE_ID       = org.doxygen.Project
+
+# If the GENERATE_HTMLHELP tag is set to YES, additional index files
+# will be generated that can be used as input for tools like the
+# Microsoft HTML help workshop to generate a compiled HTML help file (.chm)
+# of the generated HTML documentation.
+
+GENERATE_HTMLHELP      = NO
+
+# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can
+# be used to specify the file name of the resulting .chm file. You
+# can add a path in front of the file if the result should not be
+# written to the html output directory.
+
+CHM_FILE               =
+
+# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can
+# be used to specify the location (absolute path including file name) of
+# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run
+# the HTML help compiler on the generated index.hhp.
+
+HHC_LOCATION           =
+
+# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag
+# controls if a separate .chi index file is generated (YES) or that
+# it should be included in the master .chm file (NO).
+
+GENERATE_CHI           = NO
+
+# If the GENERATE_HTMLHELP tag is set to YES, the CHM_INDEX_ENCODING
+# is used to encode HtmlHelp index (hhk), content (hhc) and project file
+# content.
+
+CHM_INDEX_ENCODING     =
+
+# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag
+# controls whether a binary table of contents is generated (YES) or a
+# normal table of contents (NO) in the .chm file.
+
+BINARY_TOC             = NO
+
+# The TOC_EXPAND flag can be set to YES to add extra items for group members
+# to the contents of the HTML help documentation and to the tree view.
+
+TOC_EXPAND             = NO
+
+# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and QHP_VIRTUAL_FOLDER
+# are set, an additional index file will be generated that can be used as input for
+# Qt's qhelpgenerator to generate a Qt Compressed Help (.qch) of the generated
+# HTML documentation.
+
+GENERATE_QHP           = NO
+
+# If the QHG_LOCATION tag is specified, the QCH_FILE tag can
+# be used to specify the file name of the resulting .qch file.
+# The path specified is relative to the HTML output folder.
+
+QCH_FILE               =
+
+# The QHP_NAMESPACE tag specifies the namespace to use when generating
+# Qt Help Project output. For more information please see
+# http://doc.trolltech.com/qthelpproject.html#namespace
+
+QHP_NAMESPACE          =
+
+# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating
+# Qt Help Project output. For more information please see
+# http://doc.trolltech.com/qthelpproject.html#virtual-folders
+
+QHP_VIRTUAL_FOLDER     = doc
+
+# If QHP_CUST_FILTER_NAME is set, it specifies the name of a custom filter to add.
+# For more information please see
+# http://doc.trolltech.com/qthelpproject.html#custom-filters
+
+QHP_CUST_FILTER_NAME   =
+
+# The QHP_CUST_FILT_ATTRS tag specifies the list of the attributes of the custom filter to add.For more information please see
+# <a href="http://doc.trolltech.com/qthelpproject.html#custom-filters">Qt Help Project / Custom Filters</a>.
+
+QHP_CUST_FILTER_ATTRS  =
+
+# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this project's
+# filter section matches.
+# <a href="http://doc.trolltech.com/qthelpproject.html#filter-attributes">Qt Help Project / Filter Attributes</a>.
+
+QHP_SECT_FILTER_ATTRS  =
+
+# If the GENERATE_QHP tag is set to YES, the QHG_LOCATION tag can
+# be used to specify the location of Qt's qhelpgenerator.
+# If non-empty doxygen will try to run qhelpgenerator on the generated
+# .qhp file.
+
+QHG_LOCATION           =
+
+# The DISABLE_INDEX tag can be used to turn on/off the condensed index at
+# top of each HTML page. The value NO (the default) enables the index and
+# the value YES disables it.
+
+DISABLE_INDEX          = NO
+
+# This tag can be used to set the number of enum values (range [1..20])
+# that doxygen will group on one line in the generated HTML documentation.
+
+ENUM_VALUES_PER_LINE   = 4
+
+# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index
+# structure should be generated to display hierarchical information.
+# If the tag value is set to YES, a side panel will be generated
+# containing a tree-like index structure (just like the one that
+# is generated for HTML Help). For this to work a browser that supports
+# JavaScript, DHTML, CSS and frames is required (i.e. any modern browser).
+# Windows users are probably better off using the HTML help feature.
+
+GENERATE_TREEVIEW      = YES
+
+# By enabling USE_INLINE_TREES, doxygen will generate the Groups, Directories,
+# and Class Hierarchy pages using a tree view instead of an ordered list.
+
+USE_INLINE_TREES       = NO
+
+# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be
+# used to set the initial width (in pixels) of the frame in which the tree
+# is shown.
+
+TREEVIEW_WIDTH         = 250
+
+# Use this tag to change the font size of Latex formulas included
+# as images in the HTML documentation. The default is 10. Note that
+# when you change the font size after a successful doxygen run you need
+# to manually remove any form_*.png images from the HTML output directory
+# to force them to be regenerated.
+
+FORMULA_FONTSIZE       = 10
+
+# When the SEARCHENGINE tag is enable doxygen will generate a search box for the HTML output. The underlying search engine uses javascript
+# and DHTML and should work on any modern browser. Note that when using HTML help (GENERATE_HTMLHELP) or Qt help (GENERATE_QHP)
+# there is already a search function so this one should typically
+# be disabled.
+
+SEARCHENGINE           = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to the LaTeX output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will
+# generate Latex output.
+
+GENERATE_LATEX         = NO
+
+# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+# put in front of it. If left blank `latex' will be used as the default path.
+
+LATEX_OUTPUT           = latex
+
+# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
+# invoked. If left blank `latex' will be used as the default command name.
+
+LATEX_CMD_NAME         = latex
+
+# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to
+# generate index for LaTeX. If left blank `makeindex' will be used as the
+# default command name.
+
+MAKEINDEX_CMD_NAME     = makeindex
+
+# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact
+# LaTeX documents. This may be useful for small projects and may help to
+# save some trees in general.
+
+COMPACT_LATEX          = NO
+
+# The PAPER_TYPE tag can be used to set the paper type that is used
+# by the printer. Possible values are: a4, a4wide, letter, legal and
+# executive. If left blank a4wide will be used.
+
+PAPER_TYPE             = a4wide
+
+# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX
+# packages that should be included in the LaTeX output.
+
+EXTRA_PACKAGES         =
+
+# The LATEX_HEADER tag can be used to specify a personal LaTeX header for
+# the generated latex document. The header should contain everything until
+# the first chapter. If it is left blank doxygen will generate a
+# standard header. Notice: only use this tag if you know what you are doing!
+
+LATEX_HEADER           =
+
+# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated
+# is prepared for conversion to pdf (using ps2pdf). The pdf file will
+# contain links (just like the HTML output) instead of page references
+# This makes the output suitable for online browsing using a pdf viewer.
+
+PDF_HYPERLINKS         = NO
+
+# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of
+# plain latex in the generated Makefile. Set this option to YES to get a
+# higher quality PDF documentation.
+
+USE_PDFLATEX           = NO
+
+# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode.
+# command to the generated LaTeX files. This will instruct LaTeX to keep
+# running if errors occur, instead of asking the user for help.
+# This option is also used when generating formulas in HTML.
+
+LATEX_BATCHMODE        = NO
+
+# If LATEX_HIDE_INDICES is set to YES then doxygen will not
+# include the index chapters (such as File Index, Compound Index, etc.)
+# in the output.
+
+LATEX_HIDE_INDICES     = NO
+
+# If LATEX_SOURCE_CODE is set to YES then doxygen will include source code with syntax highlighting in the LaTeX output. Note that which sources are shown also depends on other settings such as SOURCE_BROWSER.
+
+LATEX_SOURCE_CODE      = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to the RTF output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output
+# The RTF output is optimized for Word 97 and may not look very pretty with
+# other RTF readers or editors.
+
+GENERATE_RTF           = NO
+
+# The RTF_OUTPUT tag is used to specify where the RTF docs will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+# put in front of it. If left blank `rtf' will be used as the default path.
+
+RTF_OUTPUT             = rtf
+
+# If the COMPACT_RTF tag is set to YES Doxygen generates more compact
+# RTF documents. This may be useful for small projects and may help to
+# save some trees in general.
+
+COMPACT_RTF            = NO
+
+# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated
+# will contain hyperlink fields. The RTF file will
+# contain links (just like the HTML output) instead of page references.
+# This makes the output suitable for online browsing using WORD or other
+# programs which support those fields.
+# Note: wordpad (write) and others do not support links.
+
+RTF_HYPERLINKS         = NO
+
+# Load stylesheet definitions from file. Syntax is similar to doxygen's
+# config file, i.e. a series of assignments. You only have to provide
+# replacements, missing definitions are set to their default value.
+
+RTF_STYLESHEET_FILE    =
+
+# Set optional variables used in the generation of an rtf document.
+# Syntax is similar to doxygen's config file.
+
+RTF_EXTENSIONS_FILE    =
+
+#---------------------------------------------------------------------------
+# configuration options related to the man page output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_MAN tag is set to YES (the default) Doxygen will
+# generate man pages
+
+GENERATE_MAN           = NO
+
+# The MAN_OUTPUT tag is used to specify where the man pages will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+# put in front of it. If left blank `man' will be used as the default path.
+
+MAN_OUTPUT             = man
+
+# The MAN_EXTENSION tag determines the extension that is added to
+# the generated man pages (default is the subroutine's section .3)
+
+MAN_EXTENSION          = .3
+
+# If the MAN_LINKS tag is set to YES and Doxygen generates man output,
+# then it will generate one additional man file for each entity
+# documented in the real man page(s). These additional files
+# only source the real man page, but without them the man command
+# would be unable to find the correct page. The default is NO.
+
+MAN_LINKS              = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to the XML output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_XML tag is set to YES Doxygen will
+# generate an XML file that captures the structure of
+# the code including all documentation.
+
+GENERATE_XML           = NO
+
+# The XML_OUTPUT tag is used to specify where the XML pages will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+# put in front of it. If left blank `xml' will be used as the default path.
+
+XML_OUTPUT             = xml
+
+# The XML_SCHEMA tag can be used to specify an XML schema,
+# which can be used by a validating XML parser to check the
+# syntax of the XML files.
+
+XML_SCHEMA             =
+
+# The XML_DTD tag can be used to specify an XML DTD,
+# which can be used by a validating XML parser to check the
+# syntax of the XML files.
+
+XML_DTD                =
+
+# If the XML_PROGRAMLISTING tag is set to YES Doxygen will
+# dump the program listings (including syntax highlighting
+# and cross-referencing information) to the XML output. Note that
+# enabling this will significantly increase the size of the XML output.
+
+XML_PROGRAMLISTING     = YES
+
+#---------------------------------------------------------------------------
+# configuration options for the AutoGen Definitions output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will
+# generate an AutoGen Definitions (see autogen.sf.net) file
+# that captures the structure of the code including all
+# documentation. Note that this feature is still experimental
+# and incomplete at the moment.
+
+GENERATE_AUTOGEN_DEF   = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to the Perl module output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_PERLMOD tag is set to YES Doxygen will
+# generate a Perl module file that captures the structure of
+# the code including all documentation. Note that this
+# feature is still experimental and incomplete at the
+# moment.
+
+GENERATE_PERLMOD       = NO
+
+# If the PERLMOD_LATEX tag is set to YES Doxygen will generate
+# the necessary Makefile rules, Perl scripts and LaTeX code to be able
+# to generate PDF and DVI output from the Perl module output.
+
+PERLMOD_LATEX          = NO
+
+# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be
+# nicely formatted so it can be parsed by a human reader.
+# This is useful
+# if you want to understand what is going on.
+# On the other hand, if this
+# tag is set to NO the size of the Perl module output will be much smaller
+# and Perl will parse it just the same.
+
+PERLMOD_PRETTY         = YES
+
+# The names of the make variables in the generated doxyrules.make file
+# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX.
+# This is useful so different doxyrules.make files included by the same
+# Makefile don't overwrite each other's variables.
+
+PERLMOD_MAKEVAR_PREFIX =
+
+#---------------------------------------------------------------------------
+# Configuration options related to the preprocessor
+#---------------------------------------------------------------------------
+
+# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will
+# evaluate all C-preprocessor directives found in the sources and include
+# files.
+
+ENABLE_PREPROCESSING   = YES
+
+# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro
+# names in the source code. If set to NO (the default) only conditional
+# compilation will be performed. Macro expansion can be done in a controlled
+# way by setting EXPAND_ONLY_PREDEF to YES.
+
+MACRO_EXPANSION        = NO
+
+# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES
+# then the macro expansion is limited to the macros specified with the
+# PREDEFINED and EXPAND_AS_DEFINED tags.
+
+EXPAND_ONLY_PREDEF     = NO
+
+# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files
+# in the INCLUDE_PATH (see below) will be search if a #include is found.
+
+SEARCH_INCLUDES        = YES
+
+# The INCLUDE_PATH tag can be used to specify one or more directories that
+# contain include files that are not input files but should be processed by
+# the preprocessor.
+
+INCLUDE_PATH           =
+
+# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
+# patterns (like *.h and *.hpp) to filter out the header-files in the
+# directories. If left blank, the patterns specified with FILE_PATTERNS will
+# be used.
+
+INCLUDE_FILE_PATTERNS  =
+
+# The PREDEFINED tag can be used to specify one or more macro names that
+# are defined before the preprocessor is started (similar to the -D option of
+# gcc). The argument of the tag is a list of macros of the form: name
+# or name=definition (no spaces). If the definition and the = are
+# omitted =1 is assumed. To prevent a macro definition from being
+# undefined via #undef or recursively expanded use the := operator
+# instead of the = operator.
+
+PREDEFINED             =
+
+# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then
+# this tag can be used to specify a list of macro names that should be expanded.
+# The macro definition that is found in the sources will be used.
+# Use the PREDEFINED tag if you want to use a different macro definition.
+
+EXPAND_AS_DEFINED      =
+
+# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then
+# doxygen's preprocessor will remove all function-like macros that are alone
+# on a line, have an all uppercase name, and do not end with a semicolon. Such
+# function macros are typically used for boiler-plate code, and will confuse
+# the parser if not removed.
+
+SKIP_FUNCTION_MACROS   = YES
+
+#---------------------------------------------------------------------------
+# Configuration::additions related to external references
+#---------------------------------------------------------------------------
+
+# The TAGFILES option can be used to specify one or more tagfiles.
+# Optionally an initial location of the external documentation
+# can be added for each tagfile. The format of a tag file without
+# this location is as follows:
+#
+# TAGFILES = file1 file2 ...
+# Adding location for the tag files is done as follows:
+#
+# TAGFILES = file1=loc1 "file2 = loc2" ...
+# where "loc1" and "loc2" can be relative or absolute paths or
+# URLs. If a location is present for each tag, the installdox tool
+# does not have to be run to correct the links.
+# Note that each tag file must have a unique name
+# (where the name does NOT include the path)
+# If a tag file is not located in the directory in which doxygen
+# is run, you must also specify the path to the tagfile here.
+
+TAGFILES               =
+
+# When a file name is specified after GENERATE_TAGFILE, doxygen will create
+# a tag file that is based on the input files it reads.
+
+GENERATE_TAGFILE       =
+
+# If the ALLEXTERNALS tag is set to YES all external classes will be listed
+# in the class index. If set to NO only the inherited external classes
+# will be listed.
+
+ALLEXTERNALS           = NO
+
+# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed
+# in the modules index. If set to NO, only the current project's groups will
+# be listed.
+
+EXTERNAL_GROUPS        = YES
+
+# The PERL_PATH should be the absolute path and name of the perl script
+# interpreter (i.e. the result of `which perl').
+
+PERL_PATH              = /usr/bin/perl
+
+#---------------------------------------------------------------------------
+# Configuration options related to the dot tool
+#---------------------------------------------------------------------------
+
+# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will
+# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base
+# or super classes. Setting the tag to NO turns the diagrams off. Note that
+# this option is superseded by the HAVE_DOT option below. This is only a
+# fallback. It is recommended to install and use dot, since it yields more
+# powerful graphs.
+
+CLASS_DIAGRAMS         = NO
+
+# You can define message sequence charts within doxygen comments using the \msc
+# command. Doxygen will then run the mscgen tool (see
+# http://www.mcternan.me.uk/mscgen/) to produce the chart and insert it in the
+# documentation. The MSCGEN_PATH tag allows you to specify the directory where
+# the mscgen tool resides. If left empty the tool is assumed to be found in the
+# default search path.
+
+MSCGEN_PATH            =
+
+# If set to YES, the inheritance and collaboration graphs will hide
+# inheritance and usage relations if the target is undocumented
+# or is not a class.
+
+HIDE_UNDOC_RELATIONS   = YES
+
+# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is
+# available from the path. This tool is part of Graphviz, a graph visualization
+# toolkit from AT&T and Lucent Bell Labs. The other options in this section
+# have no effect if this option is set to NO (the default)
+
+HAVE_DOT               = YES
+
+# By default doxygen will write a font called FreeSans.ttf to the output
+# directory and reference it in all dot files that doxygen generates. This
+# font does not include all possible unicode characters however, so when you need
+# these (or just want a differently looking font) you can specify the font name
+# using DOT_FONTNAME. You need need to make sure dot is able to find the font,
+# which can be done by putting it in a standard location or by setting the
+# DOTFONTPATH environment variable or by setting DOT_FONTPATH to the directory
+# containing the font.
+
+DOT_FONTNAME           = FreeSans
+
+# The DOT_FONTSIZE tag can be used to set the size of the font of dot graphs.
+# The default size is 10pt.
+
+DOT_FONTSIZE           = 10
+
+# By default doxygen will tell dot to use the output directory to look for the
+# FreeSans.ttf font (which doxygen will put there itself). If you specify a
+# different font using DOT_FONTNAME you can set the path where dot
+# can find it using this tag.
+
+DOT_FONTPATH           =
+
+# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen
+# will generate a graph for each documented class showing the direct and
+# indirect inheritance relations. Setting this tag to YES will force the
+# the CLASS_DIAGRAMS tag to NO.
+
+CLASS_GRAPH            = YES
+
+# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen
+# will generate a graph for each documented class showing the direct and
+# indirect implementation dependencies (inheritance, containment, and
+# class references variables) of the class with other documented classes.
+
+COLLABORATION_GRAPH    = YES
+
+# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen
+# will generate a graph for groups, showing the direct groups dependencies
+
+GROUP_GRAPHS           = YES
+
+# If the UML_LOOK tag is set to YES doxygen will generate inheritance and
+# collaboration diagrams in a style similar to the OMG's Unified Modeling
+# Language.
+
+UML_LOOK               = NO
+
+# If set to YES, the inheritance and collaboration graphs will show the
+# relations between templates and their instances.
+
+TEMPLATE_RELATIONS     = NO
+
+# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT
+# tags are set to YES then doxygen will generate a graph for each documented
+# file showing the direct and indirect include dependencies of the file with
+# other documented files.
+
+INCLUDE_GRAPH          = YES
+
+# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and
+# HAVE_DOT tags are set to YES then doxygen will generate a graph for each
+# documented header file showing the documented files that directly or
+# indirectly include this file.
+
+INCLUDED_BY_GRAPH      = YES
+
+# If the CALL_GRAPH and HAVE_DOT options are set to YES then
+# doxygen will generate a call dependency graph for every global function
+# or class method. Note that enabling this option will significantly increase
+# the time of a run. So in most cases it will be better to enable call graphs
+# for selected functions only using the \callgraph command.
+
+CALL_GRAPH             = YES
+
+# If the CALLER_GRAPH and HAVE_DOT tags are set to YES then
+# doxygen will generate a caller dependency graph for every global function
+# or class method. Note that enabling this option will significantly increase
+# the time of a run. So in most cases it will be better to enable caller
+# graphs for selected functions only using the \callergraph command.
+
+CALLER_GRAPH           = NO
+
+# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen
+# will graphical hierarchy of all classes instead of a textual one.
+
+GRAPHICAL_HIERARCHY    = YES
+
+# If the DIRECTORY_GRAPH, SHOW_DIRECTORIES and HAVE_DOT tags are set to YES
+# then doxygen will show the dependencies a directory has on other directories
+# in a graphical way. The dependency relations are determined by the #include
+# relations between the files in the directories.
+
+DIRECTORY_GRAPH        = YES
+
+# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
+# generated by dot. Possible values are png, jpg, or gif
+# If left blank png will be used.
+
+DOT_IMAGE_FORMAT       = png
+
+# The tag DOT_PATH can be used to specify the path where the dot tool can be
+# found. If left blank, it is assumed the dot tool can be found in the path.
+
+DOT_PATH               =
+
+# The DOTFILE_DIRS tag can be used to specify one or more directories that
+# contain dot files that are included in the documentation (see the
+# \dotfile command).
+
+DOTFILE_DIRS           =
+
+# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of
+# nodes that will be shown in the graph. If the number of nodes in a graph
+# becomes larger than this value, doxygen will truncate the graph, which is
+# visualized by representing a node as a red box. Note that doxygen if the
+# number of direct children of the root node in a graph is already larger than
+# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note
+# that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
+
+DOT_GRAPH_MAX_NODES    = 50
+
+# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the
+# graphs generated by dot. A depth value of 3 means that only nodes reachable
+# from the root by following a path via at most 3 edges will be shown. Nodes
+# that lay further from the root node will be omitted. Note that setting this
+# option to 1 or 2 may greatly reduce the computation time needed for large
+# code bases. Also note that the size of a graph can be further restricted by
+# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.
+
+MAX_DOT_GRAPH_DEPTH    = 1000
+
+# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent
+# background. This is disabled by default, because dot on Windows does not
+# seem to support this out of the box. Warning: Depending on the platform used,
+# enabling this option may lead to badly anti-aliased labels on the edges of
+# a graph (i.e. they become hard to read).
+
+DOT_TRANSPARENT        = NO
+
+# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output
+# files in one run (i.e. multiple -o and -T options on the command line). This
+# makes dot run faster, but since only newer versions of dot (>1.8.10)
+# support this, this feature is disabled by default.
+
+DOT_MULTI_TARGETS      = NO
+
+# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will
+# generate a legend page explaining the meaning of the various boxes and
+# arrows in the dot generated graphs.
+
+GENERATE_LEGEND        = YES
+
+# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will
+# remove the intermediate dot files that are used to generate
+# the various graphs.
+
+DOT_CLEANUP            = YES
diff --git a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/MarchingCubes/LookUpTable.h b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/LookUpTable.h
old mode 100755
new mode 100644
similarity index 99%
rename from applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/MarchingCubes/LookUpTable.h
rename to applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/LookUpTable.h
index 5529346954..f6b06e76b6
--- a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/MarchingCubes/LookUpTable.h
+++ b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/LookUpTable.h
@@ -11,11 +11,7 @@
 
 
 
-#ifndef _LOOKUPTABLE_H_
-#define _LOOKUPTABLE_H_
-
-
-
+#pragma once
 
 
 //_____________________________________________________________________________
@@ -773,54 +769,54 @@ static const char tiling6_1_1[48][9] = {
  */
 //-----------------------------------------------------------------------------
 static const char tiling6_1_2[48][27] = {
-  /*  67: 0, 1,             6,     */ {  1, 12,  3,   12, 10,  3,    6,  3, 10,    3,  6,  8,    5,  8,  6,    8,  5, 12,   12,  9,  8,    1,  9, 12,   12,  5, 10  },
-  /* 131: 0, 1,                7,  */ {  1, 12,  3,    1, 11, 12,   11,  1,  6,    9,  6,  1,    6,  9,  7,   12,  7,  9,    9,  8, 12,   12,  8,  3,   11,  7, 12  },
-  /*  21: 0,    2,    4,           */ {  4, 12,  0,    4,  1, 12,    1,  4, 10,    7, 10,  4,   10,  7,  2,   12,  2,  7,    7,  3, 12,   12,  3,  0,    1,  2, 12  },
-  /*  69: 0,    2,          6,     */ {  6, 12,  2,    6,  3, 12,    3,  6,  8,    5,  8,  6,    8,  5,  0,   12,  0,  5,    5,  1, 12,   12,  1,  2,    3,  0, 12  },
-  /*  41: 0,       3,    5,        */ {  0, 12,  2,   12,  9,  2,    5,  2,  9,    2,  5, 11,    4, 11,  5,   11,  4, 12,   12,  8, 11,    0,  8, 12,   12,  4,  9  },
-  /*  73: 0,       3,       6,     */ {  0, 12,  2,    0, 10, 12,   10,  0,  5,    8,  5,  0,    5,  8,  6,   12,  6,  8,    8, 11, 12,   12, 11,  2,   10,  6, 12  },
-  /*  81: 0,          4,    6,     */ {  4, 12,  0,   12,  5,  0,   10,  0,  5,    0, 10,  3,    6,  3, 10,    3,  6, 12,   12,  7,  3,    4,  7, 12,   12,  6,  5  },
-  /*  97: 0,             5, 6,     */ {  4, 12,  6,   12,  8,  6,    3,  6,  8,    6,  3, 10,    0, 10,  3,   10,  0, 12,   12,  9, 10,    4,  9, 12,   12,  0,  8  },
-  /* 193: 0,                6, 7,  */ {  5, 12,  7,    5,  8, 12,    8,  5,  0,   10,  0,  5,    0, 10,  3,   12,  3, 10,   10, 11, 12,   12, 11,  7,    8,  3, 12  },
-  /*  22:    1, 2,    4,           */ {  2, 12,  0,    2,  8, 12,    8,  2,  7,   10,  7,  2,    7, 10,  4,   12,  4, 10,   10,  9, 12,   12,  9,  0,    8,  4, 12  },
-  /* 134:    1, 2,             7,  */ {  2, 12,  0,   12, 11,  0,    7,  0, 11,    0,  7,  9,    6,  9,  7,    9,  6, 12,   12, 10,  9,    2, 10, 12,   12,  6, 11  },
-  /*  42:    1,    3,    5,        */ {  5, 12,  1,    5,  2, 12,    2,  5, 11,    4, 11,  5,   11,  4,  3,   12,  3,  4,    4,  0, 12,   12,  0,  1,    2,  3, 12  },
-  /* 138:    1,    3,          7,  */ {  7, 12,  3,    7,  0, 12,    0,  7,  9,    6,  9,  7,    9,  6,  1,   12,  1,  6,    6,  2, 12,   12,  2,  3,    0,  1, 12  },
-  /* 146:    1,       4,       7,  */ {  6, 12,  4,    6,  9, 12,    9,  6,  1,   11,  1,  6,    1, 11,  0,   12,  0, 11,   11,  8, 12,   12,  8,  4,    9,  0, 12  },
-  /* 162:    1,          5,    7,  */ {  5, 12,  1,   12,  6,  1,   11,  1,  6,    1, 11,  0,    7,  0, 11,    0,  7, 12,   12,  4,  0,    5,  4, 12,   12,  7,  6  },
-  /* 194:    1,             6, 7,  */ {  5, 12,  7,   12,  9,  7,    0,  7,  9,    7,  0, 11,    1, 11,  0,   11,  1, 12,   12, 10, 11,    5, 10, 12,   12,  1,  9  },
-  /*  28:       2, 3, 4,           */ {  3, 12,  1,   12,  8,  1,    4,  1,  8,    1,  4, 10,    7, 10,  4,   10,  7, 12,   12, 11, 10,    3, 11, 12,   12,  7,  8  },
-  /*  44:       2, 3,    5,        */ {  3, 12,  1,    3,  9, 12,    9,  3,  4,   11,  4,  3,    4, 11,  5,   12,  5, 11,   11, 10, 12,   12, 10,  1,    9,  5, 12  },
-  /*  52:       2,    4, 5,        */ {  7, 12,  5,    7, 10, 12,   10,  7,  2,    8,  2,  7,    2,  8,  1,   12,  1,  8,    8,  9, 12,   12,  9,  5,   10,  1, 12  },
-  /*  84:       2,    4,    6,     */ {  6, 12,  2,   12,  7,  2,    8,  2,  7,    2,  8,  1,    4,  1,  8,    1,  4, 12,   12,  5,  1,    6,  5, 12,   12,  4,  7  },
-  /* 148:       2,    4,       7,  */ {  6, 12,  4,   12, 10,  4,    1,  4, 10,    4,  1,  8,    2,  8,  1,    8,  2, 12,   12, 11,  8,    6, 11, 12,   12,  2, 10  },
-  /*  56:          3, 4, 5,        */ {  7, 12,  5,   12, 11,  5,    2,  5, 11,    5,  2,  9,    3,  9,  2,    9,  3, 12,   12,  8,  9,    7,  8, 12,   12,  3, 11  },
-  /* 104:          3,    5, 6,     */ {  4, 12,  6,    4, 11, 12,   11,  4,  3,    9,  3,  4,    3,  9,  2,   12,  2,  9,    9, 10, 12,   12, 10,  6,   11,  2, 12  },
-  /* 168:          3,    5,    7,  */ {  7, 12,  3,   12,  4,  3,    9,  3,  4,    3,  9,  2,    5,  2,  9,    2,  5, 12,   12,  6,  2,    7,  6, 12,   12,  5,  4  },
-  /*  87: 0, 1, 2,    4,    6,     */ {  3, 12,  7,    3,  4, 12,    4,  3,  9,    2,  9,  3,    9,  2,  5,   12,  5,  2,    2,  6, 12,   12,  6,  7,    4,  5, 12  },
-  /* 151: 0, 1, 2,    4,       7,  */ {  6, 12,  4,   12, 11,  4,    3,  4, 11,    4,  3,  9,    2,  9,  3,    9,  2, 12,   12, 10,  9,    6, 10, 12,   12,  2, 11  },
-  /* 199: 0, 1, 2,          6, 7,  */ {  5, 12,  7,    5, 11, 12,   11,  5,  2,    9,  2,  5,    2,  9,  3,   12,  3,  9,    9,  8, 12,   12,  8,  7,   11,  3, 12  },
-  /* 107: 0, 1,    3,    5, 6,     */ {  4, 12,  6,    4, 10, 12,   10,  4,  1,    8,  1,  4,    1,  8,  2,   12,  2,  8,    8, 11, 12,   12, 11,  6,   10,  2, 12  },
-  /* 171: 0, 1,    3,    5,    7,  */ {  2, 12,  6,    2,  7, 12,    7,  2,  8,    1,  8,  2,    8,  1,  4,   12,  4,  1,    1,  5, 12,   12,  5,  6,    7,  4, 12  },
-  /* 203: 0, 1,    3,       6, 7,  */ {  5, 12,  7,   12, 10,  7,    2,  7, 10,    7,  2,  8,    1,  8,  2,    8,  1, 12,   12,  9,  8,    5,  9, 12,   12,  1, 10  },
-  /* 211: 0, 1,       4,    6, 7,  */ {  1, 12,  3,   12,  9,  3,    4,  3,  9,    3,  4, 11,    5, 11,  4,   11,  5, 12,   12, 10, 11,    1, 10, 12,   12,  5,  9  },
-  /* 227: 0, 1,          5, 6, 7,  */ {  1, 12,  3,    1,  8, 12,    8,  1,  4,   10,  4,  1,    4, 10,  7,   12,  7, 10,   10, 11, 12,   12, 11,  3,    8,  7, 12  },
-  /*  61: 0,    2, 3, 4, 5,        */ {  7, 12,  5,    7,  9, 12,    9,  7,  0,   11,  0,  7,    0, 11,  1,   12,  1, 11,   11, 10, 12,   12, 10,  5,    9,  1, 12  },
-  /*  93: 0,    2, 3, 4,    6,     */ {  1, 12,  5,    1,  6, 12,    6,  1, 11,    0, 11,  1,   11,  0,  7,   12,  7,  0,    0,  4, 12,   12,  4,  5,    6,  7, 12  },
-  /* 109: 0,    2, 3,    5, 6,     */ {  4, 12,  6,   12,  9,  6,    1,  6,  9,    6,  1, 11,    0, 11,  1,   11,  0, 12,   12,  8, 11,    4,  8, 12,   12,  0,  9  },
-  /* 117: 0,    2,    4, 5, 6,     */ {  3, 12,  7,   12,  0,  7,    9,  7,  0,    7,  9,  6,    1,  6,  9,    6,  1, 12,   12,  2,  6,    3,  2, 12,   12,  1,  0  },
-  /* 213: 0,    2,    4,    6, 7,  */ {  1, 12,  5,   12,  2,  5,   11,  5,  2,    5, 11,  4,    3,  4, 11,    4,  3, 12,   12,  0,  4,    1,  0, 12,   12,  3,  2  },
-  /* 121: 0,       3, 4, 5, 6,     */ {  0, 12,  2,    0, 11, 12,   11,  0,  7,    9,  7,  0,    7,  9,  6,   12,  6,  9,    9, 10, 12,   12, 10,  2,   11,  6, 12  },
-  /* 233: 0,       3,    5, 6, 7,  */ {  0, 12,  2,   12,  8,  2,    7,  2,  8,    2,  7, 10,    4, 10,  7,   10,  4, 12,   12,  9, 10,    0,  9, 12,   12,  4,  8  },
-  /*  62:    1, 2, 3, 4, 5,        */ {  7, 12,  5,   12,  8,  5,    0,  5,  8,    5,  0, 10,    3, 10,  0,   10,  3, 12,   12, 11, 10,    7, 11, 12,   12,  3,  8  },
-  /* 158:    1, 2, 3, 4,       7,  */ {  6, 12,  4,    6,  8, 12,    8,  6,  3,   10,  3,  6,    3, 10,  0,   12,  0, 10,   10,  9, 12,   12,  9,  4,    8,  0, 12  },
-  /* 174:    1, 2, 3,    5,    7,  */ {  0, 12,  4,    0,  5, 12,    5,  0, 10,    3, 10,  0,   10,  3,  6,   12,  6,  3,    3,  7, 12,   12,  7,  4,    5,  6, 12  },
-  /* 182:    1, 2,    4, 5,    7,  */ {  2, 12,  0,   12, 10,  0,    5,  0, 10,    0,  5,  8,    6,  8,  5,    8,  6, 12,   12, 11,  8,    2, 11, 12,   12,  6, 10  },
-  /* 214:    1, 2,    4,    6, 7,  */ {  2, 12,  0,    2,  9, 12,    9,  2,  5,   11,  5,  2,    5, 11,  4,   12,  4, 11,   11,  8, 12,   12,  8,  0,    9,  4, 12  },
-  /* 186:    1,    3, 4, 5,    7,  */ {  2, 12,  6,   12,  3,  6,    8,  6,  3,    6,  8,  5,    0,  5,  8,    5,  0, 12,   12,  1,  5,    2,  1, 12,   12,  0,  3  },
-  /* 234:    1,    3,    5, 6, 7,  */ {  0, 12,  4,   12,  1,  4,   10,  4,  1,    4, 10,  7,    2,  7, 10,    7,  2, 12,   12,  3,  7,    0,  3, 12,   12,  2,  1  },
-  /* 124:       2, 3, 4, 5, 6,     */ {  3, 12,  1,   12, 11,  1,    6,  1, 11,    1,  6,  9,    7,  9,  6,    9,  7, 12,   12,  8,  9,    3,  8, 12,   12,  7, 11  },
-  /* 188:       2, 3, 4, 5,    7,  */ {  3, 12,  1,    3, 10, 12,   10,  3,  6,    8,  6,  3,    6,  8,  5,   12,  5,  8,    8,  9, 12,   12,  9,  1,   10,  5, 12  },
+  /*  67: 0, 1,             6,     */ {  1, 12,  3,   12, 10,  3,    6,  3, 10,    3,  6,  8,    5,  8,  6,    8,  5, 12,   12,  9,  8,    1,  9, 12,   12,  5, 10  },
+  /* 131: 0, 1,                7,  */ {  1, 12,  3,    1, 11, 12,   11,  1,  6,    9,  6,  1,    6,  9,  7,   12,  7,  9,    9,  8, 12,   12,  8,  3,   11,  7, 12  },
+  /*  21: 0,    2,    4,           */ {  4, 12,  0,    4,  1, 12,    1,  4, 10,    7, 10,  4,   10,  7,  2,   12,  2,  7,    7,  3, 12,   12,  3,  0,    1,  2, 12  },
+  /*  69: 0,    2,          6,     */ {  6, 12,  2,    6,  3, 12,    3,  6,  8,    5,  8,  6,    8,  5,  0,   12,  0,  5,    5,  1, 12,   12,  1,  2,    3,  0, 12  },
+  /*  41: 0,       3,    5,        */ {  0, 12,  2,   12,  9,  2,    5,  2,  9,    2,  5, 11,    4, 11,  5,   11,  4, 12,   12,  8, 11,    0,  8, 12,   12,  4,  9  },
+  /*  73: 0,       3,       6,     */ {  0, 12,  2,    0, 10, 12,   10,  0,  5,    8,  5,  0,    5,  8,  6,   12,  6,  8,    8, 11, 12,   12, 11,  2,   10,  6, 12  },
+  /*  81: 0,          4,    6,     */ {  4, 12,  0,   12,  5,  0,   10,  0,  5,    0, 10,  3,    6,  3, 10,    3,  6, 12,   12,  7,  3,    4,  7, 12,   12,  6,  5  },
+  /*  97: 0,             5, 6,     */ {  4, 12,  6,   12,  8,  6,    3,  6,  8,    6,  3, 10,    0, 10,  3,   10,  0, 12,   12,  9, 10,    4,  9, 12,   12,  0,  8  },
+  /* 193: 0,                6, 7,  */ {  5, 12,  7,    5,  8, 12,    8,  5,  0,   10,  0,  5,    0, 10,  3,   12,  3, 10,   10, 11, 12,   12, 11,  7,    8,  3, 12  },
+  /*  22:    1, 2,    4,           */ {  2, 12,  0,    2,  8, 12,    8,  2,  7,   10,  7,  2,    7, 10,  4,   12,  4, 10,   10,  9, 12,   12,  9,  0,    8,  4, 12  },
+  /* 134:    1, 2,             7,  */ {  2, 12,  0,   12, 11,  0,    7,  0, 11,    0,  7,  9,    6,  9,  7,    9,  6, 12,   12, 10,  9,    2, 10, 12,   12,  6, 11  },
+  /*  42:    1,    3,    5,        */ {  5, 12,  1,    5,  2, 12,    2,  5, 11,    4, 11,  5,   11,  4,  3,   12,  3,  4,    4,  0, 12,   12,  0,  1,    2,  3, 12  },
+  /* 138:    1,    3,          7,  */ {  7, 12,  3,    7,  0, 12,    0,  7,  9,    6,  9,  7,    9,  6,  1,   12,  1,  6,    6,  2, 12,   12,  2,  3,    0,  1, 12  },
+  /* 146:    1,       4,       7,  */ {  6, 12,  4,    6,  9, 12,    9,  6,  1,   11,  1,  6,    1, 11,  0,   12,  0, 11,   11,  8, 12,   12,  8,  4,    9,  0, 12  },
+  /* 162:    1,          5,    7,  */ {  5, 12,  1,   12,  6,  1,   11,  1,  6,    1, 11,  0,    7,  0, 11,    0,  7, 12,   12,  4,  0,    5,  4, 12,   12,  7,  6  },
+  /* 194:    1,             6, 7,  */ {  5, 12,  7,   12,  9,  7,    0,  7,  9,    7,  0, 11,    1, 11,  0,   11,  1, 12,   12, 10, 11,    5, 10, 12,   12,  1,  9  },
+  /*  28:       2, 3, 4,           */ {  3, 12,  1,   12,  8,  1,    4,  1,  8,    1,  4, 10,    7, 10,  4,   10,  7, 12,   12, 11, 10,    3, 11, 12,   12,  7,  8  },
+  /*  44:       2, 3,    5,        */ {  3, 12,  1,    3,  9, 12,    9,  3,  4,   11,  4,  3,    4, 11,  5,   12,  5, 11,   11, 10, 12,   12, 10,  1,    9,  5, 12  },
+  /*  52:       2,    4, 5,        */ {  7, 12,  5,    7, 10, 12,   10,  7,  2,    8,  2,  7,    2,  8,  1,   12,  1,  8,    8,  9, 12,   12,  9,  5,   10,  1, 12  },
+  /*  84:       2,    4,    6,     */ {  6, 12,  2,   12,  7,  2,    8,  2,  7,    2,  8,  1,    4,  1,  8,    1,  4, 12,   12,  5,  1,    6,  5, 12,   12,  4,  7  },
+  /* 148:       2,    4,       7,  */ {  6, 12,  4,   12, 10,  4,    1,  4, 10,    4,  1,  8,    2,  8,  1,    8,  2, 12,   12, 11,  8,    6, 11, 12,   12,  2, 10  },
+  /*  56:          3, 4, 5,        */ {  7, 12,  5,   12, 11,  5,    2,  5, 11,    5,  2,  9,    3,  9,  2,    9,  3, 12,   12,  8,  9,    7,  8, 12,   12,  3, 11  },
+  /* 104:          3,    5, 6,     */ {  4, 12,  6,    4, 11, 12,   11,  4,  3,    9,  3,  4,    3,  9,  2,   12,  2,  9,    9, 10, 12,   12, 10,  6,   11,  2, 12  },
+  /* 168:          3,    5,    7,  */ {  7, 12,  3,   12,  4,  3,    9,  3,  4,    3,  9,  2,    5,  2,  9,    2,  5, 12,   12,  6,  2,    7,  6, 12,   12,  5,  4  },
+  /*  87: 0, 1, 2,    4,    6,     */ {  3, 12,  7,    3,  4, 12,    4,  3,  9,    2,  9,  3,    9,  2,  5,   12,  5,  2,    2,  6, 12,   12,  6,  7,    4,  5, 12  },
+  /* 151: 0, 1, 2,    4,       7,  */ {  6, 12,  4,   12, 11,  4,    3,  4, 11,    4,  3,  9,    2,  9,  3,    9,  2, 12,   12, 10,  9,    6, 10, 12,   12,  2, 11  },
+  /* 199: 0, 1, 2,          6, 7,  */ {  5, 12,  7,    5, 11, 12,   11,  5,  2,    9,  2,  5,    2,  9,  3,   12,  3,  9,    9,  8, 12,   12,  8,  7,   11,  3, 12  },
+  /* 107: 0, 1,    3,    5, 6,     */ {  4, 12,  6,    4, 10, 12,   10,  4,  1,    8,  1,  4,    1,  8,  2,   12,  2,  8,    8, 11, 12,   12, 11,  6,   10,  2, 12  },
+  /* 171: 0, 1,    3,    5,    7,  */ {  2, 12,  6,    2,  7, 12,    7,  2,  8,    1,  8,  2,    8,  1,  4,   12,  4,  1,    1,  5, 12,   12,  5,  6,    7,  4, 12  },
+  /* 203: 0, 1,    3,       6, 7,  */ {  5, 12,  7,   12, 10,  7,    2,  7, 10,    7,  2,  8,    1,  8,  2,    8,  1, 12,   12,  9,  8,    5,  9, 12,   12,  1, 10  },
+  /* 211: 0, 1,       4,    6, 7,  */ {  1, 12,  3,   12,  9,  3,    4,  3,  9,    3,  4, 11,    5, 11,  4,   11,  5, 12,   12, 10, 11,    1, 10, 12,   12,  5,  9  },
+  /* 227: 0, 1,          5, 6, 7,  */ {  1, 12,  3,    1,  8, 12,    8,  1,  4,   10,  4,  1,    4, 10,  7,   12,  7, 10,   10, 11, 12,   12, 11,  3,    8,  7, 12  },
+  /*  61: 0,    2, 3, 4, 5,        */ {  7, 12,  5,    7,  9, 12,    9,  7,  0,   11,  0,  7,    0, 11,  1,   12,  1, 11,   11, 10, 12,   12, 10,  5,    9,  1, 12  },
+  /*  93: 0,    2, 3, 4,    6,     */ {  1, 12,  5,    1,  6, 12,    6,  1, 11,    0, 11,  1,   11,  0,  7,   12,  7,  0,    0,  4, 12,   12,  4,  5,    6,  7, 12  },
+  /* 109: 0,    2, 3,    5, 6,     */ {  4, 12,  6,   12,  9,  6,    1,  6,  9,    6,  1, 11,    0, 11,  1,   11,  0, 12,   12,  8, 11,    4,  8, 12,   12,  0,  9  },
+  /* 117: 0,    2,    4, 5, 6,     */ {  3, 12,  7,   12,  0,  7,    9,  7,  0,    7,  9,  6,    1,  6,  9,    6,  1, 12,   12,  2,  6,    3,  2, 12,   12,  1,  0  },
+  /* 213: 0,    2,    4,    6, 7,  */ {  1, 12,  5,   12,  2,  5,   11,  5,  2,    5, 11,  4,    3,  4, 11,    4,  3, 12,   12,  0,  4,    1,  0, 12,   12,  3,  2  },
+  /* 121: 0,       3, 4, 5, 6,     */ {  0, 12,  2,    0, 11, 12,   11,  0,  7,    9,  7,  0,    7,  9,  6,   12,  6,  9,    9, 10, 12,   12, 10,  2,   11,  6, 12  },
+  /* 233: 0,       3,    5, 6, 7,  */ {  0, 12,  2,   12,  8,  2,    7,  2,  8,    2,  7, 10,    4, 10,  7,   10,  4, 12,   12,  9, 10,    0,  9, 12,   12,  4,  8  },
+  /*  62:    1, 2, 3, 4, 5,        */ {  7, 12,  5,   12,  8,  5,    0,  5,  8,    5,  0, 10,    3, 10,  0,   10,  3, 12,   12, 11, 10,    7, 11, 12,   12,  3,  8  },
+  /* 158:    1, 2, 3, 4,       7,  */ {  6, 12,  4,    6,  8, 12,    8,  6,  3,   10,  3,  6,    3, 10,  0,   12,  0, 10,   10,  9, 12,   12,  9,  4,    8,  0, 12  },
+  /* 174:    1, 2, 3,    5,    7,  */ {  0, 12,  4,    0,  5, 12,    5,  0, 10,    3, 10,  0,   10,  3,  6,   12,  6,  3,    3,  7, 12,   12,  7,  4,    5,  6, 12  },
+  /* 182:    1, 2,    4, 5,    7,  */ {  2, 12,  0,   12, 10,  0,    5,  0, 10,    0,  5,  8,    6,  8,  5,    8,  6, 12,   12, 11,  8,    2, 11, 12,   12,  6, 10  },
+  /* 214:    1, 2,    4,    6, 7,  */ {  2, 12,  0,    2,  9, 12,    9,  2,  5,   11,  5,  2,    5, 11,  4,   12,  4, 11,   11,  8, 12,   12,  8,  0,    9,  4, 12  },
+  /* 186:    1,    3, 4, 5,    7,  */ {  2, 12,  6,   12,  3,  6,    8,  6,  3,    6,  8,  5,    0,  5,  8,    5,  0, 12,   12,  1,  5,    2,  1, 12,   12,  0,  3  },
+  /* 234:    1,    3,    5, 6, 7,  */ {  0, 12,  4,   12,  1,  4,   10,  4,  1,    4, 10,  7,    2,  7, 10,    7,  2, 12,   12,  3,  7,    0,  3, 12,   12,  2,  1  },
+  /* 124:       2, 3, 4, 5, 6,     */ {  3, 12,  1,   12, 11,  1,    6,  1, 11,    1,  6,  9,    7,  9,  6,    9,  7, 12,   12,  8,  9,    3,  8, 12,   12,  7, 11  },
+  /* 188:       2, 3, 4, 5,    7,  */ {  3, 12,  1,    3, 10, 12,   10,  3,  6,    8,  6,  3,    6,  8,  5,   12,  5,  8,    8,  9, 12,   12,  9,  1,   10,  5, 12  },
 };
 
 //_____________________________________________________________________________
@@ -1669,8 +1665,8 @@ static const char tiling12_2_[24][24] = {
 //-----------------------------------------------------------------------------
 /* 13: face test */
 static const char test13[2][7] = {
-/* 165: 0,    2,       5,    7,  */  { 1,2,3,4,5,6,7 },
-/*  90:    1,    3, 4,    6,     */  { 2,3,4,1,5,6,7 },
+/* 165: 0,    2,       5,    7,  */  { 1,2,3,4,5,6, 7 },
+/*  90:    1,    3, 4,    6,     */  { 2,3,4,1,5,6,-7 },
 };
 
 
@@ -2319,4 +2315,3 @@ static const char casesClassic[256][16] = {
 
 
 
-#endif // _LOOKUPTABLE_H_
diff --git a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/MarchingCubes/MarchingCubes.cpp b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/MarchingCubes.cpp
old mode 100755
new mode 100644
similarity index 50%
rename from applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/MarchingCubes/MarchingCubes.cpp
rename to applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/MarchingCubes.cpp
index d9012f0405..0197e8d1b2
--- a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/MarchingCubes/MarchingCubes.cpp
+++ b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/MarchingCubes.cpp
@@ -1,1302 +1,850 @@
-/**
- * @file    MarchingCubes.cpp
- * @author  Thomas Lewiner <thomas.lewiner@polytechnique.org>
- * @author  Math Dept, PUC-Rio
- * @version 0.2
- * @date    12/08/2002
- *
- * @brief   MarchingCubes Algorithm
- */
-//________________________________________________
-
-
-#if !defined(WIN32) || defined(__CYGWIN__)
-#pragma implementation
-#endif // WIN32
-
-#include <math.h>
-#include <time.h>
-#include <memory.h>
-#include <stdlib.h>
-#include <float.h>
-#include "MarchingCubes.h"
-#include "ply.h"
-#include "LookUpTable.h"
-
-// step size of the arrays of vertices and triangles
-#define ALLOC_SIZE 65536
-
-//_____________________________________________________________________________
-// print cube for debug
-void MarchingCubes::print_cube() { printf( "\t%f %f %f %f %f %f %f %f\n", _cube[0], _cube[1], _cube[2], _cube[3], _cube[4], _cube[5], _cube[6], _cube[7]) ; }
-//_____________________________________________________________________________
-
-
-
-//_____________________________________________________________________________
-// Constructor
-MarchingCubes::MarchingCubes( const int size_x /*= -1*/, const int size_y /*= -1*/, const int size_z /*= -1*/ ) :
-//-----------------------------------------------------------------------------
-  _originalMC(false),
-  _ext_data  (false),
-  _size_x    (size_x),
-  _size_y    (size_y),
-  _size_z    (size_z),
-  _data      ((real *)NULL),
-  _x_verts   (( int *)NULL),
-  _y_verts   (( int *)NULL),
-  _z_verts   (( int *)NULL),
-  _nverts    (0),
-  _ntrigs    (0),
-  _Nverts    (0),
-  _Ntrigs    (0),
-  _vertices  (( Vertex *)NULL),
-  _triangles ((Triangle*)NULL)
-{}
-//_____________________________________________________________________________
-
-
-
-//_____________________________________________________________________________
-// Destructor
-MarchingCubes::~MarchingCubes()
-//-----------------------------------------------------------------------------
-{
-  clean_all() ;
-}
-//_____________________________________________________________________________
-
-
-
-//_____________________________________________________________________________
-// main algorithm
-void MarchingCubes::run( real iso )
-//-----------------------------------------------------------------------------
-{
-  clock_t time = clock() ;
-
-  compute_intersection_points( iso ) ;
-
-  for( _k = 0 ; _k < _size_z-1 ; _k++ )
-  for( _j = 0 ; _j < _size_y-1 ; _j++ )
-  for( _i = 0 ; _i < _size_x-1 ; _i++ )
-  {
-    _lut_entry = 0 ;
-    for( int p = 0 ; p < 8 ; ++p )
-    {
-      _cube[p] = get_data( _i+((p^(p>>1))&1), _j+((p>>1)&1), _k+((p>>2)&1) ) - iso ;
-      if( fabs( _cube[p] ) < FLT_EPSILON ) _cube[p] = FLT_EPSILON ;
-      if( _cube[p] > 0 ) _lut_entry += 1 << p ;
-    }
-/*
-    if( ( _cube[0] = get_data( _i , _j , _k ) ) > 0 ) _lut_entry +=   1 ;
-    if( ( _cube[1] = get_data(_i+1, _j , _k ) ) > 0 ) _lut_entry +=   2 ;
-    if( ( _cube[2] = get_data(_i+1,_j+1, _k ) ) > 0 ) _lut_entry +=   4 ;
-    if( ( _cube[3] = get_data( _i ,_j+1, _k ) ) > 0 ) _lut_entry +=   8 ;
-    if( ( _cube[4] = get_data( _i , _j ,_k+1) ) > 0 ) _lut_entry +=  16 ;
-    if( ( _cube[5] = get_data(_i+1, _j ,_k+1) ) > 0 ) _lut_entry +=  32 ;
-    if( ( _cube[6] = get_data(_i+1,_j+1,_k+1) ) > 0 ) _lut_entry +=  64 ;
-    if( ( _cube[7] = get_data( _i ,_j+1,_k+1) ) > 0 ) _lut_entry += 128 ;
-*/
-    process_cube( ) ;
-  }
-
-  printf("Marching Cubes ran in %lf secs.\n", (double)(clock() - time)/CLOCKS_PER_SEC) ;
-}
-//_____________________________________________________________________________
-
-
-
-//_____________________________________________________________________________
-// init temporary structures (must set sizes before call)
-void MarchingCubes::init_temps()
-//-----------------------------------------------------------------------------
-{
-  if( !_ext_data )
-    _data    = new real [_size_x * _size_y * _size_z] ;
-  _x_verts = new int  [_size_x * _size_y * _size_z] ;
-  _y_verts = new int  [_size_x * _size_y * _size_z] ;
-  _z_verts = new int  [_size_x * _size_y * _size_z] ;
-
-  memset( _x_verts, -1, _size_x * _size_y * _size_z * sizeof( int ) ) ;
-  memset( _y_verts, -1, _size_x * _size_y * _size_z * sizeof( int ) ) ;
-  memset( _z_verts, -1, _size_x * _size_y * _size_z * sizeof( int ) ) ;
-}
-//_____________________________________________________________________________
-
-
-
-//_____________________________________________________________________________
-// init all structures (must set sizes before call)
-void MarchingCubes::init_all ()
-//-----------------------------------------------------------------------------
-{
-  init_temps() ;
-
-  _nverts = _ntrigs = 0 ;
-  _Nverts = _Ntrigs = ALLOC_SIZE ;
-  _vertices  = new Vertex  [_Nverts] ;
-  _triangles = new Triangle[_Ntrigs] ;
-}
-//_____________________________________________________________________________
-
-
-
-//_____________________________________________________________________________
-// clean temporary structures
-void MarchingCubes::clean_temps()
-//-----------------------------------------------------------------------------
-{
-  if( !_ext_data )
-    delete [] _data;
-  delete [] _x_verts;
-  delete [] _y_verts;
-  delete [] _z_verts;
-
-  if( !_ext_data )
-    _data     = (real*)NULL ;
-  _x_verts  = (int*)NULL ;
-  _y_verts  = (int*)NULL ;
-  _z_verts  = (int*)NULL ;
-}
-//_____________________________________________________________________________
-
-
-
-//_____________________________________________________________________________
-// clean all structures
-void MarchingCubes::clean_all()
-//-----------------------------------------------------------------------------
-{
-  clean_temps() ;
-  delete [] _vertices  ;
-  delete [] _triangles ;
-  _vertices  = (Vertex   *)NULL ;
-  _triangles = (Triangle *)NULL ;
-  _nverts = _ntrigs = 0 ;
-  _Nverts = _Ntrigs = 0 ;
-
-  _size_x = _size_y = _size_z = -1 ;
-}
-//_____________________________________________________________________________
-
-
-
-//_____________________________________________________________________________
-//_____________________________________________________________________________
-
-
-//_____________________________________________________________________________
-// Compute the intersection points
-void MarchingCubes::compute_intersection_points( real iso )
-//-----------------------------------------------------------------------------
-{
-  for( _k = 0 ; _k < _size_z ; _k++ )
-  for( _j = 0 ; _j < _size_y ; _j++ )
-  for( _i = 0 ; _i < _size_x ; _i++ )
-  {
-    _cube[0] = get_data( _i, _j, _k ) - iso ;
-    if( _i < _size_x - 1 ) _cube[1] = get_data(_i+1, _j , _k ) - iso ;
-    else                   _cube[1] = _cube[0] ;
-
-    if( _j < _size_y - 1 ) _cube[3] = get_data( _i ,_j+1, _k ) - iso ;
-    else                   _cube[3] = _cube[0] ;
-
-    if( _k < _size_z - 1 ) _cube[4] = get_data( _i , _j ,_k+1) - iso ;
-    else                   _cube[4] = _cube[0] ;
-
-    if( fabs( _cube[0] ) < FLT_EPSILON ) _cube[0] = FLT_EPSILON ;
-    if( fabs( _cube[1] ) < FLT_EPSILON ) _cube[1] = FLT_EPSILON ;
-    if( fabs( _cube[3] ) < FLT_EPSILON ) _cube[3] = FLT_EPSILON ;
-    if( fabs( _cube[4] ) < FLT_EPSILON ) _cube[4] = FLT_EPSILON ;
-
-    if( _cube[0] < 0 )
-    {
-      if( _cube[1] > 0 ) set_x_vert( add_x_vertex( ), _i,_j,_k ) ;
-      if( _cube[3] > 0 ) set_y_vert( add_y_vertex( ), _i,_j,_k ) ;
-      if( _cube[4] > 0 ) set_z_vert( add_z_vertex( ), _i,_j,_k ) ;
-    }
-    else
-    {
-      if( _cube[1] < 0 ) set_x_vert( add_x_vertex( ), _i,_j,_k ) ;
-      if( _cube[3] < 0 ) set_y_vert( add_y_vertex( ), _i,_j,_k ) ;
-      if( _cube[4] < 0 ) set_z_vert( add_z_vertex( ), _i,_j,_k ) ;
-    }
-  }
-}
-//_____________________________________________________________________________
-
-
-
-
-
-//_____________________________________________________________________________
-// Test a face
-// if face>0 return true if the face contains a part of the surface
-bool MarchingCubes::test_face( schar face )
-//-----------------------------------------------------------------------------
-{
-  real A,B,C,D ;
-
-  switch( face )
-  {
-  case -1 : case 1 :  A = _cube[0] ;  B = _cube[4] ;  C = _cube[5] ;  D = _cube[1] ;  break ;
-  case -2 : case 2 :  A = _cube[1] ;  B = _cube[5] ;  C = _cube[6] ;  D = _cube[2] ;  break ;
-  case -3 : case 3 :  A = _cube[2] ;  B = _cube[6] ;  C = _cube[7] ;  D = _cube[3] ;  break ;
-  case -4 : case 4 :  A = _cube[3] ;  B = _cube[7] ;  C = _cube[4] ;  D = _cube[0] ;  break ;
-  case -5 : case 5 :  A = _cube[0] ;  B = _cube[3] ;  C = _cube[2] ;  D = _cube[1] ;  break ;
-  case -6 : case 6 :  A = _cube[4] ;  B = _cube[7] ;  C = _cube[6] ;  D = _cube[5] ;  break ;
-  default : printf( "Invalid face code %d\n", face ) ;  print_cube() ;  A = B = C = D = 0 ;
-  };
-
-  if( fabs( A*C - B*D ) < FLT_EPSILON )
-    return face >= 0 ;
-  return face * A * ( A*C - B*D ) >= 0  ;  // face and A invert signs
-}
-//_____________________________________________________________________________
-
-
-
-
-
-//_____________________________________________________________________________
-// Test the interior of a cube
-// if s == 7, return true  if the interior is empty
-// if s ==-7, return false if the interior is empty
-bool MarchingCubes::test_interior( schar s )
-//-----------------------------------------------------------------------------
-{
-  real t, At=0, Bt=0, Ct=0, Dt=0, a, b ;
-  char  test =  0 ;
-  char  edge = -1 ; // reference edge of the triangulation
-
-  switch( _case )
-  {
-  case  4 :
-  case 10 :
-    a = ( _cube[4] - _cube[0] ) * ( _cube[6] - _cube[2] ) - ( _cube[7] - _cube[3] ) * ( _cube[5] - _cube[1] ) ;
-    b =  _cube[2] * ( _cube[4] - _cube[0] ) + _cube[0] * ( _cube[6] - _cube[2] )
-             - _cube[1] * ( _cube[7] - _cube[3] ) - _cube[3] * ( _cube[5] - _cube[1] ) ;
-    t = - b / (2*a) ;
-    if( t<0 || t>1 ) return s>0 ;
-
-    At = _cube[0] + ( _cube[4] - _cube[0] ) * t ;
-    Bt = _cube[3] + ( _cube[7] - _cube[3] ) * t ;
-    Ct = _cube[2] + ( _cube[6] - _cube[2] ) * t ;
-    Dt = _cube[1] + ( _cube[5] - _cube[1] ) * t ;
-    break ;
-
-  case  6 :
-  case  7 :
-  case 12 :
-  case 13 :
-    switch( _case )
-    {
-    case  6 : edge = test6 [_config][2] ; break ;
-    case  7 : edge = test7 [_config][4] ; break ;
-    case 12 : edge = test12[_config][3] ; break ;
-    case 13 : edge = tiling13_5_1[_config][_subconfig][0] ; break ;
-    }
-    switch( edge )
-    {
-    case  0 :
-      t  = _cube[0] / ( _cube[0] - _cube[1] ) ;
-      At = 0 ;
-      Bt = _cube[3] + ( _cube[2] - _cube[3] ) * t ;
-      Ct = _cube[7] + ( _cube[6] - _cube[7] ) * t ;
-      Dt = _cube[4] + ( _cube[5] - _cube[4] ) * t ;
-      break ;
-    case  1 :
-      t  = _cube[1] / ( _cube[1] - _cube[2] ) ;
-      At = 0 ;
-      Bt = _cube[0] + ( _cube[3] - _cube[0] ) * t ;
-      Ct = _cube[4] + ( _cube[7] - _cube[4] ) * t ;
-      Dt = _cube[5] + ( _cube[6] - _cube[5] ) * t ;
-      break ;
-    case  2 :
-      t  = _cube[2] / ( _cube[2] - _cube[3] ) ;
-      At = 0 ;
-      Bt = _cube[1] + ( _cube[0] - _cube[1] ) * t ;
-      Ct = _cube[5] + ( _cube[4] - _cube[5] ) * t ;
-      Dt = _cube[6] + ( _cube[7] - _cube[6] ) * t ;
-      break ;
-    case  3 :
-      t  = _cube[3] / ( _cube[3] - _cube[0] ) ;
-      At = 0 ;
-      Bt = _cube[2] + ( _cube[1] - _cube[2] ) * t ;
-      Ct = _cube[6] + ( _cube[5] - _cube[6] ) * t ;
-      Dt = _cube[7] + ( _cube[4] - _cube[7] ) * t ;
-      break ;
-    case  4 :
-      t  = _cube[4] / ( _cube[4] - _cube[5] ) ;
-      At = 0 ;
-      Bt = _cube[7] + ( _cube[6] - _cube[7] ) * t ;
-      Ct = _cube[3] + ( _cube[2] - _cube[3] ) * t ;
-      Dt = _cube[0] + ( _cube[1] - _cube[0] ) * t ;
-      break ;
-    case  5 :
-      t  = _cube[5] / ( _cube[5] - _cube[6] ) ;
-      At = 0 ;
-      Bt = _cube[4] + ( _cube[7] - _cube[4] ) * t ;
-      Ct = _cube[0] + ( _cube[3] - _cube[0] ) * t ;
-      Dt = _cube[1] + ( _cube[2] - _cube[1] ) * t ;
-      break ;
-    case  6 :
-      t  = _cube[6] / ( _cube[6] - _cube[7] ) ;
-      At = 0 ;
-      Bt = _cube[5] + ( _cube[4] - _cube[5] ) * t ;
-      Ct = _cube[1] + ( _cube[0] - _cube[1] ) * t ;
-      Dt = _cube[2] + ( _cube[3] - _cube[2] ) * t ;
-      break ;
-    case  7 :
-      t  = _cube[7] / ( _cube[7] - _cube[4] ) ;
-      At = 0 ;
-      Bt = _cube[6] + ( _cube[5] - _cube[6] ) * t ;
-      Ct = _cube[2] + ( _cube[1] - _cube[2] ) * t ;
-      Dt = _cube[3] + ( _cube[0] - _cube[3] ) * t ;
-      break ;
-    case  8 :
-      t  = _cube[0] / ( _cube[0] - _cube[4] ) ;
-      At = 0 ;
-      Bt = _cube[3] + ( _cube[7] - _cube[3] ) * t ;
-      Ct = _cube[2] + ( _cube[6] - _cube[2] ) * t ;
-      Dt = _cube[1] + ( _cube[5] - _cube[1] ) * t ;
-      break ;
-    case  9 :
-      t  = _cube[1] / ( _cube[1] - _cube[5] ) ;
-      At = 0 ;
-      Bt = _cube[0] + ( _cube[4] - _cube[0] ) * t ;
-      Ct = _cube[3] + ( _cube[7] - _cube[3] ) * t ;
-      Dt = _cube[2] + ( _cube[6] - _cube[2] ) * t ;
-      break ;
-    case 10 :
-      t  = _cube[2] / ( _cube[2] - _cube[6] ) ;
-      At = 0 ;
-      Bt = _cube[1] + ( _cube[5] - _cube[1] ) * t ;
-      Ct = _cube[0] + ( _cube[4] - _cube[0] ) * t ;
-      Dt = _cube[3] + ( _cube[7] - _cube[3] ) * t ;
-      break ;
-    case 11 :
-      t  = _cube[3] / ( _cube[3] - _cube[7] ) ;
-      At = 0 ;
-      Bt = _cube[2] + ( _cube[6] - _cube[2] ) * t ;
-      Ct = _cube[1] + ( _cube[5] - _cube[1] ) * t ;
-      Dt = _cube[0] + ( _cube[4] - _cube[0] ) * t ;
-      break ;
-    default : printf( "Invalid edge %d\n", edge ) ;  print_cube() ;  break ;
-    }
-    break ;
-
-  default : printf( "Invalid ambiguous case %d\n", _case ) ;  print_cube() ;  break ;
-  }
-
-  if( At >= 0 ) test ++ ;
-  if( Bt >= 0 ) test += 2 ;
-  if( Ct >= 0 ) test += 4 ;
-  if( Dt >= 0 ) test += 8 ;
-  switch( test )
-  {
-  case  0 : return s>0 ;
-  case  1 : return s>0 ;
-  case  2 : return s>0 ;
-  case  3 : return s>0 ;
-  case  4 : return s>0 ;
-  case  5 : if( At * Ct - Bt * Dt <  FLT_EPSILON ) return s>0 ; break ;
-  case  6 : return s>0 ;
-  case  7 : return s<0 ;
-  case  8 : return s>0 ;
-  case  9 : return s>0 ;
-  case 10 : if( At * Ct - Bt * Dt >= FLT_EPSILON ) return s>0 ; break ;
-  case 11 : return s<0 ;
-  case 12 : return s>0 ;
-  case 13 : return s<0 ;
-  case 14 : return s<0 ;
-  case 15 : return s<0 ;
-  }
-
-  return s<0 ;
-}
-//_____________________________________________________________________________
-
-
-
-
-//_____________________________________________________________________________
-// Process a unit cube
-void MarchingCubes::process_cube( )
-//-----------------------------------------------------------------------------
-{
-  if( _originalMC )
-  {
-    char nt = 0 ;
-    while( casesClassic[_lut_entry][3*nt] != -1 ) nt++ ;
-    add_triangle( casesClassic[_lut_entry], nt ) ;
-    return ;
-  }
-
-  int   v12 = -1 ;
-  _case   = cases[_lut_entry][0] ;
-  _config = cases[_lut_entry][1] ;
-  _subconfig = 0 ;
-
-  switch( _case )
-  {
-  case  0 :
-    break ;
-
-  case  1 :
-    add_triangle( tiling1[_config], 1 ) ;
-    break ;
-
-  case  2 :
-    add_triangle( tiling2[_config], 2 ) ;
-    break ;
-
-  case  3 :
-    if( test_face( test3[_config]) )
-      add_triangle( tiling3_2[_config], 4 ) ; // 3.2
-    else
-      add_triangle( tiling3_1[_config], 2 ) ; // 3.1
-    break ;
-
-  case  4 :
-    if( test_interior( test4[_config]) )
-      add_triangle( tiling4_1[_config], 2 ) ; // 4.1.1
-    else
-      add_triangle( tiling4_2[_config], 6 ) ; // 4.1.2
-    break ;
-
-  case  5 :
-    add_triangle( tiling5[_config], 3 ) ;
-    break ;
-
-  case  6 :
-    if( test_face( test6[_config][0]) )
-      add_triangle( tiling6_2[_config], 5 ) ; // 6.2
-    else
-    {
-      if( test_interior( test6[_config][1]) )
-        add_triangle( tiling6_1_1[_config], 3 ) ; // 6.1.1
-      else
-	  {
-        v12 = add_c_vertex() ;
-        add_triangle( tiling6_1_2[_config], 9 , v12) ; // 6.1.2
-      }
-    }
-    break ;
-
-  case  7 :
-    if( test_face( test7[_config][0] ) ) _subconfig +=  1 ;
-    if( test_face( test7[_config][1] ) ) _subconfig +=  2 ;
-    if( test_face( test7[_config][2] ) ) _subconfig +=  4 ;
-    switch( _subconfig )
-      {
-      case 0 :
-        add_triangle( tiling7_1[_config], 3 ) ; break ;
-      case 1 :
-        add_triangle( tiling7_2[_config][0], 5 ) ; break ;
-      case 2 :
-        add_triangle( tiling7_2[_config][1], 5 ) ; break ;
-      case 3 :
-        v12 = add_c_vertex() ;
-        add_triangle( tiling7_3[_config][0], 9, v12 ) ; break ;
-      case 4 :
-        add_triangle( tiling7_2[_config][2], 5 ) ; break ;
-      case 5 :
-        v12 = add_c_vertex() ;
-        add_triangle( tiling7_3[_config][1], 9, v12 ) ; break ;
-      case 6 :
-        v12 = add_c_vertex() ;
-        add_triangle( tiling7_3[_config][2], 9, v12 ) ; break ;
-      case 7 :
-        if( test_interior( test7[_config][3]) )
-          add_triangle( tiling7_4_2[_config], 9 ) ;
-        else
-          add_triangle( tiling7_4_1[_config], 5 ) ;
-        break ;
-      };
-    break ;
-
-  case  8 :
-    add_triangle( tiling8[_config], 2 ) ;
-    break ;
-
-  case  9 :
-    add_triangle( tiling9[_config], 4 ) ;
-    break ;
-
-  case 10 :
-    if( test_face( test10[_config][0]) )
-    {
-      if( test_face( test10[_config][1]) )
-        add_triangle( tiling10_1_1_[_config], 4 ) ; // 10.1.1
-      else
-      {
-        v12 = add_c_vertex() ;
-        add_triangle( tiling10_2[_config], 8, v12 ) ; // 10.2
-      }
-    }
-    else
-    {
-      if( test_face( test10[_config][1]) )
-      {
-        v12 = add_c_vertex() ;
-        add_triangle( tiling10_2_[_config], 8, v12 ) ; // 10.2
-      }
-      else
-      {
-        if( test_interior( test10[_config][2]) )
-          add_triangle( tiling10_1_1[_config], 4 ) ; // 10.1.1
-        else
-          add_triangle( tiling10_1_2[_config], 8 ) ; // 10.1.2
-      }
-    }
-    break ;
-
-  case 11 :
-    add_triangle( tiling11[_config], 4 ) ;
-    break ;
-
-  case 12 :
-    if( test_face( test12[_config][0]) )
-    {
-      if( test_face( test12[_config][1]) )
-        add_triangle( tiling12_1_1_[_config], 4 ) ; // 12.1.1
-      else
-      {
-        v12 = add_c_vertex() ;
-        add_triangle( tiling12_2[_config], 8, v12 ) ; // 12.2
-      }
-    }
-    else
-    {
-      if( test_face( test12[_config][1]) )
-      {
-        v12 = add_c_vertex() ;
-        add_triangle( tiling12_2_[_config], 8, v12 ) ; // 12.2
-      }
-      else
-      {
-        if( test_interior( test12[_config][2]) )
-          add_triangle( tiling12_1_1[_config], 4 ) ; // 12.1.1
-        else
-          add_triangle( tiling12_1_2[_config], 8 ) ; // 12.1.2
-      }
-    }
-    break ;
-
-  case 13 :
-    if( test_face( test13[_config][0] ) ) _subconfig +=  1 ;
-    if( test_face( test13[_config][1] ) ) _subconfig +=  2 ;
-    if( test_face( test13[_config][2] ) ) _subconfig +=  4 ;
-    if( test_face( test13[_config][3] ) ) _subconfig +=  8 ;
-    if( test_face( test13[_config][4] ) ) _subconfig += 16 ;
-    if( test_face( test13[_config][5] ) ) _subconfig += 32 ;
-    switch( subconfig13[_subconfig] )
-    {
-      case 0 :/* 13.1 */
-        add_triangle( tiling13_1[_config], 4 ) ; break ;
-
-      case 1 :/* 13.2 */
-        add_triangle( tiling13_2[_config][0], 6 ) ; break ;
-      case 2 :/* 13.2 */
-        add_triangle( tiling13_2[_config][1], 6 ) ; break ;
-      case 3 :/* 13.2 */
-        add_triangle( tiling13_2[_config][2], 6 ) ; break ;
-      case 4 :/* 13.2 */
-        add_triangle( tiling13_2[_config][3], 6 ) ; break ;
-      case 5 :/* 13.2 */
-        add_triangle( tiling13_2[_config][4], 6 ) ; break ;
-      case 6 :/* 13.2 */
-        add_triangle( tiling13_2[_config][5], 6 ) ; break ;
-
-      case 7 :/* 13.3 */
-        v12 = add_c_vertex() ;
-        add_triangle( tiling13_3[_config][0], 10, v12 ) ; break ;
-      case 8 :/* 13.3 */
-        v12 = add_c_vertex() ;
-        add_triangle( tiling13_3[_config][1], 10, v12 ) ; break ;
-      case 9 :/* 13.3 */
-        v12 = add_c_vertex() ;
-        add_triangle( tiling13_3[_config][2], 10, v12 ) ; break ;
-      case 10 :/* 13.3 */
-        v12 = add_c_vertex() ;
-        add_triangle( tiling13_3[_config][3], 10, v12 ) ; break ;
-      case 11 :/* 13.3 */
-        v12 = add_c_vertex() ;
-        add_triangle( tiling13_3[_config][4], 10, v12 ) ; break ;
-      case 12 :/* 13.3 */
-        v12 = add_c_vertex() ;
-        add_triangle( tiling13_3[_config][5], 10, v12 ) ; break ;
-      case 13 :/* 13.3 */
-        v12 = add_c_vertex() ;
-        add_triangle( tiling13_3[_config][6], 10, v12 ) ; break ;
-      case 14 :/* 13.3 */
-        v12 = add_c_vertex() ;
-        add_triangle( tiling13_3[_config][7], 10, v12 ) ; break ;
-      case 15 :/* 13.3 */
-        v12 = add_c_vertex() ;
-        add_triangle( tiling13_3[_config][8], 10, v12 ) ; break ;
-      case 16 :/* 13.3 */
-        v12 = add_c_vertex() ;
-        add_triangle( tiling13_3[_config][9], 10, v12 ) ; break ;
-      case 17 :/* 13.3 */
-        v12 = add_c_vertex() ;
-        add_triangle( tiling13_3[_config][10], 10, v12 ) ; break ;
-      case 18 :/* 13.3 */
-        v12 = add_c_vertex() ;
-        add_triangle( tiling13_3[_config][11], 10, v12 ) ; break ;
-
-      case 19 :/* 13.4 */
-        v12 = add_c_vertex() ;
-        add_triangle( tiling13_4[_config][0], 12, v12 ) ; break ;
-      case 20 :/* 13.4 */
-        v12 = add_c_vertex() ;
-        add_triangle( tiling13_4[_config][1], 12, v12 ) ; break ;
-      case 21 :/* 13.4 */
-        v12 = add_c_vertex() ;
-        add_triangle( tiling13_4[_config][2], 12, v12 ) ; break ;
-      case 22 :/* 13.4 */
-        v12 = add_c_vertex() ;
-        add_triangle( tiling13_4[_config][3], 12, v12 ) ; break ;
-
-      case 23 :/* 13.5 */
-        _subconfig = 0 ;
-        if( test_interior( test13[_config][6] ) )
-          add_triangle( tiling13_5_1[_config][0], 6 ) ;
-        else
-          add_triangle( tiling13_5_2[_config][0], 10 ) ;
-        break ;
-      case 24 :/* 13.5 */
-        _subconfig = 1 ;
-        if( test_interior( test13[_config][6] ) )
-          add_triangle( tiling13_5_1[_config][1], 6 ) ;
-        else
-          add_triangle( tiling13_5_2[_config][1], 10 ) ;
-        break ;
-      case 25 :/* 13.5 */
-        _subconfig = 2 ;
-        if( test_interior( test13[_config][6] ) )
-          add_triangle( tiling13_5_1[_config][2], 6 ) ;
-        else
-          add_triangle( tiling13_5_2[_config][2], 10 ) ;
-        break ;
-      case 26 :/* 13.5 */
-        _subconfig = 3 ;
-        if( test_interior( test13[_config][6] ) )
-          add_triangle( tiling13_5_1[_config][3], 6 ) ;
-        else
-          add_triangle( tiling13_5_2[_config][3], 10 ) ;
-        break ;
-
-      case 27 :/* 13.3 */
-        v12 = add_c_vertex() ;
-        add_triangle( tiling13_3_[_config][0], 10, v12 ) ; break ;
-      case 28 :/* 13.3 */
-        v12 = add_c_vertex() ;
-        add_triangle( tiling13_3_[_config][1], 10, v12 ) ; break ;
-      case 29 :/* 13.3 */
-        v12 = add_c_vertex() ;
-        add_triangle( tiling13_3_[_config][2], 10, v12 ) ; break ;
-      case 30 :/* 13.3 */
-        v12 = add_c_vertex() ;
-        add_triangle( tiling13_3_[_config][3], 10, v12 ) ; break ;
-      case 31 :/* 13.3 */
-        v12 = add_c_vertex() ;
-        add_triangle( tiling13_3_[_config][4], 10, v12 ) ; break ;
-      case 32 :/* 13.3 */
-        v12 = add_c_vertex() ;
-        add_triangle( tiling13_3_[_config][5], 10, v12 ) ; break ;
-      case 33 :/* 13.3 */
-        v12 = add_c_vertex() ;
-        add_triangle( tiling13_3_[_config][6], 10, v12 ) ; break ;
-      case 34 :/* 13.3 */
-        v12 = add_c_vertex() ;
-        add_triangle( tiling13_3_[_config][7], 10, v12 ) ; break ;
-      case 35 :/* 13.3 */
-        v12 = add_c_vertex() ;
-        add_triangle( tiling13_3_[_config][8], 10, v12 ) ; break ;
-      case 36 :/* 13.3 */
-        v12 = add_c_vertex() ;
-        add_triangle( tiling13_3_[_config][9], 10, v12 ) ; break ;
-      case 37 :/* 13.3 */
-        v12 = add_c_vertex() ;
-        add_triangle( tiling13_3_[_config][10], 10, v12 ) ; break ;
-      case 38 :/* 13.3 */
-        v12 = add_c_vertex() ;
-        add_triangle( tiling13_3_[_config][11], 10, v12 ) ; break ;
-
-      case 39 :/* 13.2 */
-        add_triangle( tiling13_2_[_config][0], 6 ) ; break ;
-      case 40 :/* 13.2 */
-        add_triangle( tiling13_2_[_config][1], 6 ) ; break ;
-      case 41 :/* 13.2 */
-        add_triangle( tiling13_2_[_config][2], 6 ) ; break ;
-      case 42 :/* 13.2 */
-        add_triangle( tiling13_2_[_config][3], 6 ) ; break ;
-      case 43 :/* 13.2 */
-        add_triangle( tiling13_2_[_config][4], 6 ) ; break ;
-      case 44 :/* 13.2 */
-        add_triangle( tiling13_2_[_config][5], 6 ) ; break ;
-
-      case 45 :/* 13.1 */
-        add_triangle( tiling13_1_[_config], 4 ) ; break ;
-
-      default :
-        printf("Marching Cubes: Impossible case 13?\n" ) ;  print_cube() ;
-      }
-      break ;
-
-  case 14 :
-    add_triangle( tiling14[_config], 4 ) ;
-    break ;
-  };
-}
-//_____________________________________________________________________________
-
-
-
-//_____________________________________________________________________________
-// Adding triangles
-void MarchingCubes::add_triangle( const char* trig, char n, int v12 )
-//-----------------------------------------------------------------------------
-{
-  int    tv[3] ;
-
-  for( int t = 0 ; t < 3*n ; t++ )
-  {
-    switch( trig[t] )
-    {
-    case  0 : tv[ t % 3 ] = get_x_vert( _i , _j , _k ) ; break ;
-    case  1 : tv[ t % 3 ] = get_y_vert(_i+1, _j , _k ) ; break ;
-    case  2 : tv[ t % 3 ] = get_x_vert( _i ,_j+1, _k ) ; break ;
-    case  3 : tv[ t % 3 ] = get_y_vert( _i , _j , _k ) ; break ;
-    case  4 : tv[ t % 3 ] = get_x_vert( _i , _j ,_k+1) ; break ;
-    case  5 : tv[ t % 3 ] = get_y_vert(_i+1, _j ,_k+1) ; break ;
-    case  6 : tv[ t % 3 ] = get_x_vert( _i ,_j+1,_k+1) ; break ;
-    case  7 : tv[ t % 3 ] = get_y_vert( _i , _j ,_k+1) ; break ;
-    case  8 : tv[ t % 3 ] = get_z_vert( _i , _j , _k ) ; break ;
-    case  9 : tv[ t % 3 ] = get_z_vert(_i+1, _j , _k ) ; break ;
-    case 10 : tv[ t % 3 ] = get_z_vert(_i+1,_j+1, _k ) ; break ;
-    case 11 : tv[ t % 3 ] = get_z_vert( _i ,_j+1, _k ) ; break ;
-    case 12 : tv[ t % 3 ] = v12 ; break ;
-    default : break ;
-    }
-
-    if( tv[t%3] == -1 )
-    {
-      printf("Marching Cubes: invalid triangle %d\n", _ntrigs+1) ;
-      print_cube() ;
-    }
-
-    if( t%3 == 2 )
-    {
-      if( _ntrigs >= _Ntrigs )
-      {
-        Triangle *temp = _triangles ;
-        _triangles = new Triangle[ 2*_Ntrigs ] ;
-        memcpy( _triangles, temp, _Ntrigs*sizeof(Triangle) ) ;
-        delete[] temp ;
-        printf("%d allocated triangles\n", _Ntrigs) ;
-        _Ntrigs *= 2 ;
-      }
-
-      Triangle *T = _triangles + _ntrigs++ ;
-      T->v1    = tv[0] ;
-      T->v2    = tv[1] ;
-      T->v3    = tv[2] ;
-    }
-  }
-}
-//_____________________________________________________________________________
-
-
-
-//_____________________________________________________________________________
-// Calculating gradient
-
-real MarchingCubes::get_x_grad( const int i, const int j, const int k ) const
-//-----------------------------------------------------------------------------
-{
-  if( i > 0 )
-  {
-    if ( i < _size_x - 1 )
-      return ( get_data( i+1, j, k ) - get_data( i-1, j, k ) ) / 2 ;
-    else
-      return get_data( i, j, k ) - get_data( i-1, j, k ) ;
-  }
-  else
-    return get_data( i+1, j, k ) - get_data( i, j, k ) ;
-}
-//-----------------------------------------------------------------------------
-
-real MarchingCubes::get_y_grad( const int i, const int j, const int k ) const
-//-----------------------------------------------------------------------------
-{
-  if( j > 0 )
-  {
-    if ( j < _size_y - 1 )
-      return ( get_data( i, j+1, k ) - get_data( i, j-1, k ) ) / 2 ;
-    else
-      return get_data( i, j, k ) - get_data( i, j-1, k ) ;
-  }
-  else
-    return get_data( i, j+1, k ) - get_data( i, j, k ) ;
-}
-//-----------------------------------------------------------------------------
-
-real MarchingCubes::get_z_grad( const int i, const int j, const int k ) const
-//-----------------------------------------------------------------------------
-{
-  if( k > 0 )
-  {
-    if ( k < _size_z - 1 )
-      return ( get_data( i, j, k+1 ) - get_data( i, j, k-1 ) ) / 2 ;
-    else
-      return get_data( i, j, k ) - get_data( i, j, k-1 ) ;
-  }
-  else
-    return get_data( i, j, k+1 ) - get_data( i, j, k ) ;
-}
-//_____________________________________________________________________________
-
-
-//_____________________________________________________________________________
-// Adding vertices
-
-void MarchingCubes::test_vertex_addition()
-{
-  if( _nverts >= _Nverts )
-  {
-    Vertex *temp = _vertices ;
-    _vertices = new Vertex[ _Nverts*2 ] ;
-    memcpy( _vertices, temp, _Nverts*sizeof(Vertex) ) ;
-    delete[] temp ;
-    printf("%d allocated vertices\n", _Nverts) ;
-    _Nverts *= 2 ;
-  }
-}
-
-
-int MarchingCubes::add_x_vertex( )
-//-----------------------------------------------------------------------------
-{
-  test_vertex_addition() ;
-  Vertex *vert = _vertices + _nverts++ ;
-
-  real u = ( _cube[0] ) / ( _cube[0] - _cube[1] ) ;
-
-  vert->x      = (real)_i+u;
-  vert->y      = (real) _j ;
-  vert->z      = (real) _k ;
-
-  vert->nx = (1-u)*get_x_grad(_i,_j,_k) + u*get_x_grad(_i+1,_j,_k) ;
-  vert->ny = (1-u)*get_y_grad(_i,_j,_k) + u*get_y_grad(_i+1,_j,_k) ;
-  vert->nz = (1-u)*get_z_grad(_i,_j,_k) + u*get_z_grad(_i+1,_j,_k) ;
-
-  u = (real) sqrt( vert->nx * vert->nx + vert->ny * vert->ny +vert->nz * vert->nz ) ;
-  if( u > 0 )
-  {
-    vert->nx /= u ;
-    vert->ny /= u ;
-    vert->nz /= u ;
-  }
-
-
-  return _nverts-1 ;
-}
-//-----------------------------------------------------------------------------
-
-int MarchingCubes::add_y_vertex( )
-//-----------------------------------------------------------------------------
-{
-  test_vertex_addition() ;
-  Vertex *vert = _vertices + _nverts++ ;
-
-  real u = ( _cube[0] ) / ( _cube[0] - _cube[3] ) ;
-
-  vert->x      = (real) _i ;
-  vert->y      = (real)_j+u;
-  vert->z      = (real) _k ;
-
-  vert->nx = (1-u)*get_x_grad(_i,_j,_k) + u*get_x_grad(_i,_j+1,_k) ;
-  vert->ny = (1-u)*get_y_grad(_i,_j,_k) + u*get_y_grad(_i,_j+1,_k) ;
-  vert->nz = (1-u)*get_z_grad(_i,_j,_k) + u*get_z_grad(_i,_j+1,_k) ;
-
-  u = (real) sqrt( vert->nx * vert->nx + vert->ny * vert->ny +vert->nz * vert->nz ) ;
-  if( u > 0 )
-  {
-    vert->nx /= u ;
-    vert->ny /= u ;
-    vert->nz /= u ;
-  }
-
-  return _nverts-1 ;
-}
-//-----------------------------------------------------------------------------
-
-int MarchingCubes::add_z_vertex( )
-//-----------------------------------------------------------------------------
-{
-  test_vertex_addition() ;
-  Vertex *vert = _vertices + _nverts++ ;
-
-  real u = ( _cube[0] ) / ( _cube[0] - _cube[4] ) ;
-
-  vert->x      = (real) _i ;
-  vert->y      = (real) _j ;
-  vert->z      = (real)_k+u;
-
-  vert->nx = (1-u)*get_x_grad(_i,_j,_k) + u*get_x_grad(_i,_j,_k+1) ;
-  vert->ny = (1-u)*get_y_grad(_i,_j,_k) + u*get_y_grad(_i,_j,_k+1) ;
-  vert->nz = (1-u)*get_z_grad(_i,_j,_k) + u*get_z_grad(_i,_j,_k+1) ;
-
-  u = (real) sqrt( vert->nx * vert->nx + vert->ny * vert->ny +vert->nz * vert->nz ) ;
-  if( u > 0 )
-  {
-    vert->nx /= u ;
-    vert->ny /= u ;
-    vert->nz /= u ;
-  }
-
-  return _nverts-1 ;
-}
-
-
-int MarchingCubes::add_c_vertex( )
-//-----------------------------------------------------------------------------
-{
-  test_vertex_addition() ;
-  Vertex *vert = _vertices + _nverts++ ;
-
-  real u = 0 ;
-  int   vid ;
-
-  vert->x = vert->y = vert->z =  vert->nx = vert->ny = vert->nz = 0 ;
-
-  // Computes the average of the intersection points of the cube
-  vid = get_x_vert( _i , _j , _k ) ;
-  if( vid != -1 ) { ++u ; const Vertex &v = _vertices[vid] ; vert->x += v.x ;  vert->y += v.y ;  vert->z += v.z ;  vert->nx += v.nx ; vert->ny += v.ny ; vert->nz += v.nz ; }
-  vid = get_y_vert(_i+1, _j , _k ) ;
-  if( vid != -1 ) { ++u ; const Vertex &v = _vertices[vid] ; vert->x += v.x ;  vert->y += v.y ;  vert->z += v.z ;  vert->nx += v.nx ; vert->ny += v.ny ; vert->nz += v.nz ; }
-  vid = get_x_vert( _i ,_j+1, _k ) ;
-  if( vid != -1 ) { ++u ; const Vertex &v = _vertices[vid] ; vert->x += v.x ;  vert->y += v.y ;  vert->z += v.z ;  vert->nx += v.nx ; vert->ny += v.ny ; vert->nz += v.nz ; }
-  vid = get_y_vert( _i , _j , _k ) ;
-  if( vid != -1 ) { ++u ; const Vertex &v = _vertices[vid] ; vert->x += v.x ;  vert->y += v.y ;  vert->z += v.z ;  vert->nx += v.nx ; vert->ny += v.ny ; vert->nz += v.nz ; }
-  vid = get_x_vert( _i , _j ,_k+1) ;
-  if( vid != -1 ) { ++u ; const Vertex &v = _vertices[vid] ; vert->x += v.x ;  vert->y += v.y ;  vert->z += v.z ;  vert->nx += v.nx ; vert->ny += v.ny ; vert->nz += v.nz ; }
-  vid = get_y_vert(_i+1, _j ,_k+1) ;
-  if( vid != -1 ) { ++u ; const Vertex &v = _vertices[vid] ; vert->x += v.x ;  vert->y += v.y ;  vert->z += v.z ;  vert->nx += v.nx ; vert->ny += v.ny ; vert->nz += v.nz ; }
-  vid = get_x_vert( _i ,_j+1,_k+1) ;
-  if( vid != -1 ) { ++u ; const Vertex &v = _vertices[vid] ; vert->x += v.x ;  vert->y += v.y ;  vert->z += v.z ;  vert->nx += v.nx ; vert->ny += v.ny ; vert->nz += v.nz ; }
-  vid = get_y_vert( _i , _j ,_k+1) ;
-  if( vid != -1 ) { ++u ; const Vertex &v = _vertices[vid] ; vert->x += v.x ;  vert->y += v.y ;  vert->z += v.z ;  vert->nx += v.nx ; vert->ny += v.ny ; vert->nz += v.nz ; }
-  vid = get_z_vert( _i , _j , _k ) ;
-  if( vid != -1 ) { ++u ; const Vertex &v = _vertices[vid] ; vert->x += v.x ;  vert->y += v.y ;  vert->z += v.z ;  vert->nx += v.nx ; vert->ny += v.ny ; vert->nz += v.nz ; }
-  vid = get_z_vert(_i+1, _j , _k ) ;
-  if( vid != -1 ) { ++u ; const Vertex &v = _vertices[vid] ; vert->x += v.x ;  vert->y += v.y ;  vert->z += v.z ;  vert->nx += v.nx ; vert->ny += v.ny ; vert->nz += v.nz ; }
-  vid = get_z_vert(_i+1,_j+1, _k ) ;
-  if( vid != -1 ) { ++u ; const Vertex &v = _vertices[vid] ; vert->x += v.x ;  vert->y += v.y ;  vert->z += v.z ;  vert->nx += v.nx ; vert->ny += v.ny ; vert->nz += v.nz ; }
-  vid = get_z_vert( _i ,_j+1, _k ) ;
-  if( vid != -1 ) { ++u ; const Vertex &v = _vertices[vid] ; vert->x += v.x ;  vert->y += v.y ;  vert->z += v.z ;  vert->nx += v.nx ; vert->ny += v.ny ; vert->nz += v.nz ; }
-
-  vert->x  /= u ;
-  vert->y  /= u ;
-  vert->z  /= u ;
-
-  u = (real) sqrt( vert->nx * vert->nx + vert->ny * vert->ny +vert->nz * vert->nz ) ;
-  if( u > 0 )
-  {
-    vert->nx /= u ;
-    vert->ny /= u ;
-    vert->nz /= u ;
-  }
-
-  return _nverts-1 ;
-}
-//_____________________________________________________________________________
-
-
-
-//_____________________________________________________________________________
-//_____________________________________________________________________________
-
-
-
-
-//_____________________________________________________________________________
-// Grid exportation
-void MarchingCubes::writeISO(const char *fn )
-//-----------------------------------------------------------------------------
-{
-  unsigned char buf[sizeof(float)] ;
-
-  FILE *fp = fopen( fn, "wb" ) ;
-
-  // header
-  * (int*) buf = _size_x ;
-  fwrite(buf, sizeof(float), 1, fp);
-  * (int*) buf = _size_y ;
-  fwrite(buf, sizeof(float), 1, fp);
-  * (int*) buf = _size_z ;
-  fwrite(buf, sizeof(float), 1, fp);
-
-  * (float*) buf = -1.0f ;
-  fwrite(buf, sizeof(float), 1, fp);
-  * (float*) buf =  1.0f ;
-  fwrite(buf, sizeof(float), 1, fp);
-  * (float*) buf = -1.0f ;
-  fwrite(buf, sizeof(float), 1, fp);
-  * (float*) buf =  1.0f ;
-  fwrite(buf, sizeof(float), 1, fp);
-  * (float*) buf = -1.0f ;
-  fwrite(buf, sizeof(float), 1, fp);
-  * (float*) buf =  1.0f ;
-  fwrite(buf, sizeof(float), 1, fp);
-
-  for( int i = 0 ; i < _size_x ; i++ )
-  {
-    for( int j = 0 ; j < _size_y ; j++ )
-    {
-      for( int k = 0 ; k < _size_z ; k++ )
-      {
-        * (float*) buf = (float)get_data( i,j,k ) ;
-        fwrite(buf, sizeof(float), 1, fp);
-      }
-    }
-  }
-
-  fclose(fp) ;
-}
-//_____________________________________________________________________________
-
-
-
-
-
-//_____________________________________________________________________________
-// PLY exportation
-void MarchingCubes::writePLY(const char *fn, bool bin )
-//-----------------------------------------------------------------------------
-{
-
-  typedef struct PlyFace {
-    unsigned char nverts;    /* number of Vertex indices in list */
-    int *verts;              /* Vertex index list */
-  } PlyFace;
-
-
-  PlyProperty vert_props[]  = { /* list of property information for a PlyVertex */
-    {"x", Float32, Float32, offsetof( Vertex,x ), 0, 0, 0, 0},
-    {"y", Float32, Float32, offsetof( Vertex,y ), 0, 0, 0, 0},
-    {"z", Float32, Float32, offsetof( Vertex,z ), 0, 0, 0, 0},
-    {"nx", Float32, Float32, offsetof( Vertex,nx ), 0, 0, 0, 0},
-    {"ny", Float32, Float32, offsetof( Vertex,ny ), 0, 0, 0, 0},
-    {"nz", Float32, Float32, offsetof( Vertex,nz ), 0, 0, 0, 0}
-  };
-
-  PlyProperty face_props[]  = { /* list of property information for a PlyFace */
-    {"vertex_indices", Int32, Int32, offsetof( PlyFace,verts ),
-      1, Uint8, Uint8, offsetof( PlyFace,nverts )},
-  };
-
-
-  PlyFile    *ply;
-  FILE       *fp = fopen( fn, "w" );
-
-  int          i ;
-  PlyFace     face ;
-  int         verts[3] ;
-  char       *elem_names[]  = { "vertex", "face" };
-  printf("Marching Cubes::writePLY(%s)...", fn ) ;
-  ply = write_ply ( fp, 2, elem_names, bin? PLY_BINARY_LE : PLY_ASCII );
-
-  /* describe what properties go into the PlyVertex elements */
-  describe_element_ply ( ply, "vertex", _nverts );
-  describe_property_ply ( ply, &vert_props[0] );
-  describe_property_ply ( ply, &vert_props[1] );
-  describe_property_ply ( ply, &vert_props[2] );
-  describe_property_ply ( ply, &vert_props[3] );
-  describe_property_ply ( ply, &vert_props[4] );
-  describe_property_ply ( ply, &vert_props[5] );
-
-  /* describe PlyFace properties (just list of PlyVertex indices) */
-  describe_element_ply ( ply, "face", _ntrigs );
-  describe_property_ply ( ply, &face_props[0] );
-
-  header_complete_ply ( ply );
-
-  /* set up and write the PlyVertex elements */
-  put_element_setup_ply ( ply, "vertex" );
-  for ( i = 0; i < _nverts; i++ )
-    put_element_ply ( ply, ( void * ) &(_vertices[i]) );
-  printf("   %d vertices written\n", _nverts ) ;
-
-  /* set up and write the PlyFace elements */
-  put_element_setup_ply ( ply, "face" );
-  face.nverts = 3 ;
-  face.verts  = verts ;
-  for ( i = 0; i < _ntrigs; i++ )
-  {
-    face.verts[0] = _triangles[i].v1 ;
-    face.verts[1] = _triangles[i].v2 ;
-    face.verts[2] = _triangles[i].v3 ;
-    put_element_ply ( ply, ( void * ) &face );
-  }
-  printf("   %d triangles written\n", _ntrigs ) ;
-
-  close_ply ( ply );
-  free_ply ( ply );
-  fclose( fp ) ;
-}
-//_____________________________________________________________________________
-
-
-
-//_____________________________________________________________________________
-// PLY importation
-void MarchingCubes::readPLY(const char *fn )
-//-----------------------------------------------------------------------------
-{
-  typedef struct PlyFace {
-    unsigned char nverts;    /* number of Vertex indices in list */
-    int *verts;              /* Vertex index list */
-  } PlyFace;
-
-
-  PlyProperty vert_props[]  = { /* list of property information for a PlyVertex */
-    {"x", Float32, Float32, offsetof( Vertex,x ), 0, 0, 0, 0},
-    {"y", Float32, Float32, offsetof( Vertex,y ), 0, 0, 0, 0},
-    {"z", Float32, Float32, offsetof( Vertex,z ), 0, 0, 0, 0},
-    {"nx", Float32, Float32, offsetof( Vertex,nx ), 0, 0, 0, 0},
-    {"ny", Float32, Float32, offsetof( Vertex,ny ), 0, 0, 0, 0},
-    {"nz", Float32, Float32, offsetof( Vertex,nz ), 0, 0, 0, 0}
-  };
-
-  PlyProperty face_props[]  = { /* list of property information for a PlyFace */
-    {"vertex_indices", Int32, Int32, offsetof( PlyFace,verts ),
-      1, Uint8, Uint8, offsetof( PlyFace,nverts )},
-  };
-
-
-  FILE    *fp  = fopen( fn, "r" );
-  if( !fp ) return ;
-  PlyFile *ply = read_ply ( fp );
-  printf("Marching Cubes::readPLY(%s)...", fn ) ;
-
-  //-----------------------------------------------------------------------------
-
-  // gets the number of faces and vertices
-  for ( int i = 0; i < ply->num_elem_types; ++i )
-  {
-    int elem_count ;
-    char *elem_name = setup_element_read_ply ( ply, i, &elem_count );
-    if ( equal_strings ( "vertex", elem_name ) )
-      _Nverts = _nverts = elem_count;
-    if ( equal_strings ( "face",   elem_name ) )
-      _Ntrigs = _ntrigs = elem_count;
-  }
-  delete [] _vertices ;
-  _vertices  = new Vertex  [_Nverts] ;
-  delete [] _triangles ;
-  _triangles = new Triangle[_Ntrigs] ;
-
-  //-----------------------------------------------------------------------------
-
-  /* examine each element type that is in the file (PlyVertex, PlyFace) */
-
-  for ( int i = 0; i < ply->num_elem_types; ++i )
-  {
-    /* prepare to read the i'th list of elements */
-    int elem_count ;
-    char *elem_name = setup_element_read_ply ( ply, i, &elem_count );
-
-    //-----------------------------------------------------------------------------
-    if ( equal_strings ( "vertex", elem_name ) )
-    {
-      /* set up for getting PlyVertex elements */
-      setup_property_ply ( ply, &vert_props[0] );
-      setup_property_ply ( ply, &vert_props[1] );
-      setup_property_ply ( ply, &vert_props[2] );
-      setup_property_ply ( ply, &vert_props[3] );
-      setup_property_ply ( ply, &vert_props[4] );
-      setup_property_ply ( ply, &vert_props[5] );
-
-      for ( int j = 0; j < _nverts; ++j )
-      {
-        get_element_ply ( ply, ( void * ) (_vertices + j) );
-      }
-      printf("   %d vertices read\n", _nverts ) ;
-    }
-
-    //-----------------------------------------------------------------------------
-    else if ( equal_strings ( "face", elem_name ) )
-    {
-      /* set up for getting PlyFace elements */
-      /* (all we need are PlyVertex indices) */
-
-      setup_property_ply ( ply, &face_props[0] ) ;
-      PlyFace     face ;
-      for ( int j = 0; j < _ntrigs; ++j )
-      {
-        get_element_ply ( ply, ( void * ) &face );
-        if( face.nverts != 3 )
-        {
-          printf( "not a triangulated surface: polygon %d has %d sides\n", j, face.nverts ) ;
-          return ;
-        }
-
-        _triangles[j].v1 = face.verts[0] ;
-        _triangles[j].v2 = face.verts[1] ;
-        _triangles[j].v3 = face.verts[2] ;
-
-        free( face.verts ) ;
-      }
-      printf("   %d triangles read\n", _ntrigs ) ;
-    }
-    //-----------------------------------------------------------------------------
-
-    //-----------------------------------------------------------------------------
-    else  /* all non-PlyVertex and non-PlyFace elements are grabbed here */
-      get_other_element_ply ( ply );
-    //-----------------------------------------------------------------------------
-  }
-
-  close_ply ( ply );
-  free_ply  ( ply );
-
-//  fit_to_bbox() ;
-  fclose( fp ) ;
-}
-//_____________________________________________________________________________
-
-
-
-//_____________________________________________________________________________
-// Open Inventor / VRML 1.0 ascii exportation
-void MarchingCubes::writeIV(const char *fn )
-//-----------------------------------------------------------------------------
-{
-  FILE *fp = fopen( fn, "w" ) ;
-  int   i ;
-
-  printf("Marching Cubes::exportIV(%s)...", fn) ;
-
-  fprintf( fp, "#Inventor V2.1 ascii \n\nSeparator { \n    ShapeHints {\n        vertexOrdering  COUNTERCLOCKWISE\n        shapeType       UNKNOWN_SHAPE_TYPE\n        creaseAngle     0.0\n    }\n Coordinate3 { \n point [  \n" ) ;
-  for ( i = 0; i < _nverts; i++ )
-    fprintf( fp, " %f %f %f,\n", _vertices[i].x, _vertices[i].y, _vertices[i].z ) ;
-  printf("   %d vertices written\n", _nverts ) ;
-
-  fprintf( fp, "\n ] \n} \nNormal { \nvector [ \n" ) ;
-  for ( i = 0; i < _nverts; i++ )
-    fprintf( fp, " %f %f %f,\n", _vertices[i].nx, _vertices[i].ny, _vertices[i].nz ) ;
-
-  fprintf( fp, "\n ] \n} \nIndexedFaceSet { \ncoordIndex [ \n" ) ;
-  for ( i = 0; i < _ntrigs; i++ )
-    fprintf( fp, "%d, %d, %d, -1,\n", _triangles[i].v1, _triangles[i].v2, _triangles[i].v3 ) ;
-
-  fprintf( fp, " ] \n } \n } \n" ) ;
-  fclose( fp ) ;
-  printf("   %d triangles written\n", _ntrigs ) ;
-}
-//_____________________________________________________________________________
+/**
+ * @file    MarchingCubes.cpp
+ * @author  Thomas Lewiner <thomas.lewiner@polytechnique.org>
+ * @author  Math Dept, PUC-Rio
+ * @version 0.2
+ * @date    12/08/2002
+ *
+ * @brief   MarchingCubes Algorithm
+ */
+//________________________________________________
+
+
+#if !defined(WIN32) || defined(__CYGWIN__)
+#pragma implementation
+#endif // WIN32
+
+#include <math.h>
+#include <time.h>
+#include <memory.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <float.h>
+#include "MarchingCubes.h"
+#include "LookUpTable.h"
+
+// step size of the arrays of vertices and triangles
+#define ALLOC_SIZE 65536
+
+//_____________________________________________________________________________
+// print cube for debug
+void MarchingCubes::print_cube() { printf( "\t%f %f %f %f %f %f %f %f\n", _cube[0], _cube[1], _cube[2], _cube[3], _cube[4], _cube[5], _cube[6], _cube[7]) ; }
+//_____________________________________________________________________________
+
+
+
+//_____________________________________________________________________________
+// Constructor
+MarchingCubes::MarchingCubes() :
+//-----------------------------------------------------------------------------
+  _originalMC(true),
+  _nverts    (0),
+  _ntrigs    (0),
+  _Nverts    (0),
+  _Ntrigs    (0),
+  _vertices  (( Point  *)NULL),
+  _triangles ((Triangle*)NULL)
+{}
+//_____________________________________________________________________________
+
+
+
+//_____________________________________________________________________________
+// Destructor
+MarchingCubes::~MarchingCubes()
+//-----------------------------------------------------------------------------
+{
+  clean_all() ;
+}
+//_____________________________________________________________________________
+
+
+
+//_____________________________________________________________________________
+// main algorithm
+bool MarchingCubes::tesselate_cube( real iso )
+//-----------------------------------------------------------------------------
+{
+  for( int p = 0 ; p < 8 ; ++p )
+  {
+    real &v = _cube[p] ;
+    v -= iso ;
+    if( fabs( v ) < R_EPSILON ) v = R_EPSILON ;
+//    printf( "%d - %+0.2f\t", (int)_indexes[p], v ) ;
+  }
+//  printf( "\n" ) ;
+  
+  if( !compute_intersection_points() ) return false ;
+
+  _lut_entry = 0 ;
+  for( int p = 0 ; p < 8 ; ++p )
+  {
+    if( _cube[p] > 0 ) _lut_entry += 1 << p ;
+  }
+
+  return process_cube( ) ;
+}
+//_____________________________________________________________________________
+
+
+
+//_____________________________________________________________________________
+// init all structures (must set sizes before call)
+void MarchingCubes::init_all ()
+//-----------------------------------------------------------------------------
+{
+  _nverts = _ntrigs = 0 ;
+  _Nverts = _Ntrigs = ALLOC_SIZE ;
+  _vertices  = new Point   [_Nverts] ;
+  _triangles = new Triangle[_Ntrigs] ;
+}
+//_____________________________________________________________________________
+
+
+
+//_____________________________________________________________________________
+// clean temporary structures
+void MarchingCubes::clean_temps()
+//-----------------------------------------------------------------------------
+{
+  _stored_vertices.clear() ;
+}
+//_____________________________________________________________________________
+
+
+
+//_____________________________________________________________________________
+// clean all structures
+void MarchingCubes::clean_all()
+//-----------------------------------------------------------------------------
+{
+  clean_temps() ;
+  delete [] _vertices  ;
+  delete [] _triangles ;
+  _vertices  = (Point   *)NULL ;
+  _triangles = (Triangle *)NULL ;
+  _nverts = _ntrigs = 0 ;
+  _Nverts = _Ntrigs = 0 ;
+}
+//_____________________________________________________________________________
+
+
+
+//_____________________________________________________________________________
+//_____________________________________________________________________________
+
+
+//_____________________________________________________________________________
+// Compute the intersection points
+bool MarchingCubes::compute_intersection_points()
+//-----------------------------------------------------------------------------
+{
+  bool res = false ;
+  res |= add_vertex( 0,1 ) ;
+  res |= add_vertex( 1,2 ) ;
+  res |= add_vertex( 2,3 ) ;
+  res |= add_vertex( 3,0 ) ;
+
+  res |= add_vertex( 4,5 ) ;
+  res |= add_vertex( 5,6 ) ;
+  res |= add_vertex( 6,7 ) ;
+  res |= add_vertex( 7,4 ) ;
+
+  res |= add_vertex( 0,4 ) ;
+  res |= add_vertex( 1,5 ) ;
+  res |= add_vertex( 2,6 ) ;
+  res |= add_vertex( 3,7 ) ;
+  
+  return res ;
+}
+//_____________________________________________________________________________
+
+
+
+
+
+//_____________________________________________________________________________
+// Test a face
+// if face>0 return true if the face contains a part of the surface
+bool MarchingCubes::test_face( schar face )
+//-----------------------------------------------------------------------------
+{
+  real A,B,C,D ;
+
+  switch( face )
+  {
+  case -1 : case 1 :  A = _cube[0] ;  B = _cube[4] ;  C = _cube[5] ;  D = _cube[1] ;  break ;
+  case -2 : case 2 :  A = _cube[1] ;  B = _cube[5] ;  C = _cube[6] ;  D = _cube[2] ;  break ;
+  case -3 : case 3 :  A = _cube[2] ;  B = _cube[6] ;  C = _cube[7] ;  D = _cube[3] ;  break ;
+  case -4 : case 4 :  A = _cube[3] ;  B = _cube[7] ;  C = _cube[4] ;  D = _cube[0] ;  break ;
+  case -5 : case 5 :  A = _cube[0] ;  B = _cube[3] ;  C = _cube[2] ;  D = _cube[1] ;  break ;
+  case -6 : case 6 :  A = _cube[4] ;  B = _cube[7] ;  C = _cube[6] ;  D = _cube[5] ;  break ;
+  default : printf( "Invalid face code %d\n", face ) ;  print_cube() ;  A = B = C = D = 0 ;
+  };
+
+  if( fabs( A*C - B*D ) < R_EPSILON )
+    return face >= 0 ;
+  return face * A * ( A*C - B*D ) >= 0  ;  // face and A invert signs
+}
+//_____________________________________________________________________________
+
+
+
+
+
+//_____________________________________________________________________________
+// Test the interior of a cube
+// if s == 7, return true  if the interior is empty
+// if s ==-7, return false if the interior is empty
+bool MarchingCubes::test_interior( schar s )
+//-----------------------------------------------------------------------------
+{
+  real t, At=0, Bt=0, Ct=0, Dt=0, a, b ;
+  char  test =  0 ;
+  char  edge = -1 ; // reference edge of the triangulation
+
+  switch( _case )
+  {
+  case  4 :
+  case 10 :
+  case 13 :
+    a = ( _cube[4] - _cube[0] ) * ( _cube[6] - _cube[2] ) - ( _cube[7] - _cube[3] ) * ( _cube[5] - _cube[1] ) ;
+    b =  _cube[2] * ( _cube[4] - _cube[0] ) + _cube[0] * ( _cube[6] - _cube[2] )
+             - _cube[1] * ( _cube[7] - _cube[3] ) - _cube[3] * ( _cube[5] - _cube[1] ) ;
+    t = - b / (2*a) ;
+    if( t<0 || t>1 ) return s>0 ;
+
+    At = _cube[0] + ( _cube[4] - _cube[0] ) * t ;
+    Bt = _cube[3] + ( _cube[7] - _cube[3] ) * t ;
+    Ct = _cube[2] + ( _cube[6] - _cube[2] ) * t ;
+    Dt = _cube[1] + ( _cube[5] - _cube[1] ) * t ;
+    break ;
+
+  case  6 :
+  case  7 :
+  case 12 :
+    switch( _case )
+    {
+    case  6 : edge = test6 [_config][2] ; break ;
+    case  7 : edge = test7 [_config][4] ; break ;
+    case 12 : edge = test12[_config][3] ; break ;
+    }
+    switch( edge )
+    {
+    case  0 :
+      t  = _cube[0] / ( _cube[0] - _cube[1] ) ;
+      At = 0 ;
+      Bt = _cube[3] + ( _cube[2] - _cube[3] ) * t ;
+      Ct = _cube[7] + ( _cube[6] - _cube[7] ) * t ;
+      Dt = _cube[4] + ( _cube[5] - _cube[4] ) * t ;
+      break ;
+    case  1 :
+      t  = _cube[1] / ( _cube[1] - _cube[2] ) ;
+      At = 0 ;
+      Bt = _cube[0] + ( _cube[3] - _cube[0] ) * t ;
+      Ct = _cube[4] + ( _cube[7] - _cube[4] ) * t ;
+      Dt = _cube[5] + ( _cube[6] - _cube[5] ) * t ;
+      break ;
+    case  2 :
+      t  = _cube[2] / ( _cube[2] - _cube[3] ) ;
+      At = 0 ;
+      Bt = _cube[1] + ( _cube[0] - _cube[1] ) * t ;
+      Ct = _cube[5] + ( _cube[4] - _cube[5] ) * t ;
+      Dt = _cube[6] + ( _cube[7] - _cube[6] ) * t ;
+      break ;
+    case  3 :
+      t  = _cube[3] / ( _cube[3] - _cube[0] ) ;
+      At = 0 ;
+      Bt = _cube[2] + ( _cube[1] - _cube[2] ) * t ;
+      Ct = _cube[6] + ( _cube[5] - _cube[6] ) * t ;
+      Dt = _cube[7] + ( _cube[4] - _cube[7] ) * t ;
+      break ;
+    case  4 :
+      t  = _cube[4] / ( _cube[4] - _cube[5] ) ;
+      At = 0 ;
+      Bt = _cube[7] + ( _cube[6] - _cube[7] ) * t ;
+      Ct = _cube[3] + ( _cube[2] - _cube[3] ) * t ;
+      Dt = _cube[0] + ( _cube[1] - _cube[0] ) * t ;
+      break ;
+    case  5 :
+      t  = _cube[5] / ( _cube[5] - _cube[6] ) ;
+      At = 0 ;
+      Bt = _cube[4] + ( _cube[7] - _cube[4] ) * t ;
+      Ct = _cube[0] + ( _cube[3] - _cube[0] ) * t ;
+      Dt = _cube[1] + ( _cube[2] - _cube[1] ) * t ;
+      break ;
+    case  6 :
+      t  = _cube[6] / ( _cube[6] - _cube[7] ) ;
+      At = 0 ;
+      Bt = _cube[5] + ( _cube[4] - _cube[5] ) * t ;
+      Ct = _cube[1] + ( _cube[0] - _cube[1] ) * t ;
+      Dt = _cube[2] + ( _cube[3] - _cube[2] ) * t ;
+      break ;
+    case  7 :
+      t  = _cube[7] / ( _cube[7] - _cube[4] ) ;
+      At = 0 ;
+      Bt = _cube[6] + ( _cube[5] - _cube[6] ) * t ;
+      Ct = _cube[2] + ( _cube[1] - _cube[2] ) * t ;
+      Dt = _cube[3] + ( _cube[0] - _cube[3] ) * t ;
+      break ;
+    case  8 :
+      t  = _cube[0] / ( _cube[0] - _cube[4] ) ;
+      At = 0 ;
+      Bt = _cube[3] + ( _cube[7] - _cube[3] ) * t ;
+      Ct = _cube[2] + ( _cube[6] - _cube[2] ) * t ;
+      Dt = _cube[1] + ( _cube[5] - _cube[1] ) * t ;
+      break ;
+    case  9 :
+      t  = _cube[1] / ( _cube[1] - _cube[5] ) ;
+      At = 0 ;
+      Bt = _cube[0] + ( _cube[4] - _cube[0] ) * t ;
+      Ct = _cube[3] + ( _cube[7] - _cube[3] ) * t ;
+      Dt = _cube[2] + ( _cube[6] - _cube[2] ) * t ;
+      break ;
+    case 10 :
+      t  = _cube[2] / ( _cube[2] - _cube[6] ) ;
+      At = 0 ;
+      Bt = _cube[1] + ( _cube[5] - _cube[1] ) * t ;
+      Ct = _cube[0] + ( _cube[4] - _cube[0] ) * t ;
+      Dt = _cube[3] + ( _cube[7] - _cube[3] ) * t ;
+      break ;
+    case 11 :
+      t  = _cube[3] / ( _cube[3] - _cube[7] ) ;
+      At = 0 ;
+      Bt = _cube[2] + ( _cube[6] - _cube[2] ) * t ;
+      Ct = _cube[1] + ( _cube[5] - _cube[1] ) * t ;
+      Dt = _cube[0] + ( _cube[4] - _cube[0] ) * t ;
+      break ;
+    default : printf( "Invalid edge %d\n", edge ) ;  print_cube() ;  break ;
+    }
+    break ;
+
+  default : printf( "Invalid ambiguous case %d\n", _case ) ;  print_cube() ;  break ;
+  }
+
+  if( At >= 0 ) test ++ ;
+  if( Bt >= 0 ) test += 2 ;
+  if( Ct >= 0 ) test += 4 ;
+  if( Dt >= 0 ) test += 8 ;
+  switch( test )
+  {
+  case  0 : return s>0 ;
+  case  1 : return s>0 ;
+  case  2 : return s>0 ;
+  case  3 : return s>0 ;
+  case  4 : return s>0 ;
+  case  5 : if( At * Ct - Bt * Dt <  R_EPSILON ) return s>0 ; break ;
+  case  6 : return s>0 ;
+  case  7 : return s<0 ;
+  case  8 : return s>0 ;
+  case  9 : return s>0 ;
+  case 10 : if( At * Ct - Bt * Dt >= R_EPSILON ) return s>0 ; break ;
+  case 11 : return s<0 ;
+  case 12 : return s>0 ;
+  case 13 : return s<0 ;
+  case 14 : return s<0 ;
+  case 15 : return s<0 ;
+  }
+
+  return s<0 ;
+}
+//_____________________________________________________________________________
+
+
+
+
+//_____________________________________________________________________________
+// Process a unit cube
+bool MarchingCubes::process_cube( )
+//-----------------------------------------------------------------------------
+{
+  if( _originalMC )
+  {
+    char nt = 0 ;
+    while( casesClassic[_lut_entry][3*nt] != -1 ) nt++ ;
+    add_triangle( casesClassic[_lut_entry], nt ) ;
+    return true ;
+  }
+
+  int   v12 = -1 ;
+  _case   = cases[_lut_entry][0] ;
+  _config = cases[_lut_entry][1] ;
+  _subconfig = 0 ;
+
+  switch( _case )
+  {
+  case  0 :
+    break ;
+
+  case  1 :
+    add_triangle( tiling1[_config], 1 ) ;
+    break ;
+
+  case  2 :
+    add_triangle( tiling2[_config], 2 ) ;
+    break ;
+
+  case  3 :
+    if( test_face( test3[_config]) )
+      add_triangle( tiling3_2[_config], 4 ) ; // 3.2
+    else
+      add_triangle( tiling3_1[_config], 2 ) ; // 3.1
+    break ;
+
+  case  4 :
+    if( test_interior( test4[_config]) )
+      add_triangle( tiling4_1[_config], 2 ) ; // 4.1.1
+    else
+      add_triangle( tiling4_2[_config], 6 ) ; // 4.1.2
+    break ;
+
+  case  5 :
+    add_triangle( tiling5[_config], 3 ) ;
+    break ;
+
+  case  6 :
+    if( test_face( test6[_config][0]) )
+      add_triangle( tiling6_2[_config], 5 ) ; // 6.2
+    else
+    {
+      if( test_interior( test6[_config][1]) )
+        add_triangle( tiling6_1_1[_config], 3 ) ; // 6.1.1
+      else
+	  {
+        v12 = add_c_vertex() ;
+        add_triangle( tiling6_1_2[_config], 9 , v12) ; // 6.1.2
+      }
+    }
+    break ;
+
+  case  7 :
+    if( test_face( test7[_config][0] ) ) _subconfig +=  1 ;
+    if( test_face( test7[_config][1] ) ) _subconfig +=  2 ;
+    if( test_face( test7[_config][2] ) ) _subconfig +=  4 ;
+    switch( _subconfig )
+      {
+      case 0 :
+        add_triangle( tiling7_1[_config], 3 ) ; break ;
+      case 1 :
+        add_triangle( tiling7_2[_config][0], 5 ) ; break ;
+      case 2 :
+        add_triangle( tiling7_2[_config][1], 5 ) ; break ;
+      case 3 :
+        v12 = add_c_vertex() ;
+        add_triangle( tiling7_3[_config][0], 9, v12 ) ; break ;
+      case 4 :
+        add_triangle( tiling7_2[_config][2], 5 ) ; break ;
+      case 5 :
+        v12 = add_c_vertex() ;
+        add_triangle( tiling7_3[_config][1], 9, v12 ) ; break ;
+      case 6 :
+        v12 = add_c_vertex() ;
+        add_triangle( tiling7_3[_config][2], 9, v12 ) ; break ;
+      case 7 :
+        if( test_interior( test7[_config][3]) )
+          add_triangle( tiling7_4_2[_config], 9 ) ;
+        else
+          add_triangle( tiling7_4_1[_config], 5 ) ;
+        break ;
+      };
+    break ;
+
+  case  8 :
+    add_triangle( tiling8[_config], 2 ) ;
+    break ;
+
+  case  9 :
+    add_triangle( tiling9[_config], 4 ) ;
+    break ;
+
+  case 10 :
+    if( test_face( test10[_config][0]) )
+    {
+      if( test_face( test10[_config][1]) )
+        add_triangle( tiling10_1_1_[_config], 4 ) ; // 10.1.1
+      else
+      {
+        v12 = add_c_vertex() ;
+        add_triangle( tiling10_2[_config], 8, v12 ) ; // 10.2
+      }
+    }
+    else
+    {
+      if( test_face( test10[_config][1]) )
+      {
+        v12 = add_c_vertex() ;
+        add_triangle( tiling10_2_[_config], 8, v12 ) ; // 10.2
+      }
+      else
+      {
+        if( test_interior( test10[_config][2]) )
+          add_triangle( tiling10_1_1[_config], 4 ) ; // 10.1.1
+        else
+          add_triangle( tiling10_1_2[_config], 8 ) ; // 10.1.2
+      }
+    }
+    break ;
+
+  case 11 :
+    add_triangle( tiling11[_config], 4 ) ;
+    break ;
+
+  case 12 :
+    if( test_face( test12[_config][0]) )
+    {
+      if( test_face( test12[_config][1]) )
+        add_triangle( tiling12_1_1_[_config], 4 ) ; // 12.1.1
+      else
+      {
+        v12 = add_c_vertex() ;
+        add_triangle( tiling12_2[_config], 8, v12 ) ; // 12.2
+      }
+    }
+    else
+    {
+      if( test_face( test12[_config][1]) )
+      {
+        v12 = add_c_vertex() ;
+        add_triangle( tiling12_2_[_config], 8, v12 ) ; // 12.2
+      }
+      else
+      {
+        if( test_interior( test12[_config][2]) )
+          add_triangle( tiling12_1_1[_config], 4 ) ; // 12.1.1
+        else
+          add_triangle( tiling12_1_2[_config], 8 ) ; // 12.1.2
+      }
+    }
+    break ;
+
+  case 13 :
+    if( test_face( test13[_config][0] ) ) _subconfig +=  1 ;
+    if( test_face( test13[_config][1] ) ) _subconfig +=  2 ;
+    if( test_face( test13[_config][2] ) ) _subconfig +=  4 ;
+    if( test_face( test13[_config][3] ) ) _subconfig +=  8 ;
+    if( test_face( test13[_config][4] ) ) _subconfig += 16 ;
+    if( test_face( test13[_config][5] ) ) _subconfig += 32 ;
+    switch( subconfig13[_subconfig] )
+    {
+      case 0 :/* 13.1 */
+        add_triangle( tiling13_1[_config], 4 ) ; break ;
+
+      case 1 :/* 13.2 */
+        add_triangle( tiling13_2[_config][0], 6 ) ; break ;
+      case 2 :/* 13.2 */
+        add_triangle( tiling13_2[_config][1], 6 ) ; break ;
+      case 3 :/* 13.2 */
+        add_triangle( tiling13_2[_config][2], 6 ) ; break ;
+      case 4 :/* 13.2 */
+        add_triangle( tiling13_2[_config][3], 6 ) ; break ;
+      case 5 :/* 13.2 */
+        add_triangle( tiling13_2[_config][4], 6 ) ; break ;
+      case 6 :/* 13.2 */
+        add_triangle( tiling13_2[_config][5], 6 ) ; break ;
+
+      case 7 :/* 13.3 */
+        v12 = add_c_vertex() ;
+        add_triangle( tiling13_3[_config][0], 10, v12 ) ; break ;
+      case 8 :/* 13.3 */
+        v12 = add_c_vertex() ;
+        add_triangle( tiling13_3[_config][1], 10, v12 ) ; break ;
+      case 9 :/* 13.3 */
+        v12 = add_c_vertex() ;
+        add_triangle( tiling13_3[_config][2], 10, v12 ) ; break ;
+      case 10 :/* 13.3 */
+        v12 = add_c_vertex() ;
+        add_triangle( tiling13_3[_config][3], 10, v12 ) ; break ;
+      case 11 :/* 13.3 */
+        v12 = add_c_vertex() ;
+        add_triangle( tiling13_3[_config][4], 10, v12 ) ; break ;
+      case 12 :/* 13.3 */
+        v12 = add_c_vertex() ;
+        add_triangle( tiling13_3[_config][5], 10, v12 ) ; break ;
+      case 13 :/* 13.3 */
+        v12 = add_c_vertex() ;
+        add_triangle( tiling13_3[_config][6], 10, v12 ) ; break ;
+      case 14 :/* 13.3 */
+        v12 = add_c_vertex() ;
+        add_triangle( tiling13_3[_config][7], 10, v12 ) ; break ;
+      case 15 :/* 13.3 */
+        v12 = add_c_vertex() ;
+        add_triangle( tiling13_3[_config][8], 10, v12 ) ; break ;
+      case 16 :/* 13.3 */
+        v12 = add_c_vertex() ;
+        add_triangle( tiling13_3[_config][9], 10, v12 ) ; break ;
+      case 17 :/* 13.3 */
+        v12 = add_c_vertex() ;
+        add_triangle( tiling13_3[_config][10], 10, v12 ) ; break ;
+      case 18 :/* 13.3 */
+        v12 = add_c_vertex() ;
+        add_triangle( tiling13_3[_config][11], 10, v12 ) ; break ;
+
+      case 19 :/* 13.4 */
+        v12 = add_c_vertex() ;
+        add_triangle( tiling13_4[_config][0], 12, v12 ) ; break ;
+      case 20 :/* 13.4 */
+        v12 = add_c_vertex() ;
+        add_triangle( tiling13_4[_config][1], 12, v12 ) ; break ;
+      case 21 :/* 13.4 */
+        v12 = add_c_vertex() ;
+        add_triangle( tiling13_4[_config][2], 12, v12 ) ; break ;
+      case 22 :/* 13.4 */
+        v12 = add_c_vertex() ;
+        add_triangle( tiling13_4[_config][3], 12, v12 ) ; break ;
+
+      case 23 :/* 13.5 */
+        _subconfig = 0 ;
+        if( test_interior( test13[_config][6] ) )
+          add_triangle( tiling13_5_1[_config][0], 6 ) ;
+        else
+          add_triangle( tiling13_5_2[_config][0], 10 ) ;
+        break ;
+      case 24 :/* 13.5 */
+        _subconfig = 1 ;
+        if( test_interior( test13[_config][6] ) )
+          add_triangle( tiling13_5_1[_config][1], 6 ) ;
+        else
+          add_triangle( tiling13_5_2[_config][1], 10 ) ;
+        break ;
+      case 25 :/* 13.5 */
+        _subconfig = 2 ;
+        if( test_interior( test13[_config][6] ) )
+          add_triangle( tiling13_5_1[_config][2], 6 ) ;
+        else
+          add_triangle( tiling13_5_2[_config][2], 10 ) ;
+        break ;
+      case 26 :/* 13.5 */
+        _subconfig = 3 ;
+        if( test_interior( test13[_config][6] ) )
+          add_triangle( tiling13_5_1[_config][3], 6 ) ;
+        else
+          add_triangle( tiling13_5_2[_config][3], 10 ) ;
+        break ;
+
+      case 27 :/* 13.3 */
+        v12 = add_c_vertex() ;
+        add_triangle( tiling13_3_[_config][0], 10, v12 ) ; break ;
+      case 28 :/* 13.3 */
+        v12 = add_c_vertex() ;
+        add_triangle( tiling13_3_[_config][1], 10, v12 ) ; break ;
+      case 29 :/* 13.3 */
+        v12 = add_c_vertex() ;
+        add_triangle( tiling13_3_[_config][2], 10, v12 ) ; break ;
+      case 30 :/* 13.3 */
+        v12 = add_c_vertex() ;
+        add_triangle( tiling13_3_[_config][3], 10, v12 ) ; break ;
+      case 31 :/* 13.3 */
+        v12 = add_c_vertex() ;
+        add_triangle( tiling13_3_[_config][4], 10, v12 ) ; break ;
+      case 32 :/* 13.3 */
+        v12 = add_c_vertex() ;
+        add_triangle( tiling13_3_[_config][5], 10, v12 ) ; break ;
+      case 33 :/* 13.3 */
+        v12 = add_c_vertex() ;
+        add_triangle( tiling13_3_[_config][6], 10, v12 ) ; break ;
+      case 34 :/* 13.3 */
+        v12 = add_c_vertex() ;
+        add_triangle( tiling13_3_[_config][7], 10, v12 ) ; break ;
+      case 35 :/* 13.3 */
+        v12 = add_c_vertex() ;
+        add_triangle( tiling13_3_[_config][8], 10, v12 ) ; break ;
+      case 36 :/* 13.3 */
+        v12 = add_c_vertex() ;
+        add_triangle( tiling13_3_[_config][9], 10, v12 ) ; break ;
+      case 37 :/* 13.3 */
+        v12 = add_c_vertex() ;
+        add_triangle( tiling13_3_[_config][10], 10, v12 ) ; break ;
+      case 38 :/* 13.3 */
+        v12 = add_c_vertex() ;
+        add_triangle( tiling13_3_[_config][11], 10, v12 ) ; break ;
+
+      case 39 :/* 13.2 */
+        add_triangle( tiling13_2_[_config][0], 6 ) ; break ;
+      case 40 :/* 13.2 */
+        add_triangle( tiling13_2_[_config][1], 6 ) ; break ;
+      case 41 :/* 13.2 */
+        add_triangle( tiling13_2_[_config][2], 6 ) ; break ;
+      case 42 :/* 13.2 */
+        add_triangle( tiling13_2_[_config][3], 6 ) ; break ;
+      case 43 :/* 13.2 */
+        add_triangle( tiling13_2_[_config][4], 6 ) ; break ;
+      case 44 :/* 13.2 */
+        add_triangle( tiling13_2_[_config][5], 6 ) ; break ;
+
+      case 45 :/* 13.1 */
+        add_triangle( tiling13_1_[_config], 4 ) ; break ;
+
+      default :
+        printf("Marching Cubes: Impossible case 13?\n" ) ;  print_cube() ;
+      }
+      break ;
+
+  case 14 :
+    add_triangle( tiling14[_config], 4 ) ;
+    break ;
+  };
+  
+  return true ;
+}
+//_____________________________________________________________________________
+
+
+
+//_____________________________________________________________________________
+// Adding triangles
+void MarchingCubes::add_triangle( const char* trig_, char n, int v12 )
+//-----------------------------------------------------------------------------
+{
+  int    tv[3] ;
+
+  for( int t = 0 ; t < 3*n ; t++ )
+  {
+    switch( trig_[t] )
+    {
+    case  0 : tv[ t % 3 ] = get_vertex(0,1) ; break ;
+    case  1 : tv[ t % 3 ] = get_vertex(1,2) ; break ;
+    case  2 : tv[ t % 3 ] = get_vertex(2,3) ; break ;
+    case  3 : tv[ t % 3 ] = get_vertex(3,0) ; break ;
+    case  4 : tv[ t % 3 ] = get_vertex(4,5) ; break ;
+    case  5 : tv[ t % 3 ] = get_vertex(5,6) ; break ;
+    case  6 : tv[ t % 3 ] = get_vertex(6,7) ; break ;
+    case  7 : tv[ t % 3 ] = get_vertex(7,4) ; break ;
+    case  8 : tv[ t % 3 ] = get_vertex(0,4) ; break ;
+    case  9 : tv[ t % 3 ] = get_vertex(1,5) ; break ;
+    case 10 : tv[ t % 3 ] = get_vertex(2,6) ; break ;
+    case 11 : tv[ t % 3 ] = get_vertex(3,7) ; break ;
+    case 12 : tv[ t % 3 ] = v12 ; break ;
+    default : break ;
+    }
+
+    if( tv[t%3] == -1 )
+    {
+      printf("Marching Cubes: invalid triangle %d\n", _ntrigs+1) ;
+      print_cube() ;
+    }
+
+    if( t%3 == 2 )
+    {
+      if( _ntrigs >= _Ntrigs )
+      {
+        Triangle *temp = _triangles ;
+        _triangles = new Triangle[ 2*_Ntrigs ] ;
+        memcpy( _triangles, temp, _Ntrigs*sizeof(Triangle) ) ;
+        delete[] temp ;
+        printf("%d allocated triangles\n", _Ntrigs) ;
+        _Ntrigs *= 2 ;
+      }
+
+      Triangle *T = _triangles + _ntrigs++ ;
+      T->v1    = tv[0] ;
+      T->v2    = tv[1] ;
+      T->v3    = tv[2] ;
+    }
+  }
+}
+//_____________________________________________________________________________
+
+
+
+
+//_____________________________________________________________________________
+// Adding vertices
+
+void MarchingCubes::test_vertex_addition()
+{
+  if( _nverts >= _Nverts )
+  {
+    Point  *temp = _vertices ;
+    _vertices = new Point [ _Nverts*2 ] ;
+    memcpy( _vertices, temp, _Nverts*sizeof(Point ) ) ;
+    delete[] temp ;
+    printf("%d allocated vertices\n", _Nverts) ;
+    _Nverts *= 2 ;
+  }
+}
+
+
+bool MarchingCubes::add_vertex( char i, char j )
+//-----------------------------------------------------------------------------
+{
+  real ci = _cube[i] ;
+  real cj = _cube[j] ;
+  if( ci * cj >= 0 ) return false ;
+  
+  Key ki = _indexes[i] ;
+  Key kj = _indexes[j] ;
+  std::pair<Key,Key> ij_key = std::make_pair( ki,kj ) ;
+  if( _stored_vertices.find( ij_key ) != _stored_vertices.end() ) return true ;
+
+  test_vertex_addition() ;
+  
+  Point p ;
+  _dat_access->interpolate( ci,cj, _space[i],_space[j], p ) ;
+
+  _stored_vertices[ ij_key ] = _nverts ;
+  _stored_vertices[ std::make_pair( kj,ki ) ] = _nverts ;
+  _vertices[_nverts++] = p ;
+
+  return true ;
+}
+//-----------------------------------------------------------------------------
+
+int MarchingCubes::add_c_vertex( )
+//-----------------------------------------------------------------------------
+{
+  test_vertex_addition() ;
+  Point  &vert_ = _vertices[_nverts++] ;
+
+  real u = 0 ;
+  int   vid ;
+
+  vert_.x() = vert_.y() = vert_.z() = 0 ;
+
+  // Computes the average of the intersection points of the cube
+  vid = get_vertex( 0,1 ) ;  if( vid != -1 ) { ++u ; vert_ += _vertices[vid] ; }
+  vid = get_vertex( 1,2 ) ;  if( vid != -1 ) { ++u ; vert_ += _vertices[vid] ; }
+  vid = get_vertex( 2,3 ) ;  if( vid != -1 ) { ++u ; vert_ += _vertices[vid] ; }
+  vid = get_vertex( 3,0 ) ;  if( vid != -1 ) { ++u ; vert_ += _vertices[vid] ; }
+  vid = get_vertex( 4,5 ) ;  if( vid != -1 ) { ++u ; vert_ += _vertices[vid] ; }
+  vid = get_vertex( 5,6 ) ;  if( vid != -1 ) { ++u ; vert_ += _vertices[vid] ; }
+  vid = get_vertex( 6,7 ) ;  if( vid != -1 ) { ++u ; vert_ += _vertices[vid] ; }
+  vid = get_vertex( 7,4 ) ;  if( vid != -1 ) { ++u ; vert_ += _vertices[vid] ; }
+  vid = get_vertex( 0,4 ) ;  if( vid != -1 ) { ++u ; vert_ += _vertices[vid] ; }
+  vid = get_vertex( 1,5 ) ;  if( vid != -1 ) { ++u ; vert_ += _vertices[vid] ; }
+  vid = get_vertex( 2,6 ) ;  if( vid != -1 ) { ++u ; vert_ += _vertices[vid] ; }
+  vid = get_vertex( 3,7 ) ;  if( vid != -1 ) { ++u ; vert_ += _vertices[vid] ; }
+
+  vert_  /= u ;
+
+  return _nverts-1 ;
+}
+//_____________________________________________________________________________
+
+
+
+//_____________________________________________________________________________
+//_____________________________________________________________________________
+
+
+
+//_____________________________________________________________________________
+// OFF ascii exportation
+void MarchingCubes::writeOFF(const char *fn )
+//-----------------------------------------------------------------------------
+{
+  FILE *fp = fopen( fn, "w" ) ;
+  int   i ;
+
+  printf("Marching Cubes::exportOFF(%s)...", fn) ;
+
+  fprintf( fp, "OFF\n%d %d 0\n", _nverts, _ntrigs ) ;
+  for ( i = 0; i < _nverts; i++ )
+    fprintf( fp, " %f %f %f\n", _vertices[i].x(), _vertices[i].y(), _vertices[i].z() ) ;
+  printf("   %d vertices written\n", _nverts ) ;
+
+  for ( i = 0; i < _ntrigs; i++ )
+    fprintf( fp, "3 %d %d %d\n", _triangles[i].v1, _triangles[i].v2, _triangles[i].v3 ) ;
+  fclose( fp ) ;
+  printf("   %d triangles written\n", _ntrigs ) ;
+}
+//_____________________________________________________________________________
diff --git a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/MarchingCubes.h b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/MarchingCubes.h
new file mode 100644
index 0000000000..9be9aff343
--- /dev/null
+++ b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/MarchingCubes.h
@@ -0,0 +1,182 @@
+/**
+ * @file    MarchingCubes.h
+ * @author  Thomas Lewiner <thomas.lewiner@polytechnique.org>
+ * @author  Math Dept, PUC-Rio
+ * @version 0.2
+ * @date    12/08/2002
+ *
+ * @brief   MarchingCubes Algorithm
+ */
+//________________________________________________
+
+
+#pragma once
+
+#if !defined(WIN32) || defined(__CYGWIN__)
+#pragma interface
+#endif // WIN32
+
+#include <map>
+#include "morton.h"
+#include "point.h"
+#include "data_access.h"
+
+//-----------------------------------------------------------------------------
+// Triangle structure
+/** \struct Triangle "MarchingCubes.h" MarchingCubes
+ * Indices of the oriented triange vertices
+ * \brief triangle structure
+ * \param v1 First vertex index
+ * \param v2 Second vertex index
+ * \param v3 Third vertex index
+ */
+typedef struct
+{
+  int v1,v2,v3 ;  /**< Triangle vertices */
+} Triangle ;
+//_____________________________________________________________________________
+
+
+
+//_____________________________________________________________________________
+/** Marching Cubes algorithm wrapper */
+/** \class MarchingCubes
+  * \brief Marching Cubes algorithm.
+  */
+class MarchingCubes
+//-----------------------------------------------------------------------------
+{
+// Constructors
+public :
+  /**
+   * Main and default constructor
+   * \brief constructor
+   */
+  MarchingCubes () ;
+  /** Destructor */
+  ~MarchingCubes() ;
+
+//-----------------------------------------------------------------------------
+// Accessors
+public :
+  /** accesses the number of vertices of the generated mesh */
+  inline const int nverts() const { return _nverts ; }
+  /** accesses the number of triangles of the generated mesh */
+  inline const int ntrigs() const { return _ntrigs ; }
+  /** accesses a specific vertex of the generated mesh */
+  inline Point    * vert( const int i ) const { if( i < 0  || i >= _nverts ) return ( Point  *)NULL ; return _vertices  + i ; }
+  /** accesses a specific triangle of the generated mesh */
+  inline Triangle * trig( const int i ) const { if( i < 0  || i >= _ntrigs ) return (Triangle*)NULL ; return _triangles + i ; }
+
+  /** accesses the vertex buffer of the generated mesh */
+  inline Point    *vertices () { return _vertices  ; }
+  /** accesses the triangle buffer of the generated mesh */
+  inline Triangle *triangles() { return _triangles ; }
+
+  /**
+   * selects wether the algorithm will use the enhanced topologically controlled lookup table or the original MarchingCubes
+   * \param originalMC true for the original Marching Cubes
+   */
+  inline void set_method    ( const bool originalMC = false ) { _originalMC = originalMC ; }
+
+  // Data initialization
+  /** inits all structures (must set sizes before call) : the temporary structures and the mesh buffers */
+  void init_all   () ;
+  /** clears temporary structures : the grid and the main */
+  void clean_temps() ;
+  /** clears all structures : the temporary structures and the mesh buffers */
+  void clean_all  () ;
+
+
+//-----------------------------------------------------------------------------
+// Exportation
+public :
+  /**
+   * OFF exportation of the generated mesh
+   * \param fn  name of the IV file to create
+   */
+  void writeOFF( const char *fn ) ;
+
+
+//-----------------------------------------------------------------------------
+// Algorithm
+public :
+  /** retrieves the isovalues at the cube vertices */
+  real             *cube   () { return _cube ; }
+  /** retrieves the geometry of the cube */
+  Point            *space  () { return _space; }
+  /** retrieves the indexes of the cube */
+  Key              *indexes() { return _indexes; }
+  /** retrieves the data accessor */
+  data_access     *&dat_access() { return _dat_access ; }
+  /**
+   * Main algorithm
+   * \param iso isovalue
+   */
+  bool tesselate_cube( real iso ) ;
+
+protected :
+  /** tesselates one cube */
+  bool process_cube ()             ;
+  /** tests if the components of the tesselation of the cube should be connected by the interior of an ambiguous face */
+  bool test_face    ( schar face ) ;
+  /** tests if the components of the tesselation of the cube should be connected through the interior of the cube */
+  bool test_interior( schar s )    ;
+
+
+//-----------------------------------------------------------------------------
+// Operations
+protected :
+  /** computes almost all the vertices of the mesh by interpolation along the cubes edges */
+  bool compute_intersection_points() ;
+
+  /**
+   * routine to add a triangle to the mesh
+   * \param trig the code for the triangle as a sequence of edges index
+   * \param n    the number of triangles to produce
+   * \param v12  the index of the interior vertex to use, if necessary
+   */
+  void add_triangle ( const char* trig, char n, int v12 = -1 ) ;
+
+  /** tests and eventually doubles the vertex buffer capacity for a new vertex insertion */
+  void test_vertex_addition() ;
+  /** adds a vertex on edge cube[i] cube[j] */
+  bool add_vertex( char i, char j ) ;
+  /** gets the vertex of edge cube[i] cube[j] (no check) */
+  int  get_vertex( char i, char j ) { std::map< std::pair< Key,Key >, int >::const_iterator it = _stored_vertices.find( std::make_pair( _indexes[i],_indexes[j] ) ) ; if( it == _stored_vertices.end() ) return -1 ; else return it->second ; }
+  /** adds a vertex inside the current cube */
+  int add_c_vertex() ;
+
+  /** prints cube for debug */
+  void print_cube() ;
+
+public:  
+  /** draw the surface using openGL */
+  void draw_surf() { Triangle *ptr = _triangles ; for( int i = 0 ; i < _ntrigs ; ++i, ++ptr ) { _vertices[ptr->v1].draw() ; _vertices[ptr->v2].draw() ; _vertices[ptr->v3].draw() ; } }
+  
+//-----------------------------------------------------------------------------
+// Elements
+protected :
+  bool      _originalMC ;   /**< selects wether the algorithm will use the enhanced topologically controlled lookup table or the original MarchingCubes */
+
+  int       _nverts     ;  /**< number of allocated vertices  in the vertex   buffer */
+  int       _ntrigs     ;  /**< number of allocated triangles in the triangle buffer */
+  int       _Nverts     ;  /**< size of the vertex   buffer */
+  int       _Ntrigs     ;  /**< size of the triangle buffer */
+  Point    *_vertices   ;  /**< vertex   buffer */
+  Triangle *_triangles  ;  /**< triangle buffer */
+
+  std::map< std::pair< Key,Key >, int > _stored_vertices ;
+  
+  real      _cube[8]    ;  /**< values of the implicit function on the active cube */
+  Point     _space[8]   ;  /**< coordinates of the active cube */
+  Key       _indexes[8] ;  /**< indiexs of the active cube */
+  uchar     _lut_entry  ;  /**< cube sign representation in [0..255] */
+  uchar     _case       ;  /**< case of the active cube in [0..15] */
+  uchar     _config     ;  /**< configuration of the active cube */
+  uchar     _subconfig  ;  /**< subconfiguration of the active cube */
+  data_access *_dat_access ;  /**< data accessor */
+};
+//_____________________________________________________________________________
+
+
diff --git a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/README.txt b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/README.txt
new file mode 100644
index 0000000000..01cb605922
--- /dev/null
+++ b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/README.txt
@@ -0,0 +1,123 @@
+
+ Statistical optimization of octree searches
+ Fast generation of pointerless octree duals
+---------------------------------------------------
+Rener Castro, Thomas Lewiner, HŽlio Lopes, Geovan Tavares, Alex Bordignon
+Thomas Lewiner, Vin’cius Mello, Adelailson Peixoto, SinŽsio Pesco, HŽlio Lopes
+
+
+http://www.matmidia.mat.puc-rio.br/tomlew/publication_page.php?pubkey=octree_cgf
+http://www.matmidia.mat.puc-rio.br/tomlew/publication_page.php?pubkey=fastdualoctree_sgp
+
+1. Disclaimer
+2. Available code compared to the papers
+3. Octrees implementations
+4. Morton codes
+5. Data
+6. Hash table
+7. Requirements
+
+
+Disclaimer
+--------------
+  This code is implements fast searches and the dual generation of static
+or dynamic pointer-based or pointerless octrees. It is provided "as is"
+and can be used freely. We just ask the users who would use this code to
+mention in their academic paper, patent or software documentation the
+original articles:
+
+@article{octree_cgf,
+    author = {Rener Castro and Thomas Lewiner and HŽlio Lopes and Geovan Tavares and Alex Bordignon},
+    title = {Statistical optimization of octree searches},
+    year = {2008},
+    month = {march},
+    journal = {Computer Graphics Forum},
+    volume = {27},
+    number = {6},
+    pages = {1557--1566},
+    publisher = {Eurographics},
+    doi = {10.1111/j.1467-8659.2007.01104.x},
+    url = {\url{http://www.matmidia.mat.puc-rio.br/tomlew/pdfs/octree_cgf.pdf}}
+}
+
+@article{fastdualoctree_sgp,
+    author = {Thomas Lewiner and Vin’cius Mello and Adelailson Peixoto and SinŽsio Pesco and HŽlio Lopes},
+    title = {Fast Generation of Pointerless Octree Duals},
+    year = {2010},
+    month = {july},
+    journal = {Symposium on Geometry Processing 2010},
+    booktitle = {Computer Graphics Forum},
+    volume = {29},
+    number = {5},
+    pages = {1661--1669},
+    publisher = {Wiley},
+    address = {Lyon, France},
+    url = {\url{http://www.matmidia.mat.puc-rio.br/tomlew/pdfs/fastdualoctree_sgp.pdf}}
+}
+
+
+
+If you have any comment, correction, question, please feel free to
+contact me at : lewiner@gmail.com .
+Thank to David Coeurjolly for the code porting to UNIX.
+
+
+
+
+Available code compared to the paper
+----------------------------------------------
+  The code contains simple implementations used to generate the result of
+our papers. We stripped down the time measurements (which are platform
+specific) and the robust dual marching cubes
+(http://www.matmidia.mat.puc-rio.br/tomlew/publication_page.php?pubkey=adaptive_implicit_sibgrapi)
+code.
+
+
+
+Octrees implementations
+------------------------------
+  The code contains implementations of a pointer-based octree
+("ptr_octree.*" files), pointerless octrees with recursive dual
+generation ("hash_octree.*"), pointerless octrees with optimized dual
+generation for the static strategy representing all the nodes
+("opt_octree.*") or only the leaves ("leaf_octree.*"), and the dynamic
+strategy ("mem_octree.*"). The octree is chosen at compilation time
+through the OCTREE_SWITCH macro.
+
+
+Morton codes
+-----------------
+  The Morton code operations in dilated integers are all grouped in the
+"morton.*" files.
+
+
+Data
+------
+  The data (implicit function or isogrid) is accessed through the
+data_access class. The isogrid must be in "iso" format, i.e. a binary
+file with 32-bits integers nx, ny and nz for the size of the grid,
+32-bits floats xmin, xmax, yminÉ for the geometry of the cube, followed
+by nx.ny.nz 32-bits floats for the data.
+
+
+Hash table
+-------------
+  Finally, we made a very simple naive and simple implementations for the
+hashtable, in open ("hash_ptr.h") or close ("has_noptr.h") modes. The
+parameters of the hash function are chosen at compilation time through
+macros defined in the "hash.h" file.
+
+
+Requirements
+------------
+
+  The graphical interfaces require the openGL libraries with the GLU, glut
+and glui extension, available at http://glui.sourceforge.net/ .
+
+  We use Juha Nieminen, Joel Yliluoma's function parser for the implicit
+function, and our Marching Cube's implementation
+(http://www.matmidia.mat.puc-rio.br/tomlew/publication_page.php?pubkey=marching_cubes_jgt).
+
+
+Thank you for your interest, and have fun!
+http://www.matmidia.mat.puc-rio.br/tomlew/
diff --git a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/cube.h b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/cube.h
new file mode 100644
index 0000000000..dc0652f9b3
--- /dev/null
+++ b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/cube.h
@@ -0,0 +1,256 @@
+/**
+ * \file    cube.h
+ * \author  Thomas Lewiner   <tomlew@puc-rio.br>
+ * \author  Matmidia Lab, Math Dept, PUC-Rio
+ * \date    10/01/2010
+ *
+ * \brief  Simple cube class
+ *
+ * Simple cube class
+ */
+//_____________________________________________________________________________
+
+
+
+#pragma once
+
+
+#include "point.h"
+
+typedef uchar Level ;
+extern Level L_INV ;
+
+//_____________________________________________________________________________
+/// Simple cube class
+class Cube : public Point
+{
+  // Elements
+protected :
+  Level    _lv ;  ///< cube level (from 0 on): cube corners have coordinates c(xyz) (+/-) (1/2^(lv+1))
+
+  //-----------------------------------------------------------------------------
+  // Constructors
+public:
+  /// Default constructor
+  Cube( const real &cx_ = R_INV, const real &cy_ = R_INV, const real &cz_ = R_INV, Level lv_ = L_INV )
+    : Point(cx_,cy_,cz_), _lv(lv_) {}
+
+  /// Default constructor
+  Cube( const Point& c_, Level lv_ = L_INV )
+    : Point(c_), _lv(lv_) {}
+  
+  /// Default constructor
+  Cube( const Cube& c_ )
+    : Point((const Point&)c_), _lv(c_._lv) {}
+  
+  /// Destructor
+  ~Cube() {}
+    
+  /// Assignment operator
+  Cube &operator= ( const Cube &c )
+  {  Point::operator=(c) ;  _lv = c._lv ;  return *this; }
+  
+  //-----------------------------------------------------------------------------
+  // Accessors
+public:
+  /// const accessor for point center: x coordinate
+  real  cx() const { return Point::x() ; }
+  /// accessor for point center: x coordinate
+  real &cx() { return Point::x() ; }
+
+  /// const accessor for point center: y coordinate
+  real  cy() const { return Point::y() ; }
+  /// accessor for point center: y coordinate
+  real &cy() { return Point::y() ; }
+
+  /// const accessor for point center: z coordinate
+  real  cz() const { return Point::z() ; }
+  /// accessor for point center: z coordinate
+  real &cz() { return Point::z() ; }
+
+  /// const accessor for a coordinate
+  real  coord( Axis a ) const { return Point::operator[](a) ; }
+  /// accessor for a coordinate
+  real &coord( Axis a ) { return Point::operator[](a) ; }
+
+
+  /// const accessor for the cube half size
+  real   sz() const { return (real)1.0 / (2<<_lv) ; }
+  /// const accessor for cube level
+  Level  lv() const { return _lv ; }
+  /// accessor for cube level
+  Level &lv() { return _lv ; }
+
+  /// const accessor for cube center: min x coordinate
+  real  xmin() const { return cx() - sz() ; }
+  /// const accessor for cube center: max x coordinate
+  real  xmax() const { return cx() + sz() ; }
+
+  /// const accessor for cube center: min y coordinate
+  real  ymin() const { return cy() - sz() ; }
+  /// const accessor for cube center: max y coordinate
+  real  ymax() const { return cy() + sz() ; }
+
+  /// const accessor for cube center: min z coordinate
+  real  zmin() const { return cz() - sz() ; }
+  /// const accessor for cube center: max z coordinate
+  real  zmax() const { return cz() + sz() ; }
+
+  /// const accessor for cube center: min coordinate
+  real  coordmin( Axis a ) const { return coord(a) - this->sz() ; }
+  /// const accessor for cube center: max coordinate
+  real  coordmax( Axis a ) const { return coord(a) + this->sz() ; }
+
+  //------------------------------------------------
+  // Test
+public :
+  /// conained
+  bool contains( const real &x_, const real &y_, const real &z_ ) const
+  {
+    real sz_ = sz() ;
+    return
+      ( fabs(x_-cx()) <= sz_ ) &&
+      ( fabs(y_-cy()) <= sz_ ) &&
+      ( fabs(z_-cz()) <= sz_ ) ;
+  }
+
+  /// conained
+  bool contains( const Point &p ) const { return contains( p.x(), p.y(), p.z() ) ; }
+
+  /// epsilon-conained
+  bool contains( const real &x_, const real &y_, const real &z_, const real &epsilon ) const
+  {
+    real sz_ = sz() + epsilon ;
+    return
+      ( fabs(x_-cx()) <= sz_ ) &&
+      ( fabs(y_-cy()) <= sz_ ) &&
+      ( fabs(z_-cz()) <= sz_ ) ;
+  }
+
+  /// epsilon-conained
+  bool contains( const Point &p, const real &epsilon ) const { return contains( p.x(), p.y(), p.z(), epsilon ) ; }
+
+  //-----------------------------------------------------------------------------
+  // Drawing
+public:
+  /// Draws the cube center with opengl
+  void draw_center () const { ::glVertex3f( (float)x(), (float)y(), (float)z() ) ; }
+
+  /// Draws the cube corners with opengl
+  void draw_corners( real fact = 0.9 ) const
+  {
+    const float ix = (const float) x() ;
+    const float iy = (const float) y() ;
+    const float iz = (const float) z() ;
+    const float is = (const float) (fact*sz()) ;
+
+    ::glVertex3f( ix-is, iy-is, iz-is ) ;
+    ::glVertex3f( ix+is, iy-is, iz-is ) ;
+    ::glVertex3f( ix-is, iy+is, iz-is ) ;
+    ::glVertex3f( ix+is, iy+is, iz-is ) ;
+    ::glVertex3f( ix-is, iy-is, iz+is ) ;
+    ::glVertex3f( ix+is, iy-is, iz+is ) ;
+    ::glVertex3f( ix-is, iy+is, iz+is ) ;
+    ::glVertex3f( ix+is, iy+is, iz+is ) ;
+  }
+
+  /// Draws the cube wire with opengl
+  void draw_wire  ( real fact = 0.9 ) const
+  {
+    const float ix = (const float) x() ;
+    const float iy = (const float) y() ;
+    const float iz = (const float) z() ;
+    const float is = (const float) (fact*sz()) ;
+    
+    ::glVertex3f( ix-is, iy-is, iz-is ) ;
+    ::glVertex3f( ix-is, iy+is, iz-is ) ;
+
+    ::glVertex3f( ix-is, iy-is, iz-is ) ;
+    ::glVertex3f( ix+is, iy-is, iz-is ) ;
+
+    ::glVertex3f( ix+is, iy-is, iz-is ) ;
+    ::glVertex3f( ix+is, iy+is, iz-is ) ;
+
+    ::glVertex3f( ix-is, iy+is, iz-is ) ;
+    ::glVertex3f( ix+is, iy+is, iz-is ) ;
+
+
+    ::glVertex3f( ix-is, iy-is, iz+is ) ;
+    ::glVertex3f( ix-is, iy+is, iz+is ) ;
+
+    ::glVertex3f( ix-is, iy-is, iz+is ) ;
+    ::glVertex3f( ix+is, iy-is, iz+is ) ;
+
+    ::glVertex3f( ix+is, iy-is, iz+is ) ;
+    ::glVertex3f( ix+is, iy+is, iz+is ) ;
+
+    ::glVertex3f( ix-is, iy+is, iz+is ) ;
+    ::glVertex3f( ix+is, iy+is, iz+is ) ;
+
+
+    ::glVertex3f( ix-is, iy-is, iz-is ) ;
+    ::glVertex3f( ix-is, iy-is, iz+is ) ;
+
+    ::glVertex3f( ix+is, iy-is, iz-is ) ;
+    ::glVertex3f( ix+is, iy-is, iz+is ) ;
+
+    ::glVertex3f( ix-is, iy+is, iz-is ) ;
+    ::glVertex3f( ix-is, iy+is, iz+is ) ;
+
+    ::glVertex3f( ix+is, iy+is, iz-is ) ;
+    ::glVertex3f( ix+is, iy+is, iz+is ) ;
+  }
+
+
+
+  /// Draws the cube wire with opengl
+  void draw_fill  ( real fact = 0.9 ) const
+  {
+    const float ix = (const float) x() ;
+    const float iy = (const float) y() ;
+    const float iz = (const float) z() ;
+    const float is = (const float) (fact*sz()) ;
+    
+    ::glNormal3f(0,0,-1);
+    ::glVertex3f( ix-is, iy-is, iz-is ) ;
+    ::glVertex3f( ix-is, iy+is, iz-is ) ;
+    ::glVertex3f( ix+is, iy+is, iz-is ) ;
+    ::glVertex3f( ix+is, iy-is, iz-is ) ;
+
+    ::glNormal3f(0,0,1);
+    ::glVertex3f( ix-is, iy-is, iz+is ) ;
+    ::glVertex3f( ix-is, iy+is, iz+is ) ;
+    ::glVertex3f( ix+is, iy+is, iz+is ) ;
+    ::glVertex3f( ix+is, iy-is, iz+is ) ;
+
+    ::glNormal3f(-1,0,0);
+    ::glVertex3f( ix-is, iy-is, iz-is ) ;
+    ::glVertex3f( ix-is, iy+is, iz-is ) ;
+    ::glVertex3f( ix-is, iy+is, iz+is ) ;
+    ::glVertex3f( ix-is, iy-is, iz+is ) ;
+
+    ::glNormal3f(1,0,0);
+    ::glVertex3f( ix+is, iy-is, iz-is ) ;
+    ::glVertex3f( ix+is, iy+is, iz-is ) ;
+    ::glVertex3f( ix+is, iy+is, iz+is ) ;
+    ::glVertex3f( ix+is, iy-is, iz+is ) ;
+
+    ::glNormal3f(0,-1,0);
+    ::glVertex3f( ix-is, iy-is, iz-is ) ;
+    ::glVertex3f( ix-is, iy-is, iz+is ) ;
+    ::glVertex3f( ix+is, iy-is, iz+is ) ;
+    ::glVertex3f( ix+is, iy-is, iz-is ) ;
+
+    ::glNormal3f(0,1,0);
+    ::glVertex3f( ix-is, iy+is, iz-is ) ;
+    ::glVertex3f( ix-is, iy+is, iz+is ) ;
+    ::glVertex3f( ix+is, iy+is, iz+is ) ;
+    ::glVertex3f( ix+is, iy+is, iz-is ) ;
+  }
+};
+//_____________________________________________________________________________
+
+// Invalid cube
+extern Cube C_INV ;
+
+
diff --git a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/data_access.cpp b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/data_access.cpp
new file mode 100644
index 0000000000..a536fda18c
--- /dev/null
+++ b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/data_access.cpp
@@ -0,0 +1,266 @@
+/**
+ * @file    data_access.cpp
+ * \author  Thomas Lewiner   <thomas.lewiner@polytechnique.org>
+ * \author  Math Dept, PUC-Rio
+ * \author  Matmidia Labs
+ * \date    14/02/2006
+ *
+ * @brief   data accesss
+ */
+//________________________________________________
+
+
+
+#ifndef WIN32
+#pragma implementation
+#endif // WIN32
+
+#include "data_access.h"
+
+
+//_____________________________________________________________________________
+//_____________________________________________________________________________
+// data_func
+
+//_____________________________________________________________________________
+// crossing data access: parser
+void data_func::parse()
+//-----------------------------------------------------------------------------
+{
+  if( _formula.empty() )
+    return ;
+  std::string vars("x,y,z") ;
+  int i = _parser.Parse( _formula, vars ) ;
+  if( _parser.GetParseErrorType() != FunctionParser::FP_NO_ERROR )
+    printf( "%s\n%s\n% *d\n", _parser.ErrorMsg(), _formula.c_str(), i, 1 ) ;
+  else
+    _parser.Optimize() ;
+}
+//_____________________________________________________________________________
+
+
+
+//_____________________________________________________________________________
+// crossing data access
+bool data_func::need_refine( const Cube &c )
+//-----------------------------------------------------------------------------
+{
+    if( _parser.GetParseErrorType() != FunctionParser::FP_NO_ERROR ) return false ;
+  int l = c.lv() ;
+  if( l < 2 ) return true ;
+  if( l >= _max_level ) return false ;
+  
+  real cx = c.cx() ;
+  real cy = c.cy() ;
+  real cz = c.cz() ;
+  _v[X] = cx ;
+  _v[Y] = cy ;
+  _v[Z] = cz ;
+  
+  real ref_val = _parser.Eval(_v) - _iso_val ;
+  if( fabs(ref_val) < R_EPSILON ) return true ;
+  
+  real sz = c.sz() ;
+  for( _v[X] = cx-sz ; _v[X] <= cx+sz ; _v[X] += sz )
+  {
+    for( _v[Y] = cy-sz ; _v[Y] <= cy+sz ; _v[Y] += sz )
+    {
+      for( _v[Z] = cz-sz ; _v[Z] <= cz+sz ; _v[Z] += sz )
+      {
+        real val = _parser.Eval(_v) - _iso_val ;
+        if( ref_val * val < 0 ) return true ;
+      }
+    }
+  }
+  
+  return false ;
+}
+//_____________________________________________________________________________
+
+
+#ifndef BISSEC_ITER
+#define BISSEC_ITER 3
+#endif // BISSEC_ITER
+
+//_____________________________________________________________________________
+// interpolation function
+void data_func::interpolate( real ci, real cj, const Point &pi, const Point &pj, Point &p )
+//-----------------------------------------------------------------------------
+{
+    real u ;
+  Point qi = pi ;
+  Point qj = pj ;
+  for( int i = 0 ; i < BISSEC_ITER ; ++i )
+  {
+    u = ( ci ) / ( ci - cj ) ;
+    p = ((1-u)*qi) + (u*qj) ;
+    
+    real c = value_at(p) ;
+    if( c*ci < 0 )
+    {
+      qj = p ;
+      cj = c ;
+    }
+    else if( c*cj < 0 )
+    {
+      qi = p ;
+      ci = c ;
+    }
+    else break ;
+  }
+  u = ( ci ) / ( ci - cj ) ;
+  p = ((1-u)*qi) + (u*qj) ;
+}
+//_____________________________________________________________________________
+
+
+
+
+
+//_____________________________________________________________________________
+//_____________________________________________________________________________
+// data_file
+
+
+#include <errno.h>
+#include <string.h>
+#include <zlib.h>
+
+//_____________________________________________________________________________
+// data data access: load file
+bool data_file::load_data( const char *fn  )
+//-----------------------------------------------------------------------------
+{
+  errno = 0;
+  gzFile isofile = gzopen( fn, "rb" ) ;
+  if( !isofile )
+  {
+    printf( "data_file::load_data couldn't open file %s: %s\n", fn, strerror (errno));
+    return false ;
+  }
+  
+  // read size
+  unsigned char buf[sizeof(float)] ;
+  if( gzread( isofile, buf, sizeof(float) ) < 1 ) return false ;
+  _size_x = * (int*)buf ;
+  if( gzread( isofile, buf, sizeof(float) ) < 1 ) return false ;
+  _size_y = * (int*)buf ;
+  if( gzread( isofile, buf, sizeof(float) ) < 1 ) return false ;
+  _size_z = * (int*)buf ;
+  
+  if( gzread( isofile, buf, sizeof(float) ) < 1 ) return false ;
+  float xmin = * (float*)buf ;
+  if( gzread( isofile, buf, sizeof(float) ) < 1 ) return false ;
+  float xmax = * (float*)buf ;
+  if( gzread( isofile, buf, sizeof(float) ) < 1 ) return false ;
+  float ymin = * (float*)buf ;
+  if( gzread( isofile, buf, sizeof(float) ) < 1 ) return false ;
+  float ymax = * (float*)buf ;
+  if( gzread( isofile, buf, sizeof(float) ) < 1 ) return false ;
+  float zmin = * (float*)buf ;
+  if( gzread( isofile, buf, sizeof(float) ) < 1 ) return false ;
+  float zmax = * (float*)buf ;
+  
+  // allocate data
+  delete [] _data ;
+  _size_yz = _size_z * _size_y ;
+  uint total_size = _size_x * _size_yz ;
+  if( total_size == 0 ) return false ;
+  
+  // cube fitting
+  _max_size = _size_x ;
+  if( _max_size < _size_y ) _max_size = _size_y ;
+  if( _max_size < _size_z ) _max_size = _size_z ;
+  Level p = (Level)floor( log(_max_size)/log(2) ) ;
+  if( _max_size != (1<<p) ) _max_size = 1 << (p+1) ;
+  
+  _data = new float[ total_size ] ;
+  if( _data == (float*)NULL ) return false ;
+  
+  float min_field =  FLT_MAX ;
+  float max_field = -FLT_MAX ;
+  float *data_ptr = _data ;
+  for( uint i = 0 ; i < total_size ; ++i, ++data_ptr )
+  {
+    if( gzread( isofile, buf, sizeof(float) ) < 1 ) return false ;
+    float v = * (float*) buf ;
+    *data_ptr = v ;
+    if( v < min_field ) min_field = v ;
+    if( v > max_field ) max_field = v ;
+  }
+  
+  gzclose( isofile ) ;
+  
+  printf( "data %s: %dx%dx%d, field originally in [ %f , %f ]\n", fn, (int)_size_x, (int)_size_y, (int)_size_z, min_field, max_field ) ;
+  
+  // rescale data in [-1.1]
+  float v_scale = 2.0 / (max_field - min_field) ;
+  data_ptr = _data ;
+  for( uint i = 0 ; i < total_size ; ++i, ++data_ptr )
+  {
+    *data_ptr = v_scale * ( (*data_ptr) - min_field ) - 1.0 ;
+  }
+  
+  // cube scaling
+  _sx = (xmax - xmin)/_size_x ;
+  _sy = (ymax - ymin)/_size_y ;
+  _sz = (zmax - zmin)/_size_z ;
+  float s = _sx ;
+  if( s < _sy ) s = _sy ;
+  if( s < _sz ) s = _sz ;
+  _sx /= s ;
+  _sy /= s ;
+  _sz /= s ;
+  
+  return true ;
+}
+//_____________________________________________________________________________
+
+
+
+
+//_____________________________________________________________________________
+// data data access
+bool data_file::need_refine( const Cube &c )
+//-----------------------------------------------------------------------------
+{
+    int l = c.lv() ;
+  if( l < 2 ) return true ;
+  if( l >= _max_level ) return false ;
+  
+  // ajustar se o dado nao for cubico!
+  real sz = c.sz() ;
+  uint i  = floor( (c.cx()-sz) * _max_size ) ;
+  uint iM = ceil ( (c.cx()+sz) * _max_size ) ;
+  uint j  = floor( (c.cy()-sz) * _max_size ) ;
+  uint jM = ceil ( (c.cy()+sz) * _max_size ) ;
+  uint k  = floor( (c.cz()-sz) * _max_size ) ;
+  uint kM = ceil ( (c.cz()+sz) * _max_size ) ;
+  
+  if( iM >= _size_x ) iM = _size_x-1 ;
+  if( jM >= _size_y ) jM = _size_y-1 ;
+  if( kM >= _size_z ) kM = _size_z-1 ;
+  
+  float iso_min = get_data(iM,jM,kM) ;
+  float iso_max = iso_min ;
+  for( ; i <= iM ; ++i )
+  {
+    for( ; j <= jM ; ++j )
+    {
+      for( ; k <= kM ; ++k )
+      {
+        float iso = get_data(i,j,k) ;
+        if( iso_min > iso ) iso_min = iso ;
+        if( iso_max < iso ) iso_max = iso ;
+        
+        if( iso_min*iso_max < 0 ) return true ;
+      }
+    }
+  }
+  
+  return false ;
+}
+//_____________________________________________________________________________
+
+
+
diff --git a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/data_access.h b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/data_access.h
new file mode 100644
index 0000000000..2574333e23
--- /dev/null
+++ b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/data_access.h
@@ -0,0 +1,192 @@
+/**
+ * @file    data_access.h
+ * \author  Thomas Lewiner   <thomas.lewiner@polytechnique.org>
+ * \author  Math Dept, PUC-Rio
+ * \author  Matmidia Labs
+ * \date    14/02/2006
+ *
+ * @brief   data accesss
+ */
+//________________________________________________
+
+
+#pragma once
+
+#ifndef WIN32
+#pragma interface
+#endif // WIN32
+
+#include <string>
+#include <stdio.h>
+#include "cube.h"
+
+
+//_____________________________________________________________________________
+/// data access abstract class
+class data_access
+//_____________________________________________________________________________
+{
+  public :
+  Level  _max_level;  ///< maximal level of a cell
+  real   _iso_val;  ///< iso value
+  float  _sx ;  ///< grid x proportion
+  float  _sy ;  ///< grid y proportion
+  float  _sz ;  ///< grid z proportion
+  
+  
+  public :
+  /// constructor
+  data_access( Level max_level_ = 4, real iso_val_ = 0.0 ) : _max_level(max_level_), _iso_val(iso_val_), _sx(1.0f), _sy(1.0f), _sz(1.0f) {}
+  /// destructor
+  virtual ~data_access() {}
+  /// test function
+  virtual bool need_refine( const Cube &c ) = 0 ;
+  /// data function
+  virtual real value_at   ( const Cube &c ) = 0 ;
+  /// interpolation function
+  virtual void interpolate( real ci, real cj, const Point &pi, const Point &pj, Point &p )
+  {
+    real u = ( ci ) / ( ci - cj ) ;
+    p = ((1-u)*pi) + (u*pj) ;
+  }
+} ;
+//-----------------------------------------------------------------------------
+
+
+
+// may be overridden by the preprocessor
+#ifndef RAND_THRES
+# define RAND_THRES 0.2
+#endif // RAND_THRES
+
+//_____________________________________________________________________________
+/// basic data access
+class data_rand : public data_access
+//-----------------------------------------------------------------------------
+{
+public:
+  /// test function
+  bool need_refine( const Cube &c )
+  {
+    int l = c.lv() ;
+    if( l < 2 ) return true ;
+    if( l >= _max_level ) return false ;
+    return value_at(c) > RAND_THRES ;
+  }
+  
+  /// data function
+  real value_at( const Cube &c ) { return ( (real)rand() ) / ( RAND_MAX >> 1 ) - 1.0 ; }
+  
+  /// interpolation function
+  void interpolate( real ci, real cj, const Point &pi, const Point &pj, Point &p )
+  {
+    real u = ( (real)rand() ) / ( RAND_MAX ) ;
+    p = ((1-u)*pi) + (u*pj) ;
+  }
+
+  //-----------------------------------------------------------------------------
+  // Basics
+public:
+  /// default constructor
+  data_rand( Level max_level_ ) : data_access(max_level_) {}
+  /// destructor
+  virtual ~data_rand() {}
+} ;
+//_____________________________________________________________________________
+
+
+
+#include "fptypes.h"
+#include "fparser.h"
+
+//_____________________________________________________________________________
+/// function crossing data access
+class data_func : public data_access
+//-----------------------------------------------------------------------------
+{
+public:
+  /// implicit function
+  std::string _formula ; 
+  
+protected:
+  double          _v[3]   ;
+  FunctionParser  _parser ;
+  
+protected:
+  void parse() ;
+  
+public:
+  /// test function
+  bool need_refine( const Cube &c ) ;
+  
+  /// data function
+  real value_at( const Cube &c )
+  {
+    if( _parser.GetParseErrorType() != FunctionParser::FP_NO_ERROR ) return false ;
+    _v[X] = c.cx() ;
+    _v[Y] = c.cy() ;
+    _v[Z] = c.cz() ;
+    real v = _parser.Eval(_v) - _iso_val ;
+    if( _parser.EvalError() ) return -1.0 ;
+    return v ;
+  }
+  
+  /// interpolation function
+  void interpolate( real ci, real cj, const Point &pi, const Point &pj, Point &p ) ;  
+  
+  //-----------------------------------------------------------------------------
+  // Basics
+public:
+  /// default constructor
+  data_func( Level max_level_, real iso_val_, const std::string &formula_ ) : data_access(max_level_,iso_val_), _formula(formula_) { parse() ; }
+  /// destructor
+  virtual ~data_func() {}  
+} ;
+//_____________________________________________________________________________
+
+
+
+
+//_____________________________________________________________________________
+/// iso file data access
+class data_file : public data_access
+//-----------------------------------------------------------------------------
+{
+public:
+  uint   _size_x     ;  ///< width  of the grid
+  uint   _size_y     ;  ///< depth  of the grid
+  uint   _size_z     ;  ///< height of the grid
+  
+protected:
+  float *_data       ;  /**< implicit function values sampled on the grid */
+  uint   _size_yz    ;  /**< k skip size */
+  uint   _max_size   ;  /**< bigger side to fit into the cube */
+  
+  
+public:
+  bool  load_data  ( const char *fn ) ;
+  bool  has_data   ( uint i, uint j, uint k ) { return (i < _size_x) && (j < _size_y) && (k < _size_z) ; }
+  float get_data   ( uint i, uint j, uint k ) { return _data[ k + j*_size_z + i*_size_yz] - _iso_val ; }
+  
+  /// test function
+  bool  need_refine( const Cube &c ) ;
+  /// data function
+  real value_at( const Cube &c )
+  {
+    uint i = (uint)(c.cx()*_max_size) ;
+    uint j = (uint)(c.cy()*_max_size) ;
+    uint k = (uint)(c.cz()*_max_size) ;
+    if( has_data(i,j,k) ) return (real)get_data(i,j,k) ;
+    return -1.0 ;
+  }
+  // linear interpolation: no specification
+  
+  //-----------------------------------------------------------------------------
+  // Basics
+public:
+  /// default constructor
+  data_file( Level max_level_, real iso_val_, const char *fn ) : data_access(max_level_,iso_val_), _data((float*)NULL) { load_data( fn ) ; }
+  /// destructor
+  virtual ~data_file() {}  
+} ;
+//_____________________________________________________________________________
diff --git a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/fp_identifier_parser.inc b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/fp_identifier_parser.inc
new file mode 100644
index 0000000000..723c80d74e
--- /dev/null
+++ b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/fp_identifier_parser.inc
@@ -0,0 +1,292 @@
+        unsigned nameLength = 0;
+        const unsigned maximumNameLength = 0x80000000U-8;
+        /*
+        Due to the manner the identifier lengths are returned from
+        the readOpcode() function, the maximum supported length for
+        identifiers is 0x7FFFFFFF bytes. We minus 8 here to add some
+        buffer, because of the multibyteness of UTF-8.
+        Function names are limited to 0xFFFF bytes instead, but because
+        function names that long just are not defined, the point is moot.
+        */
+        const unsigned char* const uptr = (const unsigned char*) input;
+        typedef signed char schar;
+        while(likely(nameLength < maximumNameLength))
+        {
+            unsigned char byte = uptr[nameLength+0];
+            /* Handle the common case of A-Za-z first */
+            if(byte >= 0x40)
+            {
+                if(byte < 0x80) // 0x40..0x7F - most common case
+                {
+                    // Valid characters in 40..7F: A-Za-z_
+                    // Valid bitmask for 40..5F: 01111111111111111111111111100001
+                    // Valid bitmask for 60..7F: 01111111111111111111111111100000
+                    if(sizeof(unsigned long) == 8)
+                    {
+                        const unsigned n = sizeof(unsigned long)*8-32;
+                        // ^ avoids compiler warning when not 64-bit
+                        unsigned long masklow6bits = 1UL << (byte & 0x3F);
+                        if(masklow6bits & ~((1UL << 0) | (0x0FUL << (0x1B  ))
+                                          | (1UL << n) | (0x1FUL << (0x1B+n))))
+                            { ++nameLength; continue; }
+                    }
+                    else
+                    {
+                        unsigned masklow5bits = 1 << (byte & 0x1F);
+                        if((masklow5bits & ~(1 | (0x1F << 0x1B))) || byte == '_')
+                            { ++nameLength; continue; }
+                    }
+                    break;
+                }
+                if(byte < 0xF0)
+                {
+                    if(byte < 0xE0)
+                    {
+                        if(byte < 0xC2) break; // 0x80..0xC1
+                        if(byte == 0xC2 && uptr[nameLength+1]==0xA0) break; // skip nbsp
+                        // C2-DF - next common case when >= 0x40
+                        // Valid sequence: C2-DF 80-BF
+                        if(schar(uptr[nameLength+1]) > schar(0xBF)) break;
+                        nameLength += 2;
+                        continue;
+                    }
+                    if(byte == 0xE0) // E0
+                    {
+                        // Valid sequence: E0 A0-BF 80-BF
+                        if((unsigned char)(uptr[nameLength+1] - 0xA0) > (0xBF-0xA0)) break;
+                    }
+                    else
+                    {
+                        if(byte == 0xED) break; // ED is invalid
+                        // Valid sequence: E1-EC 80-BF 80-BF
+                        //            And: EE-EF 80-BF 80-BF
+                        if(byte == 0xE2)
+                        {
+                            // break on various space characters
+                            if(uptr[nameLength+1] == 0x80
+                            && (schar(uptr[nameLength+2]) <= schar(0x8B)
+                            || (uptr[nameLength+2] == 0xAF))) break;
+                            if(uptr[nameLength+1] == 0x81
+                            && uptr[nameLength+2] == 0x9F) break;
+                        } else
+                        if(byte == 0xE3 && uptr[nameLength+1] == 0x80
+                        && uptr[nameLength+2] == 0x80) break; // this too
+
+                        if(schar(uptr[nameLength+1]) > schar(0xBF)) break;
+                    }
+                    if(schar(uptr[nameLength+2]) > schar(0xBF)) break;
+                    nameLength += 3;
+                    continue;
+                }
+                if(byte == 0xF0) // F0
+                {
+                    // Valid sequence: F0 90-BF 80-BF 80-BF
+                    if((unsigned char)(uptr[nameLength+1] - 0x90) > (0xBF-0x90)) break;
+                }
+                else
+                {
+                    if(byte > 0xF4) break; // F5-FF are invalid
+                    if(byte == 0xF4) // F4
+                    {
+                        // Valid sequence: F4 80-8F
+                        if(schar(uptr[nameLength+1]) > schar(0x8F)) break;
+                    }
+                    else
+                    {
+                        // F1-F3
+                        // Valid sequence: F1-F3 80-BF 80-BF 80-BF
+                        if(schar(uptr[nameLength+1]) > schar(0xBF)) break;
+                    }
+                }
+                if(schar(uptr[nameLength+2]) > schar(0xBF)) break;
+                if(schar(uptr[nameLength+3]) > schar(0xBF)) break;
+                nameLength += 4;
+                continue;
+            }
+            if(nameLength > 0)
+            {
+                if(sizeof(unsigned long) == 8)
+                {
+                    // Valid bitmask for 00..1F: 00000000000000000000000000000000
+                    // Valid bitmask for 20..3F: 00000000000000001111111111000000
+                    const unsigned n = sizeof(unsigned long)*8-32;
+                    // ^ avoids compiler warning when not 64-bit
+                    unsigned long masklow6bits = 1UL << byte;
+                    if(masklow6bits & (((1UL << 10)-1UL) << (16+n)))
+                        { ++nameLength; continue; }
+                }
+                else
+                {
+                    if(byte >= '0' && byte <= '9')
+                        { ++nameLength; continue; }
+                }
+            }
+            break;
+        }
+
+        /* This function generated with make_function_name_parser.cc */
+        switch(nameLength)
+        {
+             case 2:
+    /* prefix  */if('i' == uptr[0]
+    && 'f' == uptr[1]) return Functions[cIf].enabled() ? (cIf<<16) | 0x80000002U : 2;
+    return 2;
+             case 3:
+    /* prefix  */switch(uptr[0]) {
+    case 'a':
+    /* prefix a */if('b' == uptr[1]
+    && 's' == uptr[2]) return Functions[cAbs].enabled() ? (cAbs<<16) | 0x80000003U : 3;
+    return 3;
+    case 'c':
+    /* prefix c */switch(uptr[1]) {
+    case 'o':
+    /* prefix co */switch(uptr[2]) {
+    case 's':
+    /* prefix cos */return Functions[cCos].enabled() ? (cCos<<16) | 0x80000003U : 3;
+    case 't':
+    /* prefix cot */return Functions[cCot].enabled() ? (cCot<<16) | 0x80000003U : 3;
+    default: return 3; }
+    case 's':
+    /* prefix cs */if('c' == uptr[2]) return Functions[cCsc].enabled() ? (cCsc<<16) | 0x80000003U : 3;
+    return 3;
+    default: return 3; }
+    case 'e':
+    /* prefix e */if('x' == uptr[1]
+    && 'p' == uptr[2]) return Functions[cExp].enabled() ? (cExp<<16) | 0x80000003U : 3;
+    return 3;
+    case 'i':
+    /* prefix i */if('n' == uptr[1]
+    && 't' == uptr[2]) return Functions[cInt].enabled() ? (cInt<<16) | 0x80000003U : 3;
+    return 3;
+    case 'l':
+    /* prefix l */if('o' == uptr[1]
+    && 'g' == uptr[2]) return Functions[cLog].enabled() ? (cLog<<16) | 0x80000003U : 3;
+    return 3;
+    case 'm':
+    /* prefix m */switch(uptr[1]) {
+    case 'a':
+    /* prefix ma */if('x' == uptr[2]) return Functions[cMax].enabled() ? (cMax<<16) | 0x80000003U : 3;
+    return 3;
+    case 'i':
+    /* prefix mi */if('n' == uptr[2]) return Functions[cMin].enabled() ? (cMin<<16) | 0x80000003U : 3;
+    return 3;
+    default: return 3; }
+    case 'p':
+    /* prefix p */if('o' == uptr[1]
+    && 'w' == uptr[2]) return Functions[cPow].enabled() ? (cPow<<16) | 0x80000003U : 3;
+    return 3;
+    case 's':
+    /* prefix s */switch(uptr[1]) {
+    case 'e':
+    /* prefix se */if('c' == uptr[2]) return Functions[cSec].enabled() ? (cSec<<16) | 0x80000003U : 3;
+    return 3;
+    case 'i':
+    /* prefix si */if('n' == uptr[2]) return Functions[cSin].enabled() ? (cSin<<16) | 0x80000003U : 3;
+    return 3;
+    default: return 3; }
+    case 't':
+    /* prefix t */if('a' == uptr[1]
+    && 'n' == uptr[2]) return Functions[cTan].enabled() ? (cTan<<16) | 0x80000003U : 3;
+    return 3;
+    default: return 3; }
+             case 4:
+    /* prefix  */switch(uptr[0]) {
+    case 'a':
+    /* prefix a */switch(uptr[1]) {
+    case 'c':
+    /* prefix ac */if('o' == uptr[2]
+    && 's' == uptr[3]) return Functions[cAcos].enabled() ? (cAcos<<16) | 0x80000004U : 4;
+    return 4;
+    case 's':
+    /* prefix as */if('i' == uptr[2]
+    && 'n' == uptr[3]) return Functions[cAsin].enabled() ? (cAsin<<16) | 0x80000004U : 4;
+    return 4;
+    case 't':
+    /* prefix at */if('a' == uptr[2]
+    && 'n' == uptr[3]) return Functions[cAtan].enabled() ? (cAtan<<16) | 0x80000004U : 4;
+    return 4;
+    default: return 4; }
+    case 'c':
+    /* prefix c */switch(uptr[1]) {
+    case 'b':
+    /* prefix cb */if('r' == uptr[2]
+    && 't' == uptr[3]) return Functions[cCbrt].enabled() ? (cCbrt<<16) | 0x80000004U : 4;
+    return 4;
+    case 'e':
+    /* prefix ce */if('i' == uptr[2]
+    && 'l' == uptr[3]) return Functions[cCeil].enabled() ? (cCeil<<16) | 0x80000004U : 4;
+    return 4;
+    case 'o':
+    /* prefix co */if('s' == uptr[2]
+    && 'h' == uptr[3]) return Functions[cCosh].enabled() ? (cCosh<<16) | 0x80000004U : 4;
+    return 4;
+    default: return 4; }
+    case 'e':
+    /* prefix e */switch(uptr[1]) {
+    case 'v':
+    /* prefix ev */if('a' == uptr[2]
+    && 'l' == uptr[3]) return Functions[cEval].enabled() ? (cEval<<16) | 0x80000004U : 4;
+    return 4;
+    case 'x':
+    /* prefix ex */if('p' == uptr[2]
+    && '2' == uptr[3]) return Functions[cExp2].enabled() ? (cExp2<<16) | 0x80000004U : 4;
+    return 4;
+    default: return 4; }
+    case 'l':
+    /* prefix l */{static const char tmp[3] = {'o','g','2'};
+    if(std::memcmp(uptr+1, tmp, 3) == 0) return Functions[cLog2].enabled() ? (cLog2<<16) | 0x80000004U : 4;
+    return 4; }
+    case 's':
+    /* prefix s */switch(uptr[1]) {
+    case 'i':
+    /* prefix si */if('n' == uptr[2]
+    && 'h' == uptr[3]) return Functions[cSinh].enabled() ? (cSinh<<16) | 0x80000004U : 4;
+    return 4;
+    case 'q':
+    /* prefix sq */if('r' == uptr[2]
+    && 't' == uptr[3]) return Functions[cSqrt].enabled() ? (cSqrt<<16) | 0x80000004U : 4;
+    return 4;
+    default: return 4; }
+    case 't':
+    /* prefix t */{static const char tmp[3] = {'a','n','h'};
+    if(std::memcmp(uptr+1, tmp, 3) == 0) return Functions[cTanh].enabled() ? (cTanh<<16) | 0x80000004U : 4;
+    return 4; }
+    default: return 4; }
+             case 5:
+    /* prefix  */switch(uptr[0]) {
+    case 'a':
+    /* prefix a */switch(uptr[1]) {
+    case 'c':
+    /* prefix ac */{static const char tmp[3] = {'o','s','h'};
+    if(std::memcmp(uptr+2, tmp, 3) == 0) return Functions[cAcosh].enabled() ? (cAcosh<<16) | 0x80000005U : 5;
+    return 5; }
+    case 's':
+    /* prefix as */{static const char tmp[3] = {'i','n','h'};
+    if(std::memcmp(uptr+2, tmp, 3) == 0) return Functions[cAsinh].enabled() ? (cAsinh<<16) | 0x80000005U : 5;
+    return 5; }
+    case 't':
+    /* prefix at */if('a' == uptr[2]) {
+    /* prefix ata */if('n' == uptr[3]) {
+    /* prefix atan */switch(uptr[4]) {
+    case '2':
+    /* prefix atan2 */return Functions[cAtan2].enabled() ? (cAtan2<<16) | 0x80000005U : 5;
+    case 'h':
+    /* prefix atanh */return Functions[cAtanh].enabled() ? (cAtanh<<16) | 0x80000005U : 5;
+    default: return 5; }
+    }return 5;}return 5;default: return 5; }
+    case 'f':
+    /* prefix f */{static const char tmp[4] = {'l','o','o','r'};
+    if(std::memcmp(uptr+1, tmp, 4) == 0) return Functions[cFloor].enabled() ? (cFloor<<16) | 0x80000005U : 5;
+    return 5; }
+    case 'l':
+    /* prefix l */{static const char tmp[4] = {'o','g','1','0'};
+    if(std::memcmp(uptr+1, tmp, 4) == 0) return Functions[cLog10].enabled() ? (cLog10<<16) | 0x80000005U : 5;
+    return 5; }
+    case 't':
+    /* prefix t */{static const char tmp[4] = {'r','u','n','c'};
+    if(std::memcmp(uptr+1, tmp, 4) == 0) return Functions[cTrunc].enabled() ? (cTrunc<<16) | 0x80000005U : 5;
+    return 5; }
+    default: return 5; }
+            default: break;
+        }
+        return nameLength;
diff --git a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/fp_opcode_add.inc b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/fp_opcode_add.inc
new file mode 100644
index 0000000000..47e29382ff
--- /dev/null
+++ b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/fp_opcode_add.inc
@@ -0,0 +1,4279 @@
+/* Function Parser for C++ v4.0.3   
+
+   Note: This file contains generated code and is thus not
+   intended to be to be modified by hand. It was generated by
+   fpoptimizer/bytecoderules_parser which is available in the
+   development package.
+
+   Note: You don't need to add this file to your project. It's
+   enough for it to be in the same directory as fparser.cc. This
+   file is internally #included by fparser.cc.
+*/
+
+#define FP_TRACE_OPCODENAME(op) \
+    (op < VarBegin \
+        ? FP_GetOpcodeName(OPCODE(op)) \
+        : findName(data->namePtrs,op,NameData<Value_t>::VARIABLE))
+#define FP_TRACE_BYTECODE_OPTIMIZATION(srcline,from,to,with) \
+    /*std::cout << "Changing \"" from "\"\t(line " #srcline ")\n" \
+                   "    into \"" to "\"\n" with*/
+
+  static unsigned DummyOpList[1] = {cNop};
+  /* DummyOpList is needed to prevent crash when 1+x
+   * is changed into x+1 and the bytecode containing just "x"
+   * is tested against the rule which changes "x x" into "x cDup".
+   */
+  unsigned* ByteCodePtr;
+  Value_t*   ImmedPtr;
+
+  #define FP_ReDefinePointers() \
+    ByteCodePtr = !data->ByteCode.empty() ? &data->ByteCode[0] + data->ByteCode.size() - 1 : &DummyOpList[0]; \
+    ImmedPtr    = !data->Immed.empty()    ? &data->Immed[0]    + data->Immed.size()    - 1 : 0;
+  FP_ReDefinePointers();
+
+#if(!FP_FLOAT_VERSION)
+	Value_t x;
+	unsigned A;
+	Value_t y;
+	unsigned B;
+	unsigned C;
+	unsigned D;
+	switch(opcode)
+	{
+	TailCall_cAbs:
+	case cAbs:
+		switch(ByteCodePtr[0])
+		{
+		case cNeg:
+			FP_TRACE_BYTECODE_OPTIMIZATION(189,"cNeg cAbs", "cAbs", "");
+			/* opcode = cAbs; */ // redundant, matches cAbs @ 0
+			goto Laa;
+		case cImmed:
+			x = ImmedPtr[0];
+			FP_TRACE_BYTECODE_OPTIMIZATION(40,
+				"x cAbs",
+				"[fp_abs(x)]",
+				"    with x = " << x << "\n");
+			/* ByteCodePtr[0] = cImmed; */ // redundant, matches x @ 1
+			goto Lab;
+		default:
+			A = ByteCodePtr[0];
+			if(IsNeverNegativeValueOpcode(A))
+			{
+				FP_TRACE_BYTECODE_OPTIMIZATION(244,
+					"A[IsNeverNegativeValueOpcode(A)] cAbs",
+					"A",
+					"    with A = " << FP_TRACE_OPCODENAME(A) << "\n");
+				/* ByteCodePtr[0] = A; */ // redundant, matches A @ 1
+				return;
+			}
+		}
+		goto Default0;
+	TailCall_cAdd:
+	case cAdd:
+		switch(ByteCodePtr[0])
+		{
+		case cDup:
+			if(ByteCodePtr[-1] == cAdd)
+			{
+				if(ByteCodePtr[-2] == cDup)
+				{
+					FP_TRACE_BYTECODE_OPTIMIZATION(108,"cDup cAdd cDup cAdd", "[Value_t(4)] cMul", "");
+					goto Lac;
+				}
+			}
+			break;
+		case cNeg:
+			FP_TRACE_BYTECODE_OPTIMIZATION(196,"cNeg cAdd", "cSub", "");
+			goto Lad;
+		case cImmed:
+			x = ImmedPtr[0];
+			switch(ByteCodePtr[-1])
+			{
+			case cAdd:
+				if(ByteCodePtr[-2] == cImmed)
+				{
+					y = ImmedPtr[-1];
+					FP_TRACE_BYTECODE_OPTIMIZATION(142,
+						"y cAdd x cAdd",
+						"[y+x] cAdd",
+						"    with x = " << x
+						    << ", y = " << y
+						    << "\n");
+					/* ByteCodePtr[-2] = cImmed; */ // redundant, matches y @ 3
+					/* opcode = cAdd; */ // redundant, matches cAdd @ 0
+					goto Lae;
+				}
+				break;
+			case cImmed:
+				y = ImmedPtr[-1];
+				FP_TRACE_BYTECODE_OPTIMIZATION(76,
+					"y x cAdd",
+					"[y+x]",
+					"    with x = " << x
+					    << ", y = " << y
+					    << "\n");
+				/* ByteCodePtr[-1] = cImmed; */ // redundant, matches y @ 2
+				goto Laf;
+			}
+			if(x==Value_t(0))
+			{
+				FP_TRACE_BYTECODE_OPTIMIZATION(75,
+					"x[x==Value_t(0)] cAdd",
+					"",
+					"    with x = " << x << "\n");
+				goto Lag;
+			}
+			break;
+		}
+		goto Default0;
+	TailCall_cAnd:
+	case cAnd:
+		if(ByteCodePtr[0] == cImmed)
+		{
+			x = ImmedPtr[0];
+			if(ByteCodePtr[-1] == cImmed)
+			{
+				y = ImmedPtr[-1];
+				FP_TRACE_BYTECODE_OPTIMIZATION(131,
+					"y x cAnd",
+					"[truthValue(x)&&truthValue(y)]",
+					"    with x = " << x
+					    << ", y = " << y
+					    << "\n");
+				/* ByteCodePtr[-1] = cImmed; */ // redundant, matches y @ 2
+				goto Lah;
+			}
+		}
+		goto Default0;
+	TailCall_cDiv:
+	case cDiv:
+		switch(ByteCodePtr[0])
+		{
+		case cDup:
+			FP_TRACE_BYTECODE_OPTIMIZATION(121,"cDup cDiv", "[Value_t(0)] cMul [Value_t(1)] cAdd", "");
+			goto Lai;
+		case cImmed:
+			x = ImmedPtr[0];
+			if(x!=Value_t(0))
+			{
+				switch(ByteCodePtr[-1])
+				{
+				case cNeg:
+					FP_TRACE_BYTECODE_OPTIMIZATION(139,
+						"cNeg x[x!=Value_t(0)] cDiv",
+						"[-x] cDiv",
+						"    with x = " << x << "\n");
+					/* opcode = cDiv; */ // redundant, matches cDiv @ 0
+					goto Laj;
+				case cImmed:
+					y = ImmedPtr[-1];
+					FP_TRACE_BYTECODE_OPTIMIZATION(73,
+						"y x[x!=Value_t(0)] cDiv",
+						"[y/x]",
+						"    with x = " << x
+						    << ", y = " << y
+						    << "\n");
+					/* ByteCodePtr[-1] = cImmed; */ // redundant, matches y @ 2
+					goto Lak;
+				}
+			}
+			if(x==Value_t(1))
+			{
+				FP_TRACE_BYTECODE_OPTIMIZATION(72,
+					"x[x==Value_t(1)] cDiv",
+					"",
+					"    with x = " << x << "\n");
+				goto Lag;
+			}
+			break;
+		}
+		goto Default0;
+	TailCall_cEqual:
+	case cEqual:
+		if(ByteCodePtr[0] == cImmed)
+		{
+			x = ImmedPtr[0];
+			if(x==Value_t(1))
+			{
+				A = ByteCodePtr[-1];
+				if(IsLogicalOpcode(A))
+				{
+					FP_TRACE_BYTECODE_OPTIMIZATION(272,
+						"A[IsLogicalOpcode(A)] x[x==Value_t(1)] cEqual",
+						"A",
+						"    with x = " << x
+						    << ", A = " << FP_TRACE_OPCODENAME(A)
+						    << "\n");
+					/* ByteCodePtr[-1] = A; */ // redundant, matches A @ 2
+					goto Lag;
+				}
+			}
+			if(ByteCodePtr[-1] == cImmed)
+			{
+				y = ImmedPtr[-1];
+				FP_TRACE_BYTECODE_OPTIMIZATION(129,
+					"y x cEqual",
+					"[fp_equal(y,x)]",
+					"    with x = " << x
+					    << ", y = " << y
+					    << "\n");
+				/* ByteCodePtr[-1] = cImmed; */ // redundant, matches y @ 2
+				goto Lal;
+			}
+			if(x==Value_t(0))
+			{
+				switch(ByteCodePtr[-1])
+				{
+				case cAbs:
+					FP_TRACE_BYTECODE_OPTIMIZATION(208,
+						"cAbs x[x==Value_t(0)] cEqual",
+						"[x] cEqual",
+						"    with x = " << x << "\n");
+					/* ImmedPtr[0] = x; */ // redundant, matches x @ 1
+					/* opcode = cEqual; */ // redundant, matches cEqual @ 0
+					goto Lam;
+				case cSqr:
+					FP_TRACE_BYTECODE_OPTIMIZATION(210,
+						"cSqr x[x==Value_t(0)] cEqual",
+						"[x] cEqual",
+						"    with x = " << x << "\n");
+					/* ImmedPtr[0] = x; */ // redundant, matches x @ 1
+					/* opcode = cEqual; */ // redundant, matches cEqual @ 0
+					goto Lam;
+				}
+				FP_TRACE_BYTECODE_OPTIMIZATION(262,
+					"x[x==Value_t(0)] cEqual",
+					"cNot",
+					"    with x = " << x << "\n");
+				goto Lan;
+			}
+		}
+		goto Default0;
+	TailCall_cGreater:
+	case cGreater:
+		if(ByteCodePtr[0] == cImmed)
+		{
+			x = ImmedPtr[0];
+			if(x==Value_t(0))
+			{
+				switch(ByteCodePtr[-1])
+				{
+				case cAbs:
+					FP_TRACE_BYTECODE_OPTIMIZATION(264,
+						"cAbs x[x==Value_t(0)] cGreater",
+						"cNotNot",
+						"    with x = " << x << "\n");
+					goto Lao;
+				default:
+					A = ByteCodePtr[-1];
+					if(IsNeverNegativeValueOpcode(A))
+					{
+						FP_TRACE_BYTECODE_OPTIMIZATION(268,
+							"A[IsNeverNegativeValueOpcode(A)] x[x==Value_t(0)] cGreater",
+							"A cNotNot",
+							"    with x = " << x
+							    << ", A = " << FP_TRACE_OPCODENAME(A)
+							    << "\n");
+						/* ByteCodePtr[-1] = A; */ // redundant, matches A @ 2
+						goto Lap;
+					}
+				}
+			}
+			if(ByteCodePtr[-1] == cImmed)
+			{
+				y = ImmedPtr[-1];
+				FP_TRACE_BYTECODE_OPTIMIZATION(127,
+					"y x cGreater",
+					"[fp_less(x,y)]",
+					"    with x = " << x
+					    << ", y = " << y
+					    << "\n");
+				/* ByteCodePtr[-1] = cImmed; */ // redundant, matches y @ 2
+				goto Lba;
+			}
+		}
+		goto Default0;
+	TailCall_cGreaterOrEq:
+	case cGreaterOrEq:
+		if(ByteCodePtr[0] == cImmed)
+		{
+			x = ImmedPtr[0];
+			if(x==Value_t(1))
+			{
+				switch(ByteCodePtr[-1])
+				{
+				case cAbs:
+					FP_TRACE_BYTECODE_OPTIMIZATION(265,
+						"cAbs x[x==Value_t(1)] cGreaterOrEq",
+						"cNotNot",
+						"    with x = " << x << "\n");
+					goto Lao;
+				default:
+					A = ByteCodePtr[-1];
+					if(IsNeverNegativeValueOpcode(A))
+					{
+						FP_TRACE_BYTECODE_OPTIMIZATION(269,
+							"A[IsNeverNegativeValueOpcode(A)] x[x==Value_t(1)] cGreaterOrEq",
+							"A cNotNot",
+							"    with x = " << x
+							    << ", A = " << FP_TRACE_OPCODENAME(A)
+							    << "\n");
+						/* ByteCodePtr[-1] = A; */ // redundant, matches A @ 2
+						goto Lap;
+					}
+				}
+			}
+			if(ByteCodePtr[-1] == cImmed)
+			{
+				y = ImmedPtr[-1];
+				FP_TRACE_BYTECODE_OPTIMIZATION(128,
+					"y x cGreaterOrEq",
+					"[fp_lessOrEq(x,y)]",
+					"    with x = " << x
+					    << ", y = " << y
+					    << "\n");
+				/* ByteCodePtr[-1] = cImmed; */ // redundant, matches y @ 2
+				goto Lbb;
+			}
+		}
+		goto Default0;
+	TailCall_cInv:
+	case cInv:
+		switch(ByteCodePtr[0])
+		{
+		case cInv:
+			FP_TRACE_BYTECODE_OPTIMIZATION(190,"cInv cInv", "", "");
+			goto Lbc;
+		case cSqrt:
+			FP_TRACE_BYTECODE_OPTIMIZATION(67,"cSqrt cInv", "cRSqrt", "");
+			goto Lbd;
+		case cImmed:
+			x = ImmedPtr[0];
+			if(x!=Value_t(0))
+			{
+				FP_TRACE_BYTECODE_OPTIMIZATION(69,
+					"x[x!=Value_t(0)] cInv",
+					"[Value_t(1)/x]",
+					"    with x = " << x << "\n");
+				/* ByteCodePtr[0] = cImmed; */ // redundant, matches x @ 1
+				goto Lbe;
+			}
+			break;
+		}
+		goto Default0;
+	TailCall_cLess:
+	case cLess:
+		if(ByteCodePtr[0] == cImmed)
+		{
+			x = ImmedPtr[0];
+			if(x==Value_t(1))
+			{
+				switch(ByteCodePtr[-1])
+				{
+				case cAbs:
+					FP_TRACE_BYTECODE_OPTIMIZATION(266,
+						"cAbs x[x==Value_t(1)] cLess",
+						"cNot",
+						"    with x = " << x << "\n");
+					goto Lbf;
+				default:
+					A = ByteCodePtr[-1];
+					if(IsNeverNegativeValueOpcode(A))
+					{
+						FP_TRACE_BYTECODE_OPTIMIZATION(270,
+							"A[IsNeverNegativeValueOpcode(A)] x[x==Value_t(1)] cLess",
+							"A cNot",
+							"    with x = " << x
+							    << ", A = " << FP_TRACE_OPCODENAME(A)
+							    << "\n");
+						/* ByteCodePtr[-1] = A; */ // redundant, matches A @ 2
+						goto Lan;
+					}
+				}
+			}
+			if(ByteCodePtr[-1] == cImmed)
+			{
+				y = ImmedPtr[-1];
+				FP_TRACE_BYTECODE_OPTIMIZATION(125,
+					"y x cLess",
+					"[fp_less(y,x)]",
+					"    with x = " << x
+					    << ", y = " << y
+					    << "\n");
+				/* ByteCodePtr[-1] = cImmed; */ // redundant, matches y @ 2
+				goto Lbg;
+			}
+		}
+		goto Default0;
+	TailCall_cLessOrEq:
+	case cLessOrEq:
+		if(ByteCodePtr[0] == cImmed)
+		{
+			x = ImmedPtr[0];
+			if(x==Value_t(0))
+			{
+				switch(ByteCodePtr[-1])
+				{
+				case cAbs:
+					FP_TRACE_BYTECODE_OPTIMIZATION(267,
+						"cAbs x[x==Value_t(0)] cLessOrEq",
+						"cNot",
+						"    with x = " << x << "\n");
+					goto Lbf;
+				default:
+					A = ByteCodePtr[-1];
+					if(IsNeverNegativeValueOpcode(A))
+					{
+						FP_TRACE_BYTECODE_OPTIMIZATION(271,
+							"A[IsNeverNegativeValueOpcode(A)] x[x==Value_t(0)] cLessOrEq",
+							"A cNot",
+							"    with x = " << x
+							    << ", A = " << FP_TRACE_OPCODENAME(A)
+							    << "\n");
+						/* ByteCodePtr[-1] = A; */ // redundant, matches A @ 2
+						goto Lan;
+					}
+				}
+			}
+			if(ByteCodePtr[-1] == cImmed)
+			{
+				y = ImmedPtr[-1];
+				FP_TRACE_BYTECODE_OPTIMIZATION(126,
+					"y x cLessOrEq",
+					"[fp_lessOrEq(y,x)]",
+					"    with x = " << x
+					    << ", y = " << y
+					    << "\n");
+				/* ByteCodePtr[-1] = cImmed; */ // redundant, matches y @ 2
+				goto Lbh;
+			}
+		}
+		goto Default0;
+	TailCall_cMax:
+	case cMax:
+		switch(ByteCodePtr[0])
+		{
+		case cDup:
+			FP_TRACE_BYTECODE_OPTIMIZATION(111,"cDup cMax", "", "");
+			goto Lbc;
+		case cImmed:
+			x = ImmedPtr[0];
+			if(ByteCodePtr[-1] == cImmed)
+			{
+				y = ImmedPtr[-1];
+				FP_TRACE_BYTECODE_OPTIMIZATION(82,
+					"y x cMax",
+					"[Max(x,y)]",
+					"    with x = " << x
+					    << ", y = " << y
+					    << "\n");
+				/* ByteCodePtr[-1] = cImmed; */ // redundant, matches y @ 2
+				goto Lbi;
+			}
+			break;
+		default:
+			A = ByteCodePtr[0];
+			if(A>=VarBegin)
+			{
+				switch(ByteCodePtr[-1])
+				{
+				case cDup:
+					B = ByteCodePtr[-2];
+					if(B==A)
+					{
+						FP_TRACE_BYTECODE_OPTIMIZATION(113,
+							"B[B==A] cDup A[A>=VarBegin] cMax",
+							"B cDup",
+							"    with A = " << FP_TRACE_OPCODENAME(A)
+							    << ", B = " << FP_TRACE_OPCODENAME(B)
+							    << "\n");
+						/* ByteCodePtr[-2] = B; */ // redundant, matches B @ 3
+						/* ByteCodePtr[-1] = cDup; */ // redundant, matches cDup @ 2
+						goto Lbc;
+					}
+					break;
+				case cMax:
+					B = ByteCodePtr[-2];
+					if(B==A)
+					{
+						FP_TRACE_BYTECODE_OPTIMIZATION(115,
+							"B[B==A] cMax A[A>=VarBegin] cMax",
+							"B cMax",
+							"    with A = " << FP_TRACE_OPCODENAME(A)
+							    << ", B = " << FP_TRACE_OPCODENAME(B)
+							    << "\n");
+						/* ByteCodePtr[-2] = B; */ // redundant, matches B @ 3
+						/* ByteCodePtr[-1] = cMax; */ // redundant, matches cMax @ 2
+						goto Lbc;
+					}
+					break;
+				}
+			}
+		}
+		goto Default0;
+	TailCall_cMin:
+	case cMin:
+		switch(ByteCodePtr[0])
+		{
+		case cDup:
+			FP_TRACE_BYTECODE_OPTIMIZATION(110,"cDup cMin", "", "");
+			goto Lbc;
+		case cImmed:
+			x = ImmedPtr[0];
+			if(ByteCodePtr[-1] == cImmed)
+			{
+				y = ImmedPtr[-1];
+				FP_TRACE_BYTECODE_OPTIMIZATION(81,
+					"y x cMin",
+					"[Min(x,y)]",
+					"    with x = " << x
+					    << ", y = " << y
+					    << "\n");
+				/* ByteCodePtr[-1] = cImmed; */ // redundant, matches y @ 2
+				goto Lbj;
+			}
+			break;
+		default:
+			A = ByteCodePtr[0];
+			if(A>=VarBegin)
+			{
+				switch(ByteCodePtr[-1])
+				{
+				case cDup:
+					B = ByteCodePtr[-2];
+					if(B==A)
+					{
+						FP_TRACE_BYTECODE_OPTIMIZATION(112,
+							"B[B==A] cDup A[A>=VarBegin] cMin",
+							"B cDup",
+							"    with A = " << FP_TRACE_OPCODENAME(A)
+							    << ", B = " << FP_TRACE_OPCODENAME(B)
+							    << "\n");
+						/* ByteCodePtr[-2] = B; */ // redundant, matches B @ 3
+						/* ByteCodePtr[-1] = cDup; */ // redundant, matches cDup @ 2
+						goto Lbc;
+					}
+					break;
+				case cMin:
+					B = ByteCodePtr[-2];
+					if(B==A)
+					{
+						FP_TRACE_BYTECODE_OPTIMIZATION(114,
+							"B[B==A] cMin A[A>=VarBegin] cMin",
+							"B cMin",
+							"    with A = " << FP_TRACE_OPCODENAME(A)
+							    << ", B = " << FP_TRACE_OPCODENAME(B)
+							    << "\n");
+						/* ByteCodePtr[-2] = B; */ // redundant, matches B @ 3
+						/* ByteCodePtr[-1] = cMin; */ // redundant, matches cMin @ 2
+						goto Lbc;
+					}
+					break;
+				}
+			}
+		}
+		goto Default0;
+	TailCall_cMod:
+	case cMod:
+		if(ByteCodePtr[0] == cImmed)
+		{
+			x = ImmedPtr[0];
+			if(x!=Value_t(0))
+			{
+				if(ByteCodePtr[-1] == cImmed)
+				{
+					y = ImmedPtr[-1];
+					FP_TRACE_BYTECODE_OPTIMIZATION(74,
+						"y x[x!=Value_t(0)] cMod",
+						"[fp_mod(y,x)]",
+						"    with x = " << x
+						    << ", y = " << y
+						    << "\n");
+					/* ByteCodePtr[-1] = cImmed; */ // redundant, matches y @ 2
+					goto Lbk;
+				}
+			}
+		}
+		goto Default0;
+	TailCall_cMul:
+	case cMul:
+		switch(ByteCodePtr[0])
+		{
+		case cDup:
+			FP_TRACE_BYTECODE_OPTIMIZATION(338,"cDup cMul", "cSqr", "");
+			goto Lbl;
+		case cInv:
+			FP_TRACE_BYTECODE_OPTIMIZATION(195,"cInv cMul", "cDiv", "");
+			goto Lbm;
+		case cNeg:
+			A = ByteCodePtr[-1];
+			if(A>=VarBegin)
+			{
+				switch(ByteCodePtr[-2])
+				{
+				case cMul:
+					B = ByteCodePtr[-3];
+					if(B==A)
+					{
+						FP_TRACE_BYTECODE_OPTIMIZATION(330,
+							"B[B==A] cMul A[A>=VarBegin] cNeg cMul",
+							"B cSqr cMul cNeg",
+							"    with A = " << FP_TRACE_OPCODENAME(A)
+							    << ", B = " << FP_TRACE_OPCODENAME(B)
+							    << "\n");
+						/* ByteCodePtr[-3] = B; */ // redundant, matches B @ 4
+						goto Lbn;
+					}
+					goto Default1;
+				default: Default1:;
+					B = ByteCodePtr[-2];
+					if(B==A)
+					{
+						FP_TRACE_BYTECODE_OPTIMIZATION(324,
+							"B[B==A] A[A>=VarBegin] cNeg cMul",
+							"B cSqr cNeg",
+							"    with A = " << FP_TRACE_OPCODENAME(A)
+							    << ", B = " << FP_TRACE_OPCODENAME(B)
+							    << "\n");
+						/* ByteCodePtr[-2] = B; */ // redundant, matches B @ 3
+						goto Lbo;
+					}
+				}
+			}
+			goto Default2;
+		case cImmed:
+			x = ImmedPtr[0];
+			if(x==Value_t(0))
+			{
+				switch(ByteCodePtr[-1])
+				{
+				case cMul:
+					A = ByteCodePtr[-2];
+					if(A>=VarBegin)
+					{
+						FP_TRACE_BYTECODE_OPTIMIZATION(94,
+							"A[A>=VarBegin] cMul x[x==Value_t(0)] cMul",
+							"[x] cMul",
+							"    with x = " << x
+							    << ", A = " << FP_TRACE_OPCODENAME(A)
+							    << "\n");
+						/* ImmedPtr[0] = x; */ // redundant, matches x @ 1
+						/* opcode = cMul; */ // redundant, matches cMul @ 0
+						goto Lbp;
+					}
+					goto Default3;
+				default: Default3:;
+					A = ByteCodePtr[-1];
+					if(IsBinaryOpcode(A)&&!HasInvalidRangesOpcode(A))
+					{
+						switch(ByteCodePtr[-2])
+						{
+						case cImmed:
+							y = ImmedPtr[-1];
+							FP_TRACE_BYTECODE_OPTIMIZATION(93,
+								"y A[IsBinaryOpcode(A)&&!HasInvalidRangesOpcode(A)] x[x==Value_t(0)] cMul",
+								"[x] cMul",
+								"    with x = " << x
+								    << ", A = " << FP_TRACE_OPCODENAME(A)
+								    << ", y = " << y
+								    << "\n");
+							/* ByteCodePtr[-2] = cImmed; */ // redundant, matches y @ 3
+							/* opcode = cMul; */ // redundant, matches cMul @ 0
+							goto Lca;
+						default:
+							B = ByteCodePtr[-2];
+							if(IsBinaryOpcode(B)&&!HasInvalidRangesOpcode(B))
+							{
+								switch(ByteCodePtr[-3])
+								{
+								case cImmed:
+									y = ImmedPtr[-1];
+									FP_TRACE_BYTECODE_OPTIMIZATION(97,
+										"y B[IsBinaryOpcode(B)&&!HasInvalidRangesOpcode(B)] A[IsBinaryOpcode(A)&&!HasInvalidRangesOpcode(A)] x[x==Value_t(0)] cMul",
+										"A [x] cMul",
+										"    with x = " << x
+										    << ", A = " << FP_TRACE_OPCODENAME(A)
+										    << ", B = " << FP_TRACE_OPCODENAME(B)
+										    << ", y = " << y
+										    << "\n");
+									/* opcode = cMul; */ // redundant, matches cMul @ 0
+									goto Lcb;
+								default:
+									C = ByteCodePtr[-3];
+									if(C>=VarBegin)
+									{
+										FP_TRACE_BYTECODE_OPTIMIZATION(95,
+											"C[C>=VarBegin] B[IsBinaryOpcode(B)&&!HasInvalidRangesOpcode(B)] A[IsBinaryOpcode(A)&&!HasInvalidRangesOpcode(A)] x[x==Value_t(0)] cMul",
+											"A [x] cMul",
+											"    with x = " << x
+											    << ", A = " << FP_TRACE_OPCODENAME(A)
+											    << ", B = " << FP_TRACE_OPCODENAME(B)
+											    << ", C = " << FP_TRACE_OPCODENAME(C)
+											    << "\n");
+										/* opcode = cMul; */ // redundant, matches cMul @ 0
+										goto Lcc;
+									}
+									if(IsUnaryOpcode(C)&&!HasInvalidRangesOpcode(C))
+									{
+										FP_TRACE_BYTECODE_OPTIMIZATION(96,
+											"C[IsUnaryOpcode(C)&&!HasInvalidRangesOpcode(C)] B[IsBinaryOpcode(B)&&!HasInvalidRangesOpcode(B)] A[IsBinaryOpcode(A)&&!HasInvalidRangesOpcode(A)] x[x==Value_t(0)] cMul",
+											"B A [x] cMul",
+											"    with x = " << x
+											    << ", A = " << FP_TRACE_OPCODENAME(A)
+											    << ", B = " << FP_TRACE_OPCODENAME(B)
+											    << ", C = " << FP_TRACE_OPCODENAME(C)
+											    << "\n");
+										/* opcode = cMul; */ // redundant, matches cMul @ 0
+										goto Lcd;
+									}
+								}
+							}
+							if(B>=VarBegin)
+							{
+								FP_TRACE_BYTECODE_OPTIMIZATION(91,
+									"B[B>=VarBegin] A[IsBinaryOpcode(A)&&!HasInvalidRangesOpcode(A)] x[x==Value_t(0)] cMul",
+									"[x] cMul",
+									"    with x = " << x
+									    << ", A = " << FP_TRACE_OPCODENAME(A)
+									    << ", B = " << FP_TRACE_OPCODENAME(B)
+									    << "\n");
+								/* ImmedPtr[0] = x; */ // redundant, matches x @ 1
+								/* opcode = cMul; */ // redundant, matches cMul @ 0
+								goto Lbp;
+							}
+							if(IsUnaryOpcode(B)&&!HasInvalidRangesOpcode(B))
+							{
+								FP_TRACE_BYTECODE_OPTIMIZATION(92,
+									"B[IsUnaryOpcode(B)&&!HasInvalidRangesOpcode(B)] A[IsBinaryOpcode(A)&&!HasInvalidRangesOpcode(A)] x[x==Value_t(0)] cMul",
+									"A [x] cMul",
+									"    with x = " << x
+									    << ", A = " << FP_TRACE_OPCODENAME(A)
+									    << ", B = " << FP_TRACE_OPCODENAME(B)
+									    << "\n");
+								/* opcode = cMul; */ // redundant, matches cMul @ 0
+								goto Lce;
+							}
+						}
+					}
+					if(A>=VarBegin)
+					{
+						FP_TRACE_BYTECODE_OPTIMIZATION(89,
+							"A[A>=VarBegin] x[x==Value_t(0)] cMul",
+							"[x]",
+							"    with x = " << x
+							    << ", A = " << FP_TRACE_OPCODENAME(A)
+							    << "\n");
+						/* ImmedPtr[0] = x; */ // redundant, matches x @ 1
+						goto Lcf;
+					}
+					if(IsUnaryOpcode(A)&&!HasInvalidRangesOpcode(A))
+					{
+						FP_TRACE_BYTECODE_OPTIMIZATION(90,
+							"A[IsUnaryOpcode(A)&&!HasInvalidRangesOpcode(A)] x[x==Value_t(0)] cMul",
+							"[x] cMul",
+							"    with x = " << x
+							    << ", A = " << FP_TRACE_OPCODENAME(A)
+							    << "\n");
+						/* ImmedPtr[0] = x; */ // redundant, matches x @ 1
+						/* opcode = cMul; */ // redundant, matches cMul @ 0
+						goto Lcg;
+					}
+				}
+			}
+			switch(ByteCodePtr[-1])
+			{
+			case cAdd:
+				if(ByteCodePtr[-2] == cDup)
+				{
+					if(x+x==Value_t(1))
+					{
+						FP_TRACE_BYTECODE_OPTIMIZATION(148,
+							"cDup[x+x==Value_t(1)] cAdd x cMul",
+							"",
+							"    with x = " << x << "\n");
+						goto Lch;
+					}
+					FP_TRACE_BYTECODE_OPTIMIZATION(149,
+						"cDup cAdd x cMul",
+						"[x+x] cMul",
+						"    with x = " << x << "\n");
+					/* opcode = cMul; */ // redundant, matches cMul @ 0
+					goto Lci;
+				}
+				break;
+			case cMul:
+				if(ByteCodePtr[-2] == cImmed)
+				{
+					y = ImmedPtr[-1];
+					if(y*x==Value_t(1))
+					{
+						FP_TRACE_BYTECODE_OPTIMIZATION(146,
+							"y[y*x==Value_t(1)] cMul x cMul",
+							"",
+							"    with x = " << x
+							    << ", y = " << y
+							    << "\n");
+						goto Lcj;
+					}
+					FP_TRACE_BYTECODE_OPTIMIZATION(147,
+						"y cMul x cMul",
+						"[y*x] cMul",
+						"    with x = " << x
+						    << ", y = " << y
+						    << "\n");
+					/* ByteCodePtr[-2] = cImmed; */ // redundant, matches y @ 3
+					/* opcode = cMul; */ // redundant, matches cMul @ 0
+					goto Lck;
+				}
+				break;
+			case cNeg:
+				FP_TRACE_BYTECODE_OPTIMIZATION(136,
+					"cNeg x cMul",
+					"[-x] cMul",
+					"    with x = " << x << "\n");
+				/* opcode = cMul; */ // redundant, matches cMul @ 0
+				goto Lcl;
+			case cImmed:
+				y = ImmedPtr[-1];
+				FP_TRACE_BYTECODE_OPTIMIZATION(71,
+					"y x cMul",
+					"[y*x]",
+					"    with x = " << x
+					    << ", y = " << y
+					    << "\n");
+				/* ByteCodePtr[-1] = cImmed; */ // redundant, matches y @ 2
+				goto Lcm;
+			}
+			if(x==Value_t(1))
+			{
+				FP_TRACE_BYTECODE_OPTIMIZATION(70,
+					"x[x==Value_t(1)] cMul",
+					"",
+					"    with x = " << x << "\n");
+				goto Lag;
+			}
+			if(x==Value_t(2))
+			{
+				FP_TRACE_BYTECODE_OPTIMIZATION(100,
+					"x[x==Value_t(2)] cMul",
+					"cDup cAdd",
+					"    with x = " << x << "\n");
+				goto Lcn;
+			}
+			if(x==Value_t(-1))
+			{
+				FP_TRACE_BYTECODE_OPTIMIZATION(138,
+					"x[x==Value_t(-1)] cMul",
+					"cNeg",
+					"    with x = " << x << "\n");
+				goto Lco;
+			}
+			break;
+		default: Default2:;
+			A = ByteCodePtr[0];
+			if(A>=VarBegin)
+			{
+				switch(ByteCodePtr[-1])
+				{
+				case cMul:
+					switch(ByteCodePtr[-2])
+					{
+					case cNeg:
+						B = ByteCodePtr[-3];
+						if(B==A)
+						{
+							FP_TRACE_BYTECODE_OPTIMIZATION(327,
+								"B[B==A] cNeg cMul A[A>=VarBegin] cMul",
+								"B cSqr cMul cNeg",
+								"    with A = " << FP_TRACE_OPCODENAME(A)
+								    << ", B = " << FP_TRACE_OPCODENAME(B)
+								    << "\n");
+							/* ByteCodePtr[-3] = B; */ // redundant, matches B @ 4
+							goto Lbn;
+						}
+						goto Default4;
+					default: Default4:;
+						B = ByteCodePtr[-2];
+						if(B==A)
+						{
+							FP_TRACE_BYTECODE_OPTIMIZATION(318,
+								"B[B==A] cMul A[A>=VarBegin] cMul",
+								"B cSqr cMul",
+								"    with A = " << FP_TRACE_OPCODENAME(A)
+								    << ", B = " << FP_TRACE_OPCODENAME(B)
+								    << "\n");
+							/* ByteCodePtr[-2] = B; */ // redundant, matches B @ 3
+							/* opcode = cMul; */ // redundant, matches cMul @ 0
+							goto Lcp;
+						}
+					}
+					goto Default5;
+				case cNeg:
+					B = ByteCodePtr[-2];
+					if(B==A)
+					{
+						FP_TRACE_BYTECODE_OPTIMIZATION(321,
+							"B[B==A] cNeg A[A>=VarBegin] cMul",
+							"B cSqr cNeg",
+							"    with A = " << FP_TRACE_OPCODENAME(A)
+							    << ", B = " << FP_TRACE_OPCODENAME(B)
+							    << "\n");
+						/* ByteCodePtr[-2] = B; */ // redundant, matches B @ 3
+						goto Lbo;
+					}
+					goto Default5;
+				default: Default5:;
+					B = ByteCodePtr[-1];
+					if(B==A)
+					{
+						FP_TRACE_BYTECODE_OPTIMIZATION(315,
+							"B[B==A] A[A>=VarBegin] cMul",
+							"B cSqr",
+							"    with A = " << FP_TRACE_OPCODENAME(A)
+							    << ", B = " << FP_TRACE_OPCODENAME(B)
+							    << "\n");
+						/* ByteCodePtr[-1] = B; */ // redundant, matches B @ 2
+						goto Lbl;
+					}
+				}
+			}
+			if(IsUnaryOpcode(A))
+			{
+				B = ByteCodePtr[-1];
+				if(B>=VarBegin)
+				{
+					if(ByteCodePtr[-2] == cMul)
+					{
+						C = ByteCodePtr[-3];
+						if(C==A)
+						{
+							D = ByteCodePtr[-4];
+							if(D==B)
+							{
+								FP_TRACE_BYTECODE_OPTIMIZATION(337,
+									"D[D==B] C[C==A] cMul B[B>=VarBegin] A[IsUnaryOpcode(A)] cMul",
+									"D C cSqr cMul",
+									"    with A = " << FP_TRACE_OPCODENAME(A)
+									    << ", B = " << FP_TRACE_OPCODENAME(B)
+									    << ", C = " << FP_TRACE_OPCODENAME(C)
+									    << ", D = " << FP_TRACE_OPCODENAME(D)
+									    << "\n");
+								/* ByteCodePtr[-4] = D; */ // redundant, matches D @ 5
+								/* ByteCodePtr[-3] = C; */ // redundant, matches C @ 4
+								/* opcode = cMul; */ // redundant, matches cMul @ 0
+								goto Lda;
+							}
+						}
+					}
+				}
+			}
+		}
+		goto Default0;
+	TailCall_cNEqual:
+	case cNEqual:
+		if(ByteCodePtr[0] == cImmed)
+		{
+			x = ImmedPtr[0];
+			if(x==Value_t(1))
+			{
+				A = ByteCodePtr[-1];
+				if(IsLogicalOpcode(A))
+				{
+					FP_TRACE_BYTECODE_OPTIMIZATION(273,
+						"A[IsLogicalOpcode(A)] x[x==Value_t(1)] cNEqual",
+						"A cNot",
+						"    with x = " << x
+						    << ", A = " << FP_TRACE_OPCODENAME(A)
+						    << "\n");
+					/* ByteCodePtr[-1] = A; */ // redundant, matches A @ 2
+					goto Lan;
+				}
+			}
+			if(ByteCodePtr[-1] == cImmed)
+			{
+				y = ImmedPtr[-1];
+				FP_TRACE_BYTECODE_OPTIMIZATION(130,
+					"y x cNEqual",
+					"[fp_nequal(y,x)]",
+					"    with x = " << x
+					    << ", y = " << y
+					    << "\n");
+				/* ByteCodePtr[-1] = cImmed; */ // redundant, matches y @ 2
+				goto Ldb;
+			}
+			if(x==Value_t(0))
+			{
+				switch(ByteCodePtr[-1])
+				{
+				case cAbs:
+					FP_TRACE_BYTECODE_OPTIMIZATION(209,
+						"cAbs x[x==Value_t(0)] cNEqual",
+						"[x] cNEqual",
+						"    with x = " << x << "\n");
+					/* ImmedPtr[0] = x; */ // redundant, matches x @ 1
+					/* opcode = cNEqual; */ // redundant, matches cNEqual @ 0
+					goto Ldc;
+				case cSqr:
+					FP_TRACE_BYTECODE_OPTIMIZATION(211,
+						"cSqr x[x==Value_t(0)] cNEqual",
+						"[x] cNEqual",
+						"    with x = " << x << "\n");
+					/* ImmedPtr[0] = x; */ // redundant, matches x @ 1
+					/* opcode = cNEqual; */ // redundant, matches cNEqual @ 0
+					goto Ldc;
+				}
+				FP_TRACE_BYTECODE_OPTIMIZATION(263,
+					"x[x==Value_t(0)] cNEqual",
+					"cNotNot",
+					"    with x = " << x << "\n");
+				goto Lap;
+			}
+		}
+		goto Default0;
+	TailCall_cNeg:
+	case cNeg:
+		switch(ByteCodePtr[0])
+		{
+		case cMul:
+			if(ByteCodePtr[-1] == cImmed)
+			{
+				x = ImmedPtr[0];
+				FP_TRACE_BYTECODE_OPTIMIZATION(137,
+					"x cMul cNeg",
+					"[-x] cMul",
+					"    with x = " << x << "\n");
+				/* ByteCodePtr[-1] = cImmed; */ // redundant, matches x @ 2
+				goto Ldd;
+			}
+			break;
+		case cNeg:
+			FP_TRACE_BYTECODE_OPTIMIZATION(191,"cNeg cNeg", "", "");
+			goto Lbc;
+		case cImmed:
+			x = ImmedPtr[0];
+			FP_TRACE_BYTECODE_OPTIMIZATION(68,
+				"x cNeg",
+				"[-x]",
+				"    with x = " << x << "\n");
+			/* ByteCodePtr[0] = cImmed; */ // redundant, matches x @ 1
+			goto Lde;
+		}
+		goto Default0;
+	TailCall_cNot:
+	case cNot:
+		switch(ByteCodePtr[0])
+		{
+		case cAbs:
+			FP_TRACE_BYTECODE_OPTIMIZATION(235,"cAbs cNot", "cNot", "");
+			/* opcode = cNot; */ // redundant, matches cNot @ 0
+			goto Ldf;
+		case cAbsNot:
+			A = ByteCodePtr[-1];
+			if(IsLogicalOpcode(A))
+			{
+				FP_TRACE_BYTECODE_OPTIMIZATION(240,
+					"A[IsLogicalOpcode(A)] cAbsNot cNot",
+					"A",
+					"    with A = " << FP_TRACE_OPCODENAME(A) << "\n");
+				/* ByteCodePtr[-1] = A; */ // redundant, matches A @ 2
+				goto Lbc;
+			}
+			if(A!=cImmed)
+			{
+				FP_TRACE_BYTECODE_OPTIMIZATION(241,
+					"A[A!=cImmed] cAbsNot cNot",
+					"A cAbsNotNot",
+					"    with A = " << FP_TRACE_OPCODENAME(A) << "\n");
+				/* ByteCodePtr[-1] = A; */ // redundant, matches A @ 2
+				goto Ldg;
+			}
+			goto Default6;
+		case cAbsNotNot:
+			FP_TRACE_BYTECODE_OPTIMIZATION(238,"cAbsNotNot cNot", "cAbsNot", "");
+			goto Ldh;
+		case cEqual:
+			FP_TRACE_BYTECODE_OPTIMIZATION(205,"cEqual cNot", "cNEqual", "");
+			goto Ldi;
+		case cGreater:
+			FP_TRACE_BYTECODE_OPTIMIZATION(203,"cGreater cNot", "cLessOrEq", "");
+			goto Ldj;
+		case cGreaterOrEq:
+			FP_TRACE_BYTECODE_OPTIMIZATION(204,"cGreaterOrEq cNot", "cLess", "");
+			goto Ldk;
+		case cLess:
+			FP_TRACE_BYTECODE_OPTIMIZATION(201,"cLess cNot", "cGreaterOrEq", "");
+			goto Ldl;
+		case cLessOrEq:
+			FP_TRACE_BYTECODE_OPTIMIZATION(202,"cLessOrEq cNot", "cGreater", "");
+			goto Ldm;
+		case cNEqual:
+			FP_TRACE_BYTECODE_OPTIMIZATION(206,"cNEqual cNot", "cEqual", "");
+			goto Ldn;
+		case cNeg:
+			FP_TRACE_BYTECODE_OPTIMIZATION(234,"cNeg cNot", "cNot", "");
+			/* opcode = cNot; */ // redundant, matches cNot @ 0
+			goto Ldf;
+		case cNot:
+			FP_TRACE_BYTECODE_OPTIMIZATION(236,"cNot cNot", "cNotNot", "");
+			goto Ldo;
+		case cNotNot:
+			FP_TRACE_BYTECODE_OPTIMIZATION(237,"cNotNot cNot", "cNot", "");
+			/* opcode = cNot; */ // redundant, matches cNot @ 0
+			goto Ldf;
+		case cImmed:
+			x = ImmedPtr[0];
+			FP_TRACE_BYTECODE_OPTIMIZATION(85,
+				"x cNot",
+				"[!truthValue(x)]",
+				"    with x = " << x << "\n");
+			/* ByteCodePtr[0] = cImmed; */ // redundant, matches x @ 1
+			goto Ldp;
+		default: Default6:;
+			A = ByteCodePtr[0];
+			if(IsNeverNegativeValueOpcode(A))
+			{
+				FP_TRACE_BYTECODE_OPTIMIZATION(242,
+					"A[IsNeverNegativeValueOpcode(A)] cNot",
+					"A cAbsNot",
+					"    with A = " << FP_TRACE_OPCODENAME(A) << "\n");
+				/* ByteCodePtr[0] = A; */ // redundant, matches A @ 1
+				goto Lea;
+			}
+		}
+		goto Default0;
+	TailCall_cOr:
+	case cOr:
+		if(ByteCodePtr[0] == cImmed)
+		{
+			x = ImmedPtr[0];
+			if(ByteCodePtr[-1] == cImmed)
+			{
+				y = ImmedPtr[-1];
+				FP_TRACE_BYTECODE_OPTIMIZATION(132,
+					"y x cOr",
+					"[truthValue(x)||truthValue(y)]",
+					"    with x = " << x
+					    << ", y = " << y
+					    << "\n");
+				/* ByteCodePtr[-1] = cImmed; */ // redundant, matches y @ 2
+				goto Leb;
+			}
+		}
+		goto Default0;
+	TailCall_cSqr:
+	case cSqr:
+		switch(ByteCodePtr[0])
+		{
+		case cAbs:
+			FP_TRACE_BYTECODE_OPTIMIZATION(333,"cAbs cSqr", "cSqr", "");
+			/* opcode = cSqr; */ // redundant, matches cSqr @ 0
+			goto Lec;
+		case cNeg:
+			FP_TRACE_BYTECODE_OPTIMIZATION(332,"cNeg cSqr", "cSqr", "");
+			/* opcode = cSqr; */ // redundant, matches cSqr @ 0
+			goto Lec;
+		}
+		goto Default0;
+	TailCall_cSub:
+	case cSub:
+		switch(ByteCodePtr[0])
+		{
+		case cNeg:
+			FP_TRACE_BYTECODE_OPTIMIZATION(197,"cNeg cSub", "cAdd", "");
+			goto Led;
+		case cImmed:
+			x = ImmedPtr[0];
+			if(x==Value_t(0))
+			{
+				FP_TRACE_BYTECODE_OPTIMIZATION(77,
+					"x[x==Value_t(0)] cSub",
+					"",
+					"    with x = " << x << "\n");
+				goto Lag;
+			}
+			if(ByteCodePtr[-1] == cImmed)
+			{
+				y = ImmedPtr[-1];
+				FP_TRACE_BYTECODE_OPTIMIZATION(78,
+					"y x cSub",
+					"[y-x]",
+					"    with x = " << x
+					    << ", y = " << y
+					    << "\n");
+				/* ByteCodePtr[-1] = cImmed; */ // redundant, matches y @ 2
+				goto Lee;
+			}
+			FP_TRACE_BYTECODE_OPTIMIZATION(160,
+				"x cSub",
+				"[-x] cAdd",
+				"    with x = " << x << "\n");
+			/* ByteCodePtr[0] = cImmed; */ // redundant, matches x @ 1
+			goto Lef;
+		}
+		goto Default0;
+	default: Default0:;
+		A = opcode;
+		if(IsComparisonOpcode(A))
+		{
+			if(ByteCodePtr[0] == cImmed)
+			{
+				x = ImmedPtr[0];
+				switch(ByteCodePtr[-1])
+				{
+				case cAdd:
+					if(ByteCodePtr[-2] == cImmed)
+					{
+						y = ImmedPtr[-1];
+						FP_TRACE_BYTECODE_OPTIMIZATION(213,
+							"y cAdd x A[IsComparisonOpcode(A)]",
+							"[x-y] A",
+							"    with A = " << FP_TRACE_OPCODENAME(A)
+							    << ", x = " << x
+							    << ", y = " << y
+							    << "\n");
+						/* ByteCodePtr[-2] = cImmed; */ // redundant, matches y @ 3
+						goto Leg;
+					}
+					break;
+				case cNeg:
+					FP_TRACE_BYTECODE_OPTIMIZATION(214,
+						"cNeg x A[IsComparisonOpcode(A)]",
+						"[-x] {OppositeComparisonOpcode(A)}",
+						"    with A = " << FP_TRACE_OPCODENAME(A)
+						    << ", x = " << x
+						    << "\n");
+					goto Leh;
+				}
+			}
+		}
+		if(A>=VarBegin)
+		{
+			B = ByteCodePtr[0];
+			if(B==A)
+			{
+				FP_TRACE_BYTECODE_OPTIMIZATION(335,
+					"B[B==A] A[A>=VarBegin]",
+					"B cDup",
+					"    with A = " << FP_TRACE_OPCODENAME(A)
+					    << ", B = " << FP_TRACE_OPCODENAME(B)
+					    << "\n");
+				/* ByteCodePtr[0] = B; */ // redundant, matches B @ 1
+				goto Lei;
+			}
+		}
+		if(IsUnaryOpcode(A))
+		{
+			B = ByteCodePtr[0];
+			if(B>=VarBegin)
+			{
+				C = ByteCodePtr[-1];
+				if(C==A)
+				{
+					D = ByteCodePtr[-2];
+					if(D==B)
+					{
+						FP_TRACE_BYTECODE_OPTIMIZATION(336,
+							"D[D==B] C[C==A] B[B>=VarBegin] A[IsUnaryOpcode(A)]",
+							"D C cDup",
+							"    with A = " << FP_TRACE_OPCODENAME(A)
+							    << ", B = " << FP_TRACE_OPCODENAME(B)
+							    << ", C = " << FP_TRACE_OPCODENAME(C)
+							    << ", D = " << FP_TRACE_OPCODENAME(D)
+							    << "\n");
+						/* ByteCodePtr[-2] = D; */ // redundant, matches D @ 3
+						/* ByteCodePtr[-1] = C; */ // redundant, matches C @ 2
+						goto Lej;
+					}
+				}
+			}
+		}
+	}
+	goto Lek;
+Laa: ByteCodePtr -= 1;
+     data->ByteCode.pop_back();
+     goto TailCall_cAbs;
+Lab: ImmedPtr[0] = fp_abs(x); return;
+Lac: data->Immed.push_back(Value_t(4));
+     ByteCodePtr[-2] = cImmed;
+     ByteCodePtr -= 2;
+     data->ByteCode.pop_back();
+     data->ByteCode.pop_back();
+     opcode = cMul;
+Lel: FP_ReDefinePointers();
+Lem: goto TailCall_cMul;
+Lad: ByteCodePtr -= 1;
+     data->ByteCode.pop_back();
+     opcode = cSub;
+     goto TailCall_cSub;
+Lae: ImmedPtr[-1] = y+x;
+     data->Immed.pop_back();
+     data->ByteCode.pop_back();
+     data->ByteCode.pop_back();
+Len: FP_ReDefinePointers();
+Leo: goto TailCall_cAdd;
+Laf: ImmedPtr[-1] = y+x;
+Lag: data->Immed.pop_back();
+Lbc: data->ByteCode.pop_back(); return;
+Lah: ImmedPtr[-1] = truthValue(x)&&truthValue(y); goto Lag;
+Lai: data->Immed.push_back(Value_t(0));
+     ByteCodePtr[0] = cImmed;
+     AddFunctionOpcode(cMul);
+     data->Immed.push_back(Value_t(1));
+     data->ByteCode.push_back(cImmed);
+     opcode = cAdd; goto Len;
+Laj: ImmedPtr[0] = -x;
+     ByteCodePtr[-1] = cImmed;
+     ByteCodePtr -= 1;
+     data->ByteCode.pop_back();
+Lep: goto TailCall_cDiv;
+Lak: ImmedPtr[-1] = y/x; goto Lag;
+Lal: ImmedPtr[-1] = fp_equal(y,x); goto Lag;
+Lam: ByteCodePtr[-1] = cImmed;
+     ByteCodePtr -= 1;
+     data->ByteCode.pop_back();
+Lfa: goto TailCall_cEqual;
+Lan: data->Immed.pop_back();
+Lfb: data->ByteCode.pop_back();
+     opcode = cNot;
+     FP_ReDefinePointers();
+Lfc: goto TailCall_cNot;
+Lao: data->Immed.pop_back();
+     data->ByteCode.pop_back();
+Ldo: data->ByteCode.pop_back();
+     AddFunctionOpcode(cNotNot); return;
+Lap: data->Immed.pop_back(); goto Ldo;
+Lba: ImmedPtr[-1] = fp_less(x,y); goto Lag;
+Lbb: ImmedPtr[-1] = fp_lessOrEq(x,y); goto Lag;
+Lbd: data->ByteCode.pop_back();
+     AddFunctionOpcode(cRSqrt); return;
+Lbe: ImmedPtr[0] = Value_t(1)/x; return;
+Lbf: data->Immed.pop_back();
+     data->ByteCode.pop_back(); goto Lfb;
+Lbg: ImmedPtr[-1] = fp_less(y,x); goto Lag;
+Lbh: ImmedPtr[-1] = fp_lessOrEq(y,x); goto Lag;
+Lbi: ImmedPtr[-1] = Max(x,y); goto Lag;
+Lbj: ImmedPtr[-1] = Min(x,y); goto Lag;
+Lbk: ImmedPtr[-1] = fp_mod(y,x); goto Lag;
+Lbl: ByteCodePtr -= 1;
+     data->ByteCode.pop_back();
+     opcode = cSqr;
+Lfd: goto TailCall_cSqr;
+Lbm: ByteCodePtr -= 1;
+     data->ByteCode.pop_back();
+     opcode = cDiv; goto Lep;
+Lbn: data->ByteCode.pop_back();
+     data->ByteCode.pop_back();
+     data->ByteCode.pop_back();
+     AddFunctionOpcode(cSqr);
+     AddFunctionOpcode(cMul);
+Lfe: opcode = cNeg;
+     FP_ReDefinePointers();
+     goto TailCall_cNeg;
+Lbo: data->ByteCode.pop_back();
+     data->ByteCode.pop_back();
+     AddFunctionOpcode(cSqr); goto Lfe;
+Lbp: ByteCodePtr[-2] = cImmed;
+     ByteCodePtr -= 2;
+     data->ByteCode.pop_back();
+Lff: data->ByteCode.pop_back(); goto Lem;
+Lca: ImmedPtr[-1] = x;
+Lfg: data->Immed.pop_back();
+     data->ByteCode.pop_back();
+     data->ByteCode.pop_back(); goto Lel;
+Lcb: data->Immed.pop_back();
+Lcc: data->Immed.pop_back();
+     data->ByteCode.pop_back();
+Lfh: data->ByteCode.pop_back();
+     data->ByteCode.pop_back();
+     data->ByteCode.pop_back();
+Lfi: AddFunctionOpcode(A);
+     data->Immed.push_back(x);
+     data->ByteCode.push_back(cImmed); goto Lel;
+Lcd: data->Immed.pop_back();
+     data->ByteCode.pop_back();
+     data->ByteCode.pop_back();
+     data->ByteCode.pop_back();
+     data->ByteCode.pop_back();
+     AddFunctionOpcode(B); goto Lfi;
+Lce: data->Immed.pop_back(); goto Lfh;
+Lcf: ByteCodePtr[-1] = cImmed; goto Lbc;
+Lcg: ByteCodePtr[-1] = cImmed;
+     ByteCodePtr -= 1; goto Lff;
+Lch: data->Immed.pop_back();
+     data->ByteCode.pop_back();
+     data->ByteCode.pop_back(); goto Lbc;
+Lci: ImmedPtr[0] = x+x; goto Lbp;
+Lcj: data->Immed.pop_back(); goto Lch;
+Lck: ImmedPtr[-1] = y*x; goto Lfg;
+Lcl: ImmedPtr[0] = -x; goto Lcg;
+Lcm: ImmedPtr[-1] = y*x; goto Lag;
+Lcn: ByteCodePtr[0] = cDup;
+     ImmedPtr -= 1;
+     data->Immed.pop_back();
+Lfj: opcode = cAdd; goto Leo;
+Lco: data->Immed.pop_back();
+     data->ByteCode.pop_back(); goto Lfe;
+Lcp: data->ByteCode.pop_back();
+     data->ByteCode.pop_back();
+     AddFunctionOpcode(cSqr); goto Lel;
+Lda: data->ByteCode.pop_back(); goto Lcp;
+Ldb: ImmedPtr[-1] = fp_nequal(y,x); goto Lag;
+Ldc: ByteCodePtr[-1] = cImmed;
+     ByteCodePtr -= 1;
+     data->ByteCode.pop_back();
+Lfk: goto TailCall_cNEqual;
+Ldd: ImmedPtr[0] = -x;
+     ByteCodePtr -= 1;
+     data->ByteCode.pop_back();
+     opcode = cMul; goto Lem;
+Lde: ImmedPtr[0] = -x; return;
+Ldf: ByteCodePtr -= 1;
+     data->ByteCode.pop_back(); goto Lfc;
+Ldg: data->ByteCode.pop_back();
+     AddFunctionOpcode(cAbsNotNot); return;
+Ldh: data->ByteCode.pop_back();
+Lea: AddFunctionOpcode(cAbsNot); return;
+Ldi: ByteCodePtr -= 1;
+     data->ByteCode.pop_back();
+     opcode = cNEqual; goto Lfk;
+Ldj: ByteCodePtr -= 1;
+     data->ByteCode.pop_back();
+     opcode = cLessOrEq;
+     goto TailCall_cLessOrEq;
+Ldk: ByteCodePtr -= 1;
+     data->ByteCode.pop_back();
+     opcode = cLess;
+     goto TailCall_cLess;
+Ldl: ByteCodePtr -= 1;
+     data->ByteCode.pop_back();
+     opcode = cGreaterOrEq;
+     goto TailCall_cGreaterOrEq;
+Ldm: ByteCodePtr -= 1;
+     data->ByteCode.pop_back();
+     opcode = cGreater;
+     goto TailCall_cGreater;
+Ldn: ByteCodePtr -= 1;
+     data->ByteCode.pop_back();
+     opcode = cEqual; goto Lfa;
+Ldp: ImmedPtr[0] = !truthValue(x); return;
+Leb: ImmedPtr[-1] = truthValue(x)||truthValue(y); goto Lag;
+Lec: ByteCodePtr -= 1;
+     data->ByteCode.pop_back(); goto Lfd;
+Led: ByteCodePtr -= 1;
+     data->ByteCode.pop_back(); goto Lfj;
+Lee: ImmedPtr[-1] = y-x; goto Lag;
+Lef: ImmedPtr[0] = -x; goto Lfj;
+Leg: ImmedPtr[-1] = x-y;
+     data->Immed.pop_back();
+     data->ByteCode.pop_back();
+     data->ByteCode.pop_back();
+     AddFunctionOpcode(A); return;
+Leh: ImmedPtr[0] = -x;
+     ByteCodePtr[-1] = cImmed;
+     data->ByteCode.pop_back();
+     AddFunctionOpcode(OppositeComparisonOpcode(A)); return;
+Lei: data->ByteCode.push_back(cDup); return;
+Lej: ByteCodePtr[0] = cDup; return;
+Lek: data->ByteCode.push_back(opcode); return;
+return;
+// This list of dummy gotos is here to inhibit
+// compiler warnings on unused labels
+goto TailCall_cAnd;goto TailCall_cInv;goto TailCall_cMax;
+goto TailCall_cMin;goto TailCall_cMod;goto TailCall_cNeg;
+goto TailCall_cOr;goto TailCall_cSub;
+#endif
+
+#if(FP_FLOAT_VERSION)
+	Value_t x;
+	unsigned A;
+	Value_t y;
+	unsigned B;
+	unsigned C;
+	unsigned D;
+	switch(opcode)
+	{
+	TailCall_cAbs:
+	case cAbs:
+		switch(ByteCodePtr[0])
+		{
+		case cNeg:
+			FP_TRACE_BYTECODE_OPTIMIZATION(189,"cNeg cAbs", "cAbs", "");
+			/* opcode = cAbs; */ // redundant, matches cAbs @ 0
+			goto Laa;
+		case cImmed:
+			x = ImmedPtr[0];
+			FP_TRACE_BYTECODE_OPTIMIZATION(40,
+				"x cAbs",
+				"[fp_abs(x)]",
+				"    with x = " << x << "\n");
+			/* ByteCodePtr[0] = cImmed; */ // redundant, matches x @ 1
+			goto Lab;
+		default:
+			A = ByteCodePtr[0];
+			if(IsNeverNegativeValueOpcode(A))
+			{
+				FP_TRACE_BYTECODE_OPTIMIZATION(244,
+					"A[IsNeverNegativeValueOpcode(A)] cAbs",
+					"A",
+					"    with A = " << FP_TRACE_OPCODENAME(A) << "\n");
+				/* ByteCodePtr[0] = A; */ // redundant, matches A @ 1
+				return;
+			}
+		}
+		goto Default0;
+	TailCall_cAcos:
+	case cAcos:
+		if(ByteCodePtr[0] == cImmed)
+		{
+			x = ImmedPtr[0];
+			if(x>=Value_t(-1)&&x<=Value_t(1))
+			{
+				FP_TRACE_BYTECODE_OPTIMIZATION(44,
+					"x[x>=Value_t(-1)&&x<=Value_t(1)] cAcos",
+					"[fp_acos(x)]",
+					"    with x = " << x << "\n");
+				/* ByteCodePtr[0] = cImmed; */ // redundant, matches x @ 1
+				goto Lac;
+			}
+		}
+		goto Default0;
+	TailCall_cAcosh:
+	case cAcosh:
+		if(ByteCodePtr[0] == cImmed)
+		{
+			x = ImmedPtr[0];
+			if(x>=Value_t(1))
+			{
+				FP_TRACE_BYTECODE_OPTIMIZATION(41,
+					"x[x>=Value_t(1)] cAcosh",
+					"[fp_acosh(x)]",
+					"    with x = " << x << "\n");
+				/* ByteCodePtr[0] = cImmed; */ // redundant, matches x @ 1
+				goto Lad;
+			}
+		}
+		goto Default0;
+	TailCall_cAdd:
+	case cAdd:
+		switch(ByteCodePtr[0])
+		{
+		case cDup:
+			if(ByteCodePtr[-1] == cAdd)
+			{
+				if(ByteCodePtr[-2] == cDup)
+				{
+					FP_TRACE_BYTECODE_OPTIMIZATION(108,"cDup cAdd cDup cAdd", "[Value_t(4)] cMul", "");
+					goto Lae;
+				}
+			}
+			break;
+		case cNeg:
+			FP_TRACE_BYTECODE_OPTIMIZATION(196,"cNeg cAdd", "cSub", "");
+			goto Laf;
+		case cImmed:
+			x = ImmedPtr[0];
+			switch(ByteCodePtr[-1])
+			{
+			case cAdd:
+				if(ByteCodePtr[-2] == cImmed)
+				{
+					y = ImmedPtr[-1];
+					FP_TRACE_BYTECODE_OPTIMIZATION(142,
+						"y cAdd x cAdd",
+						"[y+x] cAdd",
+						"    with x = " << x
+						    << ", y = " << y
+						    << "\n");
+					/* ByteCodePtr[-2] = cImmed; */ // redundant, matches y @ 3
+					/* opcode = cAdd; */ // redundant, matches cAdd @ 0
+					goto Lag;
+				}
+				break;
+			case cImmed:
+				y = ImmedPtr[-1];
+				FP_TRACE_BYTECODE_OPTIMIZATION(76,
+					"y x cAdd",
+					"[y+x]",
+					"    with x = " << x
+					    << ", y = " << y
+					    << "\n");
+				/* ByteCodePtr[-1] = cImmed; */ // redundant, matches y @ 2
+				goto Lah;
+			}
+			if(x==Value_t(0))
+			{
+				FP_TRACE_BYTECODE_OPTIMIZATION(75,
+					"x[x==Value_t(0)] cAdd",
+					"",
+					"    with x = " << x << "\n");
+				goto Lai;
+			}
+			break;
+		}
+		goto Default0;
+	TailCall_cAnd:
+	case cAnd:
+		if(ByteCodePtr[0] == cImmed)
+		{
+			x = ImmedPtr[0];
+			if(ByteCodePtr[-1] == cImmed)
+			{
+				y = ImmedPtr[-1];
+				FP_TRACE_BYTECODE_OPTIMIZATION(131,
+					"y x cAnd",
+					"[truthValue(x)&&truthValue(y)]",
+					"    with x = " << x
+					    << ", y = " << y
+					    << "\n");
+				/* ByteCodePtr[-1] = cImmed; */ // redundant, matches y @ 2
+				goto Laj;
+			}
+		}
+		goto Default0;
+	TailCall_cAsin:
+	case cAsin:
+		if(ByteCodePtr[0] == cImmed)
+		{
+			x = ImmedPtr[0];
+			if(x>=Value_t(-1)&&x<=Value_t(1))
+			{
+				FP_TRACE_BYTECODE_OPTIMIZATION(45,
+					"x[x>=Value_t(-1)&&x<=Value_t(1)] cAsin",
+					"[fp_asin(x)]",
+					"    with x = " << x << "\n");
+				/* ByteCodePtr[0] = cImmed; */ // redundant, matches x @ 1
+				goto Lak;
+			}
+		}
+		goto Default0;
+	TailCall_cAsinh:
+	case cAsinh:
+		if(ByteCodePtr[0] == cImmed)
+		{
+			x = ImmedPtr[0];
+			FP_TRACE_BYTECODE_OPTIMIZATION(42,
+				"x cAsinh",
+				"[fp_asinh(x)]",
+				"    with x = " << x << "\n");
+			/* ByteCodePtr[0] = cImmed; */ // redundant, matches x @ 1
+			goto Lal;
+		}
+		goto Default0;
+	TailCall_cAtan:
+	case cAtan:
+		if(ByteCodePtr[0] == cImmed)
+		{
+			x = ImmedPtr[0];
+			FP_TRACE_BYTECODE_OPTIMIZATION(46,
+				"x cAtan",
+				"[fp_atan(x)]",
+				"    with x = " << x << "\n");
+			/* ByteCodePtr[0] = cImmed; */ // redundant, matches x @ 1
+			goto Lam;
+		}
+		goto Default0;
+	TailCall_cAtan2:
+	case cAtan2:
+		if(ByteCodePtr[0] == cImmed)
+		{
+			x = ImmedPtr[0];
+			if(ByteCodePtr[-1] == cImmed)
+			{
+				y = ImmedPtr[-1];
+				FP_TRACE_BYTECODE_OPTIMIZATION(83,
+					"y x cAtan2",
+					"[fp_atan2(y,x)]",
+					"    with x = " << x
+					    << ", y = " << y
+					    << "\n");
+				/* ByteCodePtr[-1] = cImmed; */ // redundant, matches y @ 2
+				goto Lan;
+			}
+		}
+		goto Default0;
+	TailCall_cAtanh:
+	case cAtanh:
+		if(ByteCodePtr[0] == cImmed)
+		{
+			x = ImmedPtr[0];
+			if(x>Value_t(-1)&&x<Value_t(1))
+			{
+				FP_TRACE_BYTECODE_OPTIMIZATION(43,
+					"x[x>Value_t(-1)&&x<Value_t(1)] cAtanh",
+					"[fp_atanh(x)]",
+					"    with x = " << x << "\n");
+				/* ByteCodePtr[0] = cImmed; */ // redundant, matches x @ 1
+				goto Lao;
+			}
+		}
+		goto Default0;
+	TailCall_cCbrt:
+	case cCbrt:
+		if(ByteCodePtr[0] == cImmed)
+		{
+			x = ImmedPtr[0];
+			FP_TRACE_BYTECODE_OPTIMIZATION(47,
+				"x cCbrt",
+				"[fp_cbrt(x)]",
+				"    with x = " << x << "\n");
+			/* ByteCodePtr[0] = cImmed; */ // redundant, matches x @ 1
+			goto Lap;
+		}
+		goto Default0;
+	TailCall_cCeil:
+	case cCeil:
+		switch(ByteCodePtr[0])
+		{
+		case cNeg:
+			FP_TRACE_BYTECODE_OPTIMIZATION(253,"cNeg cCeil", "cFloor cNeg", "");
+			goto Lba;
+		case cImmed:
+			x = ImmedPtr[0];
+			FP_TRACE_BYTECODE_OPTIMIZATION(48,
+				"x cCeil",
+				"[fp_ceil(x)]",
+				"    with x = " << x << "\n");
+			/* ByteCodePtr[0] = cImmed; */ // redundant, matches x @ 1
+			goto Lbb;
+		default:
+			A = ByteCodePtr[0];
+			if(IsAlwaysIntegerOpcode(A))
+			{
+				FP_TRACE_BYTECODE_OPTIMIZATION(247,
+					"A[IsAlwaysIntegerOpcode(A)] cCeil",
+					"A",
+					"    with A = " << FP_TRACE_OPCODENAME(A) << "\n");
+				/* ByteCodePtr[0] = A; */ // redundant, matches A @ 1
+				return;
+			}
+		}
+		goto Default0;
+	TailCall_cCos:
+	case cCos:
+		switch(ByteCodePtr[0])
+		{
+		case cAbs:
+			FP_TRACE_BYTECODE_OPTIMIZATION(281,"cAbs cCos", "cCos", "");
+			/* opcode = cCos; */ // redundant, matches cCos @ 0
+			goto Lbc;
+		case cNeg:
+			FP_TRACE_BYTECODE_OPTIMIZATION(283,"cNeg cCos", "cCos", "");
+			/* opcode = cCos; */ // redundant, matches cCos @ 0
+			goto Lbc;
+		case cImmed:
+			x = ImmedPtr[0];
+			FP_TRACE_BYTECODE_OPTIMIZATION(49,
+				"x cCos",
+				"[fp_cos(x)]",
+				"    with x = " << x << "\n");
+			/* ByteCodePtr[0] = cImmed; */ // redundant, matches x @ 1
+			goto Lbd;
+		}
+		goto Default0;
+	TailCall_cCosh:
+	case cCosh:
+		switch(ByteCodePtr[0])
+		{
+		case cAbs:
+			FP_TRACE_BYTECODE_OPTIMIZATION(282,"cAbs cCosh", "cCosh", "");
+			/* opcode = cCosh; */ // redundant, matches cCosh @ 0
+			goto Lbe;
+		case cAcosh:
+			FP_TRACE_BYTECODE_OPTIMIZATION(185,"cAcosh cCosh", "", "");
+			goto Lbf;
+		case cAsinh:
+			FP_TRACE_BYTECODE_OPTIMIZATION(295,"cAsinh cCosh", "[DO_STACKPLUS1] cSqr [Value_t(1)] cAdd cSqrt", "");
+			incStackPtr();
+			--StackPtr;
+			goto Lbg;
+		case cNeg:
+			FP_TRACE_BYTECODE_OPTIMIZATION(284,"cNeg cCosh", "cCosh", "");
+			/* opcode = cCosh; */ // redundant, matches cCosh @ 0
+			goto Lbe;
+		case cImmed:
+			x = ImmedPtr[0];
+			FP_TRACE_BYTECODE_OPTIMIZATION(50,
+				"x cCosh",
+				"[fp_cosh(x)]",
+				"    with x = " << x << "\n");
+			/* ByteCodePtr[0] = cImmed; */ // redundant, matches x @ 1
+			goto Lbh;
+		}
+		goto Default0;
+	TailCall_cDeg:
+	case cDeg:
+		if(ByteCodePtr[0] == cImmed)
+		{
+			x = ImmedPtr[0];
+			FP_TRACE_BYTECODE_OPTIMIZATION(65,
+				"x cDeg",
+				"[RadiansToDegrees(x)]",
+				"    with x = " << x << "\n");
+			/* ByteCodePtr[0] = cImmed; */ // redundant, matches x @ 1
+			goto Lbi;
+		}
+		goto Default0;
+	TailCall_cDiv:
+	case cDiv:
+		switch(ByteCodePtr[0])
+		{
+		case cCos:
+			FP_TRACE_BYTECODE_OPTIMIZATION(298,"cCos cDiv", "cSec cMul", "");
+			goto Lbj;
+		case cCot:
+			FP_TRACE_BYTECODE_OPTIMIZATION(302,"cCot cDiv", "cTan cMul", "");
+			goto Lbk;
+		case cCsc:
+			FP_TRACE_BYTECODE_OPTIMIZATION(300,"cCsc cDiv", "cSin cMul", "");
+			goto Lbl;
+		case cDup:
+			FP_TRACE_BYTECODE_OPTIMIZATION(121,"cDup cDiv", "[Value_t(0)] cMul [Value_t(1)] cAdd", "");
+			goto Lbm;
+		case cExp:
+			FP_TRACE_BYTECODE_OPTIMIZATION(259,"cExp cDiv", "cNeg cExp cMul", "");
+			goto Lbn;
+		case cExp2:
+			FP_TRACE_BYTECODE_OPTIMIZATION(260,"cExp2 cDiv", "cNeg cExp2 cMul", "");
+			goto Lbo;
+		case cInv:
+			FP_TRACE_BYTECODE_OPTIMIZATION(194,"cInv cDiv", "cMul", "");
+			goto Lbp;
+		case cPow:
+			FP_TRACE_BYTECODE_OPTIMIZATION(258,"cPow cDiv", "cNeg cPow cMul", "");
+			goto Lca;
+		case cSec:
+			FP_TRACE_BYTECODE_OPTIMIZATION(301,"cSec cDiv", "cCos cMul", "");
+			goto Lcb;
+		case cSin:
+			FP_TRACE_BYTECODE_OPTIMIZATION(297,"cSin cDiv", "cCsc cMul", "");
+			goto Lcc;
+		case cTan:
+			FP_TRACE_BYTECODE_OPTIMIZATION(299,"cTan cDiv", "cCot cMul", "");
+			goto Lcd;
+		case cImmed:
+			x = ImmedPtr[0];
+			if(x==Value_t(1))
+			{
+				FP_TRACE_BYTECODE_OPTIMIZATION(72,
+					"x[x==Value_t(1)] cDiv",
+					"",
+					"    with x = " << x << "\n");
+				goto Lai;
+			}
+			if(x!=Value_t(0))
+			{
+				switch(ByteCodePtr[-1])
+				{
+				case cMul:
+					if(ByteCodePtr[-2] == cImmed)
+					{
+						y = ImmedPtr[-1];
+						if((y/x)==GetRadiansToDegreesFactor<Value_t>())
+						{
+							FP_TRACE_BYTECODE_OPTIMIZATION(151,
+								"y[(y/x)==GetRadiansToDegreesFactor<Value_t>()] cMul x[x!=Value_t(0)] cDiv",
+								"cDeg",
+								"    with x = " << x
+								    << ", y = " << y
+								    << "\n");
+							goto Lce;
+						}
+						if((y/x)==GetDegreesToRadiansFactor<Value_t>())
+						{
+							FP_TRACE_BYTECODE_OPTIMIZATION(152,
+								"y[(y/x)==GetDegreesToRadiansFactor<Value_t>()] cMul x[x!=Value_t(0)] cDiv",
+								"cRad",
+								"    with x = " << x
+								    << ", y = " << y
+								    << "\n");
+							goto Lcf;
+						}
+						FP_TRACE_BYTECODE_OPTIMIZATION(153,
+							"y cMul x[x!=Value_t(0)] cDiv",
+							"[y/x] cMul",
+							"    with x = " << x
+							    << ", y = " << y
+							    << "\n");
+						/* ByteCodePtr[-2] = cImmed; */ // redundant, matches y @ 3
+						goto Lcg;
+					}
+					break;
+				case cNeg:
+					FP_TRACE_BYTECODE_OPTIMIZATION(139,
+						"cNeg x[x!=Value_t(0)] cDiv",
+						"[-x] cDiv",
+						"    with x = " << x << "\n");
+					/* opcode = cDiv; */ // redundant, matches cDiv @ 0
+					goto Lch;
+				case cImmed:
+					y = ImmedPtr[-1];
+					FP_TRACE_BYTECODE_OPTIMIZATION(73,
+						"y x[x!=Value_t(0)] cDiv",
+						"[y/x]",
+						"    with x = " << x
+						    << ", y = " << y
+						    << "\n");
+					/* ByteCodePtr[-1] = cImmed; */ // redundant, matches y @ 2
+					goto Lci;
+				}
+				FP_TRACE_BYTECODE_OPTIMIZATION(155,
+					"x[x!=Value_t(0)] cDiv",
+					"[Value_t(1)/x] cMul",
+					"    with x = " << x << "\n");
+				/* ByteCodePtr[0] = cImmed; */ // redundant, matches x @ 1
+				goto Lcj;
+			}
+			break;
+		}
+		goto Default0;
+	TailCall_cEqual:
+	case cEqual:
+		if(ByteCodePtr[0] == cImmed)
+		{
+			x = ImmedPtr[0];
+			if(x==Value_t(0))
+			{
+				switch(ByteCodePtr[-1])
+				{
+				case cAbs:
+					FP_TRACE_BYTECODE_OPTIMIZATION(208,
+						"cAbs x[x==Value_t(0)] cEqual",
+						"[x] cEqual",
+						"    with x = " << x << "\n");
+					/* ImmedPtr[0] = x; */ // redundant, matches x @ 1
+					/* opcode = cEqual; */ // redundant, matches cEqual @ 0
+					goto Lck;
+				case cSqr:
+					FP_TRACE_BYTECODE_OPTIMIZATION(210,
+						"cSqr x[x==Value_t(0)] cEqual",
+						"[x] cEqual",
+						"    with x = " << x << "\n");
+					/* ImmedPtr[0] = x; */ // redundant, matches x @ 1
+					/* opcode = cEqual; */ // redundant, matches cEqual @ 0
+					goto Lck;
+				}
+			}
+			if(ByteCodePtr[-1] == cImmed)
+			{
+				y = ImmedPtr[-1];
+				FP_TRACE_BYTECODE_OPTIMIZATION(129,
+					"y x cEqual",
+					"[fp_equal(y,x)]",
+					"    with x = " << x
+					    << ", y = " << y
+					    << "\n");
+				/* ByteCodePtr[-1] = cImmed; */ // redundant, matches y @ 2
+				goto Lcl;
+			}
+		}
+		goto Default0;
+	TailCall_cExp:
+	case cExp:
+		switch(ByteCodePtr[0])
+		{
+		case cAdd:
+			if(ByteCodePtr[-1] == cImmed)
+			{
+				x = ImmedPtr[0];
+				FP_TRACE_BYTECODE_OPTIMIZATION(255,
+					"x cAdd cExp",
+					"cExp [fp_exp(x)] cMul",
+					"    with x = " << x << "\n");
+				goto Lcm;
+			}
+			break;
+		case cLog:
+			A = ByteCodePtr[-1];
+			if(IsNeverNegativeValueOpcode(A))
+			{
+				FP_TRACE_BYTECODE_OPTIMIZATION(175,
+					"A[IsNeverNegativeValueOpcode(A)] cLog cExp",
+					"A",
+					"    with A = " << FP_TRACE_OPCODENAME(A) << "\n");
+				/* ByteCodePtr[-1] = A; */ // redundant, matches A @ 2
+				goto Lbf;
+			}
+			break;
+		case cImmed:
+			x = ImmedPtr[0];
+			FP_TRACE_BYTECODE_OPTIMIZATION(51,
+				"x cExp",
+				"[fp_exp(x)]",
+				"    with x = " << x << "\n");
+			/* ByteCodePtr[0] = cImmed; */ // redundant, matches x @ 1
+			goto Lcn;
+		}
+		goto Default0;
+	TailCall_cExp2:
+	case cExp2:
+		switch(ByteCodePtr[0])
+		{
+		case cAdd:
+			if(ByteCodePtr[-1] == cImmed)
+			{
+				x = ImmedPtr[0];
+				FP_TRACE_BYTECODE_OPTIMIZATION(256,
+					"x cAdd cExp2",
+					"cExp2 [fp_exp2(x)] cMul",
+					"    with x = " << x << "\n");
+				goto Lco;
+			}
+			break;
+		case cLog2:
+			A = ByteCodePtr[-1];
+			if(IsNeverNegativeValueOpcode(A))
+			{
+				FP_TRACE_BYTECODE_OPTIMIZATION(176,
+					"A[IsNeverNegativeValueOpcode(A)] cLog2 cExp2",
+					"A",
+					"    with A = " << FP_TRACE_OPCODENAME(A) << "\n");
+				/* ByteCodePtr[-1] = A; */ // redundant, matches A @ 2
+				goto Lbf;
+			}
+			break;
+		case cImmed:
+			x = ImmedPtr[0];
+			FP_TRACE_BYTECODE_OPTIMIZATION(52,
+				"x cExp2",
+				"[fp_exp2(x)]",
+				"    with x = " << x << "\n");
+			/* ByteCodePtr[0] = cImmed; */ // redundant, matches x @ 1
+			goto Lcp;
+		}
+		FP_TRACE_BYTECODE_OPTIMIZATION(341,"cExp2", "[DO_STACKPLUS1] [fp_log(Value_t(2))] cMul cExp", "");
+		incStackPtr();
+		--StackPtr;
+		goto Lda;
+	TailCall_cFloor:
+	case cFloor:
+		switch(ByteCodePtr[0])
+		{
+		case cNeg:
+			FP_TRACE_BYTECODE_OPTIMIZATION(252,"cNeg cFloor", "cCeil cNeg", "");
+			goto Ldb;
+		case cImmed:
+			x = ImmedPtr[0];
+			FP_TRACE_BYTECODE_OPTIMIZATION(53,
+				"x cFloor",
+				"[fp_floor(x)]",
+				"    with x = " << x << "\n");
+			/* ByteCodePtr[0] = cImmed; */ // redundant, matches x @ 1
+			goto Ldc;
+		default:
+			A = ByteCodePtr[0];
+			if(IsAlwaysIntegerOpcode(A))
+			{
+				FP_TRACE_BYTECODE_OPTIMIZATION(246,
+					"A[IsAlwaysIntegerOpcode(A)] cFloor",
+					"A",
+					"    with A = " << FP_TRACE_OPCODENAME(A) << "\n");
+				/* ByteCodePtr[0] = A; */ // redundant, matches A @ 1
+				return;
+			}
+		}
+		goto Default0;
+	TailCall_cGreater:
+	case cGreater:
+		if(ByteCodePtr[0] == cImmed)
+		{
+			x = ImmedPtr[0];
+			if(ByteCodePtr[-1] == cImmed)
+			{
+				y = ImmedPtr[-1];
+				FP_TRACE_BYTECODE_OPTIMIZATION(127,
+					"y x cGreater",
+					"[fp_less(x,y)]",
+					"    with x = " << x
+					    << ", y = " << y
+					    << "\n");
+				/* ByteCodePtr[-1] = cImmed; */ // redundant, matches y @ 2
+				goto Ldd;
+			}
+		}
+		goto Default0;
+	TailCall_cGreaterOrEq:
+	case cGreaterOrEq:
+		if(ByteCodePtr[0] == cImmed)
+		{
+			x = ImmedPtr[0];
+			if(x!=Value_t(0))
+			{
+				if(ByteCodePtr[-1] == cAbs)
+				{
+					FP_TRACE_BYTECODE_OPTIMIZATION(276,
+						"cAbs x[x!=Value_t(0)] cGreaterOrEq",
+						"[Value_t(0.5)/x] cMul cNotNot",
+						"    with x = " << x << "\n");
+					goto Lde;
+				}
+			}
+			if(ByteCodePtr[-1] == cImmed)
+			{
+				y = ImmedPtr[-1];
+				FP_TRACE_BYTECODE_OPTIMIZATION(128,
+					"y x cGreaterOrEq",
+					"[fp_lessOrEq(x,y)]",
+					"    with x = " << x
+					    << ", y = " << y
+					    << "\n");
+				/* ByteCodePtr[-1] = cImmed; */ // redundant, matches y @ 2
+				goto Ldf;
+			}
+		}
+		goto Default0;
+	TailCall_cInt:
+	case cInt:
+		switch(ByteCodePtr[0])
+		{
+		case cImmed:
+			x = ImmedPtr[0];
+			FP_TRACE_BYTECODE_OPTIMIZATION(54,
+				"x cInt",
+				"[fp_int(x)]",
+				"    with x = " << x << "\n");
+			/* ByteCodePtr[0] = cImmed; */ // redundant, matches x @ 1
+			goto Ldg;
+		default:
+			A = ByteCodePtr[0];
+			if(IsAlwaysIntegerOpcode(A))
+			{
+				FP_TRACE_BYTECODE_OPTIMIZATION(248,
+					"A[IsAlwaysIntegerOpcode(A)] cInt",
+					"A",
+					"    with A = " << FP_TRACE_OPCODENAME(A) << "\n");
+				/* ByteCodePtr[0] = A; */ // redundant, matches A @ 1
+				return;
+			}
+		}
+		goto Default0;
+	TailCall_cInv:
+	case cInv:
+		switch(ByteCodePtr[0])
+		{
+		case cCos:
+			FP_TRACE_BYTECODE_OPTIMIZATION(304,"cCos cInv", "cSec", "");
+			goto Ldh;
+		case cCot:
+			FP_TRACE_BYTECODE_OPTIMIZATION(308,"cCot cInv", "cTan", "");
+			goto Ldi;
+		case cCsc:
+			FP_TRACE_BYTECODE_OPTIMIZATION(306,"cCsc cInv", "cSin", "");
+			goto Ldj;
+		case cInv:
+			FP_TRACE_BYTECODE_OPTIMIZATION(190,"cInv cInv", "", "");
+			goto Lbf;
+		case cPow:
+			FP_TRACE_BYTECODE_OPTIMIZATION(192,"cPow cInv", "cNeg cPow", "");
+			goto Ldk;
+		case cSec:
+			FP_TRACE_BYTECODE_OPTIMIZATION(307,"cSec cInv", "cCos", "");
+			goto Ldl;
+		case cSin:
+			FP_TRACE_BYTECODE_OPTIMIZATION(303,"cSin cInv", "cCsc", "");
+			goto Ldm;
+		case cSqrt:
+			FP_TRACE_BYTECODE_OPTIMIZATION(67,"cSqrt cInv", "cRSqrt", "");
+			goto Ldn;
+		case cTan:
+			FP_TRACE_BYTECODE_OPTIMIZATION(305,"cTan cInv", "cCot", "");
+			goto Ldo;
+		case cImmed:
+			x = ImmedPtr[0];
+			if(x!=Value_t(0))
+			{
+				FP_TRACE_BYTECODE_OPTIMIZATION(69,
+					"x[x!=Value_t(0)] cInv",
+					"[Value_t(1)/x]",
+					"    with x = " << x << "\n");
+				/* ByteCodePtr[0] = cImmed; */ // redundant, matches x @ 1
+				goto Ldp;
+			}
+			break;
+		}
+		goto Default0;
+	TailCall_cLess:
+	case cLess:
+		if(ByteCodePtr[0] == cImmed)
+		{
+			x = ImmedPtr[0];
+			if(x!=Value_t(0))
+			{
+				if(ByteCodePtr[-1] == cAbs)
+				{
+					FP_TRACE_BYTECODE_OPTIMIZATION(275,
+						"cAbs x[x!=Value_t(0)] cLess",
+						"[Value_t(0.5)/x] cMul cNot",
+						"    with x = " << x << "\n");
+					goto Lea;
+				}
+			}
+			if(ByteCodePtr[-1] == cImmed)
+			{
+				y = ImmedPtr[-1];
+				FP_TRACE_BYTECODE_OPTIMIZATION(125,
+					"y x cLess",
+					"[fp_less(y,x)]",
+					"    with x = " << x
+					    << ", y = " << y
+					    << "\n");
+				/* ByteCodePtr[-1] = cImmed; */ // redundant, matches y @ 2
+				goto Leb;
+			}
+		}
+		goto Default0;
+	TailCall_cLessOrEq:
+	case cLessOrEq:
+		if(ByteCodePtr[0] == cImmed)
+		{
+			x = ImmedPtr[0];
+			if(ByteCodePtr[-1] == cImmed)
+			{
+				y = ImmedPtr[-1];
+				FP_TRACE_BYTECODE_OPTIMIZATION(126,
+					"y x cLessOrEq",
+					"[fp_lessOrEq(y,x)]",
+					"    with x = " << x
+					    << ", y = " << y
+					    << "\n");
+				/* ByteCodePtr[-1] = cImmed; */ // redundant, matches y @ 2
+				goto Lec;
+			}
+		}
+		goto Default0;
+	TailCall_cLog:
+	case cLog:
+		switch(ByteCodePtr[0])
+		{
+		case cExp:
+			FP_TRACE_BYTECODE_OPTIMIZATION(178,"cExp cLog", "", "");
+			goto Lbf;
+		case cMul:
+			if(ByteCodePtr[-1] == cImmed)
+			{
+				x = ImmedPtr[0];
+				if(x>Value_t(0))
+				{
+					FP_TRACE_BYTECODE_OPTIMIZATION(353,
+						"x[x>Value_t(0)] cMul cLog",
+						"cLog [fp_log(x)] cAdd",
+						"    with x = " << x << "\n");
+					goto Led;
+				}
+			}
+			break;
+		case cSqr:
+			FP_TRACE_BYTECODE_OPTIMIZATION(103,"cSqr cLog", "cAbs cLog cDup cAdd", "");
+			goto Lee;
+		case cImmed:
+			x = ImmedPtr[0];
+			if(x>Value_t(0))
+			{
+				FP_TRACE_BYTECODE_OPTIMIZATION(55,
+					"x[x>Value_t(0)] cLog",
+					"[fp_log(x)]",
+					"    with x = " << x << "\n");
+				/* ByteCodePtr[0] = cImmed; */ // redundant, matches x @ 1
+				goto Lef;
+			}
+			break;
+		}
+		goto Default0;
+	TailCall_cLog10:
+	case cLog10:
+		switch(ByteCodePtr[0])
+		{
+		case cExp:
+			FP_TRACE_BYTECODE_OPTIMIZATION(343,"cExp cLog10", "[DO_STACKPLUS1] [fp_log10(const_e<Value_t>())] cMul", "");
+			incStackPtr();
+			--StackPtr;
+			goto Leg;
+		case cMul:
+			if(ByteCodePtr[-1] == cImmed)
+			{
+				x = ImmedPtr[0];
+				if(x>Value_t(0))
+				{
+					FP_TRACE_BYTECODE_OPTIMIZATION(354,
+						"x[x>Value_t(0)] cMul cLog10",
+						"cLog10 [fp_log10(x)] cAdd",
+						"    with x = " << x << "\n");
+					goto Leh;
+				}
+			}
+			break;
+		case cSqr:
+			FP_TRACE_BYTECODE_OPTIMIZATION(105,"cSqr cLog10", "cAbs cLog10 cDup cAdd", "");
+			goto Lei;
+		case cImmed:
+			x = ImmedPtr[0];
+			if(x>Value_t(0))
+			{
+				FP_TRACE_BYTECODE_OPTIMIZATION(56,
+					"x[x>Value_t(0)] cLog10",
+					"[fp_log10(x)]",
+					"    with x = " << x << "\n");
+				/* ByteCodePtr[0] = cImmed; */ // redundant, matches x @ 1
+				goto Lej;
+			}
+			break;
+		}
+		goto Default0;
+	TailCall_cLog2:
+	case cLog2:
+		switch(ByteCodePtr[0])
+		{
+		case cExp:
+			FP_TRACE_BYTECODE_OPTIMIZATION(342,"cExp cLog2", "[DO_STACKPLUS1] [fp_log2(const_e<Value_t>())] cMul", "");
+			incStackPtr();
+			--StackPtr;
+			goto Lek;
+		case cExp2:
+			FP_TRACE_BYTECODE_OPTIMIZATION(179,"cExp2 cLog2", "", "");
+			goto Lbf;
+		case cMul:
+			if(ByteCodePtr[-1] == cImmed)
+			{
+				x = ImmedPtr[0];
+				if(x>Value_t(0))
+				{
+					FP_TRACE_BYTECODE_OPTIMIZATION(352,
+						"x[x>Value_t(0)] cMul cLog2",
+						"cLog2 [fp_log2(x)] cAdd",
+						"    with x = " << x << "\n");
+					goto Lel;
+				}
+			}
+			break;
+		case cSqr:
+			FP_TRACE_BYTECODE_OPTIMIZATION(104,"cSqr cLog2", "cAbs cLog2 cDup cAdd", "");
+			goto Lem;
+		case cImmed:
+			x = ImmedPtr[0];
+			if(x>Value_t(0))
+			{
+				FP_TRACE_BYTECODE_OPTIMIZATION(57,
+					"x[x>Value_t(0)] cLog2",
+					"[fp_log2(x)]",
+					"    with x = " << x << "\n");
+				/* ByteCodePtr[0] = cImmed; */ // redundant, matches x @ 1
+				goto Len;
+			}
+			break;
+		}
+		goto Default0;
+	TailCall_cMax:
+	case cMax:
+		switch(ByteCodePtr[0])
+		{
+		case cDup:
+			FP_TRACE_BYTECODE_OPTIMIZATION(111,"cDup cMax", "", "");
+			goto Lbf;
+		case cImmed:
+			x = ImmedPtr[0];
+			if(ByteCodePtr[-1] == cImmed)
+			{
+				y = ImmedPtr[-1];
+				FP_TRACE_BYTECODE_OPTIMIZATION(82,
+					"y x cMax",
+					"[Max(x,y)]",
+					"    with x = " << x
+					    << ", y = " << y
+					    << "\n");
+				/* ByteCodePtr[-1] = cImmed; */ // redundant, matches y @ 2
+				goto Leo;
+			}
+			break;
+		default:
+			A = ByteCodePtr[0];
+			if(A>=VarBegin)
+			{
+				switch(ByteCodePtr[-1])
+				{
+				case cDup:
+					B = ByteCodePtr[-2];
+					if(B==A)
+					{
+						FP_TRACE_BYTECODE_OPTIMIZATION(113,
+							"B[B==A] cDup A[A>=VarBegin] cMax",
+							"B cDup",
+							"    with A = " << FP_TRACE_OPCODENAME(A)
+							    << ", B = " << FP_TRACE_OPCODENAME(B)
+							    << "\n");
+						/* ByteCodePtr[-2] = B; */ // redundant, matches B @ 3
+						/* ByteCodePtr[-1] = cDup; */ // redundant, matches cDup @ 2
+						goto Lbf;
+					}
+					break;
+				case cMax:
+					B = ByteCodePtr[-2];
+					if(B==A)
+					{
+						FP_TRACE_BYTECODE_OPTIMIZATION(115,
+							"B[B==A] cMax A[A>=VarBegin] cMax",
+							"B cMax",
+							"    with A = " << FP_TRACE_OPCODENAME(A)
+							    << ", B = " << FP_TRACE_OPCODENAME(B)
+							    << "\n");
+						/* ByteCodePtr[-2] = B; */ // redundant, matches B @ 3
+						/* ByteCodePtr[-1] = cMax; */ // redundant, matches cMax @ 2
+						goto Lbf;
+					}
+					break;
+				}
+			}
+		}
+		goto Default0;
+	TailCall_cMin:
+	case cMin:
+		switch(ByteCodePtr[0])
+		{
+		case cDup:
+			FP_TRACE_BYTECODE_OPTIMIZATION(110,"cDup cMin", "", "");
+			goto Lbf;
+		case cImmed:
+			x = ImmedPtr[0];
+			if(ByteCodePtr[-1] == cImmed)
+			{
+				y = ImmedPtr[-1];
+				FP_TRACE_BYTECODE_OPTIMIZATION(81,
+					"y x cMin",
+					"[Min(x,y)]",
+					"    with x = " << x
+					    << ", y = " << y
+					    << "\n");
+				/* ByteCodePtr[-1] = cImmed; */ // redundant, matches y @ 2
+				goto Lep;
+			}
+			break;
+		default:
+			A = ByteCodePtr[0];
+			if(A>=VarBegin)
+			{
+				switch(ByteCodePtr[-1])
+				{
+				case cDup:
+					B = ByteCodePtr[-2];
+					if(B==A)
+					{
+						FP_TRACE_BYTECODE_OPTIMIZATION(112,
+							"B[B==A] cDup A[A>=VarBegin] cMin",
+							"B cDup",
+							"    with A = " << FP_TRACE_OPCODENAME(A)
+							    << ", B = " << FP_TRACE_OPCODENAME(B)
+							    << "\n");
+						/* ByteCodePtr[-2] = B; */ // redundant, matches B @ 3
+						/* ByteCodePtr[-1] = cDup; */ // redundant, matches cDup @ 2
+						goto Lbf;
+					}
+					break;
+				case cMin:
+					B = ByteCodePtr[-2];
+					if(B==A)
+					{
+						FP_TRACE_BYTECODE_OPTIMIZATION(114,
+							"B[B==A] cMin A[A>=VarBegin] cMin",
+							"B cMin",
+							"    with A = " << FP_TRACE_OPCODENAME(A)
+							    << ", B = " << FP_TRACE_OPCODENAME(B)
+							    << "\n");
+						/* ByteCodePtr[-2] = B; */ // redundant, matches B @ 3
+						/* ByteCodePtr[-1] = cMin; */ // redundant, matches cMin @ 2
+						goto Lbf;
+					}
+					break;
+				}
+			}
+		}
+		goto Default0;
+	TailCall_cMod:
+	case cMod:
+		if(ByteCodePtr[0] == cImmed)
+		{
+			x = ImmedPtr[0];
+			if(x!=Value_t(0))
+			{
+				if(ByteCodePtr[-1] == cImmed)
+				{
+					y = ImmedPtr[-1];
+					FP_TRACE_BYTECODE_OPTIMIZATION(74,
+						"y x[x!=Value_t(0)] cMod",
+						"[fp_mod(y,x)]",
+						"    with x = " << x
+						    << ", y = " << y
+						    << "\n");
+					/* ByteCodePtr[-1] = cImmed; */ // redundant, matches y @ 2
+					goto Lfa;
+				}
+			}
+		}
+		goto Default0;
+	TailCall_cMul:
+	case cMul:
+		switch(ByteCodePtr[0])
+		{
+		case cDup:
+			FP_TRACE_BYTECODE_OPTIMIZATION(338,"cDup cMul", "cSqr", "");
+			goto Lfb;
+		case cInv:
+			FP_TRACE_BYTECODE_OPTIMIZATION(195,"cInv cMul", "cDiv", "");
+			goto Lfc;
+		case cNeg:
+			A = ByteCodePtr[-1];
+			if(A>=VarBegin)
+			{
+				switch(ByteCodePtr[-2])
+				{
+				case cMul:
+					B = ByteCodePtr[-3];
+					if(B==A)
+					{
+						FP_TRACE_BYTECODE_OPTIMIZATION(330,
+							"B[B==A] cMul A[A>=VarBegin] cNeg cMul",
+							"B cSqr cMul cNeg",
+							"    with A = " << FP_TRACE_OPCODENAME(A)
+							    << ", B = " << FP_TRACE_OPCODENAME(B)
+							    << "\n");
+						/* ByteCodePtr[-3] = B; */ // redundant, matches B @ 4
+						goto Lfd;
+					}
+					goto Default1;
+				default: Default1:;
+					B = ByteCodePtr[-2];
+					if(B==A)
+					{
+						FP_TRACE_BYTECODE_OPTIMIZATION(324,
+							"B[B==A] A[A>=VarBegin] cNeg cMul",
+							"B cSqr cNeg",
+							"    with A = " << FP_TRACE_OPCODENAME(A)
+							    << ", B = " << FP_TRACE_OPCODENAME(B)
+							    << "\n");
+						/* ByteCodePtr[-2] = B; */ // redundant, matches B @ 3
+						goto Lfe;
+					}
+				}
+			}
+			goto Default2;
+		case cImmed:
+			x = ImmedPtr[0];
+			if(x==Value_t(0))
+			{
+				switch(ByteCodePtr[-1])
+				{
+				case cMul:
+					A = ByteCodePtr[-2];
+					if(A>=VarBegin)
+					{
+						FP_TRACE_BYTECODE_OPTIMIZATION(94,
+							"A[A>=VarBegin] cMul x[x==Value_t(0)] cMul",
+							"[x] cMul",
+							"    with x = " << x
+							    << ", A = " << FP_TRACE_OPCODENAME(A)
+							    << "\n");
+						/* ImmedPtr[0] = x; */ // redundant, matches x @ 1
+						/* opcode = cMul; */ // redundant, matches cMul @ 0
+						goto Lff;
+					}
+					goto Default3;
+				default: Default3:;
+					A = ByteCodePtr[-1];
+					if(IsBinaryOpcode(A)&&!HasInvalidRangesOpcode(A))
+					{
+						switch(ByteCodePtr[-2])
+						{
+						case cImmed:
+							y = ImmedPtr[-1];
+							FP_TRACE_BYTECODE_OPTIMIZATION(93,
+								"y A[IsBinaryOpcode(A)&&!HasInvalidRangesOpcode(A)] x[x==Value_t(0)] cMul",
+								"[x] cMul",
+								"    with x = " << x
+								    << ", A = " << FP_TRACE_OPCODENAME(A)
+								    << ", y = " << y
+								    << "\n");
+							/* ByteCodePtr[-2] = cImmed; */ // redundant, matches y @ 3
+							/* opcode = cMul; */ // redundant, matches cMul @ 0
+							goto Lfg;
+						default:
+							B = ByteCodePtr[-2];
+							if(IsBinaryOpcode(B)&&!HasInvalidRangesOpcode(B))
+							{
+								switch(ByteCodePtr[-3])
+								{
+								case cImmed:
+									y = ImmedPtr[-1];
+									FP_TRACE_BYTECODE_OPTIMIZATION(97,
+										"y B[IsBinaryOpcode(B)&&!HasInvalidRangesOpcode(B)] A[IsBinaryOpcode(A)&&!HasInvalidRangesOpcode(A)] x[x==Value_t(0)] cMul",
+										"A [x] cMul",
+										"    with x = " << x
+										    << ", A = " << FP_TRACE_OPCODENAME(A)
+										    << ", B = " << FP_TRACE_OPCODENAME(B)
+										    << ", y = " << y
+										    << "\n");
+									/* opcode = cMul; */ // redundant, matches cMul @ 0
+									goto Lfh;
+								default:
+									C = ByteCodePtr[-3];
+									if(C>=VarBegin)
+									{
+										FP_TRACE_BYTECODE_OPTIMIZATION(95,
+											"C[C>=VarBegin] B[IsBinaryOpcode(B)&&!HasInvalidRangesOpcode(B)] A[IsBinaryOpcode(A)&&!HasInvalidRangesOpcode(A)] x[x==Value_t(0)] cMul",
+											"A [x] cMul",
+											"    with x = " << x
+											    << ", A = " << FP_TRACE_OPCODENAME(A)
+											    << ", B = " << FP_TRACE_OPCODENAME(B)
+											    << ", C = " << FP_TRACE_OPCODENAME(C)
+											    << "\n");
+										/* opcode = cMul; */ // redundant, matches cMul @ 0
+										goto Lfi;
+									}
+									if(IsUnaryOpcode(C)&&!HasInvalidRangesOpcode(C))
+									{
+										FP_TRACE_BYTECODE_OPTIMIZATION(96,
+											"C[IsUnaryOpcode(C)&&!HasInvalidRangesOpcode(C)] B[IsBinaryOpcode(B)&&!HasInvalidRangesOpcode(B)] A[IsBinaryOpcode(A)&&!HasInvalidRangesOpcode(A)] x[x==Value_t(0)] cMul",
+											"B A [x] cMul",
+											"    with x = " << x
+											    << ", A = " << FP_TRACE_OPCODENAME(A)
+											    << ", B = " << FP_TRACE_OPCODENAME(B)
+											    << ", C = " << FP_TRACE_OPCODENAME(C)
+											    << "\n");
+										/* opcode = cMul; */ // redundant, matches cMul @ 0
+										goto Lfj;
+									}
+								}
+							}
+							if(B>=VarBegin)
+							{
+								FP_TRACE_BYTECODE_OPTIMIZATION(91,
+									"B[B>=VarBegin] A[IsBinaryOpcode(A)&&!HasInvalidRangesOpcode(A)] x[x==Value_t(0)] cMul",
+									"[x] cMul",
+									"    with x = " << x
+									    << ", A = " << FP_TRACE_OPCODENAME(A)
+									    << ", B = " << FP_TRACE_OPCODENAME(B)
+									    << "\n");
+								/* ImmedPtr[0] = x; */ // redundant, matches x @ 1
+								/* opcode = cMul; */ // redundant, matches cMul @ 0
+								goto Lff;
+							}
+							if(IsUnaryOpcode(B)&&!HasInvalidRangesOpcode(B))
+							{
+								FP_TRACE_BYTECODE_OPTIMIZATION(92,
+									"B[IsUnaryOpcode(B)&&!HasInvalidRangesOpcode(B)] A[IsBinaryOpcode(A)&&!HasInvalidRangesOpcode(A)] x[x==Value_t(0)] cMul",
+									"A [x] cMul",
+									"    with x = " << x
+									    << ", A = " << FP_TRACE_OPCODENAME(A)
+									    << ", B = " << FP_TRACE_OPCODENAME(B)
+									    << "\n");
+								/* opcode = cMul; */ // redundant, matches cMul @ 0
+								goto Lfk;
+							}
+						}
+					}
+					if(A>=VarBegin)
+					{
+						FP_TRACE_BYTECODE_OPTIMIZATION(89,
+							"A[A>=VarBegin] x[x==Value_t(0)] cMul",
+							"[x]",
+							"    with x = " << x
+							    << ", A = " << FP_TRACE_OPCODENAME(A)
+							    << "\n");
+						/* ImmedPtr[0] = x; */ // redundant, matches x @ 1
+						goto Lfl;
+					}
+					if(IsUnaryOpcode(A)&&!HasInvalidRangesOpcode(A))
+					{
+						FP_TRACE_BYTECODE_OPTIMIZATION(90,
+							"A[IsUnaryOpcode(A)&&!HasInvalidRangesOpcode(A)] x[x==Value_t(0)] cMul",
+							"[x] cMul",
+							"    with x = " << x
+							    << ", A = " << FP_TRACE_OPCODENAME(A)
+							    << "\n");
+						/* ImmedPtr[0] = x; */ // redundant, matches x @ 1
+						/* opcode = cMul; */ // redundant, matches cMul @ 0
+						goto Lfm;
+					}
+				}
+			}
+			switch(ByteCodePtr[-1])
+			{
+			case cAdd:
+				if(ByteCodePtr[-2] == cDup)
+				{
+					if(x+x==Value_t(1))
+					{
+						FP_TRACE_BYTECODE_OPTIMIZATION(148,
+							"cDup[x+x==Value_t(1)] cAdd x cMul",
+							"",
+							"    with x = " << x << "\n");
+						goto Lfn;
+					}
+					FP_TRACE_BYTECODE_OPTIMIZATION(149,
+						"cDup cAdd x cMul",
+						"[x+x] cMul",
+						"    with x = " << x << "\n");
+					/* opcode = cMul; */ // redundant, matches cMul @ 0
+					goto Lfo;
+				}
+				break;
+			case cDeg:
+				FP_TRACE_BYTECODE_OPTIMIZATION(106,
+					"cDeg x cMul",
+					"[RadiansToDegrees(x)] cMul",
+					"    with x = " << x << "\n");
+				/* opcode = cMul; */ // redundant, matches cMul @ 0
+				goto Lfp;
+			case cMul:
+				if(ByteCodePtr[-2] == cImmed)
+				{
+					y = ImmedPtr[-1];
+					if((y*x)==GetRadiansToDegreesFactor<Value_t>())
+					{
+						FP_TRACE_BYTECODE_OPTIMIZATION(144,
+							"y[(y*x)==GetRadiansToDegreesFactor<Value_t>()] cMul x cMul",
+							"cDeg",
+							"    with x = " << x
+							    << ", y = " << y
+							    << "\n");
+						goto Lce;
+					}
+					if((y*x)==GetDegreesToRadiansFactor<Value_t>())
+					{
+						FP_TRACE_BYTECODE_OPTIMIZATION(145,
+							"y[(y*x)==GetDegreesToRadiansFactor<Value_t>()] cMul x cMul",
+							"cRad",
+							"    with x = " << x
+							    << ", y = " << y
+							    << "\n");
+						goto Lcf;
+					}
+					if(y*x==Value_t(1))
+					{
+						FP_TRACE_BYTECODE_OPTIMIZATION(146,
+							"y[y*x==Value_t(1)] cMul x cMul",
+							"",
+							"    with x = " << x
+							    << ", y = " << y
+							    << "\n");
+						goto Lga;
+					}
+					FP_TRACE_BYTECODE_OPTIMIZATION(147,
+						"y cMul x cMul",
+						"[y*x] cMul",
+						"    with x = " << x
+						    << ", y = " << y
+						    << "\n");
+					/* ByteCodePtr[-2] = cImmed; */ // redundant, matches y @ 3
+					/* opcode = cMul; */ // redundant, matches cMul @ 0
+					goto Lgb;
+				}
+				break;
+			case cNeg:
+				FP_TRACE_BYTECODE_OPTIMIZATION(136,
+					"cNeg x cMul",
+					"[-x] cMul",
+					"    with x = " << x << "\n");
+				/* opcode = cMul; */ // redundant, matches cMul @ 0
+				goto Lgc;
+			case cRad:
+				FP_TRACE_BYTECODE_OPTIMIZATION(107,
+					"cRad x cMul",
+					"[DegreesToRadians(x)] cMul",
+					"    with x = " << x << "\n");
+				/* opcode = cMul; */ // redundant, matches cMul @ 0
+				goto Lgd;
+			case cImmed:
+				y = ImmedPtr[-1];
+				FP_TRACE_BYTECODE_OPTIMIZATION(71,
+					"y x cMul",
+					"[y*x]",
+					"    with x = " << x
+					    << ", y = " << y
+					    << "\n");
+				/* ByteCodePtr[-1] = cImmed; */ // redundant, matches y @ 2
+				goto Lge;
+			}
+			if(x==Value_t(1))
+			{
+				FP_TRACE_BYTECODE_OPTIMIZATION(70,
+					"x[x==Value_t(1)] cMul",
+					"",
+					"    with x = " << x << "\n");
+				goto Lai;
+			}
+			if(x==Value_t(2))
+			{
+				FP_TRACE_BYTECODE_OPTIMIZATION(100,
+					"x[x==Value_t(2)] cMul",
+					"cDup cAdd",
+					"    with x = " << x << "\n");
+				goto Lgf;
+			}
+			if(x==GetRadiansToDegreesFactor<Value_t>())
+			{
+				FP_TRACE_BYTECODE_OPTIMIZATION(101,
+					"x[x==GetRadiansToDegreesFactor<Value_t>()] cMul",
+					"cDeg",
+					"    with x = " << x << "\n");
+				goto Lgg;
+			}
+			if(x==GetDegreesToRadiansFactor<Value_t>())
+			{
+				FP_TRACE_BYTECODE_OPTIMIZATION(102,
+					"x[x==GetDegreesToRadiansFactor<Value_t>()] cMul",
+					"cRad",
+					"    with x = " << x << "\n");
+				goto Lgh;
+			}
+			if(x==Value_t(-1))
+			{
+				FP_TRACE_BYTECODE_OPTIMIZATION(138,
+					"x[x==Value_t(-1)] cMul",
+					"cNeg",
+					"    with x = " << x << "\n");
+				goto Lgi;
+			}
+			break;
+		default: Default2:;
+			A = ByteCodePtr[0];
+			if(A>=VarBegin)
+			{
+				switch(ByteCodePtr[-1])
+				{
+				case cMul:
+					switch(ByteCodePtr[-2])
+					{
+					case cNeg:
+						B = ByteCodePtr[-3];
+						if(B==A)
+						{
+							FP_TRACE_BYTECODE_OPTIMIZATION(327,
+								"B[B==A] cNeg cMul A[A>=VarBegin] cMul",
+								"B cSqr cMul cNeg",
+								"    with A = " << FP_TRACE_OPCODENAME(A)
+								    << ", B = " << FP_TRACE_OPCODENAME(B)
+								    << "\n");
+							/* ByteCodePtr[-3] = B; */ // redundant, matches B @ 4
+							goto Lfd;
+						}
+						goto Default4;
+					default: Default4:;
+						B = ByteCodePtr[-2];
+						if(B==A)
+						{
+							FP_TRACE_BYTECODE_OPTIMIZATION(318,
+								"B[B==A] cMul A[A>=VarBegin] cMul",
+								"B cSqr cMul",
+								"    with A = " << FP_TRACE_OPCODENAME(A)
+								    << ", B = " << FP_TRACE_OPCODENAME(B)
+								    << "\n");
+							/* ByteCodePtr[-2] = B; */ // redundant, matches B @ 3
+							/* opcode = cMul; */ // redundant, matches cMul @ 0
+							goto Lgj;
+						}
+					}
+					goto Default5;
+				case cNeg:
+					B = ByteCodePtr[-2];
+					if(B==A)
+					{
+						FP_TRACE_BYTECODE_OPTIMIZATION(321,
+							"B[B==A] cNeg A[A>=VarBegin] cMul",
+							"B cSqr cNeg",
+							"    with A = " << FP_TRACE_OPCODENAME(A)
+							    << ", B = " << FP_TRACE_OPCODENAME(B)
+							    << "\n");
+						/* ByteCodePtr[-2] = B; */ // redundant, matches B @ 3
+						goto Lfe;
+					}
+					goto Default5;
+				default: Default5:;
+					B = ByteCodePtr[-1];
+					if(B==A)
+					{
+						FP_TRACE_BYTECODE_OPTIMIZATION(315,
+							"B[B==A] A[A>=VarBegin] cMul",
+							"B cSqr",
+							"    with A = " << FP_TRACE_OPCODENAME(A)
+							    << ", B = " << FP_TRACE_OPCODENAME(B)
+							    << "\n");
+						/* ByteCodePtr[-1] = B; */ // redundant, matches B @ 2
+						goto Lfb;
+					}
+				}
+			}
+			if(IsUnaryOpcode(A))
+			{
+				B = ByteCodePtr[-1];
+				if(B>=VarBegin)
+				{
+					if(ByteCodePtr[-2] == cMul)
+					{
+						C = ByteCodePtr[-3];
+						if(C==A)
+						{
+							D = ByteCodePtr[-4];
+							if(D==B)
+							{
+								FP_TRACE_BYTECODE_OPTIMIZATION(337,
+									"D[D==B] C[C==A] cMul B[B>=VarBegin] A[IsUnaryOpcode(A)] cMul",
+									"D C cSqr cMul",
+									"    with A = " << FP_TRACE_OPCODENAME(A)
+									    << ", B = " << FP_TRACE_OPCODENAME(B)
+									    << ", C = " << FP_TRACE_OPCODENAME(C)
+									    << ", D = " << FP_TRACE_OPCODENAME(D)
+									    << "\n");
+								/* ByteCodePtr[-4] = D; */ // redundant, matches D @ 5
+								/* ByteCodePtr[-3] = C; */ // redundant, matches C @ 4
+								/* opcode = cMul; */ // redundant, matches cMul @ 0
+								goto Lgk;
+							}
+						}
+					}
+				}
+			}
+		}
+		goto Default0;
+	TailCall_cNEqual:
+	case cNEqual:
+		if(ByteCodePtr[0] == cImmed)
+		{
+			x = ImmedPtr[0];
+			if(x==Value_t(0))
+			{
+				switch(ByteCodePtr[-1])
+				{
+				case cAbs:
+					FP_TRACE_BYTECODE_OPTIMIZATION(209,
+						"cAbs x[x==Value_t(0)] cNEqual",
+						"[x] cNEqual",
+						"    with x = " << x << "\n");
+					/* ImmedPtr[0] = x; */ // redundant, matches x @ 1
+					/* opcode = cNEqual; */ // redundant, matches cNEqual @ 0
+					goto Lgl;
+				case cSqr:
+					FP_TRACE_BYTECODE_OPTIMIZATION(211,
+						"cSqr x[x==Value_t(0)] cNEqual",
+						"[x] cNEqual",
+						"    with x = " << x << "\n");
+					/* ImmedPtr[0] = x; */ // redundant, matches x @ 1
+					/* opcode = cNEqual; */ // redundant, matches cNEqual @ 0
+					goto Lgl;
+				}
+			}
+			if(ByteCodePtr[-1] == cImmed)
+			{
+				y = ImmedPtr[-1];
+				FP_TRACE_BYTECODE_OPTIMIZATION(130,
+					"y x cNEqual",
+					"[fp_nequal(y,x)]",
+					"    with x = " << x
+					    << ", y = " << y
+					    << "\n");
+				/* ByteCodePtr[-1] = cImmed; */ // redundant, matches y @ 2
+				goto Lgm;
+			}
+		}
+		goto Default0;
+	TailCall_cNeg:
+	case cNeg:
+		switch(ByteCodePtr[0])
+		{
+		case cMul:
+			if(ByteCodePtr[-1] == cImmed)
+			{
+				x = ImmedPtr[0];
+				FP_TRACE_BYTECODE_OPTIMIZATION(137,
+					"x cMul cNeg",
+					"[-x] cMul",
+					"    with x = " << x << "\n");
+				/* ByteCodePtr[-1] = cImmed; */ // redundant, matches x @ 2
+				goto Lgn;
+			}
+			break;
+		case cNeg:
+			FP_TRACE_BYTECODE_OPTIMIZATION(191,"cNeg cNeg", "", "");
+			goto Lbf;
+		case cSin:
+			if(ByteCodePtr[-1] == cMul)
+			{
+				if(ByteCodePtr[-2] == cImmed)
+				{
+					x = ImmedPtr[0];
+					FP_TRACE_BYTECODE_OPTIMIZATION(289,
+						"x cMul cSin cNeg",
+						"[-x] cMul cSin",
+						"    with x = " << x << "\n");
+					/* ByteCodePtr[-2] = cImmed; */ // redundant, matches x @ 3
+					goto Lgo;
+				}
+			}
+			break;
+		case cSinh:
+			if(ByteCodePtr[-1] == cMul)
+			{
+				if(ByteCodePtr[-2] == cImmed)
+				{
+					x = ImmedPtr[0];
+					FP_TRACE_BYTECODE_OPTIMIZATION(290,
+						"x cMul cSinh cNeg",
+						"[-x] cMul cSinh",
+						"    with x = " << x << "\n");
+					/* ByteCodePtr[-2] = cImmed; */ // redundant, matches x @ 3
+					goto Lgp;
+				}
+			}
+			break;
+		case cTan:
+			if(ByteCodePtr[-1] == cMul)
+			{
+				if(ByteCodePtr[-2] == cImmed)
+				{
+					x = ImmedPtr[0];
+					FP_TRACE_BYTECODE_OPTIMIZATION(291,
+						"x cMul cTan cNeg",
+						"[-x] cMul cTan",
+						"    with x = " << x << "\n");
+					/* ByteCodePtr[-2] = cImmed; */ // redundant, matches x @ 3
+					goto Lha;
+				}
+			}
+			break;
+		case cTanh:
+			if(ByteCodePtr[-1] == cMul)
+			{
+				if(ByteCodePtr[-2] == cImmed)
+				{
+					x = ImmedPtr[0];
+					FP_TRACE_BYTECODE_OPTIMIZATION(292,
+						"x cMul cTanh cNeg",
+						"[-x] cMul cTanh",
+						"    with x = " << x << "\n");
+					/* ByteCodePtr[-2] = cImmed; */ // redundant, matches x @ 3
+					goto Lhb;
+				}
+			}
+			break;
+		case cImmed:
+			x = ImmedPtr[0];
+			FP_TRACE_BYTECODE_OPTIMIZATION(68,
+				"x cNeg",
+				"[-x]",
+				"    with x = " << x << "\n");
+			/* ByteCodePtr[0] = cImmed; */ // redundant, matches x @ 1
+			goto Lhc;
+		}
+		goto Default0;
+	TailCall_cNot:
+	case cNot:
+		switch(ByteCodePtr[0])
+		{
+		case cAbs:
+			FP_TRACE_BYTECODE_OPTIMIZATION(235,"cAbs cNot", "cNot", "");
+			/* opcode = cNot; */ // redundant, matches cNot @ 0
+			goto Lhd;
+		case cAbsNot:
+			A = ByteCodePtr[-1];
+			if(IsLogicalOpcode(A))
+			{
+				FP_TRACE_BYTECODE_OPTIMIZATION(240,
+					"A[IsLogicalOpcode(A)] cAbsNot cNot",
+					"A",
+					"    with A = " << FP_TRACE_OPCODENAME(A) << "\n");
+				/* ByteCodePtr[-1] = A; */ // redundant, matches A @ 2
+				goto Lbf;
+			}
+			if(A!=cImmed)
+			{
+				FP_TRACE_BYTECODE_OPTIMIZATION(241,
+					"A[A!=cImmed] cAbsNot cNot",
+					"A cAbsNotNot",
+					"    with A = " << FP_TRACE_OPCODENAME(A) << "\n");
+				/* ByteCodePtr[-1] = A; */ // redundant, matches A @ 2
+				goto Lhe;
+			}
+			goto Default6;
+		case cAbsNotNot:
+			FP_TRACE_BYTECODE_OPTIMIZATION(238,"cAbsNotNot cNot", "cAbsNot", "");
+			goto Lhf;
+		case cEqual:
+			FP_TRACE_BYTECODE_OPTIMIZATION(205,"cEqual cNot", "cNEqual", "");
+			goto Lhg;
+		case cGreater:
+			FP_TRACE_BYTECODE_OPTIMIZATION(203,"cGreater cNot", "cLessOrEq", "");
+			goto Lhh;
+		case cGreaterOrEq:
+			FP_TRACE_BYTECODE_OPTIMIZATION(204,"cGreaterOrEq cNot", "cLess", "");
+			goto Lhi;
+		case cLess:
+			FP_TRACE_BYTECODE_OPTIMIZATION(201,"cLess cNot", "cGreaterOrEq", "");
+			goto Lhj;
+		case cLessOrEq:
+			FP_TRACE_BYTECODE_OPTIMIZATION(202,"cLessOrEq cNot", "cGreater", "");
+			goto Lhk;
+		case cNEqual:
+			FP_TRACE_BYTECODE_OPTIMIZATION(206,"cNEqual cNot", "cEqual", "");
+			goto Lhl;
+		case cNeg:
+			FP_TRACE_BYTECODE_OPTIMIZATION(234,"cNeg cNot", "cNot", "");
+			/* opcode = cNot; */ // redundant, matches cNot @ 0
+			goto Lhd;
+		case cNot:
+			FP_TRACE_BYTECODE_OPTIMIZATION(236,"cNot cNot", "cNotNot", "");
+			goto Lhm;
+		case cNotNot:
+			FP_TRACE_BYTECODE_OPTIMIZATION(237,"cNotNot cNot", "cNot", "");
+			/* opcode = cNot; */ // redundant, matches cNot @ 0
+			goto Lhd;
+		case cImmed:
+			x = ImmedPtr[0];
+			FP_TRACE_BYTECODE_OPTIMIZATION(85,
+				"x cNot",
+				"[!truthValue(x)]",
+				"    with x = " << x << "\n");
+			/* ByteCodePtr[0] = cImmed; */ // redundant, matches x @ 1
+			goto Lhn;
+		default: Default6:;
+			A = ByteCodePtr[0];
+			if(IsNeverNegativeValueOpcode(A))
+			{
+				FP_TRACE_BYTECODE_OPTIMIZATION(242,
+					"A[IsNeverNegativeValueOpcode(A)] cNot",
+					"A cAbsNot",
+					"    with A = " << FP_TRACE_OPCODENAME(A) << "\n");
+				/* ByteCodePtr[0] = A; */ // redundant, matches A @ 1
+				goto Lho;
+			}
+		}
+		goto Default0;
+	TailCall_cOr:
+	case cOr:
+		if(ByteCodePtr[0] == cImmed)
+		{
+			x = ImmedPtr[0];
+			if(ByteCodePtr[-1] == cImmed)
+			{
+				y = ImmedPtr[-1];
+				FP_TRACE_BYTECODE_OPTIMIZATION(132,
+					"y x cOr",
+					"[truthValue(x)||truthValue(y)]",
+					"    with x = " << x
+					    << ", y = " << y
+					    << "\n");
+				/* ByteCodePtr[-1] = cImmed; */ // redundant, matches y @ 2
+				goto Lhp;
+			}
+		}
+		goto Default0;
+	TailCall_cPow:
+	case cPow:
+		if(ByteCodePtr[0] == cImmed)
+		{
+			x = ImmedPtr[0];
+			if(!isEvenInteger(x+x))
+			{
+				if(ByteCodePtr[-1] == cSqr)
+				{
+					FP_TRACE_BYTECODE_OPTIMIZATION(14,
+						"cSqr x[!isEvenInteger(x+x)] cPow",
+						"cAbs [x+x] cPow",
+						"    with x = " << x << "\n");
+					/* opcode = cPow; */ // redundant, matches cPow @ 0
+					goto Lia;
+				}
+			}
+			if(IsIntegerConst(x))
+			{
+				switch(ByteCodePtr[-1])
+				{
+				case cExp:
+					FP_TRACE_BYTECODE_OPTIMIZATION(35,
+						"cExp x[IsIntegerConst(x)] cPow",
+						"[x] cMul cExp",
+						"    with x = " << x << "\n");
+					/* ImmedPtr[0] = x; */ // redundant, matches x @ 1
+					goto Lib;
+				case cExp2:
+					FP_TRACE_BYTECODE_OPTIMIZATION(36,
+						"cExp2 x[IsIntegerConst(x)] cPow",
+						"[x] cMul cExp2",
+						"    with x = " << x << "\n");
+					/* ImmedPtr[0] = x; */ // redundant, matches x @ 1
+					goto Lic;
+				case cPow:
+					if(ByteCodePtr[-2] == cImmed)
+					{
+						y = ImmedPtr[-1];
+						if(!IsIntegerConst(y))
+						{
+							FP_TRACE_BYTECODE_OPTIMIZATION(34,
+								"y[!IsIntegerConst(y)] cPow x[IsIntegerConst(x)] cPow",
+								"[y*x] cPow",
+								"    with x = " << x
+								    << ", y = " << y
+								    << "\n");
+							/* ByteCodePtr[-2] = cImmed; */ // redundant, matches y @ 3
+							/* opcode = cPow; */ // redundant, matches cPow @ 0
+							goto Lid;
+						}
+					}
+					FP_TRACE_BYTECODE_OPTIMIZATION(37,
+						"cPow x[IsIntegerConst(x)] cPow",
+						"[x] cMul cPow",
+						"    with x = " << x << "\n");
+					/* ImmedPtr[0] = x; */ // redundant, matches x @ 1
+					/* opcode = cPow; */ // redundant, matches cPow @ 0
+					goto Lie;
+				}
+			}
+			if(isEvenInteger(x))
+			{
+				switch(ByteCodePtr[-1])
+				{
+				case cAbs:
+					FP_TRACE_BYTECODE_OPTIMIZATION(278,
+						"cAbs x[isEvenInteger(x)] cPow",
+						"[x] cPow",
+						"    with x = " << x << "\n");
+					/* ImmedPtr[0] = x; */ // redundant, matches x @ 1
+					/* opcode = cPow; */ // redundant, matches cPow @ 0
+					goto Lif;
+				case cMul:
+					if(ByteCodePtr[-2] == cAbs)
+					{
+						FP_TRACE_BYTECODE_OPTIMIZATION(279,
+							"cAbs cMul x[isEvenInteger(x)] cPow",
+							"cMul [x] cPow",
+							"    with x = " << x << "\n");
+						/* opcode = cPow; */ // redundant, matches cPow @ 0
+						goto Lig;
+					}
+					break;
+				}
+			}
+			
+      if(x==Value_t(0))
+			{
+				FP_TRACE_BYTECODE_OPTIMIZATION(123,
+					"x[x==Value_t(0)] cPow",
+					"[Value_t(0)] cMul [Value_t(1)] cAdd",
+					"    with x = " << x << "\n");
+				/* ByteCodePtr[0] = cImmed; */ // redundant, matches x @ 1
+				goto Lih;
+			}
+			if(x==Value_t(0.5))
+			{
+				FP_TRACE_BYTECODE_OPTIMIZATION(167,
+					"x[x==Value_t(0.5)] cPow",
+					"cSqrt",
+					"    with x = " << x << "\n");
+				goto Lii;
+			}
+			if(x==Value_t(1)/Value_t(3))
+			{
+				FP_TRACE_BYTECODE_OPTIMIZATION(168,
+					"x[x==Value_t(1)/Value_t(3)] cPow",
+					"cCbrt",
+					"    with x = " << x << "\n");
+				goto Lij;
+			}
+			if(x==Value_t(1)/Value_t(-3))
+			{
+				FP_TRACE_BYTECODE_OPTIMIZATION(169,
+					"x[x==Value_t(1)/Value_t(-3)] cPow",
+					"cCbrt cInv",
+					"    with x = " << x << "\n");
+				goto Lik;
+			}
+			if(x==Value_t(-0.5))
+			{
+				FP_TRACE_BYTECODE_OPTIMIZATION(170,
+					"x[x==Value_t(-0.5)] cPow",
+					"cRSqrt",
+					"    with x = " << x << "\n");
+				goto Lil;
+			}
+			if(x==Value_t(-1))
+			{
+				FP_TRACE_BYTECODE_OPTIMIZATION(171,
+					"x[x==Value_t(-1)] cPow",
+					"cInv",
+					"    with x = " << x << "\n");
+				goto Lim;
+			}
+			switch(ByteCodePtr[-1])
+			{
+			case cPow:
+				if(ByteCodePtr[-2] == cImmed)
+				{
+					y = ImmedPtr[-1];
+
+					if(isEvenInteger(y)&&!isEvenInteger(x*y))
+					{
+						FP_TRACE_BYTECODE_OPTIMIZATION(13,
+							"y[isEvenInteger(y)&&!isEvenInteger(x*y)] cPow x cPow",
+							"cAbs [y*x] cPow",
+							"    with x = " << x
+							    << ", y = " << y
+							    << "\n");
+						/* opcode = cPow; */ // redundant, matches cPow @ 0
+						goto Lin;
+					}
+
+					FP_TRACE_BYTECODE_OPTIMIZATION(165,
+						"y cPow x cPow",
+						"[y*x] cPow",
+						"    with x = " << x
+						    << ", y = " << y
+						    << "\n");
+					/* ByteCodePtr[-2] = cImmed; */ // redundant, matches y @ 3
+					/* opcode = cPow; */ // redundant, matches cPow @ 0
+					goto Lid;
+				}
+				break;
+			case cSqr:
+				FP_TRACE_BYTECODE_OPTIMIZATION(38,
+					"cSqr x cPow",
+					"[x+x] cPow",
+					"    with x = " << x << "\n");
+				/* opcode = cPow; */ // redundant, matches cPow @ 0
+				goto Lio;
+			case cImmed:
+				y = ImmedPtr[-1];
+				if(y!=Value_t(0)||x>=Value_t(0))
+				{
+					FP_TRACE_BYTECODE_OPTIMIZATION(84,
+						"y[y!=Value_t(0)||x>=Value_t(0)] x cPow",
+						"[fp_pow(y,x)]",
+						"    with x = " << x
+						    << ", y = " << y
+						    << "\n");
+					/* ByteCodePtr[-1] = cImmed; */ // redundant, matches y @ 2
+					goto Lip;
+				}
+				break;
+			}
+			FP_TRACE_BYTECODE_OPTIMIZATION(312,
+				"x cPow",
+				"[DO_POWI]",
+				"    with x = " << x << "\n");
+			if(TryCompilePowi(x))
+			  return;
+		}
+		goto Default0;
+	TailCall_cRad:
+	case cRad:
+		if(ByteCodePtr[0] == cImmed)
+		{
+			x = ImmedPtr[0];
+			FP_TRACE_BYTECODE_OPTIMIZATION(66,
+				"x cRad",
+				"[DegreesToRadians(x)]",
+				"    with x = " << x << "\n");
+			/* ByteCodePtr[0] = cImmed; */ // redundant, matches x @ 1
+			goto Lja;
+		}
+		goto Default0;
+	TailCall_cSin:
+	case cSin:
+		switch(ByteCodePtr[0])
+		{
+		case cNeg:
+			FP_TRACE_BYTECODE_OPTIMIZATION(285,"cNeg cSin", "cSin cNeg", "");
+			goto Ljb;
+		case cImmed:
+			x = ImmedPtr[0];
+			FP_TRACE_BYTECODE_OPTIMIZATION(58,
+				"x cSin",
+				"[fp_sin(x)]",
+				"    with x = " << x << "\n");
+			/* ByteCodePtr[0] = cImmed; */ // redundant, matches x @ 1
+			goto Ljc;
+		}
+		goto Default0;
+	TailCall_cSinh:
+	case cSinh:
+		switch(ByteCodePtr[0])
+		{
+		case cAcosh:
+			FP_TRACE_BYTECODE_OPTIMIZATION(294,"cAcosh cSinh", "[DO_STACKPLUS1] cSqr [Value_t(-1)] cAdd cSqrt", "");
+			incStackPtr();
+			--StackPtr;
+			goto Ljd;
+		case cAsinh:
+			FP_TRACE_BYTECODE_OPTIMIZATION(184,"cAsinh cSinh", "", "");
+			goto Lbf;
+		case cNeg:
+			FP_TRACE_BYTECODE_OPTIMIZATION(286,"cNeg cSinh", "cSinh cNeg", "");
+			goto Lje;
+		case cImmed:
+			x = ImmedPtr[0];
+			FP_TRACE_BYTECODE_OPTIMIZATION(59,
+				"x cSinh",
+				"[fp_sinh(x)]",
+				"    with x = " << x << "\n");
+			/* ByteCodePtr[0] = cImmed; */ // redundant, matches x @ 1
+			goto Ljf;
+		}
+		goto Default0;
+	TailCall_cSqr:
+	case cSqr:
+		switch(ByteCodePtr[0])
+		{
+		case cAbs:
+			FP_TRACE_BYTECODE_OPTIMIZATION(333,"cAbs cSqr", "cSqr", "");
+			/* opcode = cSqr; */ // redundant, matches cSqr @ 0
+			goto Ljg;
+		case cNeg:
+			FP_TRACE_BYTECODE_OPTIMIZATION(332,"cNeg cSqr", "cSqr", "");
+			/* opcode = cSqr; */ // redundant, matches cSqr @ 0
+			goto Ljg;
+		case cSqrt:
+			A = ByteCodePtr[-1];
+			if(IsNeverNegativeValueOpcode(A))
+			{
+				FP_TRACE_BYTECODE_OPTIMIZATION(173,
+					"A[IsNeverNegativeValueOpcode(A)] cSqrt cSqr",
+					"A",
+					"    with A = " << FP_TRACE_OPCODENAME(A) << "\n");
+				/* ByteCodePtr[-1] = A; */ // redundant, matches A @ 2
+				goto Lbf;
+			}
+			break;
+		}
+		goto Default0;
+	TailCall_cSqrt:
+	case cSqrt:
+		switch(ByteCodePtr[0])
+		{
+		case cSqr:
+			FP_TRACE_BYTECODE_OPTIMIZATION(15,"cSqr cSqrt", "cAbs", "");
+			goto Ljh;
+		case cImmed:
+			x = ImmedPtr[0];
+			if(x>=Value_t(0))
+			{
+				FP_TRACE_BYTECODE_OPTIMIZATION(60,
+					"x[x>=Value_t(0)] cSqrt",
+					"[fp_sqrt(x)]",
+					"    with x = " << x << "\n");
+				/* ByteCodePtr[0] = cImmed; */ // redundant, matches x @ 1
+				goto Lji;
+			}
+			break;
+		}
+		goto Default0;
+	TailCall_cSub:
+	case cSub:
+		switch(ByteCodePtr[0])
+		{
+		case cNeg:
+			FP_TRACE_BYTECODE_OPTIMIZATION(197,"cNeg cSub", "cAdd", "");
+			goto Ljj;
+		case cImmed:
+			x = ImmedPtr[0];
+			if(x==Value_t(0))
+			{
+				FP_TRACE_BYTECODE_OPTIMIZATION(77,
+					"x[x==Value_t(0)] cSub",
+					"",
+					"    with x = " << x << "\n");
+				goto Lai;
+			}
+			if(ByteCodePtr[-1] == cImmed)
+			{
+				y = ImmedPtr[-1];
+				FP_TRACE_BYTECODE_OPTIMIZATION(78,
+					"y x cSub",
+					"[y-x]",
+					"    with x = " << x
+					    << ", y = " << y
+					    << "\n");
+				/* ByteCodePtr[-1] = cImmed; */ // redundant, matches y @ 2
+				goto Ljk;
+			}
+			FP_TRACE_BYTECODE_OPTIMIZATION(160,
+				"x cSub",
+				"[-x] cAdd",
+				"    with x = " << x << "\n");
+			/* ByteCodePtr[0] = cImmed; */ // redundant, matches x @ 1
+			goto Ljl;
+		}
+		goto Default0;
+	TailCall_cTan:
+	case cTan:
+		switch(ByteCodePtr[0])
+		{
+		case cAtan2:
+			FP_TRACE_BYTECODE_OPTIMIZATION(188,"cAtan2 cTan", "cDiv", "");
+			goto Lfc;
+		case cNeg:
+			FP_TRACE_BYTECODE_OPTIMIZATION(287,"cNeg cTan", "cTan cNeg", "");
+			goto Ljm;
+		case cImmed:
+			x = ImmedPtr[0];
+			FP_TRACE_BYTECODE_OPTIMIZATION(62,
+				"x cTan",
+				"[fp_tan(x)]",
+				"    with x = " << x << "\n");
+			/* ByteCodePtr[0] = cImmed; */ // redundant, matches x @ 1
+			goto Ljn;
+		}
+		goto Default0;
+	TailCall_cTanh:
+	case cTanh:
+		switch(ByteCodePtr[0])
+		{
+		case cNeg:
+			FP_TRACE_BYTECODE_OPTIMIZATION(288,"cNeg cTanh", "cTanh cNeg", "");
+			goto Ljo;
+		case cImmed:
+			x = ImmedPtr[0];
+			FP_TRACE_BYTECODE_OPTIMIZATION(63,
+				"x cTanh",
+				"[fp_tanh(x)]",
+				"    with x = " << x << "\n");
+			/* ByteCodePtr[0] = cImmed; */ // redundant, matches x @ 1
+			goto Ljp;
+		}
+		goto Default0;
+	TailCall_cTrunc:
+	case cTrunc:
+		switch(ByteCodePtr[0])
+		{
+		case cImmed:
+			x = ImmedPtr[0];
+			FP_TRACE_BYTECODE_OPTIMIZATION(64,
+				"x cTrunc",
+				"[fp_trunc(x)]",
+				"    with x = " << x << "\n");
+			/* ByteCodePtr[0] = cImmed; */ // redundant, matches x @ 1
+			goto Lka;
+		default:
+			A = ByteCodePtr[0];
+			if(IsAlwaysIntegerOpcode(A))
+			{
+				FP_TRACE_BYTECODE_OPTIMIZATION(245,
+					"A[IsAlwaysIntegerOpcode(A)] cTrunc",
+					"A",
+					"    with A = " << FP_TRACE_OPCODENAME(A) << "\n");
+				/* ByteCodePtr[0] = A; */ // redundant, matches A @ 1
+				return;
+			}
+		}
+		goto Default0;
+	default: Default0:;
+		A = opcode;
+		if(IsComparisonOpcode(A))
+		{
+			if(ByteCodePtr[0] == cImmed)
+			{
+				x = ImmedPtr[0];
+				switch(ByteCodePtr[-1])
+				{
+				case cAdd:
+					if(ByteCodePtr[-2] == cImmed)
+					{
+						y = ImmedPtr[-1];
+						FP_TRACE_BYTECODE_OPTIMIZATION(213,
+							"y cAdd x A[IsComparisonOpcode(A)]",
+							"[x-y] A",
+							"    with A = " << FP_TRACE_OPCODENAME(A)
+							    << ", x = " << x
+							    << ", y = " << y
+							    << "\n");
+						/* ByteCodePtr[-2] = cImmed; */ // redundant, matches y @ 3
+						goto Lkb;
+					}
+					break;
+				case cAtan:
+					if(fp_abs(x)<const_pi<Value_t>()*Value_t(0.5))
+					{
+						FP_TRACE_BYTECODE_OPTIMIZATION(229,
+							"cAtan[fp_abs(x)<const_pi<Value_t>()*Value_t(0.5)] x A[IsComparisonOpcode(A)]",
+							"[fp_tan(x)] A",
+							"    with A = " << FP_TRACE_OPCODENAME(A)
+							    << ", x = " << x
+							    << "\n");
+						goto Lkc;
+					}
+					break;
+				case cExp:
+					if(x>Value_t(0))
+					{
+						FP_TRACE_BYTECODE_OPTIMIZATION(219,
+							"cExp[x>Value_t(0)] x A[IsComparisonOpcode(A)]",
+							"[fp_log(x)] A",
+							"    with A = " << FP_TRACE_OPCODENAME(A)
+							    << ", x = " << x
+							    << "\n");
+						goto Lkd;
+					}
+					break;
+				case cExp2:
+					if(x>Value_t(0))
+					{
+						FP_TRACE_BYTECODE_OPTIMIZATION(220,
+							"cExp2[x>Value_t(0)] x A[IsComparisonOpcode(A)]",
+							"[fp_log2(x)] A",
+							"    with A = " << FP_TRACE_OPCODENAME(A)
+							    << ", x = " << x
+							    << "\n");
+						goto Lke;
+					}
+					break;
+				case cLog:
+					B = ByteCodePtr[-2];
+					if(IsNeverNegativeValueOpcode(B))
+					{
+						FP_TRACE_BYTECODE_OPTIMIZATION(222,
+							"B[IsNeverNegativeValueOpcode(B)] cLog x A[IsComparisonOpcode(A)]",
+							"B [fp_exp(x)] A",
+							"    with A = " << FP_TRACE_OPCODENAME(A)
+							    << ", x = " << x
+							    << ", B = " << FP_TRACE_OPCODENAME(B)
+							    << "\n");
+						/* ByteCodePtr[-2] = B; */ // redundant, matches B @ 3
+						goto Lkf;
+					}
+					break;
+				case cLog10:
+					B = ByteCodePtr[-2];
+					if(IsNeverNegativeValueOpcode(B))
+					{
+						FP_TRACE_BYTECODE_OPTIMIZATION(224,
+							"B[IsNeverNegativeValueOpcode(B)] cLog10 x A[IsComparisonOpcode(A)]",
+							"B [fp_pow(Value_t(10),x)] A",
+							"    with A = " << FP_TRACE_OPCODENAME(A)
+							    << ", x = " << x
+							    << ", B = " << FP_TRACE_OPCODENAME(B)
+							    << "\n");
+						/* ByteCodePtr[-2] = B; */ // redundant, matches B @ 3
+						goto Lkg;
+					}
+					break;
+				case cLog2:
+					B = ByteCodePtr[-2];
+					if(IsNeverNegativeValueOpcode(B))
+					{
+						FP_TRACE_BYTECODE_OPTIMIZATION(223,
+							"B[IsNeverNegativeValueOpcode(B)] cLog2 x A[IsComparisonOpcode(A)]",
+							"B [fp_exp2(x)] A",
+							"    with A = " << FP_TRACE_OPCODENAME(A)
+							    << ", x = " << x
+							    << ", B = " << FP_TRACE_OPCODENAME(B)
+							    << "\n");
+						/* ByteCodePtr[-2] = B; */ // redundant, matches B @ 3
+						goto Lkh;
+					}
+					break;
+				case cMul:
+					if(ByteCodePtr[-2] == cImmed)
+					{
+						y = ImmedPtr[-1];
+						if(y>Value_t(0))
+						{
+							FP_TRACE_BYTECODE_OPTIMIZATION(215,
+								"y[y>Value_t(0)] cMul x A[IsComparisonOpcode(A)]",
+								"[x/y] A",
+								"    with A = " << FP_TRACE_OPCODENAME(A)
+								    << ", x = " << x
+								    << ", y = " << y
+								    << "\n");
+							/* ByteCodePtr[-2] = cImmed; */ // redundant, matches y @ 3
+							goto Lki;
+						}
+						if(y<Value_t(0))
+						{
+							FP_TRACE_BYTECODE_OPTIMIZATION(216,
+								"y[y<Value_t(0)] cMul x A[IsComparisonOpcode(A)]",
+								"[x/y] {OppositeComparisonOpcode(A)}",
+								"    with A = " << FP_TRACE_OPCODENAME(A)
+								    << ", x = " << x
+								    << ", y = " << y
+								    << "\n");
+							/* ByteCodePtr[-2] = cImmed; */ // redundant, matches y @ 3
+							goto Lkj;
+						}
+					}
+					break;
+				case cNeg:
+					FP_TRACE_BYTECODE_OPTIMIZATION(214,
+						"cNeg x A[IsComparisonOpcode(A)]",
+						"[-x] {OppositeComparisonOpcode(A)}",
+						"    with A = " << FP_TRACE_OPCODENAME(A)
+						    << ", x = " << x
+						    << "\n");
+					goto Lkk;
+				case cPow:
+					if(x>Value_t(0))
+					{
+						if(ByteCodePtr[-2] == cImmed)
+						{
+							y = ImmedPtr[-1];
+							if(y>Value_t(0))
+							{
+								FP_TRACE_BYTECODE_OPTIMIZATION(217,
+									"y[y>Value_t(0)] cPow[x>Value_t(0)] x A[IsComparisonOpcode(A)]",
+									"[fp_pow(x,1/y)] A",
+									"    with A = " << FP_TRACE_OPCODENAME(A)
+									    << ", x = " << x
+									    << ", y = " << y
+									    << "\n");
+								/* ByteCodePtr[-2] = cImmed; */ // redundant, matches y @ 3
+								goto Lkl;
+							}
+						}
+					}
+					break;
+				case cSinh:
+					FP_TRACE_BYTECODE_OPTIMIZATION(230,
+						"cSinh x A[IsComparisonOpcode(A)]",
+						"[fp_asinh(x)] A",
+						"    with A = " << FP_TRACE_OPCODENAME(A)
+						    << ", x = " << x
+						    << "\n");
+					goto Lkm;
+				case cSqr:
+					if(x>Value_t(0))
+					{
+						FP_TRACE_BYTECODE_OPTIMIZATION(218,
+							"cSqr[x>Value_t(0)] x A[IsComparisonOpcode(A)]",
+							"cAbs [fp_sqrt(x)] A",
+							"    with A = " << FP_TRACE_OPCODENAME(A)
+							    << ", x = " << x
+							    << "\n");
+						goto Lkn;
+					}
+					break;
+				case cTanh:
+					if(fp_abs(x)<Value_t(1))
+					{
+						FP_TRACE_BYTECODE_OPTIMIZATION(231,
+							"cTanh[fp_abs(x)<Value_t(1)] x A[IsComparisonOpcode(A)]",
+							"[fp_atanh(x)] A",
+							"    with A = " << FP_TRACE_OPCODENAME(A)
+							    << ", x = " << x
+							    << "\n");
+						goto Lko;
+					}
+					break;
+				}
+			}
+		}
+		if(A>=VarBegin)
+		{
+			B = ByteCodePtr[0];
+			if(B==A)
+			{
+				FP_TRACE_BYTECODE_OPTIMIZATION(335,
+					"B[B==A] A[A>=VarBegin]",
+					"B cDup",
+					"    with A = " << FP_TRACE_OPCODENAME(A)
+					    << ", B = " << FP_TRACE_OPCODENAME(B)
+					    << "\n");
+				/* ByteCodePtr[0] = B; */ // redundant, matches B @ 1
+				goto Lkp;
+			}
+		}
+		if(IsUnaryOpcode(A))
+		{
+			B = ByteCodePtr[0];
+			if(B>=VarBegin)
+			{
+				C = ByteCodePtr[-1];
+				if(C==A)
+				{
+					D = ByteCodePtr[-2];
+					if(D==B)
+					{
+						FP_TRACE_BYTECODE_OPTIMIZATION(336,
+							"D[D==B] C[C==A] B[B>=VarBegin] A[IsUnaryOpcode(A)]",
+							"D C cDup",
+							"    with A = " << FP_TRACE_OPCODENAME(A)
+							    << ", B = " << FP_TRACE_OPCODENAME(B)
+							    << ", C = " << FP_TRACE_OPCODENAME(C)
+							    << ", D = " << FP_TRACE_OPCODENAME(D)
+							    << "\n");
+						/* ByteCodePtr[-2] = D; */ // redundant, matches D @ 3
+						/* ByteCodePtr[-1] = C; */ // redundant, matches C @ 2
+						goto Lla;
+					}
+				}
+			}
+		}
+	}
+	goto Llb;
+Laa: ByteCodePtr -= 1;
+     data->ByteCode.pop_back();
+Llc: goto TailCall_cAbs;
+Lab: ImmedPtr[0] = fp_abs(x); return;
+Lac: ImmedPtr[0] = fp_acos(x); return;
+Lad: ImmedPtr[0] = fp_acosh(x); return;
+Lae: data->Immed.push_back(Value_t(4));
+     ByteCodePtr[-2] = cImmed;
+     ByteCodePtr -= 2;
+Lld: data->ByteCode.pop_back();
+     data->ByteCode.pop_back();
+Lle: opcode = cMul;
+Llf: FP_ReDefinePointers();
+Llg: goto TailCall_cMul;
+Laf: ByteCodePtr -= 1;
+     data->ByteCode.pop_back();
+     opcode = cSub;
+     goto TailCall_cSub;
+Lag: ImmedPtr[-1] = y+x;
+     data->Immed.pop_back();
+     data->ByteCode.pop_back();
+     data->ByteCode.pop_back();
+Llh: FP_ReDefinePointers();
+Lli: goto TailCall_cAdd;
+Lah: ImmedPtr[-1] = y+x;
+Lai: data->Immed.pop_back();
+Lbf: data->ByteCode.pop_back(); return;
+Laj: ImmedPtr[-1] = truthValue(x)&&truthValue(y); goto Lai;
+Lak: ImmedPtr[0] = fp_asin(x); return;
+Lal: ImmedPtr[0] = fp_asinh(x); return;
+Lam: ImmedPtr[0] = fp_atan(x); return;
+Lan: ImmedPtr[-1] = fp_atan2(y,x); goto Lai;
+Lao: ImmedPtr[0] = fp_atanh(x); return;
+Lap: ImmedPtr[0] = fp_cbrt(x); return;
+Lba: data->ByteCode.pop_back();
+     AddFunctionOpcode(cFloor);
+Llj: opcode = cNeg;
+     FP_ReDefinePointers();
+     goto TailCall_cNeg;
+Lbb: ImmedPtr[0] = fp_ceil(x); return;
+Lbc: ByteCodePtr -= 1;
+     data->ByteCode.pop_back();
+Llk: goto TailCall_cCos;
+Lbd: ImmedPtr[0] = fp_cos(x); return;
+Lbe: ByteCodePtr -= 1;
+     data->ByteCode.pop_back();
+     goto TailCall_cCosh;
+Lbg: data->ByteCode.pop_back();
+     AddFunctionOpcode(cSqr);
+     data->Immed.push_back(Value_t(1));
+Lll: data->ByteCode.push_back(cImmed);
+     AddFunctionOpcode(cAdd);
+Llm: opcode = cSqrt;
+     FP_ReDefinePointers();
+     goto TailCall_cSqrt;
+Lbh: ImmedPtr[0] = fp_cosh(x); return;
+Lbi: ImmedPtr[0] = RadiansToDegrees(x); return;
+Lbj: data->ByteCode.pop_back();
+     AddFunctionOpcode(cSec); goto Lle;
+Lbk: data->ByteCode.pop_back();
+     AddFunctionOpcode(cTan); goto Lle;
+Lbl: data->ByteCode.pop_back();
+     AddFunctionOpcode(cSin); goto Lle;
+Lbm: data->Immed.push_back(Value_t(0));
+     ByteCodePtr[0] = cImmed;
+Lln: AddFunctionOpcode(cMul);
+     data->Immed.push_back(Value_t(1));
+Llo: data->ByteCode.push_back(cImmed);
+Llp: opcode = cAdd; goto Llh;
+Lbn: data->ByteCode.pop_back();
+     AddFunctionOpcode(cNeg);
+     AddFunctionOpcode(cExp); goto Lle;
+Lbo: data->ByteCode.pop_back();
+     AddFunctionOpcode(cNeg);
+     AddFunctionOpcode(cExp2); goto Lle;
+Lbp: ByteCodePtr -= 1;
+     data->ByteCode.pop_back();
+Lma: opcode = cMul; goto Llg;
+Lca: data->ByteCode.pop_back();
+     AddFunctionOpcode(cNeg);
+     AddFunctionOpcode(cPow); goto Lle;
+Lcb: data->ByteCode.pop_back();
+     AddFunctionOpcode(cCos); goto Lle;
+Lcc: data->ByteCode.pop_back();
+     AddFunctionOpcode(cCsc); goto Lle;
+Lcd: data->ByteCode.pop_back();
+     AddFunctionOpcode(cCot); goto Lle;
+Lce: data->Immed.pop_back();
+     data->Immed.pop_back();
+     data->ByteCode.pop_back();
+     data->ByteCode.pop_back();
+Lmb: data->ByteCode.pop_back();
+     opcode = cDeg;
+     FP_ReDefinePointers();
+     goto TailCall_cDeg;
+Lcf: data->Immed.pop_back();
+     data->Immed.pop_back();
+     data->ByteCode.pop_back();
+     data->ByteCode.pop_back();
+Lmc: data->ByteCode.pop_back();
+     opcode = cRad;
+     FP_ReDefinePointers();
+     goto TailCall_cRad;
+Lcg: ImmedPtr[-1] = y/x;
+     data->Immed.pop_back(); goto Lld;
+Lch: ImmedPtr[0] = -x;
+     ByteCodePtr[-1] = cImmed;
+     ByteCodePtr -= 1;
+     data->ByteCode.pop_back();
+Lmd: goto TailCall_cDiv;
+Lci: ImmedPtr[-1] = y/x; goto Lai;
+Lcj: ImmedPtr[0] = Value_t(1)/x; goto Lma;
+Lck: ByteCodePtr[-1] = cImmed;
+     ByteCodePtr -= 1;
+     data->ByteCode.pop_back();
+Lme: goto TailCall_cEqual;
+Lcl: ImmedPtr[-1] = fp_equal(y,x); goto Lai;
+Lcm: data->Immed.pop_back();
+     data->ByteCode.pop_back();
+     data->ByteCode.pop_back();
+     AddFunctionOpcode(cExp);
+     data->Immed.push_back(fp_exp(x));
+Lmf: data->ByteCode.push_back(cImmed); goto Lle;
+Lcn: ImmedPtr[0] = fp_exp(x); return;
+Lco: data->Immed.pop_back();
+     data->ByteCode.pop_back();
+     data->ByteCode.pop_back();
+     AddFunctionOpcode(cExp2);
+     data->Immed.push_back(fp_exp2(x)); goto Lmf;
+Lcp: ImmedPtr[0] = fp_exp2(x); return;
+Lda: data->Immed.push_back(fp_log(Value_t(2)));
+     data->ByteCode.push_back(cImmed);
+Lmg: AddFunctionOpcode(cMul);
+     opcode = cExp;
+     FP_ReDefinePointers();
+     goto TailCall_cExp;
+Ldb: data->ByteCode.pop_back();
+     AddFunctionOpcode(cCeil); goto Llj;
+Ldc: ImmedPtr[0] = fp_floor(x); return;
+Ldd: ImmedPtr[-1] = fp_less(x,y); goto Lai;
+Lde: ImmedPtr[0] = Value_t(0.5)/x;
+     ByteCodePtr[-1] = cImmed;
+     data->ByteCode.pop_back();
+     AddFunctionOpcode(cMul);
+Lmh: AddFunctionOpcode(cNotNot); return;
+Ldf: ImmedPtr[-1] = fp_lessOrEq(x,y); goto Lai;
+Ldg: ImmedPtr[0] = fp_int(x); return;
+Ldh: data->ByteCode.pop_back();
+     AddFunctionOpcode(cSec); return;
+Ldi: ByteCodePtr -= 1;
+     data->ByteCode.pop_back();
+     opcode = cTan;
+Lmi: goto TailCall_cTan;
+Ldj: ByteCodePtr -= 1;
+     data->ByteCode.pop_back();
+     opcode = cSin;
+Lmj: goto TailCall_cSin;
+Ldk: data->ByteCode.pop_back();
+     AddFunctionOpcode(cNeg);
+     opcode = cPow;
+Lmk: FP_ReDefinePointers();
+Lml: goto TailCall_cPow;
+Ldl: ByteCodePtr -= 1;
+     data->ByteCode.pop_back();
+     opcode = cCos; goto Llk;
+Ldm: data->ByteCode.pop_back();
+     AddFunctionOpcode(cCsc); return;
+Ldn: data->ByteCode.pop_back();
+     AddFunctionOpcode(cRSqrt); return;
+Ldo: data->ByteCode.pop_back();
+     AddFunctionOpcode(cCot); return;
+Ldp: ImmedPtr[0] = Value_t(1)/x; return;
+Lea: ImmedPtr[0] = Value_t(0.5)/x;
+     ByteCodePtr[-1] = cImmed;
+     data->ByteCode.pop_back();
+     AddFunctionOpcode(cMul);
+     opcode = cNot;
+     FP_ReDefinePointers();
+Lmm: goto TailCall_cNot;
+Leb: ImmedPtr[-1] = fp_less(y,x); goto Lai;
+Lec: ImmedPtr[-1] = fp_lessOrEq(y,x); goto Lai;
+Led: data->Immed.pop_back();
+     data->ByteCode.pop_back();
+     data->ByteCode.pop_back();
+     AddFunctionOpcode(cLog);
+     data->Immed.push_back(fp_log(x)); goto Llo;
+Lee: data->ByteCode.pop_back();
+     AddFunctionOpcode(cAbs);
+     AddFunctionOpcode(cLog);
+Lmn: data->ByteCode.push_back(cDup); goto Llp;
+Lef: ImmedPtr[0] = fp_log(x); return;
+Leg: data->Immed.push_back(fp_log10(const_e<Value_t>()));
+Lmo: ByteCodePtr[0] = cImmed; goto Lle;
+Leh: data->Immed.pop_back();
+     data->ByteCode.pop_back();
+     data->ByteCode.pop_back();
+     AddFunctionOpcode(cLog10);
+     data->Immed.push_back(fp_log10(x)); goto Llo;
+Lei: data->ByteCode.pop_back();
+     AddFunctionOpcode(cAbs);
+     AddFunctionOpcode(cLog10); goto Lmn;
+Lej: ImmedPtr[0] = fp_log10(x); return;
+Lek: data->Immed.push_back(fp_log2(const_e<Value_t>())); goto Lmo;
+Lel: data->Immed.pop_back();
+     data->ByteCode.pop_back();
+     data->ByteCode.pop_back();
+     AddFunctionOpcode(cLog2);
+     data->Immed.push_back(fp_log2(x)); goto Llo;
+Lem: data->ByteCode.pop_back();
+     AddFunctionOpcode(cAbs);
+     AddFunctionOpcode(cLog2); goto Lmn;
+Len: ImmedPtr[0] = fp_log2(x); return;
+Leo: ImmedPtr[-1] = Max(x,y); goto Lai;
+Lep: ImmedPtr[-1] = Min(x,y); goto Lai;
+Lfa: ImmedPtr[-1] = fp_mod(y,x); goto Lai;
+Lfb: ByteCodePtr -= 1;
+     data->ByteCode.pop_back();
+     opcode = cSqr;
+Lmp: goto TailCall_cSqr;
+Lfc: ByteCodePtr -= 1;
+     data->ByteCode.pop_back();
+     opcode = cDiv; goto Lmd;
+Lfd: data->ByteCode.pop_back();
+     data->ByteCode.pop_back();
+     data->ByteCode.pop_back();
+     AddFunctionOpcode(cSqr);
+     AddFunctionOpcode(cMul); goto Llj;
+Lfe: data->ByteCode.pop_back();
+     data->ByteCode.pop_back();
+     AddFunctionOpcode(cSqr); goto Llj;
+Lff: ByteCodePtr[-2] = cImmed;
+     ByteCodePtr -= 2;
+     data->ByteCode.pop_back();
+Lna: data->ByteCode.pop_back(); goto Llg;
+Lfg: ImmedPtr[-1] = x;
+Lnb: data->Immed.pop_back();
+     data->ByteCode.pop_back();
+     data->ByteCode.pop_back(); goto Llf;
+Lfh: data->Immed.pop_back();
+Lfi: data->Immed.pop_back();
+     data->ByteCode.pop_back();
+Lnc: data->ByteCode.pop_back();
+     data->ByteCode.pop_back();
+     data->ByteCode.pop_back();
+Lnd: AddFunctionOpcode(A);
+     data->Immed.push_back(x);
+     data->ByteCode.push_back(cImmed); goto Llf;
+Lfj: data->Immed.pop_back();
+     data->ByteCode.pop_back();
+     data->ByteCode.pop_back();
+     data->ByteCode.pop_back();
+     data->ByteCode.pop_back();
+     AddFunctionOpcode(B); goto Lnd;
+Lfk: data->Immed.pop_back(); goto Lnc;
+Lfl: ByteCodePtr[-1] = cImmed; goto Lbf;
+Lfm: ByteCodePtr[-1] = cImmed;
+     ByteCodePtr -= 1; goto Lna;
+Lfn: data->Immed.pop_back();
+     data->ByteCode.pop_back();
+     data->ByteCode.pop_back(); goto Lbf;
+Lfo: ImmedPtr[0] = x+x; goto Lff;
+Lfp: ImmedPtr[0] = RadiansToDegrees(x); goto Lfm;
+Lga: data->Immed.pop_back(); goto Lfn;
+Lgb: ImmedPtr[-1] = y*x; goto Lnb;
+Lgc: ImmedPtr[0] = -x; goto Lfm;
+Lgd: ImmedPtr[0] = DegreesToRadians(x); goto Lfm;
+Lge: ImmedPtr[-1] = y*x; goto Lai;
+Lgf: ByteCodePtr[0] = cDup;
+     ImmedPtr -= 1;
+     data->Immed.pop_back();
+Lne: opcode = cAdd; goto Lli;
+Lgg: data->Immed.pop_back(); goto Lmb;
+Lgh: data->Immed.pop_back(); goto Lmc;
+Lgi: data->Immed.pop_back();
+     data->ByteCode.pop_back(); goto Llj;
+Lgj: data->ByteCode.pop_back();
+     data->ByteCode.pop_back();
+     AddFunctionOpcode(cSqr); goto Llf;
+Lgk: data->ByteCode.pop_back(); goto Lgj;
+Lgl: ByteCodePtr[-1] = cImmed;
+     ByteCodePtr -= 1;
+     data->ByteCode.pop_back();
+Lnf: goto TailCall_cNEqual;
+Lgm: ImmedPtr[-1] = fp_nequal(y,x); goto Lai;
+Lgn: ImmedPtr[0] = -x; goto Lbp;
+Lgo: ImmedPtr[0] = -x;
+     data->ByteCode.pop_back();
+     data->ByteCode.pop_back();
+     AddFunctionOpcode(cMul);
+     opcode = cSin;
+     FP_ReDefinePointers(); goto Lmj;
+Lgp: ImmedPtr[0] = -x;
+     data->ByteCode.pop_back();
+     data->ByteCode.pop_back();
+     AddFunctionOpcode(cMul);
+     opcode = cSinh;
+     FP_ReDefinePointers();
+     goto TailCall_cSinh;
+Lha: ImmedPtr[0] = -x;
+     data->ByteCode.pop_back();
+     data->ByteCode.pop_back();
+     AddFunctionOpcode(cMul);
+     opcode = cTan;
+     FP_ReDefinePointers(); goto Lmi;
+Lhb: ImmedPtr[0] = -x;
+     data->ByteCode.pop_back();
+     data->ByteCode.pop_back();
+     AddFunctionOpcode(cMul);
+     opcode = cTanh;
+     FP_ReDefinePointers();
+     goto TailCall_cTanh;
+Lhc: ImmedPtr[0] = -x; return;
+Lhd: ByteCodePtr -= 1;
+     data->ByteCode.pop_back(); goto Lmm;
+Lhe: data->ByteCode.pop_back();
+     AddFunctionOpcode(cAbsNotNot); return;
+Lhf: data->ByteCode.pop_back();
+Lho: AddFunctionOpcode(cAbsNot); return;
+Lhg: ByteCodePtr -= 1;
+     data->ByteCode.pop_back();
+     opcode = cNEqual; goto Lnf;
+Lhh: ByteCodePtr -= 1;
+     data->ByteCode.pop_back();
+     opcode = cLessOrEq;
+     goto TailCall_cLessOrEq;
+Lhi: ByteCodePtr -= 1;
+     data->ByteCode.pop_back();
+     opcode = cLess;
+     goto TailCall_cLess;
+Lhj: ByteCodePtr -= 1;
+     data->ByteCode.pop_back();
+     opcode = cGreaterOrEq;
+     goto TailCall_cGreaterOrEq;
+Lhk: ByteCodePtr -= 1;
+     data->ByteCode.pop_back();
+     opcode = cGreater;
+     goto TailCall_cGreater;
+Lhl: ByteCodePtr -= 1;
+     data->ByteCode.pop_back();
+     opcode = cEqual; goto Lme;
+Lhm: data->ByteCode.pop_back(); goto Lmh;
+Lhn: ImmedPtr[0] = !truthValue(x); return;
+Lhp: ImmedPtr[-1] = truthValue(x)||truthValue(y); goto Lai;
+Lia: data->Immed.pop_back();
+     data->ByteCode.pop_back();
+     data->ByteCode.pop_back();
+     AddFunctionOpcode(cAbs);
+     data->Immed.push_back(x+x);
+Lng: data->ByteCode.push_back(cImmed); goto Lmk;
+Lib: ByteCodePtr[-1] = cImmed;
+     data->ByteCode.pop_back(); goto Lmg;
+Lic: ByteCodePtr[-1] = cImmed;
+     data->ByteCode.pop_back();
+     AddFunctionOpcode(cMul);
+     opcode = cExp2;
+     FP_ReDefinePointers();
+     goto TailCall_cExp2;
+Lid: ImmedPtr[-1] = y*x;
+     data->Immed.pop_back();
+     data->ByteCode.pop_back();
+     data->ByteCode.pop_back(); goto Lmk;
+Lie: ByteCodePtr[-1] = cImmed;
+     data->ByteCode.pop_back();
+     AddFunctionOpcode(cMul); goto Lmk;
+Lif: ByteCodePtr[-1] = cImmed;
+     ByteCodePtr -= 1;
+     data->ByteCode.pop_back(); goto Lml;
+Lig: data->Immed.pop_back();
+     data->ByteCode.pop_back();
+     data->ByteCode.pop_back();
+     data->ByteCode.pop_back();
+     AddFunctionOpcode(cMul);
+     data->Immed.push_back(x); goto Lng;
+Lih: ImmedPtr[0] = Value_t(0); goto Lln;
+Lii: data->Immed.pop_back();
+     data->ByteCode.pop_back(); goto Llm;
+Lij: data->Immed.pop_back();
+     data->ByteCode.pop_back();
+     opcode = cCbrt;
+     FP_ReDefinePointers();
+     goto TailCall_cCbrt;
+Lik: data->Immed.pop_back();
+     data->ByteCode.pop_back();
+     AddFunctionOpcode(cCbrt);
+Lnh: opcode = cInv;
+     FP_ReDefinePointers();
+     goto TailCall_cInv;
+Lil: data->Immed.pop_back(); goto Ldn;
+Lim: data->Immed.pop_back();
+     data->ByteCode.pop_back(); goto Lnh;
+Lin: data->Immed.pop_back();
+     data->Immed.pop_back();
+     data->ByteCode.pop_back();
+     data->ByteCode.pop_back();
+     data->ByteCode.pop_back();
+     AddFunctionOpcode(cAbs);
+     data->Immed.push_back(y*x); goto Lng;
+Lio: ImmedPtr[0] = x+x; goto Lif;
+Lip: ImmedPtr[-1] = fp_pow(y,x); goto Lai;
+Lja: ImmedPtr[0] = DegreesToRadians(x); return;
+Ljb: data->ByteCode.pop_back();
+     AddFunctionOpcode(cSin); goto Llj;
+Ljc: ImmedPtr[0] = fp_sin(x); return;
+Ljd: data->ByteCode.pop_back();
+     AddFunctionOpcode(cSqr);
+     data->Immed.push_back(Value_t(-1)); goto Lll;
+Lje: data->ByteCode.pop_back();
+     AddFunctionOpcode(cSinh); goto Llj;
+Ljf: ImmedPtr[0] = fp_sinh(x); return;
+Ljg: ByteCodePtr -= 1;
+     data->ByteCode.pop_back(); goto Lmp;
+Ljh: ByteCodePtr -= 1;
+     data->ByteCode.pop_back();
+     opcode = cAbs; goto Llc;
+Lji: ImmedPtr[0] = fp_sqrt(x); return;
+Ljj: ByteCodePtr -= 1;
+     data->ByteCode.pop_back(); goto Lne;
+Ljk: ImmedPtr[-1] = y-x; goto Lai;
+Ljl: ImmedPtr[0] = -x; goto Lne;
+Ljm: data->ByteCode.pop_back();
+     AddFunctionOpcode(cTan); goto Llj;
+Ljn: ImmedPtr[0] = fp_tan(x); return;
+Ljo: data->ByteCode.pop_back();
+     AddFunctionOpcode(cTanh); goto Llj;
+Ljp: ImmedPtr[0] = fp_tanh(x); return;
+Lka: ImmedPtr[0] = fp_trunc(x); return;
+Lkb: ImmedPtr[-1] = x-y;
+Lni: data->Immed.pop_back();
+     data->ByteCode.pop_back();
+Lnj: data->ByteCode.pop_back();
+Lnk: AddFunctionOpcode(A); return;
+Lkc: ImmedPtr[0] = fp_tan(x);
+Lnl: ByteCodePtr[-1] = cImmed; goto Lnj;
+Lkd: ImmedPtr[0] = fp_log(x); goto Lnl;
+Lke: ImmedPtr[0] = fp_log2(x); goto Lnl;
+Lkf: ImmedPtr[0] = fp_exp(x); goto Lnl;
+Lkg: ImmedPtr[0] = fp_pow(Value_t(10),x); goto Lnl;
+Lkh: ImmedPtr[0] = fp_exp2(x); goto Lnl;
+Lki: ImmedPtr[-1] = x/y; goto Lni;
+Lkj: ImmedPtr[-1] = x/y;
+     data->Immed.pop_back();
+     data->ByteCode.pop_back();
+Lnm: data->ByteCode.pop_back();
+     AddFunctionOpcode(OppositeComparisonOpcode(A)); return;
+Lkk: ImmedPtr[0] = -x;
+     ByteCodePtr[-1] = cImmed; goto Lnm;
+Lkl: ImmedPtr[-1] = fp_pow(x,1/y); goto Lni;
+Lkm: ImmedPtr[0] = fp_asinh(x); goto Lnl;
+Lkn: data->Immed.pop_back();
+     data->ByteCode.pop_back();
+     data->ByteCode.pop_back();
+     AddFunctionOpcode(cAbs);
+     data->Immed.push_back(fp_sqrt(x));
+     data->ByteCode.push_back(cImmed); goto Lnk;
+Lko: ImmedPtr[0] = fp_atanh(x); goto Lnl;
+Lkp: data->ByteCode.push_back(cDup); return;
+Lla: ByteCodePtr[0] = cDup; return;
+Llb: data->ByteCode.push_back(opcode); return;
+return;
+// This list of dummy gotos is here to inhibit
+// compiler warnings on unused labels
+goto TailCall_cAcos;goto TailCall_cAcosh;goto TailCall_cAnd;
+goto TailCall_cAsin;goto TailCall_cAsinh;goto TailCall_cAtan;
+goto TailCall_cAtan2;goto TailCall_cAtanh;goto TailCall_cCeil;
+goto TailCall_cFloor;goto TailCall_cInt;goto TailCall_cLog;
+goto TailCall_cLog10;goto TailCall_cLog2;goto TailCall_cMax;
+goto TailCall_cMin;goto TailCall_cMod;goto TailCall_cOr;
+goto TailCall_cRad;goto TailCall_cSin;goto TailCall_cSinh;
+goto TailCall_cSqrt;goto TailCall_cSub;goto TailCall_cTan;
+goto TailCall_cTanh;goto TailCall_cTrunc;
+#endif
+
+#undef FP_ReDefinePointers
+#undef FP_TRACE_BYTECODE_OPTIMIZATION
+#undef FP_TRACE_OPCODENAME
diff --git a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/fparser.cpp b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/fparser.cpp
new file mode 100644
index 0000000000..1c2df00a42
--- /dev/null
+++ b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/fparser.cpp
@@ -0,0 +1,3070 @@
+/***************************************************************************\
+|* Function Parser for C++ v4.0.3                                          *|
+|*-------------------------------------------------------------------------*|
+|* Copyright: Juha Nieminen, Joel Yliluoma                                 *|
+\***************************************************************************/
+
+#pragma implementation
+
+#include "fpconfig.h"
+#include "fparser.h"
+
+#include <set>
+#include <cstdlib>
+#include <cstring>
+#include <cctype>
+#include <cmath>
+#include <cassert>
+using namespace std;
+
+#include "fptypes.h"
+using namespace FUNCTIONPARSERTYPES;
+
+#ifdef FP_USE_THREAD_SAFE_EVAL_WITH_ALLOCA
+#ifndef FP_USE_THREAD_SAFE_EVAL
+#define FP_USE_THREAD_SAFE_EVAL
+#endif
+#endif
+
+#ifdef __GNUC__
+# define likely(x)       __builtin_expect(!!(x), 1)
+# define unlikely(x)     __builtin_expect(!!(x), 0)
+#else
+# define likely(x)   (x)
+# define unlikely(x) (x)
+#endif
+
+//=========================================================================
+// Name handling functions
+//=========================================================================
+namespace
+{
+    template<typename Value_t>
+    inline Value_t const_pi()
+    {
+        return Value_t(3.1415926535897932384626433832795L);
+    }
+
+#ifdef FP_SUPPORT_MPFR_FLOAT_TYPE
+    template<>
+    inline MpfrFloat const_pi<MpfrFloat>() { return MpfrFloat::const_pi(); }
+#endif
+
+    template<typename Value_t>
+    inline Value_t const_e()
+    {
+        return Value_t(2.7182818284590452353602874713526624977572L);
+    }
+
+#ifdef FP_SUPPORT_MPFR_FLOAT_TYPE
+    template<>
+    inline MpfrFloat const_e<MpfrFloat>() { return MpfrFloat::const_e(); }
+#endif
+
+
+    template<typename Value_t>
+    bool addNewNameData(namePtrsType<Value_t>& namePtrs,
+                        std::pair<NamePtr, NameData<Value_t> >& newName,
+                        bool isVar)
+    {
+        typename namePtrsType<Value_t>::iterator nameIter =
+            namePtrs.lower_bound(newName.first);
+
+        if(nameIter != namePtrs.end() && newName.first == nameIter->first)
+        {
+            // redefining a var is not allowed.
+            if(isVar)
+                return false;
+
+            // redefining other tokens is allowed, if the type stays the same.
+            if(nameIter->second.type != newName.second.type)
+                return false;
+
+            // update the data
+            nameIter->second = newName.second;
+            return true;
+        }
+
+        if(!isVar)
+        {
+            // Allocate a copy of the name (pointer stored in the map key)
+            // However, for VARIABLEs, the pointer points to VariableString,
+            // which is managed separately. Thusly, only done when !IsVar.
+            char* namebuf = new char[newName.first.nameLength];
+            memcpy(namebuf, newName.first.name, newName.first.nameLength);
+            newName.first.name = namebuf;
+        }
+
+        namePtrs.insert(nameIter, newName);
+        return true;
+    }
+
+    template<typename Value_t>
+    std::string findName(const namePtrsType<Value_t>& nameMap,
+                         unsigned index,
+                         typename NameData<Value_t>::DataType type)
+    {
+        for(typename namePtrsType<Value_t>::const_iterator
+                iter = nameMap.begin();
+            iter != nameMap.end();
+            ++iter)
+        {
+            if(iter->second.type != type) continue;
+            if(iter->second.index == index)
+                return std::string(iter->first.name,
+                                   iter->first.name + iter->first.nameLength);
+        }
+        return "?";
+    }
+
+    unsigned readOpcodeForFloatType(const char* input)
+    {
+    /*
+     Return value if built-in function:
+              16 lowest bits = function name length
+              15 next bits   = function opcode
+              1 bit (&0x80000000U) = indicates function
+     Return value if not built-in function:
+              31 lowest bits = function name length
+              other bits zero
+    */
+#include "fp_identifier_parser.inc"
+        return 0;
+    }
+
+    inline unsigned readOpcodeForIntType(const char* input)
+    {
+        const unsigned value = readOpcodeForFloatType(input);
+        if((value & 0x80000000U) != 0 &&
+           !Functions[(value >> 16) & 0x7FFF].okForInt())
+            return value & 0xFFFF;
+        return value;
+    }
+
+    template<typename value_t>
+    struct IsIntType
+    {
+        enum { result = false };
+    };
+#ifdef FP_SUPPORT_LONG_INT_TYPE
+    template<>
+    struct IsIntType<long>
+    {
+        enum { result = true };
+    };
+#endif
+#ifdef FP_SUPPORT_GMP_INT_TYPE
+    template<>
+    struct IsIntType<GmpInt>
+    {
+        enum { result = true };
+    };
+#endif
+
+    template<typename Value_t>
+    inline unsigned readOpcode(const char* input)
+    {
+        return IsIntType<Value_t>::result
+                ? readOpcodeForIntType(input)
+                : readOpcodeForFloatType(input);
+    }
+
+    template<typename Value_t>
+    bool containsOnlyValidNameChars(const std::string& name)
+    {
+        if(name.empty()) return false;
+        return readOpcode<Value_t>(name.c_str()) == (unsigned) name.size();
+    }
+
+    template<typename Value_t>
+    inline bool truthValue(Value_t d)
+    {
+        return IsIntType<Value_t>::result
+                ? d != 0
+                : fp_abs(d) >= Value_t(0.5);
+    }
+
+    template<typename Value_t>
+    inline bool truthValue_abs(Value_t abs_d)
+    {
+        return IsIntType<Value_t>::result
+                ? abs_d > 0
+                : abs_d >= Value_t(0.5);
+    }
+
+    template<typename Value_t>
+    inline Value_t Min(Value_t d1, Value_t d2) { return d1<d2 ? d1 : d2; }
+
+    template<typename Value_t>
+    inline Value_t Max(Value_t d1, Value_t d2) { return d1>d2 ? d1 : d2; }
+
+    template<typename Value_t>
+    inline const Value_t& GetDegreesToRadiansFactor()
+    {
+        static const Value_t factor = const_pi<Value_t>() / Value_t(180);
+        return factor;
+    }
+
+    template<typename Value_t>
+    inline Value_t DegreesToRadians(Value_t degrees)
+    {
+        return degrees * GetDegreesToRadiansFactor<Value_t>();
+    }
+
+    template<typename Value_t>
+    inline const Value_t& GetRadiansToDegreesFactor()
+    {
+        static const Value_t factor = Value_t(180) / const_pi<Value_t>();
+        return factor;
+    }
+
+    template<typename Value_t>
+    inline Value_t RadiansToDegrees(Value_t radians)
+    {
+        return radians * GetRadiansToDegreesFactor<Value_t>();
+    }
+
+    template<typename Value_t>
+    inline bool isEvenInteger(Value_t value)
+    {
+        long longval = (long)value;
+        return fp_equal(value, Value_t(longval)) && (longval%2) == 0;
+    }
+
+#ifdef FP_SUPPORT_MPFR_FLOAT_TYPE
+    template<>
+    inline bool isEvenInteger(MpfrFloat value)
+    {
+        return value.isInteger() && value%2 == 0;
+    }
+#endif
+
+#ifdef FP_SUPPORT_GMP_INT_TYPE
+    template<>
+    inline bool isEvenInteger(GmpInt value)
+    {
+        return value%2 == 0;
+    }
+#endif
+
+    template<typename Value_t>
+    inline bool isOddInteger(Value_t value)
+    {
+        long longval = (long)value;
+        return fp_equal(value, Value_t(longval)) && (longval%2) != 0;
+    }
+
+#ifdef FP_SUPPORT_MPFR_FLOAT_TYPE
+    template<>
+    inline bool isOddInteger(MpfrFloat value)
+    {
+        return value.isInteger() && value%2 != 0;
+    }
+#endif
+
+#ifdef FP_SUPPORT_GMP_INT_TYPE
+    template<>
+    inline bool isOddInteger(GmpInt value)
+    {
+        return value%2 != 0;
+    }
+#endif
+
+    template<typename Value_t>
+    inline int valueToInt(Value_t value) { return int(value); }
+
+#ifdef FP_SUPPORT_MPFR_FLOAT_TYPE
+    template<>
+    inline int valueToInt(MpfrFloat value) { return int(value.toInt()); }
+#endif
+
+#ifdef FP_SUPPORT_GMP_INT_TYPE
+    template<>
+    inline int valueToInt(GmpInt value) { return int(value.toInt()); }
+#endif
+}
+
+
+//=========================================================================
+// Data struct implementation
+//=========================================================================
+template<typename Value_t>
+FunctionParserBase<Value_t>::Data::Data():
+    referenceCounter(1),
+    numVariables(0),
+    StackSize(0)
+{}
+
+template<typename Value_t>
+FunctionParserBase<Value_t>::Data::Data(const Data& rhs):
+    referenceCounter(0),
+    numVariables(rhs.numVariables),
+    variablesString(rhs.variablesString),
+    namePtrs(),
+    FuncPtrs(rhs.FuncPtrs),
+    FuncParsers(rhs.FuncParsers),
+    ByteCode(rhs.ByteCode),
+    Immed(rhs.Immed),
+#ifndef FP_USE_THREAD_SAFE_EVAL
+    Stack(rhs.StackSize),
+#endif
+    StackSize(rhs.StackSize)
+{
+    for(typename namePtrsType<Value_t>::const_iterator i =
+            rhs.namePtrs.begin();
+        i != rhs.namePtrs.end();
+        ++i)
+    {
+        if(i->second.type == NameData<Value_t>::VARIABLE)
+        {
+            const size_t variableStringOffset =
+                i->first.name - rhs.variablesString.c_str();
+            std::pair<NamePtr, NameData<Value_t> > tmp
+                (NamePtr(&variablesString[variableStringOffset],
+                         i->first.nameLength),
+                 i->second);
+            namePtrs.insert(namePtrs.end(), tmp);
+        }
+        else
+        {
+            std::pair<NamePtr, NameData<Value_t> > tmp
+                (NamePtr(new char[i->first.nameLength], i->first.nameLength),
+                 i->second );
+            memcpy(const_cast<char*>(tmp.first.name), i->first.name,
+                   tmp.first.nameLength);
+            namePtrs.insert(namePtrs.end(), tmp);
+        }
+    }
+}
+
+template<typename Value_t>
+FunctionParserBase<Value_t>::Data::~Data()
+{
+    for(typename namePtrsType<Value_t>::iterator i =
+            namePtrs.begin();
+        i != namePtrs.end();
+        ++i)
+    {
+        if(i->second.type != NameData<Value_t>::VARIABLE)
+            delete[] i->first.name;
+    }
+}
+
+
+//=========================================================================
+// FunctionParser constructors, destructor and assignment
+//=========================================================================
+template<typename Value_t>
+FunctionParserBase<Value_t>::FunctionParserBase():
+    delimiterChar(0),
+    parseErrorType(NO_FUNCTION_PARSED_YET), evalErrorType(0),
+    data(new Data),
+    useDegreeConversion(false),
+    evalRecursionLevel(0),
+    StackPtr(0), errorLocation(0)
+{
+}
+
+template<typename Value_t>
+FunctionParserBase<Value_t>::~FunctionParserBase()
+{
+    if(--(data->referenceCounter) == 0)
+        delete data;
+}
+
+template<typename Value_t>
+FunctionParserBase<Value_t>::FunctionParserBase(const FunctionParserBase& cpy):
+    delimiterChar(cpy.delimiterChar),
+    parseErrorType(cpy.parseErrorType),
+    evalErrorType(cpy.evalErrorType),
+    data(cpy.data),
+    useDegreeConversion(cpy.useDegreeConversion),
+    evalRecursionLevel(0),
+    StackPtr(0), errorLocation(0)
+{
+    ++(data->referenceCounter);
+}
+
+template<typename Value_t>
+FunctionParserBase<Value_t>&
+FunctionParserBase<Value_t>::operator=(const FunctionParserBase& cpy)
+{
+    if(data != cpy.data)
+    {
+        if(--(data->referenceCounter) == 0) delete data;
+
+        delimiterChar = cpy.delimiterChar;
+        parseErrorType = cpy.parseErrorType;
+        evalErrorType = cpy.evalErrorType;
+        data = cpy.data;
+        useDegreeConversion = cpy.useDegreeConversion;
+        evalRecursionLevel = cpy.evalRecursionLevel;
+
+        ++(data->referenceCounter);
+    }
+
+    return *this;
+}
+
+
+template<typename Value_t>
+void FunctionParserBase<Value_t>::setDelimiterChar(char c)
+{
+    delimiterChar = c;
+}
+
+
+//---------------------------------------------------------------------------
+// Copy-on-write method
+//---------------------------------------------------------------------------
+template<typename Value_t>
+void FunctionParserBase<Value_t>::CopyOnWrite()
+{
+    if(data->referenceCounter > 1)
+    {
+        Data* oldData = data;
+        data = new Data(*oldData);
+        --(oldData->referenceCounter);
+        data->referenceCounter = 1;
+    }
+}
+
+template<typename Value_t>
+void FunctionParserBase<Value_t>::ForceDeepCopy()
+{
+    CopyOnWrite();
+}
+
+
+//=========================================================================
+// User-defined constant and function addition
+//=========================================================================
+template<typename Value_t>
+bool FunctionParserBase<Value_t>::AddConstant(const std::string& name,
+                                              Value_t value)
+{
+    if(!containsOnlyValidNameChars<Value_t>(name)) return false;
+
+    CopyOnWrite();
+    std::pair<NamePtr, NameData<Value_t> > newName
+        (NamePtr(name.data(), unsigned(name.size())),
+         NameData<Value_t>(NameData<Value_t>::CONSTANT, value));
+
+    return addNewNameData(data->namePtrs, newName, false);
+}
+
+template<typename Value_t>
+bool FunctionParserBase<Value_t>::AddUnit(const std::string& name,
+                                          Value_t value)
+{
+    if(!containsOnlyValidNameChars<Value_t>(name)) return false;
+
+    CopyOnWrite();
+    std::pair<NamePtr, NameData<Value_t> > newName
+        (NamePtr(name.data(), unsigned(name.size())),
+         NameData<Value_t>(NameData<Value_t>::UNIT, value));
+    return addNewNameData(data->namePtrs, newName, false);
+}
+
+template<typename Value_t>
+bool FunctionParserBase<Value_t>::AddFunction
+(const std::string& name, FunctionPtr ptr, unsigned paramsAmount)
+{
+    if(!containsOnlyValidNameChars<Value_t>(name)) return false;
+
+    CopyOnWrite();
+    std::pair<NamePtr, NameData<Value_t> > newName
+        (NamePtr(name.data(), unsigned(name.size())),
+         NameData<Value_t>(NameData<Value_t>::FUNC_PTR,
+                           unsigned(data->FuncPtrs.size())));
+
+    const bool success = addNewNameData(data->namePtrs, newName, false);
+    if(success)
+    {
+        data->FuncPtrs.push_back(typename Data::FuncPtrData());
+        data->FuncPtrs.back().funcPtr = ptr;
+        data->FuncPtrs.back().params = paramsAmount;
+    }
+    return success;
+}
+
+template<typename Value_t>
+bool FunctionParserBase<Value_t>::CheckRecursiveLinking
+(const FunctionParserBase* fp) const
+{
+    if(fp == this) return true;
+    for(unsigned i = 0; i < fp->data->FuncParsers.size(); ++i)
+        if(CheckRecursiveLinking(fp->data->FuncParsers[i].parserPtr))
+            return true;
+    return false;
+}
+
+template<typename Value_t>
+bool FunctionParserBase<Value_t>::AddFunction(const std::string& name,
+                                              FunctionParserBase& fp)
+{
+    if(!containsOnlyValidNameChars<Value_t>(name) ||
+       CheckRecursiveLinking(&fp))
+        return false;
+
+    CopyOnWrite();
+    std::pair<NamePtr, NameData<Value_t> > newName
+        (NamePtr(name.data(), unsigned(name.size())),
+         NameData<Value_t>(NameData<Value_t>::PARSER_PTR,
+                           unsigned(data->FuncParsers.size())));
+
+    const bool success = addNewNameData(data->namePtrs, newName, false);
+    if(success)
+    {
+        data->FuncParsers.push_back(typename Data::FuncPtrData());
+        data->FuncParsers.back().parserPtr = &fp;
+        data->FuncParsers.back().params = fp.data->numVariables;
+    }
+    return success;
+}
+
+template<typename Value_t>
+bool FunctionParserBase<Value_t>::RemoveIdentifier(const std::string& name)
+{
+    CopyOnWrite();
+
+    NamePtr namePtr(name.data(), unsigned(name.size()));
+
+    typename namePtrsType<Value_t>::iterator
+        nameIter = data->namePtrs.find(namePtr);
+
+    if(nameIter != data->namePtrs.end())
+    {
+        if(nameIter->second.type == NameData<Value_t>::VARIABLE)
+        {
+            // Illegal attempt to delete variables
+            return false;
+        }
+        delete[] nameIter->first.name;
+        data->namePtrs.erase(nameIter);
+        return true;
+    }
+    return false;
+}
+
+
+//=========================================================================
+// Function parsing
+//=========================================================================
+namespace
+{
+    // Error messages returned by ErrorMsg():
+    const char* const ParseErrorMessage[]=
+    {
+        "Syntax error",                             // 0
+        "Mismatched parenthesis",                   // 1
+        "Missing ')'",                              // 2
+        "Empty parentheses",                        // 3
+        "Syntax error: Operator expected",          // 4
+        "Not enough memory",                        // 5
+        "An unexpected error occurred. Please make a full bug report "
+        "to the author",                            // 6
+        "Syntax error in parameter 'Vars' given to "
+        "FunctionParser::Parse()",                  // 7
+        "Illegal number of parameters to function", // 8
+        "Syntax error: Premature end of string",    // 9
+        "Syntax error: Expecting ( after function", // 10
+        "Syntax error: Unknown identifier",         // 11
+        "(No function has been parsed yet)",
+        ""
+    };
+
+    template<typename Value_t>
+    inline typename FunctionParserBase<Value_t>::ParseErrorType
+    noCommaError(char c)
+    {
+        return c == ')' ?
+            FunctionParserBase<Value_t>::ILL_PARAMS_AMOUNT :
+            FunctionParserBase<Value_t>::SYNTAX_ERROR;
+    }
+
+    template<typename Value_t>
+    inline typename FunctionParserBase<Value_t>::ParseErrorType
+    noParenthError(char c)
+    {
+        return c == ',' ?
+            FunctionParserBase<Value_t>::ILL_PARAMS_AMOUNT :
+            FunctionParserBase<Value_t>::MISSING_PARENTH;
+    }
+
+    template<unsigned offset>
+    struct IntLiteralMask
+    {
+        enum { mask =
+        //    (    1UL << ('-'-offset)) |
+            (0x3FFUL << ('0'-offset)) }; /* 0x3FF = 10 bits worth "1" */
+        // Note: If you change fparser to support negative numbers parsing
+        //       (as opposed to parsing them as cNeg followed by literal),
+        //       enable the '-' line above, and change the offset value
+        //       in BeginsLiteral() to '-' instead of '.'.
+    };
+
+    template<typename Value_t, unsigned offset>
+    struct LiteralMask
+    {
+        enum { mask =
+            (    1UL << ('.'-offset)) |
+            IntLiteralMask<offset>::mask };
+    };
+#ifdef FP_SUPPORT_LONG_INT_TYPE
+    template<unsigned offset>
+    struct LiteralMask<long, offset>: public IntLiteralMask<offset>
+    {
+    };
+#endif
+#ifdef FP_SUPPORT_GMP_INT_TYPE
+    template<unsigned offset>
+    struct LiteralMask<GmpInt, offset>: public IntLiteralMask<offset>
+    {
+    };
+#endif
+
+    template<unsigned offset>
+    struct SimpleSpaceMask
+    {
+        enum { mask =
+            (1UL << ('\r'-offset)) |
+            (1UL << ('\n'-offset)) |
+            (1UL << ('\v'-offset)) |
+            (1UL << ('\t'-offset)) |
+            (1UL << (' ' -offset)) };
+    };
+
+    template<typename Value_t>
+    inline bool BeginsLiteral(unsigned byte)
+    {
+        const unsigned n = sizeof(unsigned long)>=8 ? 0 : '.';
+        byte -= n;
+        if(byte > (unsigned char)('9'-n)) return false;
+        unsigned long shifted = 1UL << byte;
+        const unsigned long mask = LiteralMask<Value_t, n>::mask;
+        return (mask & shifted) != 0;
+    }
+
+    template<typename CharPtr>
+    inline void SkipSpace(CharPtr& function)
+    {
+/*
+        Space characters in unicode:
+U+0020  SPACE                      Depends on font, often adjusted (see below)
+U+00A0  NO-BREAK SPACE             As a space, but often not adjusted
+U+2000  EN QUAD                    1 en (= 1/2 em)
+U+2001  EM QUAD                    1 em (nominally, the height of the font)
+U+2002  EN SPACE                   1 en (= 1/2 em)
+U+2003  EM SPACE                   1 em
+U+2004  THREE-PER-EM SPACE         1/3 em
+U+2005  FOUR-PER-EM SPACE          1/4 em
+U+2006  SIX-PER-EM SPACE           1/6 em
+U+2007  FIGURE SPACE               Tabular width, the width of digits
+U+2008  PUNCTUATION SPACE          The width of a period .
+U+2009  THIN SPACE                 1/5 em (or sometimes 1/6 em)
+U+200A  HAIR SPACE                 Narrower than THIN SPACE
+U+200B  ZERO WIDTH SPACE           Nominally no width, but may expand
+U+202F  NARROW NO-BREAK SPACE      Narrower than NO-BREAK SPACE (or SPACE)
+U+205F  MEDIUM MATHEMATICAL SPACE  4/18 em
+U+3000  IDEOGRAPHIC SPACE          The width of ideographic (CJK) characters.
+        Also:
+U+000A  \n
+U+000D  \r
+U+0009  \t
+U+000B  \v
+        As UTF-8 sequences:
+            09
+            0A
+            0B
+            0D
+            20
+            C2 A0
+            E2 80 80-8B
+            E2 80 AF
+            E2 81 9F
+            E3 80 80
+*/
+        while(true)
+        {
+            const unsigned n = sizeof(unsigned long)>=8 ? 0 : '\t';
+            typedef signed char schar;
+            unsigned byte = (unsigned char)*function;
+            byte -= n;
+            // ^Note: values smaller than n intentionally become
+            //        big values here due to integer wrap. The
+            //        comparison below thus excludes them, making
+            //        the effective range 0x09..0x20 (32-bit)
+            //        or 0x00..0x20 (64-bit) within the if-clause.
+            if(byte <= (unsigned char)(' '-n))
+            {
+                unsigned long shifted = 1UL << byte;
+                const unsigned long mask = SimpleSpaceMask<n>::mask;
+                if(mask & shifted)
+                    { ++function; continue; } // \r, \n, \t, \v and space
+                break;
+            }
+            if(likely(byte < 0xC2-n)) break;
+
+            if(byte == 0xC2-n && function[1] == char(0xA0))
+                { function += 2; continue; } // U+00A0
+            if(byte == 0xE3-n &&
+               function[1] == char(0x80) && function[2] == char(0x80))
+                { function += 3; continue; } // U+3000
+            if(byte == 0xE2-n)
+            {
+                if(function[1] == char(0x81))
+                {
+                    if(function[2] != char(0x9F)) break;
+                    function += 3; // U+205F
+                    continue;
+                }
+                if(function[1] == char(0x80))
+                if(function[2] == char(0xAF) || // U+202F
+                   schar(function[2]) <= schar(0x8B) // U+2000..U+200B
+                  )
+                {
+                    function += 3;
+                    continue;
+                }
+            }
+            break;
+        } // while(true)
+    } // SkipSpace(CharPtr& function)
+}
+
+// Return parse error message
+// --------------------------
+template<typename Value_t>
+const char* FunctionParserBase<Value_t>::ErrorMsg() const
+{
+    return ParseErrorMessage[parseErrorType];
+}
+
+
+// Parse variables
+// ---------------
+template<typename Value_t>
+bool FunctionParserBase<Value_t>::ParseVariables
+(const std::string& inputVarString)
+{
+    if(data->variablesString == inputVarString) return true;
+
+    /* Delete existing variables from namePtrs */
+    for(typename namePtrsType<Value_t>::iterator i =
+            data->namePtrs.begin();
+        i != data->namePtrs.end(); )
+    {
+        if(i->second.type == NameData<Value_t>::VARIABLE)
+        {
+            typename namePtrsType<Value_t>::iterator j (i);
+            ++i;
+            data->namePtrs.erase(j);
+        }
+        else ++i;
+    }
+    data->variablesString = inputVarString;
+
+    const std::string& vars = data->variablesString;
+    const unsigned len = unsigned(vars.size());
+
+    unsigned varNumber = VarBegin;
+
+    const char* beginPtr = vars.c_str();
+    const char* finalPtr = beginPtr + len;
+    while(beginPtr < finalPtr)
+    {
+        SkipSpace(beginPtr);
+        unsigned nameLength = readOpcode<Value_t>(beginPtr);
+        if(nameLength == 0 || (nameLength & 0x80000000U)) return false;
+        const char* endPtr = beginPtr + nameLength;
+        SkipSpace(endPtr);
+        if(endPtr != finalPtr && *endPtr != ',') return false;
+
+        std::pair<NamePtr, NameData<Value_t> > newName
+            (NamePtr(beginPtr, nameLength),
+             NameData<Value_t>(NameData<Value_t>::VARIABLE, varNumber++));
+
+        if(!addNewNameData(data->namePtrs, newName, true))
+        {
+            return false;
+        }
+
+        beginPtr = endPtr + 1;
+    }
+
+    data->numVariables = varNumber - VarBegin;
+    return true;
+}
+
+// Parse interface functions
+// -------------------------
+template<typename Value_t>
+int FunctionParserBase<Value_t>::Parse(const char* Function,
+                                       const std::string& Vars,
+                                       bool useDegrees)
+{
+    CopyOnWrite();
+
+    if(!ParseVariables(Vars))
+    {
+        parseErrorType = INVALID_VARS;
+        return int(strlen(Function));
+    }
+
+    return ParseFunction(Function, useDegrees);
+}
+
+template<typename Value_t>
+int FunctionParserBase<Value_t>::Parse(const std::string& Function,
+                                       const std::string& Vars,
+                                       bool useDegrees)
+{
+    CopyOnWrite();
+
+    if(!ParseVariables(Vars))
+    {
+        parseErrorType = INVALID_VARS;
+        return int(Function.size());
+    }
+
+    return ParseFunction(Function.c_str(), useDegrees);
+}
+
+
+// Main parsing function
+// ---------------------
+template<typename Value_t>
+int FunctionParserBase<Value_t>::ParseFunction(const char* function,
+                                               bool useDegrees)
+{
+    useDegreeConversion = useDegrees;
+    parseErrorType = FP_NO_ERROR;
+
+    data->ByteCode.clear(); data->ByteCode.reserve(128);
+    data->Immed.clear(); data->Immed.reserve(128);
+    data->StackSize = StackPtr = 0;
+
+    const char* ptr = CompileExpression(function);
+    if(parseErrorType != FP_NO_ERROR) return int(errorLocation - function);
+
+    assert(ptr); // Should never be null at this point. It's a bug otherwise.
+    if(*ptr)
+    {
+        if(delimiterChar == 0 || *ptr != delimiterChar)
+            parseErrorType = EXPECT_OPERATOR;
+        return int(ptr - function);
+    }
+
+#ifndef FP_USE_THREAD_SAFE_EVAL
+    data->Stack.resize(data->StackSize);
+#endif
+
+    return -1;
+}
+
+
+//=========================================================================
+// Parsing and bytecode compiling functions
+//=========================================================================
+template<typename Value_t>
+inline const char* FunctionParserBase<Value_t>::SetErrorType(ParseErrorType t,
+                                                             const char* pos)
+{
+    parseErrorType = t;
+    errorLocation = pos;
+    return 0;
+}
+
+template<typename Value_t>
+inline void FunctionParserBase<Value_t>::incStackPtr()
+{
+    if(++StackPtr > data->StackSize) ++(data->StackSize);
+}
+
+namespace
+{
+    const unsigned char powi_factor_table[128] =
+    {
+        0,1,0,0,0,0,0,0, 0, 0,0,0,0,0,0,3,/*   0 -  15 */
+        0,0,0,0,0,0,0,0, 0, 5,0,3,0,0,3,0,/*  16 -  31 */
+        0,0,0,0,0,0,0,3, 0, 0,0,0,0,5,0,0,/*  32 -  47 */
+        0,0,5,3,0,0,3,5, 0, 3,0,0,3,0,0,3,/*  48 -  63 */
+        0,0,0,0,0,0,0,0, 0, 0,0,3,0,0,3,0,/*  64 -  79 */
+        0,9,0,0,0,5,0,3, 0, 0,5,7,0,0,0,5,/*  80 -  95 */
+        0,0,0,3,5,0,3,0, 0, 3,0,0,3,0,5,3,/*  96 - 111 */
+        0,0,3,5,0,9,0,7, 3,11,0,3,0,5,3,0,/* 112 - 127 */
+    };
+
+    inline int get_powi_factor(int abs_int_exponent)
+    {
+        if(abs_int_exponent >= int(sizeof(powi_factor_table))) return 0;
+        return powi_factor_table[abs_int_exponent];
+    }
+
+#if 0
+    int EstimatePowiComplexity(int abs_int_exponent)
+    {
+        int cost = 0;
+        while(abs_int_exponent > 1)
+        {
+            int factor = get_powi_factor(abs_int_exponent);
+            if(factor)
+            {
+                cost += EstimatePowiComplexity(factor);
+                abs_int_exponent /= factor;
+                continue;
+            }
+            if(!(abs_int_exponent & 1))
+            {
+                abs_int_exponent /= 2;
+                cost += 3; // sqr
+            }
+            else
+            {
+                cost += 4; // dup+mul
+                abs_int_exponent -= 1;
+            }
+        }
+        return cost;
+    }
+#endif
+
+    bool IsEligibleIntPowiExponent(int int_exponent)
+    {
+        if(int_exponent == 0) return false;
+        int abs_int_exponent = int_exponent;
+    #if 0
+        int cost = 0;
+
+        if(abs_int_exponent < 0)
+        {
+            cost += 11;
+            abs_int_exponent = -abs_int_exponent;
+        }
+
+        cost += EstimatePowiComplexity(abs_int_exponent);
+
+        return cost < (10*3 + 4*4);
+    #else
+        if(abs_int_exponent < 0) abs_int_exponent = -abs_int_exponent;
+
+        return (abs_int_exponent >= 1)
+            && (abs_int_exponent <= 46 ||
+              (abs_int_exponent <= 1024 &&
+              (abs_int_exponent & (abs_int_exponent - 1)) == 0));
+    #endif
+    }
+
+    bool IsLogicalOpcode(unsigned op)
+    {
+        switch(op)
+        {
+          case cAnd: case cAbsAnd:
+          case cOr:  case cAbsOr:
+          case cNot: case cAbsNot:
+          case cNotNot: case cAbsNotNot:
+          case cEqual: case cNEqual:
+          case cLess: case cLessOrEq:
+          case cGreater: case cGreaterOrEq:
+              return true;
+          default: break;
+        }
+        return false;
+    }
+
+    bool IsComparisonOpcode(unsigned op)
+    {
+        switch(op)
+        {
+          case cEqual: case cNEqual:
+          case cLess: case cLessOrEq:
+          case cGreater: case cGreaterOrEq:
+              return true;
+          default: break;
+        }
+        return false;
+    }
+
+    unsigned OppositeComparisonOpcode(unsigned op)
+    {
+        switch(op)
+        {
+            case cLess: return cGreater;
+            case cGreater: return cLess;
+            case cLessOrEq: return cGreaterOrEq;
+            case cGreaterOrEq: return cLessOrEq;
+        }
+        return op;
+    }
+
+    bool IsNeverNegativeValueOpcode(unsigned op)
+    {
+        switch(op)
+        {
+          case cAnd: case cAbsAnd:
+          case cOr:  case cAbsOr:
+          case cNot: case cAbsNot:
+          case cNotNot: case cAbsNotNot:
+          case cEqual: case cNEqual:
+          case cLess: case cLessOrEq:
+          case cGreater: case cGreaterOrEq:
+          case cSqrt: case cRSqrt: case cSqr:
+          case cAbs:
+          case cAcos: case cCosh:
+              return true;
+          default: break;
+        }
+        return false;
+    }
+
+    bool IsAlwaysIntegerOpcode(unsigned op)
+    {
+        switch(op)
+        {
+          case cAnd: case cAbsAnd:
+          case cOr:  case cAbsOr:
+          case cNot: case cAbsNot:
+          case cNotNot: case cAbsNotNot:
+          case cEqual: case cNEqual:
+          case cLess: case cLessOrEq:
+          case cGreater: case cGreaterOrEq:
+          case cInt: case cFloor: case cCeil: case cTrunc:
+              return true;
+          default: break;
+        }
+        return false;
+    }
+
+    bool IsUnaryOpcode(unsigned op)
+    {
+        switch(op)
+        {
+          case cInv: case cNeg:
+          case cNot: case cAbsNot:
+          case cNotNot: case cAbsNotNot:
+          case cSqr: case cRSqrt:
+          case cDeg: case cRad:
+            return true;
+        }
+        return (op < FUNC_AMOUNT && Functions[op].params == 1);
+    }
+
+    bool IsBinaryOpcode(unsigned op)
+    {
+        switch(op)
+        {
+          case cAdd: case cSub: case cRSub:
+          case cMul: case cDiv: case cRDiv:
+          case cMod:
+          case cEqual: case cNEqual: case cLess:
+          case cLessOrEq: case cGreater: case cGreaterOrEq:
+          case cAnd: case cAbsAnd:
+          case cOr: case cAbsOr:
+            return true;
+        }
+        return (op < FUNC_AMOUNT && Functions[op].params == 2);
+    }
+
+    bool HasInvalidRangesOpcode(unsigned op)
+    {
+#ifndef FP_NO_EVALUATION_CHECKS
+        // Returns true, if the given opcode has a range of
+        // input values that gives an error.
+        switch(op)
+        {
+            case cAcos: // allowed range: |x| <= 1
+            case cAsin: // allowed range: |x| <= 1
+            case cAcosh: // allowed range: x >= 1
+            case cAtanh: // allowed range: |x| < 1
+            //case cCot: // note: no range, just separate values
+            //case cCsc: // note: no range, just separate values
+            case cLog: // allowed range: x > 0
+            case cLog2: // allowed range: x > 0
+            case cLog10: // allowed range: x > 0
+        #ifdef FP_SUPPORT_OPTIMIZER
+            case cLog2by: // allowed range: x > 0
+        #endif
+            //case cPow: // note: no range, just separate values
+            //case cSec: // note: no range, just separate values
+            case cSqrt: // allowed range: x >= 0
+            case cRSqrt: // allowed range: x > 0
+            //case cDiv: // note: no range, just separate values
+            //case cRDiv: // note: no range, just separate values
+            //case cInv: // note: no range, just separate values
+                return true;
+        }
+#endif
+        return false;
+    }
+
+#ifdef FP_EPSILON
+    const double EpsilonOrZero = FP_EPSILON;
+#else
+    const double EpsilonOrZero = 0.0;
+#endif
+
+}
+
+template<typename Value_t>
+inline void FunctionParserBase<Value_t>::AddImmedOpcode(Value_t value)
+{
+    data->Immed.push_back(value);
+    data->ByteCode.push_back(cImmed);
+}
+
+template<typename Value_t>
+inline void FunctionParserBase<Value_t>::CompilePowi(int abs_int_exponent)
+{
+    int num_muls=0;
+    while(abs_int_exponent > 1)
+    {
+        int factor = get_powi_factor(abs_int_exponent);
+        if(factor)
+        {
+            CompilePowi(factor);
+            abs_int_exponent /= factor;
+            continue;
+        }
+        if(!(abs_int_exponent & 1))
+        {
+            abs_int_exponent /= 2;
+            data->ByteCode.push_back(cSqr);
+        }
+        else
+        {
+            data->ByteCode.push_back(cDup);
+            incStackPtr();
+            abs_int_exponent -= 1;
+            ++num_muls;
+        }
+    }
+    if(num_muls > 0)
+    {
+        data->ByteCode.resize(data->ByteCode.size()+num_muls, cMul);
+        StackPtr -= num_muls;
+    }
+}
+
+template<typename Value_t>
+inline bool FunctionParserBase<Value_t>::TryCompilePowi(Value_t original_immed)
+{
+    Value_t changed_immed = original_immed;
+    for(int sqrt_count=0; /**/; ++sqrt_count)
+    {
+        int int_exponent = valueToInt(changed_immed);
+        if(changed_immed == Value_t(int_exponent) &&
+           IsEligibleIntPowiExponent(int_exponent))
+        {
+            int abs_int_exponent = int_exponent;
+            if(abs_int_exponent < 0)
+                abs_int_exponent = -abs_int_exponent;
+
+            data->Immed.pop_back(); data->ByteCode.pop_back();
+            --StackPtr;
+            // ^Though the above is accounted for by the procedure
+            // that generates cPow, we need it for correct cFetch
+            // indexes in CompilePowi().
+
+            while(sqrt_count > 0)
+            {
+                int opcode = cSqrt;
+                if(sqrt_count == 1 && int_exponent < 0)
+                {
+                    opcode = cRSqrt;
+                    int_exponent = -int_exponent;
+                }
+                data->ByteCode.push_back(opcode);
+                --sqrt_count;
+            }
+            CompilePowi(abs_int_exponent);
+            if(int_exponent < 0) data->ByteCode.push_back(cInv);
+            ++StackPtr; // Needed because cPow adding will assume this.
+            return true;
+        }
+        if(sqrt_count >= 4) break;
+        changed_immed += changed_immed;
+    }
+
+    // When we don't know whether x >= 0, we still know that
+    // x^y can be safely converted into exp(y * log(x))
+    // when y is _not_ integer, because we know that x >= 0.
+    // Otherwise either expression will give a NaN.
+    if(/*!IsIntegerConst(original_immed) ||*/
+       IsNeverNegativeValueOpcode(data->ByteCode[data->ByteCode.size()-2]))
+    {
+        data->Immed.pop_back();
+        data->ByteCode.pop_back();
+        //--StackPtr; - accounted for by the procedure that generates cPow
+        AddFunctionOpcode(cLog);
+        AddImmedOpcode(original_immed);
+        //incStackPtr(); - this and the next are redundant because...
+        AddFunctionOpcode(cMul);
+        //--StackPtr;    - ...because the cImmed was popped earlier.
+        AddFunctionOpcode(cExp);
+        return true;
+    }
+    return false;
+}
+
+//#include "fpoptimizer/fpoptimizer_opcodename.hh"
+// ^ needed only if FP_TRACE_BYTECODE_OPTIMIZATION() is used
+
+template<typename Value_t>
+inline void FunctionParserBase<Value_t>::AddFunctionOpcode(unsigned opcode)
+{
+#define FP_FLOAT_VERSION 1
+#include "fp_opcode_add.inc"
+#undef FP_FLOAT_VERSION
+}
+
+#ifdef FP_SUPPORT_LONG_INT_TYPE
+template<>
+inline void FunctionParserBase<long>::AddFunctionOpcode(unsigned opcode)
+{
+    typedef long Value_t;
+#define FP_FLOAT_VERSION 0
+#include "fp_opcode_add.inc"
+#undef FP_FLOAT_VERSION
+}
+#endif
+
+#ifdef FP_SUPPORT_GMP_INT_TYPE
+template<>
+inline void FunctionParserBase<GmpInt>::AddFunctionOpcode(unsigned opcode)
+{
+  typedef GmpInt Value_t;
+#define FP_FLOAT_VERSION 0
+#include "fp_opcode_add.inc"
+#undef FP_FLOAT_VERSION
+}
+#endif
+
+template<typename Value_t>
+const char* FunctionParserBase<Value_t>::CompileIf(const char* function)
+{
+    if(*function != '(') return SetErrorType(EXPECT_PARENTH_FUNC, function);
+
+    function = CompileExpression(function+1);
+    if(!function) return 0;
+    if(*function != ',')
+        return SetErrorType(noCommaError<Value_t>(*function), function);
+
+    OPCODE opcode = cIf;
+    if(data->ByteCode.back() == cNotNot) data->ByteCode.pop_back();
+    if(IsNeverNegativeValueOpcode(data->ByteCode.back()))
+    {
+        // If we know that the condition to be tested is always
+        // a positive value (such as when produced by "x<y"),
+        // we can use the faster opcode to evaluate it.
+        // cIf tests whether fabs(cond) >= 0.5,
+        // cAbsIf simply tests whether cond >= 0.5.
+        opcode = cAbsIf;
+    }
+
+    data->ByteCode.push_back(opcode);
+    const unsigned curByteCodeSize = unsigned(data->ByteCode.size());
+    data->ByteCode.push_back(0); // Jump index; to be set later
+    data->ByteCode.push_back(0); // Immed jump index; to be set later
+
+    --StackPtr;
+
+    function = CompileExpression(function + 1);
+    if(!function) return 0;
+    if(*function != ',')
+        return SetErrorType(noCommaError<Value_t>(*function), function);
+
+    data->ByteCode.push_back(cJump);
+    const unsigned curByteCodeSize2 = unsigned(data->ByteCode.size());
+    const unsigned curImmedSize2 = unsigned(data->Immed.size());
+    data->ByteCode.push_back(0); // Jump index; to be set later
+    data->ByteCode.push_back(0); // Immed jump index; to be set later
+
+    --StackPtr;
+
+    function = CompileExpression(function + 1);
+    if(!function) return 0;
+    if(*function != ')')
+        return SetErrorType(noParenthError<Value_t>(*function), function);
+
+    /* A cNop is added as an easy fix for the problem which happens if cNeg
+       or other similar opcodes optimized by Parse() immediately follow an
+       else-branch which could be confused as optimizable with that opcode
+       (eg. cImmed). The optimizer removes the cNop safely.
+     */
+    data->ByteCode.push_back(cNop);
+
+    // Set jump indices
+    data->ByteCode[curByteCodeSize] = curByteCodeSize2+1;
+    data->ByteCode[curByteCodeSize+1] = curImmedSize2;
+    data->ByteCode[curByteCodeSize2] = unsigned(data->ByteCode.size())-1;
+    data->ByteCode[curByteCodeSize2+1] = unsigned(data->Immed.size());
+
+    ++function;
+    SkipSpace(function);
+    return function;
+}
+
+template<typename Value_t>
+const char* FunctionParserBase<Value_t>::CompileFunctionParams
+(const char* function, unsigned requiredParams)
+{
+    if(*function != '(') return SetErrorType(EXPECT_PARENTH_FUNC, function);
+
+    if(requiredParams > 0)
+    {
+        const char* function_end = CompileExpression(function+1);
+        if(!function_end)
+        {
+            // If an error occurred, verify whether it was caused by ()
+            ++function;
+            SkipSpace(function);
+            if(*function == ')') return SetErrorType(ILL_PARAMS_AMOUNT, function);
+            // Not caused by (), use the error message given by CompileExpression()
+            return 0;
+        }
+        function = function_end;
+
+        for(unsigned i = 1; i < requiredParams; ++i)
+        {
+            if(*function != ',')
+                return SetErrorType(noCommaError<Value_t>(*function), function);
+
+            function = CompileExpression(function+1);
+            if(!function) return 0;
+        }
+        // No need for incStackPtr() because each parse parameter calls it
+        StackPtr -= requiredParams-1;
+    }
+    else
+    {
+        incStackPtr(); // return value of function is pushed onto the stack
+        ++function;
+        SkipSpace(function);
+    }
+
+    if(*function != ')')
+        return SetErrorType(noParenthError<Value_t>(*function), function);
+    ++function;
+    SkipSpace(function);
+    return function;
+}
+
+template<typename Value_t>
+const char* FunctionParserBase<Value_t>::CompileElement(const char* function)
+{
+    if(BeginsLiteral<Value_t>( (unsigned char) *function))
+        return CompileLiteral(function);
+
+    unsigned nameLength = readOpcode<Value_t>(function);
+    if(nameLength == 0)
+    {
+        // No identifier found
+        if(*function == '(') return CompileParenthesis(function);
+        if(*function == ')') return SetErrorType(MISM_PARENTH, function);
+        return SetErrorType(SYNTAX_ERROR, function);
+    }
+
+    // Function, variable or constant
+    if(nameLength & 0x80000000U) // Function
+    {
+        OPCODE func_opcode = OPCODE( (nameLength >> 16) & 0x7FFF );
+        return CompileFunction(function + (nameLength & 0xFFFF), func_opcode);
+    }
+
+    NamePtr name(function, nameLength);
+    const char* endPtr = function + nameLength;
+    SkipSpace(endPtr);
+
+    typename namePtrsType<Value_t>::iterator nameIter =
+        data->namePtrs.find(name);
+    if(nameIter == data->namePtrs.end())
+    {
+        return SetErrorType(UNKNOWN_IDENTIFIER, function);
+    }
+
+    const NameData<Value_t>* nameData = &nameIter->second;
+    switch(nameData->type)
+    {
+      case NameData<Value_t>::VARIABLE: // is variable
+          if(unlikely(!data->ByteCode.empty() && data->ByteCode.back() == nameData->index))
+              data->ByteCode.push_back(cDup);
+          else
+              data->ByteCode.push_back(nameData->index);
+          incStackPtr();
+          return endPtr;
+
+      case NameData<Value_t>::CONSTANT:
+          AddImmedOpcode(nameData->value);
+          incStackPtr();
+          return endPtr;
+
+      case NameData<Value_t>::UNIT:
+          break;
+
+  /* The reason why a cNop is added after a cFCall and a cPCall opcode is
+     that the function index could otherwise be confused with an actual
+     opcode (most prominently cImmed), making parse-time optimizations bug
+     (eg. if cNeg immediately follows an index value equal to cImmed, in
+     which case the parser would "optimize" it to negating the (inexistent)
+     literal, causing mayhem). The optimizer gets rid of the cNop safely.
+     (Another option would be to add some offset to the function index
+     when storing it in the bytecode, and then subtract that offset when
+     interpreting the bytecode, but this causes more programming overhead
+     than the speed overhead caused by the cNop to be worth the trouble,
+     especially since the function call caused by the opcode is quite slow
+     anyways.)
+   */
+      case NameData<Value_t>::FUNC_PTR:
+          function = CompileFunctionParams
+              (endPtr, data->FuncPtrs[nameData->index].params);
+          //if(!function) return 0;
+          data->ByteCode.push_back(cFCall);
+          data->ByteCode.push_back(nameData->index);
+          data->ByteCode.push_back(cNop);
+          return function;
+
+      case NameData<Value_t>::PARSER_PTR:
+          function = CompileFunctionParams
+              (endPtr, data->FuncParsers[nameData->index].params);
+          //if(!function) return 0;
+          data->ByteCode.push_back(cPCall);
+          data->ByteCode.push_back(nameData->index);
+          data->ByteCode.push_back(cNop);
+          return function;
+    }
+
+    // When it's an unit (or unrecognized type):
+    return SetErrorType(SYNTAX_ERROR, function);
+}
+
+template<typename Value_t>
+inline const char* FunctionParserBase<Value_t>::CompileFunction
+(const char* function, unsigned func_opcode)
+{
+    SkipSpace(function);
+    const FuncDefinition& funcDef = Functions[func_opcode];
+
+    if(func_opcode == cIf) // "if" is a special case
+        return CompileIf(function);
+
+    unsigned requiredParams = funcDef.params;
+#ifndef FP_DISABLE_EVAL
+    if(func_opcode == cEval)
+        requiredParams = data->numVariables;
+#endif
+
+    function = CompileFunctionParams(function, requiredParams);
+    if(!function) return 0;
+
+    if(useDegreeConversion)
+    {
+        if(funcDef.flags & FuncDefinition::AngleIn)
+            AddFunctionOpcode(cRad);
+
+        AddFunctionOpcode(func_opcode);
+
+        if(funcDef.flags & FuncDefinition::AngleOut)
+            AddFunctionOpcode(cDeg);
+    }
+    else
+    {
+        AddFunctionOpcode(func_opcode);
+    }
+    return function;
+}
+
+template<typename Value_t>
+inline const char* FunctionParserBase<Value_t>::CompileParenthesis(const char* function)
+{
+    ++function; // Skip '('
+
+    SkipSpace(function);
+    if(*function == ')') return SetErrorType(EMPTY_PARENTH, function);
+    function = CompileExpression(function);
+    if(!function) return 0;
+
+    if(*function != ')') return SetErrorType(MISSING_PARENTH, function);
+    ++function; // Skip ')'
+
+    SkipSpace(function);
+    return function;
+}
+
+template<typename Value_t>
+inline const char* FunctionParserBase<Value_t>::CompileLiteral(const char* function)
+{
+    char* endPtr;
+    const double val = strtod(function, &endPtr);
+    if(endPtr == function) return SetErrorType(SYNTAX_ERROR, function);
+    AddImmedOpcode(val);
+    incStackPtr();
+    SkipSpace(endPtr);
+    return endPtr;
+}
+
+template<typename Value_t>
+const char*
+FunctionParserBase<Value_t>::CompilePossibleUnit(const char* function)
+{
+    unsigned nameLength = readOpcode<Value_t>(function);
+    if(nameLength & 0x80000000U) return function; // built-in function name
+    if(nameLength != 0)
+    {
+        NamePtr name(function, nameLength);
+
+        typename namePtrsType<Value_t>::iterator nameIter =
+            data->namePtrs.find(name);
+        if(nameIter != data->namePtrs.end())
+        {
+            const NameData<Value_t>* nameData = &nameIter->second;
+            if(nameData->type == NameData<Value_t>::UNIT)
+            {
+                AddImmedOpcode(nameData->value);
+                incStackPtr();
+                AddFunctionOpcode(cMul);
+                --StackPtr;
+
+                const char* endPtr = function + nameLength;
+                SkipSpace(endPtr);
+                return endPtr;
+            }
+        }
+    }
+
+    return function;
+}
+
+template<typename Value_t>
+inline const char*
+FunctionParserBase<Value_t>::CompilePow(const char* function)
+{
+    function = CompileElement(function);
+    if(!function) return 0;
+    function = CompilePossibleUnit(function);
+
+    if(*function == '^')
+    {
+        ++function;
+        SkipSpace(function);
+
+        unsigned op = cPow;
+        if(data->ByteCode.back() == cImmed)
+        {
+            if(data->Immed.back() == const_e<Value_t>())
+                { op = cExp;  data->ByteCode.pop_back();
+                    data->Immed.pop_back(); --StackPtr; }
+            else if(data->Immed.back() == Value_t(2))
+                { op = cExp2; data->ByteCode.pop_back();
+                    data->Immed.pop_back(); --StackPtr; }
+        }
+
+        function = CompileUnaryMinus(function);
+        if(!function) return 0;
+
+        // add opcode
+        AddFunctionOpcode(op);
+
+        if(op == cPow) --StackPtr;
+    }
+    return function;
+}
+
+#ifdef FP_SUPPORT_FLOAT_TYPE
+template<>
+inline const char* FunctionParserBase<float>::CompileLiteral(const char* function)
+{
+    char* endPtr;
+    const float val = strtof(function, &endPtr);
+    if(endPtr == function) return SetErrorType(SYNTAX_ERROR, function);
+    AddImmedOpcode(val);
+    incStackPtr();
+    SkipSpace(endPtr);
+    return endPtr;
+}
+#endif
+
+#ifdef FP_SUPPORT_LONG_DOUBLE_TYPE
+template<>
+inline const char* FunctionParserBase<long double>::CompileLiteral(const char* function)
+{
+    char* endPtr;
+    const long double val = strtold(function, &endPtr);
+    if(endPtr == function) return SetErrorType(SYNTAX_ERROR, function);
+    AddImmedOpcode(val);
+    incStackPtr();
+    SkipSpace(endPtr);
+    return endPtr;
+}
+#endif
+
+#ifdef FP_SUPPORT_LONG_INT_TYPE
+template<>
+inline const char* FunctionParserBase<long>::CompileLiteral(const char* function)
+{
+    char* endPtr;
+    const long val = strtol(function, &endPtr, 10);
+    if(endPtr == function) return SetErrorType(SYNTAX_ERROR, function);
+    AddImmedOpcode(val);
+    incStackPtr();
+    SkipSpace(endPtr);
+    return endPtr;
+}
+
+template<>
+inline const char*
+FunctionParserBase<long>::CompilePow(const char* function)
+{
+    function = CompileElement(function);
+    if(!function) return 0;
+    return CompilePossibleUnit(function);
+}
+#endif
+
+#ifdef FP_SUPPORT_MPFR_FLOAT_TYPE
+template<>
+inline const char* FunctionParserBase<MpfrFloat>::CompileLiteral(const char* function)
+{
+    char* endPtr;
+    const MpfrFloat val = MpfrFloat::parseString(function, &endPtr);
+    if(endPtr == function) return SetErrorType(SYNTAX_ERROR, function);
+    AddImmedOpcode(val);
+    incStackPtr();
+    SkipSpace(endPtr);
+    return endPtr;
+}
+#endif
+
+#ifdef FP_SUPPORT_GMP_INT_TYPE
+template<>
+inline const char* FunctionParserBase<GmpInt>::CompileLiteral(const char* function)
+{
+    char* endPtr;
+    const GmpInt val = GmpInt::parseString(function, &endPtr);
+    if(endPtr == function) return SetErrorType(SYNTAX_ERROR, function);
+    AddImmedOpcode(val);
+    incStackPtr();
+    SkipSpace(endPtr);
+    return endPtr;
+}
+
+template<>
+inline const char*
+FunctionParserBase<GmpInt>::CompilePow(const char* function)
+{
+    function = CompileElement(function);
+    if(!function) return 0;
+    return CompilePossibleUnit(function);
+}
+#endif
+
+
+
+
+template<typename Value_t>
+inline const char*
+FunctionParserBase<Value_t>::CompileUnaryMinus(const char* function)
+{
+    char op = *function;
+    switch(op)
+    {
+        case '-':
+        case '!':
+            ++function;
+            SkipSpace(function);
+
+            function = CompileUnaryMinus(function);
+            if(!function) return 0;
+
+            AddFunctionOpcode(op=='-' ? cNeg : cNot);
+
+            return function;
+        default: break;
+    }
+    return CompilePow(function);
+}
+
+template<typename Value_t>
+inline const char*
+FunctionParserBase<Value_t>::CompileMult(const char* function)
+{
+    unsigned op = 0;
+    while(true)
+    {
+        function = CompileUnaryMinus(function);
+        if(!function) return 0;
+
+        // add opcode
+        if(op)
+        {
+            AddFunctionOpcode(op);
+            if(op != cInv) --StackPtr;
+        }
+        switch(*function)
+        {
+            case '*': op = cMul; break;
+            case '/': op = cDiv; break;
+            case '%': op = cMod; break;
+            default: return function;
+        }
+
+        ++function;
+        SkipSpace(function);
+
+        if(op != cMod &&
+           data->ByteCode.back() == cImmed &&
+           data->Immed.back() == Value_t(1))
+        {
+            op = (op == cDiv ? cInv : 0);
+            data->Immed.pop_back();
+            data->ByteCode.pop_back();
+            --StackPtr;
+        }
+    }
+    return function;
+}
+
+template<typename Value_t>
+inline const char*
+FunctionParserBase<Value_t>::CompileAddition(const char* function)
+{
+    unsigned op=0;
+    while(true)
+    {
+        function = CompileMult(function);
+        if(!function) return 0;
+
+        // add opcode
+        if(op)
+        {
+            AddFunctionOpcode(op);
+            if(op != cNeg) --StackPtr;
+        }
+        switch(*function)
+        {
+            case '+': op = cAdd; break;
+            case '-': op = cSub; break;
+            default: return function;
+        }
+
+        ++function;
+        SkipSpace(function);
+
+        if(data->ByteCode.back() == cImmed &&
+           data->Immed.back() == Value_t(0))
+        {
+            op = (op == cSub ? cNeg : 0);
+            data->Immed.pop_back();
+            data->ByteCode.pop_back();
+            --StackPtr;
+        }
+    }
+    return function;
+}
+
+template<typename Value_t>
+inline const char*
+FunctionParserBase<Value_t>::CompileComparison(const char* function)
+{
+    unsigned op=0;
+    while(true)
+    {
+        function = CompileAddition(function);
+        if(!function) return 0;
+
+        if(op)
+        {
+            AddFunctionOpcode(op);
+            --StackPtr;
+        }
+        switch(*function)
+        {
+          case '=':
+              ++function; op = cEqual; break;
+          case '!':
+              if(function[1] == '=')
+              { function += 2; op = cNEqual; break; }
+              // If '=' does not follow '!', a syntax error will
+              // be generated at the outermost parsing level
+              return function;
+          case '<':
+              if(function[1] == '=')
+              { function += 2; op = cLessOrEq; break; }
+              ++function; op = cLess; break;
+          case '>':
+              if(function[1] == '=')
+              { function += 2; op = cGreaterOrEq; break; }
+              ++function; op = cGreater; break;
+          default: return function;
+        }
+        SkipSpace(function);
+    }
+    return function;
+}
+
+template<typename Value_t>
+inline const char*
+FunctionParserBase<Value_t>::CompileAnd(const char* function)
+{
+    size_t param0end=0;
+    while(true)
+    {
+        function = CompileComparison(function);
+        if(!function) return 0;
+
+        if(param0end)
+        {
+            if(data->ByteCode.back() == cNotNot) data->ByteCode.pop_back();
+
+            unsigned& param0last = data->ByteCode[param0end-1];
+            unsigned& param1last = data->ByteCode.back();
+            if(IsNeverNegativeValueOpcode(param1last) &&
+               IsNeverNegativeValueOpcode(param0last))
+            {
+                /* Change !x & !y into !(x | y). Because y might
+                 * contain an cIf, we replace the first cNot/cAbsNot
+                 * with cNop to avoid jump indices being broken.
+                 */
+                if((param0last == cNot || param0last == cAbsNot)
+                && (param1last == cNot || param1last == cAbsNot))
+                {
+                    param1last = (param0last==cAbsNot && param1last==cAbsNot)
+                                    ? cAbsOr : cOr;
+                    param0last = cNop;
+                    AddFunctionOpcode(cAbsNot);
+                }
+                else
+                    AddFunctionOpcode(cAbsAnd);
+            }
+            else
+                AddFunctionOpcode(cAnd);
+            --StackPtr;
+        }
+        if(*function != '&') break;
+        ++function;
+        SkipSpace(function);
+        param0end = data->ByteCode.size();
+    }
+    return function;
+}
+
+template<typename Value_t>
+const char*
+FunctionParserBase<Value_t>::CompileExpression(const char* function)
+{
+    size_t param0end=0;
+    while(true)
+    {
+        SkipSpace(function);
+        function = CompileAnd(function);
+        if(!function) return 0;
+
+        if(param0end)
+        {
+            if(data->ByteCode.back() == cNotNot) data->ByteCode.pop_back();
+
+            unsigned& param0last = data->ByteCode[param0end-1];
+            unsigned& param1last = data->ByteCode.back();
+            if(IsNeverNegativeValueOpcode(param1last)
+            && IsNeverNegativeValueOpcode(param0last))
+            {
+                /* Change !x | !y into !(x & y). Because y might
+                 * contain an cIf, we replace the first cNot/cAbsNot
+                 * with cNop to avoid jump indices being broken.
+                 */
+                if((param0last == cNot || param0last == cAbsNot)
+                && (param1last == cNot || param1last == cAbsNot))
+                {
+                    param1last = (param0last==cAbsNot && param1last==cAbsNot)
+                                    ? cAbsAnd : cAnd;
+                    param0last = cNop;
+                    AddFunctionOpcode(cAbsNot);
+                }
+                else
+                    AddFunctionOpcode(cAbsOr);
+            }
+            else
+                AddFunctionOpcode(cOr);
+            --StackPtr;
+        }
+        if(*function != '|') break;
+        ++function;
+        param0end = data->ByteCode.size();
+    }
+    return function;
+}
+
+//===========================================================================
+// Function evaluation
+//===========================================================================
+template<typename Value_t>
+Value_t FunctionParserBase<Value_t>::Eval(const Value_t* Vars)
+{
+    if(parseErrorType != FP_NO_ERROR) return Value_t(0);
+
+    const unsigned* const ByteCode = &(data->ByteCode[0]);
+    const Value_t* const Immed = data->Immed.empty() ? 0 : &(data->Immed[0]);
+    const unsigned ByteCodeSize = unsigned(data->ByteCode.size());
+    unsigned IP, DP=0;
+    int SP=-1;
+
+#ifdef FP_USE_THREAD_SAFE_EVAL
+    /* If Eval() may be called by multiple threads simultaneously,
+     * then Eval() must allocate its own stack.
+     */
+#ifdef FP_USE_THREAD_SAFE_EVAL_WITH_ALLOCA
+    /* alloca() allocates room from the hardware stack.
+     * It is automatically freed when the function returns.
+     */
+    Value_t* const Stack = (Value_t*)alloca(data->StackSize*sizeof(Value_t));
+#else
+    /* Allocate from the heap. Ensure that it is freed
+     * automatically no matter which exit path is taken.
+     */
+    struct AutoDealloc
+    {
+        Value_t* ptr;
+        ~AutoDealloc() { delete[] ptr; }
+    } AutoDeallocStack = { new Value_t[data->StackSize] };
+    Value_t*& Stack = AutoDeallocStack.ptr;
+#endif
+#else
+    /* No thread safety, so use a global stack. */
+    std::vector<Value_t>& Stack = data->Stack;
+#endif
+
+    for(IP=0; IP<ByteCodeSize; ++IP)
+    {
+        switch(ByteCode[IP])
+        {
+// Functions:
+          case   cAbs: Stack[SP] = fp_abs(Stack[SP]); break;
+
+          case  cAcos:
+#           ifndef FP_NO_EVALUATION_CHECKS
+              if(Stack[SP] < Value_t(-1) || Stack[SP] > Value_t(1))
+              { evalErrorType=4; return Value_t(0); }
+#           endif
+              Stack[SP] = fp_acos(Stack[SP]); break;
+
+          case cAcosh:
+#           ifndef FP_NO_EVALUATION_CHECKS
+              if(Stack[SP] < Value_t(1))
+              { evalErrorType=4; return Value_t(0); }
+#           endif
+              Stack[SP] = fp_acosh(Stack[SP]); break;
+
+          case  cAsin:
+#           ifndef FP_NO_EVALUATION_CHECKS
+              if(Stack[SP] < Value_t(-1) || Stack[SP] > Value_t(1))
+              { evalErrorType=4; return Value_t(0); }
+#           endif
+              Stack[SP] = fp_asin(Stack[SP]); break;
+
+          case cAsinh: Stack[SP] = fp_asinh(Stack[SP]); break;
+
+          case  cAtan: Stack[SP] = fp_atan(Stack[SP]); break;
+
+          case cAtan2: Stack[SP-1] = fp_atan2(Stack[SP-1], Stack[SP]);
+                       --SP; break;
+
+          case cAtanh:
+#           ifndef FP_NO_EVALUATION_CHECKS
+              if(Stack[SP] <= Value_t(-1) || Stack[SP] >= Value_t(1))
+              { evalErrorType=4; return Value_t(0); }
+#           endif
+              Stack[SP] = fp_atanh(Stack[SP]); break;
+
+          case  cCbrt: Stack[SP] = fp_cbrt(Stack[SP]); break;
+
+          case  cCeil: Stack[SP] = fp_ceil(Stack[SP]); break;
+
+          case   cCos: Stack[SP] = fp_cos(Stack[SP]); break;
+
+          case  cCosh: Stack[SP] = fp_cosh(Stack[SP]); break;
+
+          case   cCot:
+              {
+                  const Value_t t = fp_tan(Stack[SP]);
+#               ifndef FP_NO_EVALUATION_CHECKS
+                  if(t == Value_t(0)) { evalErrorType=1; return Value_t(0); }
+#               endif
+                  Stack[SP] = Value_t(1)/t; break;
+              }
+
+          case   cCsc:
+              {
+                  const Value_t s = fp_sin(Stack[SP]);
+#               ifndef FP_NO_EVALUATION_CHECKS
+                  if(s == 0) { evalErrorType=1; return Value_t(0); }
+#               endif
+                  Stack[SP] = Value_t(1)/s; break;
+              }
+
+
+#       ifndef FP_DISABLE_EVAL
+          case  cEval:
+              {
+                  const unsigned varAmount = data->numVariables;
+                  Value_t retVal = Value_t(0);
+                  if(evalRecursionLevel == FP_EVAL_MAX_REC_LEVEL)
+                  {
+                      evalErrorType = 5;
+                  }
+                  else
+                  {
+                      ++evalRecursionLevel;
+#                   ifndef FP_USE_THREAD_SAFE_EVAL
+                      /* Eval() will use data->Stack for its storage.
+                       * Swap the current stack with an empty one.
+                       * This is the not-thread-safe method.
+                       */
+                      std::vector<Value_t> tmpStack(Stack.size());
+                      data->Stack.swap(tmpStack);
+                      retVal = Eval(&tmpStack[SP - varAmount + 1]);
+                      data->Stack.swap(tmpStack);
+#                   else
+                      /* Thread safety mode. We don't need to
+                       * worry about stack reusing here, because
+                       * each instance of Eval() will allocate
+                       * their own stack.
+                       */
+                      retVal = Eval(&Stack[SP - varAmount + 1]);
+#                   endif
+                      --evalRecursionLevel;
+                  }
+                  SP -= varAmount-1;
+                  Stack[SP] = retVal;
+                  break;
+              }
+#       endif
+
+          case   cExp: Stack[SP] = fp_exp(Stack[SP]); break;
+
+          case   cExp2: Stack[SP] = fp_exp2(Stack[SP]); break;
+
+          case cFloor: Stack[SP] = fp_floor(Stack[SP]); break;
+
+          case    cIf:
+                  if(truthValue(Stack[SP--]))
+                      IP += 2;
+                  else
+                  {
+                      const unsigned* buf = &ByteCode[IP+1];
+                      IP = buf[0];
+                      DP = buf[1];
+                  }
+                  break;
+
+          case   cInt: Stack[SP] = fp_int(Stack[SP]); break;
+
+          case   cLog:
+#           ifndef FP_NO_EVALUATION_CHECKS
+              if(!(Stack[SP] > Value_t(0)))
+              { evalErrorType=3; return Value_t(0); }
+#           endif
+              Stack[SP] = fp_log(Stack[SP]); break;
+
+          case cLog10:
+#           ifndef FP_NO_EVALUATION_CHECKS
+              if(!(Stack[SP] > Value_t(0)))
+              { evalErrorType=3; return Value_t(0); }
+#           endif
+              Stack[SP] = fp_log10(Stack[SP]);
+              break;
+
+          case  cLog2:
+#           ifndef FP_NO_EVALUATION_CHECKS
+              if(!(Stack[SP] > Value_t(0)))
+              { evalErrorType=3; return Value_t(0); }
+#           endif
+              Stack[SP] = fp_log2(Stack[SP]);
+              break;
+
+          case   cMax: Stack[SP-1] = Max(Stack[SP-1], Stack[SP]);
+                       --SP; break;
+
+          case   cMin: Stack[SP-1] = Min(Stack[SP-1], Stack[SP]);
+                       --SP; break;
+
+          case   cPow:
+#           ifndef FP_NO_EVALUATION_CHECKS
+              // x:Negative ^ y:NonInteger is failure,
+              // except when the reciprocal of y forms an integer
+              /*if(Stack[SP-1] < Value_t(0) &&
+                 !IsIntegerConst(Stack[SP]) &&
+                 !IsIntegerConst(1.0 / Stack[SP]))
+              { evalErrorType=3; return Value_t(0); }*/
+              // x:0 ^ y:negative is failure
+              if(Stack[SP-1] == Value_t(0) &&
+                 Stack[SP] < Value_t(0))
+              { evalErrorType=3; return Value_t(0); }
+#           endif
+              Stack[SP-1] = fp_pow(Stack[SP-1], Stack[SP]);
+              --SP; break;
+
+          case  cTrunc: Stack[SP] = fp_trunc(Stack[SP]); break;
+
+          case   cSec:
+              {
+                  const Value_t c = fp_cos(Stack[SP]);
+#               ifndef FP_NO_EVALUATION_CHECKS
+                  if(c == Value_t(0)) { evalErrorType=1; return Value_t(0); }
+#               endif
+                  Stack[SP] = Value_t(1)/c; break;
+              }
+
+          case   cSin: Stack[SP] = fp_sin(Stack[SP]); break;
+
+          case  cSinh: Stack[SP] = fp_sinh(Stack[SP]); break;
+
+          case  cSqrt:
+#           ifndef FP_NO_EVALUATION_CHECKS
+              if(Stack[SP] < Value_t(0)) { evalErrorType=2; return Value_t(0); }
+#           endif
+              Stack[SP] = fp_sqrt(Stack[SP]); break;
+
+          case   cTan: Stack[SP] = fp_tan(Stack[SP]); break;
+
+          case  cTanh: Stack[SP] = fp_tanh(Stack[SP]); break;
+
+
+// Misc:
+          case cImmed: Stack[++SP] = Immed[DP++]; break;
+
+          case  cJump:
+              {
+                  const unsigned* buf = &ByteCode[IP+1];
+                  IP = buf[0];
+                  DP = buf[1];
+                  break;
+              }
+
+// Operators:
+          case   cNeg: Stack[SP] = -Stack[SP]; break;
+          case   cAdd: Stack[SP-1] += Stack[SP]; --SP; break;
+          case   cSub: Stack[SP-1] -= Stack[SP]; --SP; break;
+          case   cMul: Stack[SP-1] *= Stack[SP]; --SP; break;
+
+          case   cDiv:
+#           ifndef FP_NO_EVALUATION_CHECKS
+              if(Stack[SP] == Value_t(0))
+              { evalErrorType=1; return Value_t(0); }
+#           else
+              if(IsIntType<Value_t>::result && Stack[SP] == Value_t(0))
+              { evalErrorType=1; return Value_t(0); }
+#           endif
+              Stack[SP-1] /= Stack[SP]; --SP; break;
+
+          case   cMod:
+              if(Stack[SP] == Value_t(0))
+              { evalErrorType=1; return Value_t(0); }
+              Stack[SP-1] = fp_mod(Stack[SP-1], Stack[SP]);
+              --SP; break;
+
+          case cEqual:
+              Stack[SP-1] = fp_equal(Stack[SP-1], Stack[SP]);
+              --SP; break;
+
+          case cNEqual:
+              Stack[SP-1] = fp_nequal(Stack[SP-1], Stack[SP]);
+              --SP; break;
+
+          case  cLess:
+              Stack[SP-1] = fp_less(Stack[SP-1], Stack[SP]);
+              --SP; break;
+
+          case  cLessOrEq:
+              Stack[SP-1] = fp_lessOrEq(Stack[SP-1], Stack[SP]);
+              --SP; break;
+
+          case cGreater:
+              Stack[SP-1] = fp_less(Stack[SP], Stack[SP-1]);
+              --SP; break;
+
+          case cGreaterOrEq:
+              Stack[SP-1] = fp_lessOrEq(Stack[SP], Stack[SP-1]);
+              --SP; break;
+
+          case   cNot: Stack[SP] = Value_t(!truthValue(Stack[SP])); break;
+
+          case   cAnd:
+              Stack[SP-1] = Value_t
+                  (truthValue(Stack[SP-1]) && truthValue(Stack[SP]));
+              --SP; break;
+
+          case    cOr:
+              Stack[SP-1] = Value_t
+                  (truthValue(Stack[SP-1]) || truthValue(Stack[SP]));
+              --SP; break;
+
+          case cNotNot: Stack[SP] = Value_t(truthValue(Stack[SP])); break;
+
+// Degrees-radians conversion:
+          case   cDeg: Stack[SP] = RadiansToDegrees(Stack[SP]); break;
+          case   cRad: Stack[SP] = DegreesToRadians(Stack[SP]); break;
+
+// User-defined function calls:
+          case cFCall:
+              {
+                  unsigned index = ByteCode[++IP];
+                  unsigned params = data->FuncPtrs[index].params;
+                  Value_t retVal =
+                      data->FuncPtrs[index].funcPtr(&Stack[SP-params+1]);
+                  SP -= int(params)-1;
+                  Stack[SP] = retVal;
+                  break;
+              }
+
+          case cPCall:
+              {
+                  unsigned index = ByteCode[++IP];
+                  unsigned params = data->FuncParsers[index].params;
+                  Value_t retVal =
+                      data->FuncParsers[index].parserPtr->Eval
+                      (&Stack[SP-params+1]);
+                  SP -= int(params)-1;
+                  Stack[SP] = retVal;
+                  const int error =
+                      data->FuncParsers[index].parserPtr->EvalError();
+                  if(error)
+                  {
+                      evalErrorType = error;
+                      return 0;
+                  }
+                  break;
+              }
+
+
+#ifdef FP_SUPPORT_OPTIMIZER
+          case   cFetch:
+              {
+                  unsigned stackOffs = ByteCode[++IP];
+                  Stack[SP+1] = Stack[stackOffs]; ++SP;
+                  break;
+              }
+
+          case   cPopNMov:
+              {
+                  unsigned stackOffs_target = ByteCode[++IP];
+                  unsigned stackOffs_source = ByteCode[++IP];
+                  Stack[stackOffs_target] = Stack[stackOffs_source];
+                  SP = stackOffs_target;
+                  break;
+              }
+
+          case  cLog2by:
+#           ifndef FP_NO_EVALUATION_CHECKS
+              if(Stack[SP-1] <= Value_t(0))
+              { evalErrorType=3; return Value_t(0); }
+#           endif
+              Stack[SP-1] = fp_log2(Stack[SP-1]) * Stack[SP];
+              --SP;
+              break;
+#endif // FP_SUPPORT_OPTIMIZER
+          case cAbsNot:
+              Stack[SP] = Value_t(!truthValue_abs(Stack[SP])); break;
+          case cAbsNotNot:
+              Stack[SP] = Value_t(truthValue_abs(Stack[SP])); break;
+          case cAbsAnd:
+              Stack[SP-1] = Value_t(truthValue_abs(Stack[SP-1]) &&
+                                    truthValue_abs(Stack[SP]));
+              --SP; break;
+          case cAbsOr:
+              Stack[SP-1] = Value_t(truthValue_abs(Stack[SP-1]) ||
+                                    truthValue_abs(Stack[SP]));
+              --SP; break;
+          case cAbsIf:
+              if(truthValue_abs(Stack[SP--]))
+                  IP += 2;
+              else
+              {
+                  const unsigned* buf = &ByteCode[IP+1];
+                  IP = buf[0];
+                  DP = buf[1];
+              }
+              break;
+
+          case   cDup: Stack[SP+1] = Stack[SP]; ++SP; break;
+
+          case   cInv:
+#           ifndef FP_NO_EVALUATION_CHECKS
+              if(Stack[SP] == Value_t(0))
+              { evalErrorType=1; return Value_t(0); }
+#           else
+              if(IsIntType<Value_t>::result && Stack[SP] == Value_t(0))
+              { evalErrorType=1; return Value_t(0); }
+#           endif
+              Stack[SP] = Value_t(1)/Stack[SP];
+              break;
+
+          case   cSqr:
+              Stack[SP] = Stack[SP]*Stack[SP];
+              break;
+
+          case   cRDiv:
+#           ifndef FP_NO_EVALUATION_CHECKS
+              if(Stack[SP-1] == Value_t(0))
+              { evalErrorType=1; return Value_t(0); }
+#           else
+              if(IsIntType<Value_t>::result && Stack[SP-1] == Value_t(0))
+              { evalErrorType=1; return Value_t(0); }
+#           endif
+              Stack[SP-1] = Stack[SP] / Stack[SP-1]; --SP; break;
+
+          case   cRSub: Stack[SP-1] = Stack[SP] - Stack[SP-1]; --SP; break;
+
+          case   cRSqrt:
+#           ifndef FP_NO_EVALUATION_CHECKS
+              if(Stack[SP] == Value_t(0))
+              { evalErrorType=1; return Value_t(0); }
+#           endif
+              Stack[SP] = Value_t(1) / fp_sqrt(Stack[SP]); break;
+
+          case cNop: break;
+
+// Variables:
+          default:
+              Stack[++SP] = Vars[ByteCode[IP]-VarBegin];
+        }
+    }
+
+    evalErrorType=0;
+    return Stack[SP];
+}
+
+
+//===========================================================================
+// Variable deduction
+//===========================================================================
+namespace
+{
+    template<typename Value_t>
+    int deduceVariables(FunctionParserBase<Value_t>& fParser,
+                        const char* funcStr,
+                        std::string& destVarString,
+                        int* amountOfVariablesFound,
+                        std::vector<std::string>* destVarNames,
+                        bool useDegrees)
+    {
+        typedef std::set<std::string> StrSet;
+        StrSet varNames;
+
+        int oldIndex = -1;
+
+        while(true)
+        {
+            destVarString.clear();
+            for(StrSet::iterator iter = varNames.begin();
+                iter != varNames.end();
+                ++iter)
+            {
+                if(iter != varNames.begin()) destVarString += ",";
+                destVarString += *iter;
+            }
+
+            const int index =
+                fParser.Parse(funcStr, destVarString, useDegrees);
+            if(index < 0) break;
+            if(index == oldIndex) return index;
+
+            unsigned nameLength = readOpcode<Value_t>(funcStr + index);
+            if(nameLength & 0x80000000U) return index;
+            if(nameLength == 0) return index;
+
+            varNames.insert(std::string(funcStr + index, nameLength));
+            oldIndex = index;
+        }
+
+        if(amountOfVariablesFound)
+            *amountOfVariablesFound = int(varNames.size());
+
+        if(destVarNames)
+            destVarNames->assign(varNames.begin(), varNames.end());
+
+        return -1;
+    }
+}
+
+template<typename Value_t>
+int FunctionParserBase<Value_t>::ParseAndDeduceVariables
+(const std::string& function,
+ int* amountOfVariablesFound,
+ bool useDegrees)
+{
+    std::string varString;
+    return deduceVariables(*this, function.c_str(), varString,
+                           amountOfVariablesFound, 0, useDegrees);
+}
+
+template<typename Value_t>
+int FunctionParserBase<Value_t>::ParseAndDeduceVariables
+(const std::string& function,
+ std::string& resultVarString,
+ int* amountOfVariablesFound,
+ bool useDegrees)
+{
+    std::string varString;
+    const int index =
+        deduceVariables(*this, function.c_str(), varString,
+                        amountOfVariablesFound, 0, useDegrees);
+    if(index < 0) resultVarString = varString;
+    return index;
+}
+
+template<typename Value_t>
+int FunctionParserBase<Value_t>::ParseAndDeduceVariables
+(const std::string& function,
+ std::vector<std::string>& resultVars,
+ bool useDegrees)
+{
+    std::string varString;
+    std::vector<std::string> vars;
+    const int index =
+        deduceVariables(*this, function.c_str(), varString,
+                        0, &vars, useDegrees);
+    if(index < 0) resultVars.swap(vars);
+    return index;
+}
+
+
+//===========================================================================
+// Debug output
+//===========================================================================
+#ifdef FUNCTIONPARSER_SUPPORT_DEBUG_OUTPUT
+#include <iomanip>
+#include <sstream>
+namespace
+{
+    inline void printHex(std::ostream& dest, unsigned n)
+    {
+        std::ios::fmtflags flags = dest.flags();
+        dest.width(4); dest.fill('0'); std::hex(dest); //uppercase(dest);
+        dest << n;
+        dest.flags(flags);
+    }
+
+    void padLine(std::ostringstream& dest, unsigned destLength)
+    {
+        for(size_t currentLength = dest.str().length();
+            currentLength < destLength;
+            ++currentLength)
+        {
+            dest << ' ';
+        }
+    }
+
+    const struct PowiMuliType
+    {
+        unsigned opcode_square;
+        unsigned opcode_cumulate;
+        unsigned opcode_invert;
+        unsigned opcode_half;
+        unsigned opcode_invhalf;
+    } iseq_powi = {cSqr,cMul,cInv,cSqrt,cRSqrt},
+      iseq_muli = {~unsigned(0), cAdd,cNeg, ~unsigned(0),~unsigned(0) };
+
+    template<typename Value_t>
+    Value_t ParsePowiMuli(
+        const PowiMuliType& opcodes,
+        const std::vector<unsigned>& ByteCode, unsigned& IP,
+        unsigned limit,
+        size_t factor_stack_base,
+        std::vector<Value_t>& stack,
+        bool IgnoreExcess)
+    {
+        Value_t result = Value_t(1);
+        while(IP < limit)
+        {
+            if(ByteCode[IP] == opcodes.opcode_square)
+            {
+                if(!IsIntegerConst(result)) break;
+                result *= Value_t(2);
+                ++IP;
+                continue;
+            }
+            if(ByteCode[IP] == opcodes.opcode_invert)
+            {
+                if(result < Value_t(0)) break;
+                result = -result;
+                ++IP;
+                continue;
+            }
+            if(ByteCode[IP] == opcodes.opcode_half)
+            {
+                if(IsIntegerConst(result) && result > Value_t(0) &&
+                   (valueToInt(result)) % 2 == 0)
+                    break;
+                if(IsIntegerConst(result * Value_t(0.5))) break;
+                result *= Value_t(0.5);
+                ++IP;
+                continue;
+            }
+            if(ByteCode[IP] == opcodes.opcode_invhalf)
+            {
+                if(IsIntegerConst(result) && result > Value_t(0) &&
+                   (valueToInt(result)) % 2 == 0)
+                    break;
+                if(IsIntegerConst(result * Value_t(-0.5))) break;
+                result *= Value_t(-0.5);
+                ++IP;
+                continue;
+            }
+
+            unsigned dup_fetch_pos = IP;
+            Value_t lhs = Value_t(1);
+
+    #ifdef FP_SUPPORT_OPTIMIZER
+            if(ByteCode[IP] == cFetch)
+            {
+                unsigned index = ByteCode[++IP];
+                if(index < factor_stack_base
+                || size_t(index-factor_stack_base) >= stack.size())
+                {
+                    // It wasn't a powi-fetch after all
+                    IP = dup_fetch_pos;
+                    break;
+                }
+                lhs = stack[index - factor_stack_base];
+                // Note: ^This assumes that cFetch of recentmost
+                //        is always converted into cDup.
+                goto dup_or_fetch;
+            }
+    #endif
+            if(ByteCode[IP] == cDup)
+            {
+                lhs = result;
+                goto dup_or_fetch;
+
+            dup_or_fetch:
+                stack.push_back(result);
+                ++IP;
+                Value_t subexponent = ParsePowiMuli
+                    (opcodes,
+                     ByteCode, IP, limit,
+                     factor_stack_base, stack,
+                     IgnoreExcess);
+                if(IP >= limit && IgnoreExcess)
+                    return lhs*subexponent;
+                if(IP >= limit || ByteCode[IP] != opcodes.opcode_cumulate)
+                {
+                    // It wasn't a powi-dup after all
+                    IP = dup_fetch_pos;
+                    break;
+                }
+                ++IP; // skip opcode_cumulate
+                stack.pop_back();
+                result += lhs*subexponent;
+                continue;
+            }
+            break;
+        }
+        return result;
+    }
+
+    template<typename Value_t>
+    Value_t ParsePowiSequence(const std::vector<unsigned>& ByteCode,
+                              unsigned& IP, unsigned limit,
+                              size_t factor_stack_base,
+                              bool IgnoreExcess = false)
+    {
+        std::vector<Value_t> stack;
+        stack.push_back(Value_t(1));
+        return ParsePowiMuli(iseq_powi, ByteCode, IP, limit,
+                             factor_stack_base, stack,
+                             IgnoreExcess);
+    }
+
+    template<typename Value_t>
+    Value_t ParseMuliSequence(const std::vector<unsigned>& ByteCode,
+                              unsigned& IP, unsigned limit,
+                              size_t factor_stack_base,
+                              bool IgnoreExcess = false)
+    {
+        std::vector<Value_t> stack;
+        stack.push_back(Value_t(1));
+        return ParsePowiMuli(iseq_muli, ByteCode, IP, limit,
+                             factor_stack_base, stack,
+                             IgnoreExcess);
+    }
+
+    struct IfInfo
+    {
+        std::pair<int,std::string> condition;
+        std::pair<int,std::string> thenbranch;
+        unsigned endif_location;
+
+        IfInfo() : condition(), thenbranch(), endif_location() { }
+    };
+}
+
+template<typename Value_t>
+void FunctionParserBase<Value_t>::PrintByteCode(std::ostream& dest,
+                                                bool showExpression) const
+{
+    dest << "Size of stack: " << data->StackSize << "\n";
+
+    std::ostringstream outputBuffer;
+    std::ostream& output = (showExpression ? outputBuffer : dest);
+
+    const std::vector<unsigned>& ByteCode = data->ByteCode;
+    const std::vector<Value_t>& Immed = data->Immed;
+
+    std::vector<std::pair<int,std::string> > stack;
+    std::vector<IfInfo> if_stack;
+
+    for(unsigned IP = 0, DP = 0; IP <= ByteCode.size(); ++IP)
+    {
+    after_powi_or_muli:;
+        std::string n;
+        bool out_params = false;
+        unsigned params = 2, produces = 1, opcode = 0;
+
+        if(showExpression && !if_stack.empty() &&
+          (   // Normal If termination rule:
+              if_stack.back().endif_location == IP
+              // This rule matches when cJumps are threaded:
+           || (IP < ByteCode.size() && ByteCode[IP] == cJump
+               && !if_stack.back().thenbranch.second.empty())
+          ))
+        {
+            printHex(output, IP);
+            if(if_stack.back().endif_location == IP)
+                output << ": (phi)";
+            else
+                output << ": (phi_threaded)";
+
+            stack.resize(stack.size()+2);
+            std::swap(stack[stack.size()-3], stack[stack.size()-1]);
+            std::swap(if_stack.back().condition,  stack[stack.size()-3]);
+            std::swap(if_stack.back().thenbranch, stack[stack.size()-2]);
+            opcode = cIf;
+            params = 3;
+            --IP;
+            if_stack.pop_back();
+        }
+        else
+        {
+            if(IP >= ByteCode.size()) break;
+            opcode = ByteCode[IP];
+
+            if(showExpression && (
+                opcode == cSqr || opcode == cDup
+             || opcode == cInv
+             || opcode == cSqrt || opcode == cRSqrt
+    #ifdef FP_SUPPORT_OPTIMIZER
+             || opcode == cFetch
+    #endif
+            ))
+            {
+                unsigned changed_ip = IP;
+                Value_t exponent =
+                    ParsePowiSequence<Value_t>
+                    (ByteCode, changed_ip,
+                     if_stack.empty()
+                     ? (unsigned)ByteCode.size()
+                     : if_stack.back().endif_location,
+                     stack.size()-1);
+                std::string        operation_prefix;
+                std::ostringstream operation_value;
+                int prio = 0;
+                if(exponent == 1.0)
+                {
+                    if(opcode != cDup) goto not_powi_or_muli;
+                    Value_t factor =
+                        ParseMuliSequence<Value_t>
+                        (ByteCode, changed_ip,
+                         if_stack.empty()
+                         ? (unsigned)ByteCode.size()
+                         : if_stack.back().endif_location,
+                         stack.size()-1);
+                    if(factor == Value_t(1) || factor == Value_t(-1))
+                        goto not_powi_or_muli;
+                    operation_prefix = "*";
+                    operation_value << factor;
+                    prio = 3;
+                }
+                else
+                {
+                    prio = 2;
+                    operation_prefix = "^";
+                    operation_value << exponent;
+                }
+
+                //unsigned explanation_before = changed_ip-2;
+                unsigned explanation_before = changed_ip-1;
+
+                const char* explanation_prefix = "_";
+                for(const unsigned first_ip = IP; IP < changed_ip; ++IP)
+                {
+                    printHex(output, IP);
+                    output << ": ";
+
+                    const char* sep = "|";
+                    if(first_ip+1 == changed_ip)
+                    { sep = "="; explanation_prefix = " "; }
+                    else if(IP   == first_ip) sep = "\\";
+                    else if(IP+1 == changed_ip) sep = "/";
+                    else explanation_prefix = "=";
+
+                    switch(ByteCode[IP])
+                    {
+                        case cInv: output << "inv"; break;
+                        case cNeg: output << "neg"; break;
+                        case cDup: output << "dup"; break;
+                        case cSqr: output << "sqr"; break;
+                        case cMul: output << "mul"; break;
+                        case cAdd: output << "add"; break;
+                        case cCbrt: output << "cbrt"; break;
+                        case cSqrt: output << "sqrt"; break;
+                        case cRSqrt: output << "rsqrt"; break;
+    #ifdef FP_SUPPORT_OPTIMIZER
+                        case cFetch:
+                        {
+                            unsigned index = ByteCode[++IP];
+                            output << "cFetch(" << index << ")";
+                            break;
+                        }
+    #endif
+                        default: break;
+                    }
+                    padLine(outputBuffer, 20);
+                    output << sep;
+                    if(IP >= explanation_before)
+                    {
+                        explanation_before = (unsigned)ByteCode.size();
+                        output << explanation_prefix
+                               << '[' << (stack.size()-1) << ']';
+                        std::string last = stack.back().second;
+                        if(stack.back().first >= prio)
+                            last = "(" + last + ")";
+                        output << last;
+                        output << operation_prefix;
+                        output << operation_value.str();
+                    }
+                    else
+                    {
+                        unsigned p = first_ip;
+                        Value_t exp = operation_prefix=="^" ?
+                            ParsePowiSequence<Value_t>
+                            (ByteCode, p, IP+1, stack.size()-1, true) :
+                            ParseMuliSequence<Value_t>
+                            (ByteCode, p, IP+1, stack.size()-1, true);
+                        std::string last = stack.back().second;
+                        if(stack.back().first >= prio)
+                            last = "(" + last + ")";
+                        output << " ..." << last;
+                        output << operation_prefix;
+                        output << exp;
+                    }
+                    dest << outputBuffer.str() << std::endl;
+                    outputBuffer.str("");
+                }
+
+                std::string& last = stack.back().second;
+                if(stack.back().first >= prio)
+                    last = "(" + last + ")";
+                last += operation_prefix;
+                last += operation_value.str();
+                stack.back().first = prio;
+
+                goto after_powi_or_muli;
+            }
+        not_powi_or_muli:;
+            printHex(output, IP);
+            output << ": ";
+
+            switch(opcode)
+            {
+              case cIf:
+              {
+                  unsigned label = ByteCode[IP+1]+1;
+                  output << "jz ";
+                  printHex(output, label);
+                  params = 1;
+                  produces = 0;
+                  IP += 2;
+
+                  if_stack.resize(if_stack.size() + 1);
+                  std::swap( if_stack.back().condition, stack.back() );
+                  if_stack.back().endif_location = (unsigned) ByteCode.size();
+                  stack.pop_back();
+                  break;
+              }
+              case cAbsIf:
+              {
+                  unsigned dp    = ByteCode[IP+2];
+                  unsigned label = ByteCode[IP+1]+1;
+                  output << "jz_abs " << dp << ",";
+                  printHex(output, label);
+                  params = 1;
+                  produces = 0;
+                  IP += 2;
+
+                  if_stack.resize(if_stack.size() + 1);
+                  std::swap( if_stack.back().condition, stack.back() );
+                  if_stack.back().endif_location = (unsigned) ByteCode.size();
+                  stack.pop_back();
+                  break;
+              }
+
+              case cJump:
+              {
+                  unsigned dp    = ByteCode[IP+2];
+                  unsigned label = ByteCode[IP+1]+1;
+
+                  if(!if_stack.empty() && !stack.empty())
+                  {
+                      std::swap(if_stack.back().thenbranch, stack.back());
+                      if_stack.back().endif_location = label;
+                      stack.pop_back();
+                  }
+
+                  output << "jump " << dp << ",";
+                  printHex(output, label);
+                  params = 0;
+                  produces = 0;
+                  IP += 2;
+                  break;
+              }
+              case cImmed:
+              {
+                  if(showExpression)
+                  {
+                      std::ostringstream buf;
+                      buf.precision(8);
+                      buf << Immed[DP];
+                      stack.push_back( std::make_pair(0, buf.str()) );
+                  }
+                  output.precision(8);
+                  output << "push " << Immed[DP];
+                  ++DP;
+                  produces = 0;
+                  break;
+              }
+
+              case cFCall:
+                  {
+                      const unsigned index = ByteCode[++IP];
+                      params = data->FuncPtrs[index].params;
+                      static std::string name;
+                      name = "f:" + findName(data->namePtrs, index,
+                                             NameData<Value_t>::FUNC_PTR);
+                      n = name.c_str();
+                      out_params = true;
+                      break;
+                  }
+
+              case cPCall:
+                  {
+                      const unsigned index = ByteCode[++IP];
+                      params = data->FuncParsers[index].params;
+                      static std::string name;
+                      name = "p:" + findName(data->namePtrs, index,
+                                             NameData<Value_t>::PARSER_PTR);
+                      n = name.c_str();
+                      out_params = true;
+                      break;
+                  }
+
+              default:
+                  if(OPCODE(opcode) < VarBegin)
+                  {
+                      switch(opcode)
+                      {
+                        case cNeg: n = "neg"; params = 1; break;
+                        case cAdd: n = "add"; break;
+                        case cSub: n = "sub"; break;
+                        case cMul: n = "mul"; break;
+                        case cDiv: n = "div"; break;
+                        case cMod: n = "mod"; break;
+                        case cPow: n = "pow"; break;
+                        case cEqual: n = "eq"; break;
+                        case cNEqual: n = "neq"; break;
+                        case cLess: n = "lt"; break;
+                        case cLessOrEq: n = "le"; break;
+                        case cGreater: n = "gt"; break;
+                        case cGreaterOrEq: n = "ge"; break;
+                        case cAnd: n = "and"; break;
+                        case cOr: n = "or"; break;
+                        case cNot: n = "not"; params = 1; break;
+                        case cNotNot: n = "notnot"; params = 1; break;
+                        case cDeg: n = "deg"; params = 1; break;
+                        case cRad: n = "rad"; params = 1; break;
+
+    #ifndef FP_DISABLE_EVAL
+                        case cEval: n = "eval"; params = data->numVariables;
+    #endif
+
+    #ifdef FP_SUPPORT_OPTIMIZER
+                        case cLog2by: n = "log2by"; params = 2; out_params = 1; break;
+                        case cFetch:
+                        {
+                            unsigned index = ByteCode[++IP];
+                            if(showExpression && index < stack.size())
+                                stack.push_back(stack[index]);
+                            output << "cFetch(" << index << ")";
+                            produces = 0;
+                            break;
+                        }
+                        case cPopNMov:
+                        {
+                            size_t a = ByteCode[++IP];
+                            size_t b = ByteCode[++IP];
+                            if(showExpression && b < stack.size())
+                            {
+                                std::pair<int, std::string> stacktop(0, "?");
+                                if(b < stack.size()) stacktop = stack[b];
+                                stack.resize(a);
+                                stack.push_back(stacktop);
+                            }
+                            output << "cPopNMov(" << a << ", " << b << ")";
+                            produces = 0;
+                            break;
+                        }
+    #endif
+                        case cAbsAnd: n = "abs_and"; break;
+                        case cAbsOr:  n = "abs_or"; break;
+                        case cAbsNot: n = "abs_not"; params = 1; break;
+                        case cAbsNotNot: n = "abs_notnot"; params = 1; break;
+                        case cDup:
+                        {
+                            if(showExpression)
+                                stack.push_back(stack.back());
+                            output << "dup";
+                            produces = 0;
+                            break;
+                        }
+                        case cInv: n = "inv"; params = 1; break;
+                        case cSqr: n = "sqr"; params = 1; break;
+                        case cRDiv: n = "rdiv"; break;
+                        case cRSub: n = "rsub"; break;
+                        case cRSqrt: n = "rsqrt"; params = 1; break;
+
+                        case cNop:
+                            output << "nop"; params = 0; produces = 0;
+                            break;
+
+                        default:
+                            n = Functions[opcode-cAbs].name;
+                            params = Functions[opcode-cAbs].params;
+                            out_params = params != 1;
+                      }
+                  }
+                  else
+                  {
+                      if(showExpression)
+                      {
+                          stack.push_back(std::make_pair(0,
+                              (findName(data->namePtrs, opcode,
+                                        NameData<Value_t>::VARIABLE))));
+                      }
+                      output << "push Var" << opcode-VarBegin;
+                      produces = 0;
+                  }
+            }
+        }
+        if(produces) output << n;
+        if(out_params) output << " (" << params << ")";
+        if(showExpression)
+        {
+            padLine(outputBuffer, 20);
+
+            if(produces > 0)
+            {
+                std::ostringstream buf;
+                const char *paramsep = ",", *suff = "";
+                int prio = 0; bool commutative = false;
+                switch(opcode)
+                {
+                  case cIf: buf << "if("; suff = ")";
+                      break;
+                  case cAbsIf: buf << "if("; suff = ")";
+                      break;
+                  case cOr:  prio = 6; paramsep = "|"; commutative = true;
+                      break;
+                  case cAnd: prio = 5; paramsep = "&"; commutative = true;
+                      break;
+                  case cAdd: prio = 4; paramsep = "+"; commutative = true;
+                      break;
+                  case cSub: prio = 4; paramsep = "-";
+                      break;
+                  case cMul: prio = 3; paramsep = "*"; commutative = true;
+                      break;
+                  case cDiv: prio = 3; paramsep = "/";
+                      break;
+                  case cPow: prio = 2; paramsep = "^";
+                      break;
+                  case cAbsOr:  prio = 6; paramsep = "|"; commutative = true;
+                      break;
+                  case cAbsAnd: prio = 5; paramsep = "&"; commutative = true;
+                      break;
+                  case cSqr: prio = 2; suff = "^2";
+                      break;
+                  case cNeg: buf << "(-("; suff = "))";
+                      break;
+                  case cNot: buf << "(!("; suff = "))";
+                      break;
+                  default: buf << n << '('; suff = ")";
+                }
+
+                const char* sep = "";
+                for(unsigned a=0; a<params; ++a)
+                {
+                    buf << sep;
+                    if(stack.size() + a < params)
+                        buf << "?";
+                    else
+                    {
+                        const std::pair<int,std::string>& prev =
+                            stack[stack.size() - params + a];
+                        if(prio > 0 && (prev.first > prio ||
+                                        (prev.first==prio && !commutative)))
+                            buf << '(' << prev.second << ')';
+                        else
+                            buf << prev.second;
+                    }
+                    sep = paramsep;
+                }
+                if(stack.size() >= params)
+                    stack.resize(stack.size() - params);
+                else
+                    stack.clear();
+                buf << suff;
+                stack.push_back(std::make_pair(prio, buf.str()));
+                //if(n.size() <= 4 && !out_params) padLine(outputBuffer, 20);
+            }
+            //padLine(outputBuffer, 20);
+            output << "= ";
+            if(((opcode == cIf || opcode == cAbsIf) && params != 3)
+              || opcode == cJump || opcode == cNop)
+                output << "(void)";
+            else if(stack.empty())
+                output << "[?] ?";
+            else
+                output << '[' << (stack.size()-1) << ']'
+                       << stack.back().second;
+        }
+
+        if(showExpression)
+        {
+            dest << outputBuffer.str() << std::endl;
+            outputBuffer.str("");
+        }
+        else
+            output << std::endl;
+    }
+}
+#endif
+
+
+#ifndef FP_SUPPORT_OPTIMIZER
+template<typename Value_t>
+void FunctionParserBase<Value_t>::Optimize()
+{
+    // Do nothing if no optimizations are supported.
+}
+#endif
+
+FUNCTIONPARSER_INSTANTIATE_TYPES
+
diff --git a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/fparser.h b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/fparser.h
new file mode 100644
index 0000000000..fa9695478a
--- /dev/null
+++ b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/fparser.h
@@ -0,0 +1,159 @@
+/***************************************************************************\
+|* Function Parser for C++ v4.0.3                                          *|
+|*-------------------------------------------------------------------------*|
+|* Copyright: Juha Nieminen, Joel Yliluoma                                 *|
+\***************************************************************************/
+
+#ifndef ONCE_FPARSER_H_
+#define ONCE_FPARSER_H_
+
+#pragma interface
+
+#include <string>
+#include <vector>
+
+#ifdef FUNCTIONPARSER_SUPPORT_DEBUG_OUTPUT
+#include <iostream>
+#endif
+
+#ifdef _MSC_VER
+// Visual Studio's warning about missing definitions for the explicit
+// FunctionParserBase instantiations is irrelevant here.
+#pragma warning(disable : 4661)
+#endif
+
+namespace FPoptimizer_CodeTree { class CodeTree; }
+
+template<typename Value_t>
+class FunctionParserBase
+{
+public:
+    enum ParseErrorType
+    {
+        SYNTAX_ERROR=0, MISM_PARENTH, MISSING_PARENTH, EMPTY_PARENTH,
+        EXPECT_OPERATOR, OUT_OF_MEMORY, UNEXPECTED_ERROR, INVALID_VARS,
+        ILL_PARAMS_AMOUNT, PREMATURE_EOS, EXPECT_PARENTH_FUNC,
+        UNKNOWN_IDENTIFIER,
+        NO_FUNCTION_PARSED_YET,
+        FP_NO_ERROR
+    };
+
+    typedef Value_t value_type;
+
+
+    int Parse(const char* Function, const std::string& Vars,
+              bool useDegrees = false);
+    int Parse(const std::string& Function, const std::string& Vars,
+              bool useDegrees = false);
+
+    void setDelimiterChar(char);
+
+    const char* ErrorMsg() const;
+    inline ParseErrorType GetParseErrorType() const { return parseErrorType; }
+
+    Value_t Eval(const Value_t* Vars);
+    inline int EvalError() const { return evalErrorType; }
+
+    bool AddConstant(const std::string& name, Value_t value);
+    bool AddUnit(const std::string& name, Value_t value);
+
+    typedef Value_t (*FunctionPtr)(const Value_t*);
+
+    bool AddFunction(const std::string& name,
+                     FunctionPtr, unsigned paramsAmount);
+    bool AddFunction(const std::string& name, FunctionParserBase&);
+
+    bool RemoveIdentifier(const std::string& name);
+
+    void Optimize();
+
+
+    int ParseAndDeduceVariables(const std::string& function,
+                                int* amountOfVariablesFound = 0,
+                                bool useDegrees = false);
+    int ParseAndDeduceVariables(const std::string& function,
+                                std::string& resultVarString,
+                                int* amountOfVariablesFound = 0,
+                                bool useDegrees = false);
+    int ParseAndDeduceVariables(const std::string& function,
+                                std::vector<std::string>& resultVars,
+                                bool useDegrees = false);
+
+
+    FunctionParserBase();
+    ~FunctionParserBase();
+
+    // Copy constructor and assignment operator (implemented using the
+    // copy-on-write technique for efficiency):
+    FunctionParserBase(const FunctionParserBase&);
+    FunctionParserBase& operator=(const FunctionParserBase&);
+
+
+    void ForceDeepCopy();
+
+
+#ifdef FUNCTIONPARSER_SUPPORT_DEBUG_OUTPUT
+    // For debugging purposes only:
+    void PrintByteCode(std::ostream& dest, bool showExpression = true) const;
+#endif
+
+
+
+//========================================================================
+private:
+//========================================================================
+
+// Private data:
+// ------------
+    char delimiterChar;
+    ParseErrorType parseErrorType;
+    int evalErrorType;
+
+    friend class FPoptimizer_CodeTree::CodeTree;
+
+    struct Data;
+    Data* data;
+
+    bool useDegreeConversion;
+    unsigned evalRecursionLevel;
+    unsigned StackPtr;
+    const char* errorLocation;
+
+
+// Private methods:
+// ---------------
+    void CopyOnWrite();
+    bool CheckRecursiveLinking(const FunctionParserBase*) const;
+    bool NameExists(const char*, unsigned);
+    bool ParseVariables(const std::string&);
+    int ParseFunction(const char*, bool);
+    const char* SetErrorType(ParseErrorType, const char*);
+
+    void AddFunctionOpcode(unsigned);
+    void AddImmedOpcode(Value_t v);
+    void incStackPtr();
+    void CompilePowi(int);
+    bool TryCompilePowi(Value_t);
+
+    const char* CompileIf(const char*);
+    const char* CompileFunctionParams(const char*, unsigned);
+    const char* CompileElement(const char*);
+    const char* CompilePossibleUnit(const char*);
+    const char* CompilePow(const char*);
+    const char* CompileUnaryMinus(const char*);
+    const char* CompileMult(const char*);
+    const char* CompileAddition(const char*);
+    const char* CompileComparison(const char*);
+    const char* CompileAnd(const char*);
+    const char* CompileExpression(const char*);
+    inline const char* CompileFunction(const char*, unsigned);
+    inline const char* CompileParenthesis(const char*);
+    inline const char* CompileLiteral(const char*);
+};
+
+class FunctionParser: public FunctionParserBase<double> {};
+class FunctionParser_f: public FunctionParserBase<float> {};
+class FunctionParser_ld: public FunctionParserBase<long double> {};
+class FunctionParser_li: public FunctionParserBase<long> {};
+
+#endif
diff --git a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/fpaux.h b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/fpaux.h
new file mode 100644
index 0000000000..a6878bf357
--- /dev/null
+++ b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/fpaux.h
@@ -0,0 +1,599 @@
+/***************************************************************************\
+|* Function Parser for C++ v4.0.3                                          *|
+|*-------------------------------------------------------------------------*|
+|* Copyright: Juha Nieminen, Joel Yliluoma                                 *|
+\***************************************************************************/
+
+// NOTE:
+// This file contains only internal types for the function parser library.
+// You don't need to include this file in your code. Include "fparser.hh"
+// only.
+
+#ifndef ONCE_FPARSER_AUX_H_
+#define ONCE_FPARSER_AUX_H_
+
+#include <cmath>
+#include <cstring>
+
+#ifdef FP_SUPPORT_MPFR_FLOAT_TYPE
+#include "mpfr/MpfrFloat.h"
+#endif
+
+#ifdef FP_SUPPORT_GMP_INT_TYPE
+#include "mpfr/GmpInt.h"
+#endif
+
+#ifdef ONCE_FPARSER_H_
+namespace FUNCTIONPARSERTYPES
+{
+//==========================================================================
+// Math funcs
+//==========================================================================
+    /* fp_pow() is a wrapper for std::pow()
+     * that produces an identical value for
+     * exp(1) ^ 2.0  (0x4000000000000000)
+     * as exp(2.0)   (0x4000000000000000)
+     * - std::pow() on x86_64
+     * produces 2.0  (0x3FFFFFFFFFFFFFFF) instead!
+     * See comments below for other special traits.
+     */
+    template<typename ValueT>
+    inline ValueT fp_pow_with_exp_log(const ValueT& x, const ValueT& y)
+    {
+        // Requirements: x > 0.
+        return fp_exp(fp_log(x) * y);
+    }
+
+    template<typename ValueT>
+    inline ValueT fp_powi(ValueT x, unsigned long y)
+    {
+        // Requirements: y is non-negative integer.
+        ValueT result(1);
+        while(y != 0)
+        {
+            if(y & 1) { result *= x; y -= 1; }
+            else      { x *= x;      y /= 2; }
+        }
+        return result;
+    }
+
+    template<typename ValueT>
+    ValueT fp_pow(const ValueT& x, const ValueT& y)
+    {
+        if(x == ValueT(1)) return ValueT(1);
+        // y is now zero or positive
+
+      if(IsIntegerConst(y))
+        {
+            // Use fast binary exponentiation algorithm
+            // See http://en.wikipedia.org/wiki/Exponentiation_by_squaring
+            if(y >= ValueT(0))
+                return fp_powi(x,              (long)y);
+            else
+                return ValueT(1) / fp_powi(x, -(long)y);
+        }
+
+      if(y >= ValueT(0))
+        {
+            // y is now positive. Calculate using exp(log(x)*y).
+            // See http://en.wikipedia.org/wiki/Exponentiation#Real_powers
+            if(x > ValueT(0)) return fp_pow_with_exp_log(x, y);
+            if(x == ValueT(0)) return ValueT(0);
+            // At this point, y > 0.0 and x is known to be < 0.0,
+            // because positive and zero cases are already handled.
+            //
+            if(!IsIntegerConst(y*ValueT(16)))
+                return -fp_pow_with_exp_log(-x, y);
+            // ^This is not technically correct, but it allows
+            // functions such as cbrt(x^5), that is, x^(5/3),
+            // to be evaluated when x is negative.
+            // It is too complicated (and slow) to test whether y
+            // is a formed from a ratio of an integer to an odd integer.
+            // (And due to floating point inaccuracy, pointless too.)
+            // For example, x^1.30769230769... is
+            // actually x^(17/13), i.e. (x^17) ^ (1/13).
+            // (-5)^(17/13) gives us now -8.204227562330453.
+            // To see whether the result is right, we can test the given
+            // root: (-8.204227562330453)^13 gives us the value of (-5)^17,
+            // which proves that the expression was correct.
+            //
+            // The y*16 check prevents e.g. (-4)^(3/2) from being calculated,
+            // as it would confuse functioninfo when pow() returns no error
+            // but sqrt() does when the formula is converted into sqrt(x)*x.
+            //
+            // The errors in this approach are:
+            //     (-2)^sqrt(2) should produce NaN
+            //                  or actually sqrt(2)I + 2^sqrt(2),
+            //                  produces -(2^sqrt(2)) instead.
+            //                  (Impact: Neglible)
+            // Thus, at worst, we're changing a NaN (or complex)
+            // result into a negative real number result.
+        }
+        else
+        {
+            // y is negative. Utilize the x^y = 1/(x^-y) identity.
+            if(x > ValueT(0)) return fp_pow_with_exp_log(ValueT(1) / x, -y);
+            if(x < ValueT(0))
+            {
+                if(!IsIntegerConst(y*ValueT(-16)))
+                    return -fp_pow_with_exp_log(ValueT(-1) / x, -y);
+                // ^ See comment above.
+            }
+            // Remaining case: 0.0 ^ negative number
+        }
+        // This is reached when:
+        //      x=0 and y<0
+        //      x<0 and y*16 is either positive or negative integer
+        // It is used for producing error values and as a safe fallback.
+        return fp_pow_base(x, y);
+    }
+
+// -------------------------------------------------------------------------
+// double
+// -------------------------------------------------------------------------
+    inline double fp_abs(double x) { return fabs(x); }
+    inline double fp_acos(double x) { return acos(x); }
+    inline double fp_asin(double x) { return asin(x); }
+    inline double fp_atan(double x) { return atan(x); }
+    inline double fp_atan2(double x, double y) { return atan2(x, y); }
+#ifdef FP_SUPPORT_CBRT
+    inline double fp_cbrt(double x) { return cbrt(x); }
+#else
+    inline double fp_cbrt(double x) { return x>0 ?  exp(log( x)/3.0)
+                                           : x<0 ? -exp(log(-x)/3.0)
+                                           : 0.0; }
+#endif
+    inline double fp_ceil(double x) { return ceil(x); }
+    inline double fp_cos(double x) { return cos(x); }
+    inline double fp_cosh(double x) { return cosh(x); }
+    inline double fp_exp(double x) { return exp(x); }
+    inline double fp_floor(double x) { return floor(x); }
+    inline double fp_int(double x) { return floor(x + .5); }
+    inline double fp_log(double x) { return log(x); }
+    inline double fp_log10(double x)
+    { return log(x) *
+            0.434294481903251827651128918916605082294397005803666566; }
+    inline double fp_mod(double x, double y) { return fmod(x, y); }
+    inline double fp_sin(double x) { return sin(x); }
+    inline double fp_sinh(double x) { return sinh(x); }
+    inline double fp_sqrt(double x) { return sqrt(x); }
+    inline double fp_tan(double x) { return tan(x); }
+    inline double fp_tanh(double x) { return tanh(x); }
+
+#ifndef FP_SUPPORT_ASINH
+    inline double fp_asinh(double x) { return log(x + sqrt(x*x + 1.0)); }
+    inline double fp_acosh(double x) { return log(x + sqrt(x*x - 1.0)); }
+    inline double fp_atanh(double x) { return log((1.0+x) / (1.0-x)) * 0.5; }
+#else
+    inline double fp_asinh(double x) { return asinh(x); }
+    inline double fp_acosh(double x) { return acosh(x); }
+    inline double fp_atanh(double x) { return atanh(x); }
+#endif // FP_SUPPORT_ASINH
+
+    inline double fp_trunc(double x) { return x<0.0 ? ceil(x) : floor(x); }
+
+    inline double fp_pow_base(double x, double y) { return pow(x, y); }
+
+#ifndef FP_SUPPORT_LOG2
+    inline double fp_log2(double x)
+    { return log(x) * 1.4426950408889634073599246810018921374266459541529859; }
+#else
+    inline double fp_log2(double x) { return log2(x); }
+#endif // FP_SUPPORT_LOG2
+
+    inline double fp_exp2(double x) { return fp_pow(2.0, x); }
+
+#ifdef FP_EPSILON
+    template<typename Value_t>
+    inline Value_t fp_epsilon() { return FP_EPSILON; }
+#else
+    template<typename Value_t>
+    inline Value_t fp_epsilon() { return 0.0; }
+#endif
+
+#ifdef FP_EPSILON
+    inline bool FloatEqual(double a, double b)
+    { return fabs(a - b) <= fp_epsilon<double>(); }
+#else
+    inline bool FloatEqual(double a, double b)
+    { return a == b; }
+#endif // FP_EPSILON
+
+    inline bool IsIntegerConst(double a)
+    { return FloatEqual(a, (double)(long)a); }
+
+
+// -------------------------------------------------------------------------
+// float
+// -------------------------------------------------------------------------
+#ifdef FP_SUPPORT_FLOAT_TYPE
+    inline float fp_abs(float x) { return fabsf(x); }
+    inline float fp_acos(float x) { return acosf(x); }
+    inline float fp_asin(float x) { return asinf(x); }
+    inline float fp_atan(float x) { return atanf(x); }
+    inline float fp_atan2(float x, float y) { return atan2f(x, y); }
+#ifdef FP_SUPPORT_CBRT
+    inline float fp_cbrt(float x) { return cbrtf(x); }
+#else
+    inline float fp_cbrt(float x) { return x>0 ?  expf(logf( x)/3.0f)
+                                         : x<0 ? -expf(logf(-x)/3.0f)
+                                         : 0.0f; }
+#endif
+    inline float fp_ceil(float x) { return ceilf(x); }
+    inline float fp_cos(float x) { return cosf(x); }
+    inline float fp_cosh(float x) { return coshf(x); }
+    inline float fp_exp(float x) { return expf(x); }
+    inline float fp_floor(float x) { return floorf(x); }
+    inline float fp_int(float x) { return floorf(x + .5F); }
+    inline float fp_log(float x) { return logf(x); }
+    inline float fp_log10(float x)
+    { return logf(x) *
+            0.434294481903251827651128918916605082294397005803666566F; }
+    inline float fp_mod(float x, float y) { return fmodf(x, y); }
+    inline float fp_sin(float x) { return sinf(x); }
+    inline float fp_sinh(float x) { return sinhf(x); }
+    inline float fp_sqrt(float x) { return sqrtf(x); }
+    inline float fp_tan(float x) { return tanf(x); }
+    inline float fp_tanh(float x) { return tanhf(x); }
+
+#ifndef FP_SUPPORT_ASINH
+    inline float fp_asinh(float x) { return logf(x + sqrt(x*x + 1.0F)); }
+    inline float fp_acosh(float x) { return logf(x + sqrt(x*x - 1.0F)); }
+    inline float fp_atanh(float x) { return logf((1.0F+x) / (1.0F-x)) * 0.5F; }
+#else
+    inline float fp_asinh(float x) { return asinhf(x); }
+    inline float fp_acosh(float x) { return acoshf(x); }
+    inline float fp_atanh(float x) { return atanhf(x); }
+#endif // FP_SUPPORT_ASINH
+
+    inline float fp_trunc(float x) { return x<0.0F ? ceilf(x) : floorf(x); }
+
+    inline float fp_pow_base(float x, float y) { return powf(x, y); }
+
+#ifndef FP_SUPPORT_LOG2
+    inline float fp_log2(float x)
+    { return logf(x) *
+            1.4426950408889634073599246810018921374266459541529859F; }
+#else
+    inline float fp_log2(float x) { return log2f(x); }
+#endif // FP_SUPPORT_LOG2
+
+    inline float fp_exp2(float x) { return fp_pow(2.0F, x); }
+
+#ifdef FP_EPSILON
+    template<>
+    inline float fp_epsilon<float>() { return 1e-6F; }
+#else
+    template<>
+    inline float fp_epsilon<float>() { return 0.0F; }
+#endif
+
+#ifdef FP_EPSILON
+    inline bool FloatEqual(float a, float b)
+    { return fabsf(a - b) <= fp_epsilon<float>(); }
+#else
+    inline bool FloatEqual(float a, float b)
+    { return a == b; }
+#endif // FP_EPSILON
+
+    inline bool IsIntegerConst(float a)
+    { return FloatEqual(a, (float)(long)a); }
+#endif // FP_SUPPORT_FLOAT_TYPE
+
+
+
+// -------------------------------------------------------------------------
+// long double
+// -------------------------------------------------------------------------
+#ifdef FP_SUPPORT_LONG_DOUBLE_TYPE
+    inline long double fp_abs(long double x) { return fabsl(x); }
+    inline long double fp_acos(long double x) { return acosl(x); }
+    inline long double fp_asin(long double x) { return asinl(x); }
+    inline long double fp_atan(long double x) { return atanl(x); }
+    inline long double fp_atan2(long double x, long double y)
+    { return atan2l(x, y); }
+#ifdef FP_SUPPORT_CBRT
+    inline long double fp_cbrt(long double x) { return cbrtl(x); }
+#else
+    inline long double fp_cbrt(long double x)
+        { return x>0 ?  expl(logl( x)/3.0l)
+               : x<0 ? -expl(logl(-x)/3.0l)
+               : 0.0l; }
+#endif
+    inline long double fp_ceil(long double x) { return ceill(x); }
+    inline long double fp_cos(long double x) { return cosl(x); }
+    inline long double fp_cosh(long double x) { return coshl(x); }
+    inline long double fp_exp(long double x) { return expl(x); }
+    inline long double fp_floor(long double x) { return floorl(x); }
+    inline long double fp_int(long double x) { return floorl(x + .5L); }
+    inline long double fp_log(long double x) { return logl(x); }
+    inline long double fp_log10(long double x)
+    { return logl(x) *
+            0.434294481903251827651128918916605082294397005803666566L; }
+    inline long double fp_mod(long double x, long double y)
+    { return fmodl(x, y); }
+    inline long double fp_sin(long double x) { return sinl(x); }
+    inline long double fp_sinh(long double x) { return sinhl(x); }
+    inline long double fp_sqrt(long double x) { return sqrtl(x); }
+    inline long double fp_tan(long double x) { return tanl(x); }
+    inline long double fp_tanh(long double x) { return tanhl(x); }
+
+#ifndef FP_SUPPORT_ASINH
+    inline long double fp_asinh(long double x)
+    { return logl(x + sqrtl(x*x + 1.0L)); }
+    inline long double fp_acosh(long double x)
+    { return logl(x + sqrtl(x*x - 1.0L)); }
+    inline long double fp_atanh(long double x)
+    { return logl((1.0L+x) / (1.0L-x)) * 0.5L; }
+#else
+    inline long double fp_asinh(long double x) { return asinhl(x); }
+    inline long double fp_acosh(long double x) { return acoshl(x); }
+    inline long double fp_atanh(long double x) { return atanhl(x); }
+#endif // FP_SUPPORT_ASINH
+
+    inline long double fp_trunc(long double x)
+    { return x<0.0L ? ceill(x) : floorl(x); }
+
+    inline long double fp_pow_base(long double x, long double y)
+    { return powl(x, y); }
+
+#ifndef FP_SUPPORT_LOG2
+    inline long double fp_log2(long double x)
+    { return log(x) * 1.4426950408889634073599246810018921374266459541529859L; }
+#else
+    inline long double fp_log2(long double x) { return log2l(x); }
+#endif // FP_SUPPORT_LOG2
+
+    inline long double fp_exp2(long double x) { return fp_pow(2.0L, x); }
+
+#ifdef FP_EPSILON
+    inline bool FloatEqual(long double a, long double b)
+    { return fabsl(a - b) <= fp_epsilon<double>(); }
+#else
+    inline bool FloatEqual(long double a, long double b)
+    { return a == b; }
+#endif // FP_EPSILON
+
+    inline bool IsIntegerConst(long double a)
+    { return FloatEqual(a, (long double)(long)a); }
+#endif // FP_SUPPORT_LONG_DOUBLE_TYPE
+
+
+// -------------------------------------------------------------------------
+// Long int
+// -------------------------------------------------------------------------
+    inline long fp_abs(long x) { return x < 0 ? -x : x; }
+    inline long fp_acos(long) { return 0; }
+    inline long fp_asin(long) { return 0; }
+    inline long fp_atan(long) { return 0; }
+    inline long fp_atan2(long, long) { return 0; }
+    inline long fp_cbrt(long) { return 0; }
+    inline long fp_ceil(long x) { return x; }
+    inline long fp_cos(long) { return 0; }
+    inline long fp_cosh(long) { return 0; }
+    inline long fp_exp(long) { return 0; }
+    inline long fp_floor(long x) { return x; }
+    inline long fp_int(long x) { return x; }
+    inline long fp_log(long) { return 0; }
+    inline long fp_log10(long) { return 0; }
+    inline long fp_mod(long x, long y) { return x % y; }
+    inline long fp_pow(long, long) { return 0; }
+    inline long fp_sin(long) { return 0; }
+    inline long fp_sinh(long) { return 0; }
+    inline long fp_sqrt(long) { return 1; }
+    inline long fp_tan(long) { return 0; }
+    inline long fp_tanh(long) { return 0; }
+    inline long fp_asinh(long) { return 0; }
+    inline long fp_acosh(long) { return 0; }
+    inline long fp_atanh(long) { return 0; }
+    inline long fp_trunc(long x) { return x; }
+    inline long fp_pow_base(long, long) { return 0; }
+    inline long fp_log2(long) { return 0; }
+    inline long fp_exp2(long) { return 0; }
+
+    template<>
+    inline long fp_epsilon<long>() { return 0; }
+
+    inline bool IsIntegerConst(long) { return true; }
+
+
+// -------------------------------------------------------------------------
+// MpfrFloat
+// -------------------------------------------------------------------------
+#ifdef FP_SUPPORT_MPFR_FLOAT_TYPE
+    inline MpfrFloat fp_abs(const MpfrFloat& x) { return MpfrFloat::abs(x); }
+    inline MpfrFloat fp_acos(const MpfrFloat& x) { return MpfrFloat::acos(x); }
+    inline MpfrFloat fp_asin(const MpfrFloat& x) { return MpfrFloat::asin(x); }
+    inline MpfrFloat fp_atan(const MpfrFloat& x) { return MpfrFloat::atan(x); }
+    inline MpfrFloat fp_atan2(const MpfrFloat& x, const MpfrFloat& y) { return MpfrFloat::atan2(x, y); }
+    inline MpfrFloat fp_cbrt(const MpfrFloat& x) { return MpfrFloat::cbrt(x); }
+    inline MpfrFloat fp_ceil(const MpfrFloat& x) { return MpfrFloat::ceil(x); }
+    inline MpfrFloat fp_cos(const MpfrFloat& x) { return MpfrFloat::cos(x); }
+    inline MpfrFloat fp_cosh(const MpfrFloat& x) { return MpfrFloat::cosh(x); }
+    inline MpfrFloat fp_exp(const MpfrFloat& x) { return MpfrFloat::exp(x); }
+    inline MpfrFloat fp_floor(const MpfrFloat& x) { return MpfrFloat::floor(x); }
+    inline MpfrFloat fp_int(const MpfrFloat& x) { return MpfrFloat::round(x); }
+    inline MpfrFloat fp_log(const MpfrFloat& x) { return MpfrFloat::log(x); }
+    inline MpfrFloat fp_log10(const MpfrFloat& x) { return MpfrFloat::log10(x); }
+    inline MpfrFloat fp_mod(const MpfrFloat& x, const MpfrFloat& y) { return x % y; }
+    inline MpfrFloat fp_sin(const MpfrFloat& x) { return MpfrFloat::sin(x); }
+    inline MpfrFloat fp_sinh(const MpfrFloat& x) { return MpfrFloat::sinh(x); }
+    inline MpfrFloat fp_sqrt(const MpfrFloat& x) { return MpfrFloat::sqrt(x); }
+    inline MpfrFloat fp_tan(const MpfrFloat& x) { return MpfrFloat::tan(x); }
+    inline MpfrFloat fp_tanh(const MpfrFloat& x) { return MpfrFloat::tanh(x); }
+    inline MpfrFloat fp_asinh(const MpfrFloat& x) { return MpfrFloat::asinh(x); }
+    inline MpfrFloat fp_acosh(const MpfrFloat& x) { return MpfrFloat::acosh(x); }
+    inline MpfrFloat fp_atanh(const MpfrFloat& x) { return MpfrFloat::atanh(x); }
+    inline MpfrFloat fp_trunc(const MpfrFloat& x) { return MpfrFloat::trunc(x); }
+
+    inline MpfrFloat fp_pow(const MpfrFloat& x, const MpfrFloat& y) { return MpfrFloat::pow(x, y); }
+    inline MpfrFloat fp_pow_base(const MpfrFloat& x, const MpfrFloat& y) { return MpfrFloat::pow(x, y); }
+
+    inline MpfrFloat fp_log2(const MpfrFloat& x) { return MpfrFloat::log2(x); }
+    inline MpfrFloat fp_exp2(const MpfrFloat& x) { return MpfrFloat::exp2(x); }
+
+    inline bool IsIntegerConst(const MpfrFloat& a) { return a.isInteger(); }
+
+    template<>
+    inline MpfrFloat fp_epsilon<MpfrFloat>() { return MpfrFloat::someEpsilon(); }
+#endif // FP_SUPPORT_MPFR_FLOAT_TYPE
+
+
+// -------------------------------------------------------------------------
+// GMP int
+// -------------------------------------------------------------------------
+#ifdef FP_SUPPORT_GMP_INT_TYPE
+    inline GmpInt fp_abs(GmpInt x) { return GmpInt::abs(x); }
+    inline GmpInt fp_acos(GmpInt) { return 0; }
+    inline GmpInt fp_asin(GmpInt) { return 0; }
+    inline GmpInt fp_atan(GmpInt) { return 0; }
+    inline GmpInt fp_atan2(GmpInt, GmpInt) { return 0; }
+    inline GmpInt fp_cbrt(GmpInt) { return 0; }
+    inline GmpInt fp_ceil(GmpInt x) { return x; }
+    inline GmpInt fp_cos(GmpInt) { return 0; }
+    inline GmpInt fp_cosh(GmpInt) { return 0; }
+    inline GmpInt fp_exp(GmpInt) { return 0; }
+    inline GmpInt fp_floor(GmpInt x) { return x; }
+    inline GmpInt fp_int(GmpInt x) { return x; }
+    inline GmpInt fp_log(GmpInt) { return 0; }
+    inline GmpInt fp_log10(GmpInt) { return 0; }
+    inline GmpInt fp_mod(GmpInt x, GmpInt y) { return x % y; }
+    inline GmpInt fp_pow(GmpInt, GmpInt) { return 0; }
+    inline GmpInt fp_sin(GmpInt) { return 0; }
+    inline GmpInt fp_sinh(GmpInt) { return 0; }
+    inline GmpInt fp_sqrt(GmpInt) { return 0; }
+    inline GmpInt fp_tan(GmpInt) { return 0; }
+    inline GmpInt fp_tanh(GmpInt) { return 0; }
+    inline GmpInt fp_asinh(GmpInt) { return 0; }
+    inline GmpInt fp_acosh(GmpInt) { return 0; }
+    inline GmpInt fp_atanh(GmpInt) { return 0; }
+    inline GmpInt fp_trunc(GmpInt x) { return x; }
+    inline GmpInt fp_pow_base(GmpInt, GmpInt) { return 0; }
+    inline GmpInt fp_log2(GmpInt) { return 0; }
+    inline GmpInt fp_exp2(GmpInt) { return 0; }
+
+    template<>
+    inline GmpInt fp_epsilon<GmpInt>() { return 0; }
+
+    inline bool IsIntegerConst(GmpInt) { return true; }
+#endif // FP_SUPPORT_GMP_INT_TYPE
+
+
+  
+// -------------------------------------------------------------------------
+// Comparison
+// -------------------------------------------------------------------------
+#ifdef FP_EPSILON
+    template<typename Value_t>
+    inline bool fp_equal(Value_t x, Value_t y)
+    { return fp_abs(x - y) <= fp_epsilon<Value_t>(); }
+
+    template<typename Value_t>
+    inline bool fp_nequal(Value_t x, Value_t y)
+    { return fp_abs(x - y) > fp_epsilon<Value_t>(); }
+
+    template<typename Value_t>
+    inline bool fp_less(Value_t x, Value_t y)
+    { return x < y - fp_epsilon<Value_t>(); }
+
+    template<typename Value_t>
+    inline bool fp_lessOrEq(Value_t x, Value_t y)
+    { return x <= y + fp_epsilon<Value_t>(); }
+#else // FP_EPSILON
+    template<typename Value_t>
+    inline bool fp_equal(Value_t x, Value_t y) { return x == y; }
+
+    template<typename Value_t>
+    inline bool fp_nequal(Value_t x, Value_t y) { return x != y; }
+
+    template<typename Value_t>
+    inline bool fp_less(Value_t x, Value_t y) { return x < y; }
+
+    template<typename Value_t>
+    inline bool fp_lessOrEq(Value_t x, Value_t y) { return x <= y; }
+#endif // FP_EPSILON
+
+    template<>
+    inline bool fp_equal<long>(long x, long y) { return x == y; }
+
+    template<>
+    inline bool fp_nequal<long>(long x, long y) { return x != y; }
+
+    template<>
+    inline bool fp_less<long>(long x, long y) { return x < y; }
+
+    template<>
+    inline bool fp_lessOrEq<long>(long x, long y) { return x <= y; }
+
+#ifdef FP_SUPPORT_GMP_INT_TYPE
+    template<>
+    inline bool fp_equal<GmpInt>(GmpInt x, GmpInt y) { return x == y; }
+
+    template<>
+    inline bool fp_nequal<GmpInt>(GmpInt x, GmpInt y) { return x != y; }
+
+    template<>
+    inline bool fp_less<GmpInt>(GmpInt x, GmpInt y) { return x < y; }
+
+    template<>
+    inline bool fp_lessOrEq<GmpInt>(GmpInt x, GmpInt y) { return x <= y; }
+#endif
+} // namespace FUNCTIONPARSERTYPES
+
+#endif // ONCE_FPARSER_H_
+
+
+#ifndef FP_DISABLE_DOUBLE_TYPE
+#define FUNCTIONPARSER_INSTANTIATE_DOUBLE \
+    template class FunctionParserBase<double>;
+#else
+#define FUNCTIONPARSER_INSTANTIATE_DOUBLE
+#endif
+
+#ifdef FP_SUPPORT_FLOAT_TYPE
+#define FUNCTIONPARSER_INSTANTIATE_FLOAT \
+    template class FunctionParserBase<float>;
+#else
+#define FUNCTIONPARSER_INSTANTIATE_FLOAT
+#endif
+
+#ifdef FP_SUPPORT_LONG_DOUBLE_TYPE
+#define FUNCTIONPARSER_INSTANTIATE_LONG_DOUBLE \
+    template class FunctionParserBase<long double>;
+#else
+#define FUNCTIONPARSER_INSTANTIATE_LONG_DOUBLE
+#endif
+
+#ifdef FP_SUPPORT_LONG_INT_TYPE
+#define FUNCTIONPARSER_INSTANTIATE_LONG_INT \
+    template class FunctionParserBase<long>;
+#else
+#define FUNCTIONPARSER_INSTANTIATE_LONG_INT
+#endif
+
+#ifdef FP_SUPPORT_MPFR_FLOAT_TYPE
+#define FUNCTIONPARSER_INSTANTIATE_MPFR_FLOAT \
+    template class FunctionParserBase<MpfrFloat>;
+#else
+#define FUNCTIONPARSER_INSTANTIATE_MPFR_FLOAT
+#endif
+
+#ifdef FP_SUPPORT_GMP_INT_TYPE
+#define FUNCTIONPARSER_INSTANTIATE_GMP_INT \
+    template class FunctionParserBase<GmpInt>;
+#else
+#define FUNCTIONPARSER_INSTANTIATE_GMP_INT
+#endif
+
+/* Add 'FUNCTIONPARSER_INSTANTIATE_TYPES' at the end of all .cc files
+   containing FunctionParserBase implementations.
+ */
+#define FUNCTIONPARSER_INSTANTIATE_TYPES \
+    FUNCTIONPARSER_INSTANTIATE_DOUBLE \
+    FUNCTIONPARSER_INSTANTIATE_FLOAT \
+    FUNCTIONPARSER_INSTANTIATE_LONG_DOUBLE \
+    FUNCTIONPARSER_INSTANTIATE_LONG_INT \
+    FUNCTIONPARSER_INSTANTIATE_MPFR_FLOAT \
+    FUNCTIONPARSER_INSTANTIATE_GMP_INT
+
+#endif // ONCE_FPARSER_AUX_H_
diff --git a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/fpconfig.h b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/fpconfig.h
new file mode 100644
index 0000000000..4c90de4dfc
--- /dev/null
+++ b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/fpconfig.h
@@ -0,0 +1,139 @@
+/***************************************************************************\
+|* Function Parser for C++ v4.0.3                                          *|
+|*-------------------------------------------------------------------------*|
+|* Copyright: Juha Nieminen                                                *|
+\***************************************************************************/
+
+// Configuration file
+// ------------------
+
+/* NOTE:
+   This file is for the internal use of the function parser only.
+   You don't need to include this file in your source files, just
+   include "fparser.hh".
+*/
+
+
+/* Uncomment any of these lines or define them in your compiler settings
+   to enable the correspondent version of the parser. (These are disabled
+   by default because they rely on C99 functions, and non-standard libraries
+   in the case pf MPFR and GMP, and they make compiling needlessly slower
+   and the resulting binary needlessly larger if they are not used in the
+   program.)
+*/
+//#define FP_SUPPORT_FLOAT_TYPE
+#define FP_SUPPORT_LONG_DOUBLE_TYPE
+//#define FP_SUPPORT_LONG_INT_TYPE
+//#define FP_SUPPORT_MPFR_FLOAT_TYPE
+//#define FP_SUPPORT_GMP_INT_TYPE
+
+/* Uncomment this line of define it in your compiler settings if you want
+   to disable compiling the basic double version of the library, in case
+   one of the above types is used but not the double type. (If the double
+   type is not used, then disabling it makes compiling faster and the
+   resulting binary smaller.)
+ */
+//#define FP_DISABLE_DOUBLE_TYPE
+
+/*
+ Note that these do not change what FunctionParser supports, they only
+ change how the function is evaluated, potentially making it faster when
+ these functions are involved.
+ These will make the source code use asinh(), acosh(), atanh(), exp2()
+ and log2().
+*/
+//#define FP_SUPPORT_TR1_MATH_FUNCS
+
+#ifdef FP_SUPPORT_TR1_MATH_FUNCS
+#define FP_SUPPORT_ASINH
+#define FP_SUPPORT_EXP2
+#define FP_SUPPORT_LOG2
+#define FP_SUPPORT_CBRT
+#endif
+
+/*
+ Comment out the following line to enable the eval() function, which can
+ be used in the function string to recursively call the same function.
+ Note that enabling this function may be dangerous even if the maximum
+ recursion level is limited because it is still possible to write functions
+ using it which take enormous  amounts of time to evaluate even though the
+ maximum recursion is never reached. This may be undesirable in some
+ applications.
+ Alternatively you can define the FP_ENABLE_EVAL precompiler constant in
+ your compiler settings.
+*/
+#ifndef FP_ENABLE_EVAL
+#define FP_DISABLE_EVAL
+#endif
+
+
+/*
+ Maximum recursion level for eval() calls:
+*/
+#define FP_EVAL_MAX_REC_LEVEL 1000
+
+
+/*
+ Whether to use shortcut evaluation for the & and | operators:
+*/
+#define FP_DISABLE_SHORTCUT_LOGICAL_EVALUATION
+#ifndef FP_DISABLE_SHORTCUT_LOGICAL_EVALUATION
+#define FP_ENABLE_SHORTCUT_LOGICAL_EVALUATION
+#endif
+
+/*
+ Whether to enable optimizations that may ignore side effects
+ of if() calls, such as changing if(x,!y,0) into x&!y.
+ This is basically the polar opposite of "shortcut logical evaluation".
+ Disabled by default, because it makes eval() rather unsafe.
+*/
+#ifdef FP_ENABLE_IGNORE_IF_SIDEEFFECTS
+#endif
+
+/*
+ Comment out the following lines out if you are not going to use the
+ optimizer and want a slightly smaller library. The Optimize() method
+ can still be called, but it will not do anything.
+ If you are unsure, just leave it. It won't slow down the other parts of
+ the library.
+*/
+//#define FP_NO_SUPPORT_OPTIMIZER
+#ifndef FP_NO_SUPPORT_OPTIMIZER
+#define FP_SUPPORT_OPTIMIZER
+#endif
+
+
+/*
+ Epsilon value used with the comparison operators (must be non-negative):
+ (Comment it out if you don't want to use epsilon in comparisons. Might
+ lead to marginally faster evaluation of the comparison operators, but
+ can introduce inaccuracies in comparisons.)
+*/
+#define FP_EPSILON 1e-14
+
+
+/*
+ No member function of FunctionParser is thread-safe. Most prominently,
+ Eval() is not thread-safe. By uncommenting one of these lines the Eval()
+ function can be made thread-safe at the cost of a possible small overhead.
+ The second version requires that the compiler supports the alloca() function,
+ which is not standard, but is faster.
+ */
+//#define FP_USE_THREAD_SAFE_EVAL
+//#define FP_USE_THREAD_SAFE_EVAL_WITH_ALLOCA
+
+/*
+ Uncomment (or define in your compiler options) to disable evaluation checks.
+ (Consult the documentation for details.)
+ */
+#define FP_NO_EVALUATION_CHECKS
+
+
+
+// Temporary settings while double is the only supported type by the optimizer
+#ifdef FP_DISABLE_DOUBLE_TYPE
+#ifndef FP_NO_SUPPORT_OPTIMIZER
+#define FP_NO_SUPPORT_OPTIMIZER
+#endif
+#undef FP_SUPPORT_OPTIMIZER
+#endif
diff --git a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/fpoptimizer.cpp b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/fpoptimizer.cpp
new file mode 100644
index 0000000000..9fda0c12d9
--- /dev/null
+++ b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/fpoptimizer.cpp
@@ -0,0 +1,10948 @@
+#line 1 "fpoptimizer/fpoptimizer_header.txt"
+/***************************************************************************\
+|* Function Parser for C++ v4.0.3                                          *|
+|*-------------------------------------------------------------------------*|
+|* Function optimizer                                                      *|
+|*-------------------------------------------------------------------------*|
+|* Copyright: Joel Yliluoma                                                *|
+\***************************************************************************/
+
+/* NOTE:
+   This is a concatenation of all the header and source files of the
+   original optimizer source code. All the code has been concatenated
+   into this single file for convenience of usage (in other words, to
+   simply use the optimizer, it's enough to add this file to the project
+   rather than a multitude of files which the original optimizer source
+   code is composed of).
+
+   Thus this file exists for the usage of the Function parser library
+   only, and is not suitable for developing it further. If you want to
+   develop the library further, you should download the development
+   version of the library, which has all the original source files.
+ */
+
+#include "fpconfig.h"
+#ifdef FP_SUPPORT_OPTIMIZER
+
+#define FPOPTIMIZER_MERGED_FILE
+
+#line 1 "fpoptimizer/fpoptimizer_hash.h"
+#ifndef FPoptimizerHashH
+#define FPoptimizerHashH
+
+#ifdef _MSC_VER
+
+typedef unsigned long long fphash_value_t;
+#define FPHASH_CONST(x) x##ULL
+
+#else
+
+#include <stdint.h>
+typedef uint_fast64_t fphash_value_t;
+#define FPHASH_CONST(x) x##ULL
+
+#endif
+
+namespace FUNCTIONPARSERTYPES
+{
+    struct fphash_t
+    {
+        fphash_value_t hash1, hash2;
+
+        bool operator==(const fphash_t& rhs) const
+        { return hash1 == rhs.hash1 && hash2 == rhs.hash2; }
+
+        bool operator!=(const fphash_t& rhs) const
+        { return hash1 != rhs.hash1 || hash2 != rhs.hash2; }
+
+        bool operator<(const fphash_t& rhs) const
+        { return hash1 != rhs.hash1 ? hash1 < rhs.hash1 : hash2 < rhs.hash2; }
+    };
+}
+
+#endif
+
+#line 1 "fpoptimizer/fpoptimizer_autoptr.h"
+#ifndef FPOptimizerAutoPtrH
+#define FPOptimizerAutoPtrH
+
+template<typename Ref>
+class FPOPT_autoptr
+{
+public:
+    FPOPT_autoptr()                   : p(0)   { }
+    FPOPT_autoptr(Ref*        b) : p(b)   { Birth(); }
+    FPOPT_autoptr(const FPOPT_autoptr& b) : p(b.p) { Birth(); }
+
+    inline Ref& operator* () const { return *p; }
+    inline Ref* operator->() const { return p; }
+
+    FPOPT_autoptr& operator= (Ref*        b) { Set(b); return *this; }
+    FPOPT_autoptr& operator= (const FPOPT_autoptr& b) { Set(b.p); return *this; }
+#ifdef __GXX_EXPERIMENTAL_CXX0X__
+    FPOPT_autoptr(FPOPT_autoptr&& b)      : p(b.p) { b.p = 0; }
+    FPOPT_autoptr& operator= (FPOPT_autoptr&& b) { if(p != b.p) { Forget(); p=b.p; b.p=0; }
+                                                   return *this; }
+#endif
+
+    ~FPOPT_autoptr() { Forget(); }
+
+    void UnsafeSetP(Ref* newp) { p = newp; }
+    void swap(FPOPT_autoptr<Ref>& b) { Ref* tmp=p; p=b.p; b.p=tmp; }
+
+private:
+    inline static void Have(Ref* p2);
+    inline void Forget();
+    inline void Birth();
+    inline void Set(Ref* p2);
+private:
+    Ref* p;
+};
+
+//
+template<typename Ref>
+inline void FPOPT_autoptr<Ref>::Forget()
+{
+    if(!p) return;
+    p->RefCount -= 1;
+    if(!p->RefCount) delete p;
+    //assert(p->RefCount >= 0);
+}
+template<typename Ref>
+inline void FPOPT_autoptr<Ref>::Have(Ref* p2)
+{
+    if(p2) ++(p2->RefCount);
+}
+template<typename Ref>
+inline void FPOPT_autoptr<Ref>::Birth()
+{
+    Have(p);
+}
+template<typename Ref>
+inline void FPOPT_autoptr<Ref>::Set(Ref* p2)
+{
+    Have(p2);
+    Forget();
+    p = p2;
+}
+
+#endif
+
+#line 1 "fpoptimizer/fpoptimizer_codetree.h"
+#ifndef FPOptimizer_CodeTreeH
+#define FPOptimizer_CodeTreeH
+
+#include "fpconfig.h"
+#include "fparser.h"
+#include "fptypes.h"
+
+#ifdef FP_SUPPORT_OPTIMIZER
+
+#include <vector>
+#include <utility>
+
+// line removed for fpoptimizer.c: #include "fpoptimizer_hash.h"
+// line removed for fpoptimizer.c: #include "fpoptimizer_autoptr.h"
+
+#ifdef FP_EPSILON
+ #define NEGATIVE_MAXIMUM (-FP_EPSILON)
+#else
+ #define NEGATIVE_MAXIMUM (-1e-14)
+#endif
+
+namespace FPoptimizer_Grammar
+{
+    struct Grammar;
+}
+
+namespace FPoptimizer_ByteCode
+{
+    class ByteCodeSynth;
+}
+
+namespace FPoptimizer_CodeTree
+{
+    class CodeTree;
+
+    struct MinMaxTree
+    {
+        double min,max;
+        bool has_min, has_max;
+        MinMaxTree() : min(),max(),has_min(false),has_max(false) { }
+        MinMaxTree(double mi,double ma): min(mi),max(ma),has_min(true),has_max(true) { }
+        MinMaxTree(bool,double ma): min(),max(ma),has_min(false),has_max(true) { }
+        MinMaxTree(double mi,bool): min(mi),max(),has_min(true),has_max(false) { }
+    };
+
+    struct CodeTreeData;
+    class CodeTree
+    {
+        typedef FPOPT_autoptr<CodeTreeData> DataP;
+        DataP data;
+
+    public:
+    public:
+        CodeTree();
+        ~CodeTree();
+
+        explicit CodeTree(double v); // produce an immed
+        struct VarTag { };
+        explicit CodeTree(unsigned varno, VarTag); // produce a var reference
+        struct CloneTag { };
+        explicit CodeTree(const CodeTree& b, CloneTag);
+
+        /* Generates a CodeTree from the given bytecode */
+        void GenerateFrom(
+            const std::vector<unsigned>& byteCode,
+            const std::vector<double>& immed,
+            const FunctionParser::Data& data,
+            bool keep_powi = false);
+
+        void GenerateFrom(
+            const std::vector<unsigned>& byteCode,
+            const std::vector<double>& immed,
+            const FunctionParser::Data& data,
+            const std::vector<CodeTree>& var_trees,
+            bool keep_powi = false);
+
+        void SynthesizeByteCode(
+            std::vector<unsigned>& byteCode,
+            std::vector<double>&   immed,
+            size_t& stacktop_max);
+
+        void SynthesizeByteCode(
+            FPoptimizer_ByteCode::ByteCodeSynth& synth,
+            bool MustPopTemps=true) const;
+
+        size_t SynthCommonSubExpressions(
+            FPoptimizer_ByteCode::ByteCodeSynth& synth) const;
+
+        void SetParams(const std::vector<CodeTree>& RefParams);
+        void SetParamsMove(std::vector<CodeTree>& RefParams);
+
+        CodeTree GetUniqueRef();
+        // ^use this when CodeTree tmp=x; tmp.CopyOnWrite(); does not do exactly what you want
+
+#ifdef __GXX_EXPERIMENTAL_CXX0X__
+        void SetParams(std::vector<CodeTree>&& RefParams);
+#endif
+        void SetParam(size_t which, const CodeTree& b);
+        void SetParamMove(size_t which, CodeTree& b);
+        void AddParam(const CodeTree& param);
+        void AddParamMove(CodeTree& param);
+        void AddParams(const std::vector<CodeTree>& RefParams);
+        void AddParamsMove(std::vector<CodeTree>& RefParams);
+        void AddParamsMove(std::vector<CodeTree>& RefParams, size_t replacing_slot);
+        void DelParam(size_t index);
+        void DelParams();
+
+        void Become(const CodeTree& b);
+
+        inline size_t GetParamCount() const { return GetParams().size(); }
+        inline CodeTree& GetParam(size_t n) { return GetParams()[n]; }
+        inline const CodeTree& GetParam(size_t n) const { return GetParams()[n]; }
+        inline void SetOpcode(FUNCTIONPARSERTYPES::OPCODE o);
+        inline void SetFuncOpcode(FUNCTIONPARSERTYPES::OPCODE o, unsigned f);
+        inline void SetVar(unsigned v);
+        inline void SetImmed(double v);
+        inline FUNCTIONPARSERTYPES::OPCODE GetOpcode() const;
+        inline FUNCTIONPARSERTYPES::fphash_t GetHash() const;
+        inline const std::vector<CodeTree>& GetParams() const;
+        inline std::vector<CodeTree>& GetParams();
+        inline size_t GetDepth() const;
+        inline const double& GetImmed() const;
+        inline unsigned GetVar() const;
+        inline unsigned GetFuncNo() const;
+        inline bool IsDefined() const { return GetOpcode() != FUNCTIONPARSERTYPES::cNop; }
+
+        inline bool    IsImmed() const { return GetOpcode() == FUNCTIONPARSERTYPES::cImmed; }
+        inline bool      IsVar() const { return GetOpcode() == FUNCTIONPARSERTYPES::VarBegin; }
+        bool    IsLongIntegerImmed() const { return IsImmed() && GetImmed() == (double)GetLongIntegerImmed(); }
+        long   GetLongIntegerImmed() const { return (long)GetImmed(); }
+        bool    IsLogicalValue() const;
+        inline unsigned GetRefCount() const;
+        /* This function calculates the minimum and maximum values
+         * of the tree's result. If an estimate cannot be made,
+         * has_min/has_max are indicated as false.
+         */
+        MinMaxTree CalculateResultBoundaries_do() const;
+        MinMaxTree CalculateResultBoundaries() const;
+
+        enum TriTruthValue { IsAlways, IsNever, Unknown };
+        TriTruthValue GetEvennessInfo() const;
+
+        bool IsAlwaysSigned(bool positive) const;
+        bool IsAlwaysParity(bool odd) const
+            { return GetEvennessInfo() == (odd?IsNever:IsAlways); }
+        bool IsAlwaysInteger(bool integer) const;
+
+        void ConstantFolding();
+        bool ConstantFolding_AndLogic();
+        bool ConstantFolding_OrLogic();
+        bool ConstantFolding_MulLogicItems();
+        bool ConstantFolding_AddLogicItems();
+        bool ConstantFolding_IfOperations();
+        bool ConstantFolding_PowOperations();
+        bool ConstantFolding_ComparisonOperations();
+        template<typename CondType>
+        bool ConstantFolding_LogicCommon(CondType cond_type, bool is_logical);
+        bool ConstantFolding_MulGrouping();
+        bool ConstantFolding_AddGrouping();
+        bool ConstantFolding_Assimilate();
+
+        void Rehash(bool constantfolding = true);
+        inline void Mark_Incompletely_Hashed();
+        inline bool Is_Incompletely_Hashed() const;
+
+        inline const FPoptimizer_Grammar::Grammar* GetOptimizedUsing() const;
+        inline void SetOptimizedUsing(const FPoptimizer_Grammar::Grammar* g);
+
+        bool RecreateInversionsAndNegations(bool prefer_base2 = false);
+        void FixIncompleteHashes();
+
+        void swap(CodeTree& b) { data.swap(b.data); }
+        bool IsIdenticalTo(const CodeTree& b) const;
+        void CopyOnWrite();
+    };
+
+    struct CodeTreeData
+    {
+        int RefCount;
+
+        /* Describing the codetree node */
+        FUNCTIONPARSERTYPES::OPCODE Opcode;
+        union
+        {
+            double   Value;   // In case of cImmed:   value of the immed
+            unsigned Var;     // In case of VarBegin: variable number
+            unsigned Funcno;  // In case of cFCall or cPCall
+        };
+
+        // Parameters for the function
+        //  These use the sign:
+        //   For cAdd: operands to add together (0 to n)
+        //             sign indicates that the value is negated before adding (0-x)
+        //   For cMul: operands to multiply together (0 to n)
+        //             sign indicates that the value is inverted before multiplying (1/x)
+        //   For cAnd: operands to bitwise-and together (0 to n)
+        //             sign indicates that the value is inverted before anding (!x)
+        //   For cOr:  operands to bitwise-or together (0 to n)
+        //             sign indicates that the value is inverted before orring (!x)
+        //  These don't use the sign (sign is always false):
+        //   For cMin: operands to select the minimum of
+        //   For cMax: operands to select the maximum of
+        //   For cImmed, not used
+        //   For VarBegin, not used
+        //   For cIf:  operand 1 = condition, operand 2 = yes-branch, operand 3 = no-branch
+        //   For anything else: the parameters required by the operation/function
+        std::vector<CodeTree> Params;
+
+        /* Internal operation */
+        FUNCTIONPARSERTYPES::fphash_t      Hash;
+        size_t        Depth;
+        const FPoptimizer_Grammar::Grammar* OptimizedUsing;
+
+        CodeTreeData();
+        CodeTreeData(const CodeTreeData& b);
+        explicit CodeTreeData(double i);
+#ifdef __GXX_EXPERIMENTAL_CXX0X__
+        CodeTreeData(CodeTreeData&& b);
+#endif
+
+        bool IsIdenticalTo(const CodeTreeData& b) const;
+        void Sort();
+        void Recalculate_Hash_NoRecursion();
+    };
+
+    inline void CodeTree::SetOpcode(FUNCTIONPARSERTYPES::OPCODE o)
+        { data->Opcode = o; }
+    inline void CodeTree::SetFuncOpcode(FUNCTIONPARSERTYPES::OPCODE o, unsigned f)
+        { SetOpcode(o); data->Funcno = f; }
+    inline void CodeTree::SetVar(unsigned v)
+        { SetOpcode(FUNCTIONPARSERTYPES::VarBegin); data->Var = v; }
+    inline void CodeTree::SetImmed(double v)
+        { SetOpcode(FUNCTIONPARSERTYPES::cImmed); data->Value = v; }
+    inline FUNCTIONPARSERTYPES::OPCODE CodeTree::GetOpcode() const { return data->Opcode; }
+    inline FUNCTIONPARSERTYPES::fphash_t CodeTree::GetHash() const { return data->Hash; }
+    inline const std::vector<CodeTree>& CodeTree::GetParams() const { return data->Params; }
+    inline std::vector<CodeTree>& CodeTree::GetParams() { return data->Params; }
+    inline size_t CodeTree::GetDepth() const { return data->Depth; }
+    inline const double& CodeTree::GetImmed() const { return data->Value; }
+    inline unsigned CodeTree::GetVar() const { return data->Var; }
+    inline unsigned CodeTree::GetFuncNo() const { return data->Funcno; }
+
+    inline const FPoptimizer_Grammar::Grammar* CodeTree::GetOptimizedUsing() const
+        { return data->OptimizedUsing; }
+    inline void CodeTree::SetOptimizedUsing(const FPoptimizer_Grammar::Grammar* g)
+        { data->OptimizedUsing = g; }
+    inline unsigned CodeTree::GetRefCount() const { return data->RefCount; }
+
+    inline void CodeTree::Mark_Incompletely_Hashed() { data->Depth = 0; }
+    inline bool CodeTree::Is_Incompletely_Hashed() const { return data->Depth == 0; }
+
+#ifdef FUNCTIONPARSER_SUPPORT_DEBUG_OUTPUT
+    void DumpHashes(const FPoptimizer_CodeTree::CodeTree& tree, std::ostream& o = std::cout);
+    void DumpTree(const FPoptimizer_CodeTree::CodeTree& tree, std::ostream& o = std::cout);
+    void DumpTreeWithIndent(const FPoptimizer_CodeTree::CodeTree& tree, std::ostream& o = std::cout, const std::string& indent = "\\");
+#endif
+}
+
+#endif
+
+#endif
+
+#line 1 "fpoptimizer/fpoptimizer_grammar.h"
+#ifndef FPOPT_NAN_CONST
+
+#include <iostream>
+
+#include "fpconfig.h"
+#include "fparser.h"
+#include "fptypes.h"
+
+#define FPOPT_NAN_CONST (-1712345.25) /* Would use 0.0 / 0.0 here, but some compilers don't accept it. */
+
+namespace FPoptimizer_CodeTree
+{
+    class CodeTree;
+}
+
+namespace FPoptimizer_Grammar
+{
+    enum ImmedConstraint_Value
+    {
+        ValueMask = 0x07,
+        Value_AnyNum     = 0x0, // any value
+        Value_EvenInt    = 0x1, // any even integer (0,2,4, etc)
+        Value_OddInt     = 0x2, // any odd integer (1,3, etc)
+        Value_IsInteger  = 0x3, // any integer-value (excludes e.g. 0.2)
+        Value_NonInteger = 0x4, // any non-integer (excludes e.g. 1 or 5)
+        Value_Logical    = 0x5  // a result of cNot,cNotNot,cAnd,cOr or comparators
+    };
+    enum ImmedConstraint_Sign
+    {
+        SignMask  = 0x18,
+        Sign_AnySign     = 0x00, // - or +
+        Sign_Positive    = 0x08, // positive only
+        Sign_Negative    = 0x10, // negative only
+        Sign_NoIdea      = 0x18  // where sign cannot be guessed
+    };
+    enum ImmedConstraint_Oneness
+    {
+        OnenessMask   = 0x60,
+        Oneness_Any      = 0x00,
+        Oneness_One      = 0x20, // +1 or -1
+        Oneness_NotOne   = 0x40  // anything but +1 or -1
+    };
+    enum ImmedConstraint_Constness
+    {
+        ConstnessMask = 0x80,
+        Constness_Any    = 0x00,
+        Constness_Const  = 0x80
+    };
+
+    /* The param_opcode field of the ParamSpec has the following
+     * possible values (from enum SpecialOpcode):
+     *   NumConstant:
+     *      this describes a specific constant value (constvalue)
+     *      that must be matched / synthesized.
+     *   ParamHolder:
+     *      this describes any node
+     *      that must be matched / synthesized.
+     *      "index" is the ID of the NamedHolder:
+     *      In matching, all NamedHolders having the same ID
+     *      must match the identical node.
+     *      In synthesizing, the node matched by
+     *      a NamedHolder with this ID must be synthesized.
+     *    SubFunction:
+     *      this describes a subtree
+     *      that must be matched / synthesized.
+     *      The subtree is described in subfunc_opcode,param_begin..+param_count.
+     *      If the type is GroupFunction, the tree is expected
+     *      to yield a constant value which is tested.
+     */
+    enum SpecialOpcode
+    {
+        NumConstant,        // Holds a particular value (syntax-time constant)
+        ParamHolder,        // Holds a particular named param
+        SubFunction         // Holds an opcode and the params
+    };
+
+    enum ParamMatchingType
+    {
+        PositionalParams, // this set of params in this order
+        SelectedParams,   // this set of params in any order
+        AnyParams,        // these params are included
+        GroupFunction     // this function represents a constant value
+    };
+
+    enum RuleType
+    {
+        ProduceNewTree, // replace self with the first (and only) from replaced_param
+        ReplaceParams   // replace indicate params with replaced_params
+    };
+
+#ifdef __GNUC__
+# define PACKED_GRAMMAR_ATTRIBUTE __attribute__((packed))
+#else
+# define PACKED_GRAMMAR_ATTRIBUTE
+#endif
+
+    enum { PARAM_INDEX_BITS = 9 };
+
+    /* A ParamSpec object describes
+     * either a parameter (leaf, node) that must be matched,
+     * or a parameter (leaf, node) that must be synthesized.
+     */
+    typedef std::pair<SpecialOpcode, const void*> ParamSpec;
+    ParamSpec ParamSpec_Extract(unsigned paramlist, unsigned index);
+    bool ParamSpec_Compare(const void* a, const void* b, SpecialOpcode type);
+    unsigned ParamSpec_GetDepCode(const ParamSpec& b);
+
+    struct ParamSpec_ParamHolder
+    {
+        unsigned index       : 8; // holder ID
+        unsigned constraints : 8; // constraints
+        unsigned depcode     :16;
+    } PACKED_GRAMMAR_ATTRIBUTE;
+
+    struct ParamSpec_NumConstant
+    {
+        double constvalue;        // the value
+    } PACKED_GRAMMAR_ATTRIBUTE;
+
+    struct ParamSpec_SubFunctionData
+    {
+        /* Expected parameters (leaves) of the tree: */
+        unsigned param_count         : 2;
+        unsigned param_list          : 30;
+        /* The opcode that the tree must have when SubFunction */
+        FUNCTIONPARSERTYPES::OPCODE subfunc_opcode : 8;
+
+        /* When matching, type describes the method of matching.
+         *
+         *               Sample input tree:      (cOr 2 3)  (cOr 2 4) (cOr 3 2) (cOr 4 2 3) (cOr 2)
+         * Possible methods:
+         *    PositionalParams, e.g. (cOr [2 3]):  match     no match  no match  no match   no match
+         *      The nodes described here are
+         *      to be matched, in this order.
+         *    SelectedParams,   e.g. (cOr {2 3}):  match     no match   match    no match   no match
+         *      The nodes described here are
+         *      to be matched, in any order.
+         *    AnyParams,        e.g. (cOr 2 3  ):  match     no match   match     match     no match
+         *      At least the nodes described here
+         *      are to be matched, in any order.
+         * When synthesizing, the type is ignored.
+         */
+        ParamMatchingType match_type : 3; /* When SubFunction */
+        /* Note: match_type needs 2, but we specify 3 because
+         * otherwise Microsoft VC++ borks things up
+         * as it interprets the value as signed.
+         */
+        /* Optional restholder index for capturing the rest of parameters (0=not used)
+         * Only valid when match_type = AnyParams
+         */
+        unsigned restholder_index : 5;
+    } PACKED_GRAMMAR_ATTRIBUTE; // size: 2+30+6+2+8=48 bits=6 bytes
+
+    struct ParamSpec_SubFunction
+    {
+        ParamSpec_SubFunctionData data;
+        unsigned constraints : 8; // constraints
+        unsigned depcode     : 8;
+    } PACKED_GRAMMAR_ATTRIBUTE; // 8 bytes
+
+    /* Theoretical minimal sizes in each param_opcode cases:
+     * Assume param_opcode needs 3 bits.
+     *    NumConstant:   3 + 64              (or 3+4 if just use index to clist[])
+     *    ParamHolder:   3 + 7 + 2           (7 for constraints, 2 for immed index)
+     *    SubFunction:   3 + 7 + 2 + 2 + 3*9 = 41
+     */
+
+    /* A rule describes a pattern for matching
+     * and the method how to reconstruct the
+     * matched node(s) in the tree.
+     */
+    struct Rule
+    {
+        /* If the rule matched, this field describes how to perform
+         * the replacement.
+         *   When type==ProduceNewTree,
+         *       the source tree is replaced entirely with
+         *       the new tree described at repl_param_begin[0].
+         *   When type==ReplaceParams,
+         *       the matching leaves in the source tree are removed
+         *       and new leaves are constructedfrom the trees
+         *       described at repl_param_begin[0..repl_param_count].
+         *       Other leaves remain intact.
+         */
+        RuleType  ruletype         : 2;
+        bool      logical_context  : 1;
+
+        /* The replacement parameters (if NewTree, begin[0] represents the new tree) */
+        unsigned  repl_param_count : 2; /* Assumed to be 1 when type == ProduceNewTree */
+        unsigned  repl_param_list  : 27;
+
+        /* The function that we must match. Always a SubFunction. */
+        ParamSpec_SubFunctionData match_tree;
+    } PACKED_GRAMMAR_ATTRIBUTE; // size: 2+1+2+27 + 48 = 80 bits = 10 bytes
+
+    /* Grammar is a set of rules for tree substitutions. */
+    struct Grammar
+    {
+        /* The rules of this grammar */
+        unsigned rule_count;
+        unsigned char rule_list[999]; // maximum limit...
+        /* Note: Changing the limit has no effect to performance of
+         * fparser. The limit is only actually used within grammar_parser.
+         * A too low limit causes a memory corruption during the parse.
+         * A too high limit just may cause inconvenience.
+         * The actual grammar items linked to fparser are optimized for size,
+         * and the size of the Grammar object may be considerably smaller
+         * than what is indicated by this prototype.
+         */
+    };
+
+    extern "C" {
+        extern const Rule      grammar_rules[];
+    #ifndef FPOPTIMIZER_MERGED_FILE
+        extern const Grammar   grammar_optimize_round1;
+        extern const Grammar   grammar_optimize_round2;
+        extern const Grammar   grammar_optimize_round3;
+        extern const Grammar   grammar_optimize_round4;
+        extern const Grammar   grammar_optimize_shortcut_logical_evaluation;
+        extern const Grammar   grammar_optimize_nonshortcut_logical_evaluation;
+        extern const Grammar   grammar_optimize_ignore_if_sideeffects;
+        extern const Grammar   grammar_optimize_abslogical;
+        extern const Grammar   grammar_optimize_base2_expand;
+    #endif
+    }
+
+    void DumpParam(const ParamSpec& p, std::ostream& o = std::cout);
+    void DumpParams(unsigned paramlist, unsigned count, std::ostream& o = std::cout);
+}
+
+#endif
+
+#line 1 "fpoptimizer/fpoptimizer_consts.h"
+#ifndef M_PI
+#define M_PI 3.1415926535897932384626433832795
+#endif
+
+#define CONSTANT_E     2.71828182845904523536  // exp(1)
+#define CONSTANT_EI    0.3678794411714423215955 // exp(-1)
+#define CONSTANT_2E    7.3890560989306502272304 // exp(2)
+#define CONSTANT_2EI   0.135335283236612691894 // exp(-2)
+#define CONSTANT_PI    M_PI                    // atan2(0,-1)
+#define CONSTANT_L10   2.30258509299404590109  // log(10)
+#define CONSTANT_L2    0.69314718055994530943  // log(2)
+#define CONSTANT_L10I  0.43429448190325176116  // 1/log(10)
+#define CONSTANT_L2I   1.4426950408889634074   // 1/log(2)
+#define CONSTANT_L10E  CONSTANT_L10I           // log10(e)
+#define CONSTANT_L10EI CONSTANT_L10            // 1/log10(e)
+#define CONSTANT_L10B  0.3010299956639811952137 // log10(2)
+#define CONSTANT_L10BI 3.3219280948873623478703 // 1/log10(2)
+#define CONSTANT_LB10  CONSTANT_L10BI          // log2(10)
+#define CONSTANT_LB10I CONSTANT_L10B           // 1/log2(10)
+#define CONSTANT_L2E   CONSTANT_L2I            // log2(e)
+#define CONSTANT_L2EI  CONSTANT_L2             // 1/log2(e)
+#define CONSTANT_DR    (180.0 / M_PI)          // 180/pi
+#define CONSTANT_RD    (M_PI / 180.0)          // pi/180
+
+#define CONSTANT_POS_INF     HUGE_VAL  // positive infinity, from math.h
+#define CONSTANT_NEG_INF   (-HUGE_VAL) // negative infinity
+#define CONSTANT_PIHALF (M_PI / 2)
+
+#line 1 "fpoptimizer/fpoptimizer_optimize.h"
+// line removed for fpoptimizer.c: #include "fpoptimizer_codetree.h"
+// line removed for fpoptimizer.c: #include "fpoptimizer_grammar.h"
+
+#ifdef FP_SUPPORT_OPTIMIZER
+
+#include <vector>
+#include <utility>
+#include <iostream>
+
+//#define DEBUG_SUBSTITUTIONS
+
+namespace FPoptimizer_Optimize
+{
+    using namespace FPoptimizer_Grammar;
+    using namespace FPoptimizer_CodeTree;
+    using namespace FUNCTIONPARSERTYPES;
+
+    /* This struct collects information regarding the matching process so far */
+    class MatchInfo
+    {
+    public:
+        std::vector<std::pair<bool,std::vector<CodeTree>
+                             > > restholder_matches;
+        std::vector<CodeTree> paramholder_matches;
+        std::vector<unsigned> matched_params;
+    public:
+        /* These functions save data from matching */
+        bool SaveOrTestRestHolder(
+            unsigned restholder_index,
+            const std::vector<CodeTree>& treelist)
+        {
+            if(restholder_matches.size() <= restholder_index)
+            {
+                restholder_matches.resize(restholder_index+1);
+                restholder_matches[restholder_index].first  = true;
+                restholder_matches[restholder_index].second = treelist;
+                return true;
+            }
+            if(restholder_matches[restholder_index].first == false)
+            {
+                restholder_matches[restholder_index].first  = true;
+                restholder_matches[restholder_index].second = treelist;
+                return true;
+            }
+            const std::vector<CodeTree>& found =
+                restholder_matches[restholder_index].second;
+            if(treelist.size() != found.size())
+                return false;
+            for(size_t a=0; a<treelist.size(); ++a)
+                if(!treelist[a].IsIdenticalTo(found[a]))
+                    return false;
+            return true;
+        }
+
+        void SaveRestHolder(
+            unsigned restholder_index,
+            std::vector<CodeTree>& treelist)
+        {
+            if(restholder_matches.size() <= restholder_index)
+                restholder_matches.resize(restholder_index+1);
+            restholder_matches[restholder_index].first = true;
+            restholder_matches[restholder_index].second.swap(treelist);
+        }
+
+        bool SaveOrTestParamHolder(
+            unsigned paramholder_index,
+            const CodeTree& treeptr)
+        {
+            if(paramholder_matches.size() <= paramholder_index)
+            {
+                paramholder_matches.reserve(paramholder_index+1);
+                paramholder_matches.resize(paramholder_index);
+                paramholder_matches.push_back(treeptr);
+                return true;
+            }
+            if(!paramholder_matches[paramholder_index].IsDefined())
+            {
+                paramholder_matches[paramholder_index] = treeptr;
+                return true;
+            }
+            return treeptr.IsIdenticalTo(paramholder_matches[paramholder_index]);
+        }
+
+        void SaveMatchedParamIndex(unsigned index)
+        {
+            matched_params.push_back(index);
+        }
+
+        /* These functions retrieve the data from matching
+         * for use when synthesizing the resulting tree.
+         */
+        const CodeTree& GetParamHolderValueIfFound( unsigned paramholder_index ) const
+        {
+            static const CodeTree dummytree;
+            if(paramholder_matches.size() <= paramholder_index)
+                return dummytree;
+            return paramholder_matches[paramholder_index];
+        }
+
+        const CodeTree& GetParamHolderValue( unsigned paramholder_index ) const
+            { return paramholder_matches[paramholder_index]; }
+
+        bool HasRestHolder(unsigned restholder_index) const
+            { return restholder_matches.size() > restholder_index
+                  && restholder_matches[restholder_index].first == true; }
+
+        const std::vector<CodeTree>& GetRestHolderValues( unsigned restholder_index ) const
+        {
+            static const std::vector<CodeTree> empty_result;
+            if(restholder_matches.size() <= restholder_index)
+                return empty_result;
+            return restholder_matches[restholder_index].second;
+        }
+
+        const std::vector<unsigned>& GetMatchedParamIndexes() const
+            { return matched_params; }
+
+        /* */
+        void swap(MatchInfo& b)
+        {
+            restholder_matches.swap(b.restholder_matches);
+            paramholder_matches.swap(b.paramholder_matches);
+            matched_params.swap(b.matched_params);
+        }
+        MatchInfo& operator=(const MatchInfo& b)
+        {
+            restholder_matches = b.restholder_matches;
+            paramholder_matches = b.paramholder_matches;
+            matched_params = b.matched_params;
+            return *this;
+        }
+    };
+
+    class MatchPositionSpecBase;
+
+    // For iterating through match candidates
+    typedef FPOPT_autoptr<MatchPositionSpecBase> MatchPositionSpecBaseP;
+
+    class MatchPositionSpecBase
+    {
+    public:
+        int RefCount;
+    public:
+        MatchPositionSpecBase() : RefCount(0) { }
+        virtual ~MatchPositionSpecBase() { }
+    };
+    struct MatchResultType
+    {
+        bool found;
+        MatchPositionSpecBaseP specs;
+
+        MatchResultType(bool f) : found(f), specs() { }
+        MatchResultType(bool f,
+                        const MatchPositionSpecBaseP& s) : found(f), specs(s) { }
+    };
+
+    /* Synthesize the given grammatic rule's replacement into the codetree */
+    void SynthesizeRule(
+        const Rule& rule,
+        CodeTree& tree,
+        MatchInfo& info);
+
+    /* Test the given parameter to a given CodeTree */
+    MatchResultType TestParam(
+        const ParamSpec& parampair,
+        const CodeTree& tree,
+        const MatchPositionSpecBaseP& start_at,
+        MatchInfo& info);
+
+    /* Test the list of parameters to a given CodeTree */
+    MatchResultType TestParams(
+        const ParamSpec_SubFunctionData& model_tree,
+        const CodeTree& tree,
+        const MatchPositionSpecBaseP& start_at,
+        MatchInfo& info,
+        bool TopLevel);
+
+    bool ApplyGrammar(const Grammar& grammar,
+                      FPoptimizer_CodeTree::CodeTree& tree,
+                      bool from_logical_context = false);
+    void ApplyGrammars(FPoptimizer_CodeTree::CodeTree& tree);
+
+    bool IsLogisticallyPlausibleParamsMatch(
+        const ParamSpec_SubFunctionData& params,
+        const CodeTree& tree);
+}
+
+namespace FPoptimizer_Grammar
+{
+    void DumpMatch(const Rule& rule,
+                   const FPoptimizer_CodeTree::CodeTree& tree,
+                   const FPoptimizer_Optimize::MatchInfo& info,
+                   bool DidMatch,
+                   std::ostream& o = std::cout);
+    void DumpMatch(const Rule& rule,
+                   const FPoptimizer_CodeTree::CodeTree& tree,
+                   const FPoptimizer_Optimize::MatchInfo& info,
+                   const char* whydump,
+                   std::ostream& o = std::cout);
+}
+
+#endif
+
+#line 1 "fpoptimizer/crc32.h"
+/* crc32 */
+
+#ifdef _MSC_VER
+
+ typedef unsigned int crc32_t;
+
+#else
+
+ #include <stdint.h>
+ typedef uint_least32_t crc32_t;
+
+#endif
+
+namespace crc32
+{
+    enum { startvalue = 0xFFFFFFFFUL, poly = 0xEDB88320UL };
+
+    /* This code constructs the CRC32 table at compile-time,
+     * avoiding the need for a huge explicitly written table of magical numbers. */
+    template<crc32_t crc> // One byte of a CRC32 (eight bits):
+    struct b8
+    {
+        enum { b1 = (crc & 1) ? (poly ^ (crc >> 1)) : (crc >> 1),
+               b2 = (b1  & 1) ? (poly ^ (b1  >> 1)) : (b1  >> 1),
+               b3 = (b2  & 1) ? (poly ^ (b2  >> 1)) : (b2  >> 1),
+               b4 = (b3  & 1) ? (poly ^ (b3  >> 1)) : (b3  >> 1),
+               b5 = (b4  & 1) ? (poly ^ (b4  >> 1)) : (b4  >> 1),
+               b6 = (b5  & 1) ? (poly ^ (b5  >> 1)) : (b5  >> 1),
+               b7 = (b6  & 1) ? (poly ^ (b6  >> 1)) : (b6  >> 1),
+               res= (b7  & 1) ? (poly ^ (b7  >> 1)) : (b7  >> 1) };
+    };
+    inline crc32_t update(crc32_t crc, unsigned/* char */b) // __attribute__((pure))
+    {
+        // Four values of the table
+        #define B4(n) b8<n>::res,b8<n+1>::res,b8<n+2>::res,b8<n+3>::res
+        // Sixteen values of the table
+        #define R(n) B4(n),B4(n+4),B4(n+8),B4(n+12)
+        // The whole table, index by steps of 16
+        static const crc32_t table[256] =
+        { R(0x00),R(0x10),R(0x20),R(0x30), R(0x40),R(0x50),R(0x60),R(0x70),
+          R(0x80),R(0x90),R(0xA0),R(0xB0), R(0xC0),R(0xD0),R(0xE0),R(0xF0) };
+        #undef R
+        #undef B4
+        return ((crc >> 8) /* & 0x00FFFFFF*/) ^ table[/*(unsigned char)*/(crc^b)&0xFF];
+    }
+    inline crc32_t calc_upd(crc32_t c, const unsigned char* buf, size_t size)
+    {
+        crc32_t value = c;
+        for(size_t p=0; p<size; ++p) value = update(value, buf[p]);
+        return value;
+    }
+    inline crc32_t calc(const unsigned char* buf, size_t size)
+    {
+        return calc_upd(startvalue, buf, size);
+    }
+}
+
+#line 1 "fpoptimizer/fpoptimizer_opcodename.h"
+// line removed for fpoptimizer.c: #include "fpoptimizer_grammar.h"
+#include <string>
+
+const std::string FP_GetOpcodeName(FPoptimizer_Grammar::SpecialOpcode opcode, bool pad=false);
+const std::string FP_GetOpcodeName(FUNCTIONPARSERTYPES::OPCODE opcode,        bool pad=false);
+
+#line 1 "fpoptimizer/fpoptimizer_opcodename.c"
+#include <string>
+#include <sstream>
+#include <assert.h>
+
+#include <iostream>
+
+#include "fpconfig.h"
+#include "fptypes.h"
+
+// line removed for fpoptimizer.c: #include "fpoptimizer_grammar.h"
+// line removed for fpoptimizer.c: #include "fpoptimizer_opcodename.h"
+
+using namespace FPoptimizer_Grammar;
+using namespace FUNCTIONPARSERTYPES;
+
+const std::string FP_GetOpcodeName(FPoptimizer_Grammar::SpecialOpcode opcode, bool pad)
+{
+#if 1
+    /* Symbolic meanings for the opcodes? */
+    const char* p = 0;
+    switch( opcode )
+    {
+        case NumConstant:   p = "NumConstant"; break;
+        case ParamHolder:   p = "ParamHolder"; break;
+        case SubFunction:   p = "SubFunction"; break;
+    }
+    std::ostringstream tmp;
+    //if(!p) std::cerr << "o=" << opcode << "\n";
+    assert(p);
+    tmp << p;
+    if(pad) while(tmp.str().size() < 12) tmp << ' ';
+    return tmp.str();
+#else
+    /* Just numeric meanings */
+    std::ostringstream tmp;
+    tmp << opcode;
+    if(pad) while(tmp.str().size() < 5) tmp << ' ';
+    return tmp.str();
+#endif
+}
+
+const std::string FP_GetOpcodeName(FUNCTIONPARSERTYPES::OPCODE opcode,        bool pad)
+{
+#if 1
+    /* Symbolic meanings for the opcodes? */
+    const char* p = 0;
+    switch(opcode)
+    {
+        case cAbs: p = "cAbs"; break;
+        case cAcos: p = "cAcos"; break;
+        case cAcosh: p = "cAcosh"; break;
+        case cAsin: p = "cAsin"; break;
+        case cAsinh: p = "cAsinh"; break;
+        case cAtan: p = "cAtan"; break;
+        case cAtan2: p = "cAtan2"; break;
+        case cAtanh: p = "cAtanh"; break;
+        case cCbrt: p = "cCbrt"; break;
+        case cCeil: p = "cCeil"; break;
+        case cCos: p = "cCos"; break;
+        case cCosh: p = "cCosh"; break;
+        case cCot: p = "cCot"; break;
+        case cCsc: p = "cCsc"; break;
+        case cEval: p = "cEval"; break;
+        case cExp: p = "cExp"; break;
+        case cExp2: p = "cExp2"; break;
+        case cFloor: p = "cFloor"; break;
+        case cIf: p = "cIf"; break;
+        case cInt: p = "cInt"; break;
+        case cLog: p = "cLog"; break;
+        case cLog2: p = "cLog2"; break;
+        case cLog10: p = "cLog10"; break;
+        case cMax: p = "cMax"; break;
+        case cMin: p = "cMin"; break;
+        case cPow: p = "cPow"; break;
+        case cSec: p = "cSec"; break;
+        case cSin: p = "cSin"; break;
+        case cSinh: p = "cSinh"; break;
+        case cSqrt: p = "cSqrt"; break;
+        case cTan: p = "cTan"; break;
+        case cTanh: p = "cTanh"; break;
+        case cTrunc: p = "cTrunc"; break;
+        case cImmed: p = "cImmed"; break;
+        case cJump: p = "cJump"; break;
+        case cNeg: p = "cNeg"; break;
+        case cAdd: p = "cAdd"; break;
+        case cSub: p = "cSub"; break;
+        case cMul: p = "cMul"; break;
+        case cDiv: p = "cDiv"; break;
+        case cMod: p = "cMod"; break;
+        case cEqual: p = "cEqual"; break;
+        case cNEqual: p = "cNEqual"; break;
+        case cLess: p = "cLess"; break;
+        case cLessOrEq: p = "cLessOrEq"; break;
+        case cGreater: p = "cGreater"; break;
+        case cGreaterOrEq: p = "cGreaterOrEq"; break;
+        case cNot: p = "cNot"; break;
+        case cAnd: p = "cAnd"; break;
+        case cOr: p = "cOr"; break;
+        case cDeg: p = "cDeg"; break;
+        case cRad: p = "cRad"; break;
+        case cFCall: p = "cFCall"; break;
+        case cPCall: p = "cPCall"; break;
+#ifdef FP_SUPPORT_OPTIMIZER
+        case cFetch: p = "cFetch"; break;
+        case cPopNMov: p = "cPopNMov"; break;
+        case cLog2by: p = "cLog2by"; break;
+#endif
+        case cAbsNot: p = "cAbsNot"; break;
+        case cAbsNotNot: p = "cAbsNotNot"; break;
+        case cAbsAnd: p = "cAbsAnd"; break;
+        case cAbsOr: p = "cAbsOr"; break;
+        case cAbsIf: p = "cAbsIf"; break;
+        case cDup: p = "cDup"; break;
+        case cInv: p = "cInv"; break;
+        case cSqr: p = "cSqr"; break;
+        case cRDiv: p = "cRDiv"; break;
+        case cRSub: p = "cRSub"; break;
+        case cNotNot: p = "cNotNot"; break;
+        case cRSqrt: p = "cRSqrt"; break;
+        case cNop: p = "cNop"; break;
+        case VarBegin: p = "VarBegin"; break;
+    }
+    std::ostringstream tmp;
+    //if(!p) std::cerr << "o=" << opcode << "\n";
+    assert(p);
+    tmp << p;
+    if(pad) while(tmp.str().size() < 12) tmp << ' ';
+    return tmp.str();
+#else
+    /* Just numeric meanings */
+    std::ostringstream tmp;
+    tmp << opcode;
+    if(pad) while(tmp.str().size() < 5) tmp << ' ';
+    return tmp.str();
+#endif
+}
+
+#line 1 "fpoptimizer/fpoptimizer_bytecodesynth.h"
+#include "fpconfig.h"
+#include "fparser.h"
+#include "fptypes.h"
+
+#ifdef FP_SUPPORT_OPTIMIZER
+
+#include <vector>
+#include <utility>
+
+// line removed for fpoptimizer.c: #include "fpoptimizer_codetree.h"
+
+#ifndef FP_GENERATING_POWI_TABLE
+enum { MAX_POWI_BYTECODE_LENGTH = 20 };
+#else
+enum { MAX_POWI_BYTECODE_LENGTH = 999 };
+#endif
+enum { MAX_MULI_BYTECODE_LENGTH = 3 };
+
+namespace FPoptimizer_ByteCode
+{
+    class ByteCodeSynth
+    {
+    public:
+        ByteCodeSynth()
+            : ByteCode(), Immed(), StackTop(0), StackMax(0)
+        {
+            /* estimate the initial requirements as such */
+            ByteCode.reserve(64);
+            Immed.reserve(8);
+            StackState.reserve(16);
+        }
+
+        void Pull(std::vector<unsigned>& bc,
+                  std::vector<double>&   imm,
+                  size_t& StackTop_max)
+        {
+            ByteCode.swap(bc);
+            Immed.swap(imm);
+            StackTop_max = StackMax;
+        }
+
+        size_t GetByteCodeSize() const { return ByteCode.size(); }
+        size_t GetStackTop()     const { return StackTop; }
+
+        void PushVar(unsigned varno)
+        {
+            ByteCode.push_back(varno);
+            SetStackTop(StackTop+1);
+        }
+
+        void PushImmed(double immed)
+        {
+            using namespace FUNCTIONPARSERTYPES;
+            ByteCode.push_back(cImmed);
+            Immed.push_back(immed);
+            SetStackTop(StackTop+1);
+        }
+
+        void StackTopIs(const FPoptimizer_CodeTree::CodeTree& tree)
+        {
+            if(StackTop > 0)
+            {
+                StackState[StackTop-1].first = true;
+                StackState[StackTop-1].second = tree;
+            }
+        }
+
+        void EatNParams(unsigned eat_count)
+        {
+            SetStackTop(StackTop - eat_count);
+        }
+
+        void ProducedNParams(unsigned produce_count)
+        {
+            SetStackTop(StackTop + produce_count);
+        }
+
+        void AddOperation(unsigned opcode, unsigned eat_count, unsigned produce_count = 1)
+        {
+            EatNParams(eat_count);
+
+            using namespace FUNCTIONPARSERTYPES;
+
+            if(!ByteCode.empty() && opcode == cMul && ByteCode.back() == cDup)
+                ByteCode.back() = cSqr;
+            else
+                ByteCode.push_back(opcode);
+
+            ProducedNParams(produce_count);
+        }
+
+        void DoPopNMov(size_t targetpos, size_t srcpos)
+        {
+            using namespace FUNCTIONPARSERTYPES;
+            ByteCode.push_back(cPopNMov);
+            ByteCode.push_back( (unsigned) targetpos);
+            ByteCode.push_back( (unsigned) srcpos);
+
+            SetStackTop(srcpos+1);
+            StackState[targetpos] = StackState[srcpos];
+            SetStackTop(targetpos+1);
+        }
+
+        void DoDup(size_t src_pos)
+        {
+            using namespace FUNCTIONPARSERTYPES;
+            if(src_pos == StackTop-1)
+            {
+                ByteCode.push_back(cDup);
+            }
+            else
+            {
+                ByteCode.push_back(cFetch);
+                ByteCode.push_back( (unsigned) src_pos);
+            }
+            SetStackTop(StackTop + 1);
+            StackState[StackTop-1] = StackState[src_pos];
+        }
+
+        size_t FindPos(const FPoptimizer_CodeTree::CodeTree& tree) const
+        {
+            /*std::cout << "Stack state now(" << StackTop << "):\n";
+            for(size_t a=0; a<StackTop; ++a)
+            {
+                std::cout << a << ": ";
+                if(StackState[a].first)
+                    DumpTree(StackState[a].second);
+                else
+                    std::cout << "?";
+                std::cout << "\n";
+            }*/
+            for(size_t a=StackTop; a-->0; )
+                if(StackState[a].first && StackState[a].second.IsIdenticalTo(tree))
+                    return a;
+            return ~size_t(0);
+        }
+
+        bool Find(const FPoptimizer_CodeTree::CodeTree& tree) const
+        {
+            return FindPos(tree) != ~size_t(0);
+        }
+
+        bool FindAndDup(const FPoptimizer_CodeTree::CodeTree& tree)
+        {
+            size_t pos = FindPos(tree);
+            if(pos != ~size_t(0))
+            {
+                DoDup(pos);
+                return true;
+            }
+            return false;
+        }
+
+        struct IfData
+        {
+            size_t ofs;
+        };
+
+        void SynthIfStep1(IfData& ifdata, FUNCTIONPARSERTYPES::OPCODE op)
+        {
+            using namespace FUNCTIONPARSERTYPES;
+            SetStackTop(StackTop-1); // the If condition was popped.
+
+            ifdata.ofs = ByteCode.size();
+            ByteCode.push_back(op);
+            ByteCode.push_back(0); // code index
+            ByteCode.push_back(0); // Immed index
+        }
+        void SynthIfStep2(IfData& ifdata)
+        {
+            using namespace FUNCTIONPARSERTYPES;
+            SetStackTop(StackTop-1); // ignore the pushed then-branch result.
+
+            ByteCode[ifdata.ofs+1] = unsigned( ByteCode.size()+2 );
+            ByteCode[ifdata.ofs+2] = unsigned( Immed.size()      );
+
+            ifdata.ofs = ByteCode.size();
+            ByteCode.push_back(cJump);
+            ByteCode.push_back(0); // code index
+            ByteCode.push_back(0); // Immed index
+        }
+        void SynthIfStep3(IfData& ifdata)
+        {
+            using namespace FUNCTIONPARSERTYPES;
+            SetStackTop(StackTop-1); // ignore the pushed else-branch result.
+
+            ByteCode[ifdata.ofs+1] = unsigned( ByteCode.size()-1 );
+            ByteCode[ifdata.ofs+2] = unsigned( Immed.size()      );
+
+            SetStackTop(StackTop+1); // one or the other was pushed.
+
+            /* Threading jumps:
+             * If there are any cJumps that point
+             * to the cJump instruction we just changed,
+             * change them to point to this target as well.
+             * This screws up PrintByteCode() majorly.
+             */
+            for(size_t a=0; a<ifdata.ofs; ++a)
+            {
+                if(ByteCode[a]   == cJump
+                && ByteCode[a+1] == ifdata.ofs-1)
+                {
+                    ByteCode[a+1] = unsigned( ByteCode.size()-1 );
+                    ByteCode[a+2] = unsigned( Immed.size()      );
+                }
+                switch(ByteCode[a])
+                {
+                    case cAbsIf:
+                    case cIf:
+                    case cJump:
+                    case cPopNMov: a += 2; break;
+                    case cFCall:
+                    case cPCall:
+                    case cFetch: a += 1; break;
+                    default: break;
+                }
+            }
+        }
+
+    protected:
+        void SetStackTop(size_t value)
+        {
+            StackTop = value;
+            if(StackTop > StackMax)
+            {
+                StackMax = StackTop;
+                StackState.resize(StackMax);
+            }
+        }
+
+    private:
+        std::vector<unsigned> ByteCode;
+        std::vector<double>   Immed;
+
+        std::vector<
+            std::pair<bool/*known*/, FPoptimizer_CodeTree::CodeTree/*tree*/>
+                   > StackState;
+        size_t StackTop;
+        size_t StackMax;
+    };
+
+    struct SequenceOpCode;
+    extern const SequenceOpCode AddSequence; /* Multiplication implemented with adds */
+    extern const SequenceOpCode MulSequence; /* Exponentiation implemented with muls */
+
+    /* Generate a sequence that multiplies or exponentifies the
+     * last operand in the stack by the given constant integer
+     * amount (positive or negative).
+     */
+    void AssembleSequence(
+        long count,
+        const SequenceOpCode& sequencing,
+        ByteCodeSynth& synth);
+}
+
+#endif
+
+#line 1 "fpoptimizer/fpoptimizer_bytecodesynth.c"
+// line removed for fpoptimizer.c: #include "fpoptimizer_bytecodesynth.h"
+
+#ifdef FP_SUPPORT_OPTIMIZER
+
+using namespace FUNCTIONPARSERTYPES;
+
+namespace FPoptimizer_ByteCode
+{
+    const struct SequenceOpCode
+    {
+        double basevalue;
+        unsigned op_flip;
+        unsigned op_normal, op_normal_flip;
+        unsigned op_inverse, op_inverse_flip;
+    } AddSequence = {0.0, cNeg, cAdd, cAdd, cSub, cRSub },
+      MulSequence = {1.0, cInv, cMul, cMul, cDiv, cRDiv };
+}
+
+using namespace FPoptimizer_ByteCode;
+
+#define POWI_TABLE_SIZE 256
+#define POWI_WINDOW_SIZE 3
+namespace FPoptimizer_ByteCode
+{
+    #ifndef FP_GENERATING_POWI_TABLE
+    extern const
+    unsigned char powi_table[POWI_TABLE_SIZE];
+    const
+    #endif
+    unsigned char powi_table[POWI_TABLE_SIZE] =
+    {
+          0,   1,   1,   1,   2,   1,   2,   1, /*   0 -   7 */
+          4,   1,   2,   1,   4,   1,   2, 131, /*   8 -  15 */
+          8,   1,   2,   1,   4,   1,   2,   1, /*  16 -  23 */
+          8, 133,   2, 131,   4,   1,  15,   1, /*  24 -  31 */
+         16,   1,   2,   1,   4,   1,   2, 131, /*  32 -  39 */
+          8,   1,   2,   1,   4, 133,   2,   1, /*  40 -  47 */
+         16,   1,  25, 131,   4,   1,  27,   5, /*  48 -  55 */
+          8,   3,   2,   1,  30,   1,  31,   3, /*  56 -  63 */
+         32,   1,   2,   1,   4,   1,   2,   1, /*  64 -  71 */
+          8,   1,   2, 131,   4,   1,  39,   1, /*  72 -  79 */
+         16, 137,   2,   1,   4, 133,   2, 131, /*  80 -  87 */
+          8,   1,  45, 135,   4,  31,   2,   5, /*  88 -  95 */
+         32,   1,   2, 131,  50,   1,  51,   1, /*  96 - 103 */
+          8,   3,   2,   1,  54,   1,  55,   3, /* 104 - 111 */
+         16,   1,  57, 133,   4, 137,   2, 135, /* 112 - 119 */
+         60,   1,  61,   3,  62, 133,  63,   1, /* 120 - 127 */
+        130,   1,   2,   1, 130,   1,   2, 131, /* 128 - 135 */
+        130,   1,   2,   1, 130,   1,   2, 139, /* 136 - 143 */
+        130,   1,   2, 131, 130,   1,  30,   1, /* 144 - 151 */
+        130, 137,   2,  31, 130,   1,   2, 131, /* 152 - 159 */
+        130,   1, 130,   1, 130, 133,   2,   1, /* 160 - 167 */
+        130,   1, 130,   1,   2,   1, 130, 133, /* 168 - 175 */
+        130,   1,   2,   1, 130,   1,   2,  61, /* 176 - 183 */
+        130, 133,  62, 139, 130, 137, 130,   1, /* 184 - 191 */
+        130,   1,   2, 131, 130,   1, 130,   1, /* 192 - 199 */
+        130,   1,   2,   1, 130,   1,   2, 131, /* 200 - 207 */
+        130,   1, 130,   1, 130, 131,   2, 133, /* 208 - 215 */
+        130,   1,   2, 131, 130, 141, 130,   1, /* 216 - 223 */
+        130, 133,   2,   1, 130,   1,   5, 135, /* 224 - 231 */
+        130,   1, 130,   1,   2, 131, 130,   1, /* 232 - 239 */
+        130,   1,   2, 131, 130, 133, 130, 141, /* 240 - 247 */
+        130, 131, 130,   1, 130,   1,   2, 131  /* 248 - 255 */
+    }; /* as in gcc, but custom-optimized for stack calculation */
+}
+static const int POWI_CACHE_SIZE = 256;
+
+#define FPO(x) /**/
+//#define FPO(x) x
+
+
+namespace
+{
+    class PowiCache
+    {
+    private:
+        int cache[POWI_CACHE_SIZE];
+        int cache_needed[POWI_CACHE_SIZE];
+
+    public:
+        PowiCache()
+            : cache(), cache_needed() /* Assume we have no factors in the cache */
+        {
+            /* Decide which factors we would need multiple times.
+             * Output:
+             *   cache[]        = these factors were generated
+             *   cache_needed[] = number of times these factors were desired
+             */
+            cache[1] = 1; // We have this value already.
+        }
+
+        bool Plan_Add(long value, int count)
+        {
+            if(value >= POWI_CACHE_SIZE) return false;
+            //FPO(fprintf(stderr, "%ld will be needed %d times more\n", count, need_count));
+            cache_needed[value] += count;
+            return cache[value] != 0;
+        }
+
+        void Plan_Has(long value)
+        {
+            if(value < POWI_CACHE_SIZE)
+                cache[value] = 1; // This value has been generated
+        }
+
+        void Start(size_t value1_pos)
+        {
+            for(int n=2; n<POWI_CACHE_SIZE; ++n)
+                cache[n] = -1; /* Stack location for each component */
+
+            Remember(1, value1_pos);
+
+            DumpContents();
+        }
+
+        int Find(long value) const
+        {
+            if(value < POWI_CACHE_SIZE)
+            {
+                if(cache[value] >= 0)
+                {
+                    // found from the cache
+                    FPO(fprintf(stderr, "* I found %ld from cache (%u,%d)\n",
+                        value, (unsigned)cache[value], cache_needed[value]));
+                    return cache[value];
+                }
+            }
+            return -1;
+        }
+
+        void Remember(long value, size_t stackpos)
+        {
+            if(value >= POWI_CACHE_SIZE) return;
+
+            FPO(fprintf(stderr, "* Remembering that %ld can be found at %u (%d uses remain)\n",
+                value, (unsigned)stackpos, cache_needed[value]));
+            cache[value] = (int) stackpos;
+        }
+
+        void DumpContents() const
+        {
+            FPO(for(int a=1; a<POWI_CACHE_SIZE; ++a)
+                if(cache[a] >= 0 || cache_needed[a] > 0)
+                {
+                    fprintf(stderr, "== cache: sp=%d, val=%d, needs=%d\n",
+                        cache[a], a, cache_needed[a]);
+                })
+        }
+
+        int UseGetNeeded(long value)
+        {
+            if(value >= 0 && value < POWI_CACHE_SIZE)
+                return --cache_needed[value];
+            return 0;
+        }
+    };
+
+
+    size_t AssembleSequence_Subdivide(
+        long count,
+        PowiCache& cache,
+        const SequenceOpCode& sequencing,
+        ByteCodeSynth& synth);
+
+    void Subdivide_Combine(
+        size_t apos, long aval,
+        size_t bpos, long bval,
+        PowiCache& cache,
+
+        unsigned cumulation_opcode,
+        unsigned cimulation_opcode_flip,
+
+        ByteCodeSynth& synth);
+
+    void PlanNtimesCache
+        (long value,
+         PowiCache& cache,
+         int need_count,
+         int recursioncount=0)
+    {
+        if(value < 1) return;
+
+    #ifdef FP_GENERATING_POWI_TABLE
+        if(recursioncount > 32) throw false;
+    #endif
+
+        if(cache.Plan_Add(value, need_count)) return;
+
+        long half = 1;
+        if(value < POWI_TABLE_SIZE)
+        {
+            half = powi_table[value];
+            if(half & 128)
+            {
+                half &= 127;
+                if(half & 64)
+                    half = -(half & 63) - 1;
+
+                FPO(fprintf(stderr, "value=%ld, half=%ld, otherhalf=%ld\n", value,half,value/half));
+
+                PlanNtimesCache(half,      cache, 1, recursioncount+1);
+                cache.Plan_Has(half);
+                return;
+            }
+            else if(half & 64)
+            {
+                half = -(half & 63) - 1;
+            }
+        }
+        else if(value & 1)
+            half = value & ((1 << POWI_WINDOW_SIZE) - 1); // that is, value & 7
+        else
+            half = value / 2;
+
+        long otherhalf = value-half;
+        if(half > otherhalf || half<0) std::swap(half,otherhalf);
+
+        FPO(fprintf(stderr, "value=%ld, half=%ld, otherhalf=%ld\n", value,half,otherhalf));
+
+        if(half == otherhalf)
+        {
+            PlanNtimesCache(half,      cache, 2, recursioncount+1);
+        }
+        else
+        {
+            PlanNtimesCache(half,      cache, 1, recursioncount+1);
+            PlanNtimesCache(otherhalf>0?otherhalf:-otherhalf,
+                                       cache, 1, recursioncount+1);
+        }
+        cache.Plan_Has(value);
+    }
+
+    size_t AssembleSequence_Subdivide(
+        long value,
+        PowiCache& cache,
+        const SequenceOpCode& sequencing,
+        ByteCodeSynth& synth)
+    {
+        int cachepos = cache.Find(value);
+        if(cachepos >= 0)
+        {
+            // found from the cache
+            return cachepos;
+        }
+
+        long half = 1;
+        if(value < POWI_TABLE_SIZE)
+        {
+            half = powi_table[value];
+            if(half & 128)
+            {
+                half &= 127;
+                if(half & 64)
+                    half = -(half & 63) - 1;
+
+                FPO(fprintf(stderr, "* I want %ld, my plan is %ld * %ld\n", value, half, value/half));
+                size_t half_pos = AssembleSequence_Subdivide(half, cache, sequencing, synth);
+                if(cache.UseGetNeeded(half) > 0
+                || half_pos != synth.GetStackTop()-1)
+                {
+                    synth.DoDup(half_pos);
+                    cache.Remember(half, synth.GetStackTop()-1);
+                }
+                AssembleSequence(value/half, sequencing, synth);
+                size_t stackpos = synth.GetStackTop()-1;
+                cache.Remember(value, stackpos);
+                cache.DumpContents();
+                return stackpos;
+            }
+            else if(half & 64)
+            {
+                half = -(half & 63) - 1;
+            }
+        }
+        else if(value & 1)
+            half = value & ((1 << POWI_WINDOW_SIZE) - 1); // that is, value & 7
+        else
+            half = value / 2;
+
+        long otherhalf = value-half;
+        if(half > otherhalf || half<0) std::swap(half,otherhalf);
+
+        FPO(fprintf(stderr, "* I want %ld, my plan is %ld + %ld\n", value, half, value-half));
+
+        if(half == otherhalf)
+        {
+            size_t half_pos = AssembleSequence_Subdivide(half, cache, sequencing, synth);
+
+            // self-cumulate the subdivide result
+            Subdivide_Combine(half_pos,half, half_pos,half, cache,
+                sequencing.op_normal, sequencing.op_normal_flip,
+                synth);
+        }
+        else
+        {
+            long part1 = half;
+            long part2 = otherhalf>0?otherhalf:-otherhalf;
+
+            size_t part1_pos = AssembleSequence_Subdivide(part1, cache, sequencing, synth);
+            size_t part2_pos = AssembleSequence_Subdivide(part2, cache, sequencing, synth);
+
+            FPO(fprintf(stderr, "Subdivide(%ld: %ld, %ld)\n", value, half, otherhalf));
+
+            Subdivide_Combine(part1_pos,part1, part2_pos,part2, cache,
+                otherhalf>0 ? sequencing.op_normal      : sequencing.op_inverse,
+                otherhalf>0 ? sequencing.op_normal_flip : sequencing.op_inverse_flip,
+                synth);
+        }
+
+        size_t stackpos = synth.GetStackTop()-1;
+        cache.Remember(value, stackpos);
+        cache.DumpContents();
+        return stackpos;
+    }
+
+    void Subdivide_Combine(
+        size_t apos, long aval,
+        size_t bpos, long bval,
+        PowiCache& cache,
+        unsigned cumulation_opcode,
+        unsigned cumulation_opcode_flip,
+        ByteCodeSynth& synth)
+    {
+        /*FPO(fprintf(stderr, "== making result for (sp=%u, val=%d, needs=%d) and (sp=%u, val=%d, needs=%d), stacktop=%u\n",
+            (unsigned)apos, aval, aval>=0 ? cache_needed[aval] : -1,
+            (unsigned)bpos, bval, bval>=0 ? cache_needed[bval] : -1,
+            (unsigned)synth.GetStackTop()));*/
+
+        // Figure out whether we can trample a and b
+        int a_needed = cache.UseGetNeeded(aval);
+        int b_needed = cache.UseGetNeeded(bval);
+
+        bool flipped = false;
+
+        #define DUP_BOTH() do { \
+            if(apos < bpos) { size_t tmp=apos; apos=bpos; bpos=tmp; flipped=!flipped; } \
+            FPO(fprintf(stderr, "-> dup(%u) dup(%u) op\n", (unsigned)apos, (unsigned)bpos)); \
+            synth.DoDup(apos); \
+            synth.DoDup(apos==bpos ? synth.GetStackTop()-1 : bpos); } while(0)
+        #define DUP_ONE(p) do { \
+            FPO(fprintf(stderr, "-> dup(%u) op\n", (unsigned)p)); \
+            synth.DoDup(p); \
+        } while(0)
+
+        if(a_needed > 0)
+        {
+            if(b_needed > 0)
+            {
+                // If they must both be preserved, make duplicates
+                // First push the one that is at the larger stack
+                // address. This increases the odds of possibly using cDup.
+                DUP_BOTH();
+
+                //SCENARIO 1:
+                // Input:  x B A x x
+                // Temp:   x B A x x A B
+                // Output: x B A x x R
+                //SCENARIO 2:
+                // Input:  x A B x x
+                // Temp:   x A B x x B A
+                // Output: x A B x x R
+            }
+            else
+            {
+                // A must be preserved, but B can be trampled over
+
+                // SCENARIO 1:
+                //  Input:  x B x x A
+                //   Temp:  x B x x A A B   (dup both, later first)
+                //  Output: x B x x A R
+                // SCENARIO 2:
+                //  Input:  x A x x B
+                //   Temp:  x A x x B A
+                //  Output: x A x x R       -- only commutative cases
+                // SCENARIO 3:
+                //  Input:  x x x B A
+                //   Temp:  x x x B A A B   (dup both, later first)
+                //  Output: x x x B A R
+                // SCENARIO 4:
+                //  Input:  x x x A B
+                //   Temp:  x x x A B A     -- only commutative cases
+                //  Output: x x x A R
+                // SCENARIO 5:
+                //  Input:  x A B x x
+                //   Temp:  x A B x x A B   (dup both, later first)
+                //  Output: x A B x x R
+
+                // if B is not at the top, dup both.
+                if(bpos != synth.GetStackTop()-1)
+                    DUP_BOTH();    // dup both
+                else
+                {
+                    DUP_ONE(apos); // just dup A
+                    flipped=!flipped;
+                }
+            }
+        }
+        else if(b_needed > 0)
+        {
+            // B must be preserved, but A can be trampled over
+            // This is a mirror image of the a_needed>0 case, so I'll cut the chase
+            if(apos != synth.GetStackTop()-1)
+                DUP_BOTH();
+            else
+                DUP_ONE(bpos);
+        }
+        else
+        {
+            // Both can be trampled over.
+            // SCENARIO 1:
+            //  Input:  x B x x A
+            //   Temp:  x B x x A B
+            //  Output: x B x x R
+            // SCENARIO 2:
+            //  Input:  x A x x B
+            //   Temp:  x A x x B A
+            //  Output: x A x x R       -- only commutative cases
+            // SCENARIO 3:
+            //  Input:  x x x B A
+            //  Output: x x x R         -- only commutative cases
+            // SCENARIO 4:
+            //  Input:  x x x A B
+            //  Output: x x x R
+            // SCENARIO 5:
+            //  Input:  x A B x x
+            //   Temp:  x A B x x A B   (dup both, later first)
+            //  Output: x A B x x R
+            // SCENARIO 6:
+            //  Input:  x x x C
+            //   Temp:  x x x C C   (c is both A and B)
+            //  Output: x x x R
+
+            if(apos == bpos && apos == synth.GetStackTop()-1)
+                DUP_ONE(apos); // scenario 6
+            else if(apos == synth.GetStackTop()-1 && bpos == synth.GetStackTop()-2)
+            {
+                FPO(fprintf(stderr, "-> op\n")); // scenario 3
+                flipped=!flipped;
+            }
+            else if(apos == synth.GetStackTop()-2 && bpos == synth.GetStackTop()-1)
+                FPO(fprintf(stderr, "-> op\n")); // scenario 4
+            else if(apos == synth.GetStackTop()-1)
+                DUP_ONE(bpos); // scenario 1
+            else if(bpos == synth.GetStackTop()-1)
+            {
+                DUP_ONE(apos); // scenario 2
+                flipped=!flipped;
+            }
+            else
+                DUP_BOTH(); // scenario 5
+        }
+        // Add them together.
+        synth.AddOperation(flipped ? cumulation_opcode_flip : cumulation_opcode, 2);
+    }
+
+    void LightWeight(
+        long count,
+        const SequenceOpCode& sequencing,
+        ByteCodeSynth& synth)
+    {
+        while(count < 256)
+        {
+            int half = FPoptimizer_ByteCode::powi_table[count];
+            if(half & 128)
+            {
+                half &= 127;
+                LightWeight(half,       sequencing, synth);
+                count /= half;
+            }
+            else break;
+        }
+        if(count == 1) return;
+        if(!(count & 1))
+        {
+            synth.AddOperation(cSqr, 1);
+            LightWeight(count/2, sequencing, synth);
+        }
+        else
+        {
+            synth.DoDup(synth.GetStackTop()-1);
+            LightWeight(count-1, sequencing, synth);
+            synth.AddOperation(cMul, 2);
+        }
+    }
+}
+
+namespace FPoptimizer_ByteCode
+{
+    void AssembleSequence(
+        long count,
+        const SequenceOpCode& sequencing,
+        ByteCodeSynth& synth)
+    {
+        if(count == 0)
+            synth.PushImmed(sequencing.basevalue);
+        else
+        {
+            bool needs_flip = false;
+            if(count < 0)
+            {
+                needs_flip = true;
+                count = -count;
+            }
+
+            if(false)
+                LightWeight(count,sequencing,synth);
+            else if(count > 1)
+            {
+                /* To prevent calculating the same factors over and over again,
+                 * we use a cache. */
+                PowiCache cache;
+                PlanNtimesCache(count, cache, 1);
+
+                size_t stacktop_desired = synth.GetStackTop();
+
+                cache.Start( synth.GetStackTop()-1 );
+
+                FPO(fprintf(stderr, "Calculating result for %ld...\n", count));
+                size_t res_stackpos = AssembleSequence_Subdivide(
+                    count, cache, sequencing,
+                    synth);
+
+                size_t n_excess = synth.GetStackTop() - stacktop_desired;
+                if(n_excess > 0 || res_stackpos != stacktop_desired-1)
+                {
+                    // Remove the cache values
+                    synth.DoPopNMov(stacktop_desired-1, res_stackpos);
+                }
+            }
+
+            if(needs_flip)
+                synth.AddOperation(sequencing.op_flip, 1);
+        }
+    }
+}
+
+#endif
+
+#line 1 "fpoptimizer/fpoptimizer_codetree.c"
+#include <list>
+#include <algorithm>
+
+// line removed for fpoptimizer.c: #include "fpoptimizer_codetree.h"
+#include "fptypes.h"
+// line removed for fpoptimizer.c: #include "fpoptimizer_consts.h"
+
+#ifdef FP_SUPPORT_OPTIMIZER
+
+using namespace FUNCTIONPARSERTYPES;
+//using namespace FPoptimizer_Grammar;
+
+namespace FPoptimizer_CodeTree
+{
+    CodeTree::CodeTree()
+        : data(new CodeTreeData)
+    {
+        data->Opcode = cNop;
+    }
+
+    CodeTree::CodeTree(double i)
+        : data(new CodeTreeData(i))
+    {
+        data->Recalculate_Hash_NoRecursion();
+    }
+
+    CodeTree::CodeTree(unsigned v, CodeTree::VarTag)
+        : data(new CodeTreeData)
+    {
+        data->Opcode = VarBegin;
+        data->Var    = v;
+        data->Recalculate_Hash_NoRecursion();
+    }
+
+    CodeTree::CodeTree(const CodeTree& b, CodeTree::CloneTag)
+        : data(new CodeTreeData(*b.data))
+    {
+    }
+
+    CodeTree::~CodeTree()
+    {
+    }
+
+    struct ParamComparer
+    {
+        bool operator() (const CodeTree& a, const CodeTree& b) const
+        {
+            if(a.GetDepth() != b.GetDepth())
+                return a.GetDepth() > b.GetDepth();
+            return a.GetHash() < b.GetHash();
+        }
+    };
+
+    void CodeTreeData::Sort()
+    {
+        /* If the tree is commutative, order the parameters
+         * in a set order in order to make equality tests
+         * efficient in the optimizer
+         */
+        switch(Opcode)
+        {
+            case cAdd:
+            case cMul:
+            case cMin:
+            case cMax:
+            case cAnd:
+            case cOr:
+            case cEqual:
+            case cNEqual:
+                std::sort(Params.begin(), Params.end(), ParamComparer());
+                break;
+            case cLess:
+                if(ParamComparer() (Params[1], Params[0]))
+                    { std::swap(Params[0], Params[1]); Opcode = cGreater; }
+                break;
+            case cLessOrEq:
+                if(ParamComparer() (Params[1], Params[0]))
+                    { std::swap(Params[0], Params[1]); Opcode = cGreaterOrEq; }
+                break;
+            case cGreater:
+                if(ParamComparer() (Params[1], Params[0]))
+                    { std::swap(Params[0], Params[1]); Opcode = cLess; }
+                break;
+            case cGreaterOrEq:
+                if(ParamComparer() (Params[1], Params[0]))
+                    { std::swap(Params[0], Params[1]); Opcode = cLessOrEq; }
+                break;
+            default:
+                break;
+        }
+    }
+
+    void CodeTree::AddParam(const CodeTree& param)
+    {
+        //std::cout << "AddParam called\n";
+        data->Params.push_back(param);
+    }
+    void CodeTree::AddParamMove(CodeTree& param)
+    {
+        data->Params.push_back(CodeTree());
+        data->Params.back().swap(param);
+    }
+    void CodeTree::SetParam(size_t which, const CodeTree& b)
+    {
+        DataP slot_holder ( data->Params[which].data );
+        data->Params[which] = b;
+    }
+    void CodeTree::SetParamMove(size_t which, CodeTree& b)
+    {
+        DataP slot_holder ( data->Params[which].data );
+        data->Params[which].swap(b);
+    }
+
+    void CodeTree::AddParams(const std::vector<CodeTree>& RefParams)
+    {
+        data->Params.insert(data->Params.end(), RefParams.begin(), RefParams.end());
+    }
+    void CodeTree::AddParamsMove(std::vector<CodeTree>& RefParams)
+    {
+        size_t endpos = data->Params.size(), added = RefParams.size();
+        data->Params.resize(endpos + added, CodeTree());
+        for(size_t p=0; p<added; ++p)
+            data->Params[endpos+p].swap( RefParams[p] );
+    }
+    void CodeTree::AddParamsMove(std::vector<CodeTree>& RefParams, size_t replacing_slot)
+    {
+        DataP slot_holder ( data->Params[replacing_slot].data );
+        DelParam(replacing_slot);
+        AddParamsMove(RefParams);
+    /*
+        const size_t n_added = RefParams.size();
+        const size_t oldsize = data->Params.size();
+        const size_t newsize = oldsize + n_added - 1;
+        if(RefParams.empty())
+            DelParam(replacing_slot);
+        else
+        {
+            //    0 1 2 3 4 5 6 7 8 9 10 11
+            //    a a a a X b b b b b
+            //    a a a a Y Y Y b b b b  b
+            //
+            //   replacing_slot = 4
+            //   n_added = 3
+            //   oldsize = 10
+            //   newsize = 12
+            //   tail_length = 5
+
+            data->Params.resize(newsize);
+            data->Params[replacing_slot].data = 0;
+            const size_t tail_length = oldsize - replacing_slot -1;
+            for(size_t tail=0; tail<tail_length; ++tail)
+                data->Params[newsize-1-tail].data.UnsafeSetP(
+                &*data->Params[newsize-1-tail-(n_added-1)].data);
+            for(size_t head=1; head<n_added; ++head)
+                data->Params[replacing_slot+head].data.UnsafeSetP( 0 );
+            for(size_t p=0; p<n_added; ++p)
+                data->Params[replacing_slot+p].swap( RefParams[p] );
+        }
+    */
+    }
+
+    void CodeTree::SetParams(const std::vector<CodeTree>& RefParams)
+    {
+        //std::cout << "SetParams called" << (do_clone ? ", clone" : ", no clone") << "\n";
+        std::vector<CodeTree> tmp(RefParams);
+        data->Params.swap(tmp);
+    }
+
+    void CodeTree::SetParamsMove(std::vector<CodeTree>& RefParams)
+    {
+        data->Params.swap(RefParams);
+        RefParams.clear();
+    }
+
+#ifdef __GXX_EXPERIMENTAL_CXX0X__
+    void CodeTree::SetParams(std::vector<CodeTree>&& RefParams)
+    {
+        //std::cout << "SetParams&& called\n";
+        SetParamsMove(RefParams);
+    }
+#endif
+
+    void CodeTree::DelParam(size_t index)
+    {
+        std::vector<CodeTree>& Params = data->Params;
+        //std::cout << "DelParam(" << index << ") called\n";
+    #ifdef __GXX_EXPERIMENTAL_CXX0X__
+        /* rvalue reference semantics makes this optimal */
+        Params.erase( Params.begin() + index );
+    #else
+        /* This labor evades the need for refcount +1/-1 shuffling */
+        Params[index].data = 0;
+        for(size_t p=index; p+1<Params.size(); ++p)
+            Params[p].data.UnsafeSetP( &*Params[p+1].data );
+        Params[Params.size()-1].data.UnsafeSetP( 0 );
+        Params.resize(Params.size()-1);
+    #endif
+    }
+
+    void CodeTree::DelParams()
+    {
+        data->Params.clear();
+    }
+
+    /* Is the value of this tree definitely odd(true) or even(false)? */
+    CodeTree::TriTruthValue CodeTree::GetEvennessInfo() const
+    {
+        if(!IsImmed()) return Unknown;
+        if(!IsLongIntegerImmed()) return Unknown;
+        return (GetLongIntegerImmed() & 1) ? IsNever : IsAlways;
+    }
+
+    bool CodeTree::IsLogicalValue() const
+    {
+        switch(data->Opcode)
+        {
+            case cImmed:
+                return FloatEqual(data->Value, 0.0)
+                    || FloatEqual(data->Value, 1.0);
+            case cAnd:
+            case cOr:
+            case cNot:
+            case cNotNot:
+            case cAbsAnd:
+            case cAbsOr:
+            case cAbsNot:
+            case cAbsNotNot:
+            case cEqual:
+            case cNEqual:
+            case cLess:
+            case cLessOrEq:
+            case cGreater:
+            case cGreaterOrEq:
+                /* These operations always produce truth values (0 or 1) */
+                return true;
+            case cMul:
+            {
+                std::vector<CodeTree>& Params = data->Params;
+                for(size_t a=0; a<Params.size(); ++a)
+                    if(!Params[a].IsLogicalValue())
+                        return false;
+                return true;
+            }
+            case cIf:
+            case cAbsIf:
+            {
+                std::vector<CodeTree>& Params = data->Params;
+                return Params[1].IsLogicalValue()
+                    && Params[2].IsLogicalValue();
+            }
+            default:
+                break;
+        }
+        return false; // Not a logical value.
+    }
+
+    bool CodeTree::IsAlwaysInteger(bool integer) const
+    {
+        switch(data->Opcode)
+        {
+            case cImmed:
+                return IsLongIntegerImmed() ? integer==true : integer==false;
+            case cFloor:
+            case cInt:
+                return integer==true;
+            case cAnd:
+            case cOr:
+            case cNot:
+            case cNotNot:
+            case cEqual:
+            case cNEqual:
+            case cLess:
+            case cLessOrEq:
+            case cGreater:
+            case cGreaterOrEq:
+                /* These operations always produce truth values (0 or 1) */
+                return integer==true; /* 0 and 1 are both integers */
+            case cIf:
+            {
+                std::vector<CodeTree>& Params = data->Params;
+                return Params[1].IsAlwaysInteger(integer)
+                    && Params[2].IsAlwaysInteger(integer);
+                return true; /* 0 and 1 are both integers */
+            }
+            case cAdd:
+            case cMul:
+            {
+                for(size_t a=GetParamCount(); a-- > 0; )
+                    if(!GetParam(a).IsAlwaysInteger(integer))
+                        return false;
+                return true;
+            }
+            default:
+                break;
+        }
+        return false; /* Don't know whether it's integer. */
+    }
+
+    bool CodeTree::IsAlwaysSigned(bool positive) const
+    {
+        MinMaxTree tmp = CalculateResultBoundaries();
+
+        if(positive)
+            return tmp.has_min && tmp.min >= 0.0
+              && (!tmp.has_max || tmp.max >= 0.0);
+        else
+            return tmp.has_max && tmp.max < 0.0
+              && (!tmp.has_min || tmp.min < 0.0);
+    }
+
+    bool CodeTree::IsIdenticalTo(const CodeTree& b) const
+    {
+        //if((!&*data) != (!&*b.data)) return false;
+        if(&*data == &*b.data) return true;
+        return data->IsIdenticalTo(*b.data);
+    }
+
+    bool CodeTreeData::IsIdenticalTo(const CodeTreeData& b) const
+    {
+        if(Hash   != b.Hash) return false; // a quick catch-all
+        if(Opcode != b.Opcode) return false;
+        switch(Opcode)
+        {
+            case cImmed:   return FloatEqual(Value, b.Value);
+            case VarBegin: return Var == b.Var;
+            case cFCall:
+            case cPCall:   if(Funcno != b.Funcno) return false; break;
+            default: break;
+        }
+        if(Params.size() != b.Params.size()) return false;
+        for(size_t a=0; a<Params.size(); ++a)
+        {
+            if(!Params[a].IsIdenticalTo(b.Params[a])) return false;
+        }
+        return true;
+    }
+
+    void CodeTree::Become(const CodeTree& b)
+    {
+        if(&b != this && &*data != &*b.data)
+        {
+            DataP tmp = b.data;
+            CopyOnWrite();
+            data.swap(tmp);
+        }
+    }
+
+    void CodeTree::CopyOnWrite()
+    {
+        if(data->RefCount > 1)
+            data = new CodeTreeData(*data);
+    }
+
+    CodeTree CodeTree::GetUniqueRef()
+    {
+        if(data->RefCount > 1)
+            return CodeTree(*this, CloneTag());
+        return *this;
+    }
+
+    CodeTreeData::CodeTreeData()
+        : RefCount(0),
+          Opcode(cNop), Params(), Hash(), Depth(1), OptimizedUsing(0)
+    {
+    }
+
+    CodeTreeData::CodeTreeData(const CodeTreeData& b)
+        : RefCount(0),
+          Opcode(b.Opcode),
+          Params(b.Params),
+          Hash(b.Hash),
+          Depth(b.Depth),
+          OptimizedUsing(b.OptimizedUsing)
+    {
+        switch(Opcode)
+        {
+            case VarBegin: Var   = b.Var; break;
+            case cImmed:   Value = b.Value; break;
+            case cPCall:
+            case cFCall:   Funcno = b.Funcno; break;
+            default: break;
+        }
+    }
+
+#ifdef __GXX_EXPERIMENTAL_CXX0X__
+    CodeTreeData::CodeTreeData(CodeTreeData&& b)
+        : RefCount(0),
+          Opcode(b.Opcode),
+          Params(b.Params),
+          Hash(b.Hash),
+          Depth(b.Depth),
+          OptimizedUsing(b.OptimizedUsing)
+    {
+        switch(Opcode)
+        {
+            case VarBegin: Var   = b.Var; break;
+            case cImmed:   Value = b.Value; break;
+            case cPCall:
+            case cFCall:   Funcno = b.Funcno; break;
+            default: break;
+        }
+    }
+#endif
+
+    CodeTreeData::CodeTreeData(double i)
+        : RefCount(0), Opcode(cImmed), Params(), Hash(), Depth(1), OptimizedUsing(0)
+    {
+        Value = i;
+    }
+}
+
+#endif
+
+#line 1 "fpoptimizer/fpoptimizer_debug.c"
+// line removed for fpoptimizer.c: #include "fpoptimizer_codetree.h"
+// line removed for fpoptimizer.c: #include "fpoptimizer_opcodename.h"
+
+#ifdef FP_SUPPORT_OPTIMIZER
+
+#include <sstream>
+#include <string>
+#include <map>
+#include <set>
+#include <iostream>
+
+using namespace FUNCTIONPARSERTYPES;
+
+#ifdef FUNCTIONPARSER_SUPPORT_DEBUG_OUTPUT
+namespace
+{
+    void DumpHashesFrom(
+        const FPoptimizer_CodeTree::CodeTree& tree,
+        std::map<fphash_t, std::set<std::string> >& done,
+        std::ostream& o)
+    {
+        for(size_t a=0; a<tree.GetParamCount(); ++a)
+            DumpHashesFrom(tree.GetParam(a), done, o);
+
+        std::ostringstream buf;
+        DumpTree(tree, buf);
+        done[tree.GetHash()].insert(buf.str());
+    }
+}
+#endif
+
+namespace FPoptimizer_CodeTree
+{
+#ifdef FUNCTIONPARSER_SUPPORT_DEBUG_OUTPUT
+    void DumpHashes(const CodeTree& tree, std::ostream& o)
+    {
+        std::map<fphash_t, std::set<std::string> > done;
+        DumpHashesFrom(tree, done, o);
+
+        for(std::map<fphash_t, std::set<std::string> >::const_iterator
+            i = done.begin();
+            i != done.end();
+            ++i)
+        {
+            const std::set<std::string>& flist = i->second;
+            if(flist.size() != 1) o << "ERROR - HASH COLLISION?\n";
+            for(std::set<std::string>::const_iterator
+                j = flist.begin();
+                j != flist.end();
+                ++j)
+            {
+                o << '[' << std::hex << i->first.hash1
+                              << ',' << i->first.hash2
+                              << ']' << std::dec;
+                o << ": " << *j << "\n";
+            }
+        }
+    }
+
+    void DumpTree(const CodeTree& tree, std::ostream& o)
+    {
+        //o << "/*" << tree.Depth << "*/";
+        const char* sep2 = " ";
+        /*
+        o << '[' << std::hex << tree.Hash.hash1
+                      << ',' << tree.Hash.hash2
+                      << ']' << std::dec;
+        */
+        switch(tree.GetOpcode())
+        {
+            case cImmed:
+                o << tree.GetImmed();
+                /*
+                o << "(" << std::hex
+                  << *(const uint_least64_t*)&tree.GetImmed()
+                  << std::dec << ")";
+                */
+                return;
+            case VarBegin: o << "Var" << (tree.GetVar() - VarBegin); return;
+            case cAdd: sep2 = " +"; break;
+            case cMul: sep2 = " *"; break;
+            case cAnd: sep2 = " &"; break;
+            case cOr: sep2 = " |"; break;
+            case cPow: sep2 = " ^"; break;
+            default:
+                sep2 = " ";
+                o << FP_GetOpcodeName(tree.GetOpcode());
+                if(tree.GetOpcode() == cFCall || tree.GetOpcode() == cPCall)
+                    o << ':' << tree.GetFuncNo();
+        }
+        o << '(';
+        if(tree.GetParamCount() <= 1 && sep2[1]) o << (sep2+1) << ' ';
+        for(size_t a=0; a<tree.GetParamCount(); ++a)
+        {
+            if(a > 0) o << ' ';
+
+            DumpTree(tree.GetParam(a), o);
+
+            if(a+1 < tree.GetParamCount()) o << sep2;
+        }
+        o << ')';
+    }
+
+    void DumpTreeWithIndent(const CodeTree& tree, std::ostream& o, const std::string& indent)
+    {
+        o << '[' << std::hex << (void*)(&tree.GetParams())
+                 << std::dec
+                 << ',' << tree.GetRefCount()
+                 << ']';
+        o << indent << '_';
+
+        switch(tree.GetOpcode())
+        {
+            case cImmed:   o << "cImmed " << tree.GetImmed(); o << '\n'; return;
+            case VarBegin: o << "VarBegin " << (tree.GetVar() - VarBegin); o << '\n'; return;
+            default:
+                o << FP_GetOpcodeName(tree.GetOpcode());
+                if(tree.GetOpcode() == cFCall || tree.GetOpcode() == cPCall)
+                    o << ':' << tree.GetFuncNo();
+                o << '\n';
+        }
+        for(size_t a=0; a<tree.GetParamCount(); ++a)
+        {
+            std::string ind = indent;
+            for(size_t p=0; p < ind.size(); p+=2)
+                if(ind[p] == '\\')
+                    ind[p] = ' ';
+            ind += (a+1 < tree.GetParamCount()) ? " |" : " \\";
+            DumpTreeWithIndent(tree.GetParam(a), o, ind);
+        }
+        o << std::flush;
+    }
+#endif
+}
+
+#endif
+
+#line 1 "fpoptimizer/fpoptimizer_grammar.c"
+#include "fparser.h"
+#include "fptypes.h"
+// line removed for fpoptimizer.c: #include "fpoptimizer_grammar.h"
+// line removed for fpoptimizer.c: #include "fpoptimizer_optimize.h"
+
+// line removed for fpoptimizer.c: #include "fpoptimizer_opcodename.h"
+using namespace FPoptimizer_Grammar;
+using namespace FUNCTIONPARSERTYPES;
+
+#include <cctype>
+
+namespace FPoptimizer_Grammar
+{
+    bool ParamSpec_Compare(const void* aa, const void* bb, SpecialOpcode type)
+    {
+        switch(type)
+        {
+            case ParamHolder:
+            {
+                ParamSpec_ParamHolder& a = *(ParamSpec_ParamHolder*) aa;
+                ParamSpec_ParamHolder& b = *(ParamSpec_ParamHolder*) bb;
+                return a.constraints == b.constraints
+                    && a.index       == b.index
+                    && a.depcode     == b.depcode;
+            }
+            case NumConstant:
+            {
+                ParamSpec_NumConstant& a = *(ParamSpec_NumConstant*) aa;
+                ParamSpec_NumConstant& b = *(ParamSpec_NumConstant*) bb;
+                return FloatEqual(a.constvalue, b.constvalue);
+            }
+            case SubFunction:
+            {
+                ParamSpec_SubFunction& a = *(ParamSpec_SubFunction*) aa;
+                ParamSpec_SubFunction& b = *(ParamSpec_SubFunction*) bb;
+                return a.constraints    == b.constraints
+                    && a.data.subfunc_opcode   == b.data.subfunc_opcode
+                    && a.data.match_type       == b.data.match_type
+                    && a.data.param_count      == b.data.param_count
+                    && a.data.param_list       == b.data.param_list
+                    && a.data.restholder_index == b.data.restholder_index
+                    && a.depcode               == b.depcode;
+            }
+        }
+        return true;
+    }
+
+    unsigned ParamSpec_GetDepCode(const ParamSpec& b)
+    {
+        switch(b.first)
+        {
+            case ParamHolder:
+            {
+                const ParamSpec_ParamHolder* s = (const ParamSpec_ParamHolder*) b.second;
+                return s->depcode;
+            }
+            case SubFunction:
+            {
+                const ParamSpec_SubFunction* s = (const ParamSpec_SubFunction*) b.second;
+                return s->depcode;
+            }
+            default: break;
+        }
+        return 0;
+    }
+
+    void DumpParam(const ParamSpec& parampair, std::ostream& o)
+    {
+        static const char ParamHolderNames[][2]  = {"%","&", "x","y","z","a","b","c"};
+
+        //o << "/*p" << (&p-pack.plist) << "*/";
+        unsigned constraints = 0;
+        switch(parampair.first)
+        {
+            case NumConstant:
+              { const ParamSpec_NumConstant& param = *(const ParamSpec_NumConstant*) parampair.second;
+                o.precision(12);
+                o << param.constvalue; break; }
+            case ParamHolder:
+              { const ParamSpec_ParamHolder& param = *(const ParamSpec_ParamHolder*) parampair.second;
+                o << ParamHolderNames[param.index];
+                constraints = param.constraints;
+                break; }
+            case SubFunction:
+              { const ParamSpec_SubFunction& param = *(const ParamSpec_SubFunction*) parampair.second;
+                constraints = param.constraints;
+                if(param.data.match_type == GroupFunction)
+                {
+                    if(param.data.subfunc_opcode == cNeg)
+                        { o << "-"; DumpParams(param.data.param_list, param.data.param_count, o); }
+                    else if(param.data.subfunc_opcode == cInv)
+                        { o << "/"; DumpParams(param.data.param_list, param.data.param_count, o); }
+                    else
+                    {
+                        std::string opcode = FP_GetOpcodeName(param.data.subfunc_opcode).substr(1);
+                        for(size_t a=0; a<opcode.size(); ++a) opcode[a] = (char) std::toupper(opcode[a]);
+                        o << opcode << "( ";
+                        DumpParams(param.data.param_list, param.data.param_count, o);
+                        o << " )";
+                    }
+                }
+                else
+                {
+                    o << '(' << FP_GetOpcodeName(param.data.subfunc_opcode) << ' ';
+                    if(param.data.match_type == PositionalParams) o << '[';
+                    if(param.data.match_type == SelectedParams) o << '{';
+                    DumpParams(param.data.param_list, param.data.param_count, o);
+                    if(param.data.restholder_index != 0)
+                        o << " <" << param.data.restholder_index << '>';
+                    if(param.data.match_type == PositionalParams) o << "]";
+                    if(param.data.match_type == SelectedParams) o << "}";
+                    o << ')';
+                }
+                break; }
+        }
+        switch( ImmedConstraint_Value(constraints & ValueMask) )
+        {
+            case ValueMask: break;
+            case Value_AnyNum: break;
+            case Value_EvenInt:   o << "@E"; break;
+            case Value_OddInt:    o << "@O"; break;
+            case Value_IsInteger: o << "@I"; break;
+            case Value_NonInteger:o << "@F"; break;
+            case Value_Logical:   o << "@L"; break;
+        }
+        switch( ImmedConstraint_Sign(constraints & SignMask) )
+        {
+            case SignMask: break;
+            case Sign_AnySign: break;
+            case Sign_Positive:   o << "@P"; break;
+            case Sign_Negative:   o << "@N"; break;
+        }
+        switch( ImmedConstraint_Oneness(constraints & OnenessMask) )
+        {
+            case OnenessMask: break;
+            case Oneness_Any: break;
+            case Oneness_One:     o << "@1"; break;
+            case Oneness_NotOne:  o << "@M"; break;
+        }
+    }
+
+    void DumpParams(unsigned paramlist, unsigned count, std::ostream& o)
+    {
+        for(unsigned a=0; a<count; ++a)
+        {
+            if(a > 0) o << ' ';
+            const ParamSpec& param = ParamSpec_Extract(paramlist,a);
+            DumpParam(param, o);
+            unsigned depcode = ParamSpec_GetDepCode(param);
+            if(depcode != 0)
+                o << "@D" << depcode;
+        }
+    }
+}
+
+#line 1 "fpoptimizer/fpoptimizer_grammar_data.c"
+/* This file is automatically generated. Do not edit... */
+// line removed for fpoptimizer.c: #include "fpoptimizer_consts.h"
+#include "fpconfig.h"
+#include "fptypes.h"
+#include <algorithm>
+
+#define P1(a) a
+#define P2(a,b) (P1(a) | (b << PARAM_INDEX_BITS))
+#define P3(a,b,c) (P2(a,b) | (c << (PARAM_INDEX_BITS*2)))
+
+#define grammar_optimize_abslogical grammar_optimize_abslogical_tweak
+#define grammar_optimize_ignore_if_sideeffects grammar_optimize_ignore_if_sideeffects_tweak
+#define grammar_optimize_nonshortcut_logical_evaluation grammar_optimize_nonshortcut_logical_evaluation_tweak
+#define grammar_optimize_round1 grammar_optimize_round1_tweak
+#define grammar_optimize_round2 grammar_optimize_round2_tweak
+#define grammar_optimize_round3 grammar_optimize_round3_tweak
+#define grammar_optimize_round4 grammar_optimize_round4_tweak
+#define grammar_optimize_shortcut_logical_evaluation grammar_optimize_shortcut_logical_evaluation_tweak
+// line removed for fpoptimizer.c: #include "fpoptimizer_grammar.h"
+#undef grammar_optimize_abslogical
+#undef grammar_optimize_ignore_if_sideeffects
+#undef grammar_optimize_nonshortcut_logical_evaluation
+#undef grammar_optimize_round1
+#undef grammar_optimize_round2
+#undef grammar_optimize_round3
+#undef grammar_optimize_round4
+#undef grammar_optimize_shortcut_logical_evaluation
+
+using namespace FPoptimizer_Grammar;
+using namespace FUNCTIONPARSERTYPES;
+
+namespace
+{
+    const struct ParamSpec_List
+    {
+        ParamSpec_ParamHolder plist_p[33];
+#define P(n) (n)
+        ParamSpec_NumConstant plist_n[17];
+#define N(n) (n+33)
+        ParamSpec_SubFunction plist_s[422];
+#define S(n) (n+33+17)
+    } /*PACKED_GRAMMAR_ATTRIBUTE*/ plist =
+    {
+        { /* plist_p - ParamSpec_ParamHolder[33] */
+        /* 0	*/ {0, Sign_Negative | Constness_Const, 0x0}, /* %@N */
+        /* 1	*/ {0, Constness_Const, 0x0}, /* % */
+        /* 2	*/ {0, Sign_Positive | Constness_Const, 0x0}, /* %@P */
+        /* 3	*/ {0, Constness_Const, 0x1}, /* % */
+        /* 4	*/ {0, Value_IsInteger | Sign_Positive | Constness_Const, 0x0}, /* %@I@P */
+        /* 5	*/ {0, Oneness_NotOne | Constness_Const, 0x1}, /* %@M */
+        /* 6	*/ {0, Oneness_NotOne | Constness_Const, 0x0}, /* %@M */
+        /* 7	*/ {0, Oneness_One | Constness_Const, 0x0}, /* %@1 */
+        /* 8	*/ {0, Value_Logical | Constness_Const, 0x0}, /* %@L */
+        /* 9	*/ {1, Constness_Const, 0x0}, /* & */
+        /* 10	*/ {1, Value_EvenInt | Constness_Const, 0x0}, /* &@E */
+        /* 11	*/ {1, Oneness_NotOne | Constness_Const, 0x0}, /* &@M */
+        /* 12	*/ {1, Value_IsInteger | Constness_Const, 0x0}, /* &@I */
+        /* 13	*/ {1, Sign_Positive | Constness_Const, 0x0}, /* &@P */
+        /* 14	*/ {2, 0, 0x0}, /* x */
+        /* 15	*/ {2, 0, 0x4}, /* x */
+        /* 16	*/ {2, Value_IsInteger, 0x0}, /* x@I */
+        /* 17	*/ {2, Sign_Positive, 0x0}, /* x@P */
+        /* 18	*/ {2, Sign_NoIdea, 0x0}, /* x */
+        /* 19	*/ {2, Value_Logical, 0x0}, /* x@L */
+        /* 20	*/ {3, Sign_NoIdea, 0x0}, /* y */
+        /* 21	*/ {3, 0, 0x0}, /* y */
+        /* 22	*/ {3, Value_Logical, 0x0}, /* y@L */
+        /* 23	*/ {3, 0, 0x8}, /* y */
+        /* 24	*/ {3, Value_OddInt, 0x0}, /* y@O */
+        /* 25	*/ {3, Value_NonInteger, 0x0}, /* y@F */
+        /* 26	*/ {3, Value_EvenInt, 0x0}, /* y@E */
+        /* 27	*/ {3, Sign_Positive, 0x0}, /* y@P */
+        /* 28	*/ {4, 0, 0x0}, /* z */
+        /* 29	*/ {4, 0, 0x16}, /* z */
+        /* 30	*/ {4, Value_IsInteger, 0x0}, /* z@I */
+        /* 31	*/ {5, 0, 0x0}, /* a */
+        /* 32	*/ {6, 0, 0x0}, /* b */
+        },
+
+        { /* plist_n - ParamSpec_NumConstant[17] */
+        /* 0	*/ {-2}, /* -2 */
+        /* 1	*/ {-CONSTANT_PIHALF}, /* -1.57079632679 */
+        /* 2	*/ {-1}, /* -1 */
+        /* 3	*/ {-0.5}, /* -0.5 */
+        /* 4	*/ {0}, /* 0 */
+        /* 5	*/ {CONSTANT_RD}, /* 0.0174532925199 */
+        /* 6	*/ {CONSTANT_EI}, /* 0.367879441171 */
+        /* 7	*/ {CONSTANT_L10I}, /* 0.434294481903 */
+        /* 8	*/ {0.5}, /* 0.5 */
+        /* 9	*/ {CONSTANT_L2}, /* 0.69314718056 */
+        /* 10	*/ {1}, /* 1 */
+        /* 11	*/ {CONSTANT_L2I}, /* 1.44269504089 */
+        /* 12	*/ {CONSTANT_PIHALF}, /* 1.57079632679 */
+        /* 13	*/ {2}, /* 2 */
+        /* 14	*/ {CONSTANT_L10}, /* 2.30258509299 */
+        /* 15	*/ {CONSTANT_E}, /* 2.71828182846 */
+        /* 16	*/ {CONSTANT_DR}, /* 57.2957795131 */
+        },
+
+        { /* plist_s - ParamSpec_SubFunction[422] */
+        /* 0	*/ {{1,P1(P(14))               , cAbs        ,PositionalParams,0}, 0, 0x0}, /* (cAbs [x]) */
+        /* 1	*/ {{1,P1(P(21))               , cAbs        ,PositionalParams,0}, 0, 0x0}, /* (cAbs [y]) */
+        /* 2	*/ {{1,P1(S(283))              , cAbs        ,PositionalParams,0}, 0, 0x0}, /* (cAbs [(cMul {x y})]) */
+        /* 3	*/ {{1,P1(P(14))               , cAcos       ,PositionalParams,0}, 0, 0x0}, /* (cAcos [x]) */
+        /* 4	*/ {{1,P1(P(14))               , cAcosh      ,PositionalParams,0}, 0, 0x0}, /* (cAcosh [x]) */
+        /* 5	*/ {{1,P1(P(14))               , cAsin       ,PositionalParams,0}, 0, 0x0}, /* (cAsin [x]) */
+        /* 6	*/ {{1,P1(P(14))               , cAsinh      ,PositionalParams,0}, 0, 0x0}, /* (cAsinh [x]) */
+        /* 7	*/ {{1,P1(S(242))              , cAsinh      ,PositionalParams,0}, 0, 0x0}, /* (cAsinh [(cAdd  <1>)]) */
+        /* 8	*/ {{1,P1(P(14))               , cAtan       ,PositionalParams,0}, 0, 0x0}, /* (cAtan [x]) */
+        /* 9	*/ {{2,P2(P(14),P(21))         , cAtan2      ,PositionalParams,0}, 0, 0x0}, /* (cAtan2 [x y]) */
+        /* 10	*/ {{2,P2(P(14),S(109))        , cAtan2      ,PositionalParams,0}, 0, 0x0}, /* (cAtan2 [x (cPow [y -%])]) */
+        /* 11	*/ {{1,P1(P(14))               , cAtanh      ,PositionalParams,0}, 0, 0x0}, /* (cAtanh [x]) */
+        /* 12	*/ {{1,P1(P(14))               , cCeil       ,PositionalParams,0}, 0, 0x4}, /* (cCeil [x]) */
+        /* 13	*/ {{1,P1(S(331))              , cCeil       ,PositionalParams,0}, 0, 0x0}, /* (cCeil [(cMul  <1>)]) */
+        /* 14	*/ {{1,P1(P(14))               , cCos        ,PositionalParams,0}, 0, 0x0}, /* (cCos [x]) */
+        /* 15	*/ {{1,P1(P(14))               , cCos        ,PositionalParams,0}, 0, 0x4}, /* (cCos [x]) */
+        /* 16	*/ {{1,P1(P(21))               , cCos        ,PositionalParams,0}, 0, 0x0}, /* (cCos [y]) */
+        /* 17	*/ {{1,P1(S(215))              , cCos        ,PositionalParams,0}, 0, 0x0}, /* (cCos [(cAdd {x y})]) */
+        /* 18	*/ {{1,P1(S(221))              , cCos        ,PositionalParams,0}, 0, 0x0}, /* (cCos [(cAdd {x (cMul {-1 y})})]) */
+        /* 19	*/ {{1,P1(S(242))              , cCos        ,PositionalParams,0}, 0, 0x0}, /* (cCos [(cAdd  <1>)]) */
+        /* 20	*/ {{1,P1(S(301))              , cCos        ,PositionalParams,0}, 0, 0x0}, /* (cCos [(cMul {-% x})]) */
+        /* 21	*/ {{1,P1(S(358))              , cCos        ,PositionalParams,0}, 0, 0x0}, /* (cCos [(cMul -% <1>)]) */
+        /* 22	*/ {{1,P1(P(14))               , cCosh       ,PositionalParams,0}, 0, 0x4}, /* (cCosh [x]) */
+        /* 23	*/ {{1,P1(P(14))               , cCosh       ,PositionalParams,0}, 0, 0x0}, /* (cCosh [x]) */
+        /* 24	*/ {{1,P1(S(50))               , cCosh       ,PositionalParams,0}, 0, 0x0}, /* (cCosh [(cLog [(cPow [& x])])]) */
+        /* 25	*/ {{1,P1(S(295))              , cCosh       ,PositionalParams,0}, 0, 0x0}, /* (cCosh [(cMul {x LOG( & )})]) */
+        /* 26	*/ {{1,P1(S(301))              , cCosh       ,PositionalParams,0}, 0, 0x0}, /* (cCosh [(cMul {-% x})]) */
+        /* 27	*/ {{1,P1(P(14))               , cCot        ,PositionalParams,0}, 0, 0x0}, /* (cCot [x]) */
+        /* 28	*/ {{1,P1(P(14))               , cCsc        ,PositionalParams,0}, 0, 0x0}, /* (cCsc [x]) */
+        /* 29	*/ {{1,P1(P(14))               , cFloor      ,PositionalParams,0}, 0, 0x4}, /* (cFloor [x]) */
+        /* 30	*/ {{1,P1(S(331))              , cFloor      ,PositionalParams,0}, 0, 0x0}, /* (cFloor [(cMul  <1>)]) */
+        /* 31	*/ {{3,P3(P(14),N(10),S(400))  , cIf         ,PositionalParams,0}, 0, 0x0}, /* (cIf [x 1 (cNotNot [y])]) */
+        /* 32	*/ {{3,P3(P(14),P(21),P(28))   , cIf         ,PositionalParams,0}, 0, 0x4}, /* (cIf [x y z]) */
+        /* 33	*/ {{3,P3(P(14),P(21),P(28))   , cIf         ,PositionalParams,0}, 0, 0x0}, /* (cIf [x y z]) */
+        /* 34	*/ {{3,P3(P(14),P(8),S(376))   , cIf         ,PositionalParams,0}, 0, 0x0}, /* (cIf [x %@L (cNot [y])]) */
+        /* 35	*/ {{3,P3(P(14),P(21),S(374))  , cIf         ,PositionalParams,0}, 0, 0x0}, /* (cIf [x y (cNot [%])]) */
+        /* 36	*/ {{3,P3(P(14),P(31),P(32))   , cIf         ,PositionalParams,0}, 0, 0x4}, /* (cIf [x a b]) */
+        /* 37	*/ {{3,P3(P(14),S(374),P(21))  , cIf         ,PositionalParams,0}, 0, 0x0}, /* (cIf [x (cNot [%]) y]) */
+        /* 38	*/ {{3,P3(P(14),S(376),P(8))   , cIf         ,PositionalParams,0}, 0, 0x0}, /* (cIf [x (cNot [y]) %@L]) */
+        /* 39	*/ {{3,P3(P(14),S(58),S(59))   , cIf         ,PositionalParams,0}, 0, 0x0}, /* (cIf [x (cMax [y a]) (cMax [z b])]) */
+        /* 40	*/ {{3,P3(P(14),S(61),S(62))   , cIf         ,PositionalParams,0}, 0, 0x0}, /* (cIf [x (cMin [y a]) (cMin [z b])]) */
+        /* 41	*/ {{3,P3(P(14),S(222),S(224)) , cIf         ,PositionalParams,0}, 0, 0x0}, /* (cIf [x (cAdd {y a}) (cAdd {z b})]) */
+        /* 42	*/ {{3,P3(P(14),S(288),S(289)) , cIf         ,PositionalParams,0}, 0, 0x0}, /* (cIf [x (cMul {y a}) (cMul {z b})]) */
+        /* 43	*/ {{3,P3(P(14),S(386),S(387)) , cIf         ,PositionalParams,0}, 0, 0x0}, /* (cIf [x (cAnd {y a}) (cAnd {z b})]) */
+        /* 44	*/ {{3,P3(P(14),S(393),S(394)) , cIf         ,PositionalParams,0}, 0, 0x0}, /* (cIf [x (cOr {y a}) (cOr {z b})]) */
+        /* 45	*/ {{3,P3(P(14),S(400),N(4))   , cIf         ,PositionalParams,0}, 0, 0x0}, /* (cIf [x (cNotNot [y]) 0]) */
+        /* 46	*/ {{1,P1(S(242))              , cInt        ,PositionalParams,0}, 0, 0x0}, /* (cInt [(cAdd  <1>)]) */
+        /* 47	*/ {{1,P1(P(14))               , cLog        ,PositionalParams,0}, 0, 0x0}, /* (cLog [x]) */
+        /* 48	*/ {{1,P1(P(21))               , cLog        ,PositionalParams,0}, 0, 0x0}, /* (cLog [y]) */
+        /* 49	*/ {{1,P1(P(28))               , cLog        ,PositionalParams,0}, 0, 0x0}, /* (cLog [z]) */
+        /* 50	*/ {{1,P1(S(83))               , cLog        ,PositionalParams,0}, 0, 0x0}, /* (cLog [(cPow [& x])]) */
+        /* 51	*/ {{1,P1(S(283))              , cLog        ,PositionalParams,0}, 0, 0x0}, /* (cLog [(cMul {x y})]) */
+        /* 52	*/ {{1,P1(S(331))              , cLog        ,PositionalParams,0}, 0, 0x0}, /* (cLog [(cMul  <1>)]) */
+        /* 53	*/ {{1,P1(P(1))                , cLog        ,GroupFunction   ,0}, Constness_Const, 0x0}, /* LOG( % ) */
+        /* 54	*/ {{1,P1(P(9))                , cLog        ,GroupFunction   ,0}, Constness_Const, 0x0}, /* LOG( & ) */
+        /* 55	*/ {{1,P1(P(14))               , cLog10      ,PositionalParams,0}, 0, 0x0}, /* (cLog10 [x]) */
+        /* 56	*/ {{1,P1(P(14))               , cLog2       ,PositionalParams,0}, 0, 0x0}, /* (cLog2 [x]) */
+        /* 57	*/ {{2,P2(P(14),P(21))         , cMax        ,PositionalParams,0}, 0, 0x0}, /* (cMax [x y]) */
+        /* 58	*/ {{2,P2(P(21),P(31))         , cMax        ,PositionalParams,0}, 0, 0x0}, /* (cMax [y a]) */
+        /* 59	*/ {{2,P2(P(28),P(32))         , cMax        ,PositionalParams,0}, 0, 0x0}, /* (cMax [z b]) */
+        /* 60	*/ {{2,P2(P(14),P(21))         , cMin        ,PositionalParams,0}, 0, 0x0}, /* (cMin [x y]) */
+        /* 61	*/ {{2,P2(P(21),P(31))         , cMin        ,PositionalParams,0}, 0, 0x0}, /* (cMin [y a]) */
+        /* 62	*/ {{2,P2(P(28),P(32))         , cMin        ,PositionalParams,0}, 0, 0x0}, /* (cMin [z b]) */
+        /* 63	*/ {{2,P2(P(1),N(10))          , cMin        ,GroupFunction   ,0}, Constness_Const, 0x0}, /* MIN( % 1 ) */
+        /* 64	*/ {{2,P2(P(1),P(9))           , cMin        ,GroupFunction   ,0}, Constness_Const, 0x0}, /* MIN( % & ) */
+        /* 65	*/ {{2,P2(N(6),P(14))          , cPow        ,PositionalParams,0}, 0, 0x0}, /* (cPow [0.367879441171 x]) */
+        /* 66	*/ {{2,P2(N(6),P(14))          , cPow        ,PositionalParams,0}, 0, 0x4}, /* (cPow [0.367879441171 x]) */
+        /* 67	*/ {{2,P2(N(15),P(14))         , cPow        ,PositionalParams,0}, 0, 0x0}, /* (cPow [2.71828182846 x]) */
+        /* 68	*/ {{2,P2(N(15),P(14))         , cPow        ,PositionalParams,0}, 0, 0x4}, /* (cPow [2.71828182846 x]) */
+        /* 69	*/ {{2,P2(N(6),S(6))           , cPow        ,PositionalParams,0}, 0, 0x0}, /* (cPow [0.367879441171 (cAsinh [x])]) */
+        /* 70	*/ {{2,P2(N(15),S(6))          , cPow        ,PositionalParams,0}, 0, 0x0}, /* (cPow [2.71828182846 (cAsinh [x])]) */
+        /* 71	*/ {{2,P2(N(6),S(7))           , cPow        ,PositionalParams,0}, 0, 0x0}, /* (cPow [0.367879441171 (cAsinh [(cAdd  <1>)])]) */
+        /* 72	*/ {{2,P2(N(15),S(7))          , cPow        ,PositionalParams,0}, 0, 0x0}, /* (cPow [2.71828182846 (cAsinh [(cAdd  <1>)])]) */
+        /* 73	*/ {{2,P2(N(15),S(332))        , cPow        ,PositionalParams,0}, 0, 0x0}, /* (cPow [2.71828182846 (cMul  <2>)]) */
+        /* 74	*/ {{2,P2(P(1),P(14))          , cPow        ,PositionalParams,0}, 0, 0x0}, /* (cPow [% x]) */
+        /* 75	*/ {{2,P2(P(1),P(14))          , cPow        ,PositionalParams,0}, 0, 0x1}, /* (cPow [% x]) */
+        /* 76	*/ {{2,P2(P(1),P(21))          , cPow        ,PositionalParams,0}, 0, 0x1}, /* (cPow [% y]) */
+        /* 77	*/ {{2,P2(P(14),P(1))          , cPow        ,PositionalParams,0}, 0, 0x0}, /* (cPow [x %]) */
+        /* 78	*/ {{2,P2(P(14),P(2))          , cPow        ,PositionalParams,0}, 0, 0x0}, /* (cPow [x %@P]) */
+        /* 79	*/ {{2,P2(P(21),P(13))         , cPow        ,PositionalParams,0}, 0, 0x0}, /* (cPow [y &@P]) */
+        /* 80	*/ {{2,P2(P(21),P(9))          , cPow        ,PositionalParams,0}, 0, 0x0}, /* (cPow [y &]) */
+        /* 81	*/ {{2,P2(P(2),P(14))          , cPow        ,PositionalParams,0}, 0, 0x0}, /* (cPow [%@P x]) */
+        /* 82	*/ {{2,P2(P(9),P(14))          , cPow        ,PositionalParams,0}, 0, 0x6}, /* (cPow [& x]) */
+        /* 83	*/ {{2,P2(P(9),P(14))          , cPow        ,PositionalParams,0}, 0, 0x0}, /* (cPow [& x]) */
+        /* 84	*/ {{2,P2(P(9),P(21))          , cPow        ,PositionalParams,0}, 0, 0x0}, /* (cPow [& y]) */
+        /* 85	*/ {{2,P2(P(9),S(223))         , cPow        ,PositionalParams,0}, 0, 0x0}, /* (cPow [& (cAdd {y (cMul {z (cLog [x]) /LOG( & )})})]) */
+        /* 86	*/ {{2,P2(P(14),P(4))          , cPow        ,PositionalParams,0}, 0, 0x0}, /* (cPow [x %@I@P]) */
+        /* 87	*/ {{2,P2(P(14),P(12))         , cPow        ,PositionalParams,0}, 0, 0x0}, /* (cPow [x &@I]) */
+        /* 88	*/ {{2,P2(P(1),P(21))          , cPow        ,PositionalParams,0}, 0, 0x0}, /* (cPow [% y]) */
+        /* 89	*/ {{2,P2(P(14),N(13))         , cPow        ,PositionalParams,0}, 0, 0x0}, /* (cPow [x 2]) */
+        /* 90	*/ {{2,P2(P(14),P(24))         , cPow        ,PositionalParams,0}, 0, 0x0}, /* (cPow [x y@O]) */
+        /* 91	*/ {{2,P2(P(14),P(25))         , cPow        ,PositionalParams,0}, 0, 0x0}, /* (cPow [x y@F]) */
+        /* 92	*/ {{2,P2(P(17),P(21))         , cPow        ,PositionalParams,0}, 0, 0x0}, /* (cPow [x@P y]) */
+        /* 93	*/ {{2,P2(P(18),P(21))         , cPow        ,PositionalParams,0}, Sign_Positive, 0x0}, /* (cPow [x y])@P */
+        /* 94	*/ {{2,P2(P(14),P(21))         , cPow        ,PositionalParams,0}, 0, 0x4}, /* (cPow [x y]) */
+        /* 95	*/ {{2,P2(P(14),P(28))         , cPow        ,PositionalParams,0}, 0, 0x0}, /* (cPow [x z]) */
+        /* 96	*/ {{2,P2(P(17),P(28))         , cPow        ,PositionalParams,0}, 0, 0x0}, /* (cPow [x@P z]) */
+        /* 97	*/ {{2,P2(P(14),S(63))         , cPow        ,PositionalParams,0}, 0, 0x0}, /* (cPow [x MIN( % 1 )]) */
+        /* 98	*/ {{2,P2(P(14),S(64))         , cPow        ,PositionalParams,0}, 0, 0x0}, /* (cPow [x MIN( % & )]) */
+        /* 99	*/ {{2,P2(P(14),S(208))        , cPow        ,PositionalParams,0}, 0, 0x0}, /* (cPow [x (cAdd {1 -MIN( % 1 )})]) */
+        /* 100	*/ {{2,P2(P(14),S(216))        , cPow        ,PositionalParams,0}, 0, 0x0}, /* (cPow [x (cAdd {y z})]) */
+        /* 101	*/ {{2,P2(P(14),S(218))        , cPow        ,PositionalParams,0}, 0, 0x0}, /* (cPow [x (cAdd {% -MIN( % 1 )})]) */
+        /* 102	*/ {{2,P2(P(14),S(219))        , cPow        ,PositionalParams,0}, 0, 0x0}, /* (cPow [x (cAdd {% -MIN( % & )})]) */
+        /* 103	*/ {{2,P2(P(14),S(220))        , cPow        ,PositionalParams,0}, 0, 0x0}, /* (cPow [x (cAdd {& -MIN( % & )})]) */
+        /* 104	*/ {{2,P2(P(21),N(2))          , cPow        ,PositionalParams,0}, 0, 0x0}, /* (cPow [y -1]) */
+        /* 105	*/ {{2,P2(P(14),P(21))         , cPow        ,PositionalParams,0}, 0, 0x0}, /* (cPow [x y]) */
+        /* 106	*/ {{2,P2(P(1),S(242))         , cPow        ,PositionalParams,0}, 0, 0x0}, /* (cPow [% (cAdd  <1>)]) */
+        /* 107	*/ {{2,P2(P(14),S(53))         , cPow        ,PositionalParams,0}, 0, 0x0}, /* (cPow [x LOG( % )]) */
+        /* 108	*/ {{2,P2(P(20),P(0))          , cPow        ,PositionalParams,0}, 0, 0x0}, /* (cPow [y %@N]) */
+        /* 109	*/ {{2,P2(P(21),S(194))        , cPow        ,PositionalParams,0}, 0, 0x0}, /* (cPow [y -%]) */
+        /* 110	*/ {{2,P2(P(28),S(242))        , cPow        ,PositionalParams,0}, 0, 0x0}, /* (cPow [z (cAdd  <1>)]) */
+        /* 111	*/ {{2,P2(S(14),N(2))          , cPow        ,PositionalParams,0}, 0, 0x4}, /* (cPow [(cCos [x]) -1]) */
+        /* 112	*/ {{2,P2(S(14),N(2))          , cPow        ,PositionalParams,0}, 0, 0x0}, /* (cPow [(cCos [x]) -1]) */
+        /* 113	*/ {{2,P2(S(20),N(2))          , cPow        ,PositionalParams,0}, 0, 0x5}, /* (cPow [(cCos [(cMul {-% x})]) -1]) */
+        /* 114	*/ {{2,P2(S(21),N(2))          , cPow        ,PositionalParams,0}, 0, 0x1}, /* (cPow [(cCos [(cMul -% <1>)]) -1]) */
+        /* 115	*/ {{2,P2(S(23),N(2))          , cPow        ,PositionalParams,0}, 0, 0x4}, /* (cPow [(cCosh [x]) -1]) */
+        /* 116	*/ {{2,P2(S(23),N(2))          , cPow        ,PositionalParams,0}, 0, 0x0}, /* (cPow [(cCosh [x]) -1]) */
+        /* 117	*/ {{2,P2(S(14),N(13))         , cPow        ,PositionalParams,0}, 0, 0x4}, /* (cPow [(cCos [x]) 2]) */
+        /* 118	*/ {{2,P2(S(14),N(13))         , cPow        ,PositionalParams,0}, 0, 0x0}, /* (cPow [(cCos [x]) 2]) */
+        /* 119	*/ {{2,P2(S(23),P(1))          , cPow        ,PositionalParams,0}, 0, 0x4}, /* (cPow [(cCosh [x]) %]) */
+        /* 120	*/ {{2,P2(S(23),S(259))        , cPow        ,PositionalParams,0}, 0, 0x0}, /* (cPow [(cCosh [x]) ADD( % 1 )]) */
+        /* 121	*/ {{2,P2(S(26),N(2))          , cPow        ,PositionalParams,0}, 0, 0x5}, /* (cPow [(cCosh [(cMul {-% x})]) -1]) */
+        /* 122	*/ {{2,P2(S(47),N(2))          , cPow        ,PositionalParams,0}, 0, 0x0}, /* (cPow [(cLog [x]) -1]) */
+        /* 123	*/ {{2,P2(S(49),N(2))          , cPow        ,PositionalParams,0}, 0, 0x0}, /* (cPow [(cLog [z]) -1]) */
+        /* 124	*/ {{2,P2(S(55),N(2))          , cPow        ,PositionalParams,0}, 0, 0x0}, /* (cPow [(cLog10 [x]) -1]) */
+        /* 125	*/ {{2,P2(S(56),N(2))          , cPow        ,PositionalParams,0}, 0, 0x0}, /* (cPow [(cLog2 [x]) -1]) */
+        /* 126	*/ {{2,P2(S(77),S(417))        , cPow        ,PositionalParams,0}, 0, 0x0}, /* (cPow [(cPow [x %]) /%]) */
+        /* 127	*/ {{2,P2(S(77),S(421))        , cPow        ,PositionalParams,0}, 0, 0x0}, /* (cPow [(cPow [x %]) /MIN( % & )]) */
+        /* 128	*/ {{2,P2(S(80),S(421))        , cPow        ,PositionalParams,0}, 0, 0x0}, /* (cPow [(cPow [y &]) /MIN( % & )]) */
+        /* 129	*/ {{2,P2(S(158),N(2))         , cPow        ,PositionalParams,0}, 0, 0x4}, /* (cPow [(cSin [x]) -1]) */
+        /* 130	*/ {{2,P2(S(170),N(2))         , cPow        ,PositionalParams,0}, 0, 0x4}, /* (cPow [(cSinh [x]) -1]) */
+        /* 131	*/ {{2,P2(S(177),N(2))         , cPow        ,PositionalParams,0}, 0, 0x4}, /* (cPow [(cTan [x]) -1]) */
+        /* 132	*/ {{2,P2(S(177),N(2))         , cPow        ,PositionalParams,0}, 0, 0x0}, /* (cPow [(cTan [x]) -1]) */
+        /* 133	*/ {{2,P2(S(186),N(2))         , cPow        ,PositionalParams,0}, 0, 0x0}, /* (cPow [(cTanh [x]) -1]) */
+        /* 134	*/ {{2,P2(S(186),N(2))         , cPow        ,PositionalParams,0}, 0, 0x4}, /* (cPow [(cTanh [x]) -1]) */
+        /* 135	*/ {{2,P2(S(189),N(2))         , cPow        ,PositionalParams,0}, 0, 0x0}, /* (cPow [(cTanh [(cMul {x LOG( % ) 0.5})]) -1]) */
+        /* 136	*/ {{2,P2(S(199),N(2))         , cPow        ,PositionalParams,0}, 0, 0x5}, /* (cPow [(cAdd {-1 (cPow [% x])}) -1]) */
+        /* 137	*/ {{2,P2(S(201),N(2))         , cPow        ,PositionalParams,0}, 0, 0x5}, /* (cPow [(cAdd {1 (cPow [% x])}) -1]) */
+        /* 138	*/ {{2,P2(S(332),N(2))         , cPow        ,PositionalParams,0}, 0, 0x0}, /* (cPow [(cMul  <2>) -1]) */
+        /* 139	*/ {{2,P2(S(346),N(2))         , cPow        ,PositionalParams,0}, 0, 0x4}, /* (cPow [(cMul x <2>) -1]) */
+        /* 140	*/ {{2,P2(S(158),N(13))        , cPow        ,PositionalParams,0}, 0, 0x4}, /* (cPow [(cSin [x]) 2]) */
+        /* 141	*/ {{2,P2(S(158),N(13))        , cPow        ,PositionalParams,0}, 0, 0x0}, /* (cPow [(cSin [x]) 2]) */
+        /* 142	*/ {{2,P2(S(205),N(3))         , cPow        ,PositionalParams,0}, 0, 0x4}, /* (cPow [(cAdd {1 (cPow [x 2])}) -0.5]) */
+        /* 143	*/ {{2,P2(S(205),N(8))         , cPow        ,PositionalParams,0}, 0, 0x4}, /* (cPow [(cAdd {1 (cPow [x 2])}) 0.5]) */
+        /* 144	*/ {{2,P2(S(207),N(3))         , cPow        ,PositionalParams,0}, 0, 0x0}, /* (cPow [(cAdd {1 (cPow [(cAdd  <1>) 2])}) -0.5]) */
+        /* 145	*/ {{2,P2(S(207),N(8))         , cPow        ,PositionalParams,0}, 0, 0x0}, /* (cPow [(cAdd {1 (cPow [(cAdd  <1>) 2])}) 0.5]) */
+        /* 146	*/ {{2,P2(S(209),N(2))         , cPow        ,PositionalParams,0}, 0, 0x4}, /* (cPow [(cAdd {1 (cMul {-1 x})}) -1]) */
+        /* 147	*/ {{2,P2(S(203),N(8))         , cPow        ,PositionalParams,0}, 0, 0x4}, /* (cPow [(cAdd {-1 (cPow [x 2])}) 0.5]) */
+        /* 148	*/ {{2,P2(S(226),N(8))         , cPow        ,PositionalParams,0}, 0, 0x0}, /* (cPow [(cAdd {(cPow [x 2]) -1}) 0.5]) */
+        /* 149	*/ {{2,P2(S(236),N(8))         , cPow        ,PositionalParams,0}, 0, 0x0}, /* (cPow [(cAdd {(cPow [x 2]) 1}) 0.5]) */
+        /* 150	*/ {{2,P2(S(237),N(8))         , cPow        ,PositionalParams,0}, 0, 0x4}, /* (cPow [(cAdd {(cMul {(cPow [x 2]) -1}) 1}) 0.5]) */
+        /* 151	*/ {{2,P2(S(242),N(13))        , cPow        ,PositionalParams,0}, 0, 0x0}, /* (cPow [(cAdd  <1>) 2]) */
+        /* 152	*/ {{2,P2(S(331),P(9))         , cPow        ,PositionalParams,0}, 0, 0x0}, /* (cPow [(cMul  <1>) &]) */
+        /* 153	*/ {{2,P2(S(418),P(14))        , cPow        ,PositionalParams,0}, 0, 0x0}, /* (cPow [/& x]) */
+        /* 154	*/ {{2,P2(S(418),P(14))        , cPow        ,PositionalParams,0}, 0, 0x6}, /* (cPow [/& x]) */
+        /* 155	*/ {{2,P2(P(1),P(9))           , cPow        ,GroupFunction   ,0}, Constness_Const, 0x0}, /* POW( % & ) */
+        /* 156	*/ {{2,P2(P(9),S(417))         , cPow        ,GroupFunction   ,0}, Constness_Const, 0x0}, /* POW( & /% ) */
+        /* 157	*/ {{1,P1(P(14))               , cSec        ,PositionalParams,0}, 0, 0x0}, /* (cSec [x]) */
+        /* 158	*/ {{1,P1(P(14))               , cSin        ,PositionalParams,0}, 0, 0x0}, /* (cSin [x]) */
+        /* 159	*/ {{1,P1(P(14))               , cSin        ,PositionalParams,0}, 0, 0x4}, /* (cSin [x]) */
+        /* 160	*/ {{1,P1(P(21))               , cSin        ,PositionalParams,0}, 0, 0x0}, /* (cSin [y]) */
+        /* 161	*/ {{1,P1(S(215))              , cSin        ,PositionalParams,0}, 0, 0x0}, /* (cSin [(cAdd {x y})]) */
+        /* 162	*/ {{1,P1(S(221))              , cSin        ,PositionalParams,0}, 0, 0x0}, /* (cSin [(cAdd {x (cMul {-1 y})})]) */
+        /* 163	*/ {{1,P1(S(242))              , cSin        ,PositionalParams,0}, 0, 0x0}, /* (cSin [(cAdd  <1>)]) */
+        /* 164	*/ {{1,P1(S(279))              , cSin        ,PositionalParams,0}, 0, 0x5}, /* (cSin [(cMul {% x})]) */
+        /* 165	*/ {{1,P1(S(331))              , cSin        ,PositionalParams,0}, 0, 0x0}, /* (cSin [(cMul  <1>)]) */
+        /* 166	*/ {{1,P1(S(335))              , cSin        ,PositionalParams,0}, 0, 0x0}, /* (cSin [(cMul %@N <1>)]) */
+        /* 167	*/ {{1,P1(S(339))              , cSin        ,PositionalParams,0}, 0, 0x1}, /* (cSin [(cMul % <1>)]) */
+        /* 168	*/ {{1,P1(S(358))              , cSin        ,PositionalParams,0}, 0, 0x0}, /* (cSin [(cMul -% <1>)]) */
+        /* 169	*/ {{1,P1(P(14))               , cSinh       ,PositionalParams,0}, 0, 0x4}, /* (cSinh [x]) */
+        /* 170	*/ {{1,P1(P(14))               , cSinh       ,PositionalParams,0}, 0, 0x0}, /* (cSinh [x]) */
+        /* 171	*/ {{1,P1(S(50))               , cSinh       ,PositionalParams,0}, 0, 0x0}, /* (cSinh [(cLog [(cPow [& x])])]) */
+        /* 172	*/ {{1,P1(S(279))              , cSinh       ,PositionalParams,0}, 0, 0x5}, /* (cSinh [(cMul {% x})]) */
+        /* 173	*/ {{1,P1(S(295))              , cSinh       ,PositionalParams,0}, 0, 0x0}, /* (cSinh [(cMul {x LOG( & )})]) */
+        /* 174	*/ {{1,P1(S(331))              , cSinh       ,PositionalParams,0}, 0, 0x0}, /* (cSinh [(cMul  <1>)]) */
+        /* 175	*/ {{1,P1(S(335))              , cSinh       ,PositionalParams,0}, 0, 0x0}, /* (cSinh [(cMul %@N <1>)]) */
+        /* 176	*/ {{1,P1(S(358))              , cSinh       ,PositionalParams,0}, 0, 0x0}, /* (cSinh [(cMul -% <1>)]) */
+        /* 177	*/ {{1,P1(P(14))               , cTan        ,PositionalParams,0}, 0, 0x0}, /* (cTan [x]) */
+        /* 178	*/ {{1,P1(P(14))               , cTan        ,PositionalParams,0}, 0, 0x4}, /* (cTan [x]) */
+        /* 179	*/ {{1,P1(S(210))              , cTan        ,PositionalParams,0}, 0, 0x4}, /* (cTan [(cAdd {1.57079632679 (cMul {-1 x})})]) */
+        /* 180	*/ {{1,P1(S(213))              , cTan        ,PositionalParams,0}, 0, 0x0}, /* (cTan [(cAdd {1.57079632679 (cMul -1 <1>)})]) */
+        /* 181	*/ {{1,P1(S(279))              , cTan        ,PositionalParams,0}, 0, 0x0}, /* (cTan [(cMul {% x})]) */
+        /* 182	*/ {{1,P1(S(331))              , cTan        ,PositionalParams,0}, 0, 0x0}, /* (cTan [(cMul  <1>)]) */
+        /* 183	*/ {{1,P1(S(339))              , cTan        ,PositionalParams,0}, 0, 0x0}, /* (cTan [(cMul % <1>)]) */
+        /* 184	*/ {{1,P1(S(335))              , cTan        ,PositionalParams,0}, 0, 0x0}, /* (cTan [(cMul %@N <1>)]) */
+        /* 185	*/ {{1,P1(S(358))              , cTan        ,PositionalParams,0}, 0, 0x0}, /* (cTan [(cMul -% <1>)]) */
+        /* 186	*/ {{1,P1(P(14))               , cTanh       ,PositionalParams,0}, 0, 0x0}, /* (cTanh [x]) */
+        /* 187	*/ {{1,P1(P(14))               , cTanh       ,PositionalParams,0}, 0, 0x4}, /* (cTanh [x]) */
+        /* 188	*/ {{1,P1(S(279))              , cTanh       ,PositionalParams,0}, 0, 0x0}, /* (cTanh [(cMul {% x})]) */
+        /* 189	*/ {{1,P1(S(286))              , cTanh       ,PositionalParams,0}, 0, 0x0}, /* (cTanh [(cMul {x LOG( % ) 0.5})]) */
+        /* 190	*/ {{1,P1(S(331))              , cTanh       ,PositionalParams,0}, 0, 0x0}, /* (cTanh [(cMul  <1>)]) */
+        /* 191	*/ {{1,P1(S(335))              , cTanh       ,PositionalParams,0}, 0, 0x0}, /* (cTanh [(cMul %@N <1>)]) */
+        /* 192	*/ {{1,P1(S(358))              , cTanh       ,PositionalParams,0}, 0, 0x0}, /* (cTanh [(cMul -% <1>)]) */
+        /* 193	*/ {{1,P1(P(14))               , cTrunc      ,PositionalParams,0}, 0, 0x0}, /* (cTrunc [x]) */
+        /* 194	*/ {{1,P1(P(1))                , cNeg        ,GroupFunction   ,0}, Constness_Const, 0x0}, /* -% */
+        /* 195	*/ {{1,P1(P(1))                , cNeg        ,GroupFunction   ,0}, Constness_Const, 0x1}, /* -% */
+        /* 196	*/ {{1,P1(S(63))               , cNeg        ,GroupFunction   ,0}, Constness_Const, 0x0}, /* -MIN( % 1 ) */
+        /* 197	*/ {{1,P1(S(64))               , cNeg        ,GroupFunction   ,0}, Constness_Const, 0x0}, /* -MIN( % & ) */
+        /* 198	*/ {{2,P2(N(2),S(74))          , cAdd        ,SelectedParams  ,0}, 0, 0x5}, /* (cAdd {-1 (cPow [% x])}) */
+        /* 199	*/ {{2,P2(N(2),S(74))          , cAdd        ,SelectedParams  ,0}, 0, 0x0}, /* (cAdd {-1 (cPow [% x])}) */
+        /* 200	*/ {{2,P2(N(10),P(14))         , cAdd        ,SelectedParams  ,0}, 0, 0x4}, /* (cAdd {1 x}) */
+        /* 201	*/ {{2,P2(N(10),S(74))         , cAdd        ,SelectedParams  ,0}, 0, 0x0}, /* (cAdd {1 (cPow [% x])}) */
+        /* 202	*/ {{2,P2(N(10),S(74))         , cAdd        ,SelectedParams  ,0}, 0, 0x5}, /* (cAdd {1 (cPow [% x])}) */
+        /* 203	*/ {{2,P2(N(2),S(89))          , cAdd        ,SelectedParams  ,0}, 0, 0x0}, /* (cAdd {-1 (cPow [x 2])}) */
+        /* 204	*/ {{2,P2(N(2),S(96))          , cAdd        ,SelectedParams  ,0}, 0, 0x0}, /* (cAdd {-1 (cPow [x@P z])}) */
+        /* 205	*/ {{2,P2(N(10),S(89))         , cAdd        ,SelectedParams  ,0}, 0, 0x0}, /* (cAdd {1 (cPow [x 2])}) */
+        /* 206	*/ {{2,P2(N(10),S(96))         , cAdd        ,SelectedParams  ,0}, 0, 0x0}, /* (cAdd {1 (cPow [x@P z])}) */
+        /* 207	*/ {{2,P2(N(10),S(151))        , cAdd        ,SelectedParams  ,0}, 0, 0x0}, /* (cAdd {1 (cPow [(cAdd  <1>) 2])}) */
+        /* 208	*/ {{2,P2(N(10),S(196))        , cAdd        ,SelectedParams  ,0}, 0, 0x0}, /* (cAdd {1 -MIN( % 1 )}) */
+        /* 209	*/ {{2,P2(N(10),S(261))        , cAdd        ,SelectedParams  ,0}, 0, 0x0}, /* (cAdd {1 (cMul {-1 x})}) */
+        /* 210	*/ {{2,P2(N(12),S(261))        , cAdd        ,SelectedParams  ,0}, 0, 0x0}, /* (cAdd {1.57079632679 (cMul {-1 x})}) */
+        /* 211	*/ {{2,P2(N(10),S(303))        , cAdd        ,SelectedParams  ,0}, 0, 0x1}, /* (cAdd {1 (cMul {(cLog [x]) /%})}) */
+        /* 212	*/ {{2,P2(N(10),S(334))        , cAdd        ,SelectedParams  ,0}, 0, 0x0}, /* (cAdd {1 (cMul -1 <2>)}) */
+        /* 213	*/ {{2,P2(N(12),S(333))        , cAdd        ,SelectedParams  ,0}, 0, 0x0}, /* (cAdd {1.57079632679 (cMul -1 <1>)}) */
+        /* 214	*/ {{2,P2(N(12),S(335))        , cAdd        ,SelectedParams  ,0}, 0, 0x0}, /* (cAdd {1.57079632679 (cMul %@N <1>)}) */
+        /* 215	*/ {{2,P2(P(14),P(21))         , cAdd        ,SelectedParams  ,0}, 0, 0x0}, /* (cAdd {x y}) */
+        /* 216	*/ {{2,P2(P(21),P(28))         , cAdd        ,SelectedParams  ,0}, 0, 0x0}, /* (cAdd {y z}) */
+        /* 217	*/ {{2,P2(P(7),S(95))          , cAdd        ,SelectedParams  ,0}, 0, 0x4}, /* (cAdd {%@1 (cPow [x z])}) */
+        /* 218	*/ {{2,P2(P(1),S(196))         , cAdd        ,SelectedParams  ,0}, 0, 0x0}, /* (cAdd {% -MIN( % 1 )}) */
+        /* 219	*/ {{2,P2(P(1),S(197))         , cAdd        ,SelectedParams  ,0}, 0, 0x0}, /* (cAdd {% -MIN( % & )}) */
+        /* 220	*/ {{2,P2(P(9),S(197))         , cAdd        ,SelectedParams  ,0}, 0, 0x0}, /* (cAdd {& -MIN( % & )}) */
+        /* 221	*/ {{2,P2(P(14),S(262))        , cAdd        ,SelectedParams  ,0}, 0, 0x0}, /* (cAdd {x (cMul {-1 y})}) */
+        /* 222	*/ {{2,P2(P(21),P(31))         , cAdd        ,SelectedParams  ,0}, 0, 0x0}, /* (cAdd {y a}) */
+        /* 223	*/ {{2,P2(P(21),S(290))        , cAdd        ,SelectedParams  ,0}, 0, 0x0}, /* (cAdd {y (cMul {z (cLog [x]) /LOG( & )})}) */
+        /* 224	*/ {{2,P2(P(28),P(32))         , cAdd        ,SelectedParams  ,0}, 0, 0x0}, /* (cAdd {z b}) */
+        /* 225	*/ {{2,P2(S(47),P(1))          , cAdd        ,SelectedParams  ,0}, 0, 0x0}, /* (cAdd {(cLog [x]) %}) */
+        /* 226	*/ {{2,P2(S(89),N(2))          , cAdd        ,SelectedParams  ,0}, 0, 0x0}, /* (cAdd {(cPow [x 2]) -1}) */
+        /* 227	*/ {{2,P2(S(280),P(3))         , cAdd        ,SelectedParams  ,0}, 0, 0x0}, /* (cAdd {(cMul {% (cPow [x@P z])})@D1 %@D1}) */
+        /* 228	*/ {{2,P2(S(47),P(9))          , cAdd        ,SelectedParams  ,0}, 0, 0x0}, /* (cAdd {(cLog [x]) &}) */
+        /* 229	*/ {{2,P2(S(84),S(85))         , cAdd        ,SelectedParams  ,0}, 0, 0x0}, /* (cAdd {(cPow [& y]) (cPow [& (cAdd {y (cMul {z (cLog [x]) /LOG( & )})})])}) */
+        /* 230	*/ {{2,P2(S(147),P(15))        , cAdd        ,SelectedParams  ,0}, 0, 0x0}, /* (cAdd {(cPow [(cAdd {-1 (cPow [x 2])}) 0.5])@D4 x@D4}) */
+        /* 231	*/ {{2,P2(S(280),S(195))       , cAdd        ,SelectedParams  ,0}, 0, 0x0}, /* (cAdd {(cMul {% (cPow [x@P z])})@D1 -%@D1}) */
+        /* 232	*/ {{2,P2(S(298),S(85))        , cAdd        ,SelectedParams  ,0}, 0, 0x0}, /* (cAdd {(cMul {(cPow [& y]) -1}) (cPow [& (cAdd {y (cMul {z (cLog [x]) /LOG( & )})})])}) */
+        /* 233	*/ {{2,P2(S(300),S(100))       , cAdd        ,SelectedParams  ,0}, 0, 0x0}, /* (cAdd {(cMul {(cPow [x y]) %}) (cPow [x (cAdd {y z})])}) */
+        /* 234	*/ {{2,P2(S(316),S(52))        , cAdd        ,SelectedParams  ,0}, 0, 0x0}, /* (cAdd {(cMul {LOG( % ) y}) (cLog [(cMul  <1>)])}) */
+        /* 235	*/ {{2,P2(S(52),S(53))         , cAdd        ,SelectedParams  ,0}, 0, 0x0}, /* (cAdd {(cLog [(cMul  <1>)]) LOG( % )}) */
+        /* 236	*/ {{2,P2(S(89),N(10))         , cAdd        ,SelectedParams  ,0}, 0, 0x0}, /* (cAdd {(cPow [x 2]) 1}) */
+        /* 237	*/ {{2,P2(S(317),N(10))        , cAdd        ,SelectedParams  ,0}, 0, 0x0}, /* (cAdd {(cMul {(cPow [x 2]) -1}) 1}) */
+        /* 238	*/ {{2,P2(S(341),S(293))       , cAdd        ,SelectedParams  ,0}, 0, 0x0}, /* (cAdd {(cMul % & <1>) (cMul {& (cAdd  <2>)})}) */
+        /* 239	*/ {{2,P2(S(362),S(294))       , cAdd        ,SelectedParams  ,0}, 0, 0x0}, /* (cAdd {MUL( % & ) (cMul {& (cAdd  <1>)})}) */
+        /* 240	*/ {{2,P2(S(354),S(353))       , cAdd        ,SelectedParams  ,0}, 0, 0x0}, /* (cAdd {(cMul (cPow [x (cAdd {% -MIN( % 1 )})]) <1>) (cMul (cPow [x (cAdd {1 -MIN( % 1 )})]) <2>)}) */
+        /* 241	*/ {{2,P2(S(355),S(356))       , cAdd        ,SelectedParams  ,0}, 0, 0x0}, /* (cAdd {(cMul (cPow [x (cAdd {% -MIN( % & )})]) <1>) (cMul (cPow [x (cAdd {& -MIN( % & )})]) <2>)}) */
+        /* 242	*/ {{0,0                       , cAdd        ,AnyParams       ,1}, 0, 0x0}, /* (cAdd  <1>) */
+        /* 243	*/ {{0,0                       , cAdd        ,AnyParams       ,2}, 0, 0x0}, /* (cAdd  <2>) */
+        /* 244	*/ {{0,0                       , cAdd        ,AnyParams       ,1}, Sign_Positive, 0x0}, /* (cAdd  <1>)@P */
+        /* 245	*/ {{1,P1(N(1))                , cAdd        ,AnyParams       ,1}, 0, 0x0}, /* (cAdd -1.57079632679 <1>) */
+        /* 246	*/ {{1,P1(N(8))                , cAdd        ,AnyParams       ,1}, 0, 0x0}, /* (cAdd 0.5 <1>) */
+        /* 247	*/ {{1,P1(P(6))                , cAdd        ,AnyParams       ,1}, 0, 0x0}, /* (cAdd %@M <1>) */
+        /* 248	*/ {{1,P1(P(1))                , cAdd        ,AnyParams       ,1}, 0, 0x0}, /* (cAdd % <1>) */
+        /* 249	*/ {{1,P1(P(11))               , cAdd        ,AnyParams       ,1}, 0, 0x0}, /* (cAdd &@M <1>) */
+        /* 250	*/ {{1,P1(P(9))                , cAdd        ,AnyParams       ,2}, 0, 0x0}, /* (cAdd & <2>) */
+        /* 251	*/ {{1,P1(P(14))               , cAdd        ,AnyParams       ,1}, 0, 0x4}, /* (cAdd x <1>) */
+        /* 252	*/ {{1,P1(P(14))               , cAdd        ,AnyParams       ,2}, 0, 0x4}, /* (cAdd x <2>) */
+        /* 253	*/ {{1,P1(P(14))               , cAdd        ,AnyParams       ,1}, 0, 0x0}, /* (cAdd x <1>) */
+        /* 254	*/ {{2,P2(P(9),S(194))         , cAdd        ,AnyParams       ,2}, 0, 0x0}, /* (cAdd & -% <2>) */
+        /* 255	*/ {{1,P1(S(123))              , cAdd        ,AnyParams       ,1}, 0, 0x16}, /* (cAdd (cPow [(cLog [z]) -1]) <1>) */
+        /* 256	*/ {{1,P1(S(334))              , cAdd        ,AnyParams       ,1}, 0, 0x0}, /* (cAdd (cMul -1 <2>) <1>) */
+        /* 257	*/ {{1,P1(S(338))              , cAdd        ,AnyParams       ,2}, 0, 0x0}, /* (cAdd (cMul %@M <1>) <2>) */
+        /* 258	*/ {{1,P1(S(357))              , cAdd        ,AnyParams       ,1}, 0, 0x16}, /* (cAdd (cMul (cPow [(cLog [z]) -1]) <2>) <1>) */
+        /* 259	*/ {{2,P2(P(1),N(10))          , cAdd        ,GroupFunction   ,0}, Constness_Const, 0x0}, /* ADD( % 1 ) */
+        /* 260	*/ {{2,P2(P(9),S(194))         , cAdd        ,GroupFunction   ,0}, Constness_Const, 0x0}, /* ADD( & -% ) */
+        /* 261	*/ {{2,P2(N(2),P(14))          , cMul        ,SelectedParams  ,0}, 0, 0x0}, /* (cMul {-1 x}) */
+        /* 262	*/ {{2,P2(N(2),P(21))          , cMul        ,SelectedParams  ,0}, 0, 0x0}, /* (cMul {-1 y}) */
+        /* 263	*/ {{2,P2(N(2),S(13))          , cMul        ,SelectedParams  ,0}, 0, 0x0}, /* (cMul {-1 (cCeil [(cMul  <1>)])}) */
+        /* 264	*/ {{2,P2(N(2),S(18))          , cMul        ,SelectedParams  ,0}, 0, 0x0}, /* (cMul {-1 (cCos [(cAdd {x (cMul {-1 y})})])}) */
+        /* 265	*/ {{2,P2(N(2),S(19))          , cMul        ,SelectedParams  ,0}, 0, 0x0}, /* (cMul {-1 (cCos [(cAdd  <1>)])}) */
+        /* 266	*/ {{2,P2(N(2),S(23))          , cMul        ,SelectedParams  ,0}, 0, 0x0}, /* (cMul {-1 (cCosh [x])}) */
+        /* 267	*/ {{2,P2(N(2),S(30))          , cMul        ,SelectedParams  ,0}, 0, 0x0}, /* (cMul {-1 (cFloor [(cMul  <1>)])}) */
+        /* 268	*/ {{2,P2(N(2),S(83))          , cMul        ,SelectedParams  ,0}, 0, 0x6}, /* (cMul {-1 (cPow [& x])}) */
+        /* 269	*/ {{2,P2(N(2),S(118))         , cMul        ,SelectedParams  ,0}, 0, 0x0}, /* (cMul {-1 (cPow [(cCos [x]) 2])}) */
+        /* 270	*/ {{2,P2(N(2),S(141))         , cMul        ,SelectedParams  ,0}, 0, 0x0}, /* (cMul {-1 (cPow [(cSin [x]) 2])}) */
+        /* 271	*/ {{2,P2(N(2),S(153))         , cMul        ,SelectedParams  ,0}, 0, 0x6}, /* (cMul {-1 (cPow [/& x])}) */
+        /* 272	*/ {{2,P2(N(2),S(165))         , cMul        ,SelectedParams  ,0}, 0, 0x0}, /* (cMul {-1 (cSin [(cMul  <1>)])}) */
+        /* 273	*/ {{2,P2(N(2),S(170))         , cMul        ,SelectedParams  ,0}, 0, 0x0}, /* (cMul {-1 (cSinh [x])}) */
+        /* 274	*/ {{2,P2(N(2),S(174))         , cMul        ,SelectedParams  ,0}, 0, 0x0}, /* (cMul {-1 (cSinh [(cMul  <1>)])}) */
+        /* 275	*/ {{2,P2(N(2),S(182))         , cMul        ,SelectedParams  ,0}, 0, 0x0}, /* (cMul {-1 (cTan [(cMul  <1>)])}) */
+        /* 276	*/ {{2,P2(N(2),S(190))         , cMul        ,SelectedParams  ,0}, 0, 0x0}, /* (cMul {-1 (cTanh [(cMul  <1>)])}) */
+        /* 277	*/ {{2,P2(N(15),S(110))        , cMul        ,SelectedParams  ,0}, 0, 0x0}, /* (cMul {2.71828182846 (cPow [z (cAdd  <1>)])}) */
+        /* 278	*/ {{3,P3(P(14),N(8),S(417))   , cMul        ,SelectedParams  ,0}, 0, 0x0}, /* (cMul {x 0.5 /%}) */
+        /* 279	*/ {{2,P2(P(1),P(14))          , cMul        ,SelectedParams  ,0}, 0, 0x0}, /* (cMul {% x}) */
+        /* 280	*/ {{2,P2(P(1),S(96))          , cMul        ,SelectedParams  ,0}, 0, 0x1}, /* (cMul {% (cPow [x@P z])}) */
+        /* 281	*/ {{2,P2(P(1),S(212))         , cMul        ,SelectedParams  ,0}, 0, 0x0}, /* (cMul {% (cAdd {1 (cMul -1 <2>)})}) */
+        /* 282	*/ {{2,P2(P(1),S(256))         , cMul        ,SelectedParams  ,0}, 0, 0x0}, /* (cMul {% (cAdd (cMul -1 <2>) <1>)}) */
+        /* 283	*/ {{2,P2(P(14),P(21))         , cMul        ,SelectedParams  ,0}, 0, 0x0}, /* (cMul {x y}) */
+        /* 284	*/ {{2,P2(P(14),S(104))        , cMul        ,SelectedParams  ,0}, 0, 0x0}, /* (cMul {x (cPow [y -1])}) */
+        /* 285	*/ {{2,P2(P(14),S(391))        , cMul        ,SelectedParams  ,0}, 0, 0x0}, /* (cMul {x (cAnd  <1>)}) */
+        /* 286	*/ {{3,P3(P(14),S(53),N(8))    , cMul        ,SelectedParams  ,0}, 0, 0x0}, /* (cMul {x LOG( % ) 0.5}) */
+        /* 287	*/ {{2,P2(P(21),P(28))         , cMul        ,SelectedParams  ,0}, 0, 0x0}, /* (cMul {y z}) */
+        /* 288	*/ {{2,P2(P(21),P(31))         , cMul        ,SelectedParams  ,0}, 0, 0x0}, /* (cMul {y a}) */
+        /* 289	*/ {{2,P2(P(28),P(32))         , cMul        ,SelectedParams  ,0}, 0, 0x0}, /* (cMul {z b}) */
+        /* 290	*/ {{3,P3(P(28),S(47),S(420))  , cMul        ,SelectedParams  ,0}, 0, 0x0}, /* (cMul {z (cLog [x]) /LOG( & )}) */
+        /* 291	*/ {{2,P2(P(1),S(83))          , cMul        ,SelectedParams  ,0}, 0, 0x7}, /* (cMul {% (cPow [& x])}) */
+        /* 292	*/ {{2,P2(P(1),S(153))         , cMul        ,SelectedParams  ,0}, 0, 0x7}, /* (cMul {% (cPow [/& x])}) */
+        /* 293	*/ {{2,P2(P(9),S(243))         , cMul        ,SelectedParams  ,0}, 0, 0x0}, /* (cMul {& (cAdd  <2>)}) */
+        /* 294	*/ {{2,P2(P(9),S(242))         , cMul        ,SelectedParams  ,0}, 0, 0x0}, /* (cMul {& (cAdd  <1>)}) */
+        /* 295	*/ {{2,P2(P(14),S(54))         , cMul        ,SelectedParams  ,0}, 0, 0x0}, /* (cMul {x LOG( & )}) */
+        /* 296	*/ {{2,P2(P(14),S(108))        , cMul        ,SelectedParams  ,0}, 0, 0x0}, /* (cMul {x (cPow [y %@N])}) */
+        /* 297	*/ {{2,P2(S(23),N(2))          , cMul        ,SelectedParams  ,0}, 0, 0x4}, /* (cMul {(cCosh [x]) -1}) */
+        /* 298	*/ {{2,P2(S(84),N(2))          , cMul        ,SelectedParams  ,0}, 0, 0x0}, /* (cMul {(cPow [& y]) -1}) */
+        /* 299	*/ {{2,P2(S(11),N(13))         , cMul        ,SelectedParams  ,0}, 0, 0x0}, /* (cMul {(cAtanh [x]) 2}) */
+        /* 300	*/ {{2,P2(S(105),P(1))         , cMul        ,SelectedParams  ,0}, 0, 0x0}, /* (cMul {(cPow [x y]) %}) */
+        /* 301	*/ {{2,P2(S(194),P(14))        , cMul        ,SelectedParams  ,0}, 0, 0x0}, /* (cMul {-% x}) */
+        /* 302	*/ {{2,P2(S(14),S(16))         , cMul        ,SelectedParams  ,0}, 0, 0x12}, /* (cMul {(cCos [x]) (cCos [y])}) */
+        /* 303	*/ {{2,P2(S(47),S(417))        , cMul        ,SelectedParams  ,0}, 0, 0x0}, /* (cMul {(cLog [x]) /%}) */
+        /* 304	*/ {{2,P2(S(65),N(2))          , cMul        ,SelectedParams  ,0}, 0, 0x0}, /* (cMul {(cPow [0.367879441171 x]) -1}) */
+        /* 305	*/ {{2,P2(S(65),N(2))          , cMul        ,SelectedParams  ,0}, 0, 0x4}, /* (cMul {(cPow [0.367879441171 x]) -1}) */
+        /* 306	*/ {{2,P2(S(67),N(2))          , cMul        ,SelectedParams  ,0}, 0, 0x4}, /* (cMul {(cPow [2.71828182846 x]) -1}) */
+        /* 307	*/ {{2,P2(S(170),N(2))         , cMul        ,SelectedParams  ,0}, 0, 0x4}, /* (cMul {(cSinh [x]) -1}) */
+        /* 308	*/ {{3,P3(S(25),N(13),P(1))    , cMul        ,SelectedParams  ,0}, 0, 0x0}, /* (cMul {(cCosh [(cMul {x LOG( & )})]) 2 %}) */
+        /* 309	*/ {{2,P2(S(173),N(0))         , cMul        ,SelectedParams  ,0}, 0, 0x0}, /* (cMul {(cSinh [(cMul {x LOG( & )})]) -2}) */
+        /* 310	*/ {{2,P2(S(24),N(13))         , cMul        ,SelectedParams  ,0}, 0, 0x0}, /* (cMul {(cCosh [(cLog [(cPow [& x])])]) 2}) */
+        /* 311	*/ {{2,P2(S(171),N(13))        , cMul        ,SelectedParams  ,0}, 0, 0x0}, /* (cMul {(cSinh [(cLog [(cPow [& x])])]) 2}) */
+        /* 312	*/ {{3,P3(S(173),N(13),P(1))   , cMul        ,SelectedParams  ,0}, 0, 0x0}, /* (cMul {(cSinh [(cMul {x LOG( & )})]) 2 %}) */
+        /* 313	*/ {{2,P2(S(194),S(153))       , cMul        ,SelectedParams  ,0}, 0, 0x7}, /* (cMul {-% (cPow [/& x])}) */
+        /* 314	*/ {{3,P3(S(14),S(16),N(2))    , cMul        ,SelectedParams  ,0}, 0, 0x12}, /* (cMul {(cCos [x]) (cCos [y]) -1}) */
+        /* 315	*/ {{2,P2(S(14),S(160))        , cMul        ,SelectedParams  ,0}, 0, 0x12}, /* (cMul {(cCos [x]) (cSin [y])}) */
+        /* 316	*/ {{2,P2(S(53),P(21))         , cMul        ,SelectedParams  ,0}, 0, 0x0}, /* (cMul {LOG( % ) y}) */
+        /* 317	*/ {{2,P2(S(89),N(2))          , cMul        ,SelectedParams  ,0}, 0, 0x0}, /* (cMul {(cPow [x 2]) -1}) */
+        /* 318	*/ {{2,P2(S(158),S(16))        , cMul        ,SelectedParams  ,0}, 0, 0x12}, /* (cMul {(cSin [x]) (cCos [y])}) */
+        /* 319	*/ {{2,P2(S(110),S(73))        , cMul        ,SelectedParams  ,0}, 0, 0x0}, /* (cMul {(cPow [z (cAdd  <1>)]) (cPow [2.71828182846 (cMul  <2>)])}) */
+        /* 320	*/ {{2,P2(S(155),S(106))       , cMul        ,SelectedParams  ,0}, 0, 0x0}, /* (cMul {POW( % & ) (cPow [% (cAdd  <1>)])}) */
+        /* 321	*/ {{2,P2(S(155),S(107))       , cMul        ,SelectedParams  ,0}, 0, 0x0}, /* (cMul {POW( % & ) (cPow [x LOG( % )])}) */
+        /* 322	*/ {{2,P2(S(155),S(152))       , cMul        ,SelectedParams  ,0}, 0, 0x0}, /* (cMul {POW( % & ) (cPow [(cMul  <1>) &])}) */
+        /* 323	*/ {{2,P2(S(158),S(160))       , cMul        ,SelectedParams  ,0}, 0, 0x12}, /* (cMul {(cSin [x]) (cSin [y])}) */
+        /* 324	*/ {{3,P3(S(14),S(160),N(2))   , cMul        ,SelectedParams  ,0}, 0, 0x12}, /* (cMul {(cCos [x]) (cSin [y]) -1}) */
+        /* 325	*/ {{3,P3(S(158),S(160),N(2))  , cMul        ,SelectedParams  ,0}, 0, 0x12}, /* (cMul {(cSin [x]) (cSin [y]) -1}) */
+        /* 326	*/ {{2,P2(S(97),S(240))        , cMul        ,SelectedParams  ,0}, 0, 0x0}, /* (cMul {(cPow [x MIN( % 1 )]) (cAdd {(cMul (cPow [x (cAdd {% -MIN( % 1 )})]) <1>) (cMul (cPow [x (cAdd {1 -MIN( % 1 )})]) <2>)})}) */
+        /* 327	*/ {{2,P2(S(98),S(241))        , cMul        ,SelectedParams  ,0}, 0, 0x0}, /* (cMul {(cPow [x MIN( % & )]) (cAdd {(cMul (cPow [x (cAdd {% -MIN( % & )})]) <1>) (cMul (cPow [x (cAdd {& -MIN( % & )})]) <2>)})}) */
+        /* 328	*/ {{2,P2(S(200),S(146))       , cMul        ,SelectedParams  ,0}, 0, 0x0}, /* (cMul {(cAdd {1 x})@D4 (cPow [(cAdd {1 (cMul {-1 x})}) -1])@D4}) */
+        /* 329	*/ {{2,P2(S(375),P(21))        , cMul        ,SelectedParams  ,0}, 0, 0x0}, /* (cMul {(cNot [x]) y}) */
+        /* 330	*/ {{2,P2(S(399),P(21))        , cMul        ,SelectedParams  ,0}, 0, 0x0}, /* (cMul {(cNotNot [x]) y}) */
+        /* 331	*/ {{0,0                       , cMul        ,AnyParams       ,1}, 0, 0x0}, /* (cMul  <1>) */
+        /* 332	*/ {{0,0                       , cMul        ,AnyParams       ,2}, 0, 0x0}, /* (cMul  <2>) */
+        /* 333	*/ {{1,P1(N(2))                , cMul        ,AnyParams       ,1}, 0, 0x0}, /* (cMul -1 <1>) */
+        /* 334	*/ {{1,P1(N(2))                , cMul        ,AnyParams       ,2}, 0, 0x0}, /* (cMul -1 <2>) */
+        /* 335	*/ {{1,P1(P(0))                , cMul        ,AnyParams       ,1}, 0, 0x0}, /* (cMul %@N <1>) */
+        /* 336	*/ {{1,P1(P(2))                , cMul        ,AnyParams       ,1}, 0, 0x0}, /* (cMul %@P <1>) */
+        /* 337	*/ {{1,P1(P(2))                , cMul        ,AnyParams       ,1}, 0, 0x1}, /* (cMul %@P <1>) */
+        /* 338	*/ {{1,P1(P(6))                , cMul        ,AnyParams       ,1}, 0, 0x0}, /* (cMul %@M <1>) */
+        /* 339	*/ {{1,P1(P(1))                , cMul        ,AnyParams       ,1}, 0, 0x0}, /* (cMul % <1>) */
+        /* 340	*/ {{1,P1(P(9))                , cMul        ,AnyParams       ,2}, 0, 0x0}, /* (cMul & <2>) */
+        /* 341	*/ {{2,P2(P(1),P(9))           , cMul        ,AnyParams       ,1}, 0, 0x0}, /* (cMul % & <1>) */
+        /* 342	*/ {{2,P2(P(9),S(417))         , cMul        ,AnyParams       ,2}, 0, 0x0}, /* (cMul & /% <2>) */
+        /* 343	*/ {{1,P1(P(14))               , cMul        ,AnyParams       ,1}, 0, 0x4}, /* (cMul x <1>) */
+        /* 344	*/ {{1,P1(P(14))               , cMul        ,AnyParams       ,2}, 0, 0x4}, /* (cMul x <2>) */
+        /* 345	*/ {{1,P1(P(14))               , cMul        ,AnyParams       ,1}, 0, 0x0}, /* (cMul x <1>) */
+        /* 346	*/ {{1,P1(P(14))               , cMul        ,AnyParams       ,2}, 0, 0x0}, /* (cMul x <2>) */
+        /* 347	*/ {{1,P1(S(0))                , cMul        ,AnyParams       ,1}, 0, 0x0}, /* (cMul (cAbs [x]) <1>) */
+        /* 348	*/ {{1,P1(S(47))               , cMul        ,AnyParams       ,1}, 0, 0x0}, /* (cMul (cLog [x]) <1>) */
+        /* 349	*/ {{1,P1(S(53))               , cMul        ,AnyParams       ,1}, 0, 0x0}, /* (cMul LOG( % ) <1>) */
+        /* 350	*/ {{1,P1(S(86))               , cMul        ,AnyParams       ,1}, 0, 0x4}, /* (cMul (cPow [x %@I@P]) <1>) */
+        /* 351	*/ {{1,P1(S(87))               , cMul        ,AnyParams       ,2}, 0, 0x4}, /* (cMul (cPow [x &@I]) <2>) */
+        /* 352	*/ {{1,P1(S(88))               , cMul        ,AnyParams       ,1}, 0, 0x0}, /* (cMul (cPow [% y]) <1>) */
+        /* 353	*/ {{1,P1(S(99))               , cMul        ,AnyParams       ,2}, 0, 0x0}, /* (cMul (cPow [x (cAdd {1 -MIN( % 1 )})]) <2>) */
+        /* 354	*/ {{1,P1(S(101))              , cMul        ,AnyParams       ,1}, 0, 0x0}, /* (cMul (cPow [x (cAdd {% -MIN( % 1 )})]) <1>) */
+        /* 355	*/ {{1,P1(S(102))              , cMul        ,AnyParams       ,1}, 0, 0x0}, /* (cMul (cPow [x (cAdd {% -MIN( % & )})]) <1>) */
+        /* 356	*/ {{1,P1(S(103))              , cMul        ,AnyParams       ,2}, 0, 0x0}, /* (cMul (cPow [x (cAdd {& -MIN( % & )})]) <2>) */
+        /* 357	*/ {{1,P1(S(123))              , cMul        ,AnyParams       ,2}, 0, 0x0}, /* (cMul (cPow [(cLog [z]) -1]) <2>) */
+        /* 358	*/ {{1,P1(S(194))              , cMul        ,AnyParams       ,1}, 0, 0x0}, /* (cMul -% <1>) */
+        /* 359	*/ {{1,P1(S(194))              , cMul        ,AnyParams       ,2}, 0, 0x1}, /* (cMul -% <2>) */
+        /* 360	*/ {{2,P2(S(123),S(47))        , cMul        ,AnyParams       ,1}, 0, 0x16}, /* (cMul (cPow [(cLog [z]) -1]) (cLog [x]) <1>) */
+        /* 361	*/ {{2,P2(S(419),S(47))        , cMul        ,AnyParams       ,1}, 0, 0x1}, /* (cMul /LOG( % ) (cLog [x]) <1>) */
+        /* 362	*/ {{2,P2(P(1),P(9))           , cMul        ,GroupFunction   ,0}, Constness_Const, 0x0}, /* MUL( % & ) */
+        /* 363	*/ {{2,P2(P(9),S(417))         , cMul        ,GroupFunction   ,0}, Constness_Const, 0x0}, /* MUL( & /% ) */
+        /* 364	*/ {{2,P2(S(54),S(419))        , cMul        ,GroupFunction   ,0}, Constness_Const, 0x0}, /* MUL( LOG( & ) /LOG( % ) ) */
+        /* 365	*/ {{2,P2(P(14),P(21))         , cEqual      ,PositionalParams,0}, 0, 0x12}, /* (cEqual [x y]) */
+        /* 366	*/ {{2,P2(P(14),P(21))         , cEqual      ,PositionalParams,0}, 0, 0x0}, /* (cEqual [x y]) */
+        /* 367	*/ {{2,P2(P(14),P(28))         , cEqual      ,PositionalParams,0}, 0, 0x20}, /* (cEqual [x z]) */
+        /* 368	*/ {{2,P2(P(21),P(28))         , cEqual      ,PositionalParams,0}, 0, 0x24}, /* (cEqual [y z]) */
+        /* 369	*/ {{2,P2(P(21),P(28))         , cEqual      ,PositionalParams,0}, 0, 0x0}, /* (cEqual [y z]) */
+        /* 370	*/ {{2,P2(N(4),P(14))          , cLess       ,PositionalParams,0}, 0, 0x4}, /* (cLess [0 x]) */
+        /* 371	*/ {{2,P2(P(21),P(14))         , cLess       ,PositionalParams,0}, 0, 0x0}, /* (cLess [y x]) */
+        /* 372	*/ {{2,P2(P(14),P(21))         , cLess       ,PositionalParams,0}, 0, 0x12}, /* (cLess [x y]) */
+        /* 373	*/ {{2,P2(P(14),P(21))         , cLessOrEq   ,PositionalParams,0}, 0, 0x0}, /* (cLessOrEq [x y]) */
+        /* 374	*/ {{1,P1(P(1))                , cNot        ,PositionalParams,0}, 0, 0x0}, /* (cNot [%]) */
+        /* 375	*/ {{1,P1(P(14))               , cNot        ,PositionalParams,0}, 0, 0x0}, /* (cNot [x]) */
+        /* 376	*/ {{1,P1(P(21))               , cNot        ,PositionalParams,0}, 0, 0x0}, /* (cNot [y]) */
+        /* 377	*/ {{1,P1(P(28))               , cNot        ,PositionalParams,0}, 0, 0x0}, /* (cNot [z]) */
+        /* 378	*/ {{1,P1(S(278))              , cNot        ,PositionalParams,0}, 0, 0x0}, /* (cNot [(cMul {x 0.5 /%})]) */
+        /* 379	*/ {{1,P1(S(385))              , cNot        ,PositionalParams,0}, 0, 0x0}, /* (cNot [(cAnd {x y})]) */
+        /* 380	*/ {{1,P1(S(388))              , cNot        ,PositionalParams,0}, 0, 0x0}, /* (cNot [(cAnd {z (cIf [x y (cNot [%])])})]) */
+        /* 381	*/ {{1,P1(S(389))              , cNot        ,PositionalParams,0}, 0, 0x0}, /* (cNot [(cAnd {z (cIf [x (cNot [%]) y])})]) */
+        /* 382	*/ {{1,P1(S(392))              , cNot        ,PositionalParams,0}, 0, 0x0}, /* (cNot [(cOr {x y})]) */
+        /* 383	*/ {{1,P1(S(395))              , cNot        ,PositionalParams,0}, 0, 0x0}, /* (cNot [(cOr {z (cIf [x y (cNot [%])])})]) */
+        /* 384	*/ {{1,P1(S(396))              , cNot        ,PositionalParams,0}, 0, 0x0}, /* (cNot [(cOr {z (cIf [x (cNot [%]) y])})]) */
+        /* 385	*/ {{2,P2(P(14),P(21))         , cAnd        ,SelectedParams  ,0}, 0, 0x0}, /* (cAnd {x y}) */
+        /* 386	*/ {{2,P2(P(21),P(31))         , cAnd        ,SelectedParams  ,0}, 0, 0x0}, /* (cAnd {y a}) */
+        /* 387	*/ {{2,P2(P(28),P(32))         , cAnd        ,SelectedParams  ,0}, 0, 0x0}, /* (cAnd {z b}) */
+        /* 388	*/ {{2,P2(P(28),S(35))         , cAnd        ,SelectedParams  ,0}, 0, 0x0}, /* (cAnd {z (cIf [x y (cNot [%])])}) */
+        /* 389	*/ {{2,P2(P(28),S(37))         , cAnd        ,SelectedParams  ,0}, 0, 0x0}, /* (cAnd {z (cIf [x (cNot [%]) y])}) */
+        /* 390	*/ {{2,P2(S(375),P(21))        , cAnd        ,SelectedParams  ,0}, 0, 0x0}, /* (cAnd {(cNot [x]) y}) */
+        /* 391	*/ {{0,0                       , cAnd        ,AnyParams       ,1}, 0, 0x0}, /* (cAnd  <1>) */
+        /* 392	*/ {{2,P2(P(14),P(21))         , cOr         ,SelectedParams  ,0}, 0, 0x0}, /* (cOr {x y}) */
+        /* 393	*/ {{2,P2(P(21),P(31))         , cOr         ,SelectedParams  ,0}, 0, 0x0}, /* (cOr {y a}) */
+        /* 394	*/ {{2,P2(P(28),P(32))         , cOr         ,SelectedParams  ,0}, 0, 0x0}, /* (cOr {z b}) */
+        /* 395	*/ {{2,P2(P(28),S(35))         , cOr         ,SelectedParams  ,0}, 0, 0x0}, /* (cOr {z (cIf [x y (cNot [%])])}) */
+        /* 396	*/ {{2,P2(P(28),S(37))         , cOr         ,SelectedParams  ,0}, 0, 0x0}, /* (cOr {z (cIf [x (cNot [%]) y])}) */
+        /* 397	*/ {{2,P2(S(375),P(21))        , cOr         ,SelectedParams  ,0}, 0, 0x0}, /* (cOr {(cNot [x]) y}) */
+        /* 398	*/ {{0,0                       , cOr         ,AnyParams       ,1}, 0, 0x0}, /* (cOr  <1>) */
+        /* 399	*/ {{1,P1(P(14))               , cNotNot     ,PositionalParams,0}, 0, 0x0}, /* (cNotNot [x]) */
+        /* 400	*/ {{1,P1(P(21))               , cNotNot     ,PositionalParams,0}, 0, 0x0}, /* (cNotNot [y]) */
+        /* 401	*/ {{1,P1(S(215))              , cNotNot     ,PositionalParams,0}, 0, 0x0}, /* (cNotNot [(cAdd {x y})]) */
+        /* 402	*/ {{1,P1(S(253))              , cNotNot     ,PositionalParams,0}, 0, 0x0}, /* (cNotNot [(cAdd x <1>)]) */
+        /* 403	*/ {{1,P1(S(278))              , cNotNot     ,PositionalParams,0}, 0, 0x0}, /* (cNotNot [(cMul {x 0.5 /%})]) */
+        /* 404	*/ {{1,P1(S(285))              , cNotNot     ,PositionalParams,0}, 0, 0x0}, /* (cNotNot [(cMul {x (cAnd  <1>)})]) */
+        /* 405	*/ {{1,P1(S(331))              , cDeg        ,PositionalParams,0}, 0, 0x0}, /* (cDeg [(cMul  <1>)]) */
+        /* 406	*/ {{1,P1(S(331))              , cRad        ,PositionalParams,0}, 0, 0x0}, /* (cRad [(cMul  <1>)]) */
+        /* 407	*/ {{3,P3(P(14),P(21),S(391))  , cAbsAnd     ,SelectedParams  ,0}, 0, 0x0}, /* (cAbsAnd {x y (cAnd  <1>)}) */
+        /* 408	*/ {{3,P3(P(14),P(21),S(398))  , cAbsOr      ,SelectedParams  ,0}, 0, 0x0}, /* (cAbsOr {x y (cOr  <1>)}) */
+        /* 409	*/ {{1,P1(P(14))               , cAbsNot     ,PositionalParams,0}, 0, 0x0}, /* (cAbsNot [x]) */
+        /* 410	*/ {{1,P1(P(14))               , cAbsNotNot  ,PositionalParams,0}, 0, 0x0}, /* (cAbsNotNot [x]) */
+        /* 411	*/ {{1,P1(P(21))               , cAbsNotNot  ,PositionalParams,0}, 0, 0x0}, /* (cAbsNotNot [y]) */
+        /* 412	*/ {{1,P1(P(28))               , cAbsNotNot  ,PositionalParams,0}, 0, 0x0}, /* (cAbsNotNot [z]) */
+        /* 413	*/ {{3,P3(P(14),N(10),S(411))  , cAbsIf      ,PositionalParams,0}, 0, 0x0}, /* (cAbsIf [x 1 (cAbsNotNot [y])]) */
+        /* 414	*/ {{3,P3(P(14),P(21),P(28))   , cAbsIf      ,PositionalParams,0}, 0, 0x0}, /* (cAbsIf [x y z]) */
+        /* 415	*/ {{3,P3(P(14),S(331),N(4))   , cAbsIf      ,PositionalParams,0}, 0, 0x0}, /* (cAbsIf [x (cMul  <1>) 0]) */
+        /* 416	*/ {{3,P3(P(14),S(411),N(4))   , cAbsIf      ,PositionalParams,0}, 0, 0x0}, /* (cAbsIf [x (cAbsNotNot [y]) 0]) */
+        /* 417	*/ {{1,P1(P(1))                , cInv        ,GroupFunction   ,0}, Constness_Const, 0x0}, /* /% */
+        /* 418	*/ {{1,P1(P(9))                , cInv        ,GroupFunction   ,0}, Constness_Const, 0x0}, /* /& */
+        /* 419	*/ {{1,P1(S(53))               , cInv        ,GroupFunction   ,0}, Constness_Const, 0x0}, /* /LOG( % ) */
+        /* 420	*/ {{1,P1(S(54))               , cInv        ,GroupFunction   ,0}, Constness_Const, 0x0}, /* /LOG( & ) */
+        /* 421	*/ {{1,P1(S(64))               , cInv        ,GroupFunction   ,0}, Constness_Const, 0x0}, /* /MIN( % & ) */
+        },
+
+    };
+}
+namespace FPoptimizer_Grammar
+{
+    const Rule grammar_rules[241] =
+    {
+        /* 0:	@L (cAbs [x])
+         *	->	x
+         */		 {ProduceNewTree, true , 1,P1(P(14))               , {1,P1(P(14))               , cAbs        ,PositionalParams,0}},
+        /* 1:	(cAtan [(cMul {x (cPow [y %@N])})])
+         *	->	(cAtan2 [x (cPow [y -%])])
+         */		 {ProduceNewTree, false, 1,P1(S(10))               , {1,P1(S(296))              , cAtan       ,PositionalParams,0}},
+        /* 2:	(cAtan2 [(cPow [(cAdd {(cMul {(cPow [x 2]) -1}) 1}) 0.5])@D4 x@D4])
+         *	->	(cAcos [x])
+         */		 {ProduceNewTree, false, 1,P1(S(3))                , {2,P2(S(150),P(15))        , cAtan2      ,PositionalParams,0}},
+        /* 3:	(cAtan2 [x@D4 (cPow [(cAdd {(cMul {(cPow [x 2]) -1}) 1}) 0.5])@D4])
+         *	->	(cAsin [x])
+         */		 {ProduceNewTree, false, 1,P1(S(5))                , {2,P2(P(15),S(150))        , cAtan2      ,PositionalParams,0}},
+        /* 4:	(cAtan2 [(cMul x <1>)@D4 (cMul x <2>)@D4])
+         *	:	(cMul  <1>) (cMul  <2>)
+         */		 {ReplaceParams , false, 2,P2(S(331),S(332))       , {2,P2(S(343),S(344))       , cAtan2      ,PositionalParams,0}},
+        /* 5:	(cCeil [x@I])
+         *	->	x
+         */		 {ProduceNewTree, false, 1,P1(P(14))               , {1,P1(P(16))               , cCeil       ,PositionalParams,0}},
+        /* 6:	(cCeil [(cMul -1 <1>)])
+         *	->	(cMul {-1 (cFloor [(cMul  <1>)])})
+         */		 {ProduceNewTree, false, 1,P1(S(267))              , {1,P1(S(333))              , cCeil       ,PositionalParams,0}},
+        /* 7:	(cCos [(cAdd {1.57079632679 (cMul %@N <1>)})])
+         *	->	(cSin [(cMul -% <1>)])
+         */		 {ProduceNewTree, false, 1,P1(S(168))              , {1,P1(S(214))              , cCos        ,PositionalParams,0}},
+        /* 8:	(cCos [(cAdd -1.57079632679 <1>)])
+         *	->	(cSin [(cAdd  <1>)])
+         */		 {ProduceNewTree, false, 1,P1(S(163))              , {1,P1(S(245))              , cCos        ,PositionalParams,0}},
+        /* 9:	(cCos [(cAcos [x])])
+         *	->	x
+         */		 {ProduceNewTree, false, 1,P1(P(14))               , {1,P1(S(3))                , cCos        ,PositionalParams,0}},
+        /* 10:	(cCos [(cAbs [x])])
+         *	:	x
+         */		 {ReplaceParams , false, 1,P1(P(14))               , {1,P1(S(0))                , cCos        ,PositionalParams,0}},
+        /* 11:	(cCos [(cMul -1 <1>)])
+         *	:	(cMul  <1>)
+         */		 {ReplaceParams , false, 1,P1(S(331))              , {1,P1(S(333))              , cCos        ,PositionalParams,0}},
+        /* 12:	(cCosh [(cAsinh [x])])
+         *	->	(cPow [(cAdd {(cPow [x 2]) 1}) 0.5])
+         */		 {ProduceNewTree, false, 1,P1(S(149))              , {1,P1(S(6))                , cCosh       ,PositionalParams,0}},
+        /* 13:	(cCosh [(cAbs [x])])
+         *	:	x
+         */		 {ReplaceParams , false, 1,P1(P(14))               , {1,P1(S(0))                , cCosh       ,PositionalParams,0}},
+        /* 14:	(cCosh [(cMul -1 <1>)])
+         *	:	(cMul  <1>)
+         */		 {ReplaceParams , false, 1,P1(S(331))              , {1,P1(S(333))              , cCosh       ,PositionalParams,0}},
+        /* 15:	(cFloor [x@I])
+         *	->	x
+         */		 {ProduceNewTree, false, 1,P1(P(14))               , {1,P1(P(16))               , cFloor      ,PositionalParams,0}},
+        /* 16:	(cFloor [(cMul -1 <1>)])
+         *	->	(cMul {-1 (cCeil [(cMul  <1>)])})
+         */		 {ProduceNewTree, false, 1,P1(S(263))              , {1,P1(S(333))              , cFloor      ,PositionalParams,0}},
+        /* 17:	(cFloor [(cAdd 0.5 <1>)])
+         *	->	(cInt [(cAdd  <1>)])
+         */		 {ProduceNewTree, false, 1,P1(S(46))               , {1,P1(S(246))              , cFloor      ,PositionalParams,0}},
+        /* 18:	(cIf [x 0 y])
+         *	->	(cMul {(cNot [x]) y})
+         */		 {ProduceNewTree, false, 1,P1(S(329))              , {3,P3(P(14),N(4),P(21))    , cIf         ,PositionalParams,0}},
+        /* 19:	(cIf [x@P y z])
+         *	->	(cAbsIf [x y z])
+         */		 {ProduceNewTree, false, 1,P1(S(414))              , {3,P3(P(17),P(21),P(28))   , cIf         ,PositionalParams,0}},
+        /* 20:	(cIf [x 0 y@L])
+         *	->	(cAnd {(cNot [x]) y})
+         */		 {ProduceNewTree, false, 1,P1(S(390))              , {3,P3(P(14),N(4),P(22))    , cIf         ,PositionalParams,0}},
+        /* 21:	(cIf [x 1 y@L])
+         *	->	(cOr {x y})
+         */		 {ProduceNewTree, false, 1,P1(S(392))              , {3,P3(P(14),N(10),P(22))   , cIf         ,PositionalParams,0}},
+        /* 22:	(cIf [x y 0])
+         *	->	(cMul {(cNotNot [x]) y})
+         */		 {ProduceNewTree, false, 1,P1(S(330))              , {3,P3(P(14),P(21),N(4))    , cIf         ,PositionalParams,0}},
+        /* 23:	(cIf [x y@L 0])
+         *	->	(cAnd {x y})
+         */		 {ProduceNewTree, false, 1,P1(S(385))              , {3,P3(P(14),P(22),N(4))    , cIf         ,PositionalParams,0}},
+        /* 24:	(cIf [x y@L 1])
+         *	->	(cOr {(cNot [x]) y})
+         */		 {ProduceNewTree, false, 1,P1(S(397))              , {3,P3(P(14),P(22),N(10))   , cIf         ,PositionalParams,0}},
+        /* 25:	(cIf [(cLess [x y])@D12 y@D8 x@D4])
+         *	->	(cMax [x y])
+         */		 {ProduceNewTree, false, 1,P1(S(57))               , {3,P3(S(372),P(23),P(15))  , cIf         ,PositionalParams,0}},
+        /* 26:	(cIf [(cLess [x y])@D12 x@D4 y@D8])
+         *	->	(cMin [x y])
+         */		 {ProduceNewTree, false, 1,P1(S(60))               , {3,P3(S(372),P(15),P(23))  , cIf         ,PositionalParams,0}},
+        /* 27:	(cIf [(cLess [0 x])@D4 (cFloor [x])@D4 (cCeil [x])@D4])
+         *	->	(cTrunc [x])
+         */		 {ProduceNewTree, false, 1,P1(S(193))              , {3,P3(S(370),S(29),S(12))  , cIf         ,PositionalParams,0}},
+        /* 28:	(cIf [(cLessOrEq [x y]) z a])
+         *	:	(cLess [y x]) a z
+         */		 {ReplaceParams , false, 3,P3(S(371),P(31),P(28))  , {3,P3(S(373),P(28),P(31))  , cIf         ,PositionalParams,0}},
+        /* 29:	@L (cIf [x (cAbsNotNot [y]) z])
+         *	:	x y z
+         */		 {ReplaceParams , true , 3,P3(P(14),P(21),P(28))   , {3,P3(P(14),S(411),P(28))  , cIf         ,PositionalParams,0}},
+        /* 30:	@L (cIf [x y (cAbsNotNot [z])])
+         *	:	x y z
+         */		 {ReplaceParams , true , 3,P3(P(14),P(21),P(28))   , {3,P3(P(14),P(21),S(412))  , cIf         ,PositionalParams,0}},
+        /* 31:	(cInt [x@I])
+         *	->	x
+         */		 {ProduceNewTree, false, 1,P1(P(14))               , {1,P1(P(16))               , cInt        ,PositionalParams,0}},
+        /* 32:	(cLog [(cMul %@P <1>)])
+         *	->	(cAdd {(cLog [(cMul  <1>)]) LOG( % )})
+         */		 {ProduceNewTree, false, 1,P1(S(235))              , {1,P1(S(336))              , cLog        ,PositionalParams,0}},
+        /* 33:	(cLog [(cMul (cPow [% y]) <1>)])
+         *	->	(cAdd {(cMul {LOG( % ) y}) (cLog [(cMul  <1>)])})
+         */		 {ProduceNewTree, false, 1,P1(S(234))              , {1,P1(S(352))              , cLog        ,PositionalParams,0}},
+        /* 34:	(cLog [(cAdd {(cPow [(cAdd {-1 (cPow [x 2])}) 0.5])@D4 x@D4})])
+         *	->	(cAcosh [x])
+         */		 {ProduceNewTree, false, 1,P1(S(4))                , {1,P1(S(230))              , cLog        ,PositionalParams,0}},
+        /* 35:	(cLog [(cMul {(cAdd {1 x})@D4 (cPow [(cAdd {1 (cMul {-1 x})}) -1])@D4})])
+         *	->	(cMul {(cAtanh [x]) 2})
+         */		 {ProduceNewTree, false, 1,P1(S(299))              , {1,P1(S(328))              , cLog        ,PositionalParams,0}},
+        /* 36:	(cMax x@D4 x@D4)
+         *	:	x
+         */		 {ReplaceParams , false, 1,P1(P(14))               , {2,P2(P(15),P(15))         , cMax        ,AnyParams       ,0}},
+        /* 37:	(cMax (cIf [x y z])@D4 (cIf [x a b])@D4)
+         *	:	(cIf [x (cMax [y a]) (cMax [z b])])
+         */		 {ReplaceParams , false, 1,P1(S(39))               , {2,P2(S(32),S(36))         , cMax        ,AnyParams       ,0}},
+        /* 38:	(cMin x@D4 x@D4)
+         *	:	x
+         */		 {ReplaceParams , false, 1,P1(P(14))               , {2,P2(P(15),P(15))         , cMin        ,AnyParams       ,0}},
+        /* 39:	(cMin (cIf [x y z])@D4 (cIf [x a b])@D4)
+         *	:	(cIf [x (cMin [y a]) (cMin [z b])])
+         */		 {ReplaceParams , false, 1,P1(S(40))               , {2,P2(S(32),S(36))         , cMin        ,AnyParams       ,0}},
+        /* 40:	(cPow [(cMul %@P <1>) &])
+         *	->	(cMul {POW( % & ) (cPow [(cMul  <1>) &])})
+         */		 {ProduceNewTree, false, 1,P1(S(322))              , {2,P2(S(336),P(9))         , cPow        ,PositionalParams,0}},
+        /* 41:	(cPow [% (cAdd {(cLog [x]) &})])
+         *	->	(cMul {POW( % & ) (cPow [x LOG( % )])})
+         */		 {ProduceNewTree, false, 1,P1(S(321))              , {2,P2(P(1),S(228))         , cPow        ,PositionalParams,0}},
+        /* 42:	(cPow [(cMul %@N <1>) &@E])
+         *	->	(cMul {POW( % & ) (cPow [(cMul  <1>) &])})
+         */		 {ProduceNewTree, false, 1,P1(S(322))              , {2,P2(S(335),P(10))        , cPow        ,PositionalParams,0}},
+        /* 43:	(cPow [z@D16 (cAdd (cMul (cPow [(cLog [z]) -1]) <2>) <1>)@D16])
+         *	->	(cMul {(cPow [z (cAdd  <1>)]) (cPow [2.71828182846 (cMul  <2>)])})
+         */		 {ProduceNewTree, false, 1,P1(S(319))              , {2,P2(P(29),S(258))        , cPow        ,PositionalParams,0}},
+        /* 44:	(cPow [z@D16 (cAdd (cPow [(cLog [z]) -1]) <1>)@D16])
+         *	->	(cMul {2.71828182846 (cPow [z (cAdd  <1>)])})
+         */		 {ProduceNewTree, false, 1,P1(S(277))              , {2,P2(P(29),S(255))        , cPow        ,PositionalParams,0}},
+        /* 45:	(cPow [% (cAdd &@M <1>)])
+         *	->	(cMul {POW( % & ) (cPow [% (cAdd  <1>)])})
+         */		 {ProduceNewTree, false, 1,P1(S(320))              , {2,P2(P(1),S(249))         , cPow        ,PositionalParams,0}},
+        /* 46:	(cPow [(cPow [x y@O]) z])
+         *	:	x (cMul {y z})
+         */		 {ReplaceParams , false, 2,P2(P(14),S(287))        , {2,P2(S(90),P(28))         , cPow        ,PositionalParams,0}},
+        /* 47:	(cPow [(cPow [x y@F]) z])
+         *	:	x (cMul {y z})
+         */		 {ReplaceParams , false, 2,P2(P(14),S(287))        , {2,P2(S(91),P(28))         , cPow        ,PositionalParams,0}},
+        /* 48:	(cPow [(cPow [x@P y]) z])
+         *	:	x (cMul {y z})
+         */		 {ReplaceParams , false, 2,P2(P(14),S(287))        , {2,P2(S(92),P(28))         , cPow        ,PositionalParams,0}},
+        /* 49:	(cPow [(cPow [x y])@P z])
+         *	:	(cAbs [x]) (cMul {y z})
+         */		 {ReplaceParams , false, 2,P2(S(0),S(287))         , {2,P2(S(93),P(28))         , cPow        ,PositionalParams,0}},
+        /* 50:	(cPow [(cSin [x]) %@N])
+         *	:	(cCsc [x]) -%
+         */		 {ReplaceParams , false, 2,P2(S(28),S(194))        , {2,P2(S(158),P(0))         , cPow        ,PositionalParams,0}},
+        /* 51:	(cPow [(cCos [x]) %@N])
+         *	:	(cSec [x]) -%
+         */		 {ReplaceParams , false, 2,P2(S(157),S(194))       , {2,P2(S(14),P(0))          , cPow        ,PositionalParams,0}},
+        /* 52:	(cPow [(cTan [x]) %@N])
+         *	:	(cCot [x]) -%
+         */		 {ReplaceParams , false, 2,P2(S(27),S(194))        , {2,P2(S(177),P(0))         , cPow        ,PositionalParams,0}},
+        /* 53:	(cPow [% (cLog [x])])
+         *	:	x LOG( % )
+         */		 {ReplaceParams , false, 2,P2(P(14),S(53))         , {2,P2(P(1),S(47))          , cPow        ,PositionalParams,0}},
+        /* 54:	(cPow [% (cMul (cLog [x]) <1>)])
+         *	:	x (cMul LOG( % ) <1>)
+         */		 {ReplaceParams , false, 2,P2(P(14),S(349))        , {2,P2(P(1),S(348))         , cPow        ,PositionalParams,0}},
+        /* 55:	(cPow [z@D16 (cMul (cPow [(cLog [z]) -1]) (cLog [x]) <1>)@D16])
+         *	:	x (cMul  <1>)
+         */		 {ReplaceParams , false, 2,P2(P(14),S(331))        , {2,P2(P(29),S(360))        , cPow        ,PositionalParams,0}},
+        /* 56:	(cPow [%@D1 (cMul /LOG( % ) (cLog [x]) <1>)@D1])
+         *	:	x (cMul  <1>)
+         */		 {ReplaceParams , false, 2,P2(P(14),S(331))        , {2,P2(P(3),S(361))         , cPow        ,PositionalParams,0}},
+        /* 57:	(cPow [(cPow [x y]) z@I])
+         *	:	x (cMul {y z})
+         */		 {ReplaceParams , false, 2,P2(P(14),S(287))        , {2,P2(S(105),P(30))        , cPow        ,PositionalParams,0}},
+        /* 58:	(cPow [(cAbs [x]) y@E])
+         *	:	x y
+         */		 {ReplaceParams , false, 2,P2(P(14),P(21))         , {2,P2(S(0),P(26))          , cPow        ,PositionalParams,0}},
+        /* 59:	(cPow [(cMul (cAbs [x]) <1>) y@E])
+         *	:	(cMul x <1>) y
+         */		 {ReplaceParams , false, 2,P2(S(345),P(21))        , {2,P2(S(347),P(26))        , cPow        ,PositionalParams,0}},
+        /* 60:	(cSin [(cMul -1 <1>)])
+         *	->	(cMul {-1 (cSin [(cMul  <1>)])})
+         */		 {ProduceNewTree, false, 1,P1(S(272))              , {1,P1(S(333))              , cSin        ,PositionalParams,0}},
+        /* 61:	(cSin [(cAdd {1.57079632679 (cMul %@N <1>)})])
+         *	->	(cCos [(cMul -% <1>)])
+         */		 {ProduceNewTree, false, 1,P1(S(21))               , {1,P1(S(214))              , cSin        ,PositionalParams,0}},
+        /* 62:	(cSin [(cAdd -1.57079632679 <1>)])
+         *	->	(cMul {-1 (cCos [(cAdd  <1>)])})
+         */		 {ProduceNewTree, false, 1,P1(S(265))              , {1,P1(S(245))              , cSin        ,PositionalParams,0}},
+        /* 63:	(cSin [(cAsin [x])])
+         *	->	x
+         */		 {ProduceNewTree, false, 1,P1(P(14))               , {1,P1(S(5))                , cSin        ,PositionalParams,0}},
+        /* 64:	(cSinh [(cMul -1 <1>)])
+         *	->	(cMul {-1 (cSinh [(cMul  <1>)])})
+         */		 {ProduceNewTree, false, 1,P1(S(274))              , {1,P1(S(333))              , cSinh       ,PositionalParams,0}},
+        /* 65:	(cSinh [(cAcosh [x])])
+         *	->	(cPow [(cAdd {(cPow [x 2]) -1}) 0.5])
+         */		 {ProduceNewTree, false, 1,P1(S(148))              , {1,P1(S(4))                , cSinh       ,PositionalParams,0}},
+        /* 66:	(cTan [(cMul -1 <1>)])
+         *	->	(cMul {-1 (cTan [(cMul  <1>)])})
+         */		 {ProduceNewTree, false, 1,P1(S(275))              , {1,P1(S(333))              , cTan        ,PositionalParams,0}},
+        /* 67:	(cTan [(cAtan [x])])
+         *	->	x
+         */		 {ProduceNewTree, false, 1,P1(P(14))               , {1,P1(S(8))                , cTan        ,PositionalParams,0}},
+        /* 68:	(cTan [(cAtan2 [x y])])
+         *	->	(cMul {x (cPow [y -1])})
+         */		 {ProduceNewTree, false, 1,P1(S(284))              , {1,P1(S(9))                , cTan        ,PositionalParams,0}},
+        /* 69:	(cTanh [(cMul -1 <1>)])
+         *	->	(cMul {-1 (cTanh [(cMul  <1>)])})
+         */		 {ProduceNewTree, false, 1,P1(S(276))              , {1,P1(S(333))              , cTanh       ,PositionalParams,0}},
+        /* 70:	(cTrunc [x@I])
+         *	->	x
+         */		 {ProduceNewTree, false, 1,P1(P(14))               , {1,P1(P(16))               , cTrunc      ,PositionalParams,0}},
+        /* 71:	(cAdd (cPow [(cAdd {1 (cPow [(cAdd  <1>) 2])}) 0.5]) <1>)
+         *	->	(cPow [2.71828182846 (cAsinh [(cAdd  <1>)])])
+         */		 {ProduceNewTree, false, 1,P1(S(72))               , {1,P1(S(145))              , cAdd        ,AnyParams       ,1}},
+        /* 72:	(cAdd (cPow [(cAdd {1 (cPow [(cAdd  <1>) 2])}) -0.5]) <1>)
+         *	->	(cPow [0.367879441171 (cAsinh [(cAdd  <1>)])])
+         */		 {ProduceNewTree, false, 1,P1(S(71))               , {1,P1(S(144))              , cAdd        ,AnyParams       ,1}},
+        /* 73:	(cAdd (cPow [(cAdd {1 (cPow [x 2])}) 0.5])@D4 x@D4)
+         *	:	(cPow [2.71828182846 (cAsinh [x])])
+         */		 {ReplaceParams , false, 1,P1(S(70))               , {2,P2(S(143),P(15))        , cAdd        ,AnyParams       ,0}},
+        /* 74:	(cAdd (cPow [(cAdd {1 (cPow [x 2])}) -0.5])@D4 x@D4)
+         *	:	(cPow [0.367879441171 (cAsinh [x])])
+         */		 {ReplaceParams , false, 1,P1(S(69))               , {2,P2(S(142),P(15))        , cAdd        ,AnyParams       ,0}},
+        /* 75:	(cAdd (cIf [x y z])@D4 (cIf [x a b])@D4)
+         *	:	(cIf [x (cAdd {y a}) (cAdd {z b})])
+         */		 {ReplaceParams , false, 1,P1(S(41))               , {2,P2(S(32),S(36))         , cAdd        ,AnyParams       ,0}},
+        /* 76:	(cAdd (cLog [x]) (cLog [y]))
+         *	:	(cLog [(cMul {x y})])
+         */		 {ReplaceParams , false, 1,P1(S(51))               , {2,P2(S(47),S(48))         , cAdd        ,AnyParams       ,0}},
+        /* 77:	(cAdd (cMul (cPow [x %@I@P]) <1>)@D4 (cMul (cPow [x &@I]) <2>)@D4)
+         *	:	(cMul {(cPow [x MIN( % & )]) (cAdd {(cMul (cPow [x (cAdd {% -MIN( % & )})]) <1>) (cMul (cPow [x (cAdd {& -MIN( % & )})]) <2>)})})
+         */		 {ReplaceParams , false, 1,P1(S(327))              , {2,P2(S(350),S(351))       , cAdd        ,AnyParams       ,0}},
+        /* 78:	(cAdd (cMul (cPow [x %@I@P]) <1>)@D4 (cMul x <2>)@D4)
+         *	:	(cMul {(cPow [x MIN( % 1 )]) (cAdd {(cMul (cPow [x (cAdd {% -MIN( % 1 )})]) <1>) (cMul (cPow [x (cAdd {1 -MIN( % 1 )})]) <2>)})})
+         */		 {ReplaceParams , false, 1,P1(S(326))              , {2,P2(S(350),S(344))       , cAdd        ,AnyParams       ,0}},
+        /* 79:	(cAdd (cMul %@P <1>)@D1 (cMul -% <2>)@D1)
+         *	:	(cMul {% (cAdd (cMul -1 <2>) <1>)})
+         */		 {ReplaceParams , false, 1,P1(S(282))              , {2,P2(S(337),S(359))       , cAdd        ,AnyParams       ,0}},
+        /* 80:	(cAdd %@M@D1 (cMul -% <2>)@D1)
+         *	:	(cMul {% (cAdd {1 (cMul -1 <2>)})})
+         */		 {ReplaceParams , false, 1,P1(S(281))              , {2,P2(P(5),S(359))         , cAdd        ,AnyParams       ,0}},
+        /* 81:	(cAdd (cPow [(cSin [x]) 2])@D4 (cPow [(cCos [x]) 2])@D4)
+         *	:	1
+         */		 {ReplaceParams , false, 1,P1(N(10))               , {2,P2(S(140),S(117))       , cAdd        ,AnyParams       ,0}},
+        /* 82:	(cAdd 1 (cMul {-1 (cPow [(cSin [x]) 2])}))
+         *	:	(cPow [(cCos [x]) 2])
+         */		 {ReplaceParams , false, 1,P1(S(118))              , {2,P2(N(10),S(270))        , cAdd        ,AnyParams       ,0}},
+        /* 83:	(cAdd 1 (cMul {-1 (cPow [(cCos [x]) 2])}))
+         *	:	(cPow [(cSin [x]) 2])
+         */		 {ReplaceParams , false, 1,P1(S(141))              , {2,P2(N(10),S(269))        , cAdd        ,AnyParams       ,0}},
+        /* 84:	(cAdd (cMul {(cSin [x]) (cCos [y])})@D12 (cMul {(cCos [x]) (cSin [y])})@D12)
+         *	:	(cSin [(cAdd {x y})])
+         */		 {ReplaceParams , false, 1,P1(S(161))              , {2,P2(S(318),S(315))       , cAdd        ,AnyParams       ,0}},
+        /* 85:	(cAdd (cMul {(cSin [x]) (cCos [y])})@D12 (cMul {(cCos [x]) (cSin [y]) -1})@D12)
+         *	:	(cSin [(cAdd {x (cMul {-1 y})})])
+         */		 {ReplaceParams , false, 1,P1(S(162))              , {2,P2(S(318),S(324))       , cAdd        ,AnyParams       ,0}},
+        /* 86:	(cAdd (cMul {(cCos [x]) (cCos [y])})@D12 (cMul {(cSin [x]) (cSin [y])})@D12)
+         *	:	(cCos [(cAdd {x y})])
+         */		 {ReplaceParams , false, 1,P1(S(17))               , {2,P2(S(302),S(323))       , cAdd        ,AnyParams       ,0}},
+        /* 87:	(cAdd (cMul {(cCos [x]) (cCos [y]) -1})@D12 (cMul {(cSin [x]) (cSin [y])})@D12)
+         *	:	(cMul {-1 (cCos [(cAdd {x (cMul {-1 y})})])})
+         */		 {ReplaceParams , false, 1,P1(S(264))              , {2,P2(S(314),S(323))       , cAdd        ,AnyParams       ,0}},
+        /* 88:	(cAdd (cMul {(cCos [x]) (cCos [y])})@D12 (cMul {(cSin [x]) (cSin [y]) -1})@D12)
+         *	:	(cCos [(cAdd {x (cMul {-1 y})})])
+         */		 {ReplaceParams , false, 1,P1(S(18))               , {2,P2(S(302),S(325))       , cAdd        ,AnyParams       ,0}},
+        /* 89:	(cAdd (cPow [& x])@D6 (cMul {-1 (cPow [/& x])})@D6)
+         *	:	(cMul {(cSinh [(cLog [(cPow [& x])])]) 2})
+         */		 {ReplaceParams , false, 1,P1(S(311))              , {2,P2(S(82),S(271))        , cAdd        ,AnyParams       ,0}},
+        /* 90:	(cAdd (cPow [& x])@D6 (cPow [/& x])@D6)
+         *	:	(cMul {(cCosh [(cLog [(cPow [& x])])]) 2})
+         */		 {ReplaceParams , false, 1,P1(S(310))              , {2,P2(S(82),S(154))        , cAdd        ,AnyParams       ,0}},
+        /* 91:	(cAdd (cMul {-1 (cPow [& x])})@D6 (cPow [/& x])@D6)
+         *	:	(cMul {(cSinh [(cMul {x LOG( & )})]) -2})
+         */		 {ReplaceParams , false, 1,P1(S(309))              , {2,P2(S(268),S(154))       , cAdd        ,AnyParams       ,0}},
+        /* 92:	(cAdd (cMul {% (cPow [& x])})@D7 (cMul {-% (cPow [/& x])})@D7)
+         *	:	(cMul {(cSinh [(cMul {x LOG( & )})]) 2 %})
+         */		 {ReplaceParams , false, 1,P1(S(312))              , {2,P2(S(291),S(313))       , cAdd        ,AnyParams       ,0}},
+        /* 93:	(cAdd (cMul {% (cPow [& x])})@D7 (cMul {% (cPow [/& x])})@D7)
+         *	:	(cMul {(cCosh [(cMul {x LOG( & )})]) 2 %})
+         */		 {ReplaceParams , false, 1,P1(S(308))              , {2,P2(S(291),S(292))       , cAdd        ,AnyParams       ,0}},
+        /* 94:	(cAdd (cCosh [x])@D4 (cSinh [x])@D4)
+         *	:	(cPow [2.71828182846 x])
+         */		 {ReplaceParams , false, 1,P1(S(67))               , {2,P2(S(22),S(169))        , cAdd        ,AnyParams       ,0}},
+        /* 95:	(cAdd (cMul {(cCosh [x]) -1})@D4 (cSinh [x])@D4)
+         *	:	(cMul {(cPow [0.367879441171 x]) -1})
+         */		 {ReplaceParams , false, 1,P1(S(304))              , {2,P2(S(297),S(169))       , cAdd        ,AnyParams       ,0}},
+        /* 96:	(cAdd (cCosh [x])@D4 (cMul {(cPow [2.71828182846 x]) -1})@D4)
+         *	:	(cMul {-1 (cSinh [x])})
+         */		 {ReplaceParams , false, 1,P1(S(273))              , {2,P2(S(22),S(306))        , cAdd        ,AnyParams       ,0}},
+        /* 97:	(cAdd (cSinh [x])@D4 (cMul {(cPow [2.71828182846 x]) -1})@D4)
+         *	:	(cMul {-1 (cCosh [x])})
+         */		 {ReplaceParams , false, 1,P1(S(266))              , {2,P2(S(169),S(306))       , cAdd        ,AnyParams       ,0}},
+        /* 98:	(cAdd (cCosh [x])@D4 (cMul {(cSinh [x]) -1})@D4)
+         *	:	(cPow [0.367879441171 x])
+         */		 {ReplaceParams , false, 1,P1(S(65))               , {2,P2(S(22),S(307))        , cAdd        ,AnyParams       ,0}},
+        /* 99:	(cAdd (cMul {(cSinh [x]) -1})@D4 (cPow [2.71828182846 x])@D4)
+         *	:	(cCosh [x])
+         */		 {ReplaceParams , false, 1,P1(S(23))               , {2,P2(S(307),S(68))        , cAdd        ,AnyParams       ,0}},
+        /* 100:	(cAdd (cMul {(cCosh [x]) -1})@D4 (cPow [2.71828182846 x])@D4)
+         *	:	(cSinh [x])
+         */		 {ReplaceParams , false, 1,P1(S(170))              , {2,P2(S(297),S(68))        , cAdd        ,AnyParams       ,0}},
+        /* 101:	(cAdd (cCosh [x])@D4 (cMul {(cPow [0.367879441171 x]) -1})@D4)
+         *	:	(cSinh [x])
+         */		 {ReplaceParams , false, 1,P1(S(170))              , {2,P2(S(22),S(305))        , cAdd        ,AnyParams       ,0}},
+        /* 102:	(cAdd (cSinh [x])@D4 (cPow [0.367879441171 x])@D4)
+         *	:	(cCosh [x])
+         */		 {ReplaceParams , false, 1,P1(S(23))               , {2,P2(S(169),S(66))        , cAdd        ,AnyParams       ,0}},
+        /* 103:	(cAdd (cMul {(cCosh [x]) -1})@D4 (cPow [0.367879441171 x])@D4)
+         *	:	(cMul {-1 (cSinh [x])})
+         */		 {ReplaceParams , false, 1,P1(S(273))              , {2,P2(S(297),S(66))        , cAdd        ,AnyParams       ,0}},
+        /* 104:	(cMul {%@D1 (cAdd {1 (cMul {(cLog [x]) /%})})@D1})
+         *	->	(cAdd {(cLog [x]) %})
+         */		 {ProduceNewTree, false, 1,P1(S(225))              , {2,P2(P(3),S(211))         , cMul        ,SelectedParams  ,0}},
+        /* 105:	(cMul x@L <1>)
+         *	->	(cAbsIf [x (cMul  <1>) 0])
+         */		 {ProduceNewTree, false, 1,P1(S(415))              , {1,P1(P(19))               , cMul        ,AnyParams       ,1}},
+        /* 106:	(cMul 57.2957795131 <1>)
+         *	->	(cDeg [(cMul  <1>)])
+         */		 {ProduceNewTree, false, 1,P1(S(405))              , {1,P1(N(16))               , cMul        ,AnyParams       ,1}},
+        /* 107:	(cMul 0.0174532925199 <1>)
+         *	->	(cRad [(cMul  <1>)])
+         */		 {ProduceNewTree, false, 1,P1(S(406))              , {1,P1(N(5))                , cMul        ,AnyParams       ,1}},
+        /* 108:	(cMul (cPow [(cMul x <2>) -1])@D4 x@D4)
+         *	:	(cPow [(cMul  <2>) -1])
+         */		 {ReplaceParams , false, 1,P1(S(138))              , {2,P2(S(139),P(15))        , cMul        ,AnyParams       ,0}},
+        /* 109:	(cMul (cIf [x y z])@D4 (cIf [x a b])@D4)
+         *	:	(cIf [x (cMul {y a}) (cMul {z b})])
+         */		 {ReplaceParams , false, 1,P1(S(42))               , {2,P2(S(32),S(36))         , cMul        ,AnyParams       ,0}},
+        /* 110:	(cMul (cNot [x]) (cNot [y]))
+         *	:	(cNot [(cOr {x y})])
+         */		 {ReplaceParams , false, 1,P1(S(382))              , {2,P2(S(375),S(376))       , cMul        ,AnyParams       ,0}},
+        /* 111:	(cMul (cNotNot [x]) (cNotNot [y]))
+         *	:	(cAnd {x y})
+         */		 {ReplaceParams , false, 1,P1(S(385))              , {2,P2(S(399),S(400))       , cMul        ,AnyParams       ,0}},
+        /* 112:	(cMul (cNot [x]) (cNotNot [y]))
+         *	:	(cAnd {(cNot [x]) y})
+         */		 {ReplaceParams , false, 1,P1(S(390))              , {2,P2(S(375),S(400))       , cMul        ,AnyParams       ,0}},
+        /* 113:	(cMul (cAbs [x]) (cAbs [y]))
+         *	:	(cAbs [(cMul {x y})])
+         */		 {ReplaceParams , false, 1,P1(S(2))                , {2,P2(S(0),S(1))           , cMul        ,AnyParams       ,0}},
+        /* 114:	(cMul (cAdd (cMul %@M <1>) <2>) &)
+         *	:	(cAdd {(cMul % & <1>) (cMul {& (cAdd  <2>)})})
+         */		 {ReplaceParams , false, 1,P1(S(238))              , {2,P2(S(257),P(9))         , cMul        ,AnyParams       ,0}},
+        /* 115:	(cMul (cAdd %@M <1>) &)
+         *	:	(cAdd {MUL( % & ) (cMul {& (cAdd  <1>)})})
+         */		 {ReplaceParams , false, 1,P1(S(239))              , {2,P2(S(247),P(9))         , cMul        ,AnyParams       ,0}},
+        /* 116:	(cMul (cPow [x y])@D4 (cAdd {%@1 (cPow [x z])})@D4)
+         *	:	(cAdd {(cMul {(cPow [x y]) %}) (cPow [x (cAdd {y z})])})
+         */		 {ReplaceParams , false, 1,P1(S(233))              , {2,P2(S(94),S(217))        , cMul        ,AnyParams       ,0}},
+        /* 117:	(cMul (cPow [& y]) (cAdd {1 (cPow [x@P z])}))
+         *	:	(cAdd {(cPow [& y]) (cPow [& (cAdd {y (cMul {z (cLog [x]) /LOG( & )})})])})
+         */		 {ReplaceParams , false, 1,P1(S(229))              , {2,P2(S(84),S(206))        , cMul        ,AnyParams       ,0}},
+        /* 118:	(cMul (cPow [& y]) (cAdd {-1 (cPow [x@P z])}))
+         *	:	(cAdd {(cMul {(cPow [& y]) -1}) (cPow [& (cAdd {y (cMul {z (cLog [x]) /LOG( & )})})])})
+         */		 {ReplaceParams , false, 1,P1(S(232))              , {2,P2(S(84),S(204))        , cMul        ,AnyParams       ,0}},
+        /* 119:	(cMul -1 (cSin [(cMul %@N <1>)]))
+         *	:	(cSin [(cMul -% <1>)])
+         */		 {ReplaceParams , false, 1,P1(S(168))              , {2,P2(N(2),S(166))         , cMul        ,AnyParams       ,0}},
+        /* 120:	(cMul -1 (cSinh [(cMul %@N <1>)]))
+         *	:	(cSinh [(cMul -% <1>)])
+         */		 {ReplaceParams , false, 1,P1(S(176))              , {2,P2(N(2),S(175))         , cMul        ,AnyParams       ,0}},
+        /* 121:	(cMul (cPow [(cSinh [x]) -1])@D4 (cCosh [x])@D4)
+         *	:	(cPow [(cTanh [x]) -1])
+         */		 {ReplaceParams , false, 1,P1(S(133))              , {2,P2(S(130),S(22))        , cMul        ,AnyParams       ,0}},
+        /* 122:	(cMul (cTanh [x])@D4 (cCosh [x])@D4)
+         *	:	(cSinh [x])
+         */		 {ReplaceParams , false, 1,P1(S(170))              , {2,P2(S(187),S(22))        , cMul        ,AnyParams       ,0}},
+        /* 123:	(cMul (cPow [(cTanh [x]) -1])@D4 (cSinh [x])@D4)
+         *	:	(cCosh [x])
+         */		 {ReplaceParams , false, 1,P1(S(23))               , {2,P2(S(134),S(169))       , cMul        ,AnyParams       ,0}},
+        /* 124:	(cMul (cPow [(cTan [x]) -1])@D4 (cSin [x])@D4)
+         *	:	(cCos [x])
+         */		 {ReplaceParams , false, 1,P1(S(14))               , {2,P2(S(131),S(159))       , cMul        ,AnyParams       ,0}},
+        /* 125:	(cMul (cSin [x])@D4 (cPow [(cCos [x]) -1])@D4)
+         *	:	(cTan [x])
+         */		 {ReplaceParams , false, 1,P1(S(177))              , {2,P2(S(159),S(111))       , cMul        ,AnyParams       ,0}},
+        /* 126:	(cMul (cTan [x])@D4 (cPow [(cSin [x]) -1])@D4)
+         *	:	(cPow [(cCos [x]) -1])
+         */		 {ReplaceParams , false, 1,P1(S(112))              , {2,P2(S(178),S(129))       , cMul        ,AnyParams       ,0}},
+        /* 127:	(cMul (cPow [(cSin [x]) -1])@D4 (cCos [x])@D4)
+         *	:	(cPow [(cTan [x]) -1])
+         */		 {ReplaceParams , false, 1,P1(S(132))              , {2,P2(S(129),S(15))        , cMul        ,AnyParams       ,0}},
+        /* 128:	(cMul (cTan [x])@D4 (cCos [x])@D4)
+         *	:	(cSin [x])
+         */		 {ReplaceParams , false, 1,P1(S(158))              , {2,P2(S(178),S(15))        , cMul        ,AnyParams       ,0}},
+        /* 129:	(cMul (cTan [(cAdd {1.57079632679 (cMul {-1 x})})])@D4 (cTan [x])@D4)
+         *	:	1
+         */		 {ReplaceParams , false, 1,P1(N(10))               , {2,P2(S(179),S(178))       , cMul        ,AnyParams       ,0}},
+        /* 130:	(cMul (cSin [(cMul % <1>)])@D1 (cPow [(cCos [(cMul -% <1>)]) -1])@D1)
+         *	:	(cTan [(cMul % <1>)])
+         */		 {ReplaceParams , false, 1,P1(S(183))              , {2,P2(S(167),S(114))       , cMul        ,AnyParams       ,0}},
+        /* 131:	(cMul (cTan [(cAdd {1.57079632679 (cMul -1 <1>)})]) (cTan [(cMul  <1>)]))
+         *	:	1
+         */		 {ReplaceParams , false, 1,P1(N(10))               , {2,P2(S(180),S(182))       , cMul        ,AnyParams       ,0}},
+        /* 132:	(cMul -1 (cTan [(cMul %@N <1>)]))
+         *	:	(cTan [(cMul -% <1>)])
+         */		 {ReplaceParams , false, 1,P1(S(185))              , {2,P2(N(2),S(184))         , cMul        ,AnyParams       ,0}},
+        /* 133:	(cMul (cSinh [x])@D4 (cPow [(cCosh [x]) -1])@D4)
+         *	:	(cTanh [x])
+         */		 {ReplaceParams , false, 1,P1(S(186))              , {2,P2(S(169),S(115))       , cMul        ,AnyParams       ,0}},
+        /* 134:	(cMul (cTanh [x])@D4 (cPow [(cSinh [x]) -1])@D4)
+         *	:	(cPow [(cCosh [x]) -1])
+         */		 {ReplaceParams , false, 1,P1(S(116))              , {2,P2(S(187),S(130))       , cMul        ,AnyParams       ,0}},
+        /* 135:	(cMul (cSinh [(cMul {% x})])@D5 (cPow [(cCosh [(cMul {-% x})]) -1])@D5)
+         *	:	(cTanh [(cMul {% x})])
+         */		 {ReplaceParams , false, 1,P1(S(188))              , {2,P2(S(172),S(121))       , cMul        ,AnyParams       ,0}},
+        /* 136:	(cMul (cSin [(cMul {% x})])@D5 (cPow [(cCos [(cMul {-% x})]) -1])@D5)
+         *	:	(cTan [(cMul {% x})])
+         */		 {ReplaceParams , false, 1,P1(S(181))              , {2,P2(S(164),S(113))       , cMul        ,AnyParams       ,0}},
+        /* 137:	(cMul -1 (cTanh [(cMul %@N <1>)]))
+         *	:	(cTanh [(cMul -% <1>)])
+         */		 {ReplaceParams , false, 1,P1(S(192))              , {2,P2(N(2),S(191))         , cMul        ,AnyParams       ,0}},
+        /* 138:	(cMul (cAdd {-1 (cPow [% x])})@D5 (cPow [(cAdd {1 (cPow [% x])}) -1])@D5)
+         *	:	(cTanh [(cMul {x LOG( % ) 0.5})])
+         */		 {ReplaceParams , false, 1,P1(S(189))              , {2,P2(S(198),S(137))       , cMul        ,AnyParams       ,0}},
+        /* 139:	(cMul (cAdd {1 (cPow [% x])})@D5 (cPow [(cAdd {-1 (cPow [% x])}) -1])@D5)
+         *	:	(cPow [(cTanh [(cMul {x LOG( % ) 0.5})]) -1])
+         */		 {ReplaceParams , false, 1,P1(S(135))              , {2,P2(S(202),S(136))       , cMul        ,AnyParams       ,0}},
+        /* 140:	(cMul (cLog [x]) 0.434294481903)
+         *	:	(cLog10 [x])
+         */		 {ReplaceParams , false, 1,P1(S(55))               , {2,P2(S(47),N(7))          , cMul        ,AnyParams       ,0}},
+        /* 141:	(cMul (cPow [(cLog [x]) -1]) 2.30258509299)
+         *	:	(cPow [(cLog10 [x]) -1])
+         */		 {ReplaceParams , false, 1,P1(S(124))              , {2,P2(S(122),N(14))        , cMul        ,AnyParams       ,0}},
+        /* 142:	(cMul (cLog [x]) 1.44269504089)
+         *	:	(cLog2 [x])
+         */		 {ReplaceParams , false, 1,P1(S(56))               , {2,P2(S(47),N(11))         , cMul        ,AnyParams       ,0}},
+        /* 143:	(cMul (cPow [(cLog [x]) -1]) 0.69314718056)
+         *	:	(cPow [(cLog2 [x]) -1])
+         */		 {ReplaceParams , false, 1,P1(S(125))              , {2,P2(S(122),N(9))         , cMul        ,AnyParams       ,0}},
+        /* 144:	(cMul (cPow [& y]) (cAdd {(cMul {% (cPow [x@P z])})@D1 %@D1}))
+         *	:	% (cAdd {(cPow [& y]) (cPow [& (cAdd {y (cMul {z (cLog [x]) /LOG( & )})})])})
+         */		 {ReplaceParams , false, 2,P2(P(1),S(229))         , {2,P2(S(84),S(227))        , cMul        ,AnyParams       ,0}},
+        /* 145:	(cMul (cPow [& y]) (cAdd {(cMul {% (cPow [x@P z])})@D1 -%@D1}))
+         *	:	% (cAdd {(cMul {(cPow [& y]) -1}) (cPow [& (cAdd {y (cMul {z (cLog [x]) /LOG( & )})})])})
+         */		 {ReplaceParams , false, 2,P2(P(1),S(232))         , {2,P2(S(84),S(231))        , cMul        ,AnyParams       ,0}},
+        /* 146:	(cMul (cSinh [x])@D4 (cPow [(cCosh [x]) %])@D4)
+         *	:	(cTanh [x]) (cPow [(cCosh [x]) ADD( % 1 )])
+         */		 {ReplaceParams , false, 2,P2(S(186),S(120))       , {2,P2(S(169),S(119))       , cMul        ,AnyParams       ,0}},
+        /* 147:	@L (cMul (cAbs [x]))
+         *	:	x
+         */		 {ReplaceParams , true , 1,P1(P(14))               , {1,P1(S(0))                , cMul        ,AnyParams       ,0}},
+        /* 148:	@L (cMul %@N)
+         *	:	-%
+         */		 {ReplaceParams , true , 1,P1(S(194))              , {1,P1(P(0))                , cMul        ,AnyParams       ,0}},
+        /* 149:	(cEqual [(cAbs [x]) 0])
+         *	:	x 0
+         */		 {ReplaceParams , false, 2,P2(P(14),N(4))          , {2,P2(S(0),N(4))           , cEqual      ,PositionalParams,0}},
+        /* 150:	(cEqual [(cAdd % <1>) &])
+         *	:	(cAdd  <1>) ADD( & -% )
+         */		 {ReplaceParams , false, 2,P2(S(242),S(260))       , {2,P2(S(248),P(9))         , cEqual      ,PositionalParams,0}},
+        /* 151:	(cEqual [(cMul % <1>) &])
+         *	:	(cMul  <1>) MUL( & /% )
+         */		 {ReplaceParams , false, 2,P2(S(331),S(363))       , {2,P2(S(339),P(9))         , cEqual      ,PositionalParams,0}},
+        /* 152:	(cEqual [(cPow [x %]) &])
+         *	:	(cPow [(cPow [x %]) /%]) POW( & /% )
+         */		 {ReplaceParams , false, 2,P2(S(126),S(156))       , {2,P2(S(77),P(9))          , cEqual      ,PositionalParams,0}},
+        /* 153:	(cEqual [(cAdd % <1>) (cAdd & <2>)])
+         *	:	(cAdd  <1>) (cAdd & -% <2>)
+         */		 {ReplaceParams , false, 2,P2(S(242),S(254))       , {2,P2(S(248),S(250))       , cEqual      ,PositionalParams,0}},
+        /* 154:	(cEqual [(cAdd x <1>)@D4 (cAdd x <2>)@D4])
+         *	:	(cAdd  <1>) (cAdd  <2>)
+         */		 {ReplaceParams , false, 2,P2(S(242),S(243))       , {2,P2(S(251),S(252))       , cEqual      ,PositionalParams,0}},
+        /* 155:	(cEqual [(cMul % <1>) (cMul & <2>)])
+         *	:	(cMul  <1>) (cMul & /% <2>)
+         */		 {ReplaceParams , false, 2,P2(S(331),S(342))       , {2,P2(S(339),S(340))       , cEqual      ,PositionalParams,0}},
+        /* 156:	(cEqual [(cPow [%@P x]) &@P])
+         *	:	x MUL( LOG( & ) /LOG( % ) )
+         */		 {ReplaceParams , false, 2,P2(P(14),S(364))        , {2,P2(S(81),P(13))         , cEqual      ,PositionalParams,0}},
+        /* 157:	(cEqual [(cPow [x %@P]) (cPow [y &@P])])
+         *	:	(cPow [(cPow [x %]) /MIN( % & )]) (cPow [(cPow [y &]) /MIN( % & )])
+         */		 {ReplaceParams , false, 2,P2(S(127),S(128))       , {2,P2(S(78),S(79))         , cEqual      ,PositionalParams,0}},
+        /* 158:	(cEqual [(cPow [% x])@D1 (cPow [% y])@D1])
+         *	:	x y
+         */		 {ReplaceParams , false, 2,P2(P(14),P(21))         , {2,P2(S(75),S(76))         , cEqual      ,PositionalParams,0}},
+        /* 159:	(cNEqual [(cAbs [x]) 0])
+         *	:	x 0
+         */		 {ReplaceParams , false, 2,P2(P(14),N(4))          , {2,P2(S(0),N(4))           , cNEqual     ,PositionalParams,0}},
+        /* 160:	(cNEqual [(cAdd % <1>) &])
+         *	:	(cAdd  <1>) ADD( & -% )
+         */		 {ReplaceParams , false, 2,P2(S(242),S(260))       , {2,P2(S(248),P(9))         , cNEqual     ,PositionalParams,0}},
+        /* 161:	(cNEqual [(cMul % <1>) &])
+         *	:	(cMul  <1>) MUL( & /% )
+         */		 {ReplaceParams , false, 2,P2(S(331),S(363))       , {2,P2(S(339),P(9))         , cNEqual     ,PositionalParams,0}},
+        /* 162:	(cNEqual [(cPow [x %]) &])
+         *	:	(cPow [(cPow [x %]) /%]) POW( & /% )
+         */		 {ReplaceParams , false, 2,P2(S(126),S(156))       , {2,P2(S(77),P(9))          , cNEqual     ,PositionalParams,0}},
+        /* 163:	(cNEqual [(cAdd % <1>) (cAdd & <2>)])
+         *	:	(cAdd  <1>) (cAdd & -% <2>)
+         */		 {ReplaceParams , false, 2,P2(S(242),S(254))       , {2,P2(S(248),S(250))       , cNEqual     ,PositionalParams,0}},
+        /* 164:	(cNEqual [(cAdd x <1>)@D4 (cAdd x <2>)@D4])
+         *	:	(cAdd  <1>) (cAdd  <2>)
+         */		 {ReplaceParams , false, 2,P2(S(242),S(243))       , {2,P2(S(251),S(252))       , cNEqual     ,PositionalParams,0}},
+        /* 165:	(cNEqual [(cMul % <1>) (cMul & <2>)])
+         *	:	(cMul  <1>) (cMul & /% <2>)
+         */		 {ReplaceParams , false, 2,P2(S(331),S(342))       , {2,P2(S(339),S(340))       , cNEqual     ,PositionalParams,0}},
+        /* 166:	(cNEqual [(cPow [%@P x]) &@P])
+         *	:	x MUL( LOG( & ) /LOG( % ) )
+         */		 {ReplaceParams , false, 2,P2(P(14),S(364))        , {2,P2(S(81),P(13))         , cNEqual     ,PositionalParams,0}},
+        /* 167:	(cNEqual [(cPow [x %@P]) (cPow [y &@P])])
+         *	:	(cPow [(cPow [x %]) /MIN( % & )]) (cPow [(cPow [y &]) /MIN( % & )])
+         */		 {ReplaceParams , false, 2,P2(S(127),S(128))       , {2,P2(S(78),S(79))         , cNEqual     ,PositionalParams,0}},
+        /* 168:	(cNEqual [(cPow [% x])@D1 (cPow [% y])@D1])
+         *	:	x y
+         */		 {ReplaceParams , false, 2,P2(P(14),P(21))         , {2,P2(S(75),S(76))         , cNEqual     ,PositionalParams,0}},
+        /* 169:	(cLess [x 0.5])
+         *	->	(cAbsNot [x])
+         */		 {ProduceNewTree, false, 1,P1(S(409))              , {2,P2(P(14),N(8))          , cLess       ,PositionalParams,0}},
+        /* 170:	(cLess [(cAbs [x]) %])
+         *	->	(cNot [(cMul {x 0.5 /%})])
+         */		 {ProduceNewTree, false, 1,P1(S(378))              , {2,P2(S(0),P(1))           , cLess       ,PositionalParams,0}},
+        /* 171:	(cLess [(cMul %@P <1>) &])
+         *	:	(cMul  <1>) MUL( & /% )
+         */		 {ReplaceParams , false, 2,P2(S(331),S(363))       , {2,P2(S(336),P(9))         , cLess       ,PositionalParams,0}},
+        /* 172:	(cLess [(cMul %@N <1>) &])
+         *	:	MUL( & /% ) (cMul  <1>)
+         */		 {ReplaceParams , false, 2,P2(S(363),S(331))       , {2,P2(S(335),P(9))         , cLess       ,PositionalParams,0}},
+        /* 173:	(cLess [(cAdd % <1>) &])
+         *	:	(cAdd  <1>) ADD( & -% )
+         */		 {ReplaceParams , false, 2,P2(S(242),S(260))       , {2,P2(S(248),P(9))         , cLess       ,PositionalParams,0}},
+        /* 174:	(cLess [(cPow [x %]) &])
+         *	:	(cPow [(cPow [x %]) /%]) POW( & /% )
+         */		 {ReplaceParams , false, 2,P2(S(126),S(156))       , {2,P2(S(77),P(9))          , cLess       ,PositionalParams,0}},
+        /* 175:	(cLess [(cAdd % <1>) (cAdd & <2>)])
+         *	:	(cAdd  <1>) (cAdd & -% <2>)
+         */		 {ReplaceParams , false, 2,P2(S(242),S(254))       , {2,P2(S(248),S(250))       , cLess       ,PositionalParams,0}},
+        /* 176:	(cLess [(cAdd x <1>)@D4 (cAdd x <2>)@D4])
+         *	:	(cAdd  <1>) (cAdd  <2>)
+         */		 {ReplaceParams , false, 2,P2(S(242),S(243))       , {2,P2(S(251),S(252))       , cLess       ,PositionalParams,0}},
+        /* 177:	(cLess [(cMul %@P <1>) (cMul & <2>)])
+         *	:	(cMul  <1>) (cMul & /% <2>)
+         */		 {ReplaceParams , false, 2,P2(S(331),S(342))       , {2,P2(S(336),S(340))       , cLess       ,PositionalParams,0}},
+        /* 178:	(cLess [(cMul %@N <1>) (cMul & <2>)])
+         *	:	(cMul & /% <2>) (cMul  <1>)
+         */		 {ReplaceParams , false, 2,P2(S(342),S(331))       , {2,P2(S(335),S(340))       , cLess       ,PositionalParams,0}},
+        /* 179:	(cLess [(cPow [%@P x]) &@P])
+         *	:	x MUL( LOG( & ) /LOG( % ) )
+         */		 {ReplaceParams , false, 2,P2(P(14),S(364))        , {2,P2(S(81),P(13))         , cLess       ,PositionalParams,0}},
+        /* 180:	(cLess [(cPow [x %@P]) (cPow [y &@P])])
+         *	:	(cPow [(cPow [x %]) /MIN( % & )]) (cPow [(cPow [y &]) /MIN( % & )])
+         */		 {ReplaceParams , false, 2,P2(S(127),S(128))       , {2,P2(S(78),S(79))         , cLess       ,PositionalParams,0}},
+        /* 181:	(cLess [(cPow [% x])@D1 (cPow [% y])@D1])
+         *	:	x y
+         */		 {ReplaceParams , false, 2,P2(P(14),P(21))         , {2,P2(S(75),S(76))         , cLess       ,PositionalParams,0}},
+        /* 182:	(cLessOrEq [% (cAbs [x])])
+         *	->	(cNotNot [(cMul {x 0.5 /%})])
+         */		 {ProduceNewTree, false, 1,P1(S(403))              , {2,P2(P(1),S(0))           , cLessOrEq   ,PositionalParams,0}},
+        /* 183:	(cLessOrEq [(cMul %@P <1>) &])
+         *	:	(cMul  <1>) MUL( & /% )
+         */		 {ReplaceParams , false, 2,P2(S(331),S(363))       , {2,P2(S(336),P(9))         , cLessOrEq   ,PositionalParams,0}},
+        /* 184:	(cLessOrEq [(cMul %@N <1>) &])
+         *	:	MUL( & /% ) (cMul  <1>)
+         */		 {ReplaceParams , false, 2,P2(S(363),S(331))       , {2,P2(S(335),P(9))         , cLessOrEq   ,PositionalParams,0}},
+        /* 185:	(cLessOrEq [(cAdd % <1>) &])
+         *	:	(cAdd  <1>) ADD( & -% )
+         */		 {ReplaceParams , false, 2,P2(S(242),S(260))       , {2,P2(S(248),P(9))         , cLessOrEq   ,PositionalParams,0}},
+        /* 186:	(cLessOrEq [(cPow [x %]) &])
+         *	:	(cPow [(cPow [x %]) /%]) POW( & /% )
+         */		 {ReplaceParams , false, 2,P2(S(126),S(156))       , {2,P2(S(77),P(9))          , cLessOrEq   ,PositionalParams,0}},
+        /* 187:	(cLessOrEq [(cAdd % <1>) (cAdd & <2>)])
+         *	:	(cAdd  <1>) (cAdd & -% <2>)
+         */		 {ReplaceParams , false, 2,P2(S(242),S(254))       , {2,P2(S(248),S(250))       , cLessOrEq   ,PositionalParams,0}},
+        /* 188:	(cLessOrEq [(cAdd x <1>)@D4 (cAdd x <2>)@D4])
+         *	:	(cAdd  <1>) (cAdd  <2>)
+         */		 {ReplaceParams , false, 2,P2(S(242),S(243))       , {2,P2(S(251),S(252))       , cLessOrEq   ,PositionalParams,0}},
+        /* 189:	(cLessOrEq [(cMul %@P <1>) (cMul & <2>)])
+         *	:	(cMul  <1>) (cMul & /% <2>)
+         */		 {ReplaceParams , false, 2,P2(S(331),S(342))       , {2,P2(S(336),S(340))       , cLessOrEq   ,PositionalParams,0}},
+        /* 190:	(cLessOrEq [(cMul %@N <1>) (cMul & <2>)])
+         *	:	(cMul & /% <2>) (cMul  <1>)
+         */		 {ReplaceParams , false, 2,P2(S(342),S(331))       , {2,P2(S(335),S(340))       , cLessOrEq   ,PositionalParams,0}},
+        /* 191:	(cLessOrEq [(cPow [%@P x]) &@P])
+         *	:	x MUL( LOG( & ) /LOG( % ) )
+         */		 {ReplaceParams , false, 2,P2(P(14),S(364))        , {2,P2(S(81),P(13))         , cLessOrEq   ,PositionalParams,0}},
+        /* 192:	(cLessOrEq [(cPow [x %@P]) (cPow [y &@P])])
+         *	:	(cPow [(cPow [x %]) /MIN( % & )]) (cPow [(cPow [y &]) /MIN( % & )])
+         */		 {ReplaceParams , false, 2,P2(S(127),S(128))       , {2,P2(S(78),S(79))         , cLessOrEq   ,PositionalParams,0}},
+        /* 193:	(cLessOrEq [(cPow [% x])@D1 (cPow [% y])@D1])
+         *	:	x y
+         */		 {ReplaceParams , false, 2,P2(P(14),P(21))         , {2,P2(S(75),S(76))         , cLessOrEq   ,PositionalParams,0}},
+        /* 194:	(cGreater [(cMul %@P <1>) &])
+         *	:	(cMul  <1>) MUL( & /% )
+         */		 {ReplaceParams , false, 2,P2(S(331),S(363))       , {2,P2(S(336),P(9))         , cGreater    ,PositionalParams,0}},
+        /* 195:	(cGreater [(cMul %@N <1>) &])
+         *	:	MUL( & /% ) (cMul  <1>)
+         */		 {ReplaceParams , false, 2,P2(S(363),S(331))       , {2,P2(S(335),P(9))         , cGreater    ,PositionalParams,0}},
+        /* 196:	(cGreater [(cAdd % <1>) &])
+         *	:	(cAdd  <1>) ADD( & -% )
+         */		 {ReplaceParams , false, 2,P2(S(242),S(260))       , {2,P2(S(248),P(9))         , cGreater    ,PositionalParams,0}},
+        /* 197:	(cGreater [(cPow [x %]) &])
+         *	:	(cPow [(cPow [x %]) /%]) POW( & /% )
+         */		 {ReplaceParams , false, 2,P2(S(126),S(156))       , {2,P2(S(77),P(9))          , cGreater    ,PositionalParams,0}},
+        /* 198:	(cGreater [(cAdd % <1>) (cAdd & <2>)])
+         *	:	(cAdd  <1>) (cAdd & -% <2>)
+         */		 {ReplaceParams , false, 2,P2(S(242),S(254))       , {2,P2(S(248),S(250))       , cGreater    ,PositionalParams,0}},
+        /* 199:	(cGreater [(cAdd x <1>)@D4 (cAdd x <2>)@D4])
+         *	:	(cAdd  <1>) (cAdd  <2>)
+         */		 {ReplaceParams , false, 2,P2(S(242),S(243))       , {2,P2(S(251),S(252))       , cGreater    ,PositionalParams,0}},
+        /* 200:	(cGreater [(cMul %@P <1>) (cMul & <2>)])
+         *	:	(cMul  <1>) (cMul & /% <2>)
+         */		 {ReplaceParams , false, 2,P2(S(331),S(342))       , {2,P2(S(336),S(340))       , cGreater    ,PositionalParams,0}},
+        /* 201:	(cGreater [(cMul %@N <1>) (cMul & <2>)])
+         *	:	(cMul & /% <2>) (cMul  <1>)
+         */		 {ReplaceParams , false, 2,P2(S(342),S(331))       , {2,P2(S(335),S(340))       , cGreater    ,PositionalParams,0}},
+        /* 202:	(cGreater [(cPow [%@P x]) &@P])
+         *	:	x MUL( LOG( & ) /LOG( % ) )
+         */		 {ReplaceParams , false, 2,P2(P(14),S(364))        , {2,P2(S(81),P(13))         , cGreater    ,PositionalParams,0}},
+        /* 203:	(cGreater [(cPow [x %@P]) (cPow [y &@P])])
+         *	:	(cPow [(cPow [x %]) /MIN( % & )]) (cPow [(cPow [y &]) /MIN( % & )])
+         */		 {ReplaceParams , false, 2,P2(S(127),S(128))       , {2,P2(S(78),S(79))         , cGreater    ,PositionalParams,0}},
+        /* 204:	(cGreater [(cPow [% x])@D1 (cPow [% y])@D1])
+         *	:	x y
+         */		 {ReplaceParams , false, 2,P2(P(14),P(21))         , {2,P2(S(75),S(76))         , cGreater    ,PositionalParams,0}},
+        /* 205:	(cGreaterOrEq [x 0.5])
+         *	->	(cAbsNotNot [x])
+         */		 {ProduceNewTree, false, 1,P1(S(410))              , {2,P2(P(14),N(8))          , cGreaterOrEq,PositionalParams,0}},
+        /* 206:	(cGreaterOrEq [(cMul %@P <1>) &])
+         *	:	(cMul  <1>) MUL( & /% )
+         */		 {ReplaceParams , false, 2,P2(S(331),S(363))       , {2,P2(S(336),P(9))         , cGreaterOrEq,PositionalParams,0}},
+        /* 207:	(cGreaterOrEq [(cMul %@N <1>) &])
+         *	:	MUL( & /% ) (cMul  <1>)
+         */		 {ReplaceParams , false, 2,P2(S(363),S(331))       , {2,P2(S(335),P(9))         , cGreaterOrEq,PositionalParams,0}},
+        /* 208:	(cGreaterOrEq [(cAdd % <1>) &])
+         *	:	(cAdd  <1>) ADD( & -% )
+         */		 {ReplaceParams , false, 2,P2(S(242),S(260))       , {2,P2(S(248),P(9))         , cGreaterOrEq,PositionalParams,0}},
+        /* 209:	(cGreaterOrEq [(cPow [x %]) &])
+         *	:	(cPow [(cPow [x %]) /%]) POW( & /% )
+         */		 {ReplaceParams , false, 2,P2(S(126),S(156))       , {2,P2(S(77),P(9))          , cGreaterOrEq,PositionalParams,0}},
+        /* 210:	(cGreaterOrEq [(cAdd % <1>) (cAdd & <2>)])
+         *	:	(cAdd  <1>) (cAdd & -% <2>)
+         */		 {ReplaceParams , false, 2,P2(S(242),S(254))       , {2,P2(S(248),S(250))       , cGreaterOrEq,PositionalParams,0}},
+        /* 211:	(cGreaterOrEq [(cAdd x <1>)@D4 (cAdd x <2>)@D4])
+         *	:	(cAdd  <1>) (cAdd  <2>)
+         */		 {ReplaceParams , false, 2,P2(S(242),S(243))       , {2,P2(S(251),S(252))       , cGreaterOrEq,PositionalParams,0}},
+        /* 212:	(cGreaterOrEq [(cMul %@P <1>) (cMul & <2>)])
+         *	:	(cMul  <1>) (cMul & /% <2>)
+         */		 {ReplaceParams , false, 2,P2(S(331),S(342))       , {2,P2(S(336),S(340))       , cGreaterOrEq,PositionalParams,0}},
+        /* 213:	(cGreaterOrEq [(cMul %@N <1>) (cMul & <2>)])
+         *	:	(cMul & /% <2>) (cMul  <1>)
+         */		 {ReplaceParams , false, 2,P2(S(342),S(331))       , {2,P2(S(335),S(340))       , cGreaterOrEq,PositionalParams,0}},
+        /* 214:	(cGreaterOrEq [(cPow [%@P x]) &@P])
+         *	:	x MUL( LOG( & ) /LOG( % ) )
+         */		 {ReplaceParams , false, 2,P2(P(14),S(364))        , {2,P2(S(81),P(13))         , cGreaterOrEq,PositionalParams,0}},
+        /* 215:	(cGreaterOrEq [(cPow [x %@P]) (cPow [y &@P])])
+         *	:	(cPow [(cPow [x %]) /MIN( % & )]) (cPow [(cPow [y &]) /MIN( % & )])
+         */		 {ReplaceParams , false, 2,P2(S(127),S(128))       , {2,P2(S(78),S(79))         , cGreaterOrEq,PositionalParams,0}},
+        /* 216:	(cGreaterOrEq [(cPow [% x])@D1 (cPow [% y])@D1])
+         *	:	x y
+         */		 {ReplaceParams , false, 2,P2(P(14),P(21))         , {2,P2(S(75),S(76))         , cGreaterOrEq,PositionalParams,0}},
+        /* 217:	(cNot [x@P])
+         *	->	(cAbsNot [x])
+         */		 {ProduceNewTree, false, 1,P1(S(409))              , {1,P1(P(17))               , cNot        ,PositionalParams,0}},
+        /* 218:	(cAnd x@L <1>)
+         *	->	(cNotNot [(cMul {x (cAnd  <1>)})])
+         */		 {ProduceNewTree, false, 1,P1(S(404))              , {1,P1(P(19))               , cAnd        ,AnyParams       ,1}},
+        /* 219:	(cAnd x@P y@P <1>)
+         *	->	(cAbsAnd {x y (cAnd  <1>)})
+         */		 {ProduceNewTree, false, 1,P1(S(407))              , {2,P2(P(17),P(27))         , cAnd        ,AnyParams       ,1}},
+        /* 220:	(cAnd x y)
+         *	->	(cIf [x (cNotNot [y]) 0])
+         */		 {ProduceNewTree, false, 1,P1(S(45))               , {2,P2(P(14),P(21))         , cAnd        ,AnyParams       ,0}},
+        /* 221:	(cAnd (cIf [x y z])@D4 (cIf [x a b])@D4)
+         *	:	(cIf [x (cAnd {y a}) (cAnd {z b})])
+         */		 {ReplaceParams , false, 1,P1(S(43))               , {2,P2(S(32),S(36))         , cAnd        ,AnyParams       ,0}},
+        /* 222:	(cAnd (cNot [x]) (cNot [y]))
+         *	:	(cNot [(cOr {x y})])
+         */		 {ReplaceParams , false, 1,P1(S(382))              , {2,P2(S(375),S(376))       , cAnd        ,AnyParams       ,0}},
+        /* 223:	(cAnd (cNot [z]) (cIf [x (cNot [y]) %@L]))
+         *	:	(cNot [(cOr {z (cIf [x y (cNot [%])])})])
+         */		 {ReplaceParams , false, 1,P1(S(383))              , {2,P2(S(377),S(38))        , cAnd        ,AnyParams       ,0}},
+        /* 224:	(cAnd (cNot [z]) (cIf [x %@L (cNot [y])]))
+         *	:	(cNot [(cOr {z (cIf [x (cNot [%]) y])})])
+         */		 {ReplaceParams , false, 1,P1(S(384))              , {2,P2(S(377),S(34))        , cAnd        ,AnyParams       ,0}},
+        /* 225:	(cAnd (cEqual [x y])@D12 (cEqual [y z])@D24 (cEqual [x z])@D20)
+         *	:	(cEqual [x y]) (cEqual [y z])
+         */		 {ReplaceParams , false, 2,P2(S(366),S(369))       , {3,P3(S(365),S(368),S(367)), cAnd        ,AnyParams       ,0}},
+        /* 226:	(cOr x@P y@P <1>)
+         *	->	(cAbsOr {x y (cOr  <1>)})
+         */		 {ProduceNewTree, false, 1,P1(S(408))              , {2,P2(P(17),P(27))         , cOr         ,AnyParams       ,1}},
+        /* 227:	(cOr x y)
+         *	->	(cIf [x 1 (cNotNot [y])])
+         */		 {ProduceNewTree, false, 1,P1(S(31))               , {2,P2(P(14),P(21))         , cOr         ,AnyParams       ,0}},
+        /* 228:	(cOr x@L y@L)
+         *	:	(cNotNot [(cAdd {x y})])
+         */		 {ReplaceParams , false, 1,P1(S(401))              , {2,P2(P(19),P(22))         , cOr         ,AnyParams       ,0}},
+        /* 229:	(cOr (cIf [x y z])@D4 (cIf [x a b])@D4)
+         *	:	(cIf [x (cOr {y a}) (cOr {z b})])
+         */		 {ReplaceParams , false, 1,P1(S(44))               , {2,P2(S(32),S(36))         , cOr         ,AnyParams       ,0}},
+        /* 230:	(cOr (cNot [x]) (cNot [y]))
+         *	:	(cNot [(cAnd {x y})])
+         */		 {ReplaceParams , false, 1,P1(S(379))              , {2,P2(S(375),S(376))       , cOr         ,AnyParams       ,0}},
+        /* 231:	(cOr (cNot [z]) (cIf [x (cNot [y]) %@L]))
+         *	:	(cNot [(cAnd {z (cIf [x y (cNot [%])])})])
+         */		 {ReplaceParams , false, 1,P1(S(380))              , {2,P2(S(377),S(38))        , cOr         ,AnyParams       ,0}},
+        /* 232:	(cOr (cNot [z]) (cIf [x %@L (cNot [y])]))
+         *	:	(cNot [(cAnd {z (cIf [x (cNot [%]) y])})])
+         */		 {ReplaceParams , false, 1,P1(S(381))              , {2,P2(S(377),S(34))        , cOr         ,AnyParams       ,0}},
+        /* 233:	(cOr x@L (cAdd  <1>)@P)
+         *	:	(cNotNot [(cAdd x <1>)])
+         */		 {ReplaceParams , false, 1,P1(S(402))              , {2,P2(P(19),S(244))        , cOr         ,AnyParams       ,0}},
+        /* 234:	(cNotNot [x@P])
+         *	->	(cAbsNotNot [x])
+         */		 {ProduceNewTree, false, 1,P1(S(410))              , {1,P1(P(17))               , cNotNot     ,PositionalParams,0}},
+        /* 235:	@L (cNotNot [x])
+         *	->	x
+         */		 {ProduceNewTree, true , 1,P1(P(14))               , {1,P1(P(14))               , cNotNot     ,PositionalParams,0}},
+        /* 236:	(cAbsAnd x y)
+         *	->	(cAbsIf [x (cAbsNotNot [y]) 0])
+         */		 {ProduceNewTree, false, 1,P1(S(416))              , {2,P2(P(14),P(21))         , cAbsAnd     ,AnyParams       ,0}},
+        /* 237:	(cAbsOr x y)
+         *	->	(cAbsIf [x 1 (cAbsNotNot [y])])
+         */		 {ProduceNewTree, false, 1,P1(S(413))              , {2,P2(P(14),P(21))         , cAbsOr      ,AnyParams       ,0}},
+        /* 238:	@L (cAbsNotNot [x])
+         *	->	x
+         */		 {ProduceNewTree, true , 1,P1(P(14))               , {1,P1(P(14))               , cAbsNotNot  ,PositionalParams,0}},
+        /* 239:	(cAbsIf [(cNotNot [x]) y z])
+         *	->	(cIf [x y z])
+         */		 {ProduceNewTree, false, 1,P1(S(33))               , {3,P3(S(399),P(21),P(28))  , cAbsIf      ,PositionalParams,0}},
+        /* 240:	(cAbsIf [(cLessOrEq [x y]) z a])
+         *	:	(cLess [y x]) a z
+         */		 {ReplaceParams , false, 3,P3(S(371),P(31),P(28))  , {3,P3(S(373),P(28),P(31))  , cAbsIf      ,PositionalParams,0}},
+    };
+#undef P
+#undef N
+#undef S
+
+    struct grammar_optimize_abslogical_type
+    {
+        unsigned c;
+        unsigned char l[12];
+    };
+    extern "C"
+    {
+        grammar_optimize_abslogical_type grammar_optimize_abslogical =
+        {
+            12,
+            { 19,29,30,169,205,217,219,226,234,238,
+              239,240
+    }   };  }
+    struct grammar_optimize_ignore_if_sideeffects_type
+    {
+        unsigned c;
+        unsigned char l[34];
+    };
+    extern "C"
+    {
+        grammar_optimize_ignore_if_sideeffects_type grammar_optimize_ignore_if_sideeffects =
+        {
+            34,
+            { 0,18,20,21,22,23,24,25,26,27,
+              28,37,39,75,109,110,111,112,147,148,
+              149,159,170,182,221,222,223,224,225,229,
+              230,231,232,235
+    }   };  }
+    struct grammar_optimize_nonshortcut_logical_evaluation_type
+    {
+        unsigned c;
+        unsigned char l[31];
+    };
+    extern "C"
+    {
+        grammar_optimize_nonshortcut_logical_evaluation_type grammar_optimize_nonshortcut_logical_evaluation =
+        {
+            31,
+            { 0,25,26,27,28,37,39,75,109,110,
+              111,112,147,148,149,159,170,182,218,221,
+              222,223,224,225,228,229,230,231,232,233,
+              235
+    }   };  }
+    struct grammar_optimize_round1_type
+    {
+        unsigned c;
+        unsigned char l[92];
+    };
+    extern "C"
+    {
+        grammar_optimize_round1_type grammar_optimize_round1 =
+        {
+            92,
+            { 0,1,2,3,4,5,6,7,8,9,
+              10,11,15,16,25,26,27,28,31,32,
+              33,36,37,38,39,40,41,42,43,44,
+              45,46,47,48,49,53,54,55,56,57,
+              58,59,60,61,62,63,70,75,76,77,
+              78,79,80,81,82,83,84,85,86,87,
+              88,104,108,109,110,111,112,113,114,115,
+              116,117,118,119,144,145,147,148,149,159,
+              170,182,221,222,223,224,225,229,230,231,
+              232,235
+    }   };  }
+    struct grammar_optimize_round2_type
+    {
+        unsigned c;
+        unsigned char l[81];
+    };
+    extern "C"
+    {
+        grammar_optimize_round2_type grammar_optimize_round2 =
+        {
+            81,
+            { 0,5,12,13,14,15,25,26,27,28,
+              31,34,35,36,37,38,39,40,42,43,
+              44,45,46,47,48,49,57,58,59,64,
+              65,70,71,72,73,74,75,89,90,91,
+              92,93,94,95,96,97,98,99,100,101,
+              102,103,108,109,110,111,112,113,116,117,
+              118,120,144,145,146,147,148,149,159,170,
+              182,221,222,223,224,225,229,230,231,232,
+              235
+    }   };  }
+    struct grammar_optimize_round3_type
+    {
+        unsigned c;
+        unsigned char l[85];
+    };
+    extern "C"
+    {
+        grammar_optimize_round3_type grammar_optimize_round3 =
+        {
+            85,
+            { 66,67,68,69,121,122,123,124,125,126,
+              127,128,129,130,131,132,133,134,135,136,
+              137,138,139,150,151,152,153,154,155,156,
+              157,158,160,161,162,163,164,165,166,167,
+              168,171,172,173,174,175,176,177,178,179,
+              180,181,183,184,185,186,187,188,189,190,
+              191,192,193,194,195,196,197,198,199,200,
+              201,202,203,204,206,207,208,209,210,211,
+              212,213,214,215,216
+    }   };  }
+    struct grammar_optimize_round4_type
+    {
+        unsigned c;
+        unsigned char l[10];
+    };
+    extern "C"
+    {
+        grammar_optimize_round4_type grammar_optimize_round4 =
+        {
+            10,
+            { 17,50,51,52,106,107,140,141,142,143
+    }   };  }
+    struct grammar_optimize_shortcut_logical_evaluation_type
+    {
+        unsigned c;
+        unsigned char l[33];
+    };
+    extern "C"
+    {
+        grammar_optimize_shortcut_logical_evaluation_type grammar_optimize_shortcut_logical_evaluation =
+        {
+            33,
+            { 0,25,26,27,28,37,39,75,105,109,
+              110,111,112,147,148,149,159,170,182,220,
+              221,222,223,224,225,227,229,230,231,232,
+              235,236,237
+    }   };  }
+}
+#undef P1
+#undef P2
+#undef P3
+
+namespace FPoptimizer_Grammar
+{
+    ParamSpec ParamSpec_Extract(unsigned paramlist, unsigned index)
+    {
+        index = (paramlist >> (index * PARAM_INDEX_BITS)) % (1 << PARAM_INDEX_BITS);
+        const unsigned p_begin = 0;
+        const unsigned n_begin = p_begin + sizeof(plist.plist_p)/sizeof(*plist.plist_p);
+        const unsigned s_begin = n_begin + sizeof(plist.plist_n)/sizeof(*plist.plist_n);
+      /*const unsigned     end = s_begin + sizeof(plist.plist_s)/sizeof(*plist.plist_s);*/
+        if(index < s_begin)
+        {
+            if(index < n_begin)
+                return ParamSpec(ParamHolder,(const void*)&plist.plist_p[index-p_begin]);
+            else
+                return ParamSpec(NumConstant,(const void*)&plist.plist_n[index-n_begin]);
+        }
+        else
+            return ParamSpec(SubFunction,(const void*)&plist.plist_s[index-s_begin]);
+    }
+}
+
+#line 1 "fpoptimizer/fpoptimizer_optimize.c"
+#include "fpconfig.h"
+#include "fparser.h"
+#include "fptypes.h"
+
+#ifdef FP_SUPPORT_OPTIMIZER
+
+// line removed for fpoptimizer.c: #include "fpoptimizer_grammar.h"
+// line removed for fpoptimizer.c: #include "fpoptimizer_consts.h"
+// line removed for fpoptimizer.c: #include "fpoptimizer_opcodename.h"
+// line removed for fpoptimizer.c: #include "fpoptimizer_optimize.h"
+
+#include <stdio.h>
+
+#include <algorithm>
+#include <map>
+#include <sstream>
+
+using namespace FUNCTIONPARSERTYPES;
+using namespace FPoptimizer_Grammar;
+using namespace FPoptimizer_CodeTree;
+using namespace FPoptimizer_Optimize;
+
+namespace
+{
+    /* I have heard that std::equal_range() is practically worthless
+     * due to the insane limitation that the two parameters for Comp() must
+     * be of the same type. Hence we must reinvent the wheel and implement
+     * our own here. This is practically identical to the one from
+     * GNU libstdc++, except rewritten. -Bisqwit
+     */
+    template<typename It, typename T, typename Comp>
+    std::pair<It, It>
+    MyEqualRange(It first, It last, const T& val, Comp comp)
+    {
+        size_t len = last-first;
+        while(len > 0)
+        {
+            size_t half = len/2;
+            It middle(first); middle += half;
+            if(comp(*middle, val))
+            {
+                first = middle;
+                ++first;
+                len = len - half - 1;
+            }
+            else if(comp(val, *middle))
+            {
+                len = half;
+            }
+            else
+            {
+                // The following implements this:
+                // // left = lower_bound(first, middle, val, comp);
+                It left(first);
+              {///
+                It& first2 = left;
+                It last2(middle);
+                size_t len2 = last2-first2;
+                while(len2 > 0)
+                {
+                    size_t half2 = len2 / 2;
+                    It middle2(first2); middle2 += half2;
+                    if(comp(*middle2, val))
+                    {
+                        first2 = middle2;
+                        ++first2;
+                        len2 = len2 - half2 - 1;
+                    }
+                    else
+                        len2 = half2;
+                }
+                // left = first2;  - not needed, already happens due to reference
+              }///
+                first += len;
+                // The following implements this:
+                // // right = upper_bound(++middle, first, val, comp);
+                It right(++middle);
+              {///
+                It& first2 = right;
+                It& last2 = first;
+                size_t len2 = last2-first2;
+                while(len2 > 0)
+                {
+                    size_t half2 = len2 / 2;
+                    It middle2(first2); middle2 += half2;
+                    if(comp(val, *middle2))
+                        len2 = half2;
+                    else
+                    {
+                        first2 = middle2;
+                        ++first2;
+                        len2 = len2 - half2 - 1;
+                    }
+                }
+                // right = first2;  - not needed, already happens due to reference
+              }///
+                return std::pair<It,It> (left,right);
+            }
+        }
+        return std::pair<It,It> (first,first);
+    }
+
+    /* A helper for std::equal_range */
+    struct OpcodeRuleCompare
+    {
+        bool operator() (const CodeTree& tree,
+                         unsigned rulenumber) const
+        {
+            /* If this function returns true, len=half.
+             */
+            const Rule& rule = grammar_rules[rulenumber];
+            return tree.GetOpcode() < rule.match_tree.subfunc_opcode;
+        }
+        bool operator() (unsigned rulenumber,
+                         const CodeTree& tree) const
+        {
+            /* If this function returns true, rule will be excluded from the equal_range
+             */
+            const Rule& rule = grammar_rules[rulenumber];
+            return rule.match_tree.subfunc_opcode < tree.GetOpcode();
+        }
+    };
+
+    /* Test and apply a rule to a given CodeTree */
+    bool TestRuleAndApplyIfMatch(
+        const Rule& rule,
+        CodeTree& tree,
+        bool from_logical_context)
+    {
+        MatchInfo info;
+
+        MatchResultType found(false, MatchPositionSpecBaseP());
+
+        if(rule.logical_context && !from_logical_context)
+        {
+            /* If the rule only applies in logical contexts,
+             * but we do not have a logical context, fail the rule
+             */
+            goto fail;
+        }
+
+        /*std::cout << "TESTING: ";
+        DumpMatch(rule, *tree, info, false);*/
+
+        for(;;)
+        {
+        #ifdef DEBUG_SUBSTITUTIONS
+            //DumpMatch(rule, tree, info, "Testing");
+        #endif
+            found = TestParams(rule.match_tree, tree, found.specs, info, true);
+            if(found.found) break;
+            if(!&*found.specs)
+            {
+            fail:;
+                // Did not match
+        #ifdef DEBUG_SUBSTITUTIONS
+                DumpMatch(rule, tree, info, false);
+        #endif
+                return false;
+            }
+        }
+        // Matched
+    #ifdef DEBUG_SUBSTITUTIONS
+        DumpMatch(rule, tree, info, true);
+    #endif
+        SynthesizeRule(rule, tree, info);
+        return true;
+    }
+}
+
+namespace FPoptimizer_Optimize
+{
+    /* Apply the grammar to a given CodeTree */
+    bool ApplyGrammar(
+        const Grammar& grammar,
+        CodeTree& tree,
+        bool from_logical_context)
+    {
+        if(tree.GetOptimizedUsing() == &grammar)
+        {
+#ifdef DEBUG_SUBSTITUTIONS
+            std::cout << "Already optimized:  ";
+            DumpTree(tree);
+            std::cout << "\n" << std::flush;
+#endif
+            return false;
+        }
+
+        /* First optimize all children */
+        if(true)
+        {
+            bool changed = false;
+
+            switch(tree.GetOpcode())
+            {
+                case cNot:
+                case cNotNot:
+                case cAnd:
+                case cOr:
+                    for(size_t a=0; a<tree.GetParamCount(); ++a)
+                        if(ApplyGrammar( grammar, tree.GetParam(a), true))
+                            changed = true;
+                    break;
+                case cIf:
+                case cAbsIf:
+                    if(ApplyGrammar( grammar, tree.GetParam(0), tree.GetOpcode() == cIf))
+                        changed = true;
+                    for(size_t a=1; a<tree.GetParamCount(); ++a)
+                        if(ApplyGrammar( grammar, tree.GetParam(a), from_logical_context))
+                            changed = true;
+                    break;
+                default:
+                    for(size_t a=0; a<tree.GetParamCount(); ++a)
+                        if(ApplyGrammar( grammar, tree.GetParam(a), false))
+                            changed = true;
+            }
+
+            if(changed)
+            {
+                // Give the parent node a rerun at optimization
+                tree.Mark_Incompletely_Hashed();
+                return true;
+            }
+        }
+
+        /* Figure out which rules _may_ match this tree */
+        typedef const unsigned char* rulenumit;
+
+        std::pair<rulenumit, rulenumit> range =
+            MyEqualRange(grammar.rule_list,
+                         grammar.rule_list + grammar.rule_count,
+                         tree,
+                         OpcodeRuleCompare());
+
+        if(range.first != range.second)
+        {
+#ifdef DEBUG_SUBSTITUTIONS
+            std::vector<unsigned char> rules;
+            rules.reserve(range.second - range.first);
+            for(rulenumit r = range.first; r != range.second; ++r)
+            {
+                //if(grammar_rules[*r].match_tree.subfunc_opcode != tree.GetOpcode()) continue;
+                if(IsLogisticallyPlausibleParamsMatch(grammar_rules[*r].match_tree, tree))
+                    rules.push_back(*r);
+            }
+            range.first = &rules[0];
+            range.second = &rules[rules.size()-1]+1;
+
+            if(range.first != range.second)
+            {
+                std::cout << "Input (" << FP_GetOpcodeName(tree.GetOpcode())
+                          << ")[" << tree.GetParamCount()
+                          << "]";
+                if(from_logical_context)
+                    std::cout << "(Logical)";
+
+                unsigned first=~unsigned(0), prev=~unsigned(0);
+                const char* sep = ", rules ";
+                for(rulenumit r = range.first; r != range.second; ++r)
+                {
+                    if(first==~unsigned(0)) first=prev=*r;
+                    else if(*r == prev+1) prev=*r;
+                    else
+                    {
+                        std::cout << sep << first; sep=",";
+                        if(prev != first) std::cout << '-' << prev;
+                        first = prev = *r;
+                    }
+                }
+                if(first != ~unsigned(0))
+                {
+                    std::cout << sep << first;
+                    if(prev != first) std::cout << '-' << prev;
+                }
+                std::cout << ": ";
+                DumpTree(tree);
+                std::cout << "\n" << std::flush;
+            }
+#endif
+
+            bool changed = false;
+
+            for(rulenumit r = range.first; r != range.second; ++r)
+            {
+            #ifndef DEBUG_SUBSTITUTIONS
+                if(!IsLogisticallyPlausibleParamsMatch(grammar_rules[*r].match_tree, tree))
+                    continue;
+            #endif
+                if(TestRuleAndApplyIfMatch(grammar_rules[*r], tree, from_logical_context))
+                {
+                    changed = true;
+                    break;
+                }
+            }
+
+            if(changed)
+            {
+    #ifdef DEBUG_SUBSTITUTIONS
+                std::cout << "Changed." << std::endl;
+                std::cout << "Output: ";
+                DumpTree(tree);
+                std::cout << "\n" << std::flush;
+    #endif
+                // Give the parent node a rerun at optimization
+                tree.Mark_Incompletely_Hashed();
+                return true;
+            }
+        }
+
+        // No changes, consider the tree properly optimized.
+        tree.SetOptimizedUsing(&grammar);
+        return false;
+    }
+
+    void ApplyGrammars(FPoptimizer_CodeTree::CodeTree& tree)
+    {
+    #ifdef FPOPTIMIZER_MERGED_FILE
+        #define C *(const Grammar*)&
+    #else
+        #define C
+    #endif
+        #ifdef DEBUG_SUBSTITUTIONS
+        std::cout << "Applying grammar_optimize_round1\n";
+        #endif
+        while(ApplyGrammar(C grammar_optimize_round1, tree))
+            { //std::cout << "Rerunning 1\n";
+                tree.FixIncompleteHashes();
+            }
+
+        #ifdef DEBUG_SUBSTITUTIONS
+        std::cout << "Applying grammar_optimize_round2\n";
+        #endif
+        while(ApplyGrammar(C grammar_optimize_round2, tree))
+            { //std::cout << "Rerunning 2\n";
+                tree.FixIncompleteHashes();
+            }
+
+        #ifdef DEBUG_SUBSTITUTIONS
+        std::cout << "Applying grammar_optimize_round3\n";
+        #endif
+        while(ApplyGrammar(C grammar_optimize_round3, tree))
+            { //std::cout << "Rerunning 3\n";
+                tree.FixIncompleteHashes();
+            }
+
+        #ifndef FP_ENABLE_SHORTCUT_LOGICAL_EVALUATION
+        #ifdef DEBUG_SUBSTITUTIONS
+        std::cout << "Applying grammar_optimize_nonshortcut_logical_evaluation\n";
+        #endif
+        while(ApplyGrammar(C grammar_optimize_nonshortcut_logical_evaluation, tree))
+            { //std::cout << "Rerunning 3\n";
+                tree.FixIncompleteHashes();
+            }
+        #endif
+
+        #ifdef DEBUG_SUBSTITUTIONS
+        std::cout << "Applying grammar_optimize_round4\n";
+        #endif
+        while(ApplyGrammar(C grammar_optimize_round4, tree))
+            { //std::cout << "Rerunning 4\n";
+                tree.FixIncompleteHashes();
+            }
+
+        #ifdef FP_ENABLE_SHORTCUT_LOGICAL_EVALUATION
+        #ifdef DEBUG_SUBSTITUTIONS
+        std::cout << "Applying grammar_optimize_shortcut_logical_evaluation\n";
+        #endif
+        while(ApplyGrammar(C grammar_optimize_shortcut_logical_evaluation, tree))
+            { //std::cout << "Rerunning 3\n";
+                tree.FixIncompleteHashes();
+            }
+        #endif
+
+        #ifdef FP_ENABLE_IGNORE_IF_SIDEEFFECTS
+        #ifdef DEBUG_SUBSTITUTIONS
+        std::cout << "Applying grammar_optimize_ignore_if_sideeffects\n";
+        #endif
+        while(ApplyGrammar(C grammar_optimize_ignore_if_sideeffects, tree))
+            { //std::cout << "Rerunning 3\n";
+                tree.FixIncompleteHashes();
+            }
+        #endif
+
+        #ifdef DEBUG_SUBSTITUTIONS
+        std::cout << "Applying grammar_optimize_abslogical\n";
+        #endif
+        while(ApplyGrammar(C grammar_optimize_abslogical, tree))
+            { //std::cout << "Rerunning 3\n";
+                tree.FixIncompleteHashes();
+            }
+
+        #undef C
+    }
+}
+
+#endif
+
+#line 1 "fpoptimizer/fpoptimizer_optimize_match.c"
+#include "fpconfig.h"
+#include "fparser.h"
+#include "fptypes.h"
+
+#ifdef FP_SUPPORT_OPTIMIZER
+
+#include <algorithm>
+#include <assert.h>
+#include <cstring>
+#include <cmath>
+
+#include <memory> /* for auto_ptr */
+
+// line removed for fpoptimizer.c: #include "fpoptimizer_grammar.h"
+// line removed for fpoptimizer.c: #include "fpoptimizer_optimize.h"
+
+using namespace FUNCTIONPARSERTYPES;
+using namespace FPoptimizer_Grammar;
+using namespace FPoptimizer_CodeTree;
+using namespace FPoptimizer_Optimize;
+
+namespace
+{
+    /* Test the given constraints to a given CodeTree */
+    bool TestImmedConstraints(unsigned bitmask, const CodeTree& tree)
+    {
+        switch(bitmask & ValueMask)
+        {
+            case Value_AnyNum: case ValueMask: break;
+            case Value_EvenInt:
+                if(tree.GetEvennessInfo() != CodeTree::IsAlways)
+                    return false;
+                break;
+            case Value_OddInt:
+                if(tree.GetEvennessInfo() != CodeTree::IsNever)
+                    return false;
+                break;
+            case Value_IsInteger:
+                if(!tree.IsAlwaysInteger(true)) return false;
+                break;
+            case Value_NonInteger:
+                if(!tree.IsAlwaysInteger(false)) return false;
+                break;
+            case Value_Logical:
+                if(!tree.IsLogicalValue()) return false;
+                break;
+        }
+        switch(bitmask & SignMask)
+        {
+            case Sign_AnySign: /*case SignMask:*/ break;
+            case Sign_Positive:
+                if(!tree.IsAlwaysSigned(true)) return false;
+                break;
+            case Sign_Negative:
+                if(!tree.IsAlwaysSigned(false)) return false;
+                break;
+            case Sign_NoIdea:
+                if(tree.IsAlwaysSigned(true)) return false;
+                if(tree.IsAlwaysSigned(false)) return false;
+                break;
+        }
+        switch(bitmask & OnenessMask)
+        {
+            case Oneness_Any: case OnenessMask: break;
+            case Oneness_One:
+                if(!tree.IsImmed()) return false;
+                if(!FloatEqual(fabs(tree.GetImmed()), 1.0)) return false;
+                break;
+            case Oneness_NotOne:
+                if(!tree.IsImmed()) return false;
+                if(FloatEqual(fabs(tree.GetImmed()), 1.0)) return false;
+                break;
+        }
+        switch(bitmask & ConstnessMask)
+        {
+            case Constness_Any: /*case ConstnessMask:*/ break;
+            case Constness_Const:
+                if(!tree.IsImmed()) return false;
+                break;
+        }
+        return true;
+    }
+
+    template<unsigned extent, unsigned nbits, typename item_type=unsigned int>
+    struct nbitmap
+    {
+    private:
+        static const unsigned bits_in_char = 8;
+        static const unsigned per_item = (sizeof(item_type)*bits_in_char)/nbits;
+        item_type data[(extent+per_item-1) / per_item];
+    public:
+        void inc(unsigned index, int by=1)
+        {
+            data[pos(index)] += by * item_type(1 << shift(index));
+        }
+        inline void dec(unsigned index) { inc(index, -1); }
+        int get(unsigned index) const { return (data[pos(index)] >> shift(index)) & mask(); }
+
+        static inline unsigned pos(unsigned index) { return index/per_item; }
+        static inline unsigned shift(unsigned index) { return nbits * (index%per_item); }
+        static inline unsigned mask() { return (1 << nbits)-1; }
+        static inline unsigned mask(unsigned index) { return mask() << shift(index); }
+    };
+
+    struct Needs
+    {
+        int SubTrees     : 8; // This many subtrees
+        int Others       : 8; // This many others (namedholder)
+        int minimum_need : 8; // At least this many leaves (restholder may require more)
+        int Immeds       : 8; // This many immeds
+
+        nbitmap<VarBegin,2> SubTreesDetail; // This many subtrees of each opcode type
+
+        Needs()
+        {
+            std::memset(this, 0, sizeof(*this));
+        }
+        Needs(const Needs& b)
+        {
+            std::memcpy(this, &b, sizeof(b));
+        }
+        Needs& operator= (const Needs& b)
+        {
+            std::memcpy(this, &b, sizeof(b));
+            return *this;
+        }
+    };
+
+    Needs CreateNeedList_uncached(const ParamSpec_SubFunctionData& params)
+    {
+        Needs NeedList;
+
+        // Figure out what we need
+        for(unsigned a = 0; a < params.param_count; ++a)
+        {
+            const ParamSpec& parampair = ParamSpec_Extract(params.param_list, a);
+            switch(parampair.first)
+            {
+                case SubFunction:
+                {
+                    const ParamSpec_SubFunction& param = *(const ParamSpec_SubFunction*) parampair.second;
+                    if(param.data.match_type == GroupFunction)
+                        ++NeedList.Immeds;
+                    else
+                    {
+                        ++NeedList.SubTrees;
+                        assert( param.data.subfunc_opcode < VarBegin );
+                        NeedList.SubTreesDetail.inc(param.data.subfunc_opcode);
+                    }
+                    ++NeedList.minimum_need;
+                    break;
+                }
+                case NumConstant:
+                case ParamHolder:
+                    ++NeedList.Others;
+                    ++NeedList.minimum_need;
+                    break;
+            }
+        }
+
+        return NeedList;
+    }
+
+    Needs& CreateNeedList(const ParamSpec_SubFunctionData& params)
+    {
+        typedef std::map<const ParamSpec_SubFunctionData*, Needs> needlist_cached_t;
+        static needlist_cached_t needlist_cached;
+
+        needlist_cached_t::iterator i = needlist_cached.lower_bound(&params);
+        if(i != needlist_cached.end() && i->first == &params)
+            return i->second;
+
+        return
+            needlist_cached.insert(i,
+                 std::make_pair(&params, CreateNeedList_uncached(params))
+            )->second;
+    }
+    /* Construct CodeTree from a GroupFunction, hopefully evaluating to a constant value */
+    CodeTree CalculateGroupFunction(
+        const ParamSpec& parampair,
+        const MatchInfo& info)
+    {
+        switch( parampair.first )
+        {
+            case NumConstant:
+            {
+                const ParamSpec_NumConstant& param = *(const ParamSpec_NumConstant*) parampair.second;
+                return CodeTree( param.constvalue ); // Note: calculates hash too.
+            }
+            case ParamHolder:
+            {
+                const ParamSpec_ParamHolder& param = *(const ParamSpec_ParamHolder*) parampair.second;
+                return info.GetParamHolderValueIfFound( param.index );
+                // If the ParamHolder is not defined, it will simply
+                // return an Undefined tree. This is ok.
+            }
+            case SubFunction:
+            {
+                const ParamSpec_SubFunction& param = *(const ParamSpec_SubFunction*) parampair.second;
+                /* Synthesize a CodeTree which will take care of
+                 * constant-folding our expression. It will also
+                 * indicate whether the result is, in fact,
+                 * a constant at all. */
+                CodeTree result;
+                result.SetOpcode( param.data.subfunc_opcode );
+                result.GetParams().reserve(param.data.param_count);
+                for(unsigned a=0; a<param.data.param_count; ++a)
+                {
+                    CodeTree tmp(
+                        CalculateGroupFunction
+                        (ParamSpec_Extract(param.data.param_list, a), info)
+                                );
+                    result.AddParamMove(tmp);
+                }
+                result.Rehash(); // This will also call ConstantFolding().
+                return result;
+            }
+        }
+        // Issue an un-calculatable tree. (This should be unreachable)
+        return CodeTree(); // cNop
+    }
+}
+
+namespace FPoptimizer_Optimize
+{
+    /* Test the list of parameters to a given CodeTree */
+    /* A helper function which simply checks whether the
+     * basic shape of the tree matches what we are expecting
+     * i.e. given number of numeric constants, etc.
+     */
+    bool IsLogisticallyPlausibleParamsMatch(
+        const ParamSpec_SubFunctionData& params,
+        const CodeTree& tree)
+    {
+        /* First, check if the tree has any chances of matching... */
+        /* Figure out what we need. */
+        Needs NeedList ( CreateNeedList(params) );
+
+        size_t nparams = tree.GetParamCount();
+
+        if(nparams < size_t(NeedList.minimum_need))
+        {
+            // Impossible to satisfy
+            return false;
+        }
+
+        // Figure out what we have (note: we already assume that the opcode of the tree matches!)
+        for(size_t a=0; a<nparams; ++a)
+        {
+            unsigned opcode = tree.GetParam(a).GetOpcode();
+            switch(opcode)
+            {
+                case cImmed:
+                    if(NeedList.Immeds > 0) --NeedList.Immeds;
+                    else --NeedList.Others;
+                    break;
+                case VarBegin:
+                case cFCall:
+                case cPCall:
+                    --NeedList.Others;
+                    break;
+                default:
+                    assert( opcode < VarBegin );
+                    if(NeedList.SubTrees > 0
+                    && NeedList.SubTreesDetail.get(opcode) > 0)
+                    {
+                        --NeedList.SubTrees;
+                        NeedList.SubTreesDetail.dec(opcode);
+                    }
+                    else --NeedList.Others;
+            }
+        }
+
+        // Check whether all needs were satisfied
+        if(NeedList.Immeds > 0
+        || NeedList.SubTrees > 0
+        || NeedList.Others > 0)
+        {
+            // Something came short, impossible to satisfy.
+            return false;
+        }
+
+        if(params.match_type != AnyParams)
+        {
+            if(0
+            //|| NeedList.Immeds < 0 - already checked
+            || NeedList.SubTrees < 0
+            || NeedList.Others < 0
+            //|| params.count != nparams - already checked
+              )
+            {
+                // Something was too much.
+                return false;
+            }
+        }
+        return true;
+    }
+
+    /* Test the given parameter to a given CodeTree */
+    MatchResultType TestParam(
+        const ParamSpec& parampair,
+        const CodeTree& tree,
+        const MatchPositionSpecBaseP& start_at,
+        MatchInfo& info)
+    {
+        /*std::cout << "TestParam(";
+        DumpParam(parampair);
+        std::cout << ", ";
+        DumpTree(tree);
+        std::cout << ")\n";*/
+
+        /* What kind of param are we expecting */
+        switch( parampair.first )
+        {
+            case NumConstant: /* A particular numeric value */
+            {
+                const ParamSpec_NumConstant& param = *(const ParamSpec_NumConstant*) parampair.second;
+                if(!tree.IsImmed()) return false;
+                return FloatEqual(tree.GetImmed(), param.constvalue);
+            }
+            case ParamHolder: /* Any arbitrary node */
+            {
+                const ParamSpec_ParamHolder& param = *(const ParamSpec_ParamHolder*) parampair.second;
+                if(!TestImmedConstraints(param.constraints, tree)) return false;
+                return info.SaveOrTestParamHolder(param.index, tree);
+            }
+            case SubFunction:
+            {
+                const ParamSpec_SubFunction& param = *(const ParamSpec_SubFunction*) parampair.second;
+                if(param.data.match_type == GroupFunction)
+                { /* A constant value acquired from this formula */
+                    if(!TestImmedConstraints(param.constraints, tree)) return false;
+                    /* Construct the formula */
+                    CodeTree  grammar_func = CalculateGroupFunction(parampair, info);
+        #ifdef DEBUG_SUBSTITUTIONS
+                    DumpHashes(grammar_func);
+                    std::cout << *(const void**)&grammar_func.GetImmed();
+                    std::cout << "\n";
+                    std::cout << *(const void**)&tree.GetImmed();
+                    std::cout << "\n";
+                    DumpHashes(tree);
+                    std::cout << "Comparing ";
+                    DumpTree(grammar_func);
+                    std::cout << " and ";
+                    DumpTree(tree);
+                    std::cout << ": ";
+                    std::cout << (grammar_func.IsIdenticalTo(tree) ? "true" : "false");
+                    std::cout << "\n";
+        #endif
+                    /* Evaluate it and compare */
+                    return grammar_func.IsIdenticalTo(tree);
+                }
+                else /* A subtree conforming these specs */
+                {
+                    if(!&*start_at)
+                    {
+                        if(!TestImmedConstraints(param.constraints, tree)) return false;
+                        if(tree.GetOpcode() != param.data.subfunc_opcode) return false;
+                    }
+                    return TestParams(param.data, tree, start_at, info, false);
+                }
+            }
+        }
+        return false;
+    }
+
+    struct PositionalParams_Rec
+    {
+        MatchPositionSpecBaseP start_at; /* child's start_at */
+        MatchInfo              info;     /* backup of "info" at start */
+
+        PositionalParams_Rec(): start_at(), info() { }
+    };
+    class MatchPositionSpec_PositionalParams
+        : public MatchPositionSpecBase,
+          public std::vector<PositionalParams_Rec>
+    {
+    public:
+        explicit MatchPositionSpec_PositionalParams(size_t n)
+            : MatchPositionSpecBase(),
+              std::vector<PositionalParams_Rec> (n)
+              { }
+    };
+
+    struct AnyWhere_Rec
+    {
+        MatchPositionSpecBaseP start_at; /* child's start_at */
+        AnyWhere_Rec() : start_at() { }
+    };
+    class MatchPositionSpec_AnyWhere
+        : public MatchPositionSpecBase,
+          public std::vector<AnyWhere_Rec>
+    {
+    public:
+        unsigned trypos;   /* which param index to try next */
+
+        explicit MatchPositionSpec_AnyWhere(size_t n)
+            : MatchPositionSpecBase(),
+              std::vector<AnyWhere_Rec> (n),
+              trypos(0)
+              { }
+    };
+
+    MatchResultType TestParam_AnyWhere(
+        const ParamSpec& parampair,
+        const CodeTree& tree,
+        const MatchPositionSpecBaseP& start_at,
+        MatchInfo&         info,
+        std::vector<bool>& used,
+        bool TopLevel)
+    {
+        FPOPT_autoptr<MatchPositionSpec_AnyWhere> position;
+        unsigned a;
+        if(&*start_at)
+        {
+            position = (MatchPositionSpec_AnyWhere*) &*start_at;
+            a = position->trypos;
+            goto retry_anywhere_2;
+        }
+        else
+        {
+            position = new MatchPositionSpec_AnyWhere(tree.GetParamCount());
+            a = 0;
+        }
+        for(; a < tree.GetParamCount(); ++a)
+        {
+            if(used[a]) continue;
+
+        retry_anywhere:
+          { MatchResultType r = TestParam(
+                parampair,
+                tree.GetParam(a),
+                (*position)[a].start_at,
+                info);
+
+            (*position)[a].start_at = r.specs;
+            if(r.found)
+            {
+                used[a]               = true; // matched
+                if(TopLevel) info.SaveMatchedParamIndex(a);
+
+                position->trypos = a; // in case of backtrack, try a again
+                return MatchResultType(true, &*position);
+            } }
+        retry_anywhere_2:
+            if(&*(*position)[a].start_at) // is there another try?
+            {
+                goto retry_anywhere;
+            }
+            // no, move on
+        }
+        return false;
+    }
+
+    struct AnyParams_Rec
+    {
+        MatchPositionSpecBaseP start_at; /* child's start_at */
+        MatchInfo              info;     /* backup of "info" at start */
+        std::vector<bool>      used;     /* which params are remaining */
+
+        explicit AnyParams_Rec(size_t nparams)
+            : start_at(), info(), used(nparams) { }
+    };
+    class MatchPositionSpec_AnyParams
+        : public MatchPositionSpecBase,
+          public std::vector<AnyParams_Rec>
+    {
+    public:
+        explicit MatchPositionSpec_AnyParams(size_t n, size_t m)
+            : MatchPositionSpecBase(),
+              std::vector<AnyParams_Rec> (n, AnyParams_Rec(m))
+              { }
+    };
+
+    /* Test the list of parameters to a given CodeTree */
+    MatchResultType TestParams(
+        const ParamSpec_SubFunctionData& model_tree,
+        const CodeTree& tree,
+        const MatchPositionSpecBaseP& start_at,
+        MatchInfo& info,
+        bool TopLevel)
+    {
+        /* When PositionalParams or SelectedParams, verify that
+         * the number of parameters is exactly as expected.
+         */
+        if(model_tree.match_type != AnyParams)
+        {
+            if(model_tree.param_count != tree.GetParamCount())
+                return false;
+        }
+
+        /* Verify that the tree basically conforms the shape we are expecting */
+        /* This test is not necessary; it may just save us some work. */
+        if(!IsLogisticallyPlausibleParamsMatch(model_tree, tree))
+        {
+            return false;
+        }
+
+        /* Verify each parameter that they are found in the tree as expected. */
+        switch(model_tree.match_type)
+        {
+            case PositionalParams:
+            {
+                /* Simple: Test all given parameters in succession. */
+                FPOPT_autoptr<MatchPositionSpec_PositionalParams> position;
+                unsigned a;
+                if(&*start_at)
+                {
+                    position = (MatchPositionSpec_PositionalParams*) &*start_at;
+                    a = model_tree.param_count - 1;
+                    goto retry_positionalparams_2;
+                }
+                else
+                {
+                    position = new MatchPositionSpec_PositionalParams(model_tree.param_count);
+                    a = 0;
+                }
+
+                for(; a < model_tree.param_count; ++a)
+                {
+                    (*position)[a].info = info;
+                retry_positionalparams:
+                  { MatchResultType r = TestParam(
+                        ParamSpec_Extract(model_tree.param_list, a),
+                        tree.GetParam(a),
+                        (*position)[a].start_at,
+                        info);
+
+                    (*position)[a].start_at = r.specs;
+                    if(r.found)
+                    {
+                        continue;
+                  } }
+                retry_positionalparams_2:
+                    // doesn't match
+                    if(&*(*position)[a].start_at) // is there another try?
+                    {
+                        info = (*position)[a].info;
+                        goto retry_positionalparams;
+                    }
+                    // no, backtrack
+                    if(a > 0)
+                    {
+                        --a;
+                        goto retry_positionalparams_2;
+                    }
+                    // cannot backtrack
+                    info = (*position)[0].info;
+                    return false;
+                }
+                if(TopLevel)
+                    for(unsigned a = 0; a < model_tree.param_count; ++a)
+                        info.SaveMatchedParamIndex(a);
+                return MatchResultType(true, &*position);
+            }
+            case SelectedParams:
+                // same as AnyParams, except that model_tree.count==tree.GetParamCount()
+                //                       and that there are no RestHolders
+            case AnyParams:
+            {
+                /* Ensure that all given parameters are found somewhere, in any order */
+
+                FPOPT_autoptr<MatchPositionSpec_AnyParams> position;
+                std::vector<bool> used( tree.GetParamCount() );
+                std::vector<unsigned> depcodes( model_tree.param_count );
+                std::vector<unsigned> test_order( model_tree.param_count );
+                for(unsigned a=0; a<model_tree.param_count; ++a)
+                {
+                    const ParamSpec parampair = ParamSpec_Extract(model_tree.param_list, a);
+                    depcodes[a] = ParamSpec_GetDepCode(parampair);
+                }
+                { unsigned b=0;
+                for(unsigned a=0; a<model_tree.param_count; ++a)
+                    if(depcodes[a] != 0)
+                        test_order[b++] = a;
+                for(unsigned a=0; a<model_tree.param_count; ++a)
+                    if(depcodes[a] == 0)
+                        test_order[b++] = a;
+                }
+
+                unsigned a;
+                if(&*start_at)
+                {
+                    position = (MatchPositionSpec_AnyParams*) &*start_at;
+                    if(model_tree.param_count == 0)
+                    {
+                        a = 0;
+                        goto retry_anyparams_4;
+                    }
+                    a = model_tree.param_count - 1;
+                    goto retry_anyparams_2;
+                }
+                else
+                {
+                    position = new MatchPositionSpec_AnyParams(model_tree.param_count,
+                                                               tree.GetParamCount());
+                    a = 0;
+                    if(model_tree.param_count != 0)
+                    {
+                        (*position)[0].info   = info;
+                        (*position)[0].used   = used;
+                    }
+                }
+                // Match all but restholders
+                for(; a < model_tree.param_count; ++a)
+                {
+                    if(a > 0) // this test is not necessary, but it saves from doing
+                    {         // duplicate work, because [0] was already saved above.
+                        (*position)[a].info   = info;
+                        (*position)[a].used   = used;
+                    }
+                retry_anyparams:
+                  { MatchResultType r = TestParam_AnyWhere(
+                        ParamSpec_Extract(model_tree.param_list, test_order[a]),
+                        tree,
+                        (*position)[a].start_at,
+                        info,
+                        used,
+                        TopLevel);
+                    (*position)[a].start_at = r.specs;
+                    if(r.found)
+                    {
+                        continue;
+                  } }
+                retry_anyparams_2:
+                    // doesn't match
+                    if(&*(*position)[a].start_at) // is there another try?
+                    {
+                        info = (*position)[a].info;
+                        used = (*position)[a].used;
+                        goto retry_anyparams;
+                    }
+                    // no, backtrack
+                retry_anyparams_3:
+                    if(a > 0)
+                    {
+                        --a;
+                        goto retry_anyparams_2;
+                    }
+                    // cannot backtrack
+                    info = (*position)[0].info;
+                    return false;
+                }
+            retry_anyparams_4:
+                // Capture anything remaining in the restholder
+                if(model_tree.restholder_index != 0)
+                {
+                    //std::vector<bool> used_backup(used);
+                    //MatchInfo         info_backup(info);
+
+                    if(!TopLevel
+                    || !info.HasRestHolder(model_tree.restholder_index))
+                    {
+                        std::vector<CodeTree> matches;
+                        matches.reserve(tree.GetParamCount());
+                        for(unsigned b = 0; b < tree.GetParamCount(); ++b)
+                        {
+                            if(used[b]) continue; // Ignore subtrees that were already used
+                            // Save this tree to this restholder
+
+                            matches.push_back(tree.GetParam(b));
+                            used[b] = true;
+                            if(TopLevel) info.SaveMatchedParamIndex(b);
+                        }
+                        if(!info.SaveOrTestRestHolder(model_tree.restholder_index, matches))
+                        {
+                            // Failure at restholder matching. Backtrack if possible.
+                            //used.swap(used_backup);
+                            //info.swap(info_backup);
+                            goto retry_anyparams_3;
+                        }
+                        //std::cout << "Saved restholder " << model_tree.restholder_index << "\n";
+                    }
+                    else
+                    {
+                        const std::vector<CodeTree>& matches
+                            = info.GetRestHolderValues(model_tree.restholder_index);
+                        //std::cout << "Testing restholder " << model_tree.restholder_index << std::flush;
+                        for(size_t a=0; a<matches.size(); ++a)
+                        {
+                            bool found = false;
+                            for(unsigned b = 0; b < tree.GetParamCount(); ++b)
+                            {
+                                if(used[b]) continue;
+                                if(matches[a].IsIdenticalTo(tree.GetParam(b)))
+                                {
+                                    used[b] = true;
+                                    if(TopLevel) info.SaveMatchedParamIndex(b);
+                                    found = true;
+                                    break;
+                                }
+                            }
+                            if(!found)
+                            {
+                                //std::cout << " ... failed\n";
+                                // Failure at restholder matching. Backtrack if possible.
+                                //used.swap(used_backup);
+                                //info.swap(info_backup);
+                                goto retry_anyparams_3;
+                            }
+                        }
+                        //std::cout << " ... ok\n";
+                    }
+                }
+                return MatchResultType(true, model_tree.param_count ? &*position : 0);
+            }
+            case GroupFunction: // never occurs
+                break;
+        }
+        return false; // doesn't match
+    }
+}
+
+#endif
+
+#line 1 "fpoptimizer/fpoptimizer_optimize_synth.c"
+#include "fpconfig.h"
+#include "fparser.h"
+#include "fptypes.h"
+
+#ifdef FP_SUPPORT_OPTIMIZER
+
+#include <algorithm>
+#include <assert.h>
+
+// line removed for fpoptimizer.c: #include "fpoptimizer_optimize.h"
+
+namespace FPoptimizer_Optimize
+{
+    /* Synthesize the given grammatic parameter into the codetree */
+    void SynthesizeParam(
+        const ParamSpec& parampair,
+        CodeTree& tree,
+        MatchInfo& info,
+        bool inner = true)
+    {
+        switch( parampair.first )
+        {
+            case NumConstant:
+              { const ParamSpec_NumConstant& param = *(const ParamSpec_NumConstant*) parampair.second;
+                tree.SetImmed( param.constvalue );
+                if(inner) tree.Rehash(false);
+                break; }
+            case ParamHolder:
+              { const ParamSpec_ParamHolder& param = *(const ParamSpec_ParamHolder*) parampair.second;
+                tree.Become( info.GetParamHolderValue( param.index ) );
+                break; }
+            case SubFunction:
+              { const ParamSpec_SubFunction& param = *(const ParamSpec_SubFunction*) parampair.second;
+                tree.SetOpcode( param.data.subfunc_opcode );
+                for(unsigned a=0; a < param.data.param_count; ++a)
+                {
+                    CodeTree nparam;
+                    SynthesizeParam( ParamSpec_Extract(param.data.param_list, a), nparam, info, true );
+                    tree.AddParamMove(nparam);
+                }
+                if(param.data.restholder_index != 0)
+                {
+                    std::vector<CodeTree> trees
+                        ( info.GetRestHolderValues( param.data.restholder_index ) );
+                    tree.AddParamsMove(trees);
+                    // ^note: this fails if the same restholder is synth'd twice
+                    if(tree.GetParamCount() == 1)
+                    {
+                        /* Convert cMul <1> into <1> when <1> only contains one operand.
+                         * This is redundant code; it is also done in ConstantFolding(),
+                         * but it might be better for performance to do it here, too.
+                         */
+                        assert(tree.GetOpcode() == cAdd || tree.GetOpcode() == cMul
+                            || tree.GetOpcode() == cMin || tree.GetOpcode() == cMax
+                            || tree.GetOpcode() == cAnd || tree.GetOpcode() == cOr);
+                        tree.Become(tree.GetParam(0));
+                    }
+                }
+                if(inner)
+                    tree.Rehash();
+                break; }
+        }
+    }
+
+    void SynthesizeRule(
+        const Rule& rule,
+        CodeTree& tree,
+        MatchInfo& info)
+    {
+        switch(rule.ruletype)
+        {
+            case ProduceNewTree:
+            {
+                tree.DelParams();
+                SynthesizeParam( ParamSpec_Extract(rule.repl_param_list, 0), tree, info, false );
+                break;
+            }
+            case ReplaceParams:
+            default:
+            {
+                /* Delete the matched parameters from the source tree */
+                std::vector<unsigned> list = info.GetMatchedParamIndexes();
+                std::sort(list.begin(), list.end());
+                for(size_t a=list.size(); a-->0; )
+                    tree.DelParam( list[a] );
+
+                /* Synthesize the replacement params */
+                for(unsigned a=0; a < rule.repl_param_count; ++a)
+                {
+                    CodeTree nparam;
+                    SynthesizeParam( ParamSpec_Extract(rule.repl_param_list, a), nparam, info, true );
+                    tree.AddParamMove(nparam);
+                }
+                break;
+            }
+        }
+    }
+}
+
+#endif
+
+#line 1 "fpoptimizer/fpoptimizer_optimize_debug.c"
+// line removed for fpoptimizer.c: #include "fpoptimizer_grammar.h"
+// line removed for fpoptimizer.c: #include "fpoptimizer_opcodename.h"
+// line removed for fpoptimizer.c: #include "fpoptimizer_optimize.h"
+
+#ifdef DEBUG_SUBSTITUTIONS
+
+#include <sstream>
+#include <cstring>
+
+using namespace FUNCTIONPARSERTYPES;
+using namespace FPoptimizer_Grammar;
+using namespace FPoptimizer_CodeTree;
+using namespace FPoptimizer_Optimize;
+
+namespace FPoptimizer_Grammar
+{
+    void DumpMatch(const Rule& rule,
+                   const CodeTree& tree,
+                   const MatchInfo& info,
+                   bool DidMatch,
+                   std::ostream& o)
+    {
+        DumpMatch(rule,tree,info,DidMatch?"Found match":"Found mismatch",o);
+    }
+
+    void DumpMatch(const Rule& rule,
+                   const CodeTree& tree,
+                   const MatchInfo& info,
+                   const char* whydump,
+                   std::ostream& o)
+    {
+        static const char ParamHolderNames[][2] = {"%","&","x","y","z","a","b","c"};
+
+        o << whydump
+          << " (rule " << (&rule - grammar_rules) << ")"
+          << ":\n"
+            "  Pattern    : ";
+        { ParamSpec tmp;
+          tmp.first = SubFunction;
+          ParamSpec_SubFunction tmp2;
+          tmp2.data = rule.match_tree;
+          tmp.second = (const void*) &tmp2;
+          DumpParam(tmp, o);
+        }
+        o << "\n"
+            "  Replacement: ";
+        DumpParams(rule.repl_param_list, rule.repl_param_count, o);
+        o << "\n";
+
+        o <<
+            "  Tree       : ";
+        DumpTree(tree, o);
+        o << "\n";
+        if(!std::strcmp(whydump,"Found match")) DumpHashes(tree, o);
+
+        for(size_t a=0; a<info.paramholder_matches.size(); ++a)
+        {
+            if(!info.paramholder_matches[a].IsDefined()) continue;
+            o << "           " << ParamHolderNames[a] << " = ";
+            DumpTree(info.paramholder_matches[a], o);
+            o << "\n";
+        }
+
+        for(size_t b=0; b<info.restholder_matches.size(); ++b)
+        {
+            if(!info.restholder_matches[b].first) continue;
+            for(size_t a=0; a<info.restholder_matches[b].second.size(); ++a)
+            {
+                o << "         <" << b << "> = ";
+                DumpTree(info.restholder_matches[b].second[a], o);
+                o << std::endl;
+            }
+        }
+        o << std::flush;
+    }
+
+}
+
+#endif
+
+#line 1 "fpoptimizer/fpoptimizer_hash.c"
+#include <list>
+#include <algorithm>
+
+// line removed for fpoptimizer.c: #include "fpoptimizer_codetree.h"
+#include "fptypes.h"
+// line removed for fpoptimizer.c: #include "crc32.h"
+
+#ifdef FP_SUPPORT_OPTIMIZER
+
+using namespace FUNCTIONPARSERTYPES;
+//using namespace FPoptimizer_Grammar;
+
+namespace
+{
+    bool MarkIncompletes(FPoptimizer_CodeTree::CodeTree& tree)
+    {
+        if(tree.Is_Incompletely_Hashed())
+            return true;
+
+        bool needs_rehash = false;
+        for(size_t a=0; a<tree.GetParamCount(); ++a)
+            needs_rehash |= MarkIncompletes(tree.GetParam(a));
+        if(needs_rehash)
+            tree.Mark_Incompletely_Hashed();
+        return needs_rehash;
+    }
+
+    void FixIncompletes(FPoptimizer_CodeTree::CodeTree& tree)
+    {
+        if(tree.Is_Incompletely_Hashed())
+        {
+            for(size_t a=0; a<tree.GetParamCount(); ++a)
+                FixIncompletes(tree.GetParam(a));
+            tree.Rehash();
+        }
+    }
+}
+
+namespace FPoptimizer_CodeTree
+{
+    void CodeTree::Rehash(bool constantfolding)
+    {
+        if(constantfolding)
+            ConstantFolding();
+        data->Sort();
+        data->Recalculate_Hash_NoRecursion();
+    }
+
+    void CodeTreeData::Recalculate_Hash_NoRecursion()
+    {
+        fphash_t NewHash = { Opcode * FPHASH_CONST(0x3A83A83A83A83A0),
+                             Opcode * FPHASH_CONST(0x1131462E270012B)};
+        Depth = 1;
+        switch(Opcode)
+        {
+            case cImmed:
+                if(Value != 0.0)
+                {
+                    crc32_t crc = crc32::calc( (const unsigned char*) &Value,
+                                                sizeof(Value) );
+                    NewHash.hash1 ^= crc | (fphash_value_t(crc) << FPHASH_CONST(32));
+                    NewHash.hash2 += ((~fphash_value_t(crc)) * 3) ^ 1234567;
+                }
+                break; // no params
+            case VarBegin:
+                NewHash.hash1 ^= (Var<<24) | (Var>>24);
+                NewHash.hash2 += (fphash_value_t(Var)*5) ^ 2345678;
+                break; // no params
+            case cFCall: case cPCall:
+            {
+                crc32_t crc = crc32::calc( (const unsigned char*) &Funcno, sizeof(Funcno) );
+                NewHash.hash1 ^= (crc<<24) | (crc>>24);
+                NewHash.hash2 += ((~fphash_value_t(crc)) * 7) ^ 3456789;
+                /* passthru */
+            }
+            default:
+            {
+                size_t MaxChildDepth = 0;
+                for(size_t a=0; a<Params.size(); ++a)
+                {
+                    if(Params[a].GetDepth() > MaxChildDepth)
+                        MaxChildDepth = Params[a].GetDepth();
+
+                    NewHash.hash1 += (1)*FPHASH_CONST(0x2492492492492492);
+                    NewHash.hash1 *= FPHASH_CONST(1099511628211);
+                    //assert(&*Params[a] != this);
+                    NewHash.hash1 += Params[a].GetHash().hash1;
+
+                    NewHash.hash2 += (3)*FPHASH_CONST(0x9ABCD801357);
+                    NewHash.hash2 *= FPHASH_CONST(0xECADB912345);
+                    NewHash.hash2 += (~Params[a].GetHash().hash1) ^ 4567890;
+                }
+                Depth += MaxChildDepth;
+            }
+        }
+        if(Hash != NewHash)
+        {
+            Hash = NewHash;
+            OptimizedUsing = 0;
+        }
+    }
+
+    void CodeTree::FixIncompleteHashes()
+    {
+        MarkIncompletes(*this);
+        FixIncompletes(*this);
+    }
+}
+
+#endif
+
+#line 1 "fpoptimizer/fpoptimizer_makebytecode.c"
+#include <cmath>
+#include <list>
+#include <cassert>
+
+// line removed for fpoptimizer.c: #include "fpoptimizer_codetree.h"
+#include "fptypes.h"
+// line removed for fpoptimizer.c: #include "fpoptimizer_consts.h"
+// line removed for fpoptimizer.c: #include "fpoptimizer_bytecodesynth.h"
+// line removed for fpoptimizer.c: #include "fpoptimizer_optimize.h"
+
+#ifdef FP_SUPPORT_OPTIMIZER
+
+using namespace FUNCTIONPARSERTYPES;
+//using namespace FPoptimizer_Grammar;
+
+namespace
+{
+    using namespace FPoptimizer_CodeTree;
+
+    bool AssembleSequence(
+                  const CodeTree& tree, long count,
+                  const FPoptimizer_ByteCode::SequenceOpCode& sequencing,
+                  FPoptimizer_ByteCode::ByteCodeSynth& synth,
+                  size_t max_bytecode_grow_length);
+}
+
+namespace FPoptimizer_CodeTree
+{
+    void CodeTree::SynthesizeByteCode(
+        std::vector<unsigned>& ByteCode,
+        std::vector<double>&   Immed,
+        size_t& stacktop_max)
+    {
+    #ifdef DEBUG_SUBSTITUTIONS
+        std::cout << "Making bytecode for:\n";
+        DumpTreeWithIndent(*this);
+    #endif
+        while(RecreateInversionsAndNegations())
+        {
+        #ifdef DEBUG_SUBSTITUTIONS
+            std::cout << "One change issued, produced:\n";
+            DumpTreeWithIndent(*this);
+        #endif
+            FixIncompleteHashes();
+        }
+    #ifdef DEBUG_SUBSTITUTIONS
+        std::cout << "Actually synthesizing, after recreating inv/neg:\n";
+        DumpTreeWithIndent(*this);
+    #endif
+
+        FPoptimizer_ByteCode::ByteCodeSynth synth;
+
+        /* Then synthesize the actual expression */
+        SynthesizeByteCode(synth, false);
+        /* The "false" parameters tells SynthesizeByteCode
+         * that at the outermost synthesizing level, it does
+         * not matter if leftover temps are left in the stack.
+         */
+        synth.Pull(ByteCode, Immed, stacktop_max);
+    }
+
+    void CodeTree::SynthesizeByteCode(
+        FPoptimizer_ByteCode::ByteCodeSynth& synth,
+        bool MustPopTemps) const
+    {
+        // If the synth can already locate our operand in the stack,
+        // never mind synthesizing it again, just dup it.
+        if(synth.FindAndDup(*this))
+        {
+            return;
+        }
+
+        size_t n_subexpressions_synthesized = SynthCommonSubExpressions(synth);
+
+        switch(GetOpcode())
+        {
+            case VarBegin:
+                synth.PushVar(GetVar());
+                break;
+            case cImmed:
+                synth.PushImmed(GetImmed());
+                break;
+            case cAdd:
+            case cMul:
+            case cMin:
+            case cMax:
+            case cAnd:
+            case cOr:
+            case cAbsAnd:
+            case cAbsOr:
+            {
+                if(GetOpcode() == cMul) // Special treatment for cMul sequences
+                {
+                    // If the paramlist contains an Immed, and that Immed
+                    // fits in a long-integer, try to synthesize it
+                    // as add-sequences instead.
+                    bool did_muli = false;
+                    for(size_t a=0; a<GetParamCount(); ++a)
+                    {
+                        if(GetParam(a).IsLongIntegerImmed())
+                        {
+                            long value = GetParam(a).GetLongIntegerImmed();
+
+                            CodeTree tmp(*this, CodeTree::CloneTag());
+                            tmp.DelParam(a);
+                            tmp.Rehash();
+                            if(AssembleSequence(
+                                tmp, value, FPoptimizer_ByteCode::AddSequence,
+                                synth,
+                                MAX_MULI_BYTECODE_LENGTH))
+                            {
+                                did_muli = true;
+                                break;
+                            }
+                        }
+                    }
+                    if(did_muli)
+                        break; // done
+                }
+
+                int n_stacked = 0;
+                for(size_t a=0; a<GetParamCount(); ++a)
+                {
+                    GetParam(a).SynthesizeByteCode(synth);
+                    ++n_stacked;
+
+                    if(n_stacked > 1)
+                    {
+                        // Cumulate at the earliest opportunity.
+                        synth.AddOperation(GetOpcode(), 2); // stack state: -2+1 = -1
+                        n_stacked = n_stacked - 2 + 1;
+                    }
+                }
+                if(n_stacked == 0)
+                {
+                    // Uh, we got an empty cAdd/cMul/whatever...
+                    // Synthesize a default value.
+                    // This should never happen.
+                    switch(GetOpcode())
+                    {
+                        case cAdd:
+                        case cOr:
+                        case cAbsOr:
+                            synth.PushImmed(0);
+                            break;
+                        case cMul:
+                        case cAnd:
+                        case cAbsAnd:
+                            synth.PushImmed(1);
+                            break;
+                        case cMin:
+                        case cMax:
+                            //synth.PushImmed(NaN);
+                            synth.PushImmed(0);
+                            break;
+                        default:
+                            break;
+                    }
+                    ++n_stacked;
+                }
+                assert(n_stacked == 1);
+                break;
+            }
+            case cPow:
+            {
+                const CodeTree& p0 = GetParam(0);
+                const CodeTree& p1 = GetParam(1);
+
+                if(!p1.IsLongIntegerImmed()
+                || !AssembleSequence( /* Optimize integer exponents */
+                        p0, p1.GetLongIntegerImmed(),
+                        FPoptimizer_ByteCode::MulSequence,
+                        synth,
+                        MAX_POWI_BYTECODE_LENGTH)
+                  )
+                {
+                    p0.SynthesizeByteCode(synth);
+                    p1.SynthesizeByteCode(synth);
+                    synth.AddOperation(GetOpcode(), 2); // Create a vanilla cPow.
+                }
+                break;
+            }
+            case cIf:
+            case cAbsIf:
+            {
+                // Assume that the parameter count is 3 as it should.
+                FPoptimizer_ByteCode::ByteCodeSynth::IfData ifdata;
+
+                GetParam(0).SynthesizeByteCode(synth); // expression
+
+                synth.SynthIfStep1(ifdata, GetOpcode());
+
+                GetParam(1).SynthesizeByteCode(synth); // true branch
+
+                synth.SynthIfStep2(ifdata);
+
+                GetParam(2).SynthesizeByteCode(synth); // false branch
+
+                synth.SynthIfStep3(ifdata);
+                break;
+            }
+            case cFCall:
+            case cPCall:
+            {
+                // Assume that the parameter count is as it should.
+                for(size_t a=0; a<GetParamCount(); ++a)
+                    GetParam(a).SynthesizeByteCode(synth);
+                synth.AddOperation(GetOpcode(), (unsigned) GetParamCount());
+                synth.AddOperation(GetFuncNo(), 0, 0);
+                break;
+            }
+            default:
+            {
+                // Assume that the parameter count is as it should.
+                for(size_t a=0; a<GetParamCount(); ++a)
+                    GetParam(a).SynthesizeByteCode(synth);
+                synth.AddOperation(GetOpcode(), (unsigned) GetParamCount());
+                break;
+            }
+        }
+
+        // Tell the synthesizer which tree was just produced in the stack
+        synth.StackTopIs(*this);
+
+        // If we added subexpressions, peel them off the stack now
+        if(MustPopTemps && n_subexpressions_synthesized > 0)
+        {
+            size_t top = synth.GetStackTop();
+            synth.DoPopNMov(top-1-n_subexpressions_synthesized, top-1);
+        }
+    }
+}
+
+namespace
+{
+    bool AssembleSequence(
+        const CodeTree& tree, long count,
+        const FPoptimizer_ByteCode::SequenceOpCode& sequencing,
+        FPoptimizer_ByteCode::ByteCodeSynth& synth,
+        size_t max_bytecode_grow_length)
+    {
+        if(count != 0)
+        {
+            FPoptimizer_ByteCode::ByteCodeSynth backup = synth;
+
+            tree.SynthesizeByteCode(synth);
+
+            // Ignore the size generated by subtree
+            size_t bytecodesize_backup = synth.GetByteCodeSize();
+
+            FPoptimizer_ByteCode::AssembleSequence(count, sequencing, synth);
+
+            size_t bytecode_grow_amount = synth.GetByteCodeSize() - bytecodesize_backup;
+            if(bytecode_grow_amount > max_bytecode_grow_length)
+            {
+                synth = backup;
+                return false;
+            }
+            return true;
+        }
+        else
+        {
+            FPoptimizer_ByteCode::AssembleSequence(count, sequencing, synth);
+            return true;
+        }
+    }
+}
+
+#endif
+
+#line 1 "fpoptimizer/fpoptimizer_readbytecode.c"
+#include <cmath>
+#include <cassert>
+
+// line removed for fpoptimizer.c: #include "fpoptimizer_codetree.h"
+// line removed for fpoptimizer.c: #include "fpoptimizer_optimize.h"
+// line removed for fpoptimizer.c: #include "fpoptimizer_opcodename.h"
+// line removed for fpoptimizer.c: #include "fpoptimizer_grammar.h"
+#include "fptypes.h"
+
+// line removed for fpoptimizer.c: #include "fpoptimizer_consts.h"
+#include "fparser.h"
+
+#ifdef FP_SUPPORT_OPTIMIZER
+
+using namespace FUNCTIONPARSERTYPES;
+//using namespace FPoptimizer_Grammar;
+
+namespace
+{
+    using namespace FPoptimizer_CodeTree;
+
+    typedef std::vector<double> FactorStack;
+
+    const struct PowiMuliType
+    {
+        unsigned opcode_square;
+        unsigned opcode_cumulate;
+        unsigned opcode_invert;
+        unsigned opcode_half;
+        unsigned opcode_invhalf;
+    } iseq_powi = {cSqr,cMul,cInv,cSqrt,cRSqrt},
+      iseq_muli = {~unsigned(0), cAdd,cNeg, ~unsigned(0),~unsigned(0) };
+
+    double ParsePowiMuli(
+        const PowiMuliType& opcodes,
+        const std::vector<unsigned>& ByteCode, size_t& IP,
+        size_t limit,
+        size_t factor_stack_base,
+        FactorStack& stack)
+    {
+        double result = 1;
+        while(IP < limit)
+        {
+            if(ByteCode[IP] == opcodes.opcode_square)
+            {
+                if(!IsIntegerConst(result)) break;
+                result *= 2;
+                ++IP;
+                continue;
+            }
+            if(ByteCode[IP] == opcodes.opcode_invert)
+            {
+                result = -result;
+                ++IP;
+                continue;
+            }
+            if(ByteCode[IP] == opcodes.opcode_half)
+            {
+                if(IsIntegerConst(result) && result > 0 && ((long)result) % 2 == 0)
+                    break;
+                result *= 0.5;
+                ++IP;
+                continue;
+            }
+            if(ByteCode[IP] == opcodes.opcode_invhalf)
+            {
+                if(IsIntegerConst(result) && result > 0 && ((long)result) % 2 == 0)
+                    break;
+                result *= -0.5;
+                ++IP;
+                continue;
+            }
+
+            size_t dup_fetch_pos = IP;
+            double lhs = 1.0;
+
+            if(ByteCode[IP] == cFetch)
+            {
+                unsigned index = ByteCode[++IP];
+                if(index < factor_stack_base
+                || size_t(index-factor_stack_base) >= stack.size())
+                {
+                    // It wasn't a powi-fetch after all
+                    IP = dup_fetch_pos;
+                    break;
+                }
+                lhs = stack[index - factor_stack_base];
+                // Note: ^This assumes that cFetch of recentmost
+                //        is always converted into cDup.
+                goto dup_or_fetch;
+            }
+            if(ByteCode[IP] == cDup)
+            {
+                lhs = result;
+                goto dup_or_fetch;
+
+            dup_or_fetch:
+                stack.push_back(result);
+                ++IP;
+                double subexponent = ParsePowiMuli
+                    (opcodes,
+                     ByteCode, IP, limit,
+                     factor_stack_base, stack);
+                if(IP >= limit || ByteCode[IP] != opcodes.opcode_cumulate)
+                {
+                    // It wasn't a powi-dup after all
+                    IP = dup_fetch_pos;
+                    break;
+                }
+                ++IP; // skip opcode_cumulate
+                stack.pop_back();
+                result += lhs*subexponent;
+                continue;
+            }
+            break;
+        }
+        return result;
+    }
+
+    double ParsePowiSequence(const std::vector<unsigned>& ByteCode, size_t& IP,
+                           size_t limit,
+                           size_t factor_stack_base)
+    {
+        FactorStack stack;
+        stack.push_back(1.0);
+        return ParsePowiMuli(iseq_powi, ByteCode, IP, limit, factor_stack_base, stack);
+    }
+
+    double ParseMuliSequence(const std::vector<unsigned>& ByteCode, size_t& IP,
+                           size_t limit,
+                           size_t factor_stack_base)
+    {
+        FactorStack stack;
+        stack.push_back(1.0);
+        return ParsePowiMuli(iseq_muli, ByteCode, IP, limit, factor_stack_base, stack);
+    }
+
+    class CodeTreeParserData
+    {
+    public:
+        explicit CodeTreeParserData(bool k_powi)
+            : stack(), keep_powi(k_powi) { }
+
+        void Eat(size_t nparams, OPCODE opcode)
+        {
+            CodeTree newnode;
+            newnode.SetOpcode(opcode);
+
+            std::vector<CodeTree> params = Pop(nparams);
+            newnode.SetParamsMove(params);
+
+            if(!keep_powi)
+            switch(opcode)
+            {
+                //        asinh: log(x + sqrt(x*x + 1))
+                //cAsinh [x] -> cLog (cAdd x (cPow (cAdd (cPow x 2) 1) 0.5))
+                // Note: ^ Replacement function refers to x twice
+
+                //        acosh: log(x + sqrt(x*x - 1))
+                //cAcosh [x] -> cLog (cAdd x (cPow (cAdd (cPow x 2) -1) 0.5))
+
+                //        atanh: log( (1+x) / (1-x)) / 2
+                //cAtanh [x] -> cMul (cLog (cMul (cAdd 1 x) (cPow (cAdd 1 (cMul -1 x)) -1))) 0.5
+
+                //        asin: atan2(x, sqrt(1-x*x))
+                //cAsin[x] -> cAtan2 [x (cPow [(cAdd 1 (cMul (cPow [x 2] -1)) 0.5])]
+
+                //        acos: atan2(sqrt(1-x*x), x)
+                //cAcos[x] -> cAtan2 [(cPow [(cAdd 1 (cMul (cPow [x 2] -1)) 0.5]) x]
+
+                //     The hyperbolic functions themselves are:
+                //        sinh: (exp(x)-exp(-x)) / 2  = exp(-x) * (exp(2*x)-1) / 2
+                //cSinh [x] -> cMul 0.5 (cPow [CONSTANT_EI x]) (cAdd [-1 (cPow [CONSTANT_2E x])])
+
+                //        cosh: (exp(x)+exp(-x)) / 2  = exp(-x) * (exp(2*x)+1) / 2
+                //        cosh(-x) = cosh(x)
+                //cCosh [x] -> cMul 0.5 (cPow [CONSTANT_EI x]) (cAdd [ 1 (cPow [CONSTANT_2E x])])
+
+                //        tanh: sinh/cosh = (exp(2*x)-1) / (exp(2*x)+1)
+                //cTanh [x] -> (cMul (cAdd {(cPow [CONSTANT_2E x]) -1}) (cPow [(cAdd {(cPow [CONSTANT_2E x]) 1}) -1]))
+                case cTanh:
+                {
+                    CodeTree sinh, cosh;
+                    sinh.SetOpcode(cSinh); sinh.AddParam(newnode.GetParam(0)); sinh.Rehash();
+                    cosh.SetOpcode(cCosh); cosh.AddParamMove(newnode.GetParam(0)); cosh.Rehash();
+                    CodeTree pow;
+                    pow.SetOpcode(cPow);
+                    pow.AddParamMove(cosh);
+                    pow.AddParam(CodeTree(-1.0));
+                    pow.Rehash();
+                    newnode.SetOpcode(cMul);
+                    newnode.SetParamMove(0, sinh);
+                    newnode.AddParamMove(pow);
+                    break;
+                }
+
+                //        tan: sin/cos
+                //cTan [x] -> (cMul (cSin [x]) (cPow [(cCos [x]) -1]))
+                case cTan:
+                {
+                    CodeTree sin, cos;
+                    sin.SetOpcode(cSin); sin.AddParam(newnode.GetParam(0)); sin.Rehash();
+                    cos.SetOpcode(cCos); cos.AddParamMove(newnode.GetParam(0)); cos.Rehash();
+                    CodeTree pow;
+                    pow.SetOpcode(cPow);
+                    pow.AddParamMove(cos);
+                    pow.AddParam(CodeTree(-1.0));
+                    pow.Rehash();
+                    newnode.SetOpcode(cMul);
+                    newnode.SetParamMove(0, sin);
+                    newnode.AddParamMove(pow);
+                    break;
+                }
+
+                case cPow:
+                {
+                    const CodeTree& p0 = newnode.GetParam(0);
+                    const CodeTree& p1 = newnode.GetParam(1);
+                    if(p1.GetOpcode() == cAdd)
+                    {
+                        // convert x^(a + b) into x^a * x^b just so that
+                        // some optimizations can be run on it.
+                        // For instance, exp(log(x)*-61.1 + log(z)*-59.1)
+                        // won't be changed into exp(log(x*z)*-61.1)*z^2
+                        // unless we do this.
+                        std::vector<CodeTree> mulgroup(p1.GetParamCount());
+                        for(size_t a=0; a<p1.GetParamCount(); ++a)
+                        {
+                            CodeTree pow;
+                            pow.SetOpcode(cPow);
+                            pow.AddParam(p0);
+                            pow.AddParam(p1.GetParam(a));
+                            pow.Rehash();
+                            mulgroup[a].swap(pow);
+                        }
+                        newnode.SetOpcode(cMul);
+                        newnode.SetParamsMove(mulgroup);
+                    }
+                    break;
+                }
+
+                // Should we change sin(x) into cos(pi/2-x)
+                //               or cos(x) into sin(pi/2-x)?
+                //                        note: cos(x-pi/2) = cos(pi/2-x) = sin(x)
+                //                        note: sin(x-pi/2) = -sin(pi/2-x) = -cos(x)
+                default: break;
+            }
+
+            newnode.Rehash(!keep_powi);
+        /*
+            using namespace FPoptimizer_Grammar;
+            bool recurse = false;
+            while(ApplyGrammar(pack.glist[0], newnode, recurse)) // intermediate
+            { //std::cout << "Rerunning 1\n";
+                newnode.FixIncompleteHashes();
+                recurse = true;
+            }
+        */
+            FindClone(newnode, false);
+        #ifdef DEBUG_SUBSTITUTIONS
+            std::cout << "POP " << nparams << ", " << FP_GetOpcodeName(opcode)
+                      << "->" << FP_GetOpcodeName(newnode.GetOpcode())
+                      << ": PUSH ";
+            DumpTree(newnode);
+            std::cout <<std::endl;
+        #endif
+            stack.push_back(newnode);
+        }
+
+        void EatFunc(size_t nparams, OPCODE opcode, unsigned funcno)
+        {
+            CodeTree newnode;
+            newnode.SetFuncOpcode(opcode, funcno);
+            std::vector<CodeTree> params = Pop(nparams);
+            newnode.SetParamsMove(params);
+            newnode.Rehash(false);
+        #ifdef DEBUG_SUBSTITUTIONS
+            std::cout << "POP " << nparams << ", PUSH ";
+            DumpTree(newnode);
+            std::cout << std::endl;
+        #endif
+            FindClone(newnode);
+            stack.push_back(newnode);
+        }
+
+        void AddConst(double value)
+        {
+            CodeTree newnode(value);
+            FindClone(newnode);
+            Push(newnode);
+        }
+
+        void AddVar(unsigned varno)
+        {
+            CodeTree newnode(varno, CodeTree::VarTag());
+            FindClone(newnode);
+            Push(newnode);
+        }
+
+        void SwapLastTwoInStack()
+        {
+            stack[stack.size()-1].swap( stack[stack.size()-2] );
+        }
+
+        void Dup()
+        {
+            Fetch(stack.size()-1);
+        }
+
+        void Fetch(size_t which)
+        {
+            Push(stack[which]);
+        }
+
+        template<typename T>
+        void Push(T tree)
+        {
+        #ifdef DEBUG_SUBSTITUTIONS
+            std::cout << "PUSH ";
+            DumpTree(tree);
+            std::cout << std::endl;
+        #endif
+            stack.push_back(tree);
+        }
+
+        void PopNMov(size_t target, size_t source)
+        {
+            stack[target] = stack[source];
+            stack.resize(target+1);
+        }
+
+        CodeTree PullResult()
+        {
+            clones.clear();
+            CodeTree result(stack.back());
+            stack.resize(stack.size()-1);
+            return result;
+        }
+        std::vector<CodeTree> Pop(unsigned n_pop)
+        {
+            std::vector<CodeTree> result(n_pop);
+            for(unsigned n=0; n<n_pop; ++n)
+                result[n].swap(stack[stack.size()-n_pop+n]);
+            stack.resize(stack.size()-n_pop);
+            return result;
+        }
+
+        size_t GetStackTop() const { return stack.size(); }
+    private:
+        void FindClone(CodeTree& /*tree*/, bool /*recurse*/ = true)
+        {
+            // Disabled: Causes problems in optimization when
+            // the same subtree is included in logical and non-logical
+            // contexts: optimizations applied to the logical one will
+            // mess up the non-logical one.
+            return;
+            /*
+            std::multimap<fphash_t, CodeTree>::const_iterator
+                i = clones.lower_bound(tree.GetHash());
+            for(; i != clones.end() && i->first == tree.GetHash(); ++i)
+            {
+                if(i->second.IsIdenticalTo(tree))
+                    tree.Become(i->second);
+            }
+            if(recurse)
+                for(size_t a=0; a<tree.GetParamCount(); ++a)
+                    FindClone(tree.GetParam(a));
+            clones.insert(std::make_pair(tree.GetHash(), tree));
+            */
+        }
+    private:
+        std::vector<CodeTree> stack;
+        std::multimap<fphash_t, CodeTree> clones;
+
+        bool keep_powi;
+
+    private:
+        CodeTreeParserData(const CodeTreeParserData&);
+        CodeTreeParserData& operator=(const CodeTreeParserData&);
+    };
+
+    struct IfInfo
+    {
+        CodeTree condition;
+        CodeTree thenbranch;
+        size_t endif_location;
+    };
+}
+
+namespace FPoptimizer_CodeTree
+{
+    void CodeTree::GenerateFrom(
+        const std::vector<unsigned>& ByteCode,
+        const std::vector<double>& Immed,
+        const FunctionParser::Data& fpdata,
+        bool keep_powi)
+    {
+        std::vector<CodeTree> var_trees;
+        var_trees.reserve(fpdata.numVariables);
+        for(unsigned n=0; n<fpdata.numVariables; ++n)
+        {
+            var_trees.push_back( CodeTree(n+VarBegin, CodeTree::VarTag()) );
+        }
+        GenerateFrom(ByteCode,Immed,fpdata,var_trees,keep_powi);
+    }
+
+    void CodeTree::GenerateFrom(
+        const std::vector<unsigned>& ByteCode,
+        const std::vector<double>& Immed,
+        const FunctionParser::Data& fpdata,
+        const std::vector<CodeTree>& var_trees,
+        bool keep_powi)
+    {
+        CodeTreeParserData sim(keep_powi);
+        std::vector<IfInfo> if_stack;
+
+        for(size_t IP=0, DP=0; ; ++IP)
+        {
+        after_powi:
+            while(!if_stack.empty() &&
+              (   // Normal If termination rule:
+                  if_stack.back().endif_location == IP
+                  // This rule matches when cJumps are threaded:
+               || (IP < ByteCode.size() && ByteCode[IP] == cJump
+                   && if_stack.back().thenbranch.IsDefined())
+              ))
+            {
+                // The "else" of an "if" ends here
+                CodeTree elsebranch = sim.PullResult();
+                sim.Push(if_stack.back().condition);
+                sim.Push(if_stack.back().thenbranch);
+                sim.Push(elsebranch);
+                sim.Eat(3, cIf);
+                if_stack.pop_back();
+            }
+            if(IP >= ByteCode.size()) break;
+
+            unsigned opcode = ByteCode[IP];
+            if((opcode == cSqr || opcode == cDup
+             || opcode == cInv || opcode == cNeg
+             || opcode == cSqrt || opcode == cRSqrt
+             || opcode == cFetch))
+            {
+                // Parse a powi sequence
+                size_t was_ip = IP;
+                double exponent = ParsePowiSequence(
+                    ByteCode, IP, if_stack.empty() ? ByteCode.size() : if_stack.back().endif_location,
+                    sim.GetStackTop()-1);
+                if(exponent != 1.0)
+                {
+                    //std::cout << "Found exponent at " << was_ip << ": " << exponent << "\n";
+                    sim.AddConst(exponent);
+                    sim.Eat(2, cPow);
+                    goto after_powi;
+                }
+                if(opcode == cDup
+                || opcode == cFetch
+                || opcode == cNeg)
+                {
+                    double factor = ParseMuliSequence(
+                        ByteCode, IP, if_stack.empty() ? ByteCode.size() : if_stack.back().endif_location,
+                        sim.GetStackTop()-1);
+                    if(factor != 1.0)
+                    {
+                        //std::cout << "Found factor at " << was_ip << ": " << factor << "\n";
+                        sim.AddConst(factor);
+                        sim.Eat(2, cMul);
+                        goto after_powi;
+                    }
+                }
+                IP = was_ip;
+            }
+            if(OPCODE(opcode) >= VarBegin)
+            {
+                sim.Push(var_trees[opcode-VarBegin]);
+            }
+            else
+            {
+                switch( OPCODE(opcode) )
+                {
+                    // Specials
+                    case cIf:
+                    case cAbsIf:
+                    {
+                        if_stack.resize(if_stack.size() + 1);
+                        CodeTree res( sim.PullResult() );
+                        if_stack.back().condition.swap( res );
+                        if_stack.back().endif_location = ByteCode.size();
+                        IP += 2; // dp,sp for elsebranch are irrelevant.
+                        continue;
+                    }
+                    case cJump:
+                    {
+                        CodeTree res( sim.PullResult() );
+                        if_stack.back().thenbranch.swap( res );
+                        if_stack.back().endif_location = ByteCode[IP+1]+1;
+                        IP += 2;
+                        continue;
+                    }
+                    case cImmed:
+                        sim.AddConst(Immed[DP++]);
+                        break;
+                    case cDup:
+                        sim.Dup();
+                        break;
+                    case cNop:
+                        break;
+                    case cFCall:
+                    {
+                        unsigned funcno = ByteCode[++IP];
+                        assert(funcno < fpdata.FuncPtrs.size());
+                        unsigned params = fpdata.FuncPtrs[funcno].params;
+                        sim.EatFunc(params, OPCODE(opcode), funcno);
+                        break;
+                    }
+                    case cPCall:
+                    {
+                        unsigned funcno = ByteCode[++IP];
+                        assert(funcno < fpdata.FuncParsers.size());
+                        const FunctionParserBase<double>& p =
+                            *fpdata.FuncParsers[funcno].parserPtr;
+                        unsigned params = fpdata.FuncParsers[funcno].params;
+
+                        /* Inline the procedure call */
+                        /* Works because cPCalls can never recurse */
+                        std::vector<CodeTree> paramlist = sim.Pop(params);
+                        CodeTree pcall_tree;
+                        pcall_tree.GenerateFrom(p.data->ByteCode, p.data->Immed, *p.data,
+                                                paramlist);
+                        sim.Push(pcall_tree);
+                        break;
+                    }
+                    // Unary operators requiring special attention
+                    case cInv:  // already handled by powi_opt
+                        //sim.Eat(1, cInv);
+                        //break;
+                        sim.AddConst(1);
+                        sim.SwapLastTwoInStack();
+                        sim.Eat(2, cDiv);
+                        break;
+                    case cNeg: // already handled by powi_opt
+                        sim.Eat(1, cNeg);
+                        break;
+                        sim.AddConst(0);
+                        sim.SwapLastTwoInStack();
+                        sim.Eat(2, cSub);
+                        break;
+                    case cSqr: // already handled by powi_opt
+                        //sim.Eat(1, cSqr);
+                        //break;
+                        sim.AddConst(2);
+                        sim.Eat(2, cPow);
+                        break;
+                    // Unary functions requiring special attention
+                    case cSqrt: // already handled by powi_opt
+                        sim.AddConst(0.5);
+                        sim.Eat(2, cPow);
+                        break;
+                    case cRSqrt: // already handled by powi_opt
+                        sim.AddConst(-0.5);
+                        sim.Eat(2, cPow);
+                        break;
+                    case cCbrt:
+                        sim.AddConst(1.0 / 3.0);
+                        sim.Eat(2, cPow);
+                        break;
+                    case cDeg:
+                        sim.AddConst(CONSTANT_DR);
+                        sim.Eat(2, cMul);
+                        break;
+                    case cRad:
+                        sim.AddConst(CONSTANT_RD);
+                        sim.Eat(2, cMul);
+                        break;
+                    case cExp:
+                        if(keep_powi) goto default_function_handling;
+                        sim.AddConst(CONSTANT_E);
+                        sim.SwapLastTwoInStack();
+                        sim.Eat(2, cPow);
+                        break;
+                    case cExp2: // from fpoptimizer
+                        if(keep_powi) goto default_function_handling;
+                        sim.AddConst(2.0);
+                        sim.SwapLastTwoInStack();
+                        sim.Eat(2, cPow);
+                        break;
+                    case cCot:
+                        sim.Eat(1, cTan);
+                        if(keep_powi) { sim.Eat(1, cInv); break; }
+                        sim.AddConst(-1);
+                        sim.Eat(2, cPow);
+                        break;
+                    case cCsc:
+                        sim.Eat(1, cSin);
+                        if(keep_powi) { sim.Eat(1, cInv); break; }
+                        sim.AddConst(-1);
+                        sim.Eat(2, cPow);
+                        break;
+                    case cSec:
+                        sim.Eat(1, cCos);
+                        if(keep_powi) { sim.Eat(1, cInv); break; }
+                        sim.AddConst(-1);
+                        sim.Eat(2, cPow);
+                        break;
+                    case cInt: // int(x) = floor(x + 0.5)
+                    #ifndef __x86_64
+                        if(keep_powi) { sim.Eat(1, cInt); break; }
+                    #endif
+                        sim.AddConst(0.5);
+                        sim.Eat(2, cAdd);
+                        sim.Eat(1, cFloor);
+                        break;
+                    case cLog10:
+                        sim.Eat(1, cLog);
+                        sim.AddConst(CONSTANT_L10I);
+                        sim.Eat(2, cMul);
+                        break;
+                    case cLog2:
+                        sim.Eat(1, cLog);
+                        sim.AddConst(CONSTANT_L2I);
+                        sim.Eat(2, cMul);
+                        break;
+                    case cLog2by: // x y     -> log(x)*CONSTANT_L2I*y
+                        sim.SwapLastTwoInStack();   // y x
+                        sim.Eat(1, cLog);           // y log(x)
+                        sim.AddConst(CONSTANT_L2I); // y log(x) CONSTANT_L2I
+                        sim.Eat(3, cMul);           // y*log(x)*CONSTANT_L2I
+                        break;
+                    //case cLog:
+                    //    sim.Eat(1, cLog2);
+                    //    sim.AddConst(CONSTANT_L2);
+                    //    sim.Eat(2, cMul);
+                    //    break;
+                    // Binary operators requiring special attention
+                    case cSub:
+                        if(keep_powi) { sim.Eat(2, cSub); break; }
+                        sim.AddConst(-1);
+                        sim.Eat(2, cMul); // -x is x*-1
+                        sim.Eat(2, cAdd); // Minus is negative adding
+                        break;
+                    case cRSub: // from fpoptimizer
+                        sim.SwapLastTwoInStack();
+                        if(keep_powi) { sim.Eat(2, cSub); break; }
+                        sim.AddConst(-1);
+                        sim.Eat(2, cMul); // -x is x*-1
+                        sim.Eat(2, cAdd);
+                        break;
+                    case cDiv:
+                        if(keep_powi) { sim.Eat(2, cDiv); break; }
+                        sim.AddConst(-1);
+                        sim.Eat(2, cPow); // 1/x is x^-1
+                        sim.Eat(2, cMul); // Divide is inverse multiply
+                        break;
+                    case cRDiv: // from fpoptimizer
+                        sim.SwapLastTwoInStack();
+                        if(keep_powi) { sim.Eat(2, cDiv); break; }
+                        sim.AddConst(-1);
+                        sim.Eat(2, cPow); // 1/x is x^-1
+                        sim.Eat(2, cMul); // Divide is inverse multiply
+                        break;
+                    // Binary operators not requiring special attention
+                    case cAdd: case cMul:
+                    case cMod: case cPow:
+                    case cEqual: case cLess: case cGreater:
+                    case cNEqual: case cLessOrEq: case cGreaterOrEq:
+                    case cAnd: case cOr:
+                    case cAbsAnd: case cAbsOr:
+                        sim.Eat(2, OPCODE(opcode));
+                        break;
+                    // Unary operators not requiring special attention
+                    case cNot:
+                    case cNotNot: // from fpoptimizer
+                    case cAbsNot:
+                    case cAbsNotNot:
+                        sim.Eat(1, OPCODE(opcode));
+                        break;
+                    // Special opcodes generated by fpoptimizer itself
+                    case cFetch:
+                        sim.Fetch(ByteCode[++IP]);
+                        break;
+                    case cPopNMov:
+                    {
+                        unsigned stackOffs_target = ByteCode[++IP];
+                        unsigned stackOffs_source = ByteCode[++IP];
+                        sim.PopNMov(stackOffs_target, stackOffs_source);
+                        break;
+                    }
+                    // Other functions
+#ifndef FP_DISABLE_EVAL
+                    case cEval:
+                    {
+                        size_t paramcount = fpdata.numVariables;
+                        sim.Eat(paramcount, OPCODE(opcode));
+                        break;
+                    }
+#endif
+
+                    default:
+                    default_function_handling:;
+                        unsigned funcno = opcode-cAbs;
+                        assert(funcno < FUNC_AMOUNT);
+                        const FuncDefinition& func = Functions[funcno];
+                        sim.Eat(func.params, OPCODE(opcode));
+                        break;
+                }
+            }
+        }
+        Become(sim.PullResult());
+    #ifdef DEBUG_SUBSTITUTIONS
+        std::cout << "Produced tree:\n";
+        DumpTreeWithIndent(*this);
+    #endif
+    }
+}
+
+#endif
+
+#line 1 "fpoptimizer/fpoptimizer_constantfolding.c"
+// line removed for fpoptimizer.c: #include "fpoptimizer_codetree.h"
+// line removed for fpoptimizer.c: #include "fpoptimizer_optimize.h"
+// line removed for fpoptimizer.c: #include "fpoptimizer_consts.h"
+
+#include <cmath> /* for CalculateResultBoundaries() */
+#include <algorithm>
+
+#include "fpconfig.h"
+#include "fparser.h"
+#include "fptypes.h"
+
+#ifdef FP_SUPPORT_OPTIMIZER
+
+using namespace FUNCTIONPARSERTYPES;
+using namespace FPoptimizer_CodeTree;
+
+#define FP_MUL_COMBINE_EXPONENTS
+
+#ifdef _MSC_VER
+#include <float.h>
+#define isinf(x) (!_finite(x))
+#endif
+
+namespace
+{
+    bool IsLogicalTrueValue(const MinMaxTree& p, bool abs)
+    {
+        if(p.has_min && p.min >= 0.5) return true;
+        if(!abs && p.has_max && p.max <= -0.5) return true;
+        return false;
+    }
+    bool IsLogicalFalseValue(const MinMaxTree& p, bool abs)
+    {
+        if(abs)
+            return p.has_max && p.max < 0.5;
+        else
+            return p.has_min && p.has_max
+               && p.min > -0.5 && p.max < 0.5;
+    }
+    int GetLogicalValue(const MinMaxTree& p, bool abs)
+    {
+        if(IsLogicalTrueValue(p, abs)) return 1;
+        if(IsLogicalFalseValue(p, abs)) return 0;
+        return -1;
+    }
+
+    struct ComparisonSet /* For optimizing And, Or */
+    {
+        static const int Lt_Mask = 0x1; // 1=less
+        static const int Eq_Mask = 0x2; // 2=equal
+        static const int Le_Mask = 0x3; // 1+2 = Less or Equal
+        static const int Gt_Mask = 0x4; // 4=greater
+        static const int Ne_Mask = 0x5; // 4+1 = Greater or Less, i.e. Not equal
+        static const int Ge_Mask = 0x6; // 4+2 = Greater or Equal
+        static int Swap_Mask(int m) { return (m&Eq_Mask)
+                                  | ((m&Lt_Mask) ? Gt_Mask : 0)
+                                  | ((m&Gt_Mask) ? Lt_Mask : 0); }
+        struct Comparison
+        {
+            CodeTree a;
+            CodeTree b;
+            int relationship;
+        };
+        std::vector<Comparison> relationships;
+        struct Item
+        {
+            CodeTree value;
+            bool negated;
+        };
+        std::vector<Item> plain_set;
+        int const_offset;
+
+        enum RelationshipResult
+        {
+            Ok,
+            BecomeZero,
+            BecomeOne,
+            Suboptimal
+        };
+        enum ConditionType
+        {
+            cond_or,
+            cond_and,
+            cond_mul,
+            cond_add
+        };
+
+        ComparisonSet():
+            relationships(),
+            plain_set(),
+            const_offset(0)
+        {
+        }
+
+        RelationshipResult AddItem(const CodeTree& a, bool negated, ConditionType type)
+        {
+            for(size_t c=0; c<plain_set.size(); ++c)
+                if(plain_set[c].value.IsIdenticalTo(a))
+                {
+                    if(negated != plain_set[c].negated)
+                    {
+                        switch(type)
+                        {
+                            case cond_or:
+                                return BecomeOne;
+                            case cond_add:
+                                plain_set.erase(plain_set.begin() + c);
+                                const_offset += 1;
+                                return Suboptimal;
+                            case cond_and:
+                            case cond_mul:
+                                return BecomeZero;
+                        }
+                    }
+                    return Suboptimal;
+                }
+            Item pole;
+            pole.value   = a;
+            pole.negated = negated;
+            plain_set.push_back(pole);
+            return Ok;
+        }
+
+        RelationshipResult AddRelationship(CodeTree a, CodeTree b, int reltype, ConditionType type)
+        {
+            switch(type)
+            {
+                case cond_or:
+                    if(reltype == 7) return BecomeOne;
+                    break;
+                case cond_add:
+                    if(reltype == 7) { const_offset += 1; return Suboptimal; }
+                    break;
+                case cond_and:
+                case cond_mul:
+                    if(reltype == 0) return BecomeZero;
+                    break;
+            }
+
+            if(!(a.GetHash() < b.GetHash()))
+            {
+                a.swap(b);
+                reltype = Swap_Mask(reltype);
+            }
+
+            for(size_t c=0; c<relationships.size(); ++c)
+            {
+                if(relationships[c].a.IsIdenticalTo(a)
+                && relationships[c].b.IsIdenticalTo(b))
+                {
+                    switch(type)
+                    {
+                        case cond_or:
+                        {
+                            int newrel = relationships[c].relationship | reltype;
+                            if(newrel == 7) return BecomeOne;
+                            relationships[c].relationship = newrel;
+                            break;
+                        }
+                        case cond_and:
+                        case cond_mul:
+                        {
+                            int newrel = relationships[c].relationship & reltype;
+                            if(newrel == 0) return BecomeZero;
+                            relationships[c].relationship = newrel;
+                            break;
+                        }
+                        case cond_add:
+                        {
+                            int newrel_or  = relationships[c].relationship | reltype;
+                            int newrel_and = relationships[c].relationship & reltype;
+                            if(newrel_or  == 5 // < + >
+                            && newrel_and == 0)
+                            {
+                                // (x<y) + (x>y) = x!=y
+                                relationships[c].relationship = Ne_Mask;
+                                return Suboptimal;
+                            }
+                            if(newrel_or  == 7
+                            && newrel_and == 0)
+                            {
+                                // (x<y) + (x>=y) = 1
+                                // (x<=y) + (x>y) = 1
+                                // (x=y) + (x!=y) = 1
+                                const_offset += 1;
+                                relationships.erase(relationships.begin()+c);
+                                return Suboptimal;
+                            }
+                            if(newrel_or  == 7
+                            && newrel_and == Eq_Mask)
+                            {
+                                // (x<=y) + (x>=y) = 1 + (x=y)
+                                relationships[c].relationship = Eq_Mask;
+                                const_offset += 1;
+                                return Suboptimal;
+                            }
+                            continue;
+                        }
+                    }
+                    return Suboptimal;
+                }
+            }
+            Comparison comp;
+            comp.a = a;
+            comp.b = b;
+            comp.relationship = reltype;
+            relationships.push_back(comp);
+            return Ok;
+        }
+    };
+
+    struct CollectionSet /* For optimizing Add,  Mul */
+    {
+        struct Collection
+        {
+            CodeTree value;
+            CodeTree factor;
+            bool factor_needs_rehashing;
+
+            Collection() : value(),factor(), factor_needs_rehashing(false) { }
+            Collection(const CodeTree& v, const CodeTree& f)
+                : value(v), factor(f), factor_needs_rehashing(false) { }
+        };
+        std::multimap<fphash_t, Collection> collections;
+
+        enum CollectionResult
+        {
+            Ok,
+            Suboptimal
+        };
+
+        typedef std::multimap<fphash_t, Collection>::iterator PositionType;
+
+        PositionType FindIdenticalValueTo(const CodeTree& value)
+        {
+            fphash_t hash = value.GetHash();
+            for(PositionType
+                i = collections.lower_bound(hash);
+                i != collections.end() && i->first == hash;
+                ++i)
+            {
+                if(value.IsIdenticalTo(i->second.value))
+                    return i;
+            }
+            return collections.end();
+        }
+        bool Found(const PositionType& b) { return b != collections.end(); }
+
+        CollectionResult AddCollectionTo(const CodeTree& factor,
+                                         const PositionType& into_which)
+        {
+            Collection& c = into_which->second;
+            if(c.factor_needs_rehashing)
+                c.factor.AddParam(factor);
+            else
+            {
+                CodeTree add;
+                add.SetOpcode(cAdd);
+                add.AddParamMove(c.factor);
+                add.AddParam(factor);
+                c.factor.swap(add);
+                c.factor_needs_rehashing = true;
+            }
+            return Suboptimal;
+        }
+
+        CollectionResult AddCollection(const CodeTree& value, const CodeTree& factor)
+        {
+            const fphash_t hash = value.GetHash();
+            PositionType i = collections.lower_bound(hash);
+            for(; i != collections.end() && i->first == hash; ++i)
+            {
+                if(i->second.value.IsIdenticalTo(value))
+                    return AddCollectionTo(factor, i);
+            }
+            collections.insert(
+                i,
+                std::make_pair( hash, Collection(value, factor) ) );
+            return Ok;
+        }
+
+        CollectionResult AddCollection(const CodeTree& a)
+        {
+            return AddCollection(a, CodeTree(1.0) );
+        }
+    };
+
+    struct Select2ndRev
+    {
+        template<typename T>
+        inline bool operator() (const T& a, const T& b) const
+        {
+            return a.second > b.second;
+        }
+    };
+    struct Select1st
+    {
+        template<typename T1, typename T2>
+        inline bool operator() (const std::pair<T1,T2>& a,
+                                const std::pair<T1,T2>& b) const
+        {
+            return a.first < b.first;
+        }
+
+        template<typename T1, typename T2>
+        inline bool operator() (const std::pair<T1,T2>& a, T1 b) const
+        {
+            return a.first < b;
+        }
+
+        template<typename T1, typename T2>
+        inline bool operator() (T1 a, const std::pair<T1,T2>& b) const
+        {
+            return a < b.first;
+        }
+    };
+
+    bool IsEvenIntegerConst(double v)
+    {
+        return IsIntegerConst(v) && ((long)v % 2) == 0;
+    }
+
+    struct ConstantExponentCollection
+    {
+        typedef std::pair<double, std::vector<CodeTree> > ExponentInfo;
+        std::vector<ExponentInfo> data;
+
+        void MoveToSet_Unique(double exponent, std::vector<CodeTree>& source_set)
+        {
+            data.push_back( std::pair<double, std::vector<CodeTree> >
+                            (exponent, std::vector<CodeTree>() ) );
+            data.back().second.swap(source_set);
+        }
+        void MoveToSet_NonUnique(double exponent, std::vector<CodeTree>& source_set)
+        {
+            std::vector<ExponentInfo>::iterator i
+                = std::lower_bound(data.begin(), data.end(), exponent, Select1st());
+            if(i != data.end() && i->first == exponent)
+            {
+                i->second.insert(i->second.end(), source_set.begin(), source_set.end());
+            }
+            else
+            {
+                //MoveToSet_Unique(exponent, source_set);
+                data.insert(i,  std::pair<double, std::vector<CodeTree> >
+                                (exponent, source_set) );
+            }
+        }
+
+        bool Optimize()
+        {
+            /* TODO: Group them such that:
+             *
+             *      x^3 *         z^2 becomes (x*z)^2 * x^1
+             *      x^3 * y^2.5 * z^2 becomes (x*z*y)^2 * y^0.5 * x^1
+             *                    rather than (x*y*z)^2 * (x*y)^0.5 * x^0.5
+             *
+             *      x^4.5 * z^2.5     becomes (z * x)^2.5 * x^2
+             *                        becomes (x*z*x)^2 * (z*x)^0.5
+             *                        becomes (z*x*x*z*x)^0.5 * (z*x*x)^1.5 -- buzz, bad.
+             *
+             */
+            bool changed = false;
+            std::sort( data.begin(), data.end(), Select1st() );
+        redo:
+            /* Supposed algorithm:
+             * For the smallest pair of data[] where the difference
+             * between the two is a "neat value" (x*16 is positive integer),
+             * do the combining as indicated above.
+             */
+            /*
+             * NOTE: Hanged in Testbed test P44, looping the following
+             *       (Var0 ^ 0.75) * ((1.5 * Var0) ^ 1.0)
+             *     = (Var0 ^ 1.75) *  (1.5         ^ 1.0)
+             *       Fixed by limiting to cases where (exp_a != 1.0).
+             *
+             * NOTE: Converting (x*z)^0.5 * x^16.5
+             *              into x^17 * z^0.5
+             *       is handled by code within CollectMulGroup().
+             *       However, bacause it is prone for infinite looping,
+             *       the use of "IsIdenticalTo(before)" is added at the
+             *       end of ConstantFolding_MulGrouping().
+             *
+             *       This algorithm could make it into (x*z*x)^0.5 * x^16,
+             *       but this is wrong, for it falsely includes x^evenint.. twice.
+             */
+            for(size_t a=0; a<data.size(); ++a)
+            {
+                double exp_a = data[a].first;
+                if(FloatEqual(exp_a, 1.0)) continue;
+                for(size_t b=a+1; b<data.size(); ++b)
+                {
+                    double exp_b = data[b].first;
+                    double exp_diff = exp_b - exp_a;
+                    if(exp_diff >= fabs(exp_a)) break;
+                    double exp_diff_still_probable_integer = exp_diff * 16.0;
+                    if(IsIntegerConst(exp_diff_still_probable_integer)
+                    && !(IsIntegerConst(exp_b) && !IsIntegerConst(exp_diff))
+                      )
+                    {
+                        /* When input is x^3 * z^2,
+                         * exp_a = 2
+                         * a_set = z
+                         * exp_b = 3
+                         * b_set = x
+                         * exp_diff = 3-2 = 1
+                         */
+                        std::vector<CodeTree>& a_set = data[a].second;
+                        std::vector<CodeTree>& b_set = data[b].second;
+          #ifdef DEBUG_SUBSTITUTIONS
+                        std::cout << "Before ConstantExponentCollection iteration:\n";
+                        Dump(std::cout);
+          #endif
+                        if(IsIntegerConst(exp_b)
+                        && IsEvenIntegerConst(exp_b)
+                        //&& !IsEvenIntegerConst(exp_diff)
+                        && !IsEvenIntegerConst(exp_diff+exp_a))
+                        {
+                            CodeTree tmp2;
+                            tmp2.SetOpcode(cMul);
+                            tmp2.SetParamsMove(b_set);
+                            tmp2.Rehash();
+                            CodeTree tmp;
+                            tmp.SetOpcode(cAbs);
+                            tmp.AddParamMove(tmp2);
+                            tmp.Rehash();
+                            b_set.resize(1);
+                            b_set[0].swap(tmp);
+                        }
+
+                        a_set.insert(a_set.end(), b_set.begin(), b_set.end());
+
+                        std::vector<CodeTree> b_copy = b_set;
+                        data.erase(data.begin() + b);
+                        MoveToSet_NonUnique(exp_diff, b_copy);
+                        changed = true;
+
+          #ifdef DEBUG_SUBSTITUTIONS
+                        std::cout << "After ConstantExponentCollection iteration:\n";
+                        Dump(std::cout);
+          #endif
+                        goto redo;
+                    }
+                }
+            }
+            return changed;
+        }
+
+    #ifdef DEBUG_SUBSTITUTIONS
+        void Dump(std::ostream& out)
+        {
+            for(size_t a=0; a<data.size(); ++a)
+            {
+                out.precision(12);
+                out << data[a].first << ": ";
+                for(size_t b=0; b<data[a].second.size(); ++b)
+                {
+                    if(b > 0) out << '*';
+                    DumpTree(data[a].second[b], out);
+                }
+                out << std::endl;
+            }
+        }
+    #endif
+
+    };
+
+    struct RangeComparisonData
+    {
+        enum Decision
+        {
+            MakeFalse=0,
+            MakeTrue=1,
+            MakeNEqual=2,
+            MakeEqual=3,
+            MakeNotNotP0=4,
+            MakeNotNotP1=5,
+            MakeNotP0=6,
+            MakeNotP1=7,
+            Unchanged=8
+        };
+        enum WhatDoWhenCase
+        {
+            Never =0,
+            Eq0   =1, // val==0
+            Eq1   =2, // val==1
+            Gt0Le1=3, // val>0 && val<=1
+            Ge0Lt1=4  // val>=0 && val<1
+        };
+        Decision if_identical; // What to do when operands are identical
+        Decision if_always[4]; // What to do if Always <, <=, >, >=
+        struct { Decision what : 4; WhatDoWhenCase when : 4; }
+            p0_logical_a, p1_logical_a,
+            p0_logical_b, p1_logical_b;
+
+        Decision Analyze(const CodeTree& a, const CodeTree& b) const
+        {
+            if(a.IsIdenticalTo(b))
+                return if_identical;
+
+            MinMaxTree p0 = a.CalculateResultBoundaries();
+            MinMaxTree p1 = b.CalculateResultBoundaries();
+            if(p0.has_max && p1.has_min)
+            {
+                if(p0.max <  p1.min && if_always[0] != Unchanged)
+                    return if_always[0]; // p0 < p1
+                if(p0.max <= p1.min && if_always[1] != Unchanged)
+                    return if_always[1]; // p0 <= p1
+            }
+            if(p0.has_min && p1.has_max)
+            {
+                if(p0.min >  p1.max && if_always[2] != Unchanged)
+                    return if_always[2]; // p0 > p1
+                if(p0.min >= p1.max && if_always[3] != Unchanged)
+                    return if_always[3]; // p0 >= p1
+            }
+
+            if(a.IsLogicalValue())
+            {
+                if(p0_logical_a.what != Unchanged)
+                    if(TestCase(p0_logical_a.when, p1)) return p0_logical_a.what;
+                if(p0_logical_b.what != Unchanged)
+                    if(TestCase(p0_logical_b.when, p1)) return p0_logical_b.what;
+            }
+            if(b.IsLogicalValue())
+            {
+                if(p1_logical_a.what != Unchanged)
+                    if(TestCase(p1_logical_a.when, p0)) return p1_logical_a.what;
+                if(p1_logical_b.what != Unchanged)
+                    if(TestCase(p1_logical_b.when, p0)) return p1_logical_b.what;
+            }
+            return Unchanged;
+        }
+        static bool TestCase(WhatDoWhenCase when, const MinMaxTree& p)
+        {
+            if(!p.has_min || !p.has_max) return false;
+            switch(when)
+            {
+                case Eq0: return p.min==0.0 && p.max==p.min;
+                case Eq1: return p.min==1.0 && p.max==p.max;
+                case Gt0Le1: return p.min>0 && p.max<=1;
+                case Ge0Lt1: return p.min>=0 && p.max<1;
+                default:;
+            }
+            return false;
+        }
+    };
+
+}
+
+namespace FPoptimizer_CodeTree
+{
+    template<typename CondType> /* ComparisonSet::ConditionType */
+    bool CodeTree::ConstantFolding_LogicCommon(CondType cond_type, bool is_logical)
+    {
+        bool should_regenerate = false;
+        ComparisonSet comp;
+        for(size_t a=0; a<GetParamCount(); ++a)
+        {
+            ComparisonSet::RelationshipResult change = ComparisonSet::Ok;
+            const CodeTree& atree = GetParam(a);
+            switch(atree.GetOpcode())
+            {
+                case cEqual:
+                    change = comp.AddRelationship(atree.GetParam(0), atree.GetParam(1), ComparisonSet::Eq_Mask, cond_type);
+                    break;
+                case cNEqual:
+                    change = comp.AddRelationship(atree.GetParam(0), atree.GetParam(1), ComparisonSet::Ne_Mask, cond_type);
+                    break;
+                case cLess:
+                    change = comp.AddRelationship(atree.GetParam(0), atree.GetParam(1), ComparisonSet::Lt_Mask, cond_type);
+                    break;
+                case cLessOrEq:
+                    change = comp.AddRelationship(atree.GetParam(0), atree.GetParam(1), ComparisonSet::Le_Mask, cond_type);
+                    break;
+                case cGreater:
+                    change = comp.AddRelationship(atree.GetParam(0), atree.GetParam(1), ComparisonSet::Gt_Mask, cond_type);
+                    break;
+                case cGreaterOrEq:
+                    change = comp.AddRelationship(atree.GetParam(0), atree.GetParam(1), ComparisonSet::Ge_Mask, cond_type);
+                    break;
+                case cNot:
+                    change = comp.AddItem(atree.GetParam(0), true, cond_type);
+                    break;
+                case cNotNot:
+                    change = comp.AddItem(atree.GetParam(0), false, cond_type);
+                    break;
+                default:
+                    if(is_logical || atree.IsLogicalValue())
+                        change = comp.AddItem(atree, false, cond_type);
+            }
+            switch(change)
+            {
+            ReplaceTreeWithZero:
+                    data = new CodeTreeData(0.0);
+                    return true;
+            ReplaceTreeWithOne:
+                    data = new CodeTreeData(1.0);
+                    return true;
+                case ComparisonSet::Ok: // ok
+                    break;
+                case ComparisonSet::BecomeZero: // whole set was invalidated
+                    goto ReplaceTreeWithZero;
+                case ComparisonSet::BecomeOne: // whole set was validated
+                    goto ReplaceTreeWithOne;
+                case ComparisonSet::Suboptimal: // something was changed
+                    should_regenerate = true;
+                    break;
+            }
+        }
+        if(should_regenerate)
+        {
+          #ifdef DEBUG_SUBSTITUTIONS
+            std::cout << "Before ConstantFolding_LogicCommon: "; DumpTree(*this);
+            std::cout << "\n";
+          #endif
+
+            if(is_logical)
+            {
+                DelParams(); // delete all params
+            }
+            else
+            {
+                // Delete only logical params
+                for(size_t a=GetParamCount(); a-- > 0; )
+                {
+                    const CodeTree& atree = GetParam(a);
+                    if(atree.IsLogicalValue())
+                        DelParam(a);
+                }
+            }
+
+            for(size_t a=0; a<comp.plain_set.size(); ++a)
+            {
+                if(comp.plain_set[a].negated)
+                {
+                    CodeTree r;
+                    r.SetOpcode(cNot);
+                    r.AddParamMove(comp.plain_set[a].value);
+                    r.Rehash();
+                    AddParamMove(r);
+                }
+                else if(!is_logical)
+                {
+                    CodeTree r;
+                    r.SetOpcode(cNotNot);
+                    r.AddParamMove(comp.plain_set[a].value);
+                    r.Rehash();
+                    AddParamMove(r);
+                }
+                else
+                    AddParamMove(comp.plain_set[a].value);
+            }
+            for(size_t a=0; a<comp.relationships.size(); ++a)
+            {
+                CodeTree r;
+                r.SetOpcode(cNop); // dummy
+                switch(comp.relationships[a].relationship)
+                {
+                    case ComparisonSet::Lt_Mask: r.SetOpcode( cLess ); break;
+                    case ComparisonSet::Eq_Mask: r.SetOpcode( cEqual ); break;
+                    case ComparisonSet::Gt_Mask: r.SetOpcode( cGreater ); break;
+                    case ComparisonSet::Le_Mask: r.SetOpcode( cLessOrEq ); break;
+                    case ComparisonSet::Ne_Mask: r.SetOpcode( cNEqual ); break;
+                    case ComparisonSet::Ge_Mask: r.SetOpcode( cGreaterOrEq ); break;
+                }
+                r.AddParamMove(comp.relationships[a].a);
+                r.AddParamMove(comp.relationships[a].b);
+                r.Rehash();
+                AddParamMove(r);
+            }
+            if(comp.const_offset != 0)
+                AddParam( CodeTree( double(comp.const_offset) ) );
+          #ifdef DEBUG_SUBSTITUTIONS
+            std::cout << "After ConstantFolding_LogicCommon: "; DumpTree(*this);
+            std::cout << "\n";
+          #endif
+            return true;
+        }
+        /*
+        Note: One thing this does not yet do, is to detect chains
+              such as x=y & y=z & x=z, which could be optimized
+              to x=y & x=z.
+        */
+        return false;
+    }
+
+    bool CodeTree::ConstantFolding_AndLogic()
+    {
+        return ConstantFolding_LogicCommon( ComparisonSet::cond_and, true );
+    }
+    bool CodeTree::ConstantFolding_OrLogic()
+    {
+        return ConstantFolding_LogicCommon( ComparisonSet::cond_or, true );
+    }
+    bool CodeTree::ConstantFolding_AddLogicItems()
+    {
+        return ConstantFolding_LogicCommon( ComparisonSet::cond_add, false );
+    }
+    bool CodeTree::ConstantFolding_MulLogicItems()
+    {
+        return ConstantFolding_LogicCommon( ComparisonSet::cond_mul, false );
+    }
+
+    static CodeTree CollectMulGroup_Item(
+        CodeTree& value,
+        bool& has_highlevel_opcodes)
+    {
+        switch(value.GetOpcode())
+        {
+            case cPow:
+            {
+                CodeTree exponent = value.GetParam(1);
+                value.Become( value.GetParam(0) );
+                return exponent;
+            }
+            /* - disabled to avoid clashes with powi
+            case cCbrt:
+                value.Become( value.GetParam(0) );
+                has_highlevel_opcodes = true;
+                return CodeTree(1.0 / 3.0);
+            case cSqrt:
+                value.Become( value.GetParam(0) );
+                has_highlevel_opcodes = true;
+                return CodeTree(0.5);
+            */
+            case cRSqrt:
+                value.Become( value.GetParam(0) );
+                has_highlevel_opcodes = true;
+                return CodeTree(-0.5);
+            case cInv:
+                value.Become( value.GetParam(0) );
+                has_highlevel_opcodes = true;
+                return CodeTree(-1.0);
+            default: break;
+        }
+        return CodeTree(1.0);
+    }
+
+    static void CollectMulGroup(
+        CollectionSet& mul, const CodeTree& tree, const CodeTree& factor,
+        bool& should_regenerate,
+        bool& has_highlevel_opcodes
+    )
+    {
+        for(size_t a=0; a<tree.GetParamCount(); ++a)
+        {
+            CodeTree value(tree.GetParam(a));
+
+            CodeTree exponent ( CollectMulGroup_Item(value, has_highlevel_opcodes) );
+
+            if(!factor.IsImmed() || factor.GetImmed() != 1.0)
+            {
+                CodeTree new_exp;
+                new_exp.SetOpcode(cMul);
+                new_exp.AddParam( exponent );
+                new_exp.AddParam( factor );
+                new_exp.Rehash();
+                exponent.swap( new_exp );
+            }
+        #if 0 /* FIXME: This does not work */
+            if(value.GetOpcode() == cMul)
+            {
+                if(1)
+                {
+                    // Avoid erroneously converting
+                    //          (x*z)^0.5 * z^2
+                    // into     x^0.5 * z^2.5
+                    // It should be x^0.5 * abs(z)^2.5, but this is not a good conversion.
+                    bool exponent_is_even = exponent.IsImmed() && IsEvenIntegerConst(exponent.GetImmed());
+
+                    for(size_t b=0; b<value.GetParamCount(); ++b)
+                    {
+                        bool tmp=false;
+                        CodeTree val(value.GetParam(b));
+                        CodeTree exp(CollectMulGroup_Item(val, tmp));
+                        if(exponent_is_even
+                        || (exp.IsImmed() && IsEvenIntegerConst(exp.GetImmed())))
+                        {
+                            CodeTree new_exp;
+                            new_exp.SetOpcode(cMul);
+                            new_exp.AddParam(exponent);
+                            new_exp.AddParamMove(exp);
+                            new_exp.ConstantFolding();
+                            if(!new_exp.IsImmed() || !IsEvenIntegerConst(new_exp.GetImmed()))
+                            {
+                                goto cannot_adopt_mul;
+                            }
+                        }
+                    }
+                }
+                CollectMulGroup(mul, value, exponent,
+                                should_regenerate,
+                                has_highlevel_opcodes);
+            }
+            else cannot_adopt_mul:
+        #endif
+            {
+                if(mul.AddCollection(value, exponent) == CollectionSet::Suboptimal)
+                    should_regenerate = true;
+            }
+        }
+    }
+
+    bool CodeTree::ConstantFolding_MulGrouping()
+    {
+        bool has_highlevel_opcodes = false;
+        bool should_regenerate = false;
+        CollectionSet mul;
+
+        CollectMulGroup(mul, *this, CodeTree(1.0),
+                        should_regenerate,
+                        has_highlevel_opcodes);
+
+        typedef std::pair<CodeTree/*exponent*/,
+                          std::vector<CodeTree>/*base value (mul group)*/
+                         > exponent_list;
+        typedef std::multimap<fphash_t,/*exponent hash*/
+                              exponent_list> exponent_map;
+        exponent_map by_exponent;
+
+        for(CollectionSet::PositionType
+            j = mul.collections.begin();
+            j != mul.collections.end();
+            ++j)
+        {
+            CodeTree& value = j->second.value;
+            CodeTree& exponent = j->second.factor;
+            if(j->second.factor_needs_rehashing) exponent.Rehash();
+            const fphash_t exponent_hash = exponent.GetHash();
+
+            exponent_map::iterator i = by_exponent.lower_bound(exponent_hash);
+            for(; i != by_exponent.end() && i->first == exponent_hash; ++i)
+                if(i->second.first.IsIdenticalTo(exponent))
+                {
+                    if(!exponent.IsImmed() || !FloatEqual(exponent.GetImmed(), 1.0))
+                        should_regenerate = true;
+                    i->second.second.push_back(value);
+                    goto skip_b;
+                }
+            by_exponent.insert(i, std::make_pair(exponent_hash,
+                std::make_pair(exponent,
+                               std::vector<CodeTree> (size_t(1), value)
+                              )));
+        skip_b:;
+        }
+
+    #ifdef FP_MUL_COMBINE_EXPONENTS
+        ConstantExponentCollection by_float_exponent;
+        for(exponent_map::iterator
+            j,i = by_exponent.begin();
+            i != by_exponent.end();
+            i=j)
+        {
+            j=i; ++j;
+            exponent_list& list = i->second;
+            if(list.first.IsImmed())
+            {
+                double exponent = list.first.GetImmed();
+                if(!(exponent == 0.0))
+                    by_float_exponent.MoveToSet_Unique(exponent, list.second);
+                by_exponent.erase(i);
+            }
+        }
+        if(by_float_exponent.Optimize())
+            should_regenerate = true;
+    #endif
+
+        if(should_regenerate)
+        {
+            CodeTree before = *this;
+            before.CopyOnWrite();
+
+          #ifdef DEBUG_SUBSTITUTIONS
+            std::cout << "Before ConstantFolding_MulGrouping: "; DumpTree(before);
+            std::cout << "\n";
+          #endif
+            DelParams();
+
+            /* Group by exponents */
+            /* First handle non-constant exponents */
+            for(exponent_map::iterator
+                i = by_exponent.begin();
+                i != by_exponent.end();
+                ++i)
+            {
+                exponent_list& list = i->second;
+        #ifndef FP_MUL_COMBINE_EXPONENTS
+                if(list.first.IsImmed())
+                {
+                    double exponent = list.first.GetImmed();
+                    if(exponent == 0.0) continue;
+                    if(FloatEqual(exponent, 1.0))
+                    {
+                        AddParamsMove(list.second);
+                        continue;
+                    }
+                }
+        #endif
+                CodeTree mul;
+                mul.SetOpcode(cMul);
+                mul.SetParamsMove( list.second);
+                mul.Rehash();
+
+                if(has_highlevel_opcodes && list.first.IsImmed())
+                {
+                    if(list.first.GetImmed() == 1.0 / 3.0)
+                    {
+                        CodeTree cbrt;
+                        cbrt.SetOpcode(cCbrt);
+                        cbrt.AddParamMove(mul);
+                        cbrt.Rehash();
+                        AddParamMove(cbrt);
+                        continue;
+                    }
+                    if(list.first.GetImmed() == 0.5)
+                    {
+                        CodeTree sqrt;
+                        sqrt.SetOpcode(cSqrt);
+                        sqrt.AddParamMove(mul);
+                        sqrt.Rehash();
+                        AddParamMove(sqrt);
+                        continue;
+                    }
+                    if(list.first.GetImmed() == -0.5)
+                    {
+                        CodeTree rsqrt;
+                        rsqrt.SetOpcode(cRSqrt);
+                        rsqrt.AddParamMove(mul);
+                        rsqrt.Rehash();
+                        AddParamMove(rsqrt);
+                        continue;
+                    }
+                    if(list.first.GetImmed() == -1.0)
+                    {
+                        CodeTree inv;
+                        inv.SetOpcode(cInv);
+                        inv.AddParamMove(mul);
+                        inv.Rehash();
+                        AddParamMove(inv);
+                        continue;
+                    }
+                }
+                CodeTree pow;
+                pow.SetOpcode(cPow);
+                pow.AddParamMove(mul);
+                pow.AddParamMove( list.first );
+                pow.Rehash();
+                AddParamMove(pow);
+            }
+        #ifdef FP_MUL_COMBINE_EXPONENTS
+            by_exponent.clear();
+            /* Then handle constant exponents */
+            for(size_t a=0; a<by_float_exponent.data.size(); ++a)
+            {
+                double exponent = by_float_exponent.data[a].first;
+                if(FloatEqual(exponent, 1.0))
+                {
+                    AddParamsMove(by_float_exponent.data[a].second);
+                    continue;
+                }
+                CodeTree mul;
+                mul.SetOpcode(cMul);
+                mul.SetParamsMove( by_float_exponent.data[a].second );
+                mul.Rehash();
+                CodeTree pow;
+                pow.SetOpcode(cPow);
+                pow.AddParamMove(mul);
+                pow.AddParam( CodeTree( exponent ) );
+                pow.Rehash();
+                AddParamMove(pow);
+            }
+        #endif
+          #ifdef DEBUG_SUBSTITUTIONS
+            std::cout << "After ConstantFolding_MulGrouping: "; DumpTree(*this);
+            std::cout << "\n";
+          #endif
+            // return true;
+            return !IsIdenticalTo(before); // avoids infinite looping
+        }
+        return false;
+    }
+
+    bool CodeTree::ConstantFolding_AddGrouping()
+    {
+        bool should_regenerate = false;
+        CollectionSet add;
+        for(size_t a=0; a<GetParamCount(); ++a)
+        {
+            if(GetParam(a).GetOpcode() == cMul) continue;
+            if(add.AddCollection(GetParam(a)) == CollectionSet::Suboptimal)
+                should_regenerate = true;
+            // This catches x + x and x - x
+        }
+        std::vector<bool> remaining ( GetParamCount() );
+        size_t has_mulgroups_remaining = 0;
+        for(size_t a=0; a<GetParamCount(); ++a)
+        {
+            const CodeTree& mulgroup = GetParam(a);
+            if(mulgroup.GetOpcode() == cMul)
+            {
+                // This catches x + y*x*z, producing x*(1 + y*z)
+                //
+                // However we avoid changing 7 + 7*x into 7*(x+1),
+                // because it may lead us into producing code such
+                // as 20*x + 50*(x+1) + 10, which would be much
+                // better expressed as 70*x + 60, and converting
+                // back to that format would be needlessly hairy.
+                for(size_t b=0; b<mulgroup.GetParamCount(); ++b)
+                {
+                    if(mulgroup.GetParam(b).IsImmed()) continue;
+                    CollectionSet::PositionType c
+                        = add.FindIdenticalValueTo(mulgroup.GetParam(b));
+                    if(add.Found(c))
+                    {
+                        CodeTree tmp(mulgroup, CodeTree::CloneTag());
+                        tmp.DelParam(b);
+                        tmp.Rehash();
+                        add.AddCollectionTo(tmp, c);
+                        should_regenerate = true;
+                        goto done_a;
+                    }
+                }
+                remaining[a]  = true;
+                has_mulgroups_remaining += 1;
+            done_a:;
+            }
+        }
+
+        if(has_mulgroups_remaining > 0)
+        {
+            if(has_mulgroups_remaining > 1) // is it possible to find a duplicate?
+            {
+                std::vector< std::pair<CodeTree, size_t> > occurance_counts;
+                std::multimap<fphash_t, size_t> occurance_pos;
+                bool found_dup = false;
+                for(size_t a=0; a<GetParamCount(); ++a)
+                    if(remaining[a])
+                    {
+                        // This catches x*a + x*b, producing x*(a+b)
+                        for(size_t b=0; b<GetParam(a).GetParamCount(); ++b)
+                        {
+                            const CodeTree& p = GetParam(a).GetParam(b);
+                            const fphash_t   p_hash = p.GetHash();
+                            for(std::multimap<fphash_t, size_t>::const_iterator
+                                i = occurance_pos.lower_bound(p_hash);
+                                i != occurance_pos.end() && i->first == p_hash;
+                                ++i)
+                            {
+                                if(occurance_counts[i->second].first.IsIdenticalTo(p))
+                                {
+                                    occurance_counts[i->second].second += 1;
+                                    found_dup = true;
+                                    goto found_mulgroup_item_dup;
+                                }
+                            }
+                            occurance_counts.push_back(std::make_pair(p, size_t(1)));
+                            occurance_pos.insert(std::make_pair(p_hash, occurance_counts.size()-1));
+                        found_mulgroup_item_dup:;
+                        }
+                    }
+                if(found_dup)
+                {
+                    // Find the "x" to group by
+                    CodeTree group_by; { size_t max = 0;
+                    for(size_t p=0; p<occurance_counts.size(); ++p)
+                        if(occurance_counts[p].second <= 1)
+                            occurance_counts[p].second = 0;
+                        else
+                        {
+                            occurance_counts[p].second *= occurance_counts[p].first.GetDepth();
+                            if(occurance_counts[p].second > max)
+                                { group_by = occurance_counts[p].first; max = occurance_counts[p].second; }
+                        } }
+                    // Collect the items for adding in the group (a+b)
+                    CodeTree group_add;
+                    group_add.SetOpcode(cAdd);
+
+        #ifdef DEBUG_SUBSTITUTIONS
+                    std::cout << "Duplicate across some trees: ";
+                    DumpTree(group_by);
+                    std::cout << " in ";
+                    DumpTree(*this);
+                    std::cout << "\n";
+        #endif
+                    for(size_t a=0; a<GetParamCount(); ++a)
+                        if(remaining[a])
+                            for(size_t b=0; b<GetParam(a).GetParamCount(); ++b)
+                                if(group_by.IsIdenticalTo(GetParam(a).GetParam(b)))
+                                {
+                                    CodeTree tmp(GetParam(a), CodeTree::CloneTag());
+                                    tmp.DelParam(b);
+                                    tmp.Rehash();
+                                    group_add.AddParamMove(tmp);
+                                    remaining[a] = false;
+                                    break;
+                                }
+                    group_add.Rehash();
+                    CodeTree group;
+                    group.SetOpcode(cMul);
+                    group.AddParamMove(group_by);
+                    group.AddParamMove(group_add);
+                    group.Rehash();
+                    add.AddCollection(group);
+                    should_regenerate = true;
+                }
+            }
+
+            // all remaining mul-groups.
+            for(size_t a=0; a<GetParamCount(); ++a)
+                if(remaining[a])
+                {
+                    if(add.AddCollection(GetParam(a)) == CollectionSet::Suboptimal)
+                        should_regenerate = true;
+                }
+        }
+
+        if(should_regenerate)
+        {
+          #ifdef DEBUG_SUBSTITUTIONS
+            std::cout << "Before ConstantFolding_AddGrouping: "; DumpTree(*this);
+            std::cout << "\n";
+          #endif
+            DelParams();
+
+            for(CollectionSet::PositionType
+                j = add.collections.begin();
+                j != add.collections.end();
+                ++j)
+            {
+                CodeTree& value = j->second.value;
+                CodeTree& coeff = j->second.factor;
+                if(j->second.factor_needs_rehashing) coeff.Rehash();
+
+                if(coeff.IsImmed())
+                {
+                    if(coeff.GetImmed() == 0.0)
+                        continue;
+                    if(FloatEqual(coeff.GetImmed(), 1.0))
+                    {
+                        AddParamMove(value);
+                        continue;
+                    }
+                }
+                CodeTree mul;
+                mul.SetOpcode(cMul);
+                mul.AddParamMove(value);
+                mul.AddParamMove(coeff);
+                mul.Rehash();
+                AddParamMove(mul);
+            }
+          #ifdef DEBUG_SUBSTITUTIONS
+            std::cout << "After ConstantFolding_AddGrouping: "; DumpTree(*this);
+            std::cout << "\n";
+          #endif
+            return true;
+        }
+        return false;
+    }
+
+    bool CodeTree::ConstantFolding_IfOperations()
+    {
+        // If the If() condition begins with a cNot,
+        // remove the cNot and swap the branches.
+        for(;;)
+        {
+            if(GetParam(0).GetOpcode() == cNot)
+            {
+                SetOpcode(cIf);
+                GetParam(0).Become( GetParam(0).GetParam(0) );
+                GetParam(1).swap(GetParam(2));
+            }
+            else if(GetParam(0).GetOpcode() == cAbsNot)
+            {
+                SetOpcode(cAbsIf);
+                GetParam(0).Become( GetParam(0).GetParam(0) );
+                GetParam(1).swap(GetParam(2));
+            }
+            else break;
+        }
+        if(GetParam(0).GetOpcode() == cIf
+        || GetParam(0).GetOpcode() == cAbsIf)
+        {
+            //     if(if(x, a,b), c,d)
+            //  -> if(x, if(a, c,d), if(b, c,d))
+            // when either a or b is constantly true/false
+            CodeTree cond = GetParam(0);
+            CodeTree truth_a;
+            truth_a.SetOpcode(cond.GetOpcode() == cIf ? cNotNot : cAbsNotNot);
+            truth_a.AddParam(cond.GetParam(1));
+            truth_a.ConstantFolding();
+            CodeTree truth_b;
+            truth_b.SetOpcode(cond.GetOpcode() == cIf ? cNotNot : cAbsNotNot);
+            truth_b.AddParam(cond.GetParam(2));
+            truth_b.ConstantFolding();
+            if(truth_a.IsImmed() || truth_b.IsImmed())
+            {
+                CodeTree then_tree;
+                then_tree.SetOpcode(cond.GetOpcode());
+                then_tree.AddParam(cond.GetParam(1));
+                then_tree.AddParam(GetParam(1));
+                then_tree.AddParam(GetParam(2));
+                then_tree.Rehash();
+                CodeTree else_tree;
+                else_tree.SetOpcode(cond.GetOpcode());
+                else_tree.AddParam(cond.GetParam(2));
+                else_tree.AddParam(GetParam(1));
+                else_tree.AddParam(GetParam(2));
+                else_tree.Rehash();
+                SetOpcode(cond.GetOpcode());
+                SetParam(0, cond.GetParam(0));
+                SetParamMove(1, then_tree);
+                SetParamMove(2, else_tree);
+                return true; // rerun cIf optimization
+            }
+        }
+        if(GetParam(1).GetOpcode() == GetParam(2).GetOpcode()
+        && (GetParam(1).GetOpcode() == cIf
+         || GetParam(1).GetOpcode() == cAbsIf))
+        {
+            CodeTree& leaf1 = GetParam(1);
+            CodeTree& leaf2 = GetParam(2);
+            if(leaf1.GetParam(0).IsIdenticalTo(leaf2.GetParam(0))
+            && (leaf1.GetParam(1).IsIdenticalTo(leaf2.GetParam(1))
+             || leaf1.GetParam(2).IsIdenticalTo(leaf2.GetParam(2))))
+            {
+            //     if(x, if(y,a,b), if(y,c,d))
+            // ->  if(y, if(x,a,c), if(x,b,d))
+            // when either a,c are identical or b,d are identical
+                CodeTree then_tree;
+                then_tree.SetOpcode(GetOpcode());
+                then_tree.AddParam(GetParam(0));
+                then_tree.AddParam(leaf1.GetParam(1));
+                then_tree.AddParam(leaf2.GetParam(1));
+                then_tree.Rehash();
+                CodeTree else_tree;
+                else_tree.SetOpcode(GetOpcode());
+                else_tree.AddParam(GetParam(0));
+                else_tree.AddParam(leaf1.GetParam(2));
+                else_tree.AddParam(leaf2.GetParam(2));
+                else_tree.Rehash();
+                SetOpcode(leaf1.GetOpcode());
+                SetParam(0, leaf1.GetParam(0));
+                SetParamMove(1, then_tree);
+                SetParamMove(2, else_tree);
+                return true; // rerun cIf optimization
+            // cIf [x (cIf [y a z]) (cIf [y z b])] : (cXor x y) z (cIf[x a b])
+            // ^ if only we had cXor opcode.
+            }
+            if(leaf1.GetParam(1).IsIdenticalTo(leaf2.GetParam(1))
+            && leaf1.GetParam(2).IsIdenticalTo(leaf2.GetParam(2)))
+            {
+                //    if(x, if(y,a,b), if(z,a,b))
+                // -> if( if(x, y,z), a,b)
+                CodeTree cond_tree;
+                cond_tree.SetOpcode(GetOpcode());
+                cond_tree.AddParamMove(GetParam(0));
+                cond_tree.AddParam(leaf1.GetParam(0));
+                cond_tree.AddParam(leaf2.GetParam(0));
+                cond_tree.Rehash();
+                SetOpcode(leaf1.GetOpcode());
+                SetParamMove(0, cond_tree);
+                SetParam(2, leaf1.GetParam(2));
+                SetParam(1, leaf1.GetParam(1));
+                return true; // rerun cIf optimization
+            }
+            if(leaf1.GetParam(1).IsIdenticalTo(leaf2.GetParam(2))
+            && leaf1.GetParam(2).IsIdenticalTo(leaf2.GetParam(1)))
+            {
+                //    if(x, if(y,a,b), if(z,b,a))
+                // -> if( if(x, y,!z), a,b)
+                CodeTree not_tree;
+                not_tree.SetOpcode(leaf2.GetOpcode() == cIf ? cNot : cAbsNot);
+                not_tree.AddParam(leaf2.GetParam(0));
+                not_tree.Rehash();
+                CodeTree cond_tree;
+                cond_tree.SetOpcode(GetOpcode());
+                cond_tree.AddParamMove(GetParam(0));
+                cond_tree.AddParam(leaf1.GetParam(0));
+                cond_tree.AddParamMove(not_tree);
+                cond_tree.Rehash();
+                SetOpcode(leaf1.GetOpcode());
+                SetParamMove(0, cond_tree);
+                SetParam(2, leaf1.GetParam(2));
+                SetParam(1, leaf1.GetParam(1));
+                return true; // rerun cIf optimization
+            }
+        }
+
+        // If the sub-expression evaluates to approx. zero, yield param3.
+        // If the sub-expression evaluates to approx. nonzero, yield param2.
+        MinMaxTree p = GetParam(0).CalculateResultBoundaries();
+        switch(GetLogicalValue(p, GetOpcode()==cAbsIf))
+        {
+            case 1: // true
+                Become(GetParam(1));
+                return true; // rerun optimization (opcode changed)
+            case 0: // false
+                Become(GetParam(2));
+                return true; // rerun optimization (opcode changed)
+            default: ;
+        }
+
+        CodeTree& branch1 = GetParam(1);
+        CodeTree& branch2 = GetParam(2);
+
+        if(branch1.IsIdenticalTo(branch2))
+        {
+            // If both branches of an If() are identical, the test becomes unnecessary
+            Become(GetParam(1));
+            return true; // rerun optimization (opcode changed)
+        }
+
+        const OPCODE op1 = branch1.GetOpcode();
+        const OPCODE op2 = branch2.GetOpcode();
+        if(op1 == op2)
+        {
+            // If both branches apply the same unary function to different values,
+            // extract the function. E.g. if(x,sin(a),sin(b)) -> sin(if(x,a,b))
+            if(branch1.GetParamCount() == 1)
+            {
+                CodeTree changed_if;
+                changed_if.SetOpcode(GetOpcode());
+                changed_if.AddParamMove(GetParam(0));
+                changed_if.AddParam(branch1.GetParam(0));
+                changed_if.AddParam(branch2.GetParam(0));
+                changed_if.Rehash();
+                SetOpcode(op1);
+                DelParams();
+                AddParamMove(changed_if);
+                return true; // rerun optimization (opcode changed)
+            }
+            if(op1 == cAdd    || op1 == cMul
+            || op1 == cAnd    || op1 == cOr
+            || op1 == cAbsAnd || op1 == cAbsOr
+            || op1 == cMin    || op1 == cMax)
+            {
+                // If the two groups contain one or more
+                // identical values, extract them.
+                std::vector<CodeTree> overlap;
+                for(size_t a=branch1.GetParamCount(); a-- > 0; )
+                {
+                    for(size_t b=branch2.GetParamCount(); b-- > 0; )
+                    {
+                        if(branch1.GetParam(a).IsIdenticalTo(branch2.GetParam(b)))
+                        {
+                            if(overlap.empty()) { branch1.CopyOnWrite(); branch2.CopyOnWrite(); }
+                            overlap.push_back(branch1.GetParam(a));
+                            branch2.DelParam(b);
+                            branch1.DelParam(a);
+                            break;
+                        }
+                    }
+                }
+                if(!overlap.empty())
+                {
+                    branch1.Rehash();
+                    branch2.Rehash();
+                    CodeTree changed_if;
+                    changed_if.SetOpcode(GetOpcode());
+                    changed_if.SetParamsMove(GetParams());
+                    changed_if.Rehash();
+                    SetOpcode(op1);
+                    SetParamsMove(overlap);
+                    AddParamMove(changed_if);
+                    return true; // rerun optimization (opcode changed)
+                }
+            }
+        }
+        // if(x, y+z, y) -> if(x, z,0)+y
+        if(op1 == cAdd
+        || op1 == cMul
+        || (op1 == cAnd && branch2.IsLogicalValue())
+        || (op1 == cOr  && branch2.IsLogicalValue())
+          )
+        {
+            for(size_t a=branch1.GetParamCount(); a-- > 0; )
+                if(branch1.GetParam(a).IsIdenticalTo(branch2))
+                {
+                    branch1.CopyOnWrite();
+                    branch1.DelParam(a);
+                    branch1.Rehash();
+                    CodeTree branch2_backup = branch2;
+                    branch2 = CodeTree( (op1==cAdd||op1==cOr) ? 0.0 : 1.0 );
+                    CodeTree changed_if;
+                    changed_if.SetOpcode(GetOpcode());
+                    changed_if.SetParamsMove(GetParams());
+                    changed_if.Rehash();
+                    SetOpcode(op1);
+                    AddParamMove(branch2_backup);
+                    AddParamMove(changed_if);
+                    return true; // rerun optimization (opcode changed)
+                }
+        }
+        // if(x, y&z, !!y) -> if(x, z, 1) & y
+        if((op1 == cAnd || op1 == cOr) && op2 == cNotNot)
+        {
+            CodeTree& branch2op = branch2.GetParam(0);
+            for(size_t a=branch1.GetParamCount(); a-- > 0; )
+                if(branch1.GetParam(a).IsIdenticalTo(branch2op))
+                {
+                    branch1.CopyOnWrite();
+                    branch1.DelParam(a);
+                    branch1.Rehash();
+                    CodeTree branch2_backup = branch2op;
+                    branch2 = CodeTree( (op1==cOr) ? 0.0 : 1.0 );
+                    CodeTree changed_if;
+                    changed_if.SetOpcode(GetOpcode());
+                    changed_if.SetParamsMove(GetParams());
+                    changed_if.Rehash();
+                    SetOpcode(op1);
+                    AddParamMove(branch2_backup);
+                    AddParamMove(changed_if);
+                    return true; // rerun optimization (opcode changed)
+                }
+        }
+        // if(x, y, y+z) -> if(x, 0,z)+y
+        if(op2 == cAdd
+        || op2 == cMul
+        || (op2 == cAnd && branch1.IsLogicalValue())
+        || (op2 == cOr  && branch1.IsLogicalValue())
+          )
+        {
+            for(size_t a=branch2.GetParamCount(); a-- > 0; )
+                if(branch2.GetParam(a).IsIdenticalTo(branch1))
+                {
+                    branch2.CopyOnWrite();
+                    branch2.DelParam(a);
+                    branch2.Rehash();
+                    CodeTree branch1_backup = branch1;
+                    branch1 = CodeTree( (op2==cAdd||op2==cOr) ? 0.0 : 1.0 );
+                    CodeTree changed_if;
+                    changed_if.SetOpcode(GetOpcode());
+                    changed_if.SetParamsMove(GetParams());
+                    changed_if.Rehash();
+                    SetOpcode(op2);
+                    AddParamMove(branch1_backup);
+                    AddParamMove(changed_if);
+                    return true; // rerun optimization (opcode changed)
+                }
+        }
+        // if(x, !!y, y&z) -> if(x, 1, z) & y
+        if((op2 == cAnd || op2 == cOr) && op1 == cNotNot)
+        {
+            CodeTree& branch1op = branch1.GetParam(0);
+            for(size_t a=branch2.GetParamCount(); a-- > 0; )
+                if(branch2.GetParam(a).IsIdenticalTo(branch1op))
+                {
+                    branch2.CopyOnWrite();
+                    branch2.DelParam(a);
+                    branch2.Rehash();
+                    CodeTree branch1_backup = branch1op;
+                    branch1 = CodeTree( (op2==cOr) ? 0.0 : 1.0 );
+                    CodeTree changed_if;
+                    changed_if.SetOpcode(GetOpcode());
+                    changed_if.SetParamsMove(GetParams());
+                    changed_if.Rehash();
+                    SetOpcode(op2);
+                    AddParamMove(branch1_backup);
+                    AddParamMove(changed_if);
+                    return true; // rerun optimization (opcode changed)
+                }
+        }
+        return false; // No changes
+    }
+
+    bool CodeTree::ConstantFolding_PowOperations()
+    {
+        if(GetParam(0).IsImmed()
+        && GetParam(1).IsImmed())
+        {
+            double const_value = fp_pow(GetParam(0).GetImmed(),
+                                        GetParam(1).GetImmed());
+            data = new CodeTreeData(const_value);
+            return false;
+        }
+        if(GetParam(1).IsImmed()
+        && (float)GetParam(1).GetImmed() == 1.0)
+        {
+            // Conversion through a float type value gets rid of
+            // awkward abs(x)^1 generated from exp(log(x^6)/6),
+            // without sacrificing as much precision as FloatEqual() does.
+            // x^1 = x
+            Become(GetParam(0));
+            return true; // rerun optimization (opcode changed)
+        }
+        if(GetParam(0).IsImmed()
+        && (float)GetParam(0).GetImmed() == 1.0)
+        {
+            // 1^x = 1
+            data = new CodeTreeData(1.0);
+            return false;
+        }
+
+        // 5^(20*x) = (5^20)^x
+        if(GetParam(0).IsImmed()
+        && GetParam(1).GetOpcode() == cMul)
+        {
+            bool changes = false;
+            double base_immed = GetParam(0).GetImmed();
+            CodeTree mulgroup = GetParam(1);
+            for(size_t a=mulgroup.GetParamCount(); a-->0; )
+                if(mulgroup.GetParam(a).IsImmed())
+                {
+                    double imm = mulgroup.GetParam(a).GetImmed();
+                    //if(imm >= 0.0)
+                    {
+                        double new_base_immed = fp_pow(base_immed, imm);
+                      if(std::isinf(new_base_immed) || new_base_immed == 0.0)
+                        {
+                            // It produced an infinity. Do not change.
+                            break;
+                        }
+
+                        if(!changes)
+                        {
+                            changes = true;
+                            mulgroup.CopyOnWrite();
+                        }
+                        base_immed = new_base_immed;
+                        mulgroup.DelParam(a);
+                        break; //
+                    }
+                }
+            if(changes)
+            {
+                mulgroup.Rehash();
+            #ifdef DEBUG_SUBSTITUTIONS
+                std::cout << "Before pow-mul change: "; DumpTree(*this);
+                std::cout << "\n";
+            #endif
+                GetParam(0).Become(CodeTree(base_immed));
+                GetParam(1).Become(mulgroup);
+            #ifdef DEBUG_SUBSTITUTIONS
+                std::cout << "After pow-mul change: "; DumpTree(*this);
+                std::cout << "\n";
+            #endif
+            }
+        }
+        // (x*20)^2 = x^2 * 20^2
+        if(GetParam(1).IsImmed()
+        && GetParam(0).GetOpcode() == cMul)
+        {
+            double exponent_immed = GetParam(1).GetImmed();
+            double factor_immed   = 1.0;
+            bool changes = false;
+            CodeTree& mulgroup = GetParam(0);
+            for(size_t a=mulgroup.GetParamCount(); a-->0; )
+                if(mulgroup.GetParam(a).IsImmed())
+                {
+                    double imm = mulgroup.GetParam(a).GetImmed();
+                    //if(imm >= 0.0)
+                    {
+                        double new_factor_immed = fp_pow(imm, exponent_immed);
+                        if(std::isinf(new_factor_immed) || new_factor_immed == 0.0)
+                        {
+                            // It produced an infinity. Do not change.
+                            break;
+                        }
+                        if(!changes)
+                        {
+                            changes = true;
+                            mulgroup.CopyOnWrite();
+                        }
+                        factor_immed *= new_factor_immed;
+                        mulgroup.DelParam(a);
+                        break; //
+                    }
+                }
+            if(changes)
+            {
+                mulgroup.Rehash();
+                CodeTree newpow;
+                newpow.SetOpcode(cPow);
+                newpow.SetParamsMove(GetParams());
+                SetOpcode(cMul);
+                AddParamMove(newpow);
+                AddParam( CodeTree(factor_immed) );
+                return true; // rerun optimization (opcode changed)
+            }
+        }
+
+        // (x^3)^2 = x^6
+        // NOTE: If 3 is even and 3*2 is not, x must be changed to abs(x).
+        if(GetParam(0).GetOpcode() == cPow
+        && GetParam(1).IsImmed()
+        && GetParam(0).GetParam(1).IsImmed())
+        {
+            double a = GetParam(0).GetParam(1).GetImmed();
+            double b = GetParam(1).GetImmed();
+            double c = a * b; // new exponent
+            if(IsEvenIntegerConst(a) // a is an even int?
+            && !IsEvenIntegerConst(c)) // c is not?
+            {
+                CodeTree newbase;
+                newbase.SetOpcode(cAbs);
+                newbase.AddParam(GetParam(0).GetParam(0));
+                newbase.Rehash();
+                SetParamMove(0, newbase);
+            }
+            else
+                SetParam(0, GetParam(0).GetParam(0));
+            SetParam(1, CodeTree(c));
+        }
+        return false; // No changes that require a rerun
+    }
+
+    bool CodeTree::ConstantFolding_ComparisonOperations()
+    {
+        static const RangeComparisonData Data[6] =
+        {
+            // cEqual:
+            // Case:      p0 == p1  Antonym: p0 != p1
+            // Synonym:   p1 == p0  Antonym: p1 != p0
+            { RangeComparisonData::MakeTrue,  // If identical: always true
+              {RangeComparisonData::MakeFalse,  // If Always p0 < p1: always false
+               RangeComparisonData::Unchanged,
+               RangeComparisonData::MakeFalse,  // If Always p0 > p1: always false
+               RangeComparisonData::Unchanged},
+             // NotNot(p0) if p1==1    NotNot(p1) if p0==1
+             //    Not(p0) if p1==0       Not(p1) if p0==0
+              {RangeComparisonData::MakeNotNotP0, RangeComparisonData::Eq1},
+              {RangeComparisonData::MakeNotNotP1, RangeComparisonData::Eq1},
+              {RangeComparisonData::MakeNotP0, RangeComparisonData::Eq0},
+              {RangeComparisonData::MakeNotP1, RangeComparisonData::Eq0}
+            },
+            // cNEqual:
+            // Case:      p0 != p1  Antonym: p0 == p1
+            // Synonym:   p1 != p0  Antonym: p1 == p0
+            { RangeComparisonData::MakeFalse,  // If identical: always false
+              {RangeComparisonData::MakeTrue,  // If Always p0 < p1: always true
+               RangeComparisonData::Unchanged,
+               RangeComparisonData::MakeTrue,  // If Always p0 > p1: always true
+               RangeComparisonData::Unchanged},
+             // NotNot(p0) if p1==0    NotNot(p1) if p0==0
+             //    Not(p0) if p1==1       Not(p1) if p0==1
+              {RangeComparisonData::MakeNotNotP0, RangeComparisonData::Eq0},
+              {RangeComparisonData::MakeNotNotP1, RangeComparisonData::Eq0},
+              {RangeComparisonData::MakeNotP0, RangeComparisonData::Eq1},
+              {RangeComparisonData::MakeNotP1, RangeComparisonData::Eq1}
+            },
+            // cLess:
+            // Case:      p0 < p1   Antonym: p0 >= p1
+            // Synonym:   p1 > p0   Antonym: p1 <= p0
+            { RangeComparisonData::MakeFalse,  // If identical: always false
+              {RangeComparisonData::MakeTrue,  // If Always p0  < p1: always true
+               RangeComparisonData::MakeNEqual,
+               RangeComparisonData::MakeFalse, // If Always p0 > p1: always false
+               RangeComparisonData::MakeFalse},// If Always p0 >= p1: always false
+             // Not(p0)   if p1>0 & p1<=1    --   NotNot(p1) if p0>=0 & p0<1
+              {RangeComparisonData::MakeNotP0,    RangeComparisonData::Gt0Le1},
+              {RangeComparisonData::MakeNotNotP1, RangeComparisonData::Ge0Lt1},
+              {RangeComparisonData::Unchanged, RangeComparisonData::Never},
+              {RangeComparisonData::Unchanged, RangeComparisonData::Never}
+            },
+            // cLessOrEq:
+            // Case:      p0 <= p1  Antonym: p0 > p1
+            // Synonym:   p1 >= p0  Antonym: p1 < p0
+            { RangeComparisonData::MakeTrue,   // If identical: always true
+              {RangeComparisonData::Unchanged, // If Always p0  < p1: ?
+               RangeComparisonData::MakeTrue,  // If Always p0 <= p1: always true
+               RangeComparisonData::MakeFalse, // If Always p0  > p1: always false
+               RangeComparisonData::MakeEqual},// If Never  p0  < p1:  use cEqual
+             // Not(p0)    if p1>=0 & p1<1   --   NotNot(p1) if p0>0 & p0<=1
+              {RangeComparisonData::MakeNotP0,    RangeComparisonData::Ge0Lt1},
+              {RangeComparisonData::MakeNotNotP1, RangeComparisonData::Gt0Le1},
+              {RangeComparisonData::Unchanged, RangeComparisonData::Never},
+              {RangeComparisonData::Unchanged, RangeComparisonData::Never}
+            },
+            // cGreater:
+            // Case:      p0 >  p1  Antonym: p0 <= p1
+            // Synonym:   p1 <  p0  Antonym: p1 >= p0
+            { RangeComparisonData::MakeFalse,  // If identical: always false
+              {RangeComparisonData::MakeFalse, // If Always p0  < p1: always false
+               RangeComparisonData::MakeFalse, // If Always p0 <= p1: always false
+               RangeComparisonData::MakeTrue,  // If Always p0  > p1: always true
+               RangeComparisonData::MakeNEqual},
+             // NotNot(p0) if p1>=0 & p1<1   --   Not(p1)   if p0>0 & p0<=1
+              {RangeComparisonData::MakeNotNotP0, RangeComparisonData::Ge0Lt1},
+              {RangeComparisonData::MakeNotP1,    RangeComparisonData::Gt0Le1},
+              {RangeComparisonData::Unchanged, RangeComparisonData::Never},
+              {RangeComparisonData::Unchanged, RangeComparisonData::Never}
+            },
+            // cGreaterOrEq:
+            // Case:      p0 >= p1  Antonym: p0 < p1
+            // Synonym:   p1 <= p0  Antonym: p1 > p0
+            { RangeComparisonData::MakeTrue,   // If identical: always true
+              {RangeComparisonData::MakeFalse, // If Always p0  < p1: always false
+               RangeComparisonData::MakeEqual, // If Always p0 >= p1: always true
+               RangeComparisonData::Unchanged, // If always p0  > p1: ?
+               RangeComparisonData::MakeTrue}, // If Never  p0  > p1:  use cEqual
+             // NotNot(p0) if p1>0 & p1<=1   --   Not(p1)    if p0>=0 & p0<1
+              {RangeComparisonData::MakeNotNotP0, RangeComparisonData::Gt0Le1},
+              {RangeComparisonData::MakeNotP1,    RangeComparisonData::Ge0Lt1},
+              {RangeComparisonData::Unchanged, RangeComparisonData::Never},
+              {RangeComparisonData::Unchanged, RangeComparisonData::Never}
+            }
+        };
+        switch(Data[GetOpcode()-cEqual].Analyze(GetParam(0), GetParam(1)))
+        {
+            case RangeComparisonData::MakeFalse:
+                data = new CodeTreeData(0.0); return true;
+            case RangeComparisonData::MakeTrue:
+                data = new CodeTreeData(1.0); return true;
+            case RangeComparisonData::MakeEqual:  SetOpcode(cEqual); return true;
+            case RangeComparisonData::MakeNEqual: SetOpcode(cNEqual); return true;
+            case RangeComparisonData::MakeNotNotP0: SetOpcode(cNotNot); DelParam(1); return true;
+            case RangeComparisonData::MakeNotNotP1: SetOpcode(cNotNot); DelParam(0); return true;
+            case RangeComparisonData::MakeNotP0: SetOpcode(cNot); DelParam(1); return true;
+            case RangeComparisonData::MakeNotP1: SetOpcode(cNot); DelParam(0); return true;
+            case RangeComparisonData::Unchanged:;
+        }
+        return false;
+    }
+
+    bool CodeTree::ConstantFolding_Assimilate()
+    {
+        /* If the list contains another list of the same kind, assimilate it */
+        bool assimilated = false;
+        for(size_t a=GetParamCount(); a-- > 0; )
+            if(GetParam(a).GetOpcode() == GetOpcode())
+            {
+              #ifdef DEBUG_SUBSTITUTIONS
+                if(!assimilated)
+                {
+                    std::cout << "Before assimilation: "; DumpTree(*this);
+                    std::cout << "\n";
+                    assimilated = true;
+                }
+              #endif
+                // Assimilate its children and remove it
+                AddParamsMove(GetParam(a).GetUniqueRef().GetParams(), a);
+            }
+      #ifdef DEBUG_SUBSTITUTIONS
+        if(assimilated)
+        {
+            std::cout << "After assimilation:   "; DumpTree(*this);
+            std::cout << "\n";
+        }
+      #endif
+        return assimilated;
+    }
+
+    void CodeTree::ConstantFolding()
+    {
+    #ifdef DEBUG_SUBSTITUTIONS
+        std::cout << "Runs ConstantFolding for: "; DumpTree(*this);
+        std::cout << "\n";
+    #endif
+        using namespace std;
+    redo:;
+
+        // Insert here any hardcoded constant-folding optimizations
+        // that you want to be done whenever a new subtree is generated.
+        /* Not recursive. */
+
+        double const_value = 1.0;
+        if(GetOpcode() != cImmed)
+        {
+            MinMaxTree p = CalculateResultBoundaries();
+            if(p.has_min && p.has_max && p.min == p.max)
+            {
+                // Replace us with this immed
+                const_value = p.min;
+                goto ReplaceTreeWithConstValue;
+            }
+        }
+
+        if(false)
+        {
+            ReplaceTreeWithOne:
+                const_value = 1.0;
+                goto ReplaceTreeWithConstValue;
+            ReplaceTreeWithZero:
+                const_value = 0.0;
+            ReplaceTreeWithConstValue:
+              #ifdef DEBUG_SUBSTITUTIONS
+                std::cout << "Replacing "; DumpTree(*this);
+                if(IsImmed())
+                    std::cout << "(" << std::hex
+                              << *(const uint_least64_t*)&GetImmed()
+                              << std::dec << ")";
+                std::cout << " with const value " << const_value;
+                std::cout << "(" << std::hex
+                          << *(const uint_least64_t*)&const_value
+                          << std::dec << ")";
+                std::cout << "\n";
+              #endif
+                data = new CodeTreeData(const_value);
+                return;
+            ReplaceTreeWithParam0:
+              #ifdef DEBUG_SUBSTITUTIONS
+                std::cout << "Before replace: "; DumpTree(*this);
+                std::cout << "\n";
+              #endif
+                Become(GetParam(0));
+              #ifdef DEBUG_SUBSTITUTIONS
+                std::cout << "After replace: "; DumpTree(*this);
+                std::cout << "\n";
+              #endif
+                goto redo;
+        }
+
+        /* Constant folding */
+        switch(GetOpcode())
+        {
+            case cImmed:
+                break; // nothing to do
+            case VarBegin:
+                break; // nothing to do
+
+            case cAnd:
+            case cAbsAnd:
+            {
+                ConstantFolding_Assimilate();
+                for(size_t a=GetParamCount(); a-- > 0; )
+                    switch(GetLogicalValue(GetParam(a).CalculateResultBoundaries(),
+                                           GetOpcode()==cAbsAnd))
+                    {
+                        case 0: goto ReplaceTreeWithZero;
+                        case 1: DelParam(a); break; // x & y & 1 = x & y;  x & 1 = !!x
+                        default: ;
+                    }
+                switch(GetParamCount())
+                {
+                    case 0: goto ReplaceTreeWithOne;
+                    case 1: SetOpcode(GetOpcode()==cAnd ? cNotNot : cAbsNotNot); goto redo; // Replace self with the single operand
+                    default: if(GetOpcode()==cAnd) if(ConstantFolding_AndLogic()) goto redo;
+                }
+                break;
+            }
+            case cOr:
+            case cAbsOr:
+            {
+                ConstantFolding_Assimilate();
+                for(size_t a=GetParamCount(); a-- > 0; )
+                    switch(GetLogicalValue(GetParam(a).CalculateResultBoundaries(),
+                                           GetOpcode()==cAbsOr))
+                    {
+                        case 1: goto ReplaceTreeWithOne;
+                        case 0: DelParam(a); break;
+                        default: ;
+                    }
+                switch(GetParamCount())
+                {
+                    case 0: goto ReplaceTreeWithZero;
+                    case 1: SetOpcode(GetOpcode()==cOr ? cNotNot : cAbsNotNot); goto redo; // Replace self with the single operand
+                    default: if(GetOpcode()==cOr) if(ConstantFolding_OrLogic()) goto redo;
+                }
+                break;
+            }
+            case cNot:
+            case cAbsNot:
+            {
+                unsigned opposite = 0;
+                switch(GetParam(0).GetOpcode())
+                {
+                    case cEqual:       opposite = cNEqual; break;
+                    case cNEqual:      opposite = cEqual; break;
+                    case cLess:        opposite = cGreaterOrEq; break;
+                    case cGreater:     opposite = cLessOrEq; break;
+                    case cLessOrEq:    opposite = cGreater; break;
+                    case cGreaterOrEq: opposite = cLess; break;
+                    //cNotNot already handled by grammar: @L cNotNot
+                    case cNot:         opposite = cNotNot; break;
+                    case cAbsNot:      opposite = cAbsNotNot; break;
+                    case cAbsNotNot:   opposite = cAbsNot; break;
+                    default: break;
+                }
+                if(opposite)
+                {
+                    SetOpcode(OPCODE(opposite));
+                    SetParamsMove(GetParam(0).GetUniqueRef().GetParams());
+                    goto redo;
+                }
+
+                // If the sub-expression evaluates to approx. zero, yield one.
+                // If the sub-expression evaluates to approx. nonzero, yield zero.
+                switch(GetLogicalValue(GetParam(0).CalculateResultBoundaries(),
+                                       GetOpcode()==cAbsNot))
+                {
+                    case 1: goto ReplaceTreeWithZero;
+                    case 0: goto ReplaceTreeWithOne;
+                    default: ;
+                }
+                if(GetOpcode() == cNot && GetParam(0).IsAlwaysSigned(true))
+                    SetOpcode(cAbsNot);
+
+                if(GetParam(0).GetOpcode() == cIf
+                || GetParam(0).GetOpcode() == cAbsIf)
+                {
+                    CodeTree iftree = GetParam(0);
+                    const CodeTree& ifp1 = iftree.GetParam(1);
+                    const CodeTree& ifp2 = iftree.GetParam(2);
+                    if(ifp1.GetOpcode() == cNot
+                    || ifp1.GetOpcode() == cAbsNot)
+                    {
+                        // cNot [(cIf [x (cNot[y]) z])] -> cIf [x (cNotNot[y]) (cNot[z])]
+                        SetParam(0, iftree.GetParam(0)); // condition
+                        CodeTree p1;
+                        p1.SetOpcode(ifp1.GetOpcode()==cNot ? cNotNot : cAbsNotNot);
+                        p1.AddParam(ifp1.GetParam(0));
+                        p1.Rehash();
+                        AddParamMove(p1);
+                        CodeTree p2;
+                        p2.SetOpcode(GetOpcode());
+                        p2.AddParam(ifp2);
+                        p2.Rehash();
+                        AddParamMove(p2);
+                        SetOpcode(iftree.GetOpcode());
+                        goto redo;
+                    }
+                    if(ifp2.GetOpcode() == cNot
+                    || ifp2.GetOpcode() == cAbsNot)
+                    {
+                        // cNot [(cIf [x y (cNot[z])])] -> cIf [x (cNot[y]) (cNotNot[z])]
+                        SetParam(0, iftree.GetParam(0)); // condition
+                        CodeTree p1;
+                        p1.SetOpcode(GetOpcode());
+                        p1.AddParam(ifp1);
+                        p1.Rehash();
+                        AddParamMove(p1);
+                        CodeTree p2;
+                        p2.SetOpcode(ifp2.GetOpcode()==cNot ? cNotNot : cAbsNotNot);
+                        p2.AddParam(ifp2.GetParam(0));
+                        p2.Rehash();
+                        AddParamMove(p2);
+                        SetOpcode(iftree.GetOpcode());
+                        goto redo;
+                    }
+                }
+                break;
+            }
+            case cNotNot:
+            case cAbsNotNot:
+            {
+                // The function of cNotNot is to protect a logical value from
+                // changing. If the parameter is already a logical value,
+                // then the cNotNot opcode is redundant.
+                if(GetParam(0).IsLogicalValue())
+                    goto ReplaceTreeWithParam0;
+
+                // If the sub-expression evaluates to approx. zero, yield zero.
+                // If the sub-expression evaluates to approx. nonzero, yield one.
+                switch(GetLogicalValue(GetParam(0).CalculateResultBoundaries(),
+                                       GetOpcode()==cAbsNotNot))
+                {
+                    case 0: goto ReplaceTreeWithZero;
+                    case 1: goto ReplaceTreeWithOne;
+                    default: ;
+                }
+                if(GetOpcode() == cNotNot && GetParam(0).IsAlwaysSigned(true))
+                    SetOpcode(cAbsNotNot);
+
+                if(GetParam(0).GetOpcode() == cIf
+                || GetParam(0).GetOpcode() == cAbsIf)
+                {
+                    CodeTree iftree = GetParam(0);
+                    const CodeTree& ifp1 = iftree.GetParam(1);
+                    const CodeTree& ifp2 = iftree.GetParam(2);
+                    if(ifp1.GetOpcode() == cNot
+                    || ifp1.GetOpcode() == cAbsNot)
+                    {
+                        // cNotNot [(cIf [x (cNot[y]) z])] -> cIf [x (cNot[y]) (cNotNot[z])]
+                        SetParam(0, iftree.GetParam(0)); // condition
+                        AddParam(ifp1);
+                        CodeTree p2;
+                        p2.SetOpcode(GetOpcode());
+                        p2.AddParam(ifp2);
+                        p2.Rehash();
+                        AddParamMove(p2);
+                        SetOpcode(iftree.GetOpcode());
+                        goto redo;
+                    }
+                    if(ifp2.GetOpcode() == cNot
+                    || ifp2.GetOpcode() == cAbsNot)
+                    {
+                        // cNotNot [(cIf [x y (cNot[z])])] -> cIf [x (cNotNot[y]) (cNot[z])]
+                        SetParam(0, iftree.GetParam(0)); // condition
+                        CodeTree p1;
+                        p1.SetOpcode(GetOpcode());
+                        p1.AddParam(ifp1);
+                        p1.Rehash();
+                        AddParamMove(p1);
+                        AddParam(ifp2);
+                        SetOpcode(iftree.GetOpcode());
+                        goto redo;
+                    }
+                }
+                break;
+            }
+            case cIf:
+            case cAbsIf:
+            {
+                if(ConstantFolding_IfOperations())
+                    goto redo;
+                break;
+            }
+            case cMul:
+            {
+            NowWeAreMulGroup: ;
+                ConstantFolding_Assimilate();
+                // If one sub-expression evalutes to exact zero, yield zero.
+                double immed_product = 1.0;
+                size_t n_immeds = 0; bool needs_resynth=false;
+                for(size_t a=0; a<GetParamCount(); ++a)
+                {
+                    if(!GetParam(a).IsImmed()) continue;
+                    // ^ Only check constant values
+                    double immed = GetParam(a).GetImmed();
+                    if(immed == 0.0) goto ReplaceTreeWithZero;
+                    immed_product *= immed; ++n_immeds;
+                }
+                // Merge immeds.
+                if(n_immeds > 1 || (n_immeds == 1 && FloatEqual(immed_product, 1.0)))
+                    needs_resynth = true;
+                if(needs_resynth)
+                {
+                    // delete immeds and add new ones
+                #ifdef DEBUG_SUBSTITUTIONS
+                    std::cout << "cMul: Will add new immed " << immed_product << "\n";
+                #endif
+                    for(size_t a=GetParamCount(); a-->0; )
+                        if(GetParam(a).IsImmed())
+                        {
+                        #ifdef DEBUG_SUBSTITUTIONS
+                            std::cout << " - For that, deleting immed " << GetParam(a).GetImmed();
+                            std::cout << "\n";
+                        #endif
+                            DelParam(a);
+                        }
+                    if(!FloatEqual(immed_product, 1.0))
+                        AddParam( CodeTree(immed_product) );
+                }
+                switch(GetParamCount())
+                {
+                    case 0: goto ReplaceTreeWithOne;
+                    case 1: goto ReplaceTreeWithParam0; // Replace self with the single operand
+                    default:
+                        if(ConstantFolding_MulGrouping()) goto redo;
+                        if(ConstantFolding_MulLogicItems()) goto redo;
+                }
+                break;
+            }
+            case cAdd:
+            {
+                ConstantFolding_Assimilate();
+                double immed_sum = 0.0;
+                size_t n_immeds = 0; bool needs_resynth=false;
+                for(size_t a=0; a<GetParamCount(); ++a)
+                {
+                    if(!GetParam(a).IsImmed()) continue;
+                    // ^ Only check constant values
+                    double immed = GetParam(a).GetImmed();
+                    immed_sum += immed; ++n_immeds;
+                }
+                // Merge immeds.
+                if(n_immeds > 1 || (n_immeds == 1 && immed_sum == 0.0))
+                    needs_resynth = true;
+                if(needs_resynth)
+                {
+                    // delete immeds and add new ones
+                #ifdef DEBUG_SUBSTITUTIONS
+                    std::cout << "cAdd: Will add new immed " << immed_sum << "\n";
+                    std::cout << "In: "; DumpTree(*this);
+                    std::cout << "\n";
+                #endif
+                    for(size_t a=GetParamCount(); a-->0; )
+                        if(GetParam(a).IsImmed())
+                        {
+                        #ifdef DEBUG_SUBSTITUTIONS
+                            std::cout << " - For that, deleting immed " << GetParam(a).GetImmed();
+                            std::cout << "\n";
+                        #endif
+                            DelParam(a);
+                        }
+                    if(!(immed_sum == 0.0))
+                        AddParam( CodeTree(immed_sum) );
+                }
+                switch(GetParamCount())
+                {
+                    case 0: goto ReplaceTreeWithZero;
+                    case 1: goto ReplaceTreeWithParam0; // Replace self with the single operand
+                    default:
+                        if(ConstantFolding_AddGrouping()) goto redo;
+                        if(ConstantFolding_AddLogicItems()) goto redo;
+                }
+                break;
+            }
+            case cMin:
+            {
+                ConstantFolding_Assimilate();
+                /* Goal: If there is any pair of two operands, where
+                 * their ranges form a disconnected set, i.e. as below:
+                 *     xxxxx
+                 *            yyyyyy
+                 * Then remove the larger one.
+                 *
+                 * Algorithm: 1. figure out the smallest maximum of all operands.
+                 *            2. eliminate all operands where their minimum is
+                 *               larger than the selected maximum.
+                 */
+                size_t preserve=0;
+                MinMaxTree smallest_maximum;
+                for(size_t a=0; a<GetParamCount(); ++a)
+                {
+                    MinMaxTree p = GetParam(a).CalculateResultBoundaries();
+                    if(p.has_max && (!smallest_maximum.has_max || p.max < smallest_maximum.max))
+                    {
+                        smallest_maximum.max = p.max;
+                        smallest_maximum.has_max = true;
+                        preserve=a;
+                }   }
+                if(smallest_maximum.has_max)
+                    for(size_t a=GetParamCount(); a-- > 0; )
+                    {
+                        MinMaxTree p = GetParam(a).CalculateResultBoundaries();
+                        if(p.has_min && a != preserve && p.min >= smallest_maximum.max)
+                            DelParam(a);
+                    }
+                //fprintf(stderr, "Remains: %u\n", (unsigned)GetParamCount());
+                if(GetParamCount() == 1)
+                {
+                    // Replace self with the single operand
+                    goto ReplaceTreeWithParam0;
+                }
+                break;
+            }
+            case cMax:
+            {
+                ConstantFolding_Assimilate();
+                /* Goal: If there is any pair of two operands, where
+                 * their ranges form a disconnected set, i.e. as below:
+                 *     xxxxx
+                 *            yyyyyy
+                 * Then remove the smaller one.
+                 *
+                 * Algorithm: 1. figure out the biggest minimum of all operands.
+                 *            2. eliminate all operands where their maximum is
+                 *               smaller than the selected minimum.
+                 */
+                size_t preserve=0;
+                MinMaxTree biggest_minimum;
+                for(size_t a=0; a<GetParamCount(); ++a)
+                {
+                    MinMaxTree p = GetParam(a).CalculateResultBoundaries();
+                    if(p.has_min && (!biggest_minimum.has_min || p.min > biggest_minimum.min))
+                    {
+                        biggest_minimum.min = p.min;
+                        biggest_minimum.has_min = true;
+                        preserve=a;
+                }   }
+                if(biggest_minimum.has_min)
+                {
+                    //fprintf(stderr, "Removing all where max < %g\n", biggest_minimum.min);
+                    for(size_t a=GetParamCount(); a-- > 0; )
+                    {
+                        MinMaxTree p = GetParam(a).CalculateResultBoundaries();
+                        if(p.has_max && a != preserve && p.max < biggest_minimum.min)
+                        {
+                            //fprintf(stderr, "Removing %g\n", p.max);
+                            DelParam(a);
+                        }
+                    }
+                }
+                //fprintf(stderr, "Remains: %u\n", (unsigned)GetParamCount());
+                if(GetParamCount() == 1)
+                {
+                    // Replace self with the single operand
+                    goto ReplaceTreeWithParam0;
+                }
+                break;
+            }
+
+            case cEqual:
+            case cNEqual:
+            case cLess:
+            case cGreater:
+            case cLessOrEq:
+            case cGreaterOrEq:
+                if(ConstantFolding_ComparisonOperations()) goto redo;
+                // Any reversible functions:
+                //   sin(x)  -> ASIN: Not doable, x can be cyclic
+                //   asin(x) -> SIN: doable.
+                //                   Invalid combinations are caught by
+                //                   range-estimation. Threshold is at |pi/2|.
+                //   acos(x) -> COS: doable.
+                //                   Invalid combinations are caught by
+                //                   range-estimation. Note that though
+                //                   the range is contiguous, it is direction-flipped.
+                //    log(x) -> EXP: no problem
+                //   exp2, exp10: Converted to cPow, done by grammar.
+                //   atan(x) -> TAN: doable.
+                //                   Invalid combinations are caught by
+                //                   range-estimation. Threshold is at |pi/2|.
+                //   sinh(x) -> ASINH: no problem
+                //   tanh(x) -> ATANH: no problem, but atanh is limited to -1..1
+                //                     Invalid combinations are caught by
+                //                     range-estimation, but the exact value
+                //                     of 1.0 still needs checking, because
+                //                     it involves infinity.
+                if(GetParam(1).IsImmed())
+                    switch(GetParam(0).GetOpcode())
+                    {
+                        case cAsin:
+                            SetParam(0, GetParam(0).GetParam(0));
+                            SetParam(1, CodeTree(fp_sin(GetParam(1).GetImmed())));
+                            goto redo;
+                        case cAcos:
+                            // -1..+1 --> pi..0 (polarity-flipping)
+                            SetParam(0, GetParam(0).GetParam(0));
+                            SetParam(1, CodeTree(fp_cos(GetParam(1).GetImmed())));
+                            SetOpcode( GetOpcode()==cLess ? cGreater
+                                     : GetOpcode()==cLessOrEq ? cGreaterOrEq
+                                     : GetOpcode()==cGreater ? cLess
+                                     : GetOpcode()==cGreaterOrEq ? cLessOrEq
+                                     : GetOpcode() );
+                            goto redo;
+                        case cAtan:
+                            SetParam(0, GetParam(0).GetParam(0));
+                            SetParam(1, CodeTree(fp_tan(GetParam(1).GetImmed())));
+                            goto redo;
+                        case cLog:
+                            // Different logarithms have a constant-multiplication,
+                            // which is no problem.
+                            SetParam(0, GetParam(0).GetParam(0));
+                            SetParam(1, CodeTree(fp_exp(GetParam(1).GetImmed())));
+                            goto redo;
+                        case cSinh:
+                            SetParam(0, GetParam(0).GetParam(0));
+                            SetParam(1, CodeTree(fp_asinh(GetParam(1).GetImmed())));
+                            goto redo;
+                        case cTanh:
+                            if(fabs(GetParam(1).GetImmed()) < 1.0)
+                            {
+                                SetParam(0, GetParam(0).GetParam(0));
+                                SetParam(1, CodeTree(fp_atanh(GetParam(1).GetImmed())));
+                                goto redo;
+                            }
+                            break;
+                        default: break;
+                    }
+                break;
+
+            case cAbs:
+            {
+                /* If we know the operand is always positive, cAbs is redundant.
+                 * If we know the operand is always negative, use actual negation.
+                 */
+                MinMaxTree p0 = GetParam(0).CalculateResultBoundaries();
+                if(p0.has_min && p0.min >= 0.0)
+                    goto ReplaceTreeWithParam0;
+                if(p0.has_max && p0.max <= NEGATIVE_MAXIMUM)
+                {
+                    /* abs(negative) = negative*-1 */
+                    SetOpcode(cMul);
+                    AddParam( CodeTree(-1.0) );
+                    /* The caller of ConstantFolding() will do Sort() and Rehash() next.
+                     * Thus, no need to do it here. */
+                    /* We were changed into a cMul group. Do cMul folding. */
+                    goto NowWeAreMulGroup;
+                }
+                /* If the operand is a cMul group, find elements
+                 * that are always positive and always negative,
+                 * and move them out, e.g. abs(p*n*x*y) = p*(-n)*abs(x*y)
+                 */
+                if(GetParam(0).GetOpcode() == cMul)
+                {
+                    const CodeTree& p = GetParam(0);
+                    std::vector<CodeTree> pos_set;
+                    std::vector<CodeTree> neg_set;
+                    for(size_t a=0; a<p.GetParamCount(); ++a)
+                    {
+                        p0 = p.GetParam(a).CalculateResultBoundaries();
+                        if(p0.has_min && p0.min >= 0.0)
+                            { pos_set.push_back(p.GetParam(a)); }
+                        if(p0.has_max && p0.max <= NEGATIVE_MAXIMUM)
+                            { neg_set.push_back(p.GetParam(a)); }
+                    }
+                #ifdef DEBUG_SUBSTITUTIONS
+                    std::cout << "Abs: mul group has " << pos_set.size()
+                              << " pos, " << neg_set.size() << "neg\n";
+                #endif
+                    if(!pos_set.empty() || !neg_set.empty())
+                    {
+                #ifdef DEBUG_SUBSTITUTIONS
+                        std::cout << "AbsReplace-Before: ";
+                        DumpTree(*this);
+                        std::cout << "\n" << std::flush;
+                        DumpHashes(*this, std::cout);
+                #endif
+                        CodeTree pclone;
+                        pclone.SetOpcode(cMul);
+                        for(size_t a=0; a<p.GetParamCount(); ++a)
+                        {
+                            p0 = p.GetParam(a).CalculateResultBoundaries();
+                            if((p0.has_min && p0.min >= 0.0)
+                            || (p0.has_max && p0.max <= NEGATIVE_MAXIMUM))
+                                {/*pclone.DelParam(a);*/}
+                            else
+                                pclone.AddParam( p.GetParam(a) );
+                            /* Here, p*n*x*y -> x*y.
+                             * p is saved in pos_set[]
+                             * n is saved in neg_set[]
+                             */
+                        }
+                        pclone.Rehash();
+                        CodeTree abs_mul;
+                        abs_mul.SetOpcode(cAbs);
+                        abs_mul.AddParamMove(pclone);
+                        abs_mul.Rehash();
+                        CodeTree mulgroup;
+                        mulgroup.SetOpcode(cMul);
+                        mulgroup.AddParamMove(abs_mul); // cAbs[whatever remains in p]
+                        mulgroup.AddParamsMove(pos_set);
+                        /* Now:
+                         * mulgroup  = p * Abs(x*y)
+                         */
+                        if(!neg_set.empty())
+                        {
+                            if(neg_set.size() % 2)
+                                mulgroup.AddParam( CodeTree(-1.0) );
+                            mulgroup.AddParamsMove(neg_set);
+                            /* Now:
+                             * mulgroup = p * n * -1 * Abs(x*y)
+                             */
+                        }
+                        Become(mulgroup);
+                #ifdef DEBUG_SUBSTITUTIONS
+                        std::cout << "AbsReplace-After: ";
+                        DumpTree(*this, std::cout);
+                        std::cout << "\n" << std::flush;
+                        DumpHashes(*this, std::cout);
+                #endif
+                        /* We were changed into a cMul group. Do cMul folding. */
+                        goto NowWeAreMulGroup;
+                    }
+                }
+                break;
+            }
+
+            #define HANDLE_UNARY_CONST_FUNC(funcname) \
+                if(GetParam(0).IsImmed()) \
+                    { const_value = funcname(GetParam(0).GetImmed()); \
+                      goto ReplaceTreeWithConstValue; }
+
+            case cLog:
+                HANDLE_UNARY_CONST_FUNC(log);
+                if(GetParam(0).GetOpcode() == cPow)
+                {
+                    CodeTree pow = GetParam(0);
+                    if(pow.GetParam(0).IsAlwaysSigned(true))  // log(posi ^ y) = y*log(posi)
+                    {
+                        pow.CopyOnWrite();
+                        pow.SetOpcode(cLog);
+                        SetOpcode(cMul);
+                        AddParamMove(pow.GetParam(1));
+                        pow.DelParam(1);
+                        pow.Rehash();
+                        SetParamMove(0, pow);
+                        goto NowWeAreMulGroup;
+                    }
+                    if(pow.GetParam(1).IsAlwaysParity(false)) // log(x ^ even) = even*log(abs(x))
+                    {
+                        pow.CopyOnWrite();
+                        CodeTree abs;
+                        abs.SetOpcode(cAbs);
+                        abs.AddParamMove(pow.GetParam(0));
+                        abs.Rehash();
+                        pow.SetOpcode(cLog);
+                        SetOpcode(cMul);
+                        pow.SetParamMove(0, abs);
+                        AddParamMove(pow.GetParam(1));
+                        pow.DelParam(1);
+                        pow.Rehash();
+                        SetParamMove(0, pow);
+                        goto NowWeAreMulGroup;
+                    }
+                }
+                else if(GetParam(0).GetOpcode() == cAbs)
+                {
+                    // log(abs(x^y)) = y*log(abs(x))
+                    CodeTree pow = GetParam(0).GetParam(0);
+                    if(pow.GetOpcode() == cPow)
+                    {
+                        pow.CopyOnWrite();
+                        CodeTree abs;
+                        abs.SetOpcode(cAbs);
+                        abs.AddParamMove(pow.GetParam(0));
+                        abs.Rehash();
+                        pow.SetOpcode(cLog);
+                        SetOpcode(cMul);
+                        pow.SetParamMove(0, abs);
+                        AddParamMove(pow.GetParam(1));
+                        pow.DelParam(1);
+                        pow.Rehash();
+                        SetParamMove(0, pow);
+                        goto NowWeAreMulGroup;
+                    }
+                }
+                break;
+            case cAcosh: HANDLE_UNARY_CONST_FUNC(fp_acosh); break;
+            case cAsinh: HANDLE_UNARY_CONST_FUNC(fp_asinh); break;
+            case cAtanh: HANDLE_UNARY_CONST_FUNC(fp_atanh); break;
+            case cAcos: HANDLE_UNARY_CONST_FUNC(fp_acos); break;
+            case cAsin: HANDLE_UNARY_CONST_FUNC(fp_asin); break;
+            case cAtan: HANDLE_UNARY_CONST_FUNC(fp_atan); break;
+            case cCosh: HANDLE_UNARY_CONST_FUNC(fp_cosh); break;
+            case cSinh: HANDLE_UNARY_CONST_FUNC(fp_sinh); break;
+            case cTanh: HANDLE_UNARY_CONST_FUNC(fp_tanh); break;
+            case cSin: HANDLE_UNARY_CONST_FUNC(fp_sin); break;
+            case cCos: HANDLE_UNARY_CONST_FUNC(fp_cos); break;
+            case cTan: HANDLE_UNARY_CONST_FUNC(fp_tan); break;
+            case cCeil: HANDLE_UNARY_CONST_FUNC(fp_ceil); break;
+            case cTrunc: HANDLE_UNARY_CONST_FUNC(fp_trunc); break;
+            case cFloor: HANDLE_UNARY_CONST_FUNC(fp_floor); break;
+            case cCbrt: HANDLE_UNARY_CONST_FUNC(fp_cbrt); break; // converted into cPow x 0.33333
+            case cSqrt: HANDLE_UNARY_CONST_FUNC(fp_sqrt); break; // converted into cPow x 0.5
+            case cExp: HANDLE_UNARY_CONST_FUNC(fp_exp); break; // convered into cPow CONSTANT_E x
+            case cInt: HANDLE_UNARY_CONST_FUNC(fp_int); break;
+            case cLog2: HANDLE_UNARY_CONST_FUNC(fp_log2); break;
+            case cLog10: HANDLE_UNARY_CONST_FUNC(fp_log10); break;
+
+            case cLog2by:
+                if(GetParam(0).IsImmed()
+                && GetParam(1).IsImmed())
+                    { const_value = fp_log2(GetParam(0).GetImmed()) * GetParam(1).GetImmed();
+                      goto ReplaceTreeWithConstValue; }
+                break;
+
+            case cMod: /* Can more be done than this? */
+                if(GetParam(0).IsImmed()
+                && GetParam(1).IsImmed())
+                    { const_value = fmod(GetParam(0).GetImmed(), GetParam(1).GetImmed());
+                      goto ReplaceTreeWithConstValue; }
+                break;
+
+            case cAtan2:
+            {
+                /* Range based optimizations for (y,x):
+                 * If y is +0 and x <= -0, +pi is returned
+                 * If y is -0 and x <= -0, -pi is returned (assumed never happening)
+                 * If y is +0 and x >= +0, +0 is returned
+                 * If y is -0 and x >= +0, -0 is returned  (assumed never happening)
+                 * If x is +-0 and y < 0, -pi/2 is returned
+                 * If x is +-0 and y > 0, +pi/2 is returned
+                 * Otherwise, perform constant folding when available
+                 * If we know x <> 0, convert into atan(y / x)
+                 *   TODO: Figure out whether the above step is wise
+                 *         It allows e.g. atan2(6*x, 3*y) -> atan(2*x/y)
+                 *         when we know y != 0
+                 */
+                MinMaxTree p0 = GetParam(0).CalculateResultBoundaries();
+                MinMaxTree p1 = GetParam(1).CalculateResultBoundaries();
+                if(GetParam(0).IsImmed()
+                && FloatEqual(GetParam(0).GetImmed(), 0.0))   // y == 0
+                {
+                    if(p1.has_max && p1.max < 0)              // y == 0 && x < 0
+                        { const_value = CONSTANT_PI; goto ReplaceTreeWithConstValue; }
+                    if(p1.has_min && p1.min >= 0.0)           // y == 0 && x >= 0.0
+                        { const_value = 0.0; goto ReplaceTreeWithConstValue; }
+                }
+                if(GetParam(1).IsImmed()
+                && FloatEqual(GetParam(1).GetImmed(), 0.0))   // x == 0
+                {
+                    if(p0.has_max && p0.max < 0)              // y < 0 && x == 0
+                        { const_value = -CONSTANT_PIHALF; goto ReplaceTreeWithConstValue; }
+                    if(p0.has_min && p0.min > 0)              // y > 0 && x == 0
+                        { const_value =  CONSTANT_PIHALF; goto ReplaceTreeWithConstValue; }
+                }
+                if(GetParam(0).IsImmed()
+                && GetParam(1).IsImmed())
+                    { const_value = atan2(GetParam(0).GetImmed(),
+                                          GetParam(1).GetImmed());
+                      goto ReplaceTreeWithConstValue; }
+                if((p1.has_min && p1.min > 0.0)               // p1 != 0.0
+                || (p1.has_max && p1.max < NEGATIVE_MAXIMUM)) // become atan(p0 / p1)
+                {
+                    CodeTree pow_tree;
+                    pow_tree.SetOpcode(cPow);
+                    pow_tree.AddParamMove(GetParam(1));
+                    pow_tree.AddParam(CodeTree(-1.0));
+                    pow_tree.Rehash();
+                    CodeTree div_tree;
+                    div_tree.SetOpcode(cMul);
+                    div_tree.AddParamMove(GetParam(0));
+                    div_tree.AddParamMove(pow_tree);
+                    div_tree.Rehash();
+                    SetOpcode(cAtan);
+                    SetParamMove(0, div_tree);
+                    DelParam(1);
+                }
+                break;
+            }
+
+            case cPow:
+            {
+                if(ConstantFolding_PowOperations()) goto redo;
+                break;
+            }
+
+            /* The following opcodes are processed by GenerateFrom()
+             * within fpoptimizer_bytecode_to_codetree.c and thus
+             * they will never occur in the calling context for the
+             * most of the parsing context. They may however occur
+             * at the late phase, so we deal with them.
+             */
+            case cDiv: // converted into cPow y -1
+                if(GetParam(0).IsImmed()
+                && GetParam(1).IsImmed()
+                && GetParam(1).GetImmed() != 0.0)
+                    { const_value = GetParam(0).GetImmed() / GetParam(1).GetImmed();
+                      goto ReplaceTreeWithConstValue; }
+                break;
+            case cInv: // converted into cPow y -1
+                if(GetParam(0).IsImmed()
+                && GetParam(0).GetImmed() != 0.0)
+                    { const_value = 1.0 / GetParam(0).GetImmed();
+                      goto ReplaceTreeWithConstValue; }
+                // Note: Could use (mulgroup)^immed optimization from cPow
+                break;
+            case cSub: // converted into cMul y -1
+                if(GetParam(0).IsImmed()
+                && GetParam(1).IsImmed())
+                    { const_value = GetParam(0).GetImmed() - GetParam(1).GetImmed();
+                      goto ReplaceTreeWithConstValue; }
+                break;
+            case cNeg: // converted into cMul x -1
+                if(GetParam(0).IsImmed())
+                    { const_value = -GetParam(0).GetImmed();
+                      goto ReplaceTreeWithConstValue; }
+                break;
+            case cRad: // converted into cMul x CONSTANT_RD
+                if(GetParam(0).IsImmed())
+                    { const_value = GetParam(0).GetImmed() * CONSTANT_RD;
+                      goto ReplaceTreeWithConstValue; }
+                break;
+            case cDeg: // converted into cMul x CONSTANT_DR
+                if(GetParam(0).IsImmed())
+                    { const_value = GetParam(0).GetImmed() * CONSTANT_DR;
+                      goto ReplaceTreeWithConstValue; }
+                break;
+            case cSqr: // converted into cMul x x
+                if(GetParam(0).IsImmed())
+                    { const_value = GetParam(0).GetImmed() * GetParam(0).GetImmed();
+                      goto ReplaceTreeWithConstValue; }
+                break;
+            case cExp2: // converted into cPow 2.0 x
+                HANDLE_UNARY_CONST_FUNC(fp_exp2); break;
+            case cRSqrt: // converted into cPow x -0.5
+                if(GetParam(0).IsImmed())
+                    { const_value = 1.0 / sqrt(GetParam(0).GetImmed());
+                      goto ReplaceTreeWithConstValue; }
+                break;
+            case cCot: // converted into cMul (cPow (cTan x) -1)
+                if(GetParam(0).IsImmed())
+                    { double tmp = tan(GetParam(0).GetImmed());
+                      if(tmp != 0.0)
+                      { const_value = 1.0 / tmp;
+                        goto ReplaceTreeWithConstValue; } }
+                break;
+            case cSec: // converted into cMul (cPow (cCos x) -1)
+                if(GetParam(0).IsImmed())
+                    { double tmp = cos(GetParam(0).GetImmed());
+                      if(tmp != 0.0)
+                      { const_value = 1.0 / tmp;
+                        goto ReplaceTreeWithConstValue; } }
+                break;
+            case cCsc: // converted into cMul (cPow (cSin x) -1)
+                if(GetParam(0).IsImmed())
+                    { double tmp = sin(GetParam(0).GetImmed());
+                      if(tmp != 0.0)
+                      { const_value = 1.0 / tmp;
+                        goto ReplaceTreeWithConstValue; } }
+                break;
+
+            /* Opcodes that do not occur in the tree for other reasons */
+            case cRDiv: // version of cDiv
+            case cRSub: // version of cSub
+            case cDup:
+            case cFetch:
+            case cPopNMov:
+            case cNop:
+            case cJump:
+                break; /* Should never occur */
+
+            /* Opcodes that we can't do anything about */
+            case cPCall:
+            case cFCall:
+            case cEval:
+                break;
+        }
+    }
+}
+
+#endif
+
+#line 1 "fpoptimizer/fpoptimizer_rangeestimation.c"
+// line removed for fpoptimizer.c: #include "fpoptimizer_codetree.h"
+// line removed for fpoptimizer.c: #include "fpoptimizer_consts.h"
+
+#include <cmath> /* for CalculateResultBoundaries() */
+
+#ifdef FP_SUPPORT_OPTIMIZER
+
+using namespace FUNCTIONPARSERTYPES;
+using namespace FPoptimizer_CodeTree;
+
+//#define DEBUG_SUBSTITUTIONS_extra_verbose
+
+namespace FPoptimizer_CodeTree
+{
+    MinMaxTree CodeTree::CalculateResultBoundaries() const
+#ifdef DEBUG_SUBSTITUTIONS_extra_verbose
+    {
+        MinMaxTree tmp = CalculateResultBoundaries_do();
+        std::cout << "Estimated boundaries: ";
+        if(tmp.has_min) std::cout << tmp.min; else std::cout << "-inf";
+        std::cout << " .. ";
+        if(tmp.has_max) std::cout << tmp.max; else std::cout << "+inf";
+        std::cout << ": ";
+        FPoptimizer_CodeTree::DumpTree(*this);
+        std::cout << std::endl;
+        return tmp;
+    }
+    MinMaxTree CodeTree::CalculateResultBoundaries_do() const
+#endif
+    {
+        using namespace std;
+        switch( GetOpcode() )
+        {
+            case cImmed:
+                return MinMaxTree(GetImmed(), GetImmed()); // a definite value.
+            case cAnd:
+            case cAbsAnd:
+            case cOr:
+            case cAbsOr:
+            case cNot:
+            case cAbsNot:
+            case cNotNot:
+            case cAbsNotNot:
+            case cEqual:
+            case cNEqual:
+            case cLess:
+            case cLessOrEq:
+            case cGreater:
+            case cGreaterOrEq:
+            {
+                /* These operations always produce truth values (0 or 1) */
+                /* Narrowing them down is a matter of performing Constant optimization */
+                return MinMaxTree( 0.0, 1.0 );
+            }
+            case cAbs:
+            {
+                /* cAbs always produces a positive value */
+                MinMaxTree m = GetParam(0).CalculateResultBoundaries();
+                if(m.has_min && m.has_max)
+                {
+                    if(m.min < 0.0 && m.max >= 0.0) // ex. -10..+6 or -6..+10
+                    {
+                        /* -x..+y: spans across zero. min=0, max=greater of |x| and |y|. */
+                        double tmp = -m.min; if(tmp > m.max) m.max = tmp;
+                        m.min = 0.0; m.has_min = true;
+                    }
+                    else if(m.min < 0.0) // ex. -10..-4
+                        { double tmp = m.max; m.max = -m.min; m.min = -tmp; }
+                }
+                else if(!m.has_min && m.has_max && m.max < 0.0) // ex. -inf..-10
+                {
+                    m.min = fabs(m.max); m.has_min = true; m.has_max = false;
+                }
+                else if(!m.has_max && m.has_min && m.min > 0.0) // ex. +10..+inf
+                {
+                    m.min = fabs(m.min); m.has_min = true; m.has_max = false;
+                }
+                else // ex. -inf..+inf, -inf..+10, -10..+inf
+                {
+                    // all of these cover -inf..0, 0..+inf, or both
+                    m.min = 0.0; m.has_min = true; m.has_max = false;
+                }
+                return m;
+            }
+
+            case cLog: /* Defined for 0.0 < x <= inf */
+            {
+                MinMaxTree m = GetParam(0).CalculateResultBoundaries();
+                if(m.has_min) { if(m.min < 0.0) m.has_min = false; else m.min = log(m.min); } // No boundaries
+                if(m.has_max) { if(m.max < 0.0) m.has_max = false; else m.max = log(m.max); }
+                return m;
+            }
+
+            case cLog2: /* Defined for 0.0 < x <= inf */
+            {
+                MinMaxTree m = GetParam(0).CalculateResultBoundaries();
+                if(m.has_min) { if(m.min < 0.0) m.has_min = false; else m.min = fp_log2(m.min); } // No boundaries
+                if(m.has_max) { if(m.max < 0.0) m.has_max = false; else m.max = fp_log2(m.max); }
+                return m;
+            }
+
+            case cLog10: /* Defined for 0.0 < x <= inf */
+            {
+                MinMaxTree m = GetParam(0).CalculateResultBoundaries();
+                if(m.has_min) { if(m.min < 0.0) m.has_min = false; else m.min = fp_log10(m.min); }
+                if(m.has_max) { if(m.max < 0.0) m.has_max = false; else m.max = fp_log10(m.max); }
+                return m;
+            }
+
+            case cAcosh: /* defined for             1.0 <  x <= inf */
+            {
+                MinMaxTree m = GetParam(0).CalculateResultBoundaries();
+                if(m.has_min) { if(m.min <= 1.0) m.has_min = false; else m.min = fp_acosh(m.min); } // No boundaries
+                if(m.has_max) { if(m.max <= 1.0) m.has_max = false; else m.max = fp_acosh(m.max); }
+                return m;
+            }
+            case cAsinh: /* defined for all values -inf <= x <= inf */
+            {
+                MinMaxTree m = GetParam(0).CalculateResultBoundaries();
+                if(m.has_min) m.min = fp_asinh(m.min); // No boundaries
+                if(m.has_max) m.max = fp_asinh(m.max);
+                return m;
+            }
+            case cAtanh: /* defined for all values -inf <= x <= inf */
+            {
+                MinMaxTree m = GetParam(0).CalculateResultBoundaries();
+                if(m.has_min) m.min = fp_atanh(m.min); // No boundaries
+                if(m.has_max) m.max = fp_atanh(m.max);
+                return m;
+            }
+            case cAcos: /* defined for -1.0 <= x < 1, results within CONSTANT_PI..0 */
+            {
+                /* Somewhat complicated to narrow down from this */
+                /* TODO: A resourceful programmer may add it later. */
+                return MinMaxTree( 0.0, CONSTANT_PI );
+            }
+            case cAsin: /* defined for -1.0 <= x < 1, results within -CONSTANT_PIHALF..CONSTANT_PIHALF */
+            {
+                /* Somewhat complicated to narrow down from this */
+                /* TODO: A resourceful programmer may add it later. */
+                return MinMaxTree( -CONSTANT_PIHALF, CONSTANT_PIHALF );
+            }
+            case cAtan: /* defined for all values -inf <= x <= inf */
+            {
+                MinMaxTree m = GetParam(0).CalculateResultBoundaries();
+                if(m.has_min) m.min = atan(m.min); else { m.min = -CONSTANT_PIHALF; m.has_min = true; }
+                if(m.has_max) m.max = atan(m.max); else { m.max =  CONSTANT_PIHALF; m.has_max = true; }
+                return m;
+            }
+            case cAtan2: /* too complicated to estimate */
+            {
+                MinMaxTree p0 = GetParam(0).CalculateResultBoundaries();
+                MinMaxTree p1 = GetParam(1).CalculateResultBoundaries();
+                if(GetParam(0).IsImmed()
+                && FloatEqual(GetParam(0).GetImmed(), 0.0))   // y == 0
+                {
+                    // Either 0.0 or CONSTANT_PI
+                    return MinMaxTree(0.0, CONSTANT_PI);
+                }
+                if(GetParam(1).IsImmed()
+                && FloatEqual(GetParam(1).GetImmed(), 0.0))   // x == 0
+                {
+                    // EIther -CONSTANT_PIHALF or +CONSTANT_PIHALF
+                    return MinMaxTree(-CONSTANT_PIHALF, CONSTANT_PIHALF);
+                }
+                // Anything else
+                /* Somewhat complicated to narrow down from this */
+                /* TODO: A resourceful programmer may add it later. */
+                return MinMaxTree(-CONSTANT_PI, CONSTANT_PI);
+            }
+
+            case cSin:
+            case cCos:
+            {
+                /* Could be narrowed down from here,
+                 * but it's too complicated due to
+                 * the cyclic nature of the function. */
+                /* TODO: A resourceful programmer may add it later. */
+                return MinMaxTree(-1.0, 1.0);
+            }
+            case cTan:
+            {
+                /* Could be narrowed down from here,
+                 * but it's too complicated due to
+                 * the cyclic nature of the function */
+                /* TODO: A resourceful programmer may add it later. */
+                return MinMaxTree(); // (CONSTANT_NEG_INF, CONSTANT_POS_INF);
+            }
+
+            case cCeil:
+            {
+                MinMaxTree m = GetParam(0).CalculateResultBoundaries();
+                m.max = std::ceil(m.max); // ceil() may increase the value, may not decrease
+                return m;
+            }
+            case cFloor:
+            {
+                MinMaxTree m = GetParam(0).CalculateResultBoundaries();
+                m.min = std::floor(m.min); // floor() may decrease the value, may not increase
+                return m;
+            }
+            case cTrunc:
+            {
+                MinMaxTree m = GetParam(0).CalculateResultBoundaries();
+                m.min = std::floor(m.min); // trunc() may either increase or decrease the value
+                m.max = std::ceil(m.max); // for safety, we assume both
+                return m;
+            }
+            case cInt:
+            {
+                MinMaxTree m = GetParam(0).CalculateResultBoundaries();
+                m.min = std::floor(m.min); // int() may either increase or decrease the value
+                m.max = std::ceil(m.max); // for safety, we assume both
+                return m;
+            }
+            case cSinh: /* defined for all values -inf <= x <= inf */
+            {
+                MinMaxTree m = GetParam(0).CalculateResultBoundaries();
+                if(m.has_min) m.min = sinh(m.min); // No boundaries
+                if(m.has_max) m.max = sinh(m.max);
+                return m;
+            }
+            case cTanh: /* defined for all values -inf <= x <= inf, results within -1..1 */
+            {
+                MinMaxTree m = GetParam(0).CalculateResultBoundaries();
+                if(m.has_min) m.min = tanh(m.min); else { m.has_min = true; m.min =-1.0; }
+                if(m.has_max) m.max = tanh(m.max); else { m.has_max = true; m.max = 1.0; }
+                return m;
+            }
+            case cCosh: /* defined for all values -inf <= x <= inf, results within 1..inf */
+            {
+                MinMaxTree m = GetParam(0).CalculateResultBoundaries();
+                if(m.has_min)
+                {
+                    if(m.has_max) // max, min
+                    {
+                        if(m.min >= 0.0 && m.max >= 0.0) // +x .. +y
+                            { m.min = cosh(m.min); m.max = cosh(m.max); }
+                        else if(m.min < 0.0 && m.max >= 0.0) // -x .. +y
+                            { double tmp = cosh(m.min); m.max = cosh(m.max);
+                              if(tmp > m.max) m.max = tmp;
+                              m.min = 1.0; }
+                        else // -x .. -y
+                            { m.min = cosh(m.min); m.max = cosh(m.max);
+                              std::swap(m.min, m.max); }
+                    }
+                    else // min, no max
+                    {
+                        if(m.min >= 0.0) // 0..inf -> 1..inf
+                            { m.has_max = false; m.min = cosh(m.min); }
+                        else
+                            { m.has_max = false; m.min = 1.0; } // Anything between 1..inf
+                    }
+                }
+                else // no min
+                {
+                    m.has_min = true; m.min = 1.0; // always a lower boundary
+                    if(m.has_max) // max, no min
+                    {
+                        m.min = cosh(m.max); // n..inf
+                        m.has_max = false; // No upper boundary
+                    }
+                    else // no max, no min
+                        m.has_max = false; // No upper boundary
+                }
+                return m;
+            }
+
+            case cIf:
+            case cAbsIf:
+            {
+                // No guess which branch is chosen. Produce a spanning min & max.
+                MinMaxTree res1 = GetParam(1).CalculateResultBoundaries();
+                MinMaxTree res2 = GetParam(2).CalculateResultBoundaries();
+                if(!res2.has_min) res1.has_min = false; else if(res1.has_min && res2.min < res1.min) res1.min = res2.min;
+                if(!res2.has_max) res1.has_max = false; else if(res1.has_max && res2.max > res1.max) res1.max = res2.max;
+                return res1;
+            }
+
+            case cMin:
+            {
+                bool has_unknown_min = false;
+                bool has_unknown_max = false;
+
+                MinMaxTree result;
+                for(size_t a=0; a<GetParamCount(); ++a)
+                {
+                    MinMaxTree m = GetParam(a).CalculateResultBoundaries();
+                    if(!m.has_min)
+                        has_unknown_min = true;
+                    else if(!result.has_min || m.min < result.min)
+                        result.min = m.min;
+
+                    if(!m.has_max)
+                        has_unknown_max = true;
+                    else if(!result.has_max || m.max < result.max)
+                        result.max = m.max;
+                }
+                if(has_unknown_min) result.has_min = false;
+                if(has_unknown_max) result.has_max = false;
+                return result;
+            }
+            case cMax:
+            {
+                bool has_unknown_min = false;
+                bool has_unknown_max = false;
+
+                MinMaxTree result;
+                for(size_t a=0; a<GetParamCount(); ++a)
+                {
+                    MinMaxTree m = GetParam(a).CalculateResultBoundaries();
+                    if(!m.has_min)
+                        has_unknown_min = true;
+                    else if(!result.has_min || m.min > result.min)
+                        result.min = m.min;
+
+                    if(!m.has_max)
+                        has_unknown_max = true;
+                    else if(!result.has_max || m.max > result.max)
+                        result.max = m.max;
+                }
+                if(has_unknown_min) result.has_min = false;
+                if(has_unknown_max) result.has_max = false;
+                return result;
+            }
+            case cAdd:
+            {
+                /* It's complicated. Follow the logic below. */
+                /* Note: This also deals with the following opcodes:
+                 *       cNeg, cSub, cRSub
+                 */
+                MinMaxTree result(0.0, 0.0);
+                for(size_t a=0; a<GetParamCount(); ++a)
+                {
+                    MinMaxTree item = GetParam(a).CalculateResultBoundaries();
+
+                    if(item.has_min) result.min += item.min;
+                    else             result.has_min = false;
+                    if(item.has_max) result.max += item.max;
+                    else             result.has_max = false;
+
+                    if(!result.has_min && !result.has_max) break; // hopeless
+                }
+                if(result.has_min && result.has_max
+                && result.min > result.max) std::swap(result.min, result.max);
+                return result;
+            }
+            case cMul:
+            {
+                /* It's very complicated. Follow the logic below. */
+                struct Value
+                {
+                    enum ValueType { Finite, MinusInf, PlusInf };
+                    ValueType valueType;
+                    double value;
+
+                    Value(ValueType t): valueType(t), value(0) {}
+                    Value(double v): valueType(Finite), value(v) {}
+
+                    bool isNegative() const
+                    {
+                        return valueType == MinusInf ||
+                            (valueType == Finite && value < 0.0);
+                    }
+
+                    void operator*=(const Value& rhs)
+                    {
+                        if(valueType == Finite && rhs.valueType == Finite)
+                            value *= rhs.value;
+                        else
+                            valueType = (isNegative() != rhs.isNegative() ?
+                                         MinusInf : PlusInf);
+                    }
+
+                    bool operator<(const Value& rhs) const
+                    {
+                        return
+                            (valueType == MinusInf && rhs.valueType != MinusInf) ||
+                            (valueType == Finite &&
+                             (rhs.valueType == PlusInf ||
+                              (rhs.valueType == Finite && value < rhs.value)));
+                    }
+                };
+
+                struct MultiplicationRange
+                {
+                    Value minValue, maxValue;
+
+                    MultiplicationRange():
+                        minValue(Value::PlusInf),
+                        maxValue(Value::MinusInf) {}
+
+                    void multiply(Value value1, const Value& value2)
+                    {
+                        value1 *= value2;
+                        if(value1 < minValue) minValue = value1;
+                        if(maxValue < value1) maxValue = value1;
+                    }
+                };
+
+                MinMaxTree result(1.0, 1.0);
+                for(size_t a=0; a<GetParamCount(); ++a)
+                {
+                    MinMaxTree item = GetParam(a).CalculateResultBoundaries();
+                    if(!item.has_min && !item.has_max) return MinMaxTree(); // hopeless
+
+                    Value minValue0 = result.has_min ? Value(result.min) : Value(Value::MinusInf);
+                    Value maxValue0 = result.has_max ? Value(result.max) : Value(Value::PlusInf);
+                    Value minValue1 = item.has_min ? Value(item.min) : Value(Value::MinusInf);
+                    Value maxValue1 = item.has_max ? Value(item.max) : Value(Value::PlusInf);
+
+                    MultiplicationRange range;
+                    range.multiply(minValue0, minValue1);
+                    range.multiply(minValue0, maxValue1);
+                    range.multiply(maxValue0, minValue1);
+                    range.multiply(maxValue0, maxValue1);
+
+                    if(range.minValue.valueType == Value::Finite)
+                        result.min = range.minValue.value;
+                    else result.has_min = false;
+
+                    if(range.maxValue.valueType == Value::Finite)
+                        result.max = range.maxValue.value;
+                    else result.has_max = false;
+
+                    if(!result.has_min && !result.has_max) break; // hopeless
+                }
+                if(result.has_min && result.has_max
+                && result.min > result.max) std::swap(result.min, result.max);
+                return result;
+            }
+            case cMod:
+            {
+                /* TODO: The boundaries of modulo operator could be estimated better. */
+
+                MinMaxTree x = GetParam(0).CalculateResultBoundaries();
+                MinMaxTree y = GetParam(1).CalculateResultBoundaries();
+
+                if(y.has_max)
+                {
+                    if(y.max >= 0.0)
+                    {
+                        if(!x.has_min || x.min < 0)
+                            return MinMaxTree(-y.max, y.max);
+                        else
+                            return MinMaxTree(0.0, y.max);
+                    }
+                    else
+                    {
+                        if(!x.has_max || x.max >= 0)
+                            return MinMaxTree(y.max, -y.max);
+                        else
+                            return MinMaxTree(y.max, NEGATIVE_MAXIMUM);
+                    }
+                }
+                else
+                    return MinMaxTree();
+            }
+            case cPow:
+            {
+                if(GetParam(1).IsImmed() && GetParam(1).GetImmed() == 0.0)
+                {
+                    // Note: This makes 0^0 evaluate into 1.
+                    return MinMaxTree(1.0, 1.0); // x^0 = 1
+                }
+                if(GetParam(0).IsImmed() && GetParam(0).GetImmed() == 0.0)
+                {
+                    // Note: This makes 0^0 evaluate into 0.
+                    return MinMaxTree(0.0, 0.0); // 0^x = 0
+                }
+                if(GetParam(0).IsImmed() && FloatEqual(GetParam(0).GetImmed(), 1.0))
+                {
+                    return MinMaxTree(1.0, 1.0); // 1^x = 1
+                }
+                if(GetParam(1).IsImmed()
+                && GetParam(1).GetImmed() > 0
+                && GetParam(1).IsAlwaysParity(false))
+                {
+                    // x ^ even_int_const always produces a non-negative value.
+                    double exponent = GetParam(1).GetImmed();
+                    MinMaxTree tmp = GetParam(0).CalculateResultBoundaries();
+                    MinMaxTree result;
+                    result.has_min = true;
+                    result.min = 0;
+                    if(tmp.has_min && tmp.min >= 0)
+                        result.min = fp_pow(tmp.min, exponent);
+                    else if(tmp.has_max && tmp.max <= 0)
+                        result.min = fp_pow(tmp.max, exponent);
+
+                    result.has_max = false;
+                    if(tmp.has_min && tmp.has_max)
+                    {
+                        result.has_max = true;
+                        result.max     = std::max(fabs(tmp.min), fabs(tmp.max));
+                        result.max     = fp_pow(result.max, exponent);
+                    }
+                    return result;
+                }
+
+                MinMaxTree p0 = GetParam(0).CalculateResultBoundaries();
+                MinMaxTree p1 = GetParam(1).CalculateResultBoundaries();
+                TriTruthValue p0_positivity =
+                    (p0.has_min && p0.min >= 0.0) ? IsAlways
+                  : (p0.has_max && p0.max < 0.0 ? IsNever
+                    : Unknown);
+                TriTruthValue p1_evenness = GetParam(1).GetEvennessInfo();
+
+                /* If param0 IsAlways, the return value is also IsAlways */
+                /* If param1 is even, the return value is IsAlways */
+                /* If param1 is odd, the return value is same as param0's */
+                /* If param0 is negative and param1 is not integer,
+                 * the return value is imaginary (assumed Unknown)
+                 *
+                 * Illustrated in this truth table:
+                 *  P=positive, N=negative
+                 *  E=even, O=odd, U=not integer
+                 *  *=unknown, X=invalid (unknown), x=maybe invalid (unknown)
+                 *
+                 *   param1: PE PO P* NE NO N* PU NU *
+                 * param0:
+                 *   PE      P  P  P  P  P  P  P  P  P
+                 *   PO      P  P  P  P  P  P  P  P  P
+                 *   PU      P  P  P  P  P  P  P  P  P
+                 *   P*      P  P  P  P  P  P  P  P  P
+                 *   NE      P  N  *  P  N  *  X  X  x
+                 *   NO      P  N  *  P  N  *  X  X  x
+                 *   NU      P  N  *  P  N  *  X  X  x
+                 *   N*      P  N  *  P  N  *  X  X  x
+                 *   *       P  *  *  P  *  *  x  x  *
+                 *
+                 * Note: This also deals with the following opcodes:
+                 *       cSqrt  (param0, PU) (x^0.5)
+                 *       cRSqrt (param0, NU) (x^-0.5)
+                 *       cExp   (PU, param1) (CONSTANT_E^x)
+                 */
+                TriTruthValue result_positivity = Unknown;
+                switch(p0_positivity)
+                {
+                    case IsAlways:
+                        // e.g.   5^x = positive.
+                        result_positivity = IsAlways;
+                        break;
+                    case IsNever:
+                    {
+                        result_positivity = p1_evenness;
+                        break;
+                    }
+                    default:
+                        switch(p1_evenness)
+                        {
+                            case IsAlways:
+                                // e.g. x^( 4) = positive
+                                // e.g. x^(-4) = positive
+                                result_positivity = IsAlways;
+                                break;
+                            case IsNever:
+                                break;
+                            case Unknown:
+                            {
+                                /* If p1 is const non-integer,
+                                 * assume the result is positive
+                                 * though it may be NaN instead.
+                                 */
+                                if(GetParam(1).IsImmed()
+                                && GetParam(1).IsAlwaysInteger(false)
+                                && GetParam(1).GetImmed() >= 0.0)
+                                {
+                                    result_positivity = IsAlways;
+                                }
+                                break;
+                            }
+                        }
+                }
+                switch(result_positivity)
+                {
+                    case IsAlways:
+                    {
+                        /* The result is always positive.
+                         * Figure out whether we know the minimum value. */
+                        double min = 0.0;
+                        if(p0.has_min && p1.has_min)
+                        {
+                            min = pow(p0.min, p1.min);
+                            if(p0.min < 0.0 && (!p1.has_max || p1.max >= 0.0) && min >= 0.0)
+                                min = 0.0;
+                        }
+                        if(p0.has_min && p0.min >= 0.0 && p0.has_max && p1.has_max)
+                        {
+                            double max = pow(p0.max, p1.max);
+                            if(min > max) std::swap(min, max);
+                            return MinMaxTree(min, max);
+                        }
+                        return MinMaxTree(min, false);
+                    }
+                    case IsNever:
+                    {
+                        /* The result is always negative.
+                         * TODO: Figure out whether we know the maximum value.
+                         */
+                        return MinMaxTree(false, NEGATIVE_MAXIMUM);
+                    }
+                    default:
+                    {
+                        /* It can be negative or positive.
+                         * We know nothing about the boundaries. */
+                        break;
+                    }
+                }
+                break;
+            }
+
+            /* The following opcodes are processed by GenerateFrom()
+             * within fpoptimizer_bytecode_to_codetree.c and thus
+             * they will never occur in the calling context for the
+             * most of the parsing context. They may however occur
+             * at the late phase, so we deal with them.
+             */
+            case cNeg:
+            {
+                CodeTree tmp;
+                tmp.SetOpcode(cMul);
+                tmp.AddParam(CodeTree(-1.0));
+                tmp.AddParam(GetParam(0));
+                return tmp.CalculateResultBoundaries();
+            }
+            case cSub: // converted into cMul y -1
+            {
+                CodeTree tmp, tmp2;
+                tmp2.SetOpcode(cNeg);
+                tmp2.AddParam(GetParam(1));
+                tmp.SetOpcode(cAdd);
+                tmp.AddParam(GetParam(0));
+                tmp.AddParamMove(tmp2);
+                return tmp.CalculateResultBoundaries();
+            }
+            case cInv: // converted into cPow x -1
+            {
+                CodeTree tmp;
+                tmp.SetOpcode(cPow);
+                tmp.AddParam(GetParam(0));
+                tmp.AddParam(CodeTree(-1.0));
+                return tmp.CalculateResultBoundaries();
+            }
+            case cDiv: // converted into cPow y -1
+            {
+                CodeTree tmp, tmp2;
+                tmp2.SetOpcode(cInv);
+                tmp2.AddParam(GetParam(1));
+                tmp.SetOpcode(cMul);
+                tmp.AddParam(GetParam(0));
+                tmp.AddParamMove(tmp2);
+                return tmp.CalculateResultBoundaries();
+            }
+            case cRad: // converted into cMul x CONSTANT_RD
+            {
+                CodeTree tmp;
+                tmp.SetOpcode(cMul);
+                tmp.AddParam(GetParam(0));
+                tmp.AddParam(CodeTree(CONSTANT_RD));
+                return tmp.CalculateResultBoundaries();
+            }
+            case cDeg: // converted into cMul x CONSTANT_DR
+            {
+                CodeTree tmp;
+                tmp.SetOpcode(cMul);
+                tmp.AddParam(GetParam(0));
+                tmp.AddParam(CodeTree(CONSTANT_DR));
+                return tmp.CalculateResultBoundaries();
+            }
+            case cSqr: // converted into cMul x x    or cPow x 2
+            {
+                CodeTree tmp;
+                tmp.SetOpcode(cPow);
+                tmp.AddParam(GetParam(0));
+                tmp.AddParam(CodeTree(2.0));
+                return tmp.CalculateResultBoundaries();
+            }
+            case cExp: // converted into cPow CONSTANT_E x
+            {
+                CodeTree tmp;
+                tmp.SetOpcode(cPow);
+                tmp.AddParam(CodeTree(CONSTANT_E));
+                tmp.AddParam(GetParam(0));
+                return tmp.CalculateResultBoundaries();
+            }
+            case cExp2: // converted into cPow 2 x
+            {
+                CodeTree tmp;
+                tmp.SetOpcode(cPow);
+                tmp.AddParam(CodeTree(2.0));
+                tmp.AddParam(GetParam(0));
+                return tmp.CalculateResultBoundaries();
+            }
+            case cCbrt: // converted into cPow x 0.33333333
+            {
+                // However, contrary to x^(1/3), this allows
+                // negative values for x, and produces those
+                // as well.
+                MinMaxTree result = GetParam(0).CalculateResultBoundaries();
+                if(result.has_min) result.min = fp_cbrt(result.min);
+                if(result.has_max) result.max = fp_cbrt(result.max);
+                return result;
+            }
+            case cSqrt: // converted into cPow x 0.5
+            {
+                MinMaxTree result = GetParam(0).CalculateResultBoundaries();
+                if(result.has_min) result.min = result.min < 0 ? 0 : fp_sqrt(result.min);
+                if(result.has_max) result.max = result.max < 0 ? 0 : fp_sqrt(result.max);
+                return result;
+            }
+            case cRSqrt: // converted into cPow x -0.5
+            {
+                CodeTree tmp;
+                tmp.SetOpcode(cPow);
+                tmp.AddParam(GetParam(0));
+                tmp.AddParam(CodeTree(-0.5));
+                return tmp.CalculateResultBoundaries();
+            }
+            case cLog2by: // converted into cMul y CONSTANT_L2I (cLog x)
+            {
+                CodeTree tmp, tmp2;
+                tmp2.SetOpcode(cLog2);
+                tmp2.AddParam(GetParam(0));
+                tmp.SetOpcode(cMul);
+                tmp.AddParamMove(tmp2);
+                tmp.AddParam(GetParam(1));
+                return tmp.CalculateResultBoundaries();
+            }
+            case cCot: // converted into 1 / cTan
+            {
+                CodeTree tmp, tmp2;
+                tmp2.SetOpcode(cTan);
+                tmp2.AddParam(GetParam(0));
+                tmp.SetOpcode(cInv);
+                tmp.AddParamMove(tmp2);
+                return tmp.CalculateResultBoundaries();
+            }
+            case cSec: // converted into 1 / cCos
+            {
+                CodeTree tmp, tmp2;
+                tmp2.SetOpcode(cCos);
+                tmp2.AddParam(GetParam(0));
+                tmp.SetOpcode(cInv);
+                tmp.AddParamMove(tmp2);
+                return tmp.CalculateResultBoundaries();
+            }
+            case cCsc: // converted into 1 / cSin
+            {
+                CodeTree tmp, tmp2;
+                tmp2.SetOpcode(cSin);
+                tmp2.AddParam(GetParam(0));
+                tmp.SetOpcode(cInv);
+                tmp.AddParamMove(tmp2);
+                return tmp.CalculateResultBoundaries();
+            }
+            /* The following opcodes are processed by GenerateFrom()
+             * within fpoptimizer_bytecode_to_codetree.c and thus
+             * they will never occur in the calling context:
+             */
+                break; /* Should never occur */
+
+            /* Opcodes that do not occur in the tree for other reasons */
+            case cRDiv: // version of cDiv
+            case cRSub: // version of cSub
+            case cDup:
+            case cFetch:
+            case cPopNMov:
+            case cNop:
+            case cJump:
+            case VarBegin:
+                break; /* Should never occur */
+
+            /* Opcodes that are completely unpredictable */
+            case cPCall:
+                break;
+            case cFCall:
+                break; // Cannot deduce
+            case cEval:
+                break; // Cannot deduce
+        }
+        return MinMaxTree(); /* Cannot deduce */
+    }
+}
+
+#endif
+
+#line 1 "fpoptimizer/fpoptimizer_transformations.c"
+// line removed for fpoptimizer.c: #include "fpoptimizer_bytecodesynth.h"
+// line removed for fpoptimizer.c: #include "fpoptimizer_codetree.h"
+// line removed for fpoptimizer.c: #include "fpoptimizer_consts.h"
+
+#ifdef FP_SUPPORT_OPTIMIZER
+
+using namespace FUNCTIONPARSERTYPES;
+//using namespace FPoptimizer_Grammar;
+
+//#define DEBUG_POWI
+//#define DEBUG_SUBSTITUTIONS_CSE
+
+#if defined(__x86_64) || !defined(FP_SUPPORT_CBRT)
+# define CBRT_IS_SLOW
+#endif
+
+namespace FPoptimizer_ByteCode
+{
+    extern const unsigned char powi_table[256];
+}
+namespace
+{
+    using namespace FPoptimizer_CodeTree;
+
+    typedef
+        std::multimap<fphash_t,  std::pair<size_t, CodeTree> >
+        TreeCountType;
+
+    void FindTreeCounts(TreeCountType& TreeCounts, const CodeTree& tree)
+    {
+        TreeCountType::iterator i = TreeCounts.lower_bound(tree.GetHash());
+        bool found = false;
+        for(; i != TreeCounts.end() && i->first == tree.GetHash(); ++i)
+        {
+            if(tree.IsIdenticalTo( i->second.second ) )
+            {
+                i->second.first += 1;
+                found = true;
+                break;
+            }
+        }
+        if(!found)
+        {
+            TreeCounts.insert(i, std::make_pair(tree.GetHash(), std::make_pair(size_t(1), tree)));
+        }
+
+        for(size_t a=0; a<tree.GetParamCount(); ++a)
+            FindTreeCounts(TreeCounts, tree.GetParam(a));
+    }
+
+    struct BalanceResultType
+    {
+        bool BalanceGood;
+        bool FoundChild;
+    };
+    BalanceResultType IfBalanceGood(const CodeTree& root, const CodeTree& child)
+    {
+        if(root.IsIdenticalTo(child))
+        {
+            BalanceResultType result = {true,true};
+            return result;
+        }
+
+        BalanceResultType result = {true,false};
+
+        if(root.GetOpcode() == cIf
+        || root.GetOpcode() == cAbsIf)
+        {
+            BalanceResultType cond    = IfBalanceGood(root.GetParam(0), child);
+            BalanceResultType branch1 = IfBalanceGood(root.GetParam(1), child);
+            BalanceResultType branch2 = IfBalanceGood(root.GetParam(2), child);
+
+            if(cond.FoundChild || branch1.FoundChild || branch2.FoundChild)
+                { result.FoundChild = true; }
+
+            // balance is good if:
+            //      branch1.found = branch2.found OR (cond.found AND cond.goodbalance)
+            // AND  cond.goodbalance OR (branch1.found AND branch2.found)
+            // AND  branch1.goodbalance OR (cond.found AND cond.goodbalance)
+            // AND  branch2.goodbalance OR (cond.found AND cond.goodbalance)
+
+            result.BalanceGood =
+                (   (branch1.FoundChild == branch2.FoundChild)
+                 || (cond.FoundChild && cond.BalanceGood) )
+             && (cond.BalanceGood || (branch1.FoundChild && branch2.FoundChild))
+             && (branch1.BalanceGood || (cond.FoundChild && cond.BalanceGood))
+             && (branch2.BalanceGood || (cond.FoundChild && cond.BalanceGood));
+        }
+        else
+        {
+            bool has_bad_balance        = false;
+            bool has_good_balance_found = false;
+
+            // Balance is bad if one of the children has bad balance
+            // Unless one of the children has good balance & found
+
+            for(size_t b=root.GetParamCount(), a=0; a<b; ++a)
+            {
+                BalanceResultType tmp = IfBalanceGood(root.GetParam(a), child);
+                if(tmp.FoundChild)
+                    result.FoundChild = true;
+
+                if(tmp.BalanceGood == false)
+                    has_bad_balance = true;
+                else if(tmp.FoundChild)
+                    has_good_balance_found = true;
+
+                // if the expression is
+                //   if(x, sin(x), 0) + sin(x)
+                // then sin(x) is a good subexpression
+                // even though it occurs in unbalance.
+            }
+            if(has_bad_balance && !has_good_balance_found)
+                result.BalanceGood = false;
+        }
+        return result;
+    }
+
+    bool IsOptimizableUsingPowi(long immed, long penalty = 0)
+    {
+        FPoptimizer_ByteCode::ByteCodeSynth synth;
+        synth.PushVar(0);
+        // Ignore the size generated by subtree
+        size_t bytecodesize_backup = synth.GetByteCodeSize();
+        FPoptimizer_ByteCode::AssembleSequence(immed, FPoptimizer_ByteCode::MulSequence, synth);
+
+        size_t bytecode_grow_amount = synth.GetByteCodeSize() - bytecodesize_backup;
+
+        return bytecode_grow_amount < size_t(MAX_POWI_BYTECODE_LENGTH - penalty);
+    }
+
+    void ChangeIntoRootChain(
+        CodeTree& tree,
+        bool inverted,
+        long sqrt_count,
+        long cbrt_count)
+    {
+        while(cbrt_count > 0)
+        {
+            CodeTree tmp;
+            tmp.SetOpcode(cCbrt);
+            tmp.AddParamMove(tree);
+            tmp.Rehash();
+            tree.swap(tmp);
+            --cbrt_count;
+        }
+        while(sqrt_count > 0)
+        {
+            CodeTree tmp;
+            tmp.SetOpcode(cSqrt);
+            if(inverted)
+            {
+                tmp.SetOpcode(cRSqrt);
+                inverted = false;
+            }
+            tmp.AddParamMove(tree);
+            tmp.Rehash();
+            tree.swap(tmp);
+            --sqrt_count;
+        }
+        if(inverted)
+        {
+            CodeTree tmp;
+            tmp.SetOpcode(cInv);
+            tmp.AddParamMove(tree);
+            tree.swap(tmp);
+        }
+    }
+
+    double CalculatePowiFactorCost(long abs_int_exponent)
+    {
+        static std::map<long, double> cache;
+        std::map<long,double>::iterator i = cache.lower_bound(abs_int_exponent);
+        if(i != cache.end() && i->first == abs_int_exponent)
+            return i->second;
+        std::pair<long, double> result(abs_int_exponent, 0.0);
+        double& cost = result.second;
+
+        while(abs_int_exponent > 1)
+        {
+            int factor = 0;
+            if(abs_int_exponent < 256)
+            {
+                factor = FPoptimizer_ByteCode::powi_table[abs_int_exponent];
+                if(factor & 128) factor &= 127; else factor = 0;
+                if(factor & 64) factor = -(factor&63) - 1;
+            }
+            if(factor)
+            {
+                cost += CalculatePowiFactorCost(factor);
+                abs_int_exponent /= factor;
+                continue;
+            }
+            if(!(abs_int_exponent & 1))
+            {
+                abs_int_exponent /= 2;
+                cost += 3; // sqr
+            }
+            else
+            {
+                cost += 3.5; // dup+mul
+                abs_int_exponent -= 1;
+            }
+        }
+
+        cache.insert(i, result);
+        return cost;
+    }
+
+    struct PowiResolver
+    {
+        /* Any exponentiation can be turned into one of these:
+         *
+         *   x^y  -> sqrt(x)^(y*2)         = x Sqrt       y*2  Pow
+         *   x^y  -> cbrt(x)^(y*3)         = x Cbrt       y*3  Pow
+         *   x^y  -> rsqrt(x)^(y*-2)       = x RSqrt     y*-2  Pow
+         *   x^y  -> x^(y-1/2) * sqrt(x)   = x Sqrt   x y-0.5  Pow Mul
+         *   x^y  -> x^(y-1/3) * cbrt(x)   = x Cbrt   x y-0.33 Pow Mul
+         *   x^y  -> x^(y+1/2) * rsqrt(x)  = x Sqrt   x y+0.5  Pow Mul
+         *   x^y  -> inv(x)^(-y)           = x Inv      -y     Pow
+         *
+         * These rules can be applied recursively.
+         * The goal is to find the optimal chain of operations
+         * that results in the least number of sqrt,cbrt operations;
+         * an integer value of y, and that the integer is as close
+         * to zero as possible.
+         */
+        static const unsigned MaxSep = 4;
+
+        struct PowiResult
+        {
+            PowiResult() :
+                n_int_sqrt(0),
+                n_int_cbrt(0),
+                resulting_exponent(0),
+                sep_list() { }
+
+            int n_int_sqrt;
+            int n_int_cbrt;
+            long resulting_exponent;
+            int sep_list[MaxSep];
+        };
+
+        PowiResult CreatePowiResult(double exponent) const
+        {
+            static const double RootPowers[(1+4)*(1+3)] =
+            {
+                // (sqrt^n(x))
+                1.0,
+                1.0 / (2),
+                1.0 / (2*2),
+                1.0 / (2*2*2),
+                1.0 / (2*2*2*2),
+                // cbrt^1(sqrt^n(x))
+                1.0 / (3),
+                1.0 / (3*2),
+                1.0 / (3*2*2),
+                1.0 / (3*2*2*2),
+                1.0 / (3*2*2*2*2),
+                // cbrt^2(sqrt^n(x))
+                1.0 / (3*3),
+                1.0 / (3*3*2),
+                1.0 / (3*3*2*2),
+                1.0 / (3*3*2*2*2),
+                1.0 / (3*3*2*2*2*2),
+                // cbrt^3(sqrt^n(x))
+                1.0 / (3*3*3),
+                1.0 / (3*3*3*2),
+                1.0 / (3*3*3*2*2),
+                1.0 / (3*3*3*2*2*2),
+                1.0 / (3*3*3*2*2*2*2)
+            };
+
+            PowiResult result;
+
+            int best_factor = FindIntegerFactor(exponent);
+            if(best_factor == 0)
+            {
+        #ifdef DEBUG_POWI
+            printf("no factor found for %g\n", exponent);
+        #endif
+                return result; // Unoptimizable
+            }
+
+            double best_cost = EvaluateFactorCost(best_factor, 0, 0, 0)
+                             + CalculatePowiFactorCost(long(exponent*best_factor));
+            int s_count = 0;
+            int c_count = 0;
+            int mul_count = 0;
+
+        #ifdef DEBUG_POWI
+            printf("orig = %g\n", exponent);
+            printf("plain factor = %d, cost %g\n", best_factor, best_cost);
+        #endif
+
+            for(unsigned n_s=0; n_s<MaxSep; ++n_s)
+            {
+                int best_selected_sep = 0;
+                double best_sep_cost     = best_cost;
+                int best_sep_factor   = best_factor;
+                for(int s=1; s<5*4; ++s)
+                {
+#ifdef CBRT_IS_SLOW
+                    if(s >= 5) break;
+                    // When cbrt is implemented through exp and log,
+                    // there is no advantage over exp(log()), so don't support it.
+#endif
+                    int n_sqrt = s%5;
+                    int n_cbrt = s/5;
+                    if(n_sqrt + n_cbrt > 4) continue;
+
+                    double changed_exponent = exponent;
+                    changed_exponent -= RootPowers[s];
+
+                    int factor = FindIntegerFactor(changed_exponent);
+                    if(factor != 0)
+                    {
+                        double cost = EvaluateFactorCost
+                            (factor, s_count + n_sqrt, c_count + n_cbrt, mul_count + 1)
+                          + CalculatePowiFactorCost(long(changed_exponent*factor));
+
+        #ifdef DEBUG_POWI
+                        printf("%d sqrt %d cbrt factor = %d, cost %g\n",
+                            n_sqrt, n_cbrt, factor, cost);
+        #endif
+                        if(cost < best_sep_cost)
+                        {
+                            best_selected_sep = s;
+                            best_sep_factor   = factor;
+                            best_sep_cost     = cost;
+                        }
+                    }
+                }
+                if(!best_selected_sep) break;
+
+                result.sep_list[n_s] = best_selected_sep;
+                exponent -= RootPowers[best_selected_sep];
+                s_count += best_selected_sep % 5;
+                c_count += best_selected_sep / 5;
+                best_cost   = best_sep_cost;
+                best_factor = best_sep_factor;
+                mul_count += 1;
+            }
+
+            result.resulting_exponent = (long) (exponent * best_factor + 0.5);
+            while(best_factor % 2 == 0)
+            {
+                ++result.n_int_sqrt;
+                best_factor /= 2;
+            }
+            while(best_factor % 3 == 0)
+            {
+                ++result.n_int_cbrt;
+                best_factor /= 3;
+            }
+            return result;
+        }
+
+    private:
+        // Find the integer that "value" must be multiplied
+        // with to produce an integer...
+        // Consisting of factors 2 and 3 only.
+        bool MakesInteger(double value, int factor) const
+        {
+            double v = value * double(factor);
+            double diff = fabs(v - (double)(long)(v+0.5));
+            //printf("factor %d: v=%.20f, diff=%.20f\n", factor,v, diff);
+            return diff < 1e-9;
+        }
+        int FindIntegerFactor(double value) const
+        {
+            int factor = (2*2*2*2);
+#ifdef CBRT_IS_SLOW
+            // When cbrt is implemented through exp and log,
+            // there is no advantage over exp(log()), so don't support it.
+#else
+            factor *= (3*3*3);
+#endif
+            int result = 0;
+            if(MakesInteger(value, factor))
+            {
+                result = factor;
+                while((factor % 2) == 0 && MakesInteger(value, factor/2))
+                    result = factor /= 2;
+                while((factor % 3) == 0 && MakesInteger(value, factor/3))
+                    result = factor /= 3;
+            }
+#ifdef CBRT_IS_SLOW
+            if(result == 0)
+            {
+                /* Note: Even if we allow one cbrt,
+                 *        cbrt(cbrt(x)) still gets turned into
+                 *        exp(log(x)*0.111111)
+                 *        which gives an error when x < 0...
+                 *        should we use a special system here?
+                 *        i.e. exp(log(-5)*y)
+                 *      =      -exp(log(5)*y)
+                 *        except when y is an even integer,
+                 *      when  = exp(log(5)*y)
+                 * We use a custom fp_pow() function
+                 * in order to handle these situations.
+                 */
+                if(MakesInteger(value, 3)) return 3; // single cbrt opcode
+            }
+#endif
+            return result;
+        }
+
+        int EvaluateFactorCost(int factor, int s, int c, int nmuls) const
+        {
+            const int sqrt_cost = 6;
+#ifdef CBRT_IS_SLOW
+            const int cbrt_cost = 25;
+#else
+            const int cbrt_cost = 8;
+#endif
+            int result = s * sqrt_cost + c * cbrt_cost;
+            while(factor % 2 == 0) { factor /= 2; result += sqrt_cost; }
+            while(factor % 3 == 0) { factor /= 3; result += cbrt_cost; }
+            result += nmuls;
+            return result;
+        }
+    };
+}
+
+namespace FPoptimizer_CodeTree
+{
+    bool CodeTree::RecreateInversionsAndNegations(bool prefer_base2)
+    {
+        bool changed = false;
+
+        for(size_t a=0; a<GetParamCount(); ++a)
+            if(GetParam(a).RecreateInversionsAndNegations(prefer_base2))
+                changed = true;
+
+        if(changed)
+        {
+        exit_changed:
+            Mark_Incompletely_Hashed();
+            return true;
+        }
+
+        switch(GetOpcode()) // Recreate inversions and negations
+        {
+            case cMul:
+            {
+                std::vector<CodeTree> div_params;
+                CodeTree found_log2, found_log2by;
+
+                if(true)
+                {
+                    /* This lengthy bit of code
+                     * changes log2(x)^3 * 5
+                     * to      log2by(x, 5^(1/3)) ^ 3
+                     * which is better for runtime
+                     * than    log2by(x,1)^3 * 5
+                     */
+                    bool found_log2_on_exponent = false;
+                    double log2_exponent = 0;
+                    for(size_t a = GetParamCount(); a-- > 0; )
+                    {
+                        const CodeTree& powgroup = GetParam(a);
+                        if(powgroup.GetOpcode() == cPow
+                        && powgroup.GetParam(0).GetOpcode() == cLog2
+                        && powgroup.GetParam(1).IsImmed())
+                        {
+                            // Found log2 on exponent
+                            found_log2_on_exponent = true;
+                            log2_exponent = powgroup.GetParam(1).GetImmed();
+                            break;
+                        }
+                    }
+                    if(found_log2_on_exponent)
+                    {
+                        double immeds = 1.0;
+                        for(size_t a = GetParamCount(); a-- > 0; )
+                        {
+                            const CodeTree& powgroup = GetParam(a);
+                            if(powgroup.IsImmed())
+                            {
+                                immeds *= powgroup.GetImmed();
+                                DelParam(a);
+                            }
+                        }
+                        for(size_t a = GetParamCount(); a-- > 0; )
+                        {
+                            CodeTree& powgroup = GetParam(a);
+                            if(powgroup.GetOpcode() == cPow
+                            && powgroup.GetParam(0).GetOpcode() == cLog2
+                            && powgroup.GetParam(1).IsImmed())
+                            {
+                                CodeTree& log2 = powgroup.GetParam(0);
+                                log2.CopyOnWrite();
+                                log2.SetOpcode(cLog2by);
+                                log2.AddParam( CodeTree( fp_pow(immeds, 1.0 / log2_exponent) ) );
+                                log2.Rehash();
+                                break;
+                            }
+                        }
+                    }
+                }
+
+                for(size_t a = GetParamCount(); a-- > 0; )
+                {
+                    const CodeTree& powgroup = GetParam(a);
+                    if(powgroup.GetOpcode() == cPow
+                    && powgroup.GetParam(1).IsImmed())
+                    {
+                        const CodeTree& exp_param = powgroup.GetParam(1);
+                        double exponent = exp_param.GetImmed();
+                        if(FloatEqual(exponent, -1.0))
+                        {
+                            CopyOnWrite();
+                            div_params.push_back(GetParam(a).GetParam(0));
+                            DelParam(a); // delete the pow group
+                        }
+                        else if(exponent < 0 && IsIntegerConst(exponent))
+                        {
+                            CodeTree edited_powgroup;
+                            edited_powgroup.SetOpcode(cPow);
+                            edited_powgroup.AddParam(powgroup.GetParam(0));
+                            edited_powgroup.AddParam(CodeTree(-exponent));
+                            edited_powgroup.Rehash();
+                            div_params.push_back(edited_powgroup);
+                            CopyOnWrite();
+                            DelParam(a); // delete the pow group
+                        }
+                    }
+                    else if(powgroup.GetOpcode() == cLog2 && !found_log2.IsDefined())
+                    {
+                        found_log2 = powgroup.GetParam(0);
+                        CopyOnWrite();
+                        DelParam(a);
+                    }
+                    else if(powgroup.GetOpcode() == cLog2by && !found_log2by.IsDefined())
+                    {
+                        found_log2by = powgroup;
+                        CopyOnWrite();
+                        DelParam(a);
+                    }
+                }
+                if(!div_params.empty())
+                {
+                    changed = true;
+
+                    CodeTree divgroup;
+                    divgroup.SetOpcode(cMul);
+                    divgroup.SetParamsMove(div_params);
+                    divgroup.Rehash(); // will reduce to div_params[0] if only one item
+                    CodeTree mulgroup;
+                    mulgroup.SetOpcode(cMul);
+                    mulgroup.SetParamsMove(GetParams());
+                    mulgroup.Rehash(); // will reduce to 1.0 if none remained in this cMul
+                    if(mulgroup.IsImmed() && FloatEqual(mulgroup.GetImmed(), 1.0))
+                    {
+                        SetOpcode(cInv);
+                        AddParamMove(divgroup);
+                    }
+                    /*else if(mulgroup.IsImmed() && FloatEqual(mulgroup.GetImmed(), -1.0))
+                    {
+                        CodeTree invgroup;
+                        invgroup.SetOpcode(cInv);
+                        invgroup.AddParamMove(divgroup);
+                        invgroup.Rehash();
+                        SetOpcode(cNeg);
+                        AddParamMove(invgroup);
+                    }*/
+                    else
+                    {
+                        if(mulgroup.GetDepth() >= divgroup.GetDepth())
+                        {
+                            SetOpcode(cDiv);
+                            AddParamMove(mulgroup);
+                            AddParamMove(divgroup);
+                        }
+                        else
+                        {
+                            SetOpcode(cRDiv);
+                            AddParamMove(divgroup);
+                            AddParamMove(mulgroup);
+                        }
+                    }
+                }
+                if(found_log2.IsDefined())
+                {
+                    CodeTree mulgroup;
+                    mulgroup.SetOpcode(GetOpcode());
+                    mulgroup.SetParamsMove(GetParams());
+                    mulgroup.Rehash();
+                    while(mulgroup.RecreateInversionsAndNegations(prefer_base2))
+                        mulgroup.FixIncompleteHashes();
+                    SetOpcode(cLog2by);
+                    AddParamMove(found_log2);
+                    AddParamMove(mulgroup);
+                    changed = true;
+                }
+                if(found_log2by.IsDefined())
+                {
+                    CodeTree mulgroup;
+                    mulgroup.SetOpcode(cMul);
+                    mulgroup.AddParamMove(found_log2by.GetParam(1));
+                    mulgroup.AddParamsMove(GetParams());
+                    mulgroup.Rehash();
+                    while(mulgroup.RecreateInversionsAndNegations(prefer_base2))
+                        mulgroup.FixIncompleteHashes();
+                    DelParams();
+                    SetOpcode(cLog2by);
+                    AddParamMove(found_log2by.GetParam(0));
+                    AddParamMove(mulgroup);
+                    changed = true;
+                }
+                break;
+            }
+            case cAdd:
+            {
+                std::vector<CodeTree> sub_params;
+
+                for(size_t a = GetParamCount(); a-- > 0; )
+                    if(GetParam(a).GetOpcode() == cMul)
+                    {
+                        bool is_signed = false; // if the mul group has a -1 constant...
+
+                        CodeTree& mulgroup = GetParam(a);
+
+                        for(size_t b=mulgroup.GetParamCount(); b-- > 0; )
+                        {
+                            if(mulgroup.GetParam(b).IsImmed())
+                            {
+                                double factor = mulgroup.GetParam(b).GetImmed();
+                                if(FloatEqual(factor, -1.0))
+                                {
+                                    mulgroup.CopyOnWrite();
+                                    mulgroup.DelParam(b);
+                                    is_signed = !is_signed;
+                                }
+                                else if(FloatEqual(factor, -2.0))
+                                {
+                                    mulgroup.CopyOnWrite();
+                                    mulgroup.DelParam(b);
+                                    mulgroup.AddParam( CodeTree(2.0) );
+                                    is_signed = !is_signed;
+                                }
+                            }
+                        }
+                        if(is_signed)
+                        {
+                            mulgroup.Rehash();
+                            sub_params.push_back(mulgroup);
+                            CopyOnWrite();
+                            DelParam(a);
+                        }
+                    }
+                    else if(GetParam(a).GetOpcode() == cDiv)
+                    {
+                        bool is_signed = false;
+                        CodeTree& divgroup = GetParam(a);
+                        if(divgroup.GetParam(0).IsImmed())
+                        {
+                            if(FloatEqual(divgroup.GetParam(0).GetImmed(), -1.0))
+                            {
+                                divgroup.CopyOnWrite();
+                                divgroup.DelParam(0);
+                                divgroup.SetOpcode(cInv);
+                                is_signed = !is_signed;
+                            }
+                        }
+                        if(is_signed)
+                        {
+                            divgroup.Rehash();
+                            sub_params.push_back(divgroup);
+                            CopyOnWrite();
+                            DelParam(a);
+                        }
+                    }
+                    else if(GetParam(a).GetOpcode() == cRDiv)
+                    {
+                        bool is_signed = false;
+                        CodeTree& divgroup = GetParam(a);
+                        if(divgroup.GetParam(1).IsImmed())
+                        {
+                            if(FloatEqual(divgroup.GetParam(1).GetImmed(), -1.0))
+                            {
+                                divgroup.CopyOnWrite();
+                                divgroup.DelParam(1);
+                                divgroup.SetOpcode(cInv);
+                                is_signed = !is_signed;
+                            }
+                        }
+                        if(is_signed)
+                        {
+                            divgroup.Rehash();
+                            sub_params.push_back(divgroup);
+                            CopyOnWrite();
+                            DelParam(a);
+                        }
+                    }
+                if(!sub_params.empty())
+                {
+                    CodeTree subgroup;
+                    subgroup.SetOpcode(cAdd);
+                    subgroup.SetParamsMove(sub_params);
+                    subgroup.Rehash(); // will reduce to sub_params[0] if only one item
+                    CodeTree addgroup;
+                    addgroup.SetOpcode(cAdd);
+                    addgroup.SetParamsMove(GetParams());
+                    addgroup.Rehash(); // will reduce to 0.0 if none remained in this cAdd
+                    if(addgroup.IsImmed() && FloatEqual(addgroup.GetImmed(), 0.0))
+                    {
+                        SetOpcode(cNeg);
+                        AddParamMove(subgroup);
+                    }
+                    else
+                    {
+                        if(addgroup.GetDepth() == 1)
+                        {
+                            /* 5 - (x+y+z) is best expressed as rsub(x+y+z, 5);
+                             * this has lowest stack usage.
+                             * This is identified by addgroup having just one member.
+                             */
+                            SetOpcode(cRSub);
+                            AddParamMove(subgroup);
+                            AddParamMove(addgroup);
+                        }
+                        else if(subgroup.GetOpcode() == cAdd)
+                        {
+                            /* a+b-(x+y+z) is expressed as a+b-x-y-z.
+                             * Making a long chain of cSubs is okay, because the
+                             * cost of cSub is the same as the cost of cAdd.
+                             * Thus we get the lowest stack usage.
+                             * This approach cannot be used for cDiv.
+                             */
+                            SetOpcode(cSub);
+                            AddParamMove(addgroup);
+                            AddParamMove(subgroup.GetParam(0));
+                            for(size_t a=1; a<subgroup.GetParamCount(); ++a)
+                            {
+                                CodeTree innersub;
+                                innersub.SetOpcode(cSub);
+                                innersub.SetParamsMove(GetParams());
+                                innersub.Rehash(false);
+                                //DelParams();
+                                AddParamMove(innersub);
+                                AddParamMove(subgroup.GetParam(a));
+                            }
+                        }
+                        else
+                        {
+                            SetOpcode(cSub);
+                            AddParamMove(addgroup);
+                            AddParamMove(subgroup);
+                        }
+                    }
+                }
+                break;
+            }
+            case cPow:
+            {
+                const CodeTree& p0 = GetParam(0);
+                const CodeTree& p1 = GetParam(1);
+                if(p1.IsImmed())
+                {
+                    if(p1.GetImmed() != 0.0 && !p1.IsLongIntegerImmed())
+                    {
+                        PowiResolver::PowiResult
+                            r = PowiResolver().CreatePowiResult(fabs(p1.GetImmed()));
+
+                        if(r.resulting_exponent != 0)
+                        {
+                            bool signed_chain = false;
+
+                            if(p1.GetImmed() < 0
+                            && r.sep_list[0] == 0
+                            && r.n_int_sqrt > 0)
+                            {
+                                // If one of the internal sqrts can be changed into rsqrt
+                                signed_chain = true;
+                            }
+
+                        #ifdef DEBUG_POWI
+                            printf("Will resolve powi %g as powi(chain(%d,%d),%ld)",
+                                fabs(p1.GetImmed()),
+                                r.n_int_sqrt,
+                                r.n_int_cbrt,
+                                r.resulting_exponent);
+                            for(unsigned n=0; n<PowiResolver::MaxSep; ++n)
+                            {
+                                if(r.sep_list[n] == 0) break;
+                                int n_sqrt = r.sep_list[n] % 5;
+                                int n_cbrt = r.sep_list[n] / 5;
+                                printf("*chain(%d,%d)", n_sqrt,n_cbrt);
+                            }
+                            printf("\n");
+                        #endif
+
+                            CodeTree source_tree = GetParam(0);
+
+                            CodeTree pow_item = source_tree;
+                            pow_item.CopyOnWrite();
+                            ChangeIntoRootChain(pow_item,
+                                signed_chain,
+                                r.n_int_sqrt,
+                                r.n_int_cbrt);
+                            pow_item.Rehash();
+
+                            CodeTree pow;
+                            if(r.resulting_exponent != 1)
+                            {
+                                pow.SetOpcode(cPow);
+                                pow.AddParamMove(pow_item);
+                                pow.AddParam(CodeTree( double(r.resulting_exponent) ));
+                            }
+                            else
+                                pow.swap(pow_item);
+
+                            CodeTree mul;
+                            mul.SetOpcode(cMul);
+                            mul.AddParamMove(pow);
+
+                            for(unsigned n=0; n<PowiResolver::MaxSep; ++n)
+                            {
+                                if(r.sep_list[n] == 0) break;
+                                int n_sqrt = r.sep_list[n] % 5;
+                                int n_cbrt = r.sep_list[n] / 5;
+
+                                CodeTree mul_item = source_tree;
+                                mul_item.CopyOnWrite();
+                                ChangeIntoRootChain(mul_item, false, n_sqrt, n_cbrt);
+                                mul_item.Rehash();
+                                mul.AddParamMove(mul_item);
+                            }
+
+                            if(p1.GetImmed() < 0 && !signed_chain)
+                            {
+                                mul.Rehash();
+                                SetOpcode(cInv);
+                                SetParamMove(0, mul);
+                                DelParam(1);
+                            }
+                            else
+                            {
+                                SetOpcode(cMul);
+                                SetParamsMove(mul.GetParams());
+                            }
+                        #ifdef DEBUG_POWI
+                            DumpTreeWithIndent(*this);
+                        #endif
+                            changed = true;
+                            break;
+                        }
+                    }
+                }
+                if(GetOpcode() == cPow
+                && (!p1.IsLongIntegerImmed()
+                 || !IsOptimizableUsingPowi(p1.GetLongIntegerImmed())))
+                {
+                    if(p0.IsImmed() && p0.GetImmed() > 0.0)
+                    {
+                        // Convert into cExp or Exp2.
+                        //    x^y = exp(log(x) * y) =
+                        //    Can only be done when x is positive, though.
+                        if(prefer_base2)
+                        {
+                            double mulvalue = fp_log2( p0.GetImmed() );
+                            if(mulvalue == 1.0)
+                            {
+                                // exp2(1)^x becomes exp2(x)
+                                DelParam(0);
+                            }
+                            else
+                            {
+                                // exp2(4)^x becomes exp2(4*x)
+                                CodeTree exponent;
+                                exponent.SetOpcode(cMul);
+                                exponent.AddParam( CodeTree( mulvalue ) );
+                                exponent.AddParam(p1);
+                                exponent.Rehash();
+                                SetParamMove(0, exponent);
+                                DelParam(1);
+                            }
+                            SetOpcode(cExp2);
+                            changed = true;
+                        }
+                        else
+                        {
+                            double mulvalue = std::log( p0.GetImmed() );
+                            if(mulvalue == 1.0)
+                            {
+                                // exp(1)^x becomes exp(x)
+                                DelParam(0);
+                            }
+                            else
+                            {
+                                // exp(4)^x becomes exp(4*x)
+                                CodeTree exponent;
+                                exponent.SetOpcode(cMul);
+                                exponent.AddParam( CodeTree( mulvalue ) );
+                                exponent.AddParam(p1);
+                                exponent.Rehash();
+                                SetParamMove(0, exponent);
+                                DelParam(1);
+                            }
+                            SetOpcode(cExp);
+                            changed = true;
+                        }
+                    }
+                    else if(p0.IsAlwaysSigned(true))
+                    {
+                        if(prefer_base2)
+                        {
+                            CodeTree log;
+                            log.SetOpcode(cLog2);
+                            log.AddParam(p0);
+                            log.Rehash();
+                            CodeTree exponent;
+                            exponent.SetOpcode(cMul);
+                            exponent.AddParam(p1);
+                            exponent.AddParamMove(log);
+                            exponent.Rehash();
+                            SetOpcode(cExp2);
+                            SetParamMove(0, exponent);
+                            DelParam(1);
+                            changed = true;
+                        }
+                        else
+                        {
+                            CodeTree log;
+                            log.SetOpcode(cLog);
+                            log.AddParam(p0);
+                            log.Rehash();
+                            CodeTree exponent;
+                            exponent.SetOpcode(cMul);
+                            exponent.AddParam(p1);
+                            exponent.AddParamMove(log);
+                            exponent.Rehash();
+                            SetOpcode(cExp);
+                            SetParamMove(0, exponent);
+                            DelParam(1);
+                            changed = true;
+                        }
+                    }
+                }
+                break;
+            }
+
+            default: break;
+        }
+
+        if(changed)
+            goto exit_changed;
+
+        return changed;
+    }
+
+    bool ContainsOtherCandidates(
+        const CodeTree& within,
+        const CodeTree& tree,
+        const FPoptimizer_ByteCode::ByteCodeSynth& synth,
+        const TreeCountType& TreeCounts)
+    {
+        for(size_t b=tree.GetParamCount(), a=0; a<b; ++a)
+        {
+            const CodeTree& leaf = tree.GetParam(a);
+
+            TreeCountType::iterator synth_it;
+            for(TreeCountType::const_iterator
+                i = TreeCounts.begin();
+                i != TreeCounts.end();
+                ++i)
+            {
+                if(i->first != leaf.GetHash())
+                    continue;
+
+                size_t          score     = i->second.first;
+                const CodeTree& candidate = i->second.second;
+
+                // It must not yet have been synthesized
+                if(synth.Find(candidate))
+                    continue;
+
+                // And it must not be a simple expression
+                // Because cImmed, VarBegin are faster than cFetch
+                if(leaf.GetDepth() <= 1)
+                    continue;
+
+                // It must always occur at least twice
+                if(score < 2)
+                    continue;
+
+                // And it must either appear on both sides
+                // of a cIf, or neither
+                if(IfBalanceGood(within, leaf).BalanceGood == false)
+                    continue;
+
+                return true;
+            }
+            if(ContainsOtherCandidates(within, leaf, synth, TreeCounts))
+                return true;
+        }
+        return false;
+    }
+
+    size_t CodeTree::SynthCommonSubExpressions(
+        FPoptimizer_ByteCode::ByteCodeSynth& synth) const
+    {
+        size_t stacktop_before = synth.GetStackTop();
+
+        /* Find common subtrees */
+        TreeCountType TreeCounts;
+        FindTreeCounts(TreeCounts, *this);
+
+    #ifdef DEBUG_SUBSTITUTIONS_CSE
+        DumpHashes(*this);
+    #endif
+
+        /* Synthesize some of the most common ones */
+        for(;;)
+        {
+            size_t best_score = 0;
+            TreeCountType::iterator synth_it;
+            for(TreeCountType::iterator
+                j,i = TreeCounts.begin();
+                i != TreeCounts.end();
+                i=j)
+            {
+                j=i; ++j;
+
+                size_t         score = i->second.first;
+                const CodeTree& tree = i->second.second;
+
+    #ifdef DEBUG_SUBSTITUTIONS_CSE
+                std::cout << "Score " << score << ":\n";
+                DumpTreeWithIndent(tree);
+    #endif
+
+                // It must not yet have been synthesized
+                if(synth.Find(tree))
+                {
+                    TreeCounts.erase(i);
+                    continue;
+                }
+
+                // And it must not be a simple expression
+                // Because cImmed, VarBegin are faster than cFetch
+                if(tree.GetDepth() <= 1)
+                {
+                    TreeCounts.erase(i);
+                    continue;
+                }
+
+                // It must always occur at least twice
+                if(score < 2)
+                {
+                    TreeCounts.erase(i);
+                    continue;
+                }
+
+                // And it must either appear on both sides
+                // of a cIf, or neither
+                if(IfBalanceGood(*this, tree).BalanceGood == false)
+                {
+                    TreeCounts.erase(i);
+                    continue;
+                }
+
+                // It must not contain other candidates
+                if(ContainsOtherCandidates(*this, tree, synth, TreeCounts))
+                {
+                    // Don't erase it; it may be a proper candidate later
+                    continue;
+                }
+
+                // Is a candidate.
+                score *= tree.GetDepth();
+                if(score > best_score)
+                    { best_score = score; synth_it = i; }
+            }
+
+            if(best_score <= 0) break; // Didn't find anything.
+
+            const CodeTree& tree = synth_it->second.second;
+    #ifdef DEBUG_SUBSTITUTIONS_CSE
+            std::cout << "Found Common Subexpression:"; DumpTree(tree); std::cout << "\n";
+    #endif
+            /* Synthesize the selected tree */
+            tree.SynthesizeByteCode(synth, false);
+            TreeCounts.erase(synth_it);
+    #ifdef DEBUG_SUBSTITUTIONS_CSE
+            std::cout << "Done with Common Subexpression:"; DumpTree(tree); std::cout << "\n";
+    #endif
+        }
+
+        return synth.GetStackTop() - stacktop_before;
+    }
+}
+
+#endif
+
+#line 1 "fpoptimizer/fpoptimizer_main.c"
+#include "fpconfig.h"
+#include "fparser.h"
+#include "fptypes.h"
+
+// line removed for fpoptimizer.c: #include "fpoptimizer_codetree.h"
+// line removed for fpoptimizer.c: #include "fpoptimizer_optimize.h"
+
+using namespace FUNCTIONPARSERTYPES;
+
+#ifdef FP_SUPPORT_OPTIMIZER
+using namespace FPoptimizer_CodeTree;
+
+template<>
+void FunctionParserBase<double>::Optimize()
+{
+    typedef double Value_t;
+
+    CopyOnWrite();
+
+    //PrintByteCode(std::cout);
+
+    CodeTree tree;
+    tree.GenerateFrom(data->ByteCode, data->Immed, *data);
+
+    FPoptimizer_Optimize::ApplyGrammars(tree);
+
+    std::vector<unsigned> byteCode;
+    std::vector<Value_t> immed;
+    size_t stacktop_max = 0;
+    tree.SynthesizeByteCode(byteCode, immed, stacktop_max);
+
+    /*std::cout << std::flush;
+    std::cerr << std::flush;
+    fprintf(stderr, "Estimated stacktop %u\n", (unsigned)stacktop_max);
+    fflush(stderr);*/
+
+    if(data->StackSize != stacktop_max)
+    {
+        data->StackSize = stacktop_max; // note: gcc warning is meaningful
+#ifndef FP_USE_THREAD_SAFE_EVAL
+        data->Stack.resize(stacktop_max);
+#endif
+    }
+
+    data->ByteCode.swap(byteCode);
+    data->Immed.swap(immed);
+
+    //PrintByteCode(std::cout);
+}
+
+template<>
+void FunctionParserBase<float>::Optimize()
+{}
+
+template<>
+void FunctionParserBase<long double>::Optimize()
+{}
+
+template<>
+void FunctionParserBase<long>::Optimize()
+{}
+
+#ifdef FP_SUPPORT_MPFR_FLOAT_TYPE
+template<>
+void FunctionParserBase<MpfrFloat>::Optimize()
+{}
+#endif
+
+#ifdef FP_SUPPORT_GMP_INT_TYPE
+template<>
+void FunctionParserBase<GmpInt>::Optimize()
+{}
+#endif
+
+
+FUNCTIONPARSER_INSTANTIATE_TYPES
+
+#endif
+
+#line 1 "fpoptimizer/fpoptimizer_footer.txt"
+
+#endif
+
diff --git a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/fptypes.h b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/fptypes.h
new file mode 100644
index 0000000000..a38cc4c26b
--- /dev/null
+++ b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/fptypes.h
@@ -0,0 +1,267 @@
+/***************************************************************************\
+|* Function Parser for C++ v4.0.3                                          *|
+|*-------------------------------------------------------------------------*|
+|* Copyright: Juha Nieminen, Joel Yliluoma                                 *|
+\***************************************************************************/
+
+// NOTE:
+// This file contains only internal types for the function parser library.
+// You don't need to include this file in your code. Include "fparser.hh"
+// only.
+
+#ifndef ONCE_FPARSER_TYPES_H_
+#define ONCE_FPARSER_TYPES_H_
+
+#include "fpconfig.h"
+#include <cstring>
+
+#ifdef ONCE_FPARSER_H_
+# include <map>
+#endif
+
+namespace FUNCTIONPARSERTYPES
+{
+    enum OPCODE
+    {
+// The order of opcodes in the function list must
+// match that which is in the Functions[] array.
+        cAbs,
+        cAcos, cAcosh,
+        cAsin, cAsinh,
+        cAtan, cAtan2, cAtanh,
+        cCbrt, cCeil,
+        cCos, cCosh, cCot, cCsc,
+        cEval,
+        cExp, cExp2, cFloor, cIf, cInt, cLog, cLog10, cLog2, cMax, cMin,
+        cPow, cSec, cSin, cSinh, cSqrt, cTan, cTanh,
+        cTrunc,
+
+// These do not need any ordering:
+// Except that if you change the order of {eq,neq,lt,le,gt,ge}, you
+// must also change the order in ConstantFolding_ComparisonOperations().
+        cImmed, cJump,
+        cNeg, cAdd, cSub, cMul, cDiv, cMod,
+        cEqual, cNEqual, cLess, cLessOrEq, cGreater, cGreaterOrEq,
+        cNot, cAnd, cOr,
+        cNotNot, /* Protects the double-not sequence from optimizations */
+
+        cDeg, cRad, /* Multiplication and division by 180 / pi */
+
+        cFCall, cPCall,
+
+#ifdef FP_SUPPORT_OPTIMIZER
+        cFetch, /* Same as Dup, except with absolute index
+                 * (next value is index) */
+        cPopNMov, /* cPopNMov(x,y) moves [y] to [x] and deletes anything
+                   * above [x]. Used for disposing of temporaries.
+                   */
+        cLog2by, /* log2by(x,y) = log2(x) * y */
+#endif
+        cAbsAnd,    /* As cAnd,       but assume both operands are absolute values */
+        cAbsOr,     /* As cOr,        but assume both operands are absolute values */
+        cAbsNot,    /* As cAbsNot,    but assume the operand is an absolute value */
+        cAbsNotNot, /* As cAbsNotNot, but assume the operand is an absolute value */
+        cAbsIf,     /* As cAbsIf,     but assume the 1st operand is an absolute value */
+
+        cDup,   /* Duplicates the last value in the stack: Push [Stacktop] */
+        cInv,   /* Inverts the last value in the stack (x = 1/x) */
+        cSqr,   /* squares the last operand in the stack, no push/pop */
+        cRDiv,  /* reverse division (not x/y, but y/x) */
+        cRSub,  /* reverse subtraction (not x-y, but y-x) */
+        cRSqrt, /* inverse square-root (1/sqrt(x)) */
+
+        cNop,
+        VarBegin
+    };
+
+#ifdef ONCE_FPARSER_H_
+    struct FuncDefinition
+    {
+        enum FunctionFlags
+        {
+            Enabled  = 0x01,
+            AngleIn  = 0x02,
+            AngleOut = 0x04,
+            OkForInt = 0x08
+        };
+
+#ifdef FUNCTIONPARSER_SUPPORT_DEBUG_OUTPUT
+        const char name[8];
+#else
+        struct name { } name;
+#endif
+        unsigned params : 8;
+        unsigned flags  : 8;
+
+        inline bool enabled() const { return flags != 0; }
+        inline bool okForInt() const { return (flags & OkForInt) != 0; }
+    };
+
+#ifndef FP_DISABLE_EVAL
+# define FP_EVAL_FUNCTION_ENABLED \
+    FuncDefinition::Enabled | FuncDefinition::OkForInt
+#else
+# define FP_EVAL_FUNCTION_ENABLED 0
+#endif
+#ifdef FUNCTIONPARSER_SUPPORT_DEBUG_OUTPUT
+# define FP_FNAME(n) n
+#else
+# define FP_FNAME(n) {}
+#endif
+// This list must be in the same order as that in OPCODE enum,
+// because the opcode value is used to index this array, and
+// the pointer to array element is used for generating the opcode.
+    const FuncDefinition Functions[]=
+    {
+        /*cAbs  */ { FP_FNAME("abs"),   1,
+                     FuncDefinition::Enabled | FuncDefinition::OkForInt },
+        /*cAcos */ { FP_FNAME("acos"),  1,
+                     FuncDefinition::Enabled | FuncDefinition::AngleOut },
+        /*cAcosh*/ { FP_FNAME("acosh"), 1,
+                     FuncDefinition::Enabled | FuncDefinition::AngleOut },
+        /*cAsin */ { FP_FNAME("asin"),  1,
+                     FuncDefinition::Enabled | FuncDefinition::AngleOut },
+        /*cAsinh*/ { FP_FNAME("asinh"), 1,
+                     FuncDefinition::Enabled | FuncDefinition::AngleOut },
+        /*cAtan */ { FP_FNAME("atan"),  1,
+                     FuncDefinition::Enabled | FuncDefinition::AngleOut },
+        /*cAtan2*/ { FP_FNAME("atan2"), 2,
+                     FuncDefinition::Enabled | FuncDefinition::AngleOut },
+        /*cAtanh*/ { FP_FNAME("atanh"), 1, FuncDefinition::Enabled },
+        /*cCbrt */ { FP_FNAME("cbrt"),  1, FuncDefinition::Enabled },
+        /*cCeil */ { FP_FNAME("ceil"),  1, FuncDefinition::Enabled },
+        /*cCos  */ { FP_FNAME("cos"),   1,
+                     FuncDefinition::Enabled | FuncDefinition::AngleIn },
+        /*cCosh */ { FP_FNAME("cosh"),  1,
+                     FuncDefinition::Enabled | FuncDefinition::AngleIn },
+        /*cCot  */ { FP_FNAME("cot"),   1,
+                     FuncDefinition::Enabled | FuncDefinition::AngleIn },
+        /*cCsc  */ { FP_FNAME("csc"),   1,
+                     FuncDefinition::Enabled | FuncDefinition::AngleIn },
+        /*cEval */ { FP_FNAME("eval"),  0, FP_EVAL_FUNCTION_ENABLED },
+        /*cExp  */ { FP_FNAME("exp"),   1, FuncDefinition::Enabled },
+        /*cExp2 */ { FP_FNAME("exp2"),  1, FuncDefinition::Enabled },
+        /*cFloor*/ { FP_FNAME("floor"), 1, FuncDefinition::Enabled },
+        /*cIf   */ { FP_FNAME("if"),    0,
+                     FuncDefinition::Enabled | FuncDefinition::OkForInt },
+        /*cInt  */ { FP_FNAME("int"),   1, FuncDefinition::Enabled },
+        /*cLog  */ { FP_FNAME("log"),   1, FuncDefinition::Enabled },
+        /*cLog10*/ { FP_FNAME("log10"), 1, FuncDefinition::Enabled },
+        /*cLog2 */ { FP_FNAME("log2"),  1, FuncDefinition::Enabled },
+        /*cMax  */ { FP_FNAME("max"),   2,
+                     FuncDefinition::Enabled | FuncDefinition::OkForInt },
+        /*cMin  */ { FP_FNAME("min"),   2,
+                     FuncDefinition::Enabled | FuncDefinition::OkForInt },
+        /*cPow  */ { FP_FNAME("pow"),   2, FuncDefinition::Enabled },
+        /*cSec  */ { FP_FNAME("sec"),   1,
+                     FuncDefinition::Enabled | FuncDefinition::AngleIn },
+        /*cSin  */ { FP_FNAME("sin"),   1,
+                     FuncDefinition::Enabled | FuncDefinition::AngleIn },
+        /*cSinh */ { FP_FNAME("sinh"),  1,
+                     FuncDefinition::Enabled | FuncDefinition::AngleIn },
+        /*cSqrt */ { FP_FNAME("sqrt"),  1,
+                     FuncDefinition::Enabled },
+        /*cTan  */ { FP_FNAME("tan"),   1,
+                     FuncDefinition::Enabled | FuncDefinition::AngleIn },
+        /*cTanh */ { FP_FNAME("tanh"),  1,
+                     FuncDefinition::Enabled | FuncDefinition::AngleIn },
+        /*cTrunc*/ { FP_FNAME("trunc"), 1,
+                     FuncDefinition::Enabled }
+    };
+#undef FP_FNAME
+
+    struct NamePtr
+    {
+        const char* name;
+        unsigned nameLength;
+
+        NamePtr(const char* n, unsigned l): name(n), nameLength(l) {}
+
+        inline bool operator==(const NamePtr& rhs) const
+        {
+            return nameLength == rhs.nameLength
+                && std::memcmp(name, rhs.name, nameLength) == 0;
+        }
+        inline bool operator<(const NamePtr& rhs) const
+        {
+            for(unsigned i = 0; i < nameLength; ++i)
+            {
+                if(i == rhs.nameLength) return false;
+                const char c1 = name[i], c2 = rhs.name[i];
+                if(c1 < c2) return true;
+                if(c2 < c1) return false;
+            }
+            return nameLength < rhs.nameLength;
+        }
+    };
+
+    template<typename Value_t>
+    struct NameData
+    {
+        enum DataType { CONSTANT, UNIT, FUNC_PTR, PARSER_PTR, VARIABLE };
+        DataType type;
+        unsigned index;
+        Value_t value;
+
+        NameData(DataType t, unsigned v) : type(t), index(v), value() { }
+        NameData(DataType t, Value_t v) : type(t), index(), value(v) { }
+        NameData() { }
+    };
+
+    template<typename Value_t>
+    class namePtrsType: public
+    std::map<
+        FUNCTIONPARSERTYPES::NamePtr,
+        FUNCTIONPARSERTYPES::NameData<Value_t>
+    >
+    {
+    };
+
+    const unsigned FUNC_AMOUNT = sizeof(Functions)/sizeof(Functions[0]);
+#endif // ONCE_FPARSER_H_
+}
+
+#ifdef ONCE_FPARSER_H_
+#include <vector>
+
+template<typename Value_t>
+struct FunctionParserBase<Value_t>::Data
+{
+    unsigned referenceCounter;
+
+    unsigned numVariables;
+    std::string variablesString;
+    FUNCTIONPARSERTYPES::namePtrsType<Value_t> namePtrs;
+
+    struct FuncPtrData
+    {
+        union
+        {
+            FunctionPtr funcPtr;
+            FunctionParserBase<Value_t>* parserPtr;
+        };
+        unsigned params;
+    };
+
+    std::vector<FuncPtrData> FuncPtrs;
+    std::vector<FuncPtrData> FuncParsers;
+
+    std::vector<unsigned> ByteCode;
+    std::vector<Value_t> Immed;
+#ifndef FP_USE_THREAD_SAFE_EVAL
+    std::vector<Value_t> Stack;
+    // Note: When Stack exists,
+    //       Stack.size() and StackSize are mutually redundant.
+#endif
+    unsigned StackSize;
+
+    Data();
+    Data(const Data&);
+    Data& operator=(const Data&); // not implemented on purpose
+    ~Data();
+};
+#endif
+
+#include "fpaux.h"
+
+#endif
diff --git a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/hash.h b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/hash.h
new file mode 100644
index 0000000000..d02659184f
--- /dev/null
+++ b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/hash.h
@@ -0,0 +1,46 @@
+/**
+ * @file    hash.h
+ * @author  Thomas Lewiner 
+ * @version 
+ * @date    
+ *
+ * @brief
+ *
+ */
+//________________________________________________
+
+
+#ifndef _HASH_H_
+#define _HASH_H_
+
+// may be overridden by the preprocessor
+#ifndef USE_HASH_PTR
+# define USE_HASH_PTR 1
+#endif // USE_HASH_PTR
+
+// may be overridden by the preprocessor
+#ifndef HASH_BITS
+# define HASH_BITS 22
+#endif // HASH_BITS
+
+#ifndef NON_HASH_BITS
+# define NON_HASH_BITS 22
+#endif // HASH_BITS
+
+
+
+
+#if USE_HASH_PTR
+
+// #define HASH_HAS_ERASE 1
+# include "hash_ptr.h"
+
+#else  // USE_HASH_PTR
+
+# undef HASH_HAS_ERASE
+# include "hash_noptr.h"
+
+#endif // USE_HASH_PTR
+
+
+#endif // _HASH_H_
diff --git a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/hash_noptr.h b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/hash_noptr.h
new file mode 100644
index 0000000000..dc021cccce
--- /dev/null
+++ b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/hash_noptr.h
@@ -0,0 +1,251 @@
+/**
+ * @file    hash_noptr.h
+ * @author  Thomas Lewiner 
+ * @version 
+ * @date    
+ *
+ * @brief Hash table without pointers
+ *
+ */
+//________________________________________________
+
+
+#ifndef _HASH_H_
+# error This header should not be included directly! include hash.h instead
+#endif // _HASH_H_
+
+#pragma once
+
+
+#include <stdlib.h> // memset
+
+#include "morton.h"
+
+//_____________________________________________________________________________
+// Class hash
+template < typename Data > class Hash
+//-----------------------------------------------------------------------------
+{
+public:
+  typedef uint cntr ;
+//  static const cntr HASH_BITS = 16 ;
+//  static const cntr NON_HASH_BITS = 64-HASH_BITS ;
+  static const cntr HASH_SIZE = ((cntr)1<<HASH_BITS) ;
+  static const cntr HASH_MASK = HASH_SIZE-1 ;
+  static const cntr SKIP_MINI = 11 ;
+  static const cntr SKIP_BITS = 3 ;
+  static const cntr SKIP_MASK = ((cntr)1<<SKIP_BITS)-1 ;
+
+  typedef struct { Key key ; Data data ; } KeyData ;
+  static KeyData KD_INV ;
+
+protected:
+//  KeyData _hash[HASH_SIZE] ;
+  KeyData *_hash ; // allocate dynamically since stack memory is limited
+  
+public:
+	// Constructor & Desctructor  
+  Hash   () { _hash = new KeyData[HASH_SIZE] ; reset() ; } 
+  ~Hash  () { delete [] _hash ; }
+
+  void reset() { memset( _hash, KEY_INV, HASH_SIZE*sizeof(KeyData) ) ; KD_INV.key = KEY_INV ; }
+  
+  inline cntr hash( Key k ) const ; 
+  
+  cntr size() const
+  {
+    cntr s = 0 ;
+    cntr n = HASH_SIZE ;
+    KeyData *ptr = _hash ;
+    for( ; n > 0 ; --n, ++ptr )
+      s += ( ptr->key != KEY_INV ) ;
+    return s ;
+  }
+  
+  bool insert( KeyData d )
+  {
+    cntr h = hash( d.key ) ;
+    KeyData *p = _hash + h ;
+    const cntr skip = ((d.key>>HASH_BITS) & SKIP_MASK) + SKIP_MINI ;
+    cntr overflow   = skip ;
+    while( p->key != KEY_INV && p->key != d.key )
+    { // collision
+      h += skip ;
+      if( h < HASH_SIZE )
+        p += skip ;
+      else
+      {
+        h &= HASH_MASK ;
+        p = _hash + h ;
+        if( !(overflow--) )
+          return false ;
+      }
+    }
+    *p = d ;
+    return true ;
+  }
+
+  const KeyData operator[] ( Key k ) const
+  {
+    cntr h = hash( k ) ;
+    const KeyData *p = _hash + h ;
+    const cntr skip = ((k>>HASH_BITS) & SKIP_MASK) + SKIP_MINI ;
+    cntr overflow   = skip ;
+    while( p->key != k && p->key != KEY_INV )
+    { // collision
+      h += skip ;
+      if( h < HASH_SIZE )
+        p += skip ;
+      else
+      {
+        h &= HASH_MASK ;
+        p = _hash + h ;
+        if( !(overflow--) )
+          return KD_INV ;
+      }
+    }
+    return *p ;
+  }
+  
+  KeyData &operator[] ( Key k )
+  {
+    cntr h = hash( k ) ;
+    KeyData *p = _hash + h ;
+    const cntr skip = ((k>>HASH_BITS) & SKIP_MASK) + SKIP_MINI ;
+    cntr overflow   = skip ;
+    while( p->key != k && p->key != KEY_INV )
+    { // collision
+      h += skip ;
+      if( h < HASH_SIZE )
+        p += skip ;
+      else
+      {
+        h &= HASH_MASK ;
+        p = _hash + h ;
+        if( !(overflow--) )
+          return KD_INV ;
+      }
+    }
+    return *p ;
+  }
+  
+
+  bool contains( Key k ) const { return (*this)[k].key == k ; }
+  
+  
+  
+  //------------------------------------------------
+  // iterator
+  public :
+  /// iterator
+  class iterator
+  {
+    public :
+    // constructors
+    /// default constructors
+    iterator( Hash<Data> &hash_, cntr id_ = 0 ) : _ptr(hash_._hash+id_), _last(hash_._hash+HASH_SIZE) { while( _ptr != _last && _ptr->key == KEY_INV ) ++_ptr ; }
+    
+    /// destructor
+    ~iterator() {}
+    
+    /// copy constructor
+    iterator( const iterator &it ) : _ptr(it._ptr), _last(it._last) {}
+    
+    /// assignment operator
+    iterator &operator = ( const iterator &it )
+    { _ptr = it._ptr; _last = it._last;  return *this; }
+    
+    //-----------------------------------------------------------------------------
+    // Operations
+    public  :
+    /// equality operator
+    inline bool        operator ==( const iterator &it ) const { return _ptr == it._ptr ; }
+    /// inequality operator
+    inline bool        operator !=( const iterator &it ) const { return _ptr != it._ptr ; }
+    
+    /// validation operator
+    inline bool        operator ()() const { return _ptr != _last ; }
+    
+    /// key accessor
+    inline const Key  &key() const { return _ptr->key ; }
+    
+    /// value accessor
+    inline const Data &operator * () const { return _ptr->data ; }
+    
+    /// value accessor
+    inline Data       &operator * ()       { return _ptr->data ; }
+    
+    /// accesses the next position
+    inline iterator   &operator ++()       { while( (++_ptr != _last) && _ptr->key == KEY_INV ) ;  return *this ; }
+    
+    //-----------------------------------------------------------------------------
+    // Elements
+    private :
+    KeyData       *_ptr  ; ///< position pointer
+    const KeyData *_last ; ///< last position pointer
+  };
+  
+  //------------------------------------------------
+  // const_iterator
+  public :
+  /// const_iterator
+  class const_iterator
+  {
+    public :
+    // constructors
+    /// default constructors
+    const_iterator( const Hash<Data> &hash_, cntr id_ = 0 ) : _ptr(hash_._hash+id_), _last(hash_._hash+HASH_SIZE) { while( _ptr != _last && _ptr->key == KEY_INV ) ++_ptr ; }
+    
+    /// destructor
+    ~const_iterator() {}
+    
+    /// copy constructor
+    const_iterator( const const_iterator &it ) : _ptr(it._ptr), _last(it._last) {}
+    
+    /// assignment operator
+    const_iterator &operator = ( const const_iterator &it )
+    { _ptr = it._ptr; _last = it._last;  return *this; }
+    
+    //-----------------------------------------------------------------------------
+    // Operations
+    public  :
+    /// equality operator
+    inline bool        operator ==( const const_iterator &it ) const { return _ptr == it._ptr ; }
+    /// inequality operator
+    inline bool        operator !=( const const_iterator &it ) const { return _ptr != it._ptr ; }
+    
+    /// validation operator
+    inline bool        operator ()() const { return _ptr != _last ; }
+    
+    /// key accessor
+    inline const Key  &key() const { return _ptr->key ; }
+    
+    /// value accessor
+    inline const Data &operator * () const { return _ptr->data ; }
+    
+    /// accesses the next position
+    inline const_iterator   &operator ++() { while( (++_ptr != _last) && _ptr->key == KEY_INV ) ;  return *this ; }
+    
+    //-----------------------------------------------------------------------------
+    // Elements
+    private :
+    const KeyData * _ptr  ; ///< position pointer
+    const KeyData * const _last ; ///< last position pointer
+  };
+  
+  public :
+  /// Node iterator creation
+  iterator begin( cntr id = 0 ) { return iterator( *this, id ) ; }
+  /// Node const iterator creation
+  const_iterator cbegin( cntr id = 0 ) { return const_iterator( *this, id ) ; }
+  
+};
+//_____________________________________________________________________________
+
+
+
+/// hash function specification: no inversion
+template <> inline Hash<real >::cntr Hash<real >::hash( Key k ) const { return k & HASH_MASK ; }
+
+/// hash function specification: inversion
+template <> inline Hash<Level>::cntr Hash<Level>::hash( Key k ) const { return (k>>NON_HASH_BITS) & HASH_MASK ; }
diff --git a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/hash_octree.cpp b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/hash_octree.cpp
new file mode 100644
index 0000000000..2c17aa0101
--- /dev/null
+++ b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/hash_octree.cpp
@@ -0,0 +1,1356 @@
+/**
+ * \file    hash_octree.cpp
+ * \author  Thomas Lewiner   <tomlew@puc-rio.br>
+ * \author  Matmidia Lab, Math Dept, PUC-Rio
+ * \date    10/01/2010
+ *
+ *  Octree structure with hashtable and hierarchical operations
+ */
+//_____________________________________________________________________________
+
+
+#ifndef WIN32
+#pragma implementation
+#endif // WIN32
+
+
+#include <stack>
+#include "hash_octree.h"
+
+/// invalid key
+template<> Hash<real>::KeyData Hash<real>::KD_INV = { KEY_INV, R_INV } ;
+
+
+
+//_____________________________________________________________________________
+// Create the root
+void HashOctree::init()
+//-----------------------------------------------------------------------------
+{
+  _max_level = 0 ;
+  _max_field = R_INV ;
+  HashField::KeyData kd ;
+  kd.key  =  1  ;
+  kd.data = 0.0 ;
+  _hash.insert( kd ) ;
+}
+//_____________________________________________________________________________
+
+
+
+
+//_____________________________________________________________________________
+// Check that each point scan or scribble is in the right node
+bool HashOctree::check ()
+//-----------------------------------------------------------------------------
+{
+  bool result = true ;
+
+  for( cell_iterator it = cells_begin() ; it() ; ++it )
+  {
+    Key k = it.key() << 3 ;
+    bool has_son = false ;
+    bool all_sons = true  ;
+    for( int i = 0 ; i < 8 ; ++i )
+    {
+      if( _hash[ k | i ].key != KEY_INV )
+        has_son = true ;
+      else
+        all_sons = false ;
+    }
+    
+    if( it.is_leaf() && has_son )
+    {
+      printf("(hash) Invalid leaf %d: value %f\n", (int)k, _hash[k].data ) ;
+      result = false ;
+    }
+
+    if( has_son && !all_sons )
+    {
+      printf("(hash) Invalid subdivision %d: value %f\n", (int)k, _hash[k].data ) ;
+      result = false ;
+    }
+  }
+
+  return result ;
+}
+//_____________________________________________________________________________
+
+
+
+
+
+
+//_____________________________________________________________________________
+// Deletes the content of the octree
+void HashOctree::clear_octree()
+//-----------------------------------------------------------------------------
+{
+  _hash.reset() ;
+  _max_level = 0 ;
+  _max_field = R_INV ;
+}
+//_____________________________________________________________________________
+
+
+
+
+
+//_____________________________________________________________________________
+// set the values of each leaf from the implicit function
+bool HashOctree::set_impl( data_access *ref )
+//-----------------------------------------------------------------------------
+{
+  if( !ref ) return false ;
+  
+  _max_field = -FLT_MAX ;
+  for( cell_iterator it = cells_begin() ; it() ; ++it )
+  {
+    if( it.is_leaf() )
+    {
+      real v = (*ref).value_at( it.top() ) ;
+      *it = v ;
+      v = fabs(v) ;
+      if( _max_field < v ) _max_field = v ;
+    }
+//    else
+//      *it = R_INV ;
+  }
+  
+//  printf( "max field: %f\n", max_field() ) ;
+  return true ;
+}
+//_____________________________________________________________________________
+
+
+
+
+
+//_____________________________________________________________________________
+// Refine the octree according to the data access
+bool HashOctree::refine( data_access *ref /*= NULL*/ )
+//-----------------------------------------------------------------------------
+{
+  if( !ref ) return false ;
+
+    clear() ;  init() ;
+  
+  // traversal stack: iterator has a pre-ordered stack, and cannot be recursed on
+  geom_cell it = geom_root() ;
+  std::stack< geom_cell > s ;
+  s.push( it ) ;
+  
+  // although it may refine only the leaves
+  // the leaf iterator may change during the refinement
+  bool refined = false ;
+  while( !s.empty() )
+  {
+    it = s.top() ;  s.pop() ;
+
+    // test for subdivision
+    if( !(*ref).need_refine( it ) ) continue ;
+    refined = true ;
+    
+    //_____________________________________________________________________________
+    // subdivides the cell in the tree
+    _hash[it.key()].data = it._field = R_INV ;
+    HashField::KeyData kd ;
+    kd.data = 0.0 ;
+
+    // recurse on the traversal
+    Key sk = it.key() << 3 ;
+    for( int i = 0 ; i < 8 ; ++i )
+    {
+      kd.key = sk | i ;
+      if( !_hash.insert( kd ) )
+      {
+        printf( "hash table saturated!\n" ) ;
+        exit(1) ;
+        return false ;
+      }
+      
+      s.push( geom_cell( kd.key, kd.data ) ) ;
+    }
+    
+    Level lv = it.lv()+1 ;
+    if( _max_level < lv ) _max_level = lv ;
+  }
+  
+  return refined ;
+}
+//_____________________________________________________________________________
+
+
+
+//_____________________________________________________________________________
+// Refine the octree according to the data access
+bool HashOctree::adapt( data_access *ref /*= NULL*/ )
+//-----------------------------------------------------------------------------
+{
+  if( !ref ) return false ;
+
+#ifdef HASH_HAS_ERASE
+    _max_level = 0 ;
+  
+  // traversal stack: iterator has a pre-ordered stack, and cannot be recursed on
+  geom_cell it = geom_root() ;
+  std::stack< geom_cell > s ;
+  s.push( it ) ;
+  
+  // although it may refine only the leaves
+  // the leaf iterator may change during the refinement
+  geom_cell sons[8] ;
+  bool refined = false ;
+  while( !s.empty() )
+  {
+    it = s.top() ;  s.pop() ;
+    
+    // look for the leaves
+    if( !it.is_leaf() )
+    {
+      if( !(*ref).need_refine( it ) )
+      {
+        // delete branch
+        std::stack<Key> del_s ;
+        del_s.push( it.key() ) ;
+        while( !del_s.empty() )
+        {
+          Key n = del_s.top() << 3 ;
+          del_s.pop() ;
+          
+          for( int i = 0 ; i < 8 ; ++i )
+          {
+            HashField::KeyData kd = _hash.erase( n|i ) ;
+            if( kd == HashField::KD_INV ) continue ; // is_leaf(n)
+            del_s.push( n|i ) ;
+          }
+        }
+        
+        refined = true ;
+        _hash[it.key()].data = 0.0 ; // leaf now!
+        if( _max_level < it.lv() ) _max_level = it.lv() ;
+        continue ;
+      }
+      
+      it.sons( sons, _hash ) ;
+      for( int i = 0 ; i < 8 ; ++i )
+        s.push( sons[i] ) ;
+      
+      if( _max_level < sons[0].lv() ) _max_level = sons[0].lv() ;
+      continue ;
+    }
+    
+    // test for subdivision
+    if( !(*ref).need_refine( it ) ) continue ;
+    refined = true ;
+    
+    //_____________________________________________________________________________
+    // subdivides the cell in the tree
+    _hash[it.key()].data = it._field = R_INV ;
+    HashField::KeyData kd ;
+    kd.data = 0.0 ;
+    
+    // recurse on the traversal
+    Key sk = it.key() << 3 ;
+    for( int i = 0 ; i < 8 ; ++i )
+    {
+      kd.key = sk | i ;
+      if( !_hash.insert( kd ) )
+      {
+        printf( "hash table saturated!\n" ) ;
+        exit(1) ;
+        return false ;
+      }
+      
+      s.push( geom_cell( kd.key, kd.data ) ) ;
+    }
+    
+    Level lv = it.lv()+1 ;
+    if( _max_level < lv ) _max_level = lv ;
+  }
+  
+  return refined ;  
+
+#else  // HASH_HAS_ERASE
+  // no remotion in the hash table!
+  return refine( ref ) ;
+#endif // HASH_HAS_ERASE
+}
+//_____________________________________________________________________________
+
+
+
+
+//_____________________________________________________________________________
+// Draw the octree with wireframe
+bool HashOctree::draw_wire()
+//-----------------------------------------------------------------------------
+{
+  for( leaf_iterator it = leaves_begin() ; it() ; ++it )
+    it.draw_wire() ;
+  
+  return true ;
+}
+//_____________________________________________________________________________
+
+
+
+
+
+//_____________________________________________________________________________
+// Draw the octree with dots
+bool HashOctree::draw_centers()
+//-----------------------------------------------------------------------------
+{
+  for( cell_iterator it = cells_begin() ; it() ; ++it )
+  {
+    ::glTexCoord1f( (GLfloat)fabs(*it / max_field()) ) ;
+    it.top().draw() ;
+  }
+  
+  return true ;
+}
+//_____________________________________________________________________________
+
+
+
+//_____________________________________________________________________________
+// Recursion structure
+typedef struct
+//-----------------------------------------------------------------------------
+{
+  enum { DUAL_VERTEX=0, DUAL_EDGE=1, DUAL_FACE=2, DUAL_CUBE=3 } type ;
+  Key cells[8]  ;
+  int direction ;
+} hash_dual_iterator_struct ;
+//-----------------------------------------------------------------------------
+// edge pattern for cubes
+// direction : x -> 0, y -> 1, z -> 2, other -> -1
+static const int dir_edges[19][3] = {
+  {0,1,0}, {0,2,1}, {0,4,2}, {1,3,1}, {1,5,2}, {2,3,0}, {2,6,2}, {3,7,2}, {4,5,0}, {4,6,1}, {5,7,1}, {6,7,0},
+  {0,5,-1}, {0,6,-1}, {1,7,-1}, {2,7,-1}, {0,3,-1}, {4,7,-1}, {0,7,-1} } ;
+//_____________________________________________________________________________
+
+
+
+#define PRINT_DUAL_DEBUG 0
+
+//_____________________________________________________________________________
+// Debug print
+void print_final_cube( Key *cells )
+{
+#if PRINT_DUAL_DEBUG
+  printf( "cube %d %d %d %d %d %d %d %d \n",
+         (int)(cells[0]),
+         (int)(cells[1]),
+         (int)(cells[2]),
+         (int)(cells[3]),
+         (int)(cells[4]),
+         (int)(cells[5]),
+         (int)(cells[6]),
+         (int)(cells[7]) ) ;
+#endif  // PRINT_DUAL_DEBUG
+}
+//-----------------------------------------------------------------------------
+void print_dual_cube( const char*ori, Key *cells )
+{
+#if PRINT_DUAL_DEBUG
+  printf( "%s->cube %d %d %d %d %d %d %d %d \n", ori,
+         (int)(cells[0]),
+         (int)(cells[1]),
+         (int)(cells[2]),
+         (int)(cells[3]),
+         (int)(cells[4]),
+         (int)(cells[5]),
+         (int)(cells[6]),
+         (int)(cells[7]) ) ;
+#endif  // PRINT_DUAL_DEBUG
+}
+//-----------------------------------------------------------------------------
+void print_dual_face( const char*ori, Key *cells )
+{
+#if PRINT_DUAL_DEBUG
+  printf( "%s->face %d %d %d %d\n", ori,
+         (int)(cells[0]),
+         (int)(cells[1]),
+         (int)(cells[2]),
+         (int)(cells[3]) ) ;
+#endif  // PRINT_DUAL_DEBUG
+}
+//-----------------------------------------------------------------------------
+void print_dual_edge( const char*ori, Key *cells )
+{
+#if PRINT_DUAL_DEBUG
+  printf( "%s->edge %d %d\n", ori,
+         (int)(cells[0]),
+         (int)(cells[1]) ) ;
+#endif  // PRINT_DUAL_DEBUG
+}
+//-----------------------------------------------------------------------------
+void print_dual_vertex( const char*ori, Key *cells )
+{
+#if PRINT_DUAL_DEBUG
+  printf( "%s->vertex %d\n", ori,
+         (int)(cells[0]) ) ;
+#endif  // PRINT_DUAL_DEBUG
+}
+//_____________________________________________________________________________
+
+
+//_____________________________________________________________________________
+// Rebuild the octree dual
+bool HashOctree::dual_cubes_walk( hash_dual_walker &walker )
+//-----------------------------------------------------------------------------
+{
+  bool result = true ;
+  
+  
+  // face pattern for a cube
+  // direction : yz -> 0, zx -> 1, xy -> 2
+  static const int faces[6][5] = {
+    {0,1,2,3, 2}, {4,5,6,7, 2}, {0,1,4,5, 1}, {2,3,6,7, 1}, {0,2,4,6, 0}, {1,3,5,7, 0} } ;
+  
+  // traversal stack: iterator has a pre-ordered stack, and cannot be recursed on
+  hash_dual_iterator_struct dual_it ;
+  dual_it.type     = hash_dual_iterator_struct::DUAL_VERTEX ;
+  dual_it.cells[0] = (Key)1 ;
+  std::stack< hash_dual_iterator_struct > s ;
+  s.push( dual_it ) ;
+  
+  _dual_temp_memory = s.size() ;
+  while( !s.empty() )
+  {
+    int s_size = s.size() ;
+    if( s_size > _dual_temp_memory ) _dual_temp_memory = s_size ;
+    
+    dual_it = s.top() ;
+    s.pop() ;
+    
+    //_____________________________________________________________________________
+    //_____________________________________________________________________________
+    // vertex case
+    if( dual_it.type == hash_dual_iterator_struct::DUAL_VERTEX )
+    {
+      print_dual_vertex( "!", dual_it.cells ) ;
+
+      Key v = dual_it.cells[0] ;
+      if( is_leaf(v) ) continue ;
+      v <<= 3 ;
+      
+      //_____________________________________________________________________________
+      // vertex
+      dual_it.type = hash_dual_iterator_struct::DUAL_VERTEX ;
+      for( int i = 0 ; i < 8 ; ++i )
+      {
+        dual_it.cells[0] = v | i ;
+        s.push( dual_it ) ;
+        print_dual_vertex( "vertex", dual_it.cells ) ;
+      }
+      
+      //_____________________________________________________________________________
+      // edge
+      dual_it.type = hash_dual_iterator_struct::DUAL_EDGE ;
+      for( int i = 0 ; i < 12 ; ++i )
+      {
+        dual_it.cells[0] = v | dir_edges[i][0] ;
+        dual_it.cells[1] = v | dir_edges[i][1] ;
+        dual_it.direction = dir_edges[i][2] ;
+        s.push( dual_it ) ;
+        print_dual_edge( "vertex", dual_it.cells ) ;
+      }
+      
+      //_____________________________________________________________________________
+      // face
+      dual_it.type = hash_dual_iterator_struct::DUAL_FACE ;
+      for( int i = 0 ; i < 6 ; ++i )
+      {
+        dual_it.cells[0] = v | faces[i][0] ;
+        dual_it.cells[1] = v | faces[i][1] ;
+        dual_it.cells[2] = v | faces[i][2] ;
+        dual_it.cells[3] = v | faces[i][3] ;
+        dual_it.direction = faces[i][4] ;
+        s.push( dual_it ) ;
+        print_dual_face( "vertex", dual_it.cells ) ;
+      }
+      
+      //_____________________________________________________________________________
+      // cube
+      dual_it.type = hash_dual_iterator_struct::DUAL_CUBE ;
+      for( int i = 0 ; i < 8 ; ++i ) dual_it.cells[i] = v | i ;
+      s.push( dual_it ) ;
+      print_dual_cube( "vertex", dual_it.cells ) ;
+      
+      continue ;
+    }
+    
+    
+    //_____________________________________________________________________________
+    //_____________________________________________________________________________
+    // edge case
+    else if( dual_it.type == hash_dual_iterator_struct::DUAL_EDGE )
+    {
+      print_dual_edge( "!", dual_it.cells ) ;
+
+      Key all_sons[2][8] ;
+      Key v0 = dual_it.cells[0] << 3 ;
+      Key v1 = dual_it.cells[1] << 3 ;
+      if( is_leaf( dual_it.cells[0] ) )
+      {
+        if( is_leaf( dual_it.cells[1] ) )
+          continue ;
+        
+        // repeat father
+        for( int i = 0 ; i < 8 ; ++i )
+        {
+          all_sons[0][i] = dual_it.cells[0] ;
+          all_sons[1][i] = v1 | i ;
+        }
+      }
+      else
+      {
+        if( is_leaf( dual_it.cells[1] ) )
+        {
+          // repeat father
+          for( int i = 0 ; i < 8 ; ++i )
+          {
+            all_sons[0][i] = v0 | i ;
+            all_sons[1][i] = dual_it.cells[1] ;
+          }
+        }
+        else
+        {
+          for( int i = 0 ; i < 8 ; ++i )
+          {
+            all_sons[0][i] = v0 | i ;
+            all_sons[1][i] = v1 | i ;
+          }
+        }
+      }
+      
+      
+      //_____________________________________________________________________________
+      // local cube
+      Key sons[8] ;
+      int dir = dual_it.direction ;
+      switch( dir )
+      {
+          // x-aligned edge
+        case 0 :
+          sons[0] = all_sons[0][1] ;
+          sons[1] = all_sons[1][0] ;
+          sons[2] = all_sons[0][3] ;
+          sons[3] = all_sons[1][2] ;
+          sons[4] = all_sons[0][5] ;
+          sons[5] = all_sons[1][4] ;
+          sons[6] = all_sons[0][7] ;
+          sons[7] = all_sons[1][6] ;
+          break ;
+          
+          // y-aligned edge
+        case 1 :
+          sons[0] = all_sons[0][2] ;
+          sons[1] = all_sons[0][3] ;
+          sons[2] = all_sons[1][0] ;
+          sons[3] = all_sons[1][1] ;
+          sons[4] = all_sons[0][6] ;
+          sons[5] = all_sons[0][7] ;
+          sons[6] = all_sons[1][4] ;
+          sons[7] = all_sons[1][5] ;
+          break ;
+          
+          // z-aligned edge
+        case 2 :
+          sons[0] = all_sons[0][4] ;
+          sons[1] = all_sons[0][5] ;
+          sons[2] = all_sons[0][6] ;
+          sons[3] = all_sons[0][7] ;
+          sons[4] = all_sons[1][0] ;
+          sons[5] = all_sons[1][1] ;
+          sons[6] = all_sons[1][2] ;
+          sons[7] = all_sons[1][3] ;
+          break ;
+      }
+      
+      //_____________________________________________________________________________
+      // edge
+      dual_it.direction = dir ; // same direction
+      dual_it.type = hash_dual_iterator_struct::DUAL_EDGE ;
+      for( int i = 0 ; i < 12 ; ++i )
+      {
+        if( dir_edges[i][2] != dir ) continue ;
+        dual_it.cells[0] = sons[ dir_edges[i][0] ] ;
+        dual_it.cells[1] = sons[ dir_edges[i][1] ] ;
+        s.push( dual_it ) ;
+        print_dual_edge( "edge", dual_it.cells ) ;
+      }
+      
+      //_____________________________________________________________________________
+      // face
+      dual_it.type = hash_dual_iterator_struct::DUAL_FACE ;
+      for( int i = 0 ; i < 6 ; ++i )
+      {
+        if( faces[i][4] == dir ) continue ;
+        dual_it.cells[0] = sons[ faces[i][0] ] ;
+        dual_it.cells[1] = sons[ faces[i][1] ] ;
+        dual_it.cells[2] = sons[ faces[i][2] ] ;
+        dual_it.cells[3] = sons[ faces[i][3] ] ;
+        dual_it.direction = faces[i][4] ;
+        s.push( dual_it ) ;
+        print_dual_face( "edge", dual_it.cells ) ;
+      }
+      
+      //_____________________________________________________________________________
+      // cube
+      dual_it.type = hash_dual_iterator_struct::DUAL_CUBE ;
+      for( int i = 0 ; i < 8 ; ++i ) dual_it.cells[i] = sons[i] ;
+      s.push( dual_it ) ;
+      print_dual_cube( "edge", dual_it.cells ) ;
+      
+      continue ;
+    }
+    
+    
+    //_____________________________________________________________________________
+    //_____________________________________________________________________________
+    // face case
+    else if( dual_it.type == hash_dual_iterator_struct::DUAL_FACE )
+    {
+      print_dual_face( "!", dual_it.cells ) ;
+
+      Key all_sons[4][8] ;
+      bool leaf = true ;
+      for( int i = 0 ; i < 4 ; ++i )
+      {
+        if( is_leaf( dual_it.cells[i] ) )
+        {
+          // repeat father
+          for( int j = 0 ; j < 8 ; ++j )
+            all_sons[i][j] = dual_it.cells[i] ;
+        }
+        else
+        {
+          leaf = false ;
+          Key f = dual_it.cells[i] << 3 ;
+          for( int j = 0 ; j < 8 ; ++j )
+            all_sons[i][j] = f | j ;
+        }
+      }
+      if( leaf ) continue ;
+      
+      
+      //_____________________________________________________________________________
+      // local cube
+      Key sons[8] ;
+      int dir = dual_it.direction ;
+      switch( dir )
+      {
+          // yz-aligned face
+        case 0 :
+          sons[0] = all_sons[0][6] ;
+          sons[1] = all_sons[0][7] ;
+          sons[2] = all_sons[1][4] ;
+          sons[3] = all_sons[1][5] ;
+          sons[4] = all_sons[2][2] ;
+          sons[5] = all_sons[2][3] ;
+          sons[6] = all_sons[3][0] ;
+          sons[7] = all_sons[3][1] ;
+          break ;
+          
+          // zx-aligned edge
+        case 1 :
+          sons[0] = all_sons[0][5] ;
+          sons[1] = all_sons[1][4] ;
+          sons[2] = all_sons[0][7] ;
+          sons[3] = all_sons[1][6] ;
+          sons[4] = all_sons[2][1] ;
+          sons[5] = all_sons[3][0] ;
+          sons[6] = all_sons[2][3] ;
+          sons[7] = all_sons[3][2] ;
+          break ;
+          
+          // xy-aligned edge
+        case 2 :
+          sons[0] = all_sons[0][3] ;
+          sons[1] = all_sons[1][2] ;
+          sons[2] = all_sons[2][1] ;
+          sons[3] = all_sons[3][0] ;
+          sons[4] = all_sons[0][7] ;
+          sons[5] = all_sons[1][6] ;
+          sons[6] = all_sons[2][5] ;
+          sons[7] = all_sons[3][4] ;
+          break ;
+      }
+      
+      //_____________________________________________________________________________
+      // face
+      // same direction
+      dual_it.direction = dir ;
+      dual_it.type = hash_dual_iterator_struct::DUAL_FACE ;
+      for( int i = 0 ; i < 6 ; ++i )
+      {
+        if( faces[i][4] != dir ) continue ;
+        dual_it.cells[0] = sons[ faces[i][0] ] ;
+        dual_it.cells[1] = sons[ faces[i][1] ] ;
+        dual_it.cells[2] = sons[ faces[i][2] ] ;
+        dual_it.cells[3] = sons[ faces[i][3] ] ;
+        //        dual_it.direction = faces[i][4] ;
+        s.push( dual_it ) ;
+        print_dual_face( "face", dual_it.cells ) ;
+      }
+      
+      //_____________________________________________________________________________
+      // cube
+      dual_it.type = hash_dual_iterator_struct::DUAL_CUBE ;
+      for( int i = 0 ; i < 8 ; ++i ) dual_it.cells[i] = sons[i] ;
+      s.push( dual_it ) ;
+      print_dual_cube( "face", dual_it.cells ) ;
+      
+      continue ;
+    }
+    
+    
+    //_____________________________________________________________________________
+    //_____________________________________________________________________________
+    // cube case
+    else if( dual_it.type == hash_dual_iterator_struct::DUAL_CUBE )
+    {
+      print_dual_cube( "!", dual_it.cells ) ;
+
+      bool leaf = true ;
+      
+      //_____________________________________________________________________________
+      // cube
+      for( int i = 0 ; i < 8 ; ++i )
+      {
+        // copy father
+        if( is_leaf( dual_it.cells[i] ) )
+          continue ;
+        
+        // else
+        leaf = false ;
+        dual_it.cells[i] = ( dual_it.cells[i]<<3 ) | 7-i ;
+      }
+      
+      // finally add dual cube
+      if( leaf )
+      {
+        result &= walker( *this, dual_it.cells ) ;
+        print_final_cube( dual_it.cells ) ;
+      }
+      else
+      {
+        s.push( dual_it ) ;
+        print_dual_cube( "cube", dual_it.cells ) ;
+      }
+      
+      continue ;
+    }
+    
+  }
+  
+  return result ;
+}
+//_____________________________________________________________________________
+
+
+
+
+//_____________________________________________________________________________
+// Isosurface walker
+bool hash_isosurface_walker( HashOctree &fo, Key *keys )
+//-----------------------------------------------------------------------------
+{
+  MarchingCubes &mc = fo.mc() ;
+  
+  /** isovalues at the cube vertices */
+  real            *cube    = mc.cube() ;
+  /** geometry of the cube */
+  Point           *space   = mc.space() ;
+  /** indexes of the cube */
+  Key             *indexes = mc.indexes() ;
+  
+  for( int j = 0 ; j < 8 ; ++j )
+  {
+    int i = (j==2)?3:(j==3)?2:(j==7)?6:(j==6)?7:j ;
+    const Key k = keys[j] ;
+    HashOctree::geom_cell c = fo.geom_key(k) ;
+    cube[i] = *c ;
+    
+    space[i] = (Point)c ;
+    indexes[i] = k ;
+  }
+  
+  mc.tesselate_cube( 0.0 ) ;
+  
+  return true ;
+}
+//_____________________________________________________________________________
+
+
+
+//_____________________________________________________________________________
+// Build the isosurface using dual marching cubes
+bool HashOctree::build_isosurface( data_access *ref )
+//-----------------------------------------------------------------------------
+{
+  if( !ref ) return false ;
+  _mc.dat_access() = ref ;
+
+    printf( "Build isosurface... " ) ;
+  bool result = false ;
+  
+  //_________________________________________________________________________
+  // Dual Marching Cubes
+  
+  _mc.init_all() ; 
+  
+  result = dual_cubes_walk( hash_isosurface_walker ) ;
+  
+  _mc.clean_temps() ;
+  
+  printf( "generated %d vertices and %d faces!\n", _mc.nverts(), _mc.ntrigs() ) ;
+  
+  return result ;
+}
+//_____________________________________________________________________________
+
+
+
+
+//_____________________________________________________________________________
+// Isosurface drawing walker
+bool hash_direct_isosurface_walker( HashOctree &fo, Key *keys )
+//-----------------------------------------------------------------------------
+{
+  MC_Draw &mc = fo.mc_draw() ;
+  
+  /** isovalues at the cube vertices */
+  real            *cube    = mc.cube() ;
+  /** geometry of the cube */
+  Point           *space   = mc.space() ;
+  
+  for( int j = 0 ; j < 8 ; ++j )
+  {
+    int i = (j==2)?3:(j==3)?2:(j==7)?6:(j==6)?7:j ;
+    const HashOctree::geom_cell c = fo.geom_key( keys[j] ) ;
+    cube[i] = *c ;
+    space[i] = (Point)c ;
+  }
+  
+  mc.tesselate_cube( 0.0 ) ;
+  
+  return true ;
+}
+//_____________________________________________________________________________
+
+
+
+//_____________________________________________________________________________
+// Build the isosurface using dual marching cubes
+bool HashOctree::direct_draw_isosurface( data_access *ref )
+//-----------------------------------------------------------------------------
+{
+  if( !ref ) return false ;
+  _mc_draw.dat_access() = ref ;
+  
+    bool result = false ;
+  
+  // Dual Marching Cubes
+  ::glBegin( GL_TRIANGLES ) ;
+  {
+    result = dual_cubes_walk( hash_direct_isosurface_walker ) ;
+  }
+  ::glEnd() ; // GL_TRIANGLES
+  
+  return result ;
+}
+//_____________________________________________________________________________
+
+
+
+
+
+
+//_____________________________________________________________________________
+// Draw walker
+bool hash_draw_walker( HashOctree &fo, Key *keys )
+//-----------------------------------------------------------------------------
+{
+  Cube cells[8] ;
+  for( int i = 0 ; i < 8 ; ++i )
+    cells[i] = key2cube( keys[i] ) ;
+    
+  ((Point)cells[0]).draw() ;
+  ((Point)cells[1]).draw() ;
+  
+  ((Point)cells[1]).draw() ;
+  ((Point)cells[3]).draw() ;
+  
+  ((Point)cells[3]).draw() ;
+  ((Point)cells[2]).draw() ;
+  
+  ((Point)cells[2]).draw() ;
+  ((Point)cells[0]).draw() ;
+  
+  ((Point)cells[4]).draw() ;
+  ((Point)cells[5]).draw() ;
+  
+  ((Point)cells[5]).draw() ;
+  ((Point)cells[7]).draw() ;
+  
+  ((Point)cells[7]).draw() ;
+  ((Point)cells[6]).draw() ;
+  
+  ((Point)cells[6]).draw() ;
+  ((Point)cells[4]).draw() ;
+  
+  ((Point)cells[0]).draw() ;
+  ((Point)cells[4]).draw() ;
+  
+  ((Point)cells[1]).draw() ;
+  ((Point)cells[5]).draw() ;
+  
+  ((Point)cells[2]).draw() ;
+  ((Point)cells[6]).draw() ;
+  
+  ((Point)cells[3]).draw() ;
+  ((Point)cells[7]).draw() ;
+  
+  return true ;
+}
+//_____________________________________________________________________________
+
+
+
+
+//_____________________________________________________________________________
+// Draw the dual octree with wireframe
+bool HashOctree::draw_dual()
+//-----------------------------------------------------------------------------
+{
+  ::glBegin( GL_LINES ) ;
+  bool result = dual_cubes_walk( hash_draw_walker ) ;
+  ::glEnd() ;  // GL_LINES
+  
+  return result ;
+}
+//_____________________________________________________________________________
+
+
+
+
+
+//_____________________________________________________________________________
+// Do nothing walker, just for dual generation timing
+bool hash_timing_walker( HashOctree &fo, Key *keys )
+//-----------------------------------------------------------------------------
+{
+  return true ;
+}
+//_____________________________________________________________________________
+
+
+//_____________________________________________________________________________
+// Do nothing, just for dual generation timing
+bool HashOctree::dual_timing()
+//-----------------------------------------------------------------------------
+{
+    return dual_cubes_walk( hash_timing_walker ) ;
+}
+//_____________________________________________________________________________
+
+
+
+
+
+//_____________________________________________________________________________
+// Prints statistics about the octree
+void HashOctree::stats()
+//-----------------------------------------------------------------------------
+{
+  uint level_dist[MAX_LEVEL+1] ;
+  memset( level_dist, 0, (MAX_LEVEL+1)*sizeof(uint) ) ;
+  
+  int s = 0 ;
+  for( cell_iterator it = cells_begin() ; it() ; ++it )
+  {
+    ++s ;
+    if( it.is_leaf() ) level_dist[ it.lv() ] ++ ;
+  }
+  
+  printf( " number of nodes:\t%d\n", s ) ;
+#if USE_HASH_PTR
+  printf( " total memory:\t%d\n", (int) ( s * sizeof(HashField::KeyBucket) ) ) ;
+  _hash.stats() ;
+#else  // USE_HASH_PTR 
+  printf( " total memory:\t%d\n", (int) ( s * sizeof(HashField::KeyData  ) ) ) ;
+#endif // USE_HASH_PTR
+  
+  printf( " leaves' levels:\t" ) ;
+  for( Level l = 0 ; l <= MAX_LEVEL; ++l )
+    printf( "\t%d", level_dist[l] ) ;
+  printf( "\n" ) ;
+
+  printf( " max size of the stack:\t%d\n", _dual_temp_memory ) ;
+  printf( " total memory of stack:\t%d\n", (int) ( _dual_temp_memory * sizeof(hash_dual_iterator_struct) ) ) ;
+}
+//_____________________________________________________________________________
+
+
+
+
+
+//_____________________________________________________________________________
+//_____________________________________________________________________________
+// search operations
+
+
+//_____________________________________________________________________________
+// Find cells of the octree at a given position
+bool HashOctree::find_leaf( real x, real y, real z, geom_cell &n ) const
+//-----------------------------------------------------------------------------
+{
+    
+  n = geom_root() ;
+  
+  while( !n.is_leaf() )
+  {
+    ++n.lv() ;
+    real sz = n.sz() ;
+    
+    // side test :
+    //  0->back  lower left, 1->back  lower right, 2->back  upper left, 3->back  upper right
+    //  4->front lower left, 5->front lower right, 6->front upper left, 7->front upper right
+    int i = ( (n.cz() < z) << 2 ) | ( (n.cy() < y) << 1 ) | (n.cx() < x) ;
+    n.cx() += (i&1) ? +sz : -sz ;
+    n.cy() += (i&2) ? +sz : -sz ;
+    n.cz() += (i&4) ? +sz : -sz ;
+    
+    geom_cell s ;
+    n.son(i,s,_hash) ;
+    n = s ;
+  }
+  
+  return true ;
+}
+//_____________________________________________________________________________
+
+
+
+//_____________________________________________________________________________
+// Find cells of the octree inside a given box of center x,y and half side r
+bool HashOctree::find_radius( real x, real y, real z, real r, List<geom_cell> &cells ) const
+//-----------------------------------------------------------------------------
+{
+    
+  cells.clear() ;
+  
+  geom_cell n = geom_root() ;
+  
+  std::stack< geom_cell > s ;
+  s.push( n ) ;
+  
+  while( !s.empty() )
+  {
+    n = s.top() ;  s.pop() ;
+//    printf( "%d\t%.4f\t%.4f\t%.4f\n", (int)n.lv(), n.x(), n.y(), n.z() ) ;
+    if( n.is_leaf() )
+    {
+      cells.insert( n ) ;
+      continue ;
+    }
+    
+    geom_cell sons[8] ;
+    n.sons( sons, _hash ) ;
+    real sz_ = sons[0].sz() + r ;
+    for( int i = 0 ; i < 8 ; ++i )
+    {
+      if( (fabs( sons[i].cx() - x ) < sz_ ) &&
+          (fabs( sons[i].cy() - y ) < sz_ ) &&
+          (fabs( sons[i].cz() - z ) < sz_ ) )
+        s.push( sons[i] ) ;
+    }
+  }
+//  printf( "\n" ) ;
+  
+  return true ;
+}
+//_____________________________________________________________________________
+
+
+
+//_____________________________________________________________________________
+// Find neighbor cells of the octree to a given cell
+bool HashOctree::adjacent( const geom_cell &cell, List<geom_cell> &cells ) const
+//-----------------------------------------------------------------------------
+{
+  return find_radius( cell.cx(), cell.cy(), cell.cz(), cell.sz() + (real) 0.5 / (1 << max_level() ) , cells ) ;
+}
+//_____________________________________________________________________________
+
+
+
+//_____________________________________________________________________________
+//_____________________________________________________________________________
+// I/O
+
+//_____________________________________________________________________________
+// Draws the intersecting cells of a plane with the octree with color
+void HashOctree::draw_plane ( real nx, real ny, real nz, real d )
+//-----------------------------------------------------------------------------
+{
+  geom_cell n = geom_root() ;
+  
+  std::stack< geom_cell > s ;
+  s.push( n ) ;
+  
+  //_____________________________________________________________________________
+  // retrieve the index of the most positive cube corner
+  bool fx = nx >= 0 ;
+  bool fy = ny >= 0 ;
+  bool fz = nz >= 0 ;
+  
+  //_____________________________________________________________________________
+  
+  ::glLineWidth( 1.0f ) ;
+  ::glDisable( GL_LIGHTING ) ;
+  
+  real px,py,pz, mx,my,mz ;
+  while( !s.empty() )
+  {
+    n = s.top() ;  s.pop() ;
+    
+    if( n.is_leaf() )
+    {		
+      
+      ::glTexCoord1f( (GLfloat)fabs(*n/max_field()) ) ;
+      ::glBegin( GL_LINES ) ;
+      n.draw_wire() ;
+      ::glEnd() ;  // GL_LINES		
+      
+      continue ;
+    }
+    
+    //___________________________________________________________________________
+    // recursion
+    geom_cell sons[8] ;
+    n.sons( sons, _hash ) ;
+    real sz_ = sons[0].sz() ;
+    for( int i = 0 ; i < 8 ; ++i )
+    {
+      // get the coordinates of the extremum vertices
+      if( fx ) { px = sons[i].cx() + sz_ ;  mx = sons[i].cx() - sz_ ; }
+      else     { px = sons[i].cx() - sz_ ;  mx = sons[i].cx() + sz_ ; }
+      if( fy ) { py = sons[i].cy() + sz_ ;  my = sons[i].cy() - sz_ ; }
+      else     { py = sons[i].cy() - sz_ ;  my = sons[i].cy() + sz_ ; }
+      if( fz ) { pz = sons[i].cz() + sz_ ;  mz = sons[i].cz() - sz_ ; }
+      else     { pz = sons[i].cz() - sz_ ;  mz = sons[i].cz() + sz_ ; }
+      
+      // plane/cube intersection test
+      if( (nx * px + ny * py + nz * pz + d >= 0.0) && (nx * mx + ny * my + nz * mz + d <= 0.0)  )
+        s.push( sons[i] ) ;
+    }
+  }
+}
+//_____________________________________________________________________________
+
+
+
+
+
+//_____________________________________________________________________________
+// Draws the intersection of a plane with the octree with color
+void HashOctree::draw_slice ( real nx, real ny, real nz, real d, float alpha )
+//-----------------------------------------------------------------------------
+{
+  geom_cell n = geom_root() ;
+  
+  std::stack< geom_cell > s ;
+  s.push( n ) ;
+  
+  // retrieve the index of the most positive cube corner
+  bool fx = nx >= 0 ;
+  bool fy = ny >= 0 ;
+  bool fz = nz >= 0 ;
+  
+  
+  
+  //_____________________________________________________________________________
+  
+  ::glDisable( GL_LIGHTING ) ;
+  
+  real px,py,pz, mx,my,mz ;
+  while( !s.empty() )
+  {
+    n = s.top() ;  s.pop() ;
+    if( n.is_leaf() )
+    {
+      // retrieves the signs of each cube corner
+      real val[8] ;
+      real v   = nx * n.cx() + ny * n.cy() + nz * n.cz() + d ;
+      real sz_ = n.sz() ;
+      int zeros = 0 ;
+      for( int i = 0 ; i < 8 ; ++i )
+      {
+        val[i] = v + nx * ((i&1)?sz_:-sz_) + ny * ((i&2)?sz_:-sz_) + nz * ((i&4)?sz_:-sz_) ;
+        if( fabs(val[i]) < R_EPSILON ) { val[i] = R_EPSILON ;  ++zeros ; }
+      }
+      
+      //_________________________________________________________________________
+      // degenerated intersection
+      if( zeros > 0 )
+      {
+        int npos = 0, nneg = 0 ;
+        for( int i = 0 ; i < 8 ; ++i )
+        {
+          if( fabs(val[i]) < R_EPSILON ) continue ;
+          if( val[i] < 0 )
+            ++nneg ;
+          else
+            ++npos ;
+        }
+        float def = (nneg>npos) ? (float)R_EPSILON : -(float)R_EPSILON ;
+        
+        for( int i = 0 ; i < 8 ; ++i )
+        {
+          if( fabs(val[i]) < R_EPSILON ) val[i] = def ;
+        }
+        //        continue ;
+      }
+      
+      //_________________________________________________________________________
+      // Continuation method
+      int v0=-1, v1=-1 ;  // current edge vertices
+      
+      // get the first intersection
+      static int edges[12][2] = { {0,1}, {0,2}, {0,4}, {1,3}, {1,5}, {2,3}, {2,6}, {3,7}, {4,5}, {4,6}, {5,7}, {6,7} } ;
+      for( int e = 0 ; e < 12 ; ++e )
+      {
+        if( val[ edges[e][0] ] * val[ edges[e][1] ] < 0 )
+        {
+          v0 = edges[e][0] ;
+          v1 = edges[e][1] ;
+          break ;
+        }
+      }
+      int  ov0 = v0, ov1 = v1 ;
+      
+      
+      // equation of previous face adjacent to v0v1: v>>c & 1 == s (c-th coordinate equal to +/- 1)
+      int pf = -1 ;  bool ps ;
+      if       ( (v0 & 1) == (v1 & 1) )   { pf = 0 ; ps = ((v0 & 1) /*>> 0*/) == 1 ; }
+      else   if( (v0 & 2) == (v1 & 2) )   { pf = 1 ; ps = ((v0 & 2)   >> 1  ) == 1 ; }
+      else /*if( (v0 & 4) == (v1 & 4) )*/ { pf = 2 ; ps = ((v0 & 4)   >> 2  ) == 1 ; }
+      
+      //      printf( "cube %d %d %d %d %d %d %d %d, march : (%d,%d) ", val[0]>0, val[1]>0, val[2]>0, val[3]>0, val[4]>0, val[5]>0, val[6]>0, val[7]>0, v0, v1 ) ;
+      
+      //_________________________________________________________________________
+      // marching
+      
+      GLfloat color = (GLfloat)fabs(*n / max_field()) ;
+		  //cmap.gl_color( at(*n) ) ;	
+      ::glBegin( GL_POLYGON ) ;
+      {
+        do
+        {
+          // equation of next face adjacent to v0v1
+          int nf = -1 ;  bool ns ;
+          if       ( pf != 0 && ((v0 & 1) == (v1 & 1)) )   { nf = 0 ; ns = ((v0 & 1) /*>> 0*/) == 1 ; }
+          else   if( pf != 1 && ((v0 & 2) == (v1 & 2)) )   { nf = 1 ; ns = ((v0 & 2)   >> 1  ) == 1 ; }
+          else /*if( pf != 2 && ((v0 & 4) == (v1 & 4)) )*/ { nf = 2 ; ns = ((v0 & 4)   >> 2  ) == 1 ; }
+          
+          /* equivalent construction
+           // get the direction perpendicular to v0v1
+           int of = (v0 ^ v1) & 7 ; // only bit of difference
+           of = of==1 ? 0 : (of==2 ? 1 : 2) ;
+           
+           // compute the equation of the next face adjacent to v0v1
+           int  nf = 3 - (pf+of) ;    // third option: {pf,nf,of}={0,1,2}
+           bool ns = (v0 >> nf) & 1 ; // value of the edge on that direction
+           */
+          
+          // compute the two next vertices (invert the pf-th bit
+          int v2 = ps ? ( v0 & (~(1<<pf)) ) : ( v0 | (1<<pf) ) ;
+          int v3 = ps ? ( v1 & (~(1<<pf)) ) : ( v1 | (1<<pf) ) ;
+          
+          // get the characteristic of the square
+          int  c = (val[v3] > 0) | ((val[v2] > 0) << 1) | ((val[v1] > 0) << 2) | ((val[v0] > 0) << 3) ;
+          if( c > 7 ) c = (~c)&7 ; // consider v0 as negative, and thus v1 as positive
+          /*
+           if( c < 4 )
+           { // degenerated intesection
+           printf( "degenerated intersection %d!\n", c ) ;
+           }
+           */
+          
+          //_______________________________________________________________________
+          // method of continuity on the cube surface
+          switch( c )
+          {
+            case  4 : v0 = v3 ;  break ;
+            case  5 : v0 = v2 ;  v1 = v3 ;  break ;
+            case  6 : /* impossible case */ break ;
+            case  7 : v1 = v2 ;  break ;
+          }
+          
+          
+          
+          
+          real cx =  n.cx();
+          real cy =  n.cy(); 
+          real cz =  n.cz();
+          real sz =  sz_;   
+          real a0 = val[v0];  
+          int i0 = v0; 
+          real a1 = val[v1];  
+          int i1  = v1;
+          
+          real w0 = a1 / (a1-a0) ;
+          real w1 = a0 / (a0-a1) ;
+          
+          real x = cx + w0 * ((i0&1)?sz:-sz) + w1 * ((i1&1)?sz:-sz);
+          real y = cy + w0 * ((i0&2)?sz:-sz) + w1 * ((i1&2)?sz:-sz);
+          real z = cz + w0 * ((i0&4)?sz:-sz) + w1 * ((i1&4)?sz:-sz);
+          
+          ::glTexCoord1d( color ) ;
+          ::glVertex3d(x, y, z) ;
+          
+          // next face
+          pf = nf ;  ps = ns ;
+          
+          //          printf( "(%d,%d) ", v0, v1 ) ;
+        } while( v0 != ov0 || v1 != ov1 ) ;
+        //        printf( "\n" ) ;
+      }
+      ::glEnd() ; // GL_POLYGON
+      
+      continue ;
+    }
+    
+    //___________________________________________________________________________
+    // recursion
+    geom_cell sons[8] ;
+    n.sons( sons, _hash ) ;
+    real sz_ = sons[0].sz() ;
+    for( int i = 0 ; i < 8 ; ++i )
+    {
+      // get the coordinates of the extremum vertices
+      if( fx ) { px = sons[i].cx() + sz_ ;  mx = sons[i].cx() - sz_ ; }
+      else     { px = sons[i].cx() - sz_ ;  mx = sons[i].cx() + sz_ ; }
+      if( fy ) { py = sons[i].cy() + sz_ ;  my = sons[i].cy() - sz_ ; }
+      else     { py = sons[i].cy() - sz_ ;  my = sons[i].cy() + sz_ ; }
+      if( fz ) { pz = sons[i].cz() + sz_ ;  mz = sons[i].cz() - sz_ ; }
+      else     { pz = sons[i].cz() - sz_ ;  mz = sons[i].cz() + sz_ ; }
+      
+      // plane/cube intersection test
+      if( (nx * px + ny * py + nz * pz + d >= 0.0) && (nx * mx + ny * my + nz * mz + d <= 0.0)  )
+        s.push( sons[i] ) ;
+    }
+  }
+}
+//_____________________________________________________________________________
+
+
+
+
+
diff --git a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/hash_octree.h b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/hash_octree.h
new file mode 100644
index 0000000000..89a111297f
--- /dev/null
+++ b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/hash_octree.h
@@ -0,0 +1,352 @@
+/**
+ * \file    hash_octree.h
+ * \author  Thomas Lewiner   <tomlew@puc-rio.br>
+ * \author  Matmidia Lab, Math Dept, PUC-Rio
+ * \date    10/01/2010
+ *
+ *  Octree structure with hashtable and hierarchical operations
+ */
+//_____________________________________________________________________________
+
+
+#pragma once
+
+#ifndef WIN32
+#pragma interface
+#endif // WIN32
+
+
+#include "mlist.h"
+#include "cube.h"
+#include "hash.h"
+#include "MarchingCubes.h"
+#include "mc_draw.h"
+#include "data_access.h"
+
+
+
+//_____________________________________________________________________________
+// HashOctree
+/// \class HashOctree HashOctree.h
+class HashOctree
+//-----------------------------------------------------------------------------
+{
+// forward declaration
+public:
+  class geom_cell  ;
+  class cell_iterator  ;
+  class leaf_iterator  ;
+
+// Elements
+protected:
+  /// Octree cell data structure
+  typedef Hash<real> HashField ;
+
+  /// Hashtable of the octree nodes
+  HashField _hash ;
+
+  /// Maximal level of the octree (for find_adjacent)
+  Level _max_level ;
+  
+  /// Maximal field of the octree
+  real _max_field ;
+  
+  /// Isosurface
+  MarchingCubes _mc ;
+
+  /// Isosurface Draw
+  MC_Draw _mc_draw ;
+  
+  /// Dual run memory consumption
+  uint _dual_temp_memory ;
+  
+//-----------------------------------------------------------------------------
+// Constructors
+public:
+  /// Default constructor: Constructs a octree with and empty root
+  HashOctree() { init() ; }
+
+  /// Destructor: Free memory
+  ~HashOctree() { clear() ; }
+
+
+  /// Create the root
+  void init() ;
+
+  /// Memory cleaning
+  void clear() { clear_octree() ;  _mc.clean_all() ; }
+
+  /// Delete the content of the octree
+  void clear_octree() ;
+
+  /// Check that only the leaves have data
+  bool check () ;
+
+  /// Prints statistics about the octree
+  void stats() ;
+  
+  
+  /// Return the maximal level of the octree
+  Level  max_level() const { return _max_level ; }
+  
+  /// Return the maximal field of the octree
+  real max_field() const { return _max_field ; }
+   
+  /// Return the isosurface
+  MarchingCubes &mc() { return _mc ; }
+
+  /// Return the isosurface draw
+  MC_Draw &mc_draw() { return _mc_draw ; }
+  
+  /// set the values of each leaf from the implicit function
+  bool set_impl( data_access *ref = NULL ) ;
+  
+  /// Refine the octree according to the data access
+  bool refine( data_access *ref = NULL ) ;
+
+  /// Adapt the octree according to the data access
+  bool adapt( data_access *ref = NULL ) ;
+  
+  /// Draw the octree with wireframe
+  bool draw_wire() ;
+  
+  /// Draw the octree with dots
+  bool draw_centers() ;
+  
+  /// Dual function type
+  typedef bool hash_dual_walker( HashOctree &fo, Key *keys ) ;
+
+  /// Walk on the dual cubes
+  bool dual_cubes_walk( hash_dual_walker &walker ) ;
+
+  /// Build the isosurface using dual marching cubes
+  bool build_isosurface( data_access *ref = NULL ) ;
+  
+  /// Draw the isosurface on-the-fly using dual marching cubes
+  bool direct_draw_isosurface( data_access *ref = NULL ) ;
+  
+  /// Draw the dual octree with wireframe
+  bool draw_dual() ;
+
+  /// Do nothing, just for dual generation timing
+  bool dual_timing() ;
+    
+//-----------------------------------------------------------------------------
+// iterators
+public:
+  /// Create an iterator traversing the tree from the root
+  inline cell_iterator cells_begin() { return cell_iterator( *this ) ; }
+
+  /// Create an iterator traversing the leaves of the tree from the root
+  inline leaf_iterator leaves_begin() { return leaf_iterator( *this ) ; }
+
+//-----------------------------------------------------------------------------
+// search operations
+public:
+  /// Find cells of the octree at a given position
+  bool find_leaf( real x, real y, real z, geom_cell &cell ) const ;
+
+  /// Find cells of the octree inside a given box of center x,y,z and half side r
+  bool find_radius( real x, real y, real z, real r, List<geom_cell> &cells ) const ;
+
+  /// Find adjacent cells of the octree to a given cell
+  bool adjacent( const geom_cell &cell, List<geom_cell> &cells ) const ;
+
+  /// Leaf test based on the field value
+  bool is_leaf( Key k ) const { return !is_inv( _hash[k].data ) ; }
+
+//-----------------------------------------------------------------------------
+// I/O
+public:
+
+  /// Draws the intersecting cells of a plane with the octree with color
+  void draw_plane ( real nx, real ny, real nz, real d	  ) ;
+
+  /// Draws the intersection of a plane with the octree with color
+  void draw_slice ( real nx, real ny, real nz, real d, float alpha ) ;
+
+  /// Draws the isosurface of level l inside the dual graph
+  void draw_iso   () { _mc.draw_surf() ; }
+
+//_____________________________________________________________________________
+// Iterator Cell
+public :
+  /// Auxiliary structure to traverse the octree
+  class geom_cell : public Cube
+  //---------------------------------------------------------------------------
+  {
+    friend class HashOctree ;
+
+  protected:
+    Key   _key   ;  ///< octree cell
+    real  _field ;  ///< field associated to the cell
+
+  //---------------------------------------------------------------------------
+  // Constructors
+  public:
+    /// Default constructor: Constructs an iterator from a cell
+    geom_cell( Key key_ = KEY_INV, real field_ = R_INV ) : Cube(key2cube(key_)), _key(key_), _field(field_) {}
+
+    /// Destructor
+    ~geom_cell() {}
+
+    /// Copy constructor
+    geom_cell( const geom_cell &i ) : Cube(i), _key(i._key), _field(i._field) {}
+
+    /// Assignment operator
+    geom_cell &operator = ( const geom_cell &i )
+    {  Cube::operator=(i) ;  _key = i._key ;  _field = i._field ;  return *this; }
+    
+
+  //---------------------------------------------------------------------------
+  // Public constant accessors
+  public  :
+    /// key const accessor
+    inline Key  key() const { return _key ; }
+    /// key accessor
+    inline Key &key() { return _key ; }
+
+    /// id const accessor
+    inline real  operator*() const { return _field ; }
+    
+    //---------------------------------------------------------------------------
+  // Tests
+  public :
+    /// equality operator
+    inline bool operator ==( const geom_cell &i ) const { return key() == i.key() ; }
+
+    /// inequality operator
+    inline bool operator !=( const geom_cell &i ) const { return key() != i.key() ; }
+
+    /// leaf test
+    inline bool is_leaf() const { return !is_inv(*(*this)) ; }
+
+    /// validation operator
+    inline bool      operator ()() const { return key() != KEY_INV ; }
+
+  //---------------------------------------------------------------------------
+  // Operations
+  public  :
+    /// sons
+    inline bool sons( geom_cell *s /*[8]*/, const HashField &hash )
+    {
+      if( is_leaf() ) return false ;
+
+      Key k = _key << 3 ;
+      for( int i = 0 ; i < 8 ; ++i )
+      {
+        s[i]._key   = k | i ;
+        s[i]._field = hash[k|i].data ;
+        (Cube&)s[i] = key2cube(s[i]._key) ;
+      }
+      return true ;
+    }
+
+    /// get son from side i
+    inline bool son( int i , geom_cell &s, const HashField &hash )
+    {
+      if( is_leaf() ) return false ;
+      s._key   = (key() << 3) | i ;
+      s._field = hash[s._key].data ;
+      (Cube&)s = key2cube(s._key) ;
+      return true ;
+    }
+  };
+
+  const geom_cell geom_root() const { const Key root_key = 1 ; return geom_cell( root_key, _hash[root_key].data ) ; }
+  const geom_cell geom_key ( Key k ) const { return geom_cell( k, _hash[k].data ) ; }
+
+
+
+//_____________________________________________________________________________
+// Cell Iterator
+public :
+  /// Octree cell iterator : Traverse the octree returning basic information on the cells
+  class cell_iterator
+  //---------------------------------------------------------------------------
+  {
+    friend class HashOctree ;
+
+  protected:
+    /// Octree traversal iterator
+    HashField::iterator _it ;
+
+  //---------------------------------------------------------------------------
+  // Constructors
+  public:
+    /// Default constructor : Constructs an iterator from a cell
+    cell_iterator( HashOctree &o ) : _it( o._hash.begin() ) {}
+
+    /// Destructor
+    ~cell_iterator() {}
+
+    /// Copy constructor
+    cell_iterator( const cell_iterator &i ) : _it(i._it) {}
+
+    /// Assignment operator
+    cell_iterator &operator = ( const cell_iterator &i )
+    { _it = i._it; return *this; }
+
+  //---------------------------------------------------------------------------
+  // Operations
+  public  :
+    /// equality operator
+    inline bool operator ==( const cell_iterator &i ) const { return _it == i._it ; }
+
+    /// inequality operator
+    inline bool operator !=( const cell_iterator &i ) const { return _it != i._it ; }
+
+    /// validation operator
+    inline bool      operator ()() const { return _it() ; }
+
+    /// next position
+    inline cell_iterator &operator ++() { ++_it ; return *this ; }
+
+  //---------------------------------------------------------------------------
+  // Accessors
+  public  :
+    // cell accessor
+    inline geom_cell top() const { return geom_cell( key(), *_it ) ; }
+
+    /// id accessor
+    inline real &operator*() { return *_it ; }
+
+    /// level accessor
+    inline Level lv() { return key_level(_it.key()) ; }
+
+    /// size accessor
+    inline real  sz() { return Cube(0,0,0,lv()).sz() ; }
+    
+    /// key accessor
+    inline Key   key() const { return _it.key() ; }
+    
+    /// points accessor
+    inline bool is_leaf() const { return !is_inv(*_it) ; }
+
+    /// Draws the cell wire with opengl
+    void draw_wire  () const { top().draw_wire  () ; }
+
+  };
+
+
+  /// Octree leaf iterator : Traverse the octree returning basic information on the leaves
+  class leaf_iterator : public cell_iterator
+  //---------------------------------------------------------------------------
+  {
+    public :
+    leaf_iterator( HashOctree &o ) : cell_iterator( o )
+    { if( (*this)() && !this->is_leaf() ) ++(*this) ; }
+
+    
+    /// next position
+    inline leaf_iterator &operator ++()
+    {
+      cell_iterator &it = *this ;
+      do ++it ; while ( it() && !it.is_leaf() ) ;
+      return *this ;
+    }
+  } ;
+} ;
+//_____________________________________________________________________________
+
+
diff --git a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/hash_ptr.h b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/hash_ptr.h
new file mode 100644
index 0000000000..79b0c9ff99
--- /dev/null
+++ b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/hash_ptr.h
@@ -0,0 +1,292 @@
+/**
+ * @file    hash_ptr.h
+ * @author  Thomas Lewiner 
+ * @version 
+ * @date    
+ *
+ * @brief
+ *
+ */
+//________________________________________________
+
+
+#ifndef _HASH_H_
+# error This header should not be included directly! include hash.h instead
+#endif // _HASH_H_
+
+#pragma once
+
+#define HASH_HAS_ERASE 1
+
+#include <stdlib.h> // memset
+#include <string.h>
+#include <stdio.h> //printf
+#include "mlist.h" // memset
+
+#include "morton.h"
+
+//_____________________________________________________________________________
+// Class hash
+template < typename Data > class Hash
+//-----------------------------------------------------------------------------
+{
+public:
+  typedef uint cntr ;
+//  static const cntr HASH_BITS = 16 ;
+//  static const cntr NON_HASH_BITS = 64-HASH_BITS ;
+  static const cntr HASH_SIZE = ((cntr)1<<HASH_BITS) ;
+  static const cntr HASH_MASK = HASH_SIZE-1 ;
+
+  // Bucket associative data
+  typedef struct KeyData
+  {
+    Key key ;
+    Data data ;
+
+    /// comparison based on the key only
+    bool operator==( const struct KeyData& rhs) const { return key == rhs.key ; }
+
+    /// comparison based on the key only
+    bool operator!=( const struct KeyData& rhs) const { return key != rhs.key ; }
+    
+  } KeyData ;
+  static KeyData KD_INV ;
+  
+  class iterator ;
+
+public:
+  typedef List<KeyData>                      KeyBucket ;
+  typedef typename KeyBucket::iterator       keybucket_iterator ;
+  typedef typename KeyBucket::const_iterator keybucket_const_iterator ;
+
+protected:
+//  KeyBucket _hash[HASH_SIZE] ;
+  KeyBucket *_hash ; // allocate dynamically since stack memory is limited
+  
+public:
+	// Constructor & Desctructor  
+  Hash   () { _hash = new KeyBucket[HASH_SIZE] ; } 
+  ~Hash  () { delete [] _hash ; }
+
+  void reset()
+  {
+    cntr n = HASH_SIZE ;
+    KeyBucket *ptr = _hash ;
+    for( ; n > 0 ; --n, ++ptr )
+    {
+      (*ptr).clear() ;
+    }
+    KD_INV.key = KEY_INV ;
+  }
+  
+  cntr size() const
+  {
+    cntr s = 0 ;
+    cntr n = HASH_SIZE ;
+    KeyBucket *ptr = _hash ;
+    for( ; n > 0 ; --n, ++ptr )
+      s += ptr->size() ;
+    return s ;
+  }
+  
+  void stats() const
+  {
+    static const cntr MAX_COLLISION = 32 ;
+    cntr colls[MAX_COLLISION] ;
+    memset( colls, 0, MAX_COLLISION*sizeof(cntr) ) ;
+    KeyBucket *ptr = _hash ;
+    for( cntr n = HASH_SIZE ; n > 0 ; --n, ++ptr )
+    {
+      cntr s = ptr->size() ;
+      if( s >= MAX_COLLISION ) s = MAX_COLLISION-1 ;
+      ++colls[s] ;
+    }
+
+    printf( "Hashtable collisions: [\t") ;
+    for( cntr n = 0 ; n < MAX_COLLISION ; ++n )
+      printf( "%d\t", colls[n] ) ;
+    printf( "\t]\n") ;
+  }
+  
+  inline cntr hash( Key k ) const ; 
+
+  bool insert( KeyData d )
+  {
+    cntr h = hash( d.key ) ;
+    KeyBucket &l = _hash[h] ;
+    return l.insert_unique( d ) ;
+  }
+
+  const KeyData operator[] ( Key k ) const
+  {
+    cntr h = hash( k ) ;
+    KeyData kd ; kd.key = k ;
+    keybucket_const_iterator it = _hash[h].cfind( kd ) ;
+    if( !it() ) return KD_INV ;
+    return *it ;
+  }
+  
+  KeyData &operator[] ( Key k )
+  {
+    cntr h = hash( k ) ;
+    KeyData kd ; kd.key = k ;
+    keybucket_iterator it = _hash[h].find( kd ) ;
+    if( !it() ) return KD_INV ;
+    return *it ;
+  }
+  
+  KeyData erase( Key k )
+  {
+    cntr h = hash( k ) ;
+    KeyData kd ; kd.key = k ;
+    if( _hash[h].remove( kd ) )
+      return kd ;
+    return KD_INV ;
+  }
+  
+  bool contains( Key k ) const { return (*this)[k].key == k ; }
+  
+  
+  //------------------------------------------------
+  // iterators
+  public :
+  /// iterator
+  class iterator
+  {
+    public :
+    // constructors
+    /// default constructors
+    iterator( Hash<Data> &hash_, Key id_ = 0 ) : _ptr(hash_._hash+id_), _last(hash_._hash+HASH_SIZE)
+    {
+      while( _ptr != _last && _ptr->empty() )
+        ++_ptr ;
+      if( _ptr != _last )
+        _l_it = _ptr->begin() ;
+    }
+    
+    /// destructor
+    ~iterator() {}
+    
+    /// copy constructor
+    iterator( const iterator &it ) : _ptr(it._ptr), _last(it._last), _l_it(it._l_it) {}
+    
+    /// assignment operator
+    iterator &operator = ( const iterator &it )
+    { _ptr = it._ptr; _last = it._last;  _l_it = it._l_it ;  return *this; }
+    
+    //-----------------------------------------------------------------------------
+    // Operations
+    public  :
+    /// equality operator
+    inline bool        operator ==( const iterator &it ) const { return _ptr == it._ptr && _l_it == it._l_it ; }
+    /// inequality operator
+    inline bool        operator !=( const iterator &it ) const { return _ptr != it._ptr || _l_it != it._l_it ; }
+    
+    /// validation operator
+    inline bool        operator ()() const { return _ptr != _last ; }
+    
+    /// key accessor
+    inline const Key  &key() const { return (*_l_it).key ; }
+    
+    /// value accessor
+    inline const Data &operator * () const { return (*_l_it).data ; }
+    
+    /// value accessor
+    inline Data       &operator * ()       { return (*_l_it).data ; }
+    
+    /// accesses the next position
+    inline iterator   &operator ++()       {
+      if( !(++_l_it)() )
+      {
+        while( _ptr != _last && (*(++_ptr)).empty() ) ;
+        if( _ptr != _last )
+          _l_it = _ptr->begin() ;
+      }
+      return *this ;
+    }
+    
+    //-----------------------------------------------------------------------------
+    // Elements
+    private :
+    KeyBucket           *_ptr  ; ///< position pointer
+    const KeyBucket     *_last ; ///< last position pointer
+    keybucket_iterator   _l_it ; ///< list iterator inside a bucket
+  };
+  
+  //------------------------------------------------
+  // const_iterator
+  public :
+  /// const_iterator
+  class const_iterator
+  {
+    public :
+    // constructors
+    /// default constructors
+    const_iterator( Hash<Data> &hash_, Key id_ = 0 ) : _ptr(hash_._hash+id_), _last(hash_._hash+HASH_SIZE)
+    {
+      while( _ptr != _last && _ptr->empty() )
+        ++_ptr ;
+      if( _ptr != _last )
+        _l_it = _ptr->cbegin() ;
+    }
+    
+    /// destructor
+    ~const_iterator() {}
+    
+    /// copy constructor
+    const_iterator( const const_iterator &it ) : _ptr(it._ptr), _last(it._last), _l_it(it._l_it) {}
+    
+    /// assignment operator
+    const_iterator &operator = ( const const_iterator &it )
+    { _ptr = it._ptr; _last = it._last;  _l_it = it._l_it ;  return *this; }
+    
+    //-----------------------------------------------------------------------------
+    // Operations
+    public  :
+    /// equality operator
+    inline bool        operator ==( const const_iterator &it ) const { return _ptr == it._ptr && _l_it == it._l_it ; ; }
+    /// inequality operator
+    inline bool        operator !=( const const_iterator &it ) const { return _ptr != it._ptr || _l_it != it._l_it ; ; }
+    
+    /// validation operator
+    inline bool        operator ()() const { return _ptr != _last ; }
+    
+    /// key accessor
+    inline const Key  &key() const { return (*_l_it).key ; }
+    
+    /// value accessor
+    inline const Data &operator * () const { return (*_l_it).data ; }
+    
+    /// accesses the next position
+    inline const_iterator   &operator ++()       {
+      if( !(++_l_it)() )
+      {
+        while( _ptr != _last && (*(++_ptr)).empty() ) ;
+        if( _ptr != _last )
+          _l_it = _ptr->cbegin() ;
+      }
+      return *this ;
+    }
+    
+    //-----------------------------------------------------------------------------
+    // Elements
+    private :
+    const KeyBucket  *         _ptr  ; ///< position pointer
+    const KeyBucket  * const   _last ; ///< last position pointer
+    keybucket_const_iterator   _l_it ; ///< list iterator inside a bucket
+  };
+  
+  public :
+  /// Node iterator creation
+  iterator begin( cntr id = 0 ) { return iterator( *this, id ) ; }
+  /// Node const iterator creation
+  const_iterator cbegin( cntr id = 0 ) { return const_iterator( *this, id ) ; }  
+};
+//_____________________________________________________________________________
+
+
+/// hash function specification: no inversion
+template <> inline Hash<real >::cntr Hash<real >::hash( Key k ) const { return k & HASH_MASK ; }
+
+/// hash function specification: inversion
+template <> inline Hash<Level>::cntr Hash<Level>::hash( Key k ) const { return (k>>NON_HASH_BITS) & HASH_MASK ; }
diff --git a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/implfuns.h b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/implfuns.h
new file mode 100644
index 0000000000..76e61cc4ed
--- /dev/null
+++ b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/implfuns.h
@@ -0,0 +1,101 @@
+/**
+ * @file    implfuns.h
+ * @author  Thomas Lewiner 
+ * @version 
+ * @date    
+ *
+ * @brief
+ *
+ */
+//________________________________________________
+
+
+#pragma once
+
+#define NFUNS 38
+
+// implicit functions
+const char *fun_list[NFUNS] =
+{
+  "Type Formula"    ,
+  "Sphere"          ,
+  "Ellipsoid"       ,
+  "Hyperboloid"     ,
+  "Plane"           ,
+  "Cubic"           ,
+  "Cushin"          ,
+  "Cassini"         ,
+  "Tangle cube"     ,
+  "Chair"           ,
+  "Cyclide"         ,
+  "2 Spheres"       ,
+  "2 Torii"         ,
+  "Heart"           ,
+  "Smile"           ,
+  "Spheres in"      ,
+  "Spheres dif"     ,
+	"Cross cap"       ,
+  "Weird cube"      ,
+  "Klein bottle"    ,
+  "Steiner's roman" ,
+	"Hunt's surface"  ,
+  "Cayley cubic"    ,
+  "Clebsch cubic"   ,
+  "Barth sextic"    ,
+	"Barth decic"     ,
+  "Steiner relative",
+  "Mitre"           ,
+  "Glob tear"       ,
+	"Piri tear"       ,
+  "Gumdrop torus"   ,
+  "Bretzel"         ,
+  "Blob"            ,
+  "Bifolia"         ,
+  "Lemniscate"      ,
+	"Planes"          ,
+  "Cylinders"       ,
+  "Torus"           ,
+} ;
+
+// implicit functions
+const char *fun_def [NFUNS] =
+{
+  /* Type Formula     */  "f(x,y,z)",
+  /* Sphere           */  "4*x^2-4*x+2.51+4*y^2-4*y+4*z^2-4*z",
+  /* Ellipsoid        */  "8*x^2-8*x+3.51+4*y^2-4*y+4*z^2-4*z",
+  /* Hyperboloid      */  "8*x^2-8*x-.1-4*y^2+4*y-4*z^2+4*z",
+  /* Plane            */  "x+y+z",
+  /* Cubic            */  "16*y^2-16*y+10-64*x^3+96*x^2-44*x",
+  /* Cushin           */  "112.5*z+81*y*z^2+51.75*x+119.25*y-135*y*z-38.8125+162*x^3-81*x^4+162*y^3+216*z^3-81*y^4-81*z^4-162*x*y-132.75*x^2-200.25*y^2-220.5*z^2+162*x*y^2+81*x*z-81*x*z^2-81*x^2*z-162*x^2*y^2-81*y^2*z^2+162*x^2*y+135*y^2*z+81*z^2*x^2",
+  /* Cassini          */  "-167.6778*z-267.2672*y*z^2-167.6778*x-205.1322*y+267.2672*y*z+59.74405625-267.2672*x^3+133.6336*x^4-267.2672*y^3-267.2672*z^3+133.6336*y^4+133.6336*z^4+267.2672*x*y+301.3114*x^2+338.7658*y^2+301.3114*z^2-267.2672*x*y^2+267.2672*x*z-267.2672*x*z^2-267.2672*x^2*z+267.2672*x^2*y^2+267.2672*y^2*z^2-267.2672*x^2*y-267.2672*y^2*z+267.2672*z^2*x^2",
+  /* Tangle cube      */  "-468*z-468*x-468*y+1296*y^4+1764*x^2+1764*y^2+1764*z^2+1296*z^4-2592*x^3+119.8-2592*y^3+1296*x^4-2592*z^3",
+  /* Chair            */  "-18250*z-36000*y*z^2-2250*x-18250*y+52000*y*z+4626.5625-20000*x^3+10000*x^4-20000*y^3-4000*z^3+10000*y^4+2000*z^4-12000*x*y+12250*x^2+28250*y^2+20250*z^2+12000*x*y^2+20000*x*z-36000*x*z^2-20000*x^2*z-12000*x^2*y^2+36000*y^2*z^2+12000*x^2*y-52000*y^2*z+36000*z^2*x^2",
+  /* Cyclide          */  "-11.23227514*x^2-6.0015984*x^4-6.0015984*y^4-6.0015984*z^4-13.56959251*z^2+12.0031968*y*z^2+12.0031968*z^3+6.027648307*x+7.256824512*y-13.25842291*y^2+12.0031968*y^3+12.0031968*x^2*z-9.79449408*x*y+9.79449408*x*y^2-9.79449408*x*z+9.79449408*x*z^2-12.0031968*x^2*y^2-12.0031968*y^2*z^2-12.0031968*z^2*x^2+7.567994112*z+12.0031968*y^2*z+12.0031968*x^2*y-12.0031968*y*z-2.289346823+9.79449408*x^3",
+  /* 2 Spheres        */  "(40000*x^2-52400*x+48853+40000*y^2-52400*y+40000*z^2-52400*z)*(4000*x^2-2800*x+1207+4000*y^2-2800*y+4000*z^2-2800*z)",
+  /* 2 Torii          */  "-6.929911075*x -6.559601218*z -40.61779736*z^3 +56.91300912*z^4 -17.17986918*y^7 +4.294967296*y^8 -55.95084095*z^5 +38.69346103*z^6 +38.69346103*x^6 +4.294967296*z^8 -17.17986918*x^7 +37.0828483*y^6 +4.294967296*x^8 -17.17986918*z^7 +20.40667127*z^2 -51.53960755*y^3*z^4 -89.2368375*x^4*y -41.69153918*x^3 +51.53960755*x*z^5 -51.11900275*y^5 -51.53960755*x^2*z^5 -51.53960755*y^5*z^2 +92.57432908*x^3*y +87.74249087*y^3*z -5.938337301*y +17.84876088*y^2 -35.13389168*y^3 +1.174097113 -51.53960755*y^2*z^5 +51.53960755*x^5*y -62.4313134*x*y^2 +50.14452444*y^4 +51.53960755*y^5*z -67.27041824*x^2*z -62.06100354*y*z^2 +114.4697704*y^2*z^4 +17.17986918*y^2*z^6 +88.81623269*y^3*x +112.8591576*y^4*z^2 +114.4697704*x^4*y^2 -87.08935385*y^4*z +25.76980378*y^4*z^4 +103.0792151*x^3*z^3 +103.0792151*y^3*z^3 -87.08935385*y^4*x +112.8591576*y^4*x^2 +90.42684543*y*z^3 +51.53960755*y*z^5 +116.0803831*x^2*z^4 +17.17986918*x^2*z^6 -146.2614203*x^3*z^2 +94.72181273*x^3*z +25.76980378*x^4*z^4 -51.53960755*x^4*z^3 -88.16309567*y*z^4 +25.43751542*y*z -90.31057932*x*z^4 -90.31057932*x^4*z +116.0803831*x^4*z^2 -139.2820984*y^3*z^2 -17.17986918*y^6*z -140.3558402*y^3*x^2 +17.17986918*x^6*z^2 +94.72181273*x*z^3 +17.17986918*y^6*z^2 -143.0401948*x^3*y^2 -17.17986918*x^6*z -17.17986918*x*z^6 -51.53960755*x^3*z^4 +51.53960755*x^5*z -51.53960755*x^5*z^2 +103.0792151*x^3*y^3 +17.17986918*x^6*y^2 -17.17986918*x^6*y +51.53960755*y^5*x -17.17986918*y*z^6 -51.53960755*y^5*x^2 -17.17986918*y^6*x +17.17986918*y^6*x^2 +25.76980378*x^4*y^4 -143.0401948*y^2*z^3 -146.2614203*x^2*z^3 +26.71500605*x*y +28.49944647*x*z -67.27041824*x*z^2 +125.3614762*x^2*y^2 +123.7508635*y^2*z^2 -60.82070066*y^2*z +131.8111938*z^2*x^2 +21.31385204*x^2 +51.53960755*y^4*z*x +103.0792151*y^2*z^3*x +51.53960755*y^2*z^2*x^4 -51.53960755*y^4*z^2*x +103.0792151*y^3*z^2*x -103.0792151*y^2*z^2*x^3 -51.53960755*x^4*y^2*z +103.0792151*x^2*z^3*y -51.53960755*x^2*z^4*y +103.0792151*x^3*y^2*z -51.53960755*y^2*z^4*x +51.53960755*y^4*z^2*x^2 -103.0792151*y^3*z^2*x^2 +51.53960755*y^2*z^4*x^2 -103.0792151*y^2*z^3*x^2 +51.53960755*x*z^4*y +51.53960755*x^4*y*z -51.53960755*y^4*z*x^2 -103.0792151*x^3*y*z -51.53960755*x^4*y*z^2 +103.0792151*x^3*y*z^2 -103.0792151*x*z^3*y -103.0792151*y^3*z*x +103.0792151*y^3*z*x^2 +125.8603256*y*z^2*x -177.3999332*x^2*y*z^2 -177.3999332*x^2*z*y^2 +125.8603256*y^2*z*x -177.3999332*x*y^2*z^2 +228.9395407*y^2*z^2*x^2 -74.32071807*y*z*x +125.8603256*y*z*x^2 -64.41223599*x^2*y -51.53960755*x^5*y^2 +57.44988003*x^4 -55.95084095*x^5 -51.53960755*x^4*y^3 -51.53960755*x^3*y^4 -51.53960755*y^4*z^3",
+  /* Heart            */  "-697.347066*z-2684.277024*y*z^2-1347.168628*x-687.693448*y+926.747328*y^2*z^4+3706.989312*y^3*x+926.747328*y^4*z^2+3706.989312*x^4*y^2-926.747328*y^4*z-1853.494656*y^4*x+1853.494656*y^4*x^2+1972.308416*y*z^3+1853.494656*x^2*z^4-7413.978624*x^3*z^2+7413.978624*x^3*z-926.747328*y*z^4+1668.419376*y*z-1853.494656*x*z^4+7413.978624*x^3*y-3706.989312*x^4*z+3706.989312*x^4*z^2+1853.494656*y^3*z-1853.494656*y^3*z^2-3706.989312*y^3*x^2+3718.870688*x*z^3-7413.978624*x^3*y^2-3706.989312*x^4*y-1972.308416*y^2*z^3-3718.870688*x^2*z^3+195.187199+3706.989312*y*z^2*x-3706.989312*x^2*y*z^2-3706.989312*x^2*z*y^2+3706.989312*y^2*z*x-3706.989312*x*y^2*z^2+3706.989312*y^2*z^2*x^2-8788.562432*x^3+10572.59674*x^4-1888.224832*y^3-1920.898616*z^3+1716.401856*y^4+1716.401856*z^4-926.747328*z^5+308.915776*z^6-7413.978624*x^5+2471.326208*x^6-926.747328*y^5+308.915776*y^6+3158.618112*x*y+4505.78674*x^2+1477.347976*y^2+1511.506932*z^2-3706.989312*y*z*x-5012.112768*x*y^2+3706.989312*y*z*x^2+3167.529144*x*z-5029.934832*x*z^2-6874.518456*x^2*z+8719.10208*x^2*y^2+3611.024352*y^2*z^2-6865.607424*x^2*y-2595.166704*y^2*z+8736.924144*z^2*x^2",
+  /* Smile            */  "-12348*z-435632*y^3-27216*y*z^2-17834.8125*x-35974.25*y-327680*y^7+733184*y^6-891648*y^4*x+11664*y*z^3+972*x^3*z+21168*y*z+2304*y^3*z+8748*x*z^3+46656*x^6*y^2-58320*x^6*y+5162.816406-1100160*y^3*x^2+11664*y*z^2*x+5184*y^2*z*x-72987.75*x^3+95610.375*x^4-20412*z^3+6561*z^4+65536*y^8-89667*x^5+60507*x^6-26244*x^7+6561*x^8+41910.1875*x^2+23814*z^2+712044*x^2*y^2-257499*x^2*y-18144*y*z*x+3888*y*z*x^2-311040*x^4*y^3+174960*x^5*y-139968*x^5*y^2+622080*x^3*y^3+552960*y^5*x-552960*y^5*x^2-147456*y^6*x+1016064*y^4*x^2+789888*y^3*x+340632*x^3*y-957440*y^5-315900*x^4*y-408060*x*y^2-248832*x^3*y^4+147456*y^6*x^2+124416*x^4*y^4-660960*x^3*y^2+155243*y^2+797792*y^4+447120*x^4*y^2+120591*x*y+15876*x*z-20412*x*z^2-6804*x^2*z+7776*y^2*z^2-12096*y^2*z+4374*z^2*x^2",
+  /* Spheres in       */  "-(8*(4*x^2-4*x+3+4*y^2-4*y+4*z^2-4*z))*(-1+sqrt(4*x^2-4*x+3+4*y^2-4*y+4*z^2-4*z))",
+  /* Spheres dif      */  "-496*z-4416*y*z^2-560*x-560*y+6912*y^2*z^4+1024*y^2*z^6+9728*y^3*x+7296*y^4*z^2+13056*x^4*y^2-7680*y^4*z-6144*x^4*y^3+1536*y^4*z^4+6144*x^3*z^3+6144*y^3*z^3-9984*y^4*x+13056*y^4*x^2+5760*y*z^3+3072*y*z^5-3072*x^2*z^5+6912*x^2*z^4+1024*x^2*z^6-9472*x^3*z^2+6144*x^5*y-6144*x^5*y^2+7680*x^3*z+1536*x^4*z^4-3072*x^4*z^3-5376*y*z^4-3072*y^3*z^4+4608*y^4*z*x+6144*y^2*z^3*x+3072*y^2*z^2*x^4-3072*y^4*z^2*x+6144*y^3*z^2*x-6144*y^2*z^2*x^3-4608*x^4*y^2*z+6144*x^2*z^3*y-3072*x^2*z^4*y+9216*x^3*y^2*z-3072*y^2*z^4*x+3072*y^4*z^2*x^2-6144*y^3*z^2*x^2+3072*y^2*z^4*x^2-6144*y^2*z^3*x^2+3072*x*z^4*y+4608*x^4*y*z-4608*y^4*z*x^2-9216*x^3*y*z-3072*x^4*y*z^2+6144*x^3*y*z^2-6144*x*z^3*y-9216*y^3*z*x+9216*y^3*z*x^2+2112*y*z-5376*x*z^4+9728*x^3*y-7680*x^4*z+7296*x^4*z^2+7680*y^3*z-9472*y^3*z^2-1536*y^6*z-15872*y^3*x^2+1024*x^6*z^2+5760*x*z^3+1024*y^6*z^2-3072*y^4*z^3-15872*x^3*y^2-1536*x^6*z+3072*x*z^5-1024*x*z^6-3072*x^3*z^4+4608*x^5*z-3072*x^5*z^2+12288*x^3*y^3+2048*x^6*y^2-2048*x^6*y+6144*y^5*x-1024*y*z^6-6144*y^5*x^2+4608*y^5*z-3072*y^5*z^2-9984*x^4*y-2048*y^6*x-6144*x^3*y^4+2048*y^6*x^2+3072*x^4*y^4-8832*y^2*z^3-8832*x^2*z^3-3072*y^2*z^5+96+8448*y*z^2*x-11520*x^2*y*z^2-15360*x^2*z*y^2+10752*y^2*z*x-11520*x*y^2*z^2+14592*y^2*z^2*x^2-3776*x^3+5600*x^4-3776*y^3-2560*z^3+5600*y^4+3440*z^4-2048*y^7+512*y^8-3328*z^5+2304*z^6-5888*x^5+4352*x^6-5888*y^5+256*z^8-2048*x^7+4352*y^6+512*x^8-1024*z^7+2496*x*y+1808*x^2+1808*y^2+1392*z^2-6144*y*z*x-6336*x*y^2+10752*y*z*x^2+2112*x*z-4416*x*z^2-5184*x^2*z+13248*x^2*y^2+8640*y^2*z^2-6336*x^2*y-5184*y^2*z+8640*z^2*x^2",
+  /* Cross cap        */  ".4*sqrt(100*x-10)*x^2-0.08*sqrt(100*x-10)*x+0.008*sqrt(100*x-10)+.4*sqrt(100*x-10)*y^2-0.08*sqrt(100*x-10)*y+1.6*sqrt(100*x-10)*z^2-.8*sqrt(100*x-10)*z+.1*sqrt(100*y-10)*y^2-0.02*sqrt(100*y-10)*y+0.001*sqrt(100*y-10)+.4*sqrt(100*y-10)*z^2-.4*sqrt(100*y-10)*z",
+  /* Weird cube       */  "59136*z-10240*y^3-10240*x^3+59136*x+59136*y+204800*z^2*x^2+204800*y^2*z^2-23232+204800*x^2*y^2-102400*x^2*y-102400*x^2*z-297216*x*z+128000*z^2-512000*y*z*x^2+128000*x^2+1566720*y*z*x-102400*x*z^2-512000*y*z^2*x-512000*y^2*z*x-102400*z^3-297216*y*z+102400*y^3*x-102400*y*z^2+102400*x^3*z+102400*x^3*y-102400*x*y^2+128000*y^2+102400*y*z^3-297216*x*y+102400*y^3*z-102400*y^2*z+102400*x*z^3",
+  /* Klein bottle     */  "-244615.68*y^3-304335.36*x^3-96138.60864*y-786432*z^5-453427.2*y^3*z^2+1139015.68*z^4-139968*y^4*x-255052.8*y^3*x^2+248832*x^4*z^2-248832*x^4*z+33252.70426+46656*x^6+46656*y^6+1051729.92*y^2*z^2+493102.08*x^2*y^2+442368*x^2*z^4-497664*x^3*z^2-403046.4*y*z^4-442368*x*z^4-344176.128*x^2*y-705392.64*x^2*z+497664*y^2*z^2*x^2+480030.72*x*z-484761.6*y*z*x+555332.4032*z^2+453427.2*y*z*x^2+243162.3168*x^2-931184.64*x*z^2+453427.2*y*z^2*x+525312*y^2*z*x-991887.36*z^3+392220.672*y*z+255052.8*y^3*x-779599.872*y*z^2+525312*x^3*z+255052.8*x^3*y-127526.4*y^5-127526.4*x^4*y-366958.08*x*y^2-497664*x*y^2*z^2+262144*z^6-497664*x^2*z*y^2-453427.2*x^2*y*z^2+1106288.64*z^2*x^2-139968*x^5-279936*x^3*y^2-884736*x^2*z^3-120681.6768*x+196337.664*y^2-191443.7632*z+231206.4*y^4+261895.68*x^4-884736*y^2*z^3+806092.8*y*z^3+442368*y^2*z^4+248832*y^4*z^2+139968*x^4*y^2-248832*y^4*z+139968*y^4*x^2+232316.928*x*y+453427.2*y^3*z-623185.92*y^2*z+933888*x*z^3",
+  /* Steiner's roman  */  "0.03125*y^2+.125*y*z*x-0.00390625-0.0625*y^2*z-0.0625*y*z^2+0.03125*z^2-0.0625*x^2*z+0.03125*x^2+0.0625*x^2*y^2+0.0625*z^2*x^2+0.0625*y^2*z^2-0.0625*x^2*y-0.0625*x*y^2-0.0625*x*z^2",
+  /* Hunt's surface   */  "-321408*y-559872*z^5+1446336*z^4+933120*z^2*x^2-1990656*y^2*z^3+559872*x^4*z^2+1990656*y*z^2*x-559872*x^4*z-1990656*x^3*y^2-3538944*y^3*x^2+1119744*x*z^3-3538944*y^3*z^2-1959552*z^3-1469664*x^3+37719-1119744*x^3*z^2+1119744*x^3*z-1658880*y*z^2-1769472*y^4*z+1990656*y*z^3+1990656*x^3*y+3538944*y^3*z+3428352*y^2*z^2+1534464*x*y+186624*x^6+559872*x^2*z^4-995328*y*z^4-559872*x*z^4-373248*x^2*z-186624*x*z-3334144*y^3+4288512*y^4+1201392*x^4+1990656*y^2*z*x-1990656*x*y^2*z^2+3538944*y^3*x+1769472*y^4*z^2+1769472*y^4*x^2-1769472*y^4*x+1990656*y*z*x^2+802872*x^2-1990656*y*z*x-3303936*x*y^2-2433024*y^2*z-373248*x*z^2+663552*y*z-995328*x^4*y+4299264*x^2*y^2+1990656*y^2*z^2*x^2+186624*z^6-559872*x^5-3145728*y^5+1048576*y^6-2529792*x^2*y-161352*x-229392*z-1990656*x^2*y*z^2-1990656*x^2*z*y^2+1115856*z^2+995328*y^2*z^4+995328*x^4*y^2-1119744*x^2*z^3+1464192*y^2",
+  /* Cayley cubic     */  "264-512*z-512*x-512*y+320*y^2-320*x^2*y-320*x^2*z-320*x*y^2+672*x*y-320*x*z^2+672*x*z-320*y^2*z-320*y*z^2+672*y*z+320*z^2+320*x^2",
+  /* Clebsch cubic    */  "8154-15300*z-15300*x-15300*y+4176*y^2+4176*z^2+24480*x*y+24480*y*z+5184*x^3-12096*x*y^2-12096*y^2*z-12096*x*z^2-12096*y*z^2+24480*x*z-12096*x^2*y-12096*x^2*z+4176*x^2+3456*y*z*x+5184*z^3+5184*y^3",
+  /* Barth sextic     */  "-2846.637681*z-75426.87093*y*z^2-2846.637681*x-2846.637681*y+224595.2132*y^3*z^2+42893.86887*y^2*z^4+85787.73774*y^3*x-42893.86887*y^4*x+42893.86887*y^4*x^2+85787.73774*y*z^3-85787.73774*x^3*z^2+85787.73774*x^3*z-42893.86887*y*z^4+32533.00206*y*z-42893.86887*x^4*z+42893.86887*x^4*z^2-85787.73774*y^3*x^2-85787.73774*y^2*z^3+571.8691769+36870.73567*x^3-18435.36784*x^4+36870.73567*y^3+36870.73567*z^3-18435.36784*y^4-18435.36784*z^4+32533.00206*x*y-15588.73016*x^2-15588.73016*y^2-15588.73016*z^2-112297.6066*x^2*z^4+112297.6066*x*z^4+277614.9509*y^2*z^2*x^2-75426.87093*x*y^2-277614.9509*y*z*x+277614.9509*y*z*x^2+277614.9509*y*z^2*x+277614.9509*y^2*z*x-224595.2132*x^3*y+112297.6066*x^4*y-277614.9509*x*y^2*z^2-277614.9509*x^2*z*y^2-277614.9509*x^2*y*z^2+224595.2132*x^3*y^2+224595.2132*x^2*z^3-112297.6066*y^4*z^2-112297.6066*x^4*y^2+112297.6066*y^4*z+32533.00206*x*z+79764.60454*x*z^2-75426.87093*x^2*z-36870.73567*x^2*y^2-36870.73567*y^2*z^2-224595.2132*y^3*z-224595.2132*x*z^3+79764.60454*x^2*y+79764.60454*y^2*z-36870.73567*z^2*x^2",
+  /* Barth decic      */  "25.33143961*y^2*z^2*x^4 +25.15700632*y^4*z^2*x -34.82908387*y^2*z^4 +8.917960033*y^4*z^2 +0.04360832264*y^4*z^4 +16.49570037*y^4*z +8.917960033*x^4*y^2 -42.37063678*x^4*y^3 -34.82908387*y^4*x^2 +2.299854983*y^7*z^2 +25.37005208*x^4*y^5 +33.65896395*x^6*y^2*z -100.9768918*x^3*y^2*z^4 +1.198101193*x^3 +246.5161156*y^2*z^2*x^2 +25.36672152*x^3*y^4 +6.515326172*y^6*x^2 +44.38789864*y^2*z*x +6.273208191*y^5*z^2 +0.05111641659 +201.9537837*x^2*z^3*y^3 -8.109285345*x^3*z^2 +117.9808071*y^2*z^3*x +0.8487421525*x^8 -8.109285345*y^3*x^2 +6.515326172*x^6*z^2 +33.83339724*x^3*y^3 +50.48844592*x^4*y^2*z^4 -33.65896395*y^6*z*x +100.9768918*x^5*y*z +6.273208191*x^2*z^5 +100.9768918*x^4*y^3*z -201.9537837*x^3*y*z^3 -4.774233544*x^2*z^6 -21.54557109*x^5*y -3.716625642*x^3*z +6.273208191*x^5*y^2 +0.04360832264*x^4*z^4 -100.9768918*x^2*z^3*y^4 +33.65896395*y^2*z^6*x +16.49570037*x*z^4 +16.49570037*x^4*y -120.2077842*x^2*y*z^2 +9.865021177*x*z^6 -42.37063678*x^3*z^4 -3.39496861*x^7 -15.2723629*x^4*z^5 -2.299854983*x*z^7 +25.15700632*x^2*z^4*y +117.9808071*x^3*y^2*z +25.15700632*y^2*z^4*x +50.48844592*x^2*z^4*y^4 -25.60810291*x^3*y^2 -14.9720102*x^6*z -100.9768918*x^5*y^2*z -100.9768918*x^2*z^4*y^3 +6.515326172*y^2*z^6 -3.716625642*y^3*x -5.046246117*y*z^2 -100.9768918*x^4*y^3*z^2 -50.48844592*y^4*z^4*x +100.9768918*x^3*y^4*z +2.299854983*x^7*y^2 -3.940860141*y^8*x +5.090787632*y^6*z^4 -15.2723629*x^5*y^4 +0.8487421525*y^8 +2.299854983*x^2*z^7 -0.5749637458*x^2*z^8 -75.64545224*y^4*z*x -100.9768918*y^5*z*x^2 -50.48844592*x^4*y*z^4 +25.33143961*y^4*z^2*x^2 +1.198101193*z^3 +100.9768918*y^5*z*x +0.9611245006*y^5 -120.2077842*x^2*z*y^2 +3.940860141*y^2*z^8 -10.18157526*x^6*y^3 -8.456684027*x^4*y^6 +201.9537837*x^3*y^2*z^3 -100.9768918*x^2*z^5*y +19.60032929*y*z^4 -15.76344056*x^7*z^2 -3.940860141*x^8*z +0.2347202588*x^3*y +19.60032929*x^4*z +9.865021177*y^6*z -19.05645904*y*z*x -10.25601137*x^5*z +9.865021177*x^6*y +0.4659238756*x^2 -0.3389589536*x -0.3389589536*y +1.198101193*y^3 -3.380386036*y^4 -3.380386036*x^4 -8.109285345*y^2*z^3 -25.60810291*x^2*z^3 -4.774233544*x^6*y^2 +117.9808071*y^3*z^2*x -218.9576989*y^2*z^2*x^3 +25.15700632*x^4*y^2*z +117.9808071*x^2*z^3*y +100.9768918*x^2*z^5*y^2 +33.65896395*y^6*z*x^2 -33.65896395*x^6*y*z +100.9768918*y^4*z^3*x -50.48844592*x^4*y^4*z -50.74010416*x^3*y^5 -3.39496861*y^7 -5.892963096*x*z^2 -5.046246117*x^2*z -100.9768918*y^5*z^2*x -100.9768918*y^2*z^5*x -21.54557109*y^5*z +0.9611245006*z^5 +18.5125231*z^2*x^2 +25.15700632*x^4*y*z^2 -17.00391526*x^3*y*z -33.65896395*x*z^6*y +100.9768918*y^3*z^4*x +5.090787632*x^4*z^6 -34.82908387*x^4*z^2 +2.567983615*x*z +100.9768918*x^3*y*z^4 +3.940860141*x^8*z^2 -8.456684027*x^6*z^4 +16.91336805*y^3*z^6 +30.54472579*y^5*z^3 -15.76344056*y^7*x^2 +15.76344056*y^7*x +30.54472579*x^3*z^5 +25.37005208*x^5*z^4 +25.37005208*y^4*z^5 -10.18157526*y^6*z^3 +33.65896395*x^2*z^6*y -100.9768918*x^4*y^2*z^3 -15.2723629*y^5*z^4 -50.74010416*y^3*z^5 -100.9768918*x^3*y^4*z^2 +50.48844592*x^4*y^4*z^2 -201.9537837*x^3*y^3*z +0.5749637458*y^8*z -0.5749637458*y^8*z^2 +35.62606345*y^5*x^2 -100.9768918*x^5*y*z^2 +3.640421878*z^6 +0.9611245006*x^5 -21.54557109*x*z^5 +0.4659238756*y^2 -33.65896395*x^6*y^2*z^2 -33.65896395*y^6*z^2*x^2 +0.5749637458*x^8*y -0.5749637458*x^8*y^2 +0.2347202588*x*z^3 +3.640421878*x^6 +25.36672152*x^4*z^3 +25.36672152*y^3*z^4 +0.4659238756*z^2 -0.3389589536*z -120.2077842*x*y^2*z^2 +100.9768918*x*z^5*y +30.54472579*x^5*y^3 +16.91336805*x^6*z^3 -33.65896395*x^2*z^6*y^2 +33.65896395*x^6*y*z^2 +201.9537837*x^3*y^3*z^2 +2.567983615*x*y +18.5125231*x^2*y^2 -15.76344056*y^2*z^7 +5.090787632*x^6*y^4 -3.940860141*y*z^8 +100.9768918*y^5*z^2*x^2 +0.04360832264*x^4*y^4 +35.62606345*x^5*z^2 +117.9808071*x^3*y*z^2 -17.00391526*x*z^3*y +35.62606345*y^2*z^5 -4.774233544*y^6*z^2 -42.37063678*y^4*z^3 +0.5749637458*x*z^8 +3.940860141*y^8*x^2 -2.299854983*x^7*y -3.380386036*z^4 +0.2347202588*y^3*z -25.60810291*y^3*z^2 +16.91336805*x^3*y^6 +3.640421878*y^6 +33.83339724*x^3*z^3 +33.83339724*y^3*z^3 +19.60032929*y^4*x +8.917960033*x^2*z^4 -10.25601137*y*z^5 -3.716625642*y*z^3 -5.892963096*y^2*z -5.892963096*x^2*y +33.65896395*y^6*z^2*x +100.9768918*x^5*y^2*z^2 +44.38789864*y*z*x^2 +44.38789864*y*z^2*x -3.39496861*z^7 -10.18157526*x^3*z^6 +100.9768918*x^4*y*z^3 -5.046246117*x*y^2 -10.25601137*y^5*x -14.9720102*y*z^6 +15.76344056*y*z^7 +0.8487421525*z^8 -75.64545224*x*z^4*y -75.64545224*x^4*y*z +25.15700632*y^4*z*x^2 +18.5125231*y^2*z^2 -14.9720102*y^6*x -8.456684027*y^4*z^6 +2.567983615*y*z +15.76344056*x^7*z -218.9576989*y^3*z^2*x^2 +25.33143961*y^2*z^4*x^2 -218.9576989*y^2*z^3*x^2 -17.00391526*y^3*z*x +117.9808071*y^3*z*x^2 -201.9537837*y^3*z^3*x -50.74010416*x^5*z^3 -2.299854983*y^7*z",
+  /* Steiner relative */  "2-8*y*z*x-2*z-2*x-10*y+8*y^2-16*x*y^2-16*x^2*y+16*x^2*y^2+20*x*y-16*z^2*x^2+16*x^2*z+16*x*z^2+20*y*z-16*y*z^2-16*y^2*z+16*y^2*z^2-12*x*z",
+  /* Mitre            */  "4-8*z-16*x-12*y+28*y^2-16*x*y^2-16*x^2*y+16*x^2*y^2+16*x*y+16*z^2*x^2-16*x^2*z-16*x*z^2+16*y*z-16*y*z^2-16*y^2*z+16*y^2*z^2+16*x*z+8*z^2+16*y^4+16*x^4-32*x^3+32*x^2-32*y^3",
+  /* Glob tear        */  "16*x^5-32*x^4+24*x^3-8*x^2+x-2-4*y^2+4*y-4*z^2+4*z",
+  /* Piri tear        */  "x^4-1*x^3+y^2-1*y+.5+z^2-1*z",
+  /* Gumdrop torus    */  "-1792*z-2048*y*z^2-2368*x-1792*y+2048*y*z-2048*x^3+1024*x^4-2048*y^3-2048*z^3+1024*y^4+1024*z^4+4352*x*y+3392*x^2+2816*y^2+2816*z^2+641-4352*x*y^2+4352*x*z-4352*x*z^2-4352*x^2*z+4352*x^2*y^2+2048*y^2*z^2-4352*x^2*y-2048*y^2*z+4352*z^2*x^2",
+  /* Bretzel          */  "-1*z-4.5*x-2.53125*y+7.59375*y^2-18*x*y^2+18*x*y+72*x^4*y^2-72*x^4*y-144*x^3*y^2+144*x^3*y+z^2+5.0625*y^4+674*x^4+.55640625-196*x^3+38.5*x^2-1408*x^5+256*x^8-1024*x^7+1664*x^6+90*x^2*y^2-90*x^2*y-10.125*y^3",
+  /* Blob             */  "9*x^2-8.1*x+4.895+9*y^2-8.1*y+9*z^2-9*z+sin(12*x-5.4)+sin(12*y-5.4)+sin(12*z-6)",
+  /* Bifolia          */  "4-16*z-16*x+4*y^2+8*x^2*y^2+32*z^2*x^2-32*x^2*z-8*x*y^2-32*x*z^2+32*x*z+8*y^2*z^2-8*y^2*z+32*z^2+y^4+16*z^4+16*x^4-32*x^3+32*x^2-32*z^3-12*x^2*y+12*x*y-6*y-12*y*z^2+12*y*z",
+  /* Lemniscate       */  "16*x^4-32*x^3+20*x^2-4*x+2+4*y^2-4*y+4*z^2-4*z",
+  /* Planes           */  "x*y",
+  /* Cylinders        */  "((4*x-2)^2+(4*y-2)^2)^4+((4*x-2)^2+(4*z-2)^2)^4-((4*x-2)^2+(4*y-2)^2)^4*((4*x-2)^2+(4*z-2)^2)^4",
+  /* Torus            */  "(1.4-sqrt((6*x-3)^2+(6*y-3)^2))^2+(6*z-3)^2-1.44"
+} ;
diff --git a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/leaf_octree.cpp b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/leaf_octree.cpp
new file mode 100644
index 0000000000..179975cf47
--- /dev/null
+++ b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/leaf_octree.cpp
@@ -0,0 +1,1120 @@
+/**
+ * \file    leaf_octree.cpp
+ * \author  Thomas Lewiner   <tomlew@puc-rio.br>
+ * \author  Matmidia Lab, Math Dept, PUC-Rio
+ * \date    10/01/2010
+ *
+ *  Octree structure without intermediate nodes, hashtable and optimized operations
+ */
+//_____________________________________________________________________________
+
+
+#ifndef WIN32
+#pragma implementation
+#endif // WIN32
+
+
+#include <stack>
+#include "leaf_octree.h"
+
+#ifdef HASH_HAS_ERASE
+
+//_____________________________________________________________________________
+// Create the root
+void LeafOctree::init()
+//-----------------------------------------------------------------------------
+{
+  _max_field = R_INV ;
+  _opt_level = L_INV ;
+  memset( _level_dist, 0, (MAX_LEVEL+1)*sizeof(uint) ) ;
+
+  HashField::KeyData kd ;
+  kd.data = 0.0 ;
+  kd.key  =  1  ;
+  _hash.insert( kd ) ;
+
+  _level_dist[0] = 1 ;
+}
+//_____________________________________________________________________________
+
+
+
+
+//_____________________________________________________________________________
+/// Compute the optimal level
+void LeafOctree::compute_opt_level()
+//-----------------------------------------------------------------------------
+{
+  Level left     = 0 ;
+  Level right    = MAX_LEVEL ;
+  uint  leftsum  =  0 ;
+  uint  rightsum =  0 ;
+  while( left < right )
+  {
+    uint leftsum_old = leftsum ;
+    if( leftsum <= rightsum )
+    {
+      leftsum += _level_dist[ left ] ;
+      ++left ;
+    }
+    if( leftsum_old >= rightsum )
+    {
+      rightsum += _level_dist[ right ] ;
+      --right ;
+    }
+  }  
+  _opt_level = right ;
+}
+//_____________________________________________________________________________
+
+
+//_____________________________________________________________________________
+// Check that each point scan or scribble is in the right node
+bool LeafOctree::check ()
+//-----------------------------------------------------------------------------
+{  
+  bool result = true ;
+
+  uint level_dist[MAX_LEVEL+1] ;
+  memset( level_dist, 0, (MAX_LEVEL+1)*sizeof(uint) ) ;
+  for( leaf_iterator it = leaves_begin() ; it() ; ++it )
+  {
+    Key k  = it.key() ;
+    level_dist[ key_level(k) ] ++ ;
+
+    Key ks = k << 3 ;
+    HashField::KeyData kd ;
+    for( int i = 0 ; i < 8 ; ++i )
+    {
+      if( node_exists( ks|i, kd ) )
+        printf("(leaf) Invalid leaf %d: has son %d\n", (int)k, (int)ks|i ) ;
+    }
+
+    if( node_exists( k>>3, kd ) )
+      printf("(leaf) Invalid leaf %d: has father %d\n", (int)k, (int)k>>3 ) ;
+  }
+
+  for( Level lv = 0 ; lv <= MAX_LEVEL ; ++lv )
+  {
+    if( _level_dist[lv] != level_dist[lv] )
+    {
+      printf("(leaf) Invalid level statistic %d: %d != %d\n", (int)lv, (int)_level_dist[lv], (int)level_dist[lv] ) ;
+      result = false ;
+    }
+  }
+
+  return result ;
+}
+//_____________________________________________________________________________
+
+
+
+
+//_____________________________________________________________________________
+// Deletes the content of the octree
+void LeafOctree::clear_octree()
+//-----------------------------------------------------------------------------
+{
+  _hash.reset() ;
+  _verts.reset() ;
+  _max_field = R_INV ;
+  _opt_level = L_INV ;
+  memset( _level_dist, 0, (MAX_LEVEL+1)*sizeof(uint) ) ;
+}
+//_____________________________________________________________________________
+
+
+
+
+
+//_____________________________________________________________________________
+// set the values of each leaf from the implicit function
+bool LeafOctree::set_impl( data_access *ref )
+//-----------------------------------------------------------------------------
+{
+  if( !ref ) return false ;
+  
+  _max_field = -FLT_MAX ;
+  for( leaf_iterator it = leaves_begin() ; it() ; ++it )
+  {
+    real v = (*ref).value_at( it.top() ) ;
+    *it = v ;
+    v = fabs(v) ;
+    if( _max_field < v ) _max_field = v ;
+  }
+  
+//  printf( "max field: %f\n", max_field() ) ;
+  return true ;
+}
+//_____________________________________________________________________________
+
+
+
+
+
+//_____________________________________________________________________________
+// Refine the octree according to the data access
+bool LeafOctree::refine( data_access *ref /*= NULL*/ )
+//-----------------------------------------------------------------------------
+{
+  if( !ref ) return false ;
+
+    clear() ;  init() ;
+
+  // traversal stack: iterator has a pre-ordered stack, and cannot be recursed on
+  geom_cell it = geom_root() ; // the only cell
+  std::stack< geom_cell > s ;
+  s.push( it ) ;
+  
+  // although it may refine only the leaves
+  // the leaf iterator may change during the refinement
+  bool refined = false ;
+  while( !s.empty() )
+  {
+    it = s.top() ;  s.pop() ;
+
+    // test for subdivision
+    if( !(*ref).need_refine( it ) ) continue ;
+    refined = true ;
+    
+    //_____________________________________________________________________________
+    // subdivides the cell in the tree
+    _hash.erase( it.key() ) ;
+
+    HashField::KeyData kd ;
+    kd.data = 0.0 ;
+
+    // recurse on the traversal
+    Key sk = it.key() << 3 ;
+    for( int i = 0 ; i < 8 ; ++i )
+    {
+      kd.key = sk | i ;
+      if( !_hash.insert( kd ) )
+      {
+        printf( "hash table saturated!\n" ) ;
+        exit(1) ;
+        return false ;
+      }
+      
+      s.push( geom_cell( kd.key, kd.data ) ) ;
+    }
+    
+    Level lv = it.lv() ;
+    _level_dist[ lv ] -= 1 ;
+    _level_dist[lv+1] += 8 ;
+  }
+  
+  compute_opt_level() ;
+  return refined ;
+}
+//_____________________________________________________________________________
+
+
+
+//_____________________________________________________________________________
+// Refine the octree according to the data access
+bool LeafOctree::adapt( data_access *ref /*= NULL*/ )
+//-----------------------------------------------------------------------------
+{
+  if( !ref ) return false ;
+
+    
+  // need to go for a stack structure
+  // this is horribly heavy, but the adaptation destroys the leaf iterator!
+  std::stack< geom_cell > s ;
+  for( leaf_iterator it = leaves_begin() ; it() ; ++it )
+    s.push( it.top() ) ;
+
+  
+  bool refined = false ;
+  while( !s.empty() )
+  {
+    geom_cell it = s.top() ;
+    s.pop() ;
+      
+    HashField::KeyData kd ;
+    if( !node_exists( it.key(), kd ) ) continue ;
+
+      // try to refine
+    std::stack< geom_cell > ref_s ;
+    ref_s.push( it ) ;
+    
+    bool it_refined = false ;
+    while( !ref_s.empty() )
+    {
+      geom_cell r_it = ref_s.top() ;  ref_s.pop() ;
+      
+      // test for subdivision
+      if( !(*ref).need_refine( r_it ) ) continue ;
+      refined = it_refined = true ;
+      
+      // subdivides the cell in the tree
+      _hash.erase( r_it.key() ) ;
+      
+      kd.data = 0.0 ;
+      
+      // recurse on the traversal
+      Key sk = r_it.key() << 3 ;
+      for( int i = 0 ; i < 8 ; ++i )
+      {
+        kd.key = sk | i ;
+        if( !_hash.insert( kd ) )
+        {
+          printf( "hash table saturated!\n" ) ;
+          exit(1) ;
+          return false ;
+        }
+        
+        ref_s.push( geom_cell( kd.key, kd.data ) ) ;
+      }
+      
+      Level lv = r_it.lv() ;
+      _level_dist[ lv ] -= 1 ;
+      _level_dist[lv+1] += 8 ;
+    }
+    if( it_refined ) continue ;
+
+    
+    // no need refine the current leaf: check parent
+    geom_cell father( it.key() >> 3, 0.0 ) ;
+    if( (*ref).need_refine( father ) ) continue ; // need to refine father = no need to simplify: OK!
+    
+    // need to simplify? check on brothers and nephews
+    std::stack< Key > nephews_s;
+    Key fk = father.key() << 3 ;
+    for( int i = 0 ; i < 8 ; ++i )
+    {
+      if( (fk | i) == it.key() ) continue ;
+      nephews_s.push( fk|i ) ;
+    }
+    std::stack< std::pair<Key,Level> > nephews_keys ;
+    bool keep_refined = false ;
+    while( !nephews_s.empty() )
+    {
+      Key n_it = nephews_s.top() ;  nephews_s.pop() ;
+
+      if( !node_exists( n_it, kd ) )
+      {
+        // look down for nephews
+        fk = n_it << 3 ;
+        for( int i = 0 ; i < 8 ; ++i )
+          nephews_s.push( fk|i ) ;
+        continue ;
+      }
+      
+      geom_cell g_it = geom_key( n_it ) ;
+      nephews_keys.push( std::make_pair(n_it,g_it.lv()) ) ;
+      if( (*ref).need_refine( g_it ) )
+      {
+        keep_refined = true ;
+        break ;
+      }
+    }
+    
+    if( keep_refined ) continue ;
+    refined = true ;
+    
+    // delete cell, brothers, nephews
+    nephews_keys.push( std::make_pair(it.key(),it.lv()) ) ;
+    while( !nephews_keys.empty() )
+    {
+      _hash.erase( nephews_keys.top().first  ) ;
+      _level_dist[ nephews_keys.top().second ] -= 1 ;
+      nephews_keys.pop() ;
+    }
+    
+    // recurse on father
+    kd.key = father.key() ;
+    kd.data = 0.0 ;
+    _hash.insert( kd ) ;
+    _level_dist[ father.lv() ] += 1 ;
+    s.push( father ) ;
+  }
+
+  compute_opt_level() ;
+  return refined ;
+}
+//_____________________________________________________________________________
+
+
+
+
+
+//_____________________________________________________________________________
+// Draw the octree with wireframe
+bool LeafOctree::draw_wire()
+//-----------------------------------------------------------------------------
+{
+  for( leaf_iterator it = leaves_begin() ; it() ; ++it )
+    it.draw_wire() ;
+  
+  return true ;
+}
+//_____________________________________________________________________________
+
+
+
+
+
+//_____________________________________________________________________________
+// Draw the octree with dots
+bool LeafOctree::draw_centers()
+//-----------------------------------------------------------------------------
+{
+  for( leaf_iterator it = leaves_begin() ; it() ; ++it )
+  {
+    ::glTexCoord1f( (GLfloat)fabs(*it / max_field()) ) ;
+    it.top().draw() ;
+  }
+  
+  return true ;
+}
+//_____________________________________________________________________________
+
+
+
+//_____________________________________________________________________________
+// Compute primal vertices
+bool LeafOctree::compute_primal_verts()
+//-----------------------------------------------------------------------------
+{
+    
+  // add all the inner vertices
+  for( leaf_iterator l_it = leaves_begin() ; l_it() ; ++l_it )
+  {
+    Key verts_k[8] ;
+    Level lv = vertices_keys( l_it.key(), verts_k ) ;
+    
+    HashVerts::KeyData kd ;
+    kd.data = lv ;
+    Key *v_ptr = verts_k ;
+    for( int i = 0 ; i < 8 ; ++i, ++v_ptr )
+    {
+      kd.key = *v_ptr ;
+      if( kd.key == KEY_INV ) continue ;
+      
+      HashVerts::KeyData &hk = _verts[ kd.key ] ;
+      if( hk.key == KEY_INV )
+        _verts.insert( kd ) ;
+      else if( hk.data < kd.data )
+        hk.data = kd.data ;
+    }
+  }
+
+  return true ;
+}
+//_____________________________________________________________________________
+
+
+
+//_____________________________________________________________________________
+// Octree dual caller
+bool LeafOctree::dual_cubes_walk( leaf_dual_walker &walker )
+//-----------------------------------------------------------------------------
+{
+  bool result = compute_primal_verts() ;
+
+  for( HashVerts::const_iterator v_it = _verts.cbegin() ; v_it() ; ++v_it )
+  {
+    const Level lv = *v_it ;
+    Key dual_verts[8] ;
+    dual_vertices_keys( v_it.key(), lv, dual_verts ) ;
+    
+    Key *dv_ptr = dual_verts ;
+    for( int i = 0 ; i < 8 ; ++i, ++dv_ptr )
+    {
+      // find_at, only the level too high case
+      Key &ki = *dv_ptr ;
+      HashField::KeyData kd ;
+      while( ki != 0 && !node_exists(ki,kd) )
+        ki >>= 3;
+    }
+    result &= walker( *this, dual_verts ) ;
+  }
+  
+  return result ;
+}
+//_____________________________________________________________________________
+
+
+
+
+//_____________________________________________________________________________
+// Isosurface walker
+bool leaf_isosurface_walker( LeafOctree &fo, Key *keys )
+//-----------------------------------------------------------------------------
+{
+  MarchingCubes &mc = fo.mc() ;
+  
+  /** isovalues at the cube vertices */
+  real            *cube    = mc.cube() ;
+  /** geometry of the cube */
+  Point           *space   = mc.space() ;
+  /** indexes of the cube */
+  Key             *indexes = mc.indexes() ;
+  
+  for( int j = 0 ; j < 8 ; ++j )
+  {
+    int i = (j==2)?3:(j==3)?2:(j==7)?6:(j==6)?7:j ;
+    const Key k = keys[j] ;
+    LeafOctree::geom_cell c = fo.geom_key(k) ;
+    cube[i] = *c ;
+    
+    space[i] = (Point)c ;
+    indexes[i] = k ;
+  }
+  
+  mc.tesselate_cube( 0.0 ) ;
+  
+  return true ;
+}
+//_____________________________________________________________________________
+
+
+
+
+//_____________________________________________________________________________
+// Build the isosurface using dual marching cubes
+bool LeafOctree::build_isosurface( data_access *ref )
+//-----------------------------------------------------------------------------
+{
+  if( !ref ) return false ;
+  _mc.dat_access() = ref ;
+  _verts.reset() ;
+  
+  
+    printf( "Build isosurface... " ) ;
+  bool result = false ;
+  
+  //_________________________________________________________________________
+  // Dual Marching Cubes
+  
+  _mc.init_all() ; 
+  
+  result = dual_cubes_walk( leaf_isosurface_walker ) ;
+  
+  _mc.clean_temps() ;
+  
+  printf( "generated %d vertices and %d faces!\n", _mc.nverts(), _mc.ntrigs() ) ;
+  
+  return result ;
+}
+//_____________________________________________________________________________
+
+
+
+
+
+//_____________________________________________________________________________
+// Isosurface drawing walker
+bool leaf_direct_isosurface_walker( LeafOctree &fo, Key *keys )
+//-----------------------------------------------------------------------------
+{
+  MC_Draw &mc = fo.mc_draw() ;
+  
+  /** isovalues at the cube vertices */
+  real            *cube    = mc.cube() ;
+  /** geometry of the cube */
+  Point           *space   = mc.space() ;
+  
+  for( int j = 0 ; j < 8 ; ++j )
+  {
+    int i = (j==2)?3:(j==3)?2:(j==7)?6:(j==6)?7:j ;
+    const LeafOctree::geom_cell c = fo.geom_key( keys[j] ) ;
+    cube[i] = *c ;
+    
+    space[i] = (Point)c ;
+  }
+  
+  mc.tesselate_cube( 0.0 ) ;
+  
+  return true ;
+}
+//_____________________________________________________________________________
+
+
+
+//_____________________________________________________________________________
+// Build the isosurface using dual marching cubes
+bool LeafOctree::direct_draw_isosurface( data_access *ref )
+//-----------------------------------------------------------------------------
+{
+  if( !ref ) return false ;
+  _mc_draw.dat_access() = ref ;
+  _verts.reset() ;
+  
+  
+    bool result = false ;
+  
+  // Dual Marching Cubes
+  ::glBegin( GL_TRIANGLES ) ;
+  {
+    result = dual_cubes_walk( leaf_direct_isosurface_walker ) ;
+  }
+  ::glEnd() ; // GL_TRIANGLES
+  
+  return result ;
+}
+//_____________________________________________________________________________
+
+
+
+
+
+
+//_____________________________________________________________________________
+// Draw walker
+bool leaf_draw_walker( LeafOctree &fo, Key *keys )
+//-----------------------------------------------------------------------------
+{
+  Cube cells[8] ;
+  for( int i = 0 ; i < 8 ; ++i )
+    cells[i] = key2cube( keys[i] ) ;
+  
+  ((Point)cells[0]).draw() ;
+  ((Point)cells[1]).draw() ;
+  
+  ((Point)cells[1]).draw() ;
+  ((Point)cells[3]).draw() ;
+  
+  ((Point)cells[3]).draw() ;
+  ((Point)cells[2]).draw() ;
+  
+  ((Point)cells[2]).draw() ;
+  ((Point)cells[0]).draw() ;
+  
+  ((Point)cells[4]).draw() ;
+  ((Point)cells[5]).draw() ;
+  
+  ((Point)cells[5]).draw() ;
+  ((Point)cells[7]).draw() ;
+  
+  ((Point)cells[7]).draw() ;
+  ((Point)cells[6]).draw() ;
+  
+  ((Point)cells[6]).draw() ;
+  ((Point)cells[4]).draw() ;
+  
+  ((Point)cells[0]).draw() ;
+  ((Point)cells[4]).draw() ;
+  
+  ((Point)cells[1]).draw() ;
+  ((Point)cells[5]).draw() ;
+  
+  ((Point)cells[2]).draw() ;
+  ((Point)cells[6]).draw() ;
+  
+  ((Point)cells[3]).draw() ;
+  ((Point)cells[7]).draw() ;
+  
+  return true ;
+}
+//_____________________________________________________________________________
+
+
+
+
+//_____________________________________________________________________________
+// Draw the dual octree with wireframe
+bool LeafOctree::draw_dual()
+//-----------------------------------------------------------------------------
+{
+  _verts.reset() ;
+  
+  ::glBegin( GL_LINES ) ;
+  bool result = dual_cubes_walk( leaf_draw_walker ) ;
+  ::glEnd() ;  // GL_LINES
+  
+  return result ;
+}
+//_____________________________________________________________________________
+
+
+
+
+//_____________________________________________________________________________
+// Do nothing walker, just for dual generation timing
+bool leaf_timing_walker( LeafOctree &fo, Key *keys )
+//-----------------------------------------------------------------------------
+{
+  return true ;
+}
+//_____________________________________________________________________________
+
+
+//_____________________________________________________________________________
+// Do nothing, just for dual generation timing
+bool LeafOctree::dual_timing()
+//-----------------------------------------------------------------------------
+{
+  _verts.reset() ;
+  
+    return dual_cubes_walk( leaf_timing_walker ) ;
+}
+//_____________________________________________________________________________
+
+
+
+
+
+//_____________________________________________________________________________
+// Prints statistics about the octree
+void LeafOctree::stats() const
+//-----------------------------------------------------------------------------
+{
+  int s = _hash.size() ;
+  printf( " number of nodes:\t%d\n", s ) ;
+#if USE_HASH_PTR
+  printf( " total memory:\t%d\n", (int) ( s * sizeof(HashField::KeyBucket) ) ) ;
+  _hash.stats() ;
+#else  // USE_HASH_PTR 
+  printf( " total memory:\t%d\n", (int) ( s * sizeof(HashField::KeyData  ) ) ) ;
+#endif // USE_HASH_PTR
+  
+  printf( " leaves' levels:\t" ) ;
+  for( Level l = 0 ; l <= MAX_LEVEL; ++l )
+    printf( "\t%d", _level_dist[l] ) ;
+  printf( "\n" ) ;
+
+  s = _verts.size() ;
+  printf( " number of dual nodes:\t%d\n", s ) ;
+#if USE_HASH_PTR
+  printf( " total memory of dual:\t%d\n", (int) ( s * sizeof(HashVerts::KeyBucket) ) ) ;
+  _verts.stats() ;
+#else  // USE_HASH_PTR 
+  printf( " total memory of dual:\t%d\n", (int) ( s * sizeof(HashVerts::KeyData  ) ) ) ;
+#endif // USE_HASH_PTR
+}
+//_____________________________________________________________________________
+
+
+
+
+
+//_____________________________________________________________________________
+//_____________________________________________________________________________
+// search operations
+
+
+//_____________________________________________________________________________
+// Find cells of the octree at a given position
+bool LeafOctree::find_leaf( Key k, Level o_lv, geom_cell &n ) const
+//-----------------------------------------------------------------------------
+{
+    
+  Level   shift  = 3*(MAX_LEVEL-o_lv) ;
+  Key     k_up   = k >> shift ;
+
+  HashField::KeyData kd_up ;
+  if( node_exists(k_up,kd_up) )
+  {
+    n = geom_cell( kd_up ) ;
+    return true ;
+  }
+
+  Key k_dw = k_up ;
+  HashField::KeyData kd_dw ;
+  
+  bool b_up, b_dw ;
+  do
+  {
+    b_up = k_up != KEY_INV ;
+    b_dw = shift > 2 ;
+
+    if( b_up )
+    {
+      k_up >>= 3;
+      if( node_exists(k_up,kd_up) )
+      {
+        n = geom_cell( kd_up ) ;
+        return true ;
+      }
+    }
+    
+    if( b_dw )
+    {
+      shift -= 3 ;
+      k_dw = k >> shift ;
+      if( node_exists(k_dw,kd_dw) )
+      {
+        n = geom_cell( kd_dw ) ;
+        return true ;
+      }
+    }
+  }
+  while( b_up || b_dw ) ;
+
+  return false ;
+}
+//_____________________________________________________________________________
+
+
+
+//_____________________________________________________________________________
+// Find cells of the octree inside a given box of center x,y and half side r
+bool LeafOctree::find_radius( real x, real y, real z, real r, List<geom_cell> &cells ) const
+//-----------------------------------------------------------------------------
+{
+    
+  cells.clear() ;
+
+  Level lv_b = (Level)floor( log(r)/log(0.5) ) ;
+  Key   k_b  = cube2key( Cube(x,y,z,lv_b) ) ;
+
+  Key neighbors[27] ;
+  neighbor_keys( k_b, neighbors ) ;
+  neighbors[13] = k_b ;
+
+  Key *k_ptr = neighbors ;
+  for( int dir = 0 ; dir < 27 ; ++dir, ++k_ptr )
+  {
+    Key k = *k_ptr ;
+    if( k == KEY_INV ) continue ;
+
+    // look up (faster...)
+    Key k_up = k ;
+    bool found_up = false ;
+    HashField::KeyData kd ;
+    do
+    {
+      if( node_exists(k_up,kd) )
+      {
+        geom_cell gc(kd) ;
+        real sz = gc.sz() + r ;
+        
+        // test directly with the key?
+        if( fabs( x-gc.x() ) <= sz && fabs( y-gc.y() ) <= sz && fabs( z-gc.z() ) <= sz )
+          cells.insert_unique( gc ) ;
+        
+        found_up = true ;
+        break ;
+      }
+      k_up >>= 3 ;
+    } while( k_up != 0 ) ;
+
+    if( found_up ) continue ;
+    
+    // look down
+    std::stack<Key> s ;
+    Key k_dw = k << 3 ;
+    ++lv_b ;
+    for( int i = 0 ; i < 8 ; ++i )
+      // test directly with the key before insertion?
+      s.push( k_dw | i ) ;
+
+    while( !s.empty() )
+    {
+      k_dw = s.top() ;
+      s.pop() ;
+      if( node_exists(k_dw,kd) )
+      {
+        geom_cell gc(kd) ;
+        real sz = gc.sz() + r ;
+        
+        // test directly with the key?
+        if( fabs( x-gc.x() ) <= sz && fabs( y-gc.y() ) <= sz && fabs( z-gc.z() ) <= sz )
+          cells.insert( gc ) ;
+
+        continue ;
+      }
+      
+      if( ++lv_b > MAX_LEVEL ) break ;
+      k_dw <<= 3 ;
+      for( int i = 0 ; i < 8 ; ++i )
+        // test directly with the key before insertion?
+        s.push( k_dw | i ) ;
+    }
+  }
+  
+  return true ;
+}
+//_____________________________________________________________________________
+
+
+
+//_____________________________________________________________________________
+// Find neighbor cells of the octree to a given cell
+bool LeafOctree::adjacent( Key k, List<geom_cell> &cells ) const
+//-----------------------------------------------------------------------------
+{
+    
+  cells.clear() ;
+
+  Key neighbors[27] ;
+  neighbor_keys( k, neighbors ) ;
+  
+  Key *k_ptr = neighbors ;
+  for( int dir = 0 ; dir < 27 ; ++dir, ++k_ptr )
+  {
+    Key ki = *k_ptr ;
+    if( ki == KEY_INV ) continue ;
+    
+    HashField::KeyData kd ;
+    if( node_exists(ki,kd) )
+    {
+      cells.insert( geom_cell(kd) );
+      continue ;
+    }
+
+    // look up (faster)
+    do
+    {
+      ki >>= 3 ;
+      if( key_contains( ki,k ) ) ki = 0 ;
+    } while( ki !=0 && !node_exists(ki,kd) ) ;
+    
+    if( ki > 0 )
+    {
+      cells.insert_unique( geom_cell(kd) ) ;
+      continue ;
+    }
+
+    ki = *k_ptr ;
+    
+    std::stack<Key> subneighbors ;
+    subneighbor_keys(ki, dir, subneighbors ) ;
+    while( !subneighbors.empty() )
+    {
+      Key ski = subneighbors.top() ;
+      subneighbors.pop() ;
+      
+      if( node_exists(ski,kd) )
+        cells.insert( geom_cell(kd) );
+      else
+      {
+        if( key_level(ski) >= MAX_LEVEL ) break ;
+        subneighbor_keys(ski, dir, subneighbors ) ;        
+      }
+    }
+  }
+  
+  return true ;
+}
+//_____________________________________________________________________________
+
+
+
+//_____________________________________________________________________________
+//_____________________________________________________________________________
+// I/O
+
+//_____________________________________________________________________________
+// Draws the intersecting cells of a plane with the octree with color
+void LeafOctree::draw_plane ( real nx, real ny, real nz, real d )
+//-----------------------------------------------------------------------------
+{
+  // retrieve the index of the most positive cube corner
+  bool fx = nx >= 0 ;
+  bool fy = ny >= 0 ;
+  bool fz = nz >= 0 ;
+  
+  real px,py,pz, mx,my,mz ;
+
+  ::glLineWidth( 1.0f ) ;
+  ::glDisable( GL_LIGHTING ) ;
+  ::glBegin( GL_LINES ) ;
+  {
+    for( leaf_iterator it = leaves_begin() ; it() ; ++it )
+    {
+      geom_cell n = it.top() ;
+      real sz_ = n.sz() ;
+      
+      // get the coordinates of the extremum vertices
+      if( fx ) { px = n.cx() + sz_ ;  mx = n.cx() - sz_ ; }
+      else     { px = n.cx() - sz_ ;  mx = n.cx() + sz_ ; }
+      if( fy ) { py = n.cy() + sz_ ;  my = n.cy() - sz_ ; }
+      else     { py = n.cy() - sz_ ;  my = n.cy() + sz_ ; }
+      if( fz ) { pz = n.cz() + sz_ ;  mz = n.cz() - sz_ ; }
+      else     { pz = n.cz() - sz_ ;  mz = n.cz() + sz_ ; }
+      
+      // plane/cube intersection test
+      if( (nx * px + ny * py + nz * pz + d >= 0.0) && (nx * mx + ny * my + nz * mz + d <= 0.0)  )
+      {
+        ::glTexCoord1f( (GLfloat)fabs(*n/max_field()) ) ;
+        n.draw_wire() ;
+      }
+    }
+  }
+  ::glEnd() ;  // GL_LINES		
+}
+//_____________________________________________________________________________
+
+
+
+
+
+//_____________________________________________________________________________
+// Draws the intersection of a plane with the octree with color
+void LeafOctree::draw_slice ( real nx, real ny, real nz, real d, float alpha )
+//-----------------------------------------------------------------------------
+{
+  // retrieve the index of the most positive cube corner
+  bool fx = nx >= 0 ;
+  bool fy = ny >= 0 ;
+  bool fz = nz >= 0 ;
+  
+  real px,py,pz, mx,my,mz ;
+  
+  ::glDisable( GL_LIGHTING ) ;
+  for( leaf_iterator it = leaves_begin() ; it() ; ++it )
+  {
+    geom_cell n = it.top() ;
+    real sz_ = n.sz() ;
+    
+    // get the coordinates of the extremum vertices
+    if( fx ) { px = n.cx() + sz_ ;  mx = n.cx() - sz_ ; }
+    else     { px = n.cx() - sz_ ;  mx = n.cx() + sz_ ; }
+    if( fy ) { py = n.cy() + sz_ ;  my = n.cy() - sz_ ; }
+    else     { py = n.cy() - sz_ ;  my = n.cy() + sz_ ; }
+    if( fz ) { pz = n.cz() + sz_ ;  mz = n.cz() - sz_ ; }
+    else     { pz = n.cz() - sz_ ;  mz = n.cz() + sz_ ; }
+    
+
+    // plane/cube intersection test
+    if( (nx * px + ny * py + nz * pz + d >= 0.0) && (nx * mx + ny * my + nz * mz + d <= 0.0)  )
+    {
+      // retrieves the signs of each cube corner
+      real val[8] ;
+      real v   = nx * n.cx() + ny * n.cy() + nz * n.cz() + d ;
+      int zeros = 0 ;
+      for( int i = 0 ; i < 8 ; ++i )
+      {
+        val[i] = v + nx * ((i&1)?sz_:-sz_) + ny * ((i&2)?sz_:-sz_) + nz * ((i&4)?sz_:-sz_) ;
+        if( fabs(val[i]) < R_EPSILON ) { val[i] = R_EPSILON ;  ++zeros ; }
+      }
+      
+      //_________________________________________________________________________
+      // degenerated intersection
+      if( zeros > 0 )
+      {
+        int npos = 0, nneg = 0 ;
+        for( int i = 0 ; i < 8 ; ++i )
+        {
+          if( fabs(val[i]) < R_EPSILON ) continue ;
+          if( val[i] < 0 )
+            ++nneg ;
+          else
+            ++npos ;
+        }
+        float def = (nneg>npos) ? (float)R_EPSILON : -(float)R_EPSILON ;
+        
+        for( int i = 0 ; i < 8 ; ++i )
+        {
+          if( fabs(val[i]) < R_EPSILON ) val[i] = def ;
+        }
+        //        continue ;
+      }
+      
+      //_________________________________________________________________________
+      // Continuation method
+      int v0=-1, v1=-1 ;  // current edge vertices
+      
+      // get the first intersection
+      static int edges[12][2] = { {0,1}, {0,2}, {0,4}, {1,3}, {1,5}, {2,3}, {2,6}, {3,7}, {4,5}, {4,6}, {5,7}, {6,7} } ;
+      for( int e = 0 ; e < 12 ; ++e )
+      {
+        if( val[ edges[e][0] ] * val[ edges[e][1] ] < 0 )
+        {
+          v0 = edges[e][0] ;
+          v1 = edges[e][1] ;
+          break ;
+        }
+      }
+      int  ov0 = v0, ov1 = v1 ;
+      
+      
+      // equation of previous face adjacent to v0v1: v>>c & 1 == s (c-th coordinate equal to +/- 1)
+      int pf = -1 ;  bool ps ;
+      if       ( (v0 & 1) == (v1 & 1) )   { pf = 0 ; ps = ((v0 & 1) /*>> 0*/) == 1 ; }
+      else   if( (v0 & 2) == (v1 & 2) )   { pf = 1 ; ps = ((v0 & 2)   >> 1  ) == 1 ; }
+      else /*if( (v0 & 4) == (v1 & 4) )*/ { pf = 2 ; ps = ((v0 & 4)   >> 2  ) == 1 ; }
+      
+      //      printf( "cube %d %d %d %d %d %d %d %d, march : (%d,%d) ", val[0]>0, val[1]>0, val[2]>0, val[3]>0, val[4]>0, val[5]>0, val[6]>0, val[7]>0, v0, v1 ) ;
+      
+      //_________________________________________________________________________
+      // marching
+      
+      GLfloat color = (GLfloat)fabs(*n / max_field()) ;
+		  //cmap.gl_color( at(*n) ) ;	
+      ::glBegin( GL_POLYGON ) ;
+      {
+        do
+        {
+          // equation of next face adjacent to v0v1
+          int nf = -1 ;  bool ns ;
+          if       ( pf != 0 && ((v0 & 1) == (v1 & 1)) )   { nf = 0 ; ns = ((v0 & 1) /*>> 0*/) == 1 ; }
+          else   if( pf != 1 && ((v0 & 2) == (v1 & 2)) )   { nf = 1 ; ns = ((v0 & 2)   >> 1  ) == 1 ; }
+          else /*if( pf != 2 && ((v0 & 4) == (v1 & 4)) )*/ { nf = 2 ; ns = ((v0 & 4)   >> 2  ) == 1 ; }
+          
+          /* equivalent construction
+           // get the direction perpendicular to v0v1
+           int of = (v0 ^ v1) & 7 ; // only bit of difference
+           of = of==1 ? 0 : (of==2 ? 1 : 2) ;
+           
+           // compute the equation of the next face adjacent to v0v1
+           int  nf = 3 - (pf+of) ;    // third option: {pf,nf,of}={0,1,2}
+           bool ns = (v0 >> nf) & 1 ; // value of the edge on that direction
+           */
+          
+          // compute the two next vertices (invert the pf-th bit
+          int v2 = ps ? ( v0 & (~(1<<pf)) ) : ( v0 | (1<<pf) ) ;
+          int v3 = ps ? ( v1 & (~(1<<pf)) ) : ( v1 | (1<<pf) ) ;
+          
+          // get the characteristic of the square
+          int  c = (val[v3] > 0) | ((val[v2] > 0) << 1) | ((val[v1] > 0) << 2) | ((val[v0] > 0) << 3) ;
+          if( c > 7 ) c = (~c)&7 ; // consider v0 as negative, and thus v1 as positive
+          /*
+           if( c < 4 )
+           { // degenerated intesection
+           printf( "degenerated intersection %d!\n", c ) ;
+           }
+           */
+          
+          //_______________________________________________________________________
+          // method of continuity on the cube surface
+          switch( c )
+          {
+            case  4 : v0 = v3 ;  break ;
+            case  5 : v0 = v2 ;  v1 = v3 ;  break ;
+            case  6 : /* impossible case */ break ;
+            case  7 : v1 = v2 ;  break ;
+          }
+          
+          
+          
+          
+          real cx =  n.cx();
+          real cy =  n.cy(); 
+          real cz =  n.cz();
+          real sz =  sz_;   
+          real a0 = val[v0];  
+          int i0 = v0; 
+          real a1 = val[v1];  
+          int i1  = v1;
+          
+          real w0 = a1 / (a1-a0) ;
+          real w1 = a0 / (a0-a1) ;
+          
+          real x = cx + w0 * ((i0&1)?sz:-sz) + w1 * ((i1&1)?sz:-sz);
+          real y = cy + w0 * ((i0&2)?sz:-sz) + w1 * ((i1&2)?sz:-sz);
+          real z = cz + w0 * ((i0&4)?sz:-sz) + w1 * ((i1&4)?sz:-sz);
+          
+          ::glTexCoord1d( color ) ;
+          ::glVertex3d(x, y, z) ;
+          
+          // next face
+          pf = nf ;  ps = ns ;
+          
+          //          printf( "(%d,%d) ", v0, v1 ) ;
+        } while( v0 != ov0 || v1 != ov1 ) ;
+        //        printf( "\n" ) ;
+      }
+      ::glEnd() ; // GL_POLYGON
+      
+    }
+  }
+}
+//_____________________________________________________________________________
+
+
+#endif // HASH_HAS_ERASE
diff --git a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/leaf_octree.h b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/leaf_octree.h
new file mode 100644
index 0000000000..a427ee32c6
--- /dev/null
+++ b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/leaf_octree.h
@@ -0,0 +1,332 @@
+/**
+ * \file    leaf_octree.h
+ * \author  Thomas Lewiner   <tomlew@puc-rio.br>
+ * \author  Matmidia Lab, Math Dept, PUC-Rio
+ * \date    10/01/2010
+ *
+ *  Octree structure without intermediate nodes, hashtable and optimized operations
+ */
+//_____________________________________________________________________________
+
+
+#pragma once
+
+#ifndef WIN32
+#pragma interface
+#endif // WIN32
+
+
+#include "mlist.h"
+#include "cube.h"
+#include "hash.h"
+#include "MarchingCubes.h"
+#include "mc_draw.h"
+#include "data_access.h"
+
+
+#ifdef HASH_HAS_ERASE
+
+
+//_____________________________________________________________________________
+// LeafOctree
+/// \class LeafOctree LeafOctree.h
+class LeafOctree
+//-----------------------------------------------------------------------------
+{
+// forward declaration
+public:
+  class geom_cell  ;
+  class leaf_iterator  ;
+
+// Elements
+protected:
+  /// Octree cell data structure
+  typedef Hash<real>  HashField ;
+
+  /// Hashtable of the octree nodes
+  HashField _hash ;
+  
+  /// Level distribution of the octree
+  uint _level_dist[MAX_LEVEL+1] ;
+  
+  /// Optimal level for direct search in the octree
+  Level _opt_level ;
+  
+  /// Maximal field of the octree
+  real _max_field ;
+  
+  /// Isosurface
+  MarchingCubes _mc ;
+  
+  /// Isosurface Draw
+  MC_Draw _mc_draw ;
+  
+private:
+  /// Octree vertices data structure
+  typedef Hash<Level> HashVerts ;
+  /// Hashtable of the octree vertices
+  HashVerts _verts ;
+  
+  
+//-----------------------------------------------------------------------------
+// Constructors
+public:
+  /// Default constructor: Constructs a octree with and empty root
+  LeafOctree() { init() ; }
+
+  /// Destructor: Free memory
+  ~LeafOctree() { clear() ; }
+
+
+  /// Create the root
+  void init() ;
+
+  /// Memory cleaning
+  void clear() { clear_octree() ;  _mc.clean_all() ; }
+
+  /// Delete the content of the octree
+  void clear_octree() ;
+  
+  /// Compute the optimal level
+  void compute_opt_level() ;
+  
+  /// Check that only the leaves have data
+  bool check () ;
+
+  /// Prints statistics about the octree
+  void stats() const ;
+    
+
+  /// Return the maximal level of the octree
+  Level  max_level() const { Level lv = MAX_LEVEL ; while( lv > 0 && !_level_dist[lv] ) --lv ; return lv ; }
+  
+  /// Return the optimal level of the octree
+  Level  opt_level() const { return _opt_level ; }
+  
+  /// Return the optimal level of the octree
+  Level &opt_level()  { return _opt_level ; }
+  
+  /// Return the maximal field of the octree
+  real max_field() const { return _max_field ; }
+   
+  /// Return the isosurface
+  MarchingCubes &mc() { return _mc ; }
+
+  /// Return the isosurface draw
+  MC_Draw &mc_draw() { return _mc_draw ; }
+  
+  /// set the values of each leaf from the implicit function
+  bool set_impl( data_access *ref = NULL ) ;
+  
+  /// Refine the octree according to the data access
+  bool refine( data_access *ref = NULL ) ;
+
+  /// Adapt the octree according to the data access
+  bool adapt( data_access *ref = NULL ) ;
+  
+  /// Draw the octree with wireframe
+  bool draw_wire() ;
+  
+  /// Draw the octree with dots
+  bool draw_centers() ;
+  
+  /// Dual function type
+  typedef bool leaf_dual_walker( LeafOctree &fo, Key *keys ) ;
+
+  /// Compute primal vertices
+  bool compute_primal_verts() ;
+  
+  /// Walk on the dual cubes
+  bool dual_cubes_walk( leaf_dual_walker &walker ) ;
+
+  /// Build the isosurface using dual marching cubes
+  bool build_isosurface( data_access *ref = NULL ) ;
+  
+  /// Draw the isosurface on-the-fly using dual marching cubes
+  bool direct_draw_isosurface( data_access *ref = NULL ) ;
+  
+  /// Draw the dual octree with wireframe
+  bool draw_dual() ;
+  
+  /// Do nothing, just for dual generation timing
+  bool dual_timing() ;
+  
+//-----------------------------------------------------------------------------
+// iterators
+public:
+  /// Create an iterator traversing the leaves of the tree from the root
+  inline leaf_iterator leaves_begin() { return leaf_iterator( *this ) ; }
+
+//-----------------------------------------------------------------------------
+// search operations
+public:
+  /// Find cells of the octree at a given position
+  bool find_leaf( Key k, Level o_lv, geom_cell &cell ) const ;
+  bool find_leaf( Key k, geom_cell &cell ) const { return find_leaf( k, opt_level(), cell ) ; }
+  bool find_leaf( real x, real y, real z, geom_cell &cell ) const { return find_leaf( cube2key( Cube(x,y,z,MAX_LEVEL) ), opt_level(), cell ) ; }
+
+  /// Find cells of the octree inside a given box of center x,y,z and half side r
+  bool find_radius( real x, real y, real z, real r, List<geom_cell> &cells ) const ;
+
+  /// Find adjacent cells of the octree to a given cell
+  bool adjacent( Key k, List<geom_cell> &cells ) const ;
+  bool adjacent( const geom_cell &cell, List<geom_cell> &cells ) const { return adjacent( cell.key(), cells ) ; }
+
+  /// Node existence
+  bool node_exists( Key k, HashField::KeyData &kd ) const { kd = _hash[k] ;  return kd.key != KEY_INV ; }
+  
+  //-----------------------------------------------------------------------------
+// I/O
+public:
+
+  /// Draws the intersecting cells of a plane with the octree with color
+  void draw_plane ( real nx, real ny, real nz, real d	  ) ;
+
+  /// Draws the intersection of a plane with the octree with color
+  void draw_slice ( real nx, real ny, real nz, real d, float alpha ) ;
+
+  /// Draws the isosurface of level l inside the dual graph
+  void draw_iso   () { _mc.draw_surf() ; }
+
+//_____________________________________________________________________________
+// Iterator Cell
+public :
+  /// Auxiliary structure to traverse the octree
+  class geom_cell : public Cube
+  //---------------------------------------------------------------------------
+  {
+    friend class LeafOctree ;
+
+  protected:
+    Key   _key   ;  ///< octree cell
+    real  _field ;  ///< field associated to the cell
+
+  //---------------------------------------------------------------------------
+  // Constructors
+  public:
+    /// Default constructor
+    geom_cell( Key key_ = KEY_INV, real field_ = R_INV ) : Cube(key2cube(key_)), _key(key_), _field(field_) {}
+
+    /// Default constructor
+    geom_cell( HashField::KeyData kd ) : Cube(key2cube(kd.key)), _key(kd.key), _field(kd.data) {}
+
+    /// Destructor
+    ~geom_cell() {}
+
+    /// Copy constructor
+    geom_cell( const geom_cell &i ) : Cube(i), _key(i._key), _field(i._field) {}
+
+    /// Assignment operator
+    geom_cell &operator = ( const geom_cell &i )
+    {  Cube::operator=(i) ;  _key = i._key ;  _field = i._field ;  return *this; }
+    
+
+  //---------------------------------------------------------------------------
+  // Public constant accessors
+  public  :
+    /// key const accessor
+    inline Key  key() const { return _key ; }
+    /// key accessor
+    inline Key &key() { return _key ; }
+
+    /// id const accessor
+    inline real  operator*() const { return _field ; }
+    
+    //---------------------------------------------------------------------------
+  // Tests
+  public :
+    /// equality operator
+    inline bool operator ==( const geom_cell &i ) const { return key() == i.key() ; }
+
+    /// inequality operator
+    inline bool operator !=( const geom_cell &i ) const { return key() != i.key() ; }
+
+    /// validation operator
+    inline bool      operator ()() const { return key() != KEY_INV ; }
+  };
+
+  const geom_cell geom_root() const { const Key root_key = 1 ; return geom_cell( root_key, _hash[root_key].data ) ; }
+  const geom_cell geom_key ( Key k ) const { return geom_cell( k, _hash[k].data ) ; }
+
+
+
+//_____________________________________________________________________________
+// Cell Iterator
+public :
+  /// Octree cell iterator : Traverse the octree returning basic information on the cells
+  class leaf_iterator
+  //---------------------------------------------------------------------------
+  {
+    friend class LeafOctree ;
+
+  protected:
+    /// Octree traversal iterator
+    HashField::iterator _it ;
+
+  //---------------------------------------------------------------------------
+  // Constructors
+  public:
+    /// Default constructor : Constructs an iterator from a cell
+    leaf_iterator( LeafOctree &o ) : _it( o._hash.begin() ) {}
+
+    /// Destructor
+    ~leaf_iterator() {}
+
+    /// Copy constructor
+    leaf_iterator( const leaf_iterator &i ) : _it(i._it) {}
+
+    /// Assignment operator
+    leaf_iterator &operator = ( const leaf_iterator &i )
+    { _it = i._it; return *this; }
+
+  //---------------------------------------------------------------------------
+  // Operations
+  public  :
+    /// equality operator
+    inline bool operator ==( const leaf_iterator &i ) const { return _it == i._it ; }
+
+    /// inequality operator
+    inline bool operator !=( const leaf_iterator &i ) const { return _it != i._it ; }
+
+    /// validation operator
+    inline bool      operator ()() const { return _it() ; }
+
+    /// next position
+    inline leaf_iterator &operator ++() { ++_it ; return *this ; }
+
+  //---------------------------------------------------------------------------
+  // Accessors
+  public  :
+    // cell accessor
+    inline geom_cell top() const { return geom_cell( key(), *_it ) ; }
+
+    /// id accessor
+    inline real &operator*() { return *_it ; }
+
+    /// level accessor
+    inline Level lv() { return key_level(_it.key()) ; }
+
+    /// size accessor
+    inline real  sz() { return Cube(0,0,0,lv()).sz() ; }
+    
+    /// key accessor
+    inline Key   key() const { return _it.key() ; }
+    
+    /// points accessor
+    inline bool is_leaf() const { return !is_inv(*_it) ; }
+
+    /// Draws the cell wire with opengl
+    void draw_wire  () const { top().draw_wire  () ; }
+
+  };
+} ;
+//_____________________________________________________________________________
+
+
+#else  // HASH_HAS_ERASE
+
+#include "opt_octree.h"
+typedef OptOctree LeafOctree ;
+
+#endif // HASH_HAS_ERASE
+
diff --git a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/mc_draw.cpp b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/mc_draw.cpp
new file mode 100644
index 0000000000..a1a76351cf
--- /dev/null
+++ b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/mc_draw.cpp
@@ -0,0 +1,695 @@
+/**
+ * @file    md_draw.cpp
+ * @author  Thomas Lewiner <thomas.lewiner@polytechnique.org>
+ * @author  Math Dept, PUC-Rio
+ * @version 0.2
+ * @date    12/08/2002
+ *
+ * @brief   MC_Draw Direct Draw Algorithm
+ */
+//________________________________________________
+
+
+#if !defined(WIN32) || defined(__CYGWIN__)
+#pragma implementation
+#endif // WIN32
+
+#include <math.h>
+#include <time.h>
+#include <memory.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <float.h>
+#include "mc_draw.h"
+#include "LookUpTable.h"
+
+
+//_____________________________________________________________________________
+// print cube for debug
+void MC_Draw::print_cube() { printf( "\t%f %f %f %f %f %f %f %f\n", _cube[0], _cube[1], _cube[2], _cube[3], _cube[4], _cube[5], _cube[6], _cube[7]) ; }
+//_____________________________________________________________________________
+
+
+
+//_____________________________________________________________________________
+// main algorithm
+bool MC_Draw::tesselate_cube( real iso )
+//-----------------------------------------------------------------------------
+{
+  for( int p = 0 ; p < 8 ; ++p )
+  {
+    real &v = _cube[p] ;
+    v -= iso ;
+    if( fabs( v ) < R_EPSILON ) v = R_EPSILON ;
+  }
+  
+  if( !compute_intersection_points() ) return false ;
+
+  _lut_entry = 0 ;
+  for( int p = 0 ; p < 8 ; ++p )
+  {
+    if( _cube[p] > 0 ) _lut_entry += 1 << p ;
+  }
+
+  return process_cube( ) ;
+}
+//_____________________________________________________________________________
+
+
+
+//_____________________________________________________________________________
+//_____________________________________________________________________________
+
+
+//_____________________________________________________________________________
+// Compute the intersection points
+bool MC_Draw::compute_intersection_points()
+//-----------------------------------------------------------------------------
+{
+  bool res = false ;
+  res |= add_vertex( 0,1 ) ;
+  res |= add_vertex( 1,2 ) ;
+  res |= add_vertex( 2,3 ) ;
+  res |= add_vertex( 3,0 ) ;
+
+  res |= add_vertex( 4,5 ) ;
+  res |= add_vertex( 5,6 ) ;
+  res |= add_vertex( 6,7 ) ;
+  res |= add_vertex( 7,4 ) ;
+
+  res |= add_vertex( 0,4 ) ;
+  res |= add_vertex( 1,5 ) ;
+  res |= add_vertex( 2,6 ) ;
+  res |= add_vertex( 3,7 ) ;
+  
+  return res ;
+}
+//_____________________________________________________________________________
+
+
+
+
+
+//_____________________________________________________________________________
+// Test a face
+// if face>0 return true if the face contains a part of the surface
+bool MC_Draw::test_face( schar face )
+//-----------------------------------------------------------------------------
+{
+  real A,B,C,D ;
+
+  switch( face )
+  {
+  case -1 : case 1 :  A = _cube[0] ;  B = _cube[4] ;  C = _cube[5] ;  D = _cube[1] ;  break ;
+  case -2 : case 2 :  A = _cube[1] ;  B = _cube[5] ;  C = _cube[6] ;  D = _cube[2] ;  break ;
+  case -3 : case 3 :  A = _cube[2] ;  B = _cube[6] ;  C = _cube[7] ;  D = _cube[3] ;  break ;
+  case -4 : case 4 :  A = _cube[3] ;  B = _cube[7] ;  C = _cube[4] ;  D = _cube[0] ;  break ;
+  case -5 : case 5 :  A = _cube[0] ;  B = _cube[3] ;  C = _cube[2] ;  D = _cube[1] ;  break ;
+  case -6 : case 6 :  A = _cube[4] ;  B = _cube[7] ;  C = _cube[6] ;  D = _cube[5] ;  break ;
+  default : printf( "Invalid face code %d\n", face ) ;  print_cube() ;  A = B = C = D = 0 ;
+  };
+
+  if( fabs( A*C - B*D ) < R_EPSILON )
+    return face >= 0 ;
+  return face * A * ( A*C - B*D ) >= 0  ;  // face and A invert signs
+}
+//_____________________________________________________________________________
+
+
+
+
+
+//_____________________________________________________________________________
+// Test the interior of a cube
+// if s == 7, return true  if the interior is empty
+// if s ==-7, return false if the interior is empty
+bool MC_Draw::test_interior( schar s )
+//-----------------------------------------------------------------------------
+{
+  real t, At=0, Bt=0, Ct=0, Dt=0, a, b ;
+  char  test =  0 ;
+  char  edge = -1 ; // reference edge of the triangulation
+
+  switch( _case )
+  {
+  case  4 :
+  case 10 :
+    a = ( _cube[4] - _cube[0] ) * ( _cube[6] - _cube[2] ) - ( _cube[7] - _cube[3] ) * ( _cube[5] - _cube[1] ) ;
+    b =  _cube[2] * ( _cube[4] - _cube[0] ) + _cube[0] * ( _cube[6] - _cube[2] )
+             - _cube[1] * ( _cube[7] - _cube[3] ) - _cube[3] * ( _cube[5] - _cube[1] ) ;
+    t = - b / (2*a) ;
+    if( t<0 || t>1 ) return s>0 ;
+
+    At = _cube[0] + ( _cube[4] - _cube[0] ) * t ;
+    Bt = _cube[3] + ( _cube[7] - _cube[3] ) * t ;
+    Ct = _cube[2] + ( _cube[6] - _cube[2] ) * t ;
+    Dt = _cube[1] + ( _cube[5] - _cube[1] ) * t ;
+    break ;
+
+  case  6 :
+  case  7 :
+  case 12 :
+  case 13 :
+    switch( _case )
+    {
+    case  6 : edge = test6 [_config][2] ; break ;
+    case  7 : edge = test7 [_config][4] ; break ;
+    case 12 : edge = test12[_config][3] ; break ;
+    case 13 : edge = tiling13_5_1[_config][_subconfig][0] ; break ;
+    }
+    switch( edge )
+    {
+    case  0 :
+      t  = _cube[0] / ( _cube[0] - _cube[1] ) ;
+      At = 0 ;
+      Bt = _cube[3] + ( _cube[2] - _cube[3] ) * t ;
+      Ct = _cube[7] + ( _cube[6] - _cube[7] ) * t ;
+      Dt = _cube[4] + ( _cube[5] - _cube[4] ) * t ;
+      break ;
+    case  1 :
+      t  = _cube[1] / ( _cube[1] - _cube[2] ) ;
+      At = 0 ;
+      Bt = _cube[0] + ( _cube[3] - _cube[0] ) * t ;
+      Ct = _cube[4] + ( _cube[7] - _cube[4] ) * t ;
+      Dt = _cube[5] + ( _cube[6] - _cube[5] ) * t ;
+      break ;
+    case  2 :
+      t  = _cube[2] / ( _cube[2] - _cube[3] ) ;
+      At = 0 ;
+      Bt = _cube[1] + ( _cube[0] - _cube[1] ) * t ;
+      Ct = _cube[5] + ( _cube[4] - _cube[5] ) * t ;
+      Dt = _cube[6] + ( _cube[7] - _cube[6] ) * t ;
+      break ;
+    case  3 :
+      t  = _cube[3] / ( _cube[3] - _cube[0] ) ;
+      At = 0 ;
+      Bt = _cube[2] + ( _cube[1] - _cube[2] ) * t ;
+      Ct = _cube[6] + ( _cube[5] - _cube[6] ) * t ;
+      Dt = _cube[7] + ( _cube[4] - _cube[7] ) * t ;
+      break ;
+    case  4 :
+      t  = _cube[4] / ( _cube[4] - _cube[5] ) ;
+      At = 0 ;
+      Bt = _cube[7] + ( _cube[6] - _cube[7] ) * t ;
+      Ct = _cube[3] + ( _cube[2] - _cube[3] ) * t ;
+      Dt = _cube[0] + ( _cube[1] - _cube[0] ) * t ;
+      break ;
+    case  5 :
+      t  = _cube[5] / ( _cube[5] - _cube[6] ) ;
+      At = 0 ;
+      Bt = _cube[4] + ( _cube[7] - _cube[4] ) * t ;
+      Ct = _cube[0] + ( _cube[3] - _cube[0] ) * t ;
+      Dt = _cube[1] + ( _cube[2] - _cube[1] ) * t ;
+      break ;
+    case  6 :
+      t  = _cube[6] / ( _cube[6] - _cube[7] ) ;
+      At = 0 ;
+      Bt = _cube[5] + ( _cube[4] - _cube[5] ) * t ;
+      Ct = _cube[1] + ( _cube[0] - _cube[1] ) * t ;
+      Dt = _cube[2] + ( _cube[3] - _cube[2] ) * t ;
+      break ;
+    case  7 :
+      t  = _cube[7] / ( _cube[7] - _cube[4] ) ;
+      At = 0 ;
+      Bt = _cube[6] + ( _cube[5] - _cube[6] ) * t ;
+      Ct = _cube[2] + ( _cube[1] - _cube[2] ) * t ;
+      Dt = _cube[3] + ( _cube[0] - _cube[3] ) * t ;
+      break ;
+    case  8 :
+      t  = _cube[0] / ( _cube[0] - _cube[4] ) ;
+      At = 0 ;
+      Bt = _cube[3] + ( _cube[7] - _cube[3] ) * t ;
+      Ct = _cube[2] + ( _cube[6] - _cube[2] ) * t ;
+      Dt = _cube[1] + ( _cube[5] - _cube[1] ) * t ;
+      break ;
+    case  9 :
+      t  = _cube[1] / ( _cube[1] - _cube[5] ) ;
+      At = 0 ;
+      Bt = _cube[0] + ( _cube[4] - _cube[0] ) * t ;
+      Ct = _cube[3] + ( _cube[7] - _cube[3] ) * t ;
+      Dt = _cube[2] + ( _cube[6] - _cube[2] ) * t ;
+      break ;
+    case 10 :
+      t  = _cube[2] / ( _cube[2] - _cube[6] ) ;
+      At = 0 ;
+      Bt = _cube[1] + ( _cube[5] - _cube[1] ) * t ;
+      Ct = _cube[0] + ( _cube[4] - _cube[0] ) * t ;
+      Dt = _cube[3] + ( _cube[7] - _cube[3] ) * t ;
+      break ;
+    case 11 :
+      t  = _cube[3] / ( _cube[3] - _cube[7] ) ;
+      At = 0 ;
+      Bt = _cube[2] + ( _cube[6] - _cube[2] ) * t ;
+      Ct = _cube[1] + ( _cube[5] - _cube[1] ) * t ;
+      Dt = _cube[0] + ( _cube[4] - _cube[0] ) * t ;
+      break ;
+    default : printf( "Invalid edge %d\n", edge ) ;  print_cube() ;  break ;
+    }
+    break ;
+
+  default : printf( "Invalid ambiguous case %d\n", _case ) ;  print_cube() ;  break ;
+  }
+
+  if( At >= 0 ) test ++ ;
+  if( Bt >= 0 ) test += 2 ;
+  if( Ct >= 0 ) test += 4 ;
+  if( Dt >= 0 ) test += 8 ;
+  switch( test )
+  {
+  case  0 : return s>0 ;
+  case  1 : return s>0 ;
+  case  2 : return s>0 ;
+  case  3 : return s>0 ;
+  case  4 : return s>0 ;
+  case  5 : if( At * Ct - Bt * Dt <  R_EPSILON ) return s>0 ; break ;
+  case  6 : return s>0 ;
+  case  7 : return s<0 ;
+  case  8 : return s>0 ;
+  case  9 : return s>0 ;
+  case 10 : if( At * Ct - Bt * Dt >= R_EPSILON ) return s>0 ; break ;
+  case 11 : return s<0 ;
+  case 12 : return s>0 ;
+  case 13 : return s<0 ;
+  case 14 : return s<0 ;
+  case 15 : return s<0 ;
+  }
+
+  return s<0 ;
+}
+//_____________________________________________________________________________
+
+
+
+
+//_____________________________________________________________________________
+// Process a unit cube
+bool MC_Draw::process_cube( )
+//-----------------------------------------------------------------------------
+{
+  if( _originalMC )
+  {
+    char nt = 0 ;
+    while( casesClassic[_lut_entry][3*nt] != -1 ) nt++ ;
+    draw_triangle( casesClassic[_lut_entry], nt ) ;
+    return true ;
+  }
+
+  int   v12 = -1 ;
+  _case   = cases[_lut_entry][0] ;
+  _config = cases[_lut_entry][1] ;
+  _subconfig = 0 ;
+
+  switch( _case )
+  {
+  case  0 :
+    break ;
+
+  case  1 :
+    draw_triangle( tiling1[_config], 1 ) ;
+    break ;
+
+  case  2 :
+    draw_triangle( tiling2[_config], 2 ) ;
+    break ;
+
+  case  3 :
+    if( test_face( test3[_config]) )
+      draw_triangle( tiling3_2[_config], 4 ) ; // 3.2
+    else
+      draw_triangle( tiling3_1[_config], 2 ) ; // 3.1
+    break ;
+
+  case  4 :
+    if( test_interior( test4[_config]) )
+      draw_triangle( tiling4_1[_config], 2 ) ; // 4.1.1
+    else
+      draw_triangle( tiling4_2[_config], 6 ) ; // 4.1.2
+    break ;
+
+  case  5 :
+    draw_triangle( tiling5[_config], 3 ) ;
+    break ;
+
+  case  6 :
+    if( test_face( test6[_config][0]) )
+      draw_triangle( tiling6_2[_config], 5 ) ; // 6.2
+    else
+    {
+      if( test_interior( test6[_config][1]) )
+        draw_triangle( tiling6_1_1[_config], 3 ) ; // 6.1.1
+      else
+	  {
+        comp_c_vertex() ;
+        draw_triangle( tiling6_1_2[_config], 9 , v12) ; // 6.1.2
+      }
+    }
+    break ;
+
+  case  7 :
+    if( test_face( test7[_config][0] ) ) _subconfig +=  1 ;
+    if( test_face( test7[_config][1] ) ) _subconfig +=  2 ;
+    if( test_face( test7[_config][2] ) ) _subconfig +=  4 ;
+    switch( _subconfig )
+      {
+      case 0 :
+        draw_triangle( tiling7_1[_config], 3 ) ; break ;
+      case 1 :
+        draw_triangle( tiling7_2[_config][0], 5 ) ; break ;
+      case 2 :
+        draw_triangle( tiling7_2[_config][1], 5 ) ; break ;
+      case 3 :
+        comp_c_vertex() ;
+        draw_triangle( tiling7_3[_config][0], 9, v12 ) ; break ;
+      case 4 :
+        draw_triangle( tiling7_2[_config][2], 5 ) ; break ;
+      case 5 :
+        comp_c_vertex() ;
+        draw_triangle( tiling7_3[_config][1], 9, v12 ) ; break ;
+      case 6 :
+        comp_c_vertex() ;
+        draw_triangle( tiling7_3[_config][2], 9, v12 ) ; break ;
+      case 7 :
+        if( test_interior( test7[_config][3]) )
+          draw_triangle( tiling7_4_2[_config], 9 ) ;
+        else
+          draw_triangle( tiling7_4_1[_config], 5 ) ;
+        break ;
+      };
+    break ;
+
+  case  8 :
+    draw_triangle( tiling8[_config], 2 ) ;
+    break ;
+
+  case  9 :
+    draw_triangle( tiling9[_config], 4 ) ;
+    break ;
+
+  case 10 :
+    if( test_face( test10[_config][0]) )
+    {
+      if( test_face( test10[_config][1]) )
+        draw_triangle( tiling10_1_1_[_config], 4 ) ; // 10.1.1
+      else
+      {
+        comp_c_vertex() ;
+        draw_triangle( tiling10_2[_config], 8, v12 ) ; // 10.2
+      }
+    }
+    else
+    {
+      if( test_face( test10[_config][1]) )
+      {
+        comp_c_vertex() ;
+        draw_triangle( tiling10_2_[_config], 8, v12 ) ; // 10.2
+      }
+      else
+      {
+        if( test_interior( test10[_config][2]) )
+          draw_triangle( tiling10_1_1[_config], 4 ) ; // 10.1.1
+        else
+          draw_triangle( tiling10_1_2[_config], 8 ) ; // 10.1.2
+      }
+    }
+    break ;
+
+  case 11 :
+    draw_triangle( tiling11[_config], 4 ) ;
+    break ;
+
+  case 12 :
+    if( test_face( test12[_config][0]) )
+    {
+      if( test_face( test12[_config][1]) )
+        draw_triangle( tiling12_1_1_[_config], 4 ) ; // 12.1.1
+      else
+      {
+        comp_c_vertex() ;
+        draw_triangle( tiling12_2[_config], 8, v12 ) ; // 12.2
+      }
+    }
+    else
+    {
+      if( test_face( test12[_config][1]) )
+      {
+        comp_c_vertex() ;
+        draw_triangle( tiling12_2_[_config], 8, v12 ) ; // 12.2
+      }
+      else
+      {
+        if( test_interior( test12[_config][2]) )
+          draw_triangle( tiling12_1_1[_config], 4 ) ; // 12.1.1
+        else
+          draw_triangle( tiling12_1_2[_config], 8 ) ; // 12.1.2
+      }
+    }
+    break ;
+
+  case 13 :
+    if( test_face( test13[_config][0] ) ) _subconfig +=  1 ;
+    if( test_face( test13[_config][1] ) ) _subconfig +=  2 ;
+    if( test_face( test13[_config][2] ) ) _subconfig +=  4 ;
+    if( test_face( test13[_config][3] ) ) _subconfig +=  8 ;
+    if( test_face( test13[_config][4] ) ) _subconfig += 16 ;
+    if( test_face( test13[_config][5] ) ) _subconfig += 32 ;
+    switch( subconfig13[_subconfig] )
+    {
+      case 0 :/* 13.1 */
+        draw_triangle( tiling13_1[_config], 4 ) ; break ;
+
+      case 1 :/* 13.2 */
+        draw_triangle( tiling13_2[_config][0], 6 ) ; break ;
+      case 2 :/* 13.2 */
+        draw_triangle( tiling13_2[_config][1], 6 ) ; break ;
+      case 3 :/* 13.2 */
+        draw_triangle( tiling13_2[_config][2], 6 ) ; break ;
+      case 4 :/* 13.2 */
+        draw_triangle( tiling13_2[_config][3], 6 ) ; break ;
+      case 5 :/* 13.2 */
+        draw_triangle( tiling13_2[_config][4], 6 ) ; break ;
+      case 6 :/* 13.2 */
+        draw_triangle( tiling13_2[_config][5], 6 ) ; break ;
+
+      case 7 :/* 13.3 */
+        comp_c_vertex() ;
+        draw_triangle( tiling13_3[_config][0], 10, v12 ) ; break ;
+      case 8 :/* 13.3 */
+        comp_c_vertex() ;
+        draw_triangle( tiling13_3[_config][1], 10, v12 ) ; break ;
+      case 9 :/* 13.3 */
+        comp_c_vertex() ;
+        draw_triangle( tiling13_3[_config][2], 10, v12 ) ; break ;
+      case 10 :/* 13.3 */
+        comp_c_vertex() ;
+        draw_triangle( tiling13_3[_config][3], 10, v12 ) ; break ;
+      case 11 :/* 13.3 */
+        comp_c_vertex() ;
+        draw_triangle( tiling13_3[_config][4], 10, v12 ) ; break ;
+      case 12 :/* 13.3 */
+        comp_c_vertex() ;
+        draw_triangle( tiling13_3[_config][5], 10, v12 ) ; break ;
+      case 13 :/* 13.3 */
+        comp_c_vertex() ;
+        draw_triangle( tiling13_3[_config][6], 10, v12 ) ; break ;
+      case 14 :/* 13.3 */
+        comp_c_vertex() ;
+        draw_triangle( tiling13_3[_config][7], 10, v12 ) ; break ;
+      case 15 :/* 13.3 */
+        comp_c_vertex() ;
+        draw_triangle( tiling13_3[_config][8], 10, v12 ) ; break ;
+      case 16 :/* 13.3 */
+        comp_c_vertex() ;
+        draw_triangle( tiling13_3[_config][9], 10, v12 ) ; break ;
+      case 17 :/* 13.3 */
+        comp_c_vertex() ;
+        draw_triangle( tiling13_3[_config][10], 10, v12 ) ; break ;
+      case 18 :/* 13.3 */
+        comp_c_vertex() ;
+        draw_triangle( tiling13_3[_config][11], 10, v12 ) ; break ;
+
+      case 19 :/* 13.4 */
+        comp_c_vertex() ;
+        draw_triangle( tiling13_4[_config][0], 12, v12 ) ; break ;
+      case 20 :/* 13.4 */
+        comp_c_vertex() ;
+        draw_triangle( tiling13_4[_config][1], 12, v12 ) ; break ;
+      case 21 :/* 13.4 */
+        comp_c_vertex() ;
+        draw_triangle( tiling13_4[_config][2], 12, v12 ) ; break ;
+      case 22 :/* 13.4 */
+        comp_c_vertex() ;
+        draw_triangle( tiling13_4[_config][3], 12, v12 ) ; break ;
+
+      case 23 :/* 13.5 */
+        _subconfig = 0 ;
+        if( test_interior( test13[_config][6] ) )
+          draw_triangle( tiling13_5_1[_config][0], 6 ) ;
+        else
+          draw_triangle( tiling13_5_2[_config][0], 10 ) ;
+        break ;
+      case 24 :/* 13.5 */
+        _subconfig = 1 ;
+        if( test_interior( test13[_config][6] ) )
+          draw_triangle( tiling13_5_1[_config][1], 6 ) ;
+        else
+          draw_triangle( tiling13_5_2[_config][1], 10 ) ;
+        break ;
+      case 25 :/* 13.5 */
+        _subconfig = 2 ;
+        if( test_interior( test13[_config][6] ) )
+          draw_triangle( tiling13_5_1[_config][2], 6 ) ;
+        else
+          draw_triangle( tiling13_5_2[_config][2], 10 ) ;
+        break ;
+      case 26 :/* 13.5 */
+        _subconfig = 3 ;
+        if( test_interior( test13[_config][6] ) )
+          draw_triangle( tiling13_5_1[_config][3], 6 ) ;
+        else
+          draw_triangle( tiling13_5_2[_config][3], 10 ) ;
+        break ;
+
+      case 27 :/* 13.3 */
+        comp_c_vertex() ;
+        draw_triangle( tiling13_3_[_config][0], 10, v12 ) ; break ;
+      case 28 :/* 13.3 */
+        comp_c_vertex() ;
+        draw_triangle( tiling13_3_[_config][1], 10, v12 ) ; break ;
+      case 29 :/* 13.3 */
+        comp_c_vertex() ;
+        draw_triangle( tiling13_3_[_config][2], 10, v12 ) ; break ;
+      case 30 :/* 13.3 */
+        comp_c_vertex() ;
+        draw_triangle( tiling13_3_[_config][3], 10, v12 ) ; break ;
+      case 31 :/* 13.3 */
+        comp_c_vertex() ;
+        draw_triangle( tiling13_3_[_config][4], 10, v12 ) ; break ;
+      case 32 :/* 13.3 */
+        comp_c_vertex() ;
+        draw_triangle( tiling13_3_[_config][5], 10, v12 ) ; break ;
+      case 33 :/* 13.3 */
+        comp_c_vertex() ;
+        draw_triangle( tiling13_3_[_config][6], 10, v12 ) ; break ;
+      case 34 :/* 13.3 */
+        comp_c_vertex() ;
+        draw_triangle( tiling13_3_[_config][7], 10, v12 ) ; break ;
+      case 35 :/* 13.3 */
+        comp_c_vertex() ;
+        draw_triangle( tiling13_3_[_config][8], 10, v12 ) ; break ;
+      case 36 :/* 13.3 */
+        comp_c_vertex() ;
+        draw_triangle( tiling13_3_[_config][9], 10, v12 ) ; break ;
+      case 37 :/* 13.3 */
+        comp_c_vertex() ;
+        draw_triangle( tiling13_3_[_config][10], 10, v12 ) ; break ;
+      case 38 :/* 13.3 */
+        comp_c_vertex() ;
+        draw_triangle( tiling13_3_[_config][11], 10, v12 ) ; break ;
+
+      case 39 :/* 13.2 */
+        draw_triangle( tiling13_2_[_config][0], 6 ) ; break ;
+      case 40 :/* 13.2 */
+        draw_triangle( tiling13_2_[_config][1], 6 ) ; break ;
+      case 41 :/* 13.2 */
+        draw_triangle( tiling13_2_[_config][2], 6 ) ; break ;
+      case 42 :/* 13.2 */
+        draw_triangle( tiling13_2_[_config][3], 6 ) ; break ;
+      case 43 :/* 13.2 */
+        draw_triangle( tiling13_2_[_config][4], 6 ) ; break ;
+      case 44 :/* 13.2 */
+        draw_triangle( tiling13_2_[_config][5], 6 ) ; break ;
+
+      case 45 :/* 13.1 */
+        draw_triangle( tiling13_1_[_config], 4 ) ; break ;
+
+      default :
+        printf("Marching Cubes: Impossible case 13?\n" ) ;  print_cube() ;
+      }
+      break ;
+
+  case 14 :
+    draw_triangle( tiling14[_config], 4 ) ;
+    break ;
+  };
+  
+  return true ;
+}
+//_____________________________________________________________________________
+
+
+
+//_____________________________________________________________________________
+// Adding triangles
+void MC_Draw::draw_triangle( const char* trig_, char n, int v12 )
+//-----------------------------------------------------------------------------
+{
+  for( int t = 0 ; t < 3*n ; t++ )
+  {
+    switch( trig_[t] )
+    {
+      case  0 : _verts[0][1].draw() ; break ;
+      case  1 : _verts[1][2].draw() ; break ;
+      case  2 : _verts[2][3].draw() ; break ;
+      case  3 : _verts[3][0].draw() ; break ;
+      case  4 : _verts[4][5].draw() ; break ;
+      case  5 : _verts[5][6].draw() ; break ;
+      case  6 : _verts[6][7].draw() ; break ;
+      case  7 : _verts[7][4].draw() ; break ;
+      case  8 : _verts[0][4].draw() ; break ;
+      case  9 : _verts[1][5].draw() ; break ;
+      case 10 : _verts[2][6].draw() ; break ;
+      case 11 : _verts[3][7].draw() ; break ;
+      case 12 : _c_vert     .draw() ; break ;
+      default : break ;
+    }
+  }
+}
+//_____________________________________________________________________________
+
+
+
+
+//_____________________________________________________________________________
+// Adding vertices
+bool MC_Draw::add_vertex( char i, char j )
+//-----------------------------------------------------------------------------
+{
+  real ci = _cube[i] ;
+  real cj = _cube[j] ;
+  if( ci * cj >= 0 ) { _verts[i][j] = P_INV ; return false ; }
+  
+  _dat_access->interpolate( ci,cj, _space[i],_space[j], _verts[i][j] ) ;
+
+  return true ;
+}
+//-----------------------------------------------------------------------------
+
+bool MC_Draw::comp_c_vertex( )
+//-----------------------------------------------------------------------------
+{
+  real u = 0 ;
+
+  _c_vert.x() = _c_vert.y() = _c_vert.z() = 0 ;
+
+  // Computes the average of the intersection points of the cube
+  Point &v01 = _verts[0][1] ;  if( v01 != P_INV ) { ++u ; _c_vert += v01 ; }
+  Point &v12 = _verts[1][2] ;  if( v12 != P_INV ) { ++u ; _c_vert += v12 ; }
+  Point &v23 = _verts[2][3] ;  if( v23 != P_INV ) { ++u ; _c_vert += v23 ; }
+  Point &v30 = _verts[3][0] ;  if( v30 != P_INV ) { ++u ; _c_vert += v30 ; }
+  Point &v45 = _verts[4][5] ;  if( v45 != P_INV ) { ++u ; _c_vert += v45 ; }
+  Point &v56 = _verts[5][6] ;  if( v56 != P_INV ) { ++u ; _c_vert += v56 ; }
+  Point &v67 = _verts[6][7] ;  if( v67 != P_INV ) { ++u ; _c_vert += v67 ; }
+  Point &v74 = _verts[7][4] ;  if( v74 != P_INV ) { ++u ; _c_vert += v74 ; }
+  Point &v04 = _verts[0][4] ;  if( v04 != P_INV ) { ++u ; _c_vert += v04 ; }
+  Point &v15 = _verts[1][5] ;  if( v15 != P_INV ) { ++u ; _c_vert += v15 ; }
+  Point &v26 = _verts[2][6] ;  if( v26 != P_INV ) { ++u ; _c_vert += v26 ; }
+  Point &v37 = _verts[3][7] ;  if( v37 != P_INV ) { ++u ; _c_vert += v37 ; }
+  
+  _c_vert  /= u ;
+
+  return u > 0 ;
+}
+//_____________________________________________________________________________
+
+
+
diff --git a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/mc_draw.h b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/mc_draw.h
new file mode 100644
index 0000000000..c2099ee787
--- /dev/null
+++ b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/mc_draw.h
@@ -0,0 +1,116 @@
+/**
+ * @file    mc_draw.h
+ * @author  Thomas Lewiner <thomas.lewiner@polytechnique.org>
+ * @author  Math Dept, PUC-Rio
+ * @version 0.2
+ * @date    12/08/2002
+ *
+ * @brief   MarchingCubes Direct Draw
+ */
+//________________________________________________
+
+
+#pragma once
+
+#if !defined(WIN32) || defined(__CYGWIN__)
+#pragma interface
+#endif // WIN32
+
+#include <map>
+#include "point.h"
+#include "data_access.h"
+
+
+//_____________________________________________________________________________
+/** Marching Cubes algorithm wrapper */
+/** \class MarchingCubes Direct Draw
+  * \brief Marching Cubes Direct Draw.
+  */
+class MC_Draw
+//-----------------------------------------------------------------------------
+{
+// Constructors
+public :
+  /**
+   * Main and default constructor
+   * \brief constructor
+   */
+  MC_Draw () : _originalMC(true) {}
+  /** Destructor */
+  ~MC_Draw () {}
+
+//-----------------------------------------------------------------------------
+// Accessors
+public :
+  /**
+   * selects wether the algorithm will use the enhanced topologically controlled lookup table or the original MarchingCubes
+   * \param originalMC true for the original Marching Cubes
+   */
+  inline void set_method    ( const bool originalMC = false ) { _originalMC = originalMC ; }
+
+//-----------------------------------------------------------------------------
+// Algorithm
+public :
+  /** retrieves the isovalues at the cube vertices */
+  real             *cube   () { return _cube ; }
+  /** retrieves the geometry of the cube */
+  Point            *space  () { return _space; }
+  /** retrieves the data accessor */
+  data_access     *&dat_access() { return _dat_access ; }
+
+  /**
+   * Main algorithm
+   * \param iso isovalue
+   */
+  bool tesselate_cube( real iso ) ;
+
+protected :
+  /** tesselates one cube */
+  bool process_cube ()             ;
+  /** tests if the components of the tesselation of the cube should be connected by the interior of an ambiguous face */
+  bool test_face    ( schar face ) ;
+  /** tests if the components of the tesselation of the cube should be connected through the interior of the cube */
+  bool test_interior( schar s )    ;
+
+
+//-----------------------------------------------------------------------------
+// Operations
+protected :
+  /** computes almost all the vertices of the mesh by interpolation along the cubes edges */
+  bool compute_intersection_points() ;
+
+  /** adds a vertex on edge cube[i] cube[j] */
+  bool add_vertex( char i, char j ) ;
+
+  /** compute a vertex inside the current cube */
+  bool comp_c_vertex() ;
+
+  /**
+   * routine to add a triangle to the mesh
+   * \param trig the code for the triangle as a sequence of edges index
+   * \param n    the number of triangles to produce
+   * \param v12  the index of the interior vertex to use, if necessary
+   */
+  void draw_triangle ( const char* trig, char n, int v12 = -1 ) ;
+
+  /** prints cube for debug */
+  void print_cube() ;
+
+//-----------------------------------------------------------------------------
+// Elements
+protected :
+  bool      _originalMC ;   /**< selects wether the algorithm will use the enhanced topologically controlled lookup table or the original MarchingCubes */
+
+  real      _cube[8]     ;  /**< values of the implicit function on the active cube */
+  Point     _space[8]    ;  /**< coordinates of the active cube */
+  Point     _verts[8][8] ;  /**< coordinates of the vertices, per edge */
+  Point     _c_vert      ;  /**< coordinates of the central vertex */
+  uchar     _lut_entry   ;  /**< cube sign representation in [0..255] */
+  uchar     _case        ;  /**< case of the active cube in [0..15] */
+  uchar     _config      ;  /**< configuration of the active cube */
+  uchar     _subconfig   ;  /**< subconfiguration of the active cube */
+  data_access *_dat_access ;  /**< data accessor */
+};
+//_____________________________________________________________________________
+
+
diff --git a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/mem_octree.cpp b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/mem_octree.cpp
new file mode 100644
index 0000000000..9aa6df57ba
--- /dev/null
+++ b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/mem_octree.cpp
@@ -0,0 +1,1111 @@
+/**
+ * \file    mem_octree.cpp
+ * \author  Thomas Lewiner   <tomlew@puc-rio.br>
+ * \author  Matmidia Lab, Math Dept, PUC-Rio
+ * \date    10/01/2010
+ *
+ *  Octree structure with hashtable and optimized operations without auxiliary memory
+ */
+//_____________________________________________________________________________
+
+
+#ifndef WIN32
+#pragma implementation
+#endif // WIN32
+
+
+#include <stack>
+#include "mem_octree.h"
+
+
+//_____________________________________________________________________________
+// Create the root
+void MemOctree::init()
+//-----------------------------------------------------------------------------
+{
+  _max_field = R_INV ;
+  _opt_level = L_INV ;
+  memset( _level_dist, 0, (MAX_LEVEL+1)*sizeof(uint) ) ;
+
+  HashField::KeyData kd ;
+  kd.key  =  1  ;
+  kd.data = 0.0 ;
+  _hash.insert( kd ) ;
+
+  _level_dist[0] = 1 ;
+}
+//_____________________________________________________________________________
+
+
+
+
+//_____________________________________________________________________________
+/// Compute the optimal level
+void MemOctree::compute_opt_level()
+//-----------------------------------------------------------------------------
+{
+  Level left     = 0 ;
+  Level right    = MAX_LEVEL ;
+  uint  leftsum  =  0 ;
+  uint  rightsum =  0 ;
+  while( left < right )
+  {
+    uint leftsum_old = leftsum ;
+    if( leftsum <= rightsum )
+    {
+      leftsum += _level_dist[ left ] ;
+      ++left ;
+    }
+    if( leftsum_old >= rightsum )
+    {
+      rightsum += _level_dist[ right ] ;
+      --right ;
+    }
+  }  
+  _opt_level = right ;
+}
+//_____________________________________________________________________________
+
+
+//_____________________________________________________________________________
+// Check that each point scan or scribble is in the right node
+bool MemOctree::check ()
+//-----------------------------------------------------------------------------
+{
+  bool result = true ;
+
+  uint level_dist[MAX_LEVEL+1] ;
+  memset( level_dist, 0, (MAX_LEVEL+1)*sizeof(uint) ) ;
+  for( cell_iterator it = cells_begin() ; it() ; ++it )
+  {
+    if( is_leaf( it.key() ) )
+      level_dist[ key_level(it.key()) ] ++ ;
+    Key k = it.key() << 3 ;
+    bool has_son = false ;
+    bool all_sons = true  ;
+    for( int i = 0 ; i < 8 ; ++i )
+    {
+      if( _hash[ k | i ].key != KEY_INV )
+        has_son = true ;
+      else
+        all_sons = false ;
+    }
+    
+    if( it.is_leaf() && has_son )
+    {
+      printf("(mem) Invalid leaf %d: value %f\n", (int)k, _hash[k].data ) ;
+      result = false ;
+    }
+
+    if( has_son && !all_sons )
+    {
+      printf("(mem) Invalid subdivision %d: value %f\n", (int)k, _hash[k].data ) ;
+      result = false ;
+    }
+  }
+
+  for( Level lv = 0 ; lv <= MAX_LEVEL ; ++lv )
+  {
+    if( _level_dist[lv] != level_dist[lv] )
+    {
+      printf("(mem) Invalid level statistic %d: %d != %d\n", (int)lv, (int)_level_dist[lv], (int)level_dist[lv] ) ;
+      result = false ;
+    }
+  }
+
+  return result ;
+}
+//_____________________________________________________________________________
+
+
+
+
+
+//_____________________________________________________________________________
+// Deletes the content of the octree
+void MemOctree::clear_octree()
+//-----------------------------------------------------------------------------
+{
+  _hash .reset() ;
+  _max_field = R_INV ;
+  _opt_level = L_INV ;
+  memset( _level_dist, 0, (MAX_LEVEL+1)*sizeof(uint) ) ;
+}
+//_____________________________________________________________________________
+
+
+
+
+
+//_____________________________________________________________________________
+// set the values of each leaf from the implicit function
+bool MemOctree::set_impl( data_access *ref )
+//-----------------------------------------------------------------------------
+{
+  if( !ref ) return false ;
+  
+  _max_field = -FLT_MAX ;
+  for( cell_iterator it = cells_begin() ; it() ; ++it )
+  {
+    if( it.is_leaf() )
+    {
+      real v = (*ref).value_at( it.top() ) ;
+      *it = v ;
+      v = fabs(v) ;
+      if( _max_field < v ) _max_field = v ;
+    }
+//    else
+//      *it = R_INV ;
+  }
+  
+//  printf( "max field: %f\n", max_field() ) ;
+  return true ;
+}
+//_____________________________________________________________________________
+
+
+
+
+
+//_____________________________________________________________________________
+// Refine the octree according to the data access
+bool MemOctree::refine( data_access *ref /*= NULL*/ )
+//-----------------------------------------------------------------------------
+{
+  if( !ref ) return false ;
+
+    clear() ;  init() ;
+
+  // traversal stack: iterator has a pre-ordered stack, and cannot be recursed on
+  geom_cell it = geom_root() ;
+  std::stack< geom_cell > s ;
+  s.push( it ) ;
+  
+  // although it may refine only the leaves
+  // the leaf iterator may change during the refinement
+  bool refined = false ;
+  while( !s.empty() )
+  {
+    it = s.top() ;  s.pop() ;
+
+    // test for subdivision
+    if( !(*ref).need_refine( it ) ) continue ;
+    refined = true ;
+    
+    //_____________________________________________________________________________
+    // subdivides the cell in the tree
+    _hash[it.key()].data = it._field = R_INV ;
+    HashField::KeyData kd ;
+    kd.data = 0.0 ;
+
+    // recurse on the traversal
+    Key sk = it.key() << 3 ;
+    for( int i = 0 ; i < 8 ; ++i )
+    {
+      kd.key = sk | i ;
+      if( !_hash.insert( kd ) )
+      {
+        printf( "hash table saturated!\n" ) ;
+        exit(1) ;
+        return false ;
+      }
+      
+      s.push( geom_cell( kd.key, kd.data ) ) ;
+    }
+    Level lv = it.lv() ;
+    _level_dist[ lv ] -= 1 ;
+    _level_dist[lv+1] += 8 ;
+  }
+  
+  compute_opt_level() ;
+
+  return refined ;
+}
+//_____________________________________________________________________________
+
+
+
+//_____________________________________________________________________________
+// Refine the octree according to the data access
+bool MemOctree::adapt( data_access *ref /*= NULL*/ )
+//-----------------------------------------------------------------------------
+{
+  if( !ref ) return false ;
+
+#ifdef HASH_HAS_ERASE
+    
+  // traversal stack: iterator has a pre-ordered stack, and cannot be recursed on
+  geom_cell it = geom_root() ;
+  std::stack< geom_cell > s ;
+  s.push( it ) ;
+  
+  // although it may refine only the leaves
+  // the leaf iterator may change during the refinement
+  geom_cell sons[8] ;
+  bool refined = false ;
+  while( !s.empty() )
+  {
+    it = s.top() ;  s.pop() ;
+//    printf( "mem key %d\n", (int) it.key() ) ;
+
+    // look for the leaves
+    if( !it.is_leaf() )
+    {
+      if( !(*ref).need_refine( it ) )
+      {
+        std::stack< std::pair<Key,Level> > del_s ; // avoid level recomputation
+        del_s.push( std::make_pair( it.key(), it.lv() ) ) ;
+        while( !del_s.empty() )
+        {
+          Key n    = del_s.top().first << 3 ;
+          Level lv = del_s.top().second + 1 ;
+          del_s.pop() ;
+          
+          for( int i = 0 ; i < 8 ; ++i )
+          {
+            HashField::KeyData kd = _hash.erase( n|i ) ;
+            if( !is_inv( kd.data ) ) // is_leaf(n)
+            {
+              _level_dist[ lv ] -- ;
+              continue ;
+            }
+            del_s.push( std::make_pair( n|i, lv ) ) ;
+          }
+        }
+
+        refined = true ;
+        _level_dist[it.lv()] += 1 ;
+        _hash[it.key()].data = 0.0 ; // leaf now!
+        continue ;
+      }
+      
+      it.sons( sons, _hash ) ;
+      for( int i = 0 ; i < 8 ; ++i )
+        s.push( sons[i] ) ;
+      
+      continue ;
+    }
+
+    // test for subdivision
+    if( !(*ref).need_refine( it ) ) continue ;
+    refined = true ;
+    
+    //_____________________________________________________________________________
+    // subdivides the cell in the tree
+    _hash[it.key()].data = it._field = R_INV ;
+    HashField::KeyData kd ;
+    kd.data = 0.0 ;
+    
+    // recurse on the traversal
+    Key sk = it.key() << 3 ;
+    for( int i = 0 ; i < 8 ; ++i )
+    {
+      kd.key = sk | i ;
+      if( !_hash.insert( kd ) )
+      {
+        printf( "hash table saturated!\n" ) ;
+        exit(1) ;
+        return false ;
+      }
+      
+      s.push( geom_cell( kd.key, kd.data ) ) ;
+    }
+    
+    Level lv = it.lv() ;
+    _level_dist[ lv ] -= 1 ;
+    _level_dist[lv+1] += 8 ;
+  }
+  
+  compute_opt_level() ;
+  return refined ;
+  
+#else  // HASH_HAS_ERASE
+  // no remotion in the hash table!
+  return refine( ref ) ;
+#endif // HASH_HAS_ERASE
+}
+//_____________________________________________________________________________
+
+
+
+
+
+//_____________________________________________________________________________
+// Draw the octree with wireframe
+bool MemOctree::draw_wire()
+//-----------------------------------------------------------------------------
+{
+  for( leaf_iterator it = leaves_begin() ; it() ; ++it )
+    it.draw_wire() ;
+  
+  return true ;
+}
+//_____________________________________________________________________________
+
+
+
+
+
+//_____________________________________________________________________________
+// Draw the octree with dots
+bool MemOctree::draw_centers()
+//-----------------------------------------------------------------------------
+{
+  for( cell_iterator it = cells_begin() ; it() ; ++it )
+  {
+    ::glTexCoord1f( (GLfloat)fabs(*it / max_field()) ) ;
+    it.top().draw() ;
+  }
+  
+  return true ;
+}
+//_____________________________________________________________________________
+
+
+
+
+//_____________________________________________________________________________
+// Octree dual caller
+bool MemOctree::dual_cubes_walk( mem_dual_walker &walker )
+//-----------------------------------------------------------------------------
+{
+  bool result = true ;
+
+  // add all the inner vertices
+  for( leaf_iterator l_it = leaves_begin() ; l_it() ; ++l_it )
+  {
+    Key verts_k[8] ;
+    Level lv = vertices_keys( l_it.key(), verts_k ) ;
+
+    Key *v_ptr = verts_k ;
+    for( int i = 0 ; i < 8 ; ++i, ++v_ptr )
+    {
+      Key k = *v_ptr ;
+      if( k == KEY_INV ) continue ;
+
+      Key dual_verts[8] ;
+      dual_vertices_keys( k, lv, dual_verts ) ;
+      
+      bool run_walker = true ;
+      Key *dv_ptr = dual_verts ;
+      for( int j = 0 ; j < 8 ; ++j, ++dv_ptr )
+      {
+        if( j == i ) continue ;
+        
+        HashField::KeyData kd ;
+        
+        // neighbor has bigger size: skip
+        //   must be processed by the deepest level
+        if( !node_exists(*dv_ptr,kd) )
+          continue ;
+        
+        // neighbor is deeper: break
+        //   will be processed by that neighbor
+        if( !is_leaf(kd) )
+        {
+          run_walker = false ;
+          break ;
+        }
+        
+        // neighbor has same level
+        //   choose the first one in the order
+        if( j < i )
+        {
+          run_walker = false ;
+          break ;
+        }
+      }
+
+      if( run_walker )
+      {
+        dv_ptr = dual_verts ;
+        for( int j = 0 ; j < 8 ; ++j, ++dv_ptr )
+        {
+          // find_at, only the level too high case
+          Key &ki = *dv_ptr ;
+          HashField::KeyData kd ;
+          while( ki != 0 && !node_exists(ki,kd) )
+            ki >>= 3;
+        }
+        result &= walker( *this, dual_verts ) ;
+      }
+    }
+  }
+
+  return result ;
+}
+//_____________________________________________________________________________
+
+
+
+
+//_____________________________________________________________________________
+// Isosurface walker
+bool mem_isosurface_walker( MemOctree &fo, Key *keys )
+//-----------------------------------------------------------------------------
+{
+  MarchingCubes &mc = fo.mc() ;
+  
+  /** isovalues at the cube vertices */
+  real            *cube    = mc.cube() ;
+  /** geometry of the cube */
+  Point           *space   = mc.space() ;
+  /** indexes of the cube */
+  Key             *indexes = mc.indexes() ;
+  
+  for( int j = 0 ; j < 8 ; ++j )
+  {
+    int i = (j==2)?3:(j==3)?2:(j==7)?6:(j==6)?7:j ;
+    const Key k = keys[j] ;
+    MemOctree::geom_cell c = fo.geom_key(k) ;
+    cube[i] = *c ;
+    
+    space[i] = (Point)c ;
+    indexes[i] = k ;
+  }
+  
+  mc.tesselate_cube( 0.0 ) ;
+  
+  return true ;
+}
+//_____________________________________________________________________________
+
+
+
+
+//_____________________________________________________________________________
+// Build the isosurface using dual marching cubes
+bool MemOctree::build_isosurface( data_access *ref )
+//-----------------------------------------------------------------------------
+{
+  if( !ref ) return false ;
+  _mc.dat_access() = ref ;
+  
+    printf( "Build isosurface... " ) ;
+  bool result = false ;
+  
+  //_________________________________________________________________________
+  // Dual Marching Cubes
+  
+  _mc.init_all() ; 
+  
+  result = dual_cubes_walk( mem_isosurface_walker ) ;
+  
+  _mc.clean_temps() ;
+  
+  printf( "generated %d vertices and %d faces!\n", _mc.nverts(), _mc.ntrigs() ) ;
+  
+  return result ;
+}
+//_____________________________________________________________________________
+
+
+
+
+
+//_____________________________________________________________________________
+// Isosurface drawing walker
+bool mem_direct_isosurface_walker( MemOctree &fo, Key *keys )
+//-----------------------------------------------------------------------------
+{
+  MC_Draw &mc = fo.mc_draw() ;
+  
+  /** isovalues at the cube vertices */
+  real            *cube    = mc.cube() ;
+  /** geometry of the cube */
+  Point           *space   = mc.space() ;
+  
+  for( int j = 0 ; j < 8 ; ++j )
+  {
+    int i = (j==2)?3:(j==3)?2:(j==7)?6:(j==6)?7:j ;
+    const MemOctree::geom_cell c = fo.geom_key( keys[j] ) ;
+    cube[i] = *c ;
+    
+    space[i] = (Point)c ;
+  }
+  
+  mc.tesselate_cube( 0.0 ) ;
+  
+  return true ;
+}
+//_____________________________________________________________________________
+
+
+
+//_____________________________________________________________________________
+// Build the isosurface using dual marching cubes
+bool MemOctree::direct_draw_isosurface( data_access *ref )
+//-----------------------------------------------------------------------------
+{
+  if( !ref ) return false ;
+  _mc_draw.dat_access() = ref ;
+  
+    bool result = false ;
+  
+  // Dual Marching Cubes
+  ::glBegin( GL_TRIANGLES ) ;
+  {
+    result = dual_cubes_walk( mem_direct_isosurface_walker ) ;
+  }
+  ::glEnd() ; // GL_TRIANGLES
+  
+  return result ;
+}
+//_____________________________________________________________________________
+
+
+
+
+
+
+//_____________________________________________________________________________
+// Draw walker
+bool mem_draw_walker( MemOctree &fo, Key *keys )
+//-----------------------------------------------------------------------------
+{
+  Cube cells[8] ;
+  for( int i = 0 ; i < 8 ; ++i )
+    cells[i] = key2cube( keys[i] ) ;
+  
+  ((Point)cells[0]).draw() ;
+  ((Point)cells[1]).draw() ;
+  
+  ((Point)cells[1]).draw() ;
+  ((Point)cells[3]).draw() ;
+  
+  ((Point)cells[3]).draw() ;
+  ((Point)cells[2]).draw() ;
+  
+  ((Point)cells[2]).draw() ;
+  ((Point)cells[0]).draw() ;
+  
+  ((Point)cells[4]).draw() ;
+  ((Point)cells[5]).draw() ;
+  
+  ((Point)cells[5]).draw() ;
+  ((Point)cells[7]).draw() ;
+  
+  ((Point)cells[7]).draw() ;
+  ((Point)cells[6]).draw() ;
+  
+  ((Point)cells[6]).draw() ;
+  ((Point)cells[4]).draw() ;
+  
+  ((Point)cells[0]).draw() ;
+  ((Point)cells[4]).draw() ;
+  
+  ((Point)cells[1]).draw() ;
+  ((Point)cells[5]).draw() ;
+  
+  ((Point)cells[2]).draw() ;
+  ((Point)cells[6]).draw() ;
+  
+  ((Point)cells[3]).draw() ;
+  ((Point)cells[7]).draw() ;
+  
+  return true ;
+}
+//_____________________________________________________________________________
+
+
+
+
+//_____________________________________________________________________________
+// Draw the dual octree with wireframe
+bool MemOctree::draw_dual()
+//-----------------------------------------------------------------------------
+{
+  ::glBegin( GL_LINES ) ;
+  bool result = dual_cubes_walk( mem_draw_walker ) ;
+  ::glEnd() ;  // GL_LINES
+  
+  return result ;
+}
+//_____________________________________________________________________________
+
+
+
+
+//_____________________________________________________________________________
+// Do nothing walker, just for dual generation timing
+bool mem_timing_walker( MemOctree &fo, Key *keys )
+//-----------------------------------------------------------------------------
+{
+  return true ;
+}
+//_____________________________________________________________________________
+
+
+//_____________________________________________________________________________
+// Do nothing, just for dual generation timing
+bool MemOctree::dual_timing()
+//-----------------------------------------------------------------------------
+{
+    return dual_cubes_walk( mem_timing_walker ) ;
+}
+//_____________________________________________________________________________
+
+
+
+
+
+//_____________________________________________________________________________
+// Prints statistics about the octree
+void MemOctree::stats() const
+//-----------------------------------------------------------------------------
+{
+  int s = _hash.size() ;
+  printf( " number of nodes:\t%d\n", s ) ;
+#if USE_HASH_PTR
+  printf( " total memory:\t%d\n", (int) ( s * sizeof(HashField::KeyBucket) ) ) ;
+  _hash.stats() ;
+#else  // USE_HASH_PTR 
+  printf( " total memory:\t%d\n", (int) ( s * sizeof(HashField::KeyData  ) ) ) ;
+#endif // USE_HASH_PTR
+  
+  printf( " leaves' levels:\t" ) ;
+  for( Level l = 0 ; l <= MAX_LEVEL; ++l )
+    printf( "\t%d", _level_dist[l] ) ;
+  printf( "\n" ) ;
+}
+//_____________________________________________________________________________
+
+
+
+
+
+//_____________________________________________________________________________
+//_____________________________________________________________________________
+// search operations
+
+
+//_____________________________________________________________________________
+// Find cells of the octree at a given position
+bool MemOctree::find_leaf( Key k, Level o_lv, geom_cell &n ) const
+//-----------------------------------------------------------------------------
+{
+    
+  Level   shift = 3*(MAX_LEVEL-o_lv) ;
+  Key     ki    = k >> shift ;
+  HashField::KeyData kd ;
+  
+  // level too high
+  if( !node_exists(ki,kd) )
+  {
+    do
+    {
+      ki >>= 3;
+    }
+    while( ki !=0 && !node_exists(ki,kd) ) ;
+  }
+  // level correct or too low
+  else
+  {
+    HashField::KeyData kd_temp ;
+    do
+    {
+      kd_temp = kd ;
+      shift -= 3 ;
+      ki = k >> shift ;
+    }
+    while( ki !=0 && node_exists(ki,kd) ) ;
+    kd = kd_temp ;
+  }
+  n = geom_cell( kd ) ;
+
+  return kd.key != KEY_INV ;
+}
+//_____________________________________________________________________________
+
+
+
+//_____________________________________________________________________________
+// Find cells of the octree inside a given box of center x,y and half side r
+bool MemOctree::find_radius( real x, real y, real z, real r, List<geom_cell> &cells ) const
+//-----------------------------------------------------------------------------
+{
+    
+  cells.clear() ;
+
+  Level lv_b = (Level)floor( log(r)/log(0.5) ) ;
+  Key   k_b  = cube2key( Cube(x,y,z,lv_b) ) ;
+
+  Key neighbors[27] ;
+  neighbor_keys( k_b, neighbors ) ;
+
+  std::stack<Key> s ;
+  s.push( k_b ) ;
+  
+  Key *k_ptr = neighbors ;
+  for( int dir = 0 ; dir < 27 ; ++dir, ++k_ptr )
+    s.push( *k_ptr ) ;
+  
+  while( !s.empty() )
+  {
+    Key ki = s.top() ;
+    s.pop() ;
+    if( ki == KEY_INV ) continue ;
+    
+    HashField::KeyData kd ;
+    if( node_exists(ki,kd) )
+    {
+      if( is_leaf( kd ) )
+      {
+        geom_cell gc(kd) ;
+        real sz = gc.sz() + r ;
+
+        // test directly with the key?
+        if( fabs( x-gc.x() ) <= sz && fabs( y-gc.y() ) <= sz && fabs( z-gc.z() ) <= sz )
+          cells.insert( gc ) ;
+      }
+      else 
+      {
+        Key ski = ki << 3 ;
+        for( int i = 0 ; i < 8 ; ++i )
+          // test directly with the key before insertion?
+          s.push( ski | i ) ;
+      }
+    }        
+    else
+    {
+      HashField::KeyData kd ;
+      do
+      {
+        ki >>= 3 ;
+      } while( ki !=0 && !node_exists(ki,kd) ) ;
+      
+      if( ki > 0 )
+      {
+        geom_cell gc(kd) ;
+        real sz = gc.sz() + r ;
+
+        // test directly with the key?
+        if( fabs( x-gc.x() ) <= sz && fabs( y-gc.y() ) <= sz && fabs( z-gc.z() ) <= sz )
+          cells.insert_unique( gc ) ;
+      }
+    }
+  }
+  
+  return true ;
+}
+//_____________________________________________________________________________
+
+
+
+//_____________________________________________________________________________
+// Find neighbor cells of the octree to a given cell
+bool MemOctree::adjacent( Key k, List<geom_cell> &cells ) const
+//-----------------------------------------------------------------------------
+{
+    
+  cells.clear() ;
+
+  Key neighbors[27] ;
+  neighbor_keys( k, neighbors ) ;
+  
+  Key *k_ptr = neighbors ;
+  for( int dir = 0 ; dir < 27 ; ++dir, ++k_ptr )
+  {
+    Key ki = *k_ptr ;
+    if( ki == KEY_INV ) continue ;
+    
+    HashField::KeyData kd ;
+    if( node_exists(ki,kd) )
+    {
+      if( is_leaf( kd ) ) cells.insert( geom_cell(kd) );        
+      else 
+      {
+        std::stack<Key> subneighbors ;
+        subneighbor_keys(ki, dir, subneighbors ) ;
+        while( !subneighbors.empty() )
+        {
+          Key ski = subneighbors.top() ;
+          subneighbors.pop() ;
+          
+          real sdi ;
+          if( is_leaf( ski, sdi ) )
+            cells.insert( geom_cell( ski, sdi ) ) ;
+          else
+            subneighbor_keys(ski, dir, subneighbors ) ;
+        }
+      }
+    }        
+    else
+    {
+      HashField::KeyData kd ;
+      do
+      {
+        ki >>= 3 ;
+      } while( ki !=0 && !node_exists(ki,kd) ) ;
+
+      if( ki > 0 )
+        cells.insert_unique( geom_cell(kd) ) ;
+    }
+  }
+  
+  return true ;
+}
+//_____________________________________________________________________________
+
+
+
+//_____________________________________________________________________________
+//_____________________________________________________________________________
+// I/O
+
+//_____________________________________________________________________________
+// Draws the intersecting cells of a plane with the octree with color
+void MemOctree::draw_plane ( real nx, real ny, real nz, real d )
+//-----------------------------------------------------------------------------
+{
+  geom_cell n = geom_root() ;
+  
+  std::stack< geom_cell > s ;
+  s.push( n ) ;
+  
+  //_____________________________________________________________________________
+  // retrieve the index of the most positive cube corner
+  bool fx = nx >= 0 ;
+  bool fy = ny >= 0 ;
+  bool fz = nz >= 0 ;
+  
+  //_____________________________________________________________________________
+  
+  ::glLineWidth( 1.0f ) ;
+  ::glDisable( GL_LIGHTING ) ;
+  
+  real px,py,pz, mx,my,mz ;
+  while( !s.empty() )
+  {
+    n = s.top() ;  s.pop() ;
+    
+    if( n.is_leaf() )
+    {		
+      
+      ::glTexCoord1f( (GLfloat)fabs(*n/max_field()) ) ;
+      ::glBegin( GL_LINES ) ;
+      n.draw_wire() ;
+      ::glEnd() ;  // GL_LINES		
+      
+      continue ;
+    }
+    
+    //___________________________________________________________________________
+    // recursion
+    geom_cell sons[8] ;
+    n.sons( sons, _hash ) ;
+    real sz_ = sons[0].sz() ;
+    for( int i = 0 ; i < 8 ; ++i )
+    {
+      // get the coordinates of the extremum vertices
+      if( fx ) { px = sons[i].cx() + sz_ ;  mx = sons[i].cx() - sz_ ; }
+      else     { px = sons[i].cx() - sz_ ;  mx = sons[i].cx() + sz_ ; }
+      if( fy ) { py = sons[i].cy() + sz_ ;  my = sons[i].cy() - sz_ ; }
+      else     { py = sons[i].cy() - sz_ ;  my = sons[i].cy() + sz_ ; }
+      if( fz ) { pz = sons[i].cz() + sz_ ;  mz = sons[i].cz() - sz_ ; }
+      else     { pz = sons[i].cz() - sz_ ;  mz = sons[i].cz() + sz_ ; }
+      
+      // plane/cube intersection test
+      if( (nx * px + ny * py + nz * pz + d >= 0.0) && (nx * mx + ny * my + nz * mz + d <= 0.0)  )
+        s.push( sons[i] ) ;
+    }
+  }
+}
+//_____________________________________________________________________________
+
+
+
+
+
+//_____________________________________________________________________________
+// Draws the intersection of a plane with the octree with color
+void MemOctree::draw_slice ( real nx, real ny, real nz, real d, float alpha )
+//-----------------------------------------------------------------------------
+{
+  geom_cell n = geom_root() ;
+  
+  std::stack< geom_cell > s ;
+  s.push( n ) ;
+  
+  // retrieve the index of the most positive cube corner
+  bool fx = nx >= 0 ;
+  bool fy = ny >= 0 ;
+  bool fz = nz >= 0 ;
+  
+  
+  
+  //_____________________________________________________________________________
+  
+  ::glDisable( GL_LIGHTING ) ;
+  
+  real px,py,pz, mx,my,mz ;
+  while( !s.empty() )
+  {
+    n = s.top() ;  s.pop() ;
+    if( n.is_leaf() )
+    {
+      // retrieves the signs of each cube corner
+      real val[8] ;
+      real v   = nx * n.cx() + ny * n.cy() + nz * n.cz() + d ;
+      real sz_ = n.sz() ;
+      int zeros = 0 ;
+      for( int i = 0 ; i < 8 ; ++i )
+      {
+        val[i] = v + nx * ((i&1)?sz_:-sz_) + ny * ((i&2)?sz_:-sz_) + nz * ((i&4)?sz_:-sz_) ;
+        if( fabs(val[i]) < R_EPSILON ) { val[i] = R_EPSILON ;  ++zeros ; }
+      }
+      
+      //_________________________________________________________________________
+      // degenerated intersection
+      if( zeros > 0 )
+      {
+        int npos = 0, nneg = 0 ;
+        for( int i = 0 ; i < 8 ; ++i )
+        {
+          if( fabs(val[i]) < R_EPSILON ) continue ;
+          if( val[i] < 0 )
+            ++nneg ;
+          else
+            ++npos ;
+        }
+        float def = (nneg>npos) ? (float)R_EPSILON : -(float)R_EPSILON ;
+        
+        for( int i = 0 ; i < 8 ; ++i )
+        {
+          if( fabs(val[i]) < R_EPSILON ) val[i] = def ;
+        }
+        //        continue ;
+      }
+      
+      //_________________________________________________________________________
+      // Continuation method
+      int v0=-1, v1=-1 ;  // current edge vertices
+      
+      // get the first intersection
+      static int edges[12][2] = { {0,1}, {0,2}, {0,4}, {1,3}, {1,5}, {2,3}, {2,6}, {3,7}, {4,5}, {4,6}, {5,7}, {6,7} } ;
+      for( int e = 0 ; e < 12 ; ++e )
+      {
+        if( val[ edges[e][0] ] * val[ edges[e][1] ] < 0 )
+        {
+          v0 = edges[e][0] ;
+          v1 = edges[e][1] ;
+          break ;
+        }
+      }
+      int  ov0 = v0, ov1 = v1 ;
+      
+      
+      // equation of previous face adjacent to v0v1: v>>c & 1 == s (c-th coordinate equal to +/- 1)
+      int pf = -1 ;  bool ps ;
+      if       ( (v0 & 1) == (v1 & 1) )   { pf = 0 ; ps = ((v0 & 1) /*>> 0*/) == 1 ; }
+      else   if( (v0 & 2) == (v1 & 2) )   { pf = 1 ; ps = ((v0 & 2)   >> 1  ) == 1 ; }
+      else /*if( (v0 & 4) == (v1 & 4) )*/ { pf = 2 ; ps = ((v0 & 4)   >> 2  ) == 1 ; }
+      
+      //      printf( "cube %d %d %d %d %d %d %d %d, march : (%d,%d) ", val[0]>0, val[1]>0, val[2]>0, val[3]>0, val[4]>0, val[5]>0, val[6]>0, val[7]>0, v0, v1 ) ;
+      
+      //_________________________________________________________________________
+      // marching
+      
+      GLfloat color = (GLfloat)fabs(*n / max_field()) ;
+		  //cmap.gl_color( at(*n) ) ;	
+      ::glBegin( GL_POLYGON ) ;
+      {
+        do
+        {
+          // equation of next face adjacent to v0v1
+          int nf = -1 ;  bool ns ;
+          if       ( pf != 0 && ((v0 & 1) == (v1 & 1)) )   { nf = 0 ; ns = ((v0 & 1) /*>> 0*/) == 1 ; }
+          else   if( pf != 1 && ((v0 & 2) == (v1 & 2)) )   { nf = 1 ; ns = ((v0 & 2)   >> 1  ) == 1 ; }
+          else /*if( pf != 2 && ((v0 & 4) == (v1 & 4)) )*/ { nf = 2 ; ns = ((v0 & 4)   >> 2  ) == 1 ; }
+          
+          /* equivalent construction
+           // get the direction perpendicular to v0v1
+           int of = (v0 ^ v1) & 7 ; // only bit of difference
+           of = of==1 ? 0 : (of==2 ? 1 : 2) ;
+           
+           // compute the equation of the next face adjacent to v0v1
+           int  nf = 3 - (pf+of) ;    // third option: {pf,nf,of}={0,1,2}
+           bool ns = (v0 >> nf) & 1 ; // value of the edge on that direction
+           */
+          
+          // compute the two next vertices (invert the pf-th bit
+          int v2 = ps ? ( v0 & (~(1<<pf)) ) : ( v0 | (1<<pf) ) ;
+          int v3 = ps ? ( v1 & (~(1<<pf)) ) : ( v1 | (1<<pf) ) ;
+          
+          // get the characteristic of the square
+          int  c = (val[v3] > 0) | ((val[v2] > 0) << 1) | ((val[v1] > 0) << 2) | ((val[v0] > 0) << 3) ;
+          if( c > 7 ) c = (~c)&7 ; // consider v0 as negative, and thus v1 as positive
+          /*
+           if( c < 4 )
+           { // degenerated intesection
+           printf( "degenerated intersection %d!\n", c ) ;
+           }
+           */
+          
+          //_______________________________________________________________________
+          // method of continuity on the cube surface
+          switch( c )
+          {
+            case  4 : v0 = v3 ;  break ;
+            case  5 : v0 = v2 ;  v1 = v3 ;  break ;
+            case  6 : /* impossible case */ break ;
+            case  7 : v1 = v2 ;  break ;
+          }
+          
+          
+          
+          
+          real cx =  n.cx();
+          real cy =  n.cy(); 
+          real cz =  n.cz();
+          real sz =  sz_;   
+          real a0 = val[v0];  
+          int i0 = v0; 
+          real a1 = val[v1];  
+          int i1  = v1;
+          
+          real w0 = a1 / (a1-a0) ;
+          real w1 = a0 / (a0-a1) ;
+          
+          real x = cx + w0 * ((i0&1)?sz:-sz) + w1 * ((i1&1)?sz:-sz);
+          real y = cy + w0 * ((i0&2)?sz:-sz) + w1 * ((i1&2)?sz:-sz);
+          real z = cz + w0 * ((i0&4)?sz:-sz) + w1 * ((i1&4)?sz:-sz);
+          
+          ::glTexCoord1d( color ) ;
+          ::glVertex3d(x, y, z) ;
+          
+          // next face
+          pf = nf ;  ps = ns ;
+          
+          //          printf( "(%d,%d) ", v0, v1 ) ;
+        } while( v0 != ov0 || v1 != ov1 ) ;
+        //        printf( "\n" ) ;
+      }
+      ::glEnd() ; // GL_POLYGON
+      
+      continue ;
+    }
+    
+    //___________________________________________________________________________
+    // recursion
+    geom_cell sons[8] ;
+    n.sons( sons, _hash ) ;
+    real sz_ = sons[0].sz() ;
+    for( int i = 0 ; i < 8 ; ++i )
+    {
+      // get the coordinates of the extremum vertices
+      if( fx ) { px = sons[i].cx() + sz_ ;  mx = sons[i].cx() - sz_ ; }
+      else     { px = sons[i].cx() - sz_ ;  mx = sons[i].cx() + sz_ ; }
+      if( fy ) { py = sons[i].cy() + sz_ ;  my = sons[i].cy() - sz_ ; }
+      else     { py = sons[i].cy() - sz_ ;  my = sons[i].cy() + sz_ ; }
+      if( fz ) { pz = sons[i].cz() + sz_ ;  mz = sons[i].cz() - sz_ ; }
+      else     { pz = sons[i].cz() - sz_ ;  mz = sons[i].cz() + sz_ ; }
+      
+      // plane/cube intersection test
+      if( (nx * px + ny * py + nz * pz + d >= 0.0) && (nx * mx + ny * my + nz * mz + d <= 0.0)  )
+        s.push( sons[i] ) ;
+    }
+  }
+}
+//_____________________________________________________________________________
+
diff --git a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/mem_octree.h b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/mem_octree.h
new file mode 100644
index 0000000000..a161235b44
--- /dev/null
+++ b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/mem_octree.h
@@ -0,0 +1,367 @@
+/**
+ * \file    mem_octree.h
+ * \author  Thomas Lewiner   <tomlew@puc-rio.br>
+ * \author  Matmidia Lab, Math Dept, PUC-Rio
+ * \date    10/01/2010
+ *
+ *  Octree structure with hashtable and optimized operations without auxiliary memory
+ */
+//_____________________________________________________________________________
+
+
+#pragma once
+
+
+#ifndef WIN32
+#pragma interface
+#endif // WIN32
+
+
+#include "mlist.h"
+#include "cube.h"
+#include "hash.h"
+#include "MarchingCubes.h"
+#include "mc_draw.h"
+#include "data_access.h"
+
+
+
+//_____________________________________________________________________________
+// MemOctree
+/// \class MemOctree MemOctree.h
+class MemOctree
+//-----------------------------------------------------------------------------
+{
+// forward declaration
+public:
+  class geom_cell  ;
+  class cell_iterator  ;
+  class leaf_iterator  ;
+
+// Elements
+protected:
+  /// Octree cell data structure
+  typedef Hash<real>  HashField ;
+
+  /// Hashtable of the octree nodes
+  HashField _hash ;
+  
+  /// Level distribution of the octree
+  uint _level_dist[MAX_LEVEL+1] ;
+  
+  /// Memimal level for direct search in the octree
+  Level _opt_level ;
+  
+  /// Maximal field of the octree
+  real _max_field ;
+  
+  /// Isosurface
+  MarchingCubes _mc ;
+
+  /// Isosurface Draw
+  MC_Draw _mc_draw ;
+
+//-----------------------------------------------------------------------------
+// Constructors
+public:
+  /// Default constructor: Constructs a octree with and empty root
+  MemOctree() { init() ; }
+
+  /// Destructor: Free memory
+  ~MemOctree() { clear() ; }
+
+
+  /// Create the root
+  void init() ;
+
+  /// Memory cleaning
+  void clear() { clear_octree() ;  _mc.clean_all() ; }
+
+  /// Delete the content of the octree
+  void clear_octree() ;
+
+  /// Compute the optimal level
+  void compute_opt_level() ;
+  
+  /// Check that only the leaves have data
+  bool check () ;
+
+  /// Prints statistics about the octree
+  void stats() const ;
+
+  /// Return the maximal level of the octree
+  Level  max_level() const { Level lv = MAX_LEVEL ; while( lv > 0 && !_level_dist[lv] ) --lv ; return lv ; }
+  
+  /// Return the optimal level of the octree
+  Level  opt_level() const { return _opt_level ; }
+  
+  /// Return the optimal level of the octree
+  Level &opt_level()  { return _opt_level ; }
+  
+  /// Return the maximal field of the octree
+  real max_field() const { return _max_field ; }
+   
+  /// Return the isosurface
+  MarchingCubes &mc() { return _mc ; }
+
+  /// Return the isosurface draw
+  MC_Draw &mc_draw() { return _mc_draw ; }
+  
+  /// set the values of each leaf from the implicit function
+  bool set_impl( data_access *ref = NULL ) ;
+  
+  /// Refine the octree according to the data access
+  bool refine( data_access *ref = NULL ) ;
+
+  /// Adapt the octree according to the data access
+  bool adapt( data_access *ref = NULL ) ;
+  
+  /// Draw the octree with wireframe
+  bool draw_wire() ;
+  
+  /// Draw the octree with dots
+  bool draw_centers() ;
+  
+  /// Dual function type
+  typedef bool mem_dual_walker( MemOctree &fo, Key *keys ) ;
+
+  /// Walk on the dual cubes
+  bool dual_cubes_walk( mem_dual_walker &walker ) ;
+
+  /// Build the isosurface using dual marching cubes
+  bool build_isosurface( data_access *ref = NULL ) ;
+  
+  /// Draw the isosurface on-the-fly using dual marching cubes
+  bool direct_draw_isosurface( data_access *ref = NULL ) ;
+  
+  /// Draw the dual octree with wireframe
+  bool draw_dual() ;
+  
+  /// Do nothing, just for dual generation timing
+  bool dual_timing() ;
+  
+//-----------------------------------------------------------------------------
+// iterators
+public:
+  /// Create an iterator traversing the tree from the root
+  inline cell_iterator cells_begin() { return cell_iterator( *this ) ; }
+
+  /// Create an iterator traversing the leaves of the tree from the root
+  inline leaf_iterator leaves_begin() { return leaf_iterator( *this ) ; }
+
+//-----------------------------------------------------------------------------
+// search operations
+public:
+  /// Find cells of the octree at a given position
+  bool find_leaf( Key k, Level o_lv, geom_cell &cell ) const ;
+  bool find_leaf( Key k, geom_cell &cell ) const { return find_leaf( k, opt_level(), cell ) ; }
+  bool find_leaf( real x, real y, real z, geom_cell &cell ) const { return find_leaf( cube2key( Cube(x,y,z,MAX_LEVEL) ), opt_level(), cell ) ; }
+
+  /// Find cells of the octree inside a given box of center x,y,z and half side r
+  bool find_radius( real x, real y, real z, real r, List<geom_cell> &cells ) const ;
+
+  /// Find adjacent cells of the octree to a given cell
+  bool adjacent( Key k, List<geom_cell> &cells ) const ;
+  bool adjacent( const geom_cell &cell, List<geom_cell> &cells ) const { return adjacent( cell.key(), cells ) ; }
+
+  /// Leaf test based on the field value
+  bool is_leaf( const HashField::KeyData &kd ) const { return !is_inv( kd.data ) ; }
+  
+  /// Leaf test based on the field value
+  bool is_leaf( Key k, real &d ) const { const HashField::KeyData &kd = _hash[k] ; d = kd.data ; return is_leaf( kd ) ; }
+
+  /// Leaf test based on the field value
+  bool is_leaf( Key k ) const { return is_leaf( _hash[k] ) ; }
+  
+  /// Node existence
+  bool node_exists( Key k, HashField::KeyData &kd ) const { kd = _hash[k] ;  return kd.key != KEY_INV ; }
+  
+  //-----------------------------------------------------------------------------
+// I/O
+public:
+
+  /// Draws the intersecting cells of a plane with the octree with color
+  void draw_plane ( real nx, real ny, real nz, real d	  ) ;
+
+  /// Draws the intersection of a plane with the octree with color
+  void draw_slice ( real nx, real ny, real nz, real d, float alpha ) ;
+
+  /// Draws the isosurface of level l inside the dual graph
+  void draw_iso   () { _mc.draw_surf() ; }
+
+//_____________________________________________________________________________
+// Iterator Cell
+public :
+  /// Auxiliary structure to traverse the octree
+  class geom_cell : public Cube
+  //---------------------------------------------------------------------------
+  {
+    friend class MemOctree ;
+
+  protected:
+    Key   _key   ;  ///< octree cell
+    real  _field ;  ///< field associated to the cell
+
+  //---------------------------------------------------------------------------
+  // Constructors
+  public:
+    /// Default constructor
+    geom_cell( Key key_ = KEY_INV, real field_ = R_INV ) : Cube(key2cube(key_)), _key(key_), _field(field_) {}
+
+    /// Default constructor
+    geom_cell( HashField::KeyData kd ) : Cube(key2cube(kd.key)), _key(kd.key), _field(kd.data) {}
+
+    /// Destructor
+    ~geom_cell() {}
+
+    /// Copy constructor
+    geom_cell( const geom_cell &i ) : Cube(i), _key(i._key), _field(i._field) {}
+
+    /// Assignment operator
+    geom_cell &operator = ( const geom_cell &i )
+    {  Cube::operator=(i) ;  _key = i._key ;  _field = i._field ;  return *this; }
+    
+
+  //---------------------------------------------------------------------------
+  // Public constant accessors
+  public  :
+    /// key const accessor
+    inline Key  key() const { return _key ; }
+    /// key accessor
+    inline Key &key() { return _key ; }
+
+    /// id const accessor
+    inline real  operator*() const { return _field ; }
+    
+    //---------------------------------------------------------------------------
+  // Tests
+  public :
+    /// equality operator
+    inline bool operator ==( const geom_cell &i ) const { return key() == i.key() ; }
+
+    /// inequality operator
+    inline bool operator !=( const geom_cell &i ) const { return key() != i.key() ; }
+
+    /// leaf test
+    inline bool is_leaf() const { return !is_inv(*(*this)) ; }
+
+    /// validation operator
+    inline bool      operator ()() const { return key() != KEY_INV ; }
+
+  //---------------------------------------------------------------------------
+  // Operations
+  public  :
+    /// sons
+    inline bool sons( geom_cell *s /*[8]*/, const HashField &hash )
+    {
+      if( is_leaf() ) return false ;
+
+      Key k = _key << 3 ;
+      for( int i = 0 ; i < 8 ; ++i )
+      {
+        s[i]._key   = k | i ;
+        s[i]._field = hash[k|i].data ;
+        (Cube&)s[i] = key2cube(s[i]._key) ;
+      }
+      return true ;
+    }
+  };
+
+  const geom_cell geom_root() const { const Key root_key = 1 ; return geom_cell( root_key, _hash[root_key].data ) ; }
+  const geom_cell geom_key ( Key k ) const { return geom_cell( k, _hash[k].data ) ; }
+
+
+
+//_____________________________________________________________________________
+// Cell Iterator
+public :
+  /// Octree cell iterator : Traverse the octree returning basic information on the cells
+  class cell_iterator
+  //---------------------------------------------------------------------------
+  {
+    friend class MemOctree ;
+
+  protected:
+    /// Octree traversal iterator
+    HashField::iterator _it ;
+
+  //---------------------------------------------------------------------------
+  // Constructors
+  public:
+    /// Default constructor : Constructs an iterator from a cell
+    cell_iterator( MemOctree &o ) : _it( o._hash.begin() ) {}
+
+    /// Destructor
+    ~cell_iterator() {}
+
+    /// Copy constructor
+    cell_iterator( const cell_iterator &i ) : _it(i._it) {}
+
+    /// Assignment operator
+    cell_iterator &operator = ( const cell_iterator &i )
+    { _it = i._it; return *this; }
+
+  //---------------------------------------------------------------------------
+  // Operations
+  public  :
+    /// equality operator
+    inline bool operator ==( const cell_iterator &i ) const { return _it == i._it ; }
+
+    /// inequality operator
+    inline bool operator !=( const cell_iterator &i ) const { return _it != i._it ; }
+
+    /// validation operator
+    inline bool      operator ()() const { return _it() ; }
+
+    /// next position
+    inline cell_iterator &operator ++() { ++_it ; return *this ; }
+
+  //---------------------------------------------------------------------------
+  // Accessors
+  public  :
+    // cell accessor
+    inline geom_cell top() const { return geom_cell( key(), *_it ) ; }
+
+    /// id accessor
+    inline real &operator*() { return *_it ; }
+
+    /// level accessor
+    inline Level lv() { return key_level(_it.key()) ; }
+
+    /// size accessor
+    inline real  sz() { return Cube(0,0,0,lv()).sz() ; }
+    
+    /// key accessor
+    inline Key   key() const { return _it.key() ; }
+    
+    /// points accessor
+    inline bool is_leaf() const { return !is_inv(*_it) ; }
+
+    /// Draws the cell wire with opengl
+    void draw_wire  () const { top().draw_wire  () ; }
+
+  };
+
+
+  /// Octree leaf iterator : Traverse the octree returning basic information on the leaves
+  class leaf_iterator : public cell_iterator
+  //---------------------------------------------------------------------------
+  {
+    public :
+    leaf_iterator( MemOctree &o ) : cell_iterator( o )
+    { if( (*this)() && !this->is_leaf() ) ++(*this) ; }
+
+    
+    /// next position
+    inline leaf_iterator &operator ++()
+    {
+      cell_iterator &it = *this ;
+      do ++it ; while ( it() && !it.is_leaf() ) ;
+      return *this ;
+    }
+  } ;
+} ;
+//_____________________________________________________________________________
+
+
+
diff --git a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/mlist.h b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/mlist.h
new file mode 100644
index 0000000000..1a86fec0b2
--- /dev/null
+++ b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/mlist.h
@@ -0,0 +1,502 @@
+/**
+ * @file    mlist.h
+ * @author  Thomas Lewiner <thomas.lewiner@polytechnique.org>
+ * @version 0.3
+ * @date    28/06/2004
+ *
+ * @brief   template list class
+ */
+//_____________________________________________________________________________
+
+
+
+#pragma once
+
+#include <stdlib.h> // qsort
+
+typedef unsigned int  lsize ;
+typedef const lsize   clsize ;
+
+//_____________________________________________________________________________
+/// template list class
+template <typename T> class List
+//-----------------------------------------------------------------------------
+{
+// types
+public :
+  class node ;
+  class iterator ;
+  class const_iterator ;
+
+//-----------------------------------------------------------------------------
+// default constructors
+public  :
+  /// default constructors
+  List() : _first((node*)NULL) {}
+
+  /// one-element constructor
+  List( const T &val ) : _first((node*)NULL) { insert(val) ; }
+
+  /// copy constructor (reverse order)
+  List( const List<T> &l ) : _first((node*)NULL)
+    {
+      for( const_iterator it = l.cbegin() ; it() ; ++it )
+        insert( *it ) ;
+    }
+
+  /// assignment operator
+  List<T> &operator = ( const List<T> &l ) { if( this != &l) { clear() ;  for( const_iterator it = l.cbegin() ; it() ; ++it ) insert( *it ) ; }  return *this; }
+
+  /// destructor
+  ~List() { clear() ; }
+
+  /// number of elements of the list
+  clsize size() const { lsize n = 0 ; for( const_iterator it = cbegin() ; it() ; ++it ) ++n ; return n ; }
+
+  /// number of elements of the list
+  bool size_greater( clsize m ) const { lsize n = 0 ; for( const_iterator it = cbegin() ; it() ; ++it ) { if(++n > m) return true ; } return false ; }
+
+  /// number of elements of the list
+  bool size_greater_or_equal( clsize m ) const { if( m == 0 ) return true ; lsize n = 0 ; for( const_iterator it = cbegin() ; it() ; ++it ) { if(++n >= m) return true ; } return false ; }
+
+  /// tests if the list has one element
+  bool empty () const { return _first == (node*)NULL ; }
+
+  /// tests if the list has two elements
+  bool single() const { return !empty() && _first->next() == (node*)NULL ; }
+
+  /// tests if the list has three elements
+  bool pair  () const { return !empty() && _first->next() != (node*)NULL && _first->next()->next() == (node*)NULL ; }
+
+  /// tests if the list has more than three elements
+  bool triple() const { return !empty() && _first->next() != (node*)NULL && _first->next()->next() != (node*)NULL ; }
+
+  const T  first () const { return _first->val() ; }  ///< first element accessor
+  T       &first ()       { return _first->val() ; }  ///< first element accessor
+  const T  second() const { return _first->next()->val() ; }  ///< second element accessor
+  T       &second()       { return _first->next()->val() ; }  ///< second element accessor
+  const T  third () const { return _first->next()->next()->val() ; }  ///< third element accessor
+  T       &third ()       { return _first->next()->next()->val() ; }  ///< third element accessor
+
+  /// get the first two elements
+  bool firsts( T &t1, T &t2 ) const { if( !empty() ) { t1 = first() ; if( !single() ) { t2 = second() ; return true ; } } return false ; }
+  /// get the first three elements
+  bool firsts( T &t1, T &t2, T &t3 ) const { if( firsts( t1,t2 ) ) { if( !pair() ) t3 = third() ; return true ; } return false ; }
+
+  const T  top () const { return _first->val() ; }  ///< first element accessor
+  T       &top ()       { return _first->val() ; }  ///< first element accessor
+
+//-----------------------------------------------------------------------------
+// clear
+public  :
+  /// destructor
+  void clear()
+    {
+      node *p = _first ;
+      while( p != (node*)NULL )
+      {
+        node *n = p->next() ;
+        delete p ;
+        p = n ;
+      }
+      _first = (node*)NULL ;
+    }
+
+  /// emptyness test
+  inline bool empty() { return _first == (node*)NULL ; }
+
+//-----------------------------------------------------------------------------
+// find and replace
+public  :
+  /// membership test
+  const_iterator cfind( const T &val ) const { for( const_iterator it = cbegin() ; it() ; ++it )  if( (*it) == val ) return it ; return cend() ; }
+
+  /// membership test
+  iterator find( const T &val ) { for( iterator it = begin() ; it() ; ++it )  if( (*it) == val ) return it ; return end() ; }
+
+  /// membership test (return also the last pointer for eventual remotion)
+  iterator find( const T &val, iterator &lst ) { lst = end() ; for( iterator it = begin() ; it() ; ++it ) { if( *it == val ) return it ;  lst = it ; } return end() ; }
+
+  /// membership test
+  clsize pos( const T &val ) const { lsize i = 0 ; for( const_iterator it = cbegin() ; it() ; ++it, ++i )  if( *it == val ) return i ; return (clsize)-1 ; }
+
+  /// get the minimal element
+  const_iterator min_val() const { if( empty() ) return cend() ; const_iterator it = cbegin(), m = it ; for( ++it ; it() ; ++it ) { if( *it < *m  ) m = it ; } return m ; }
+
+  /// get the minimal element
+  iterator min_val() { if( empty() ) return end() ; iterator it = begin(), m = it ; for( ++it ; it() ; ++it ) { if( *it < *m  ) m = it ; } return m ; }
+
+  /// get the maximal element
+  const_iterator max_val() const { if( empty() ) return cend() ; const_iterator it = cbegin(), m = it ; for( ++it ; it() ; ++it ) { if( *it > *m  ) m = it ; } return m ; }
+
+  /// get the maximal element
+  iterator max_val() { if( empty() ) return end() ; iterator it = begin(), m = it ; for( ++it ; it() ; ++it ) { if( *it > *m  ) m = it ; } return m ; }
+
+  /// replacing the elements of a list
+  clsize replace( const T &old_val, const T &new_val )
+    {
+      lsize n = 0 ;
+      for( iterator it = begin() ; it() ; ++it )
+        if( *it == old_val ) { *it = new_val ;  ++n ; }
+      return n ;
+    }
+
+//-----------------------------------------------------------------------------
+// element insertion
+public  :
+  /// insertion at the beginning
+  inline void push_front( const T &val ) { _first = new node( val, _first ) ; }
+
+  /// insertion in the middle
+  iterator push_after( const T &val, iterator i = begin() )
+    {
+      if( i == end() ) { push_front( val ) ; return begin() ; }
+      i._node->next() = new node( val, i._node->next() ) ;
+      return ++i ;
+    }
+
+  /// insertion at the end
+  iterator push_back( const T &val )
+    {
+      return push_after( val, last() ) ;
+    }
+
+  /// insertion
+  inline void insert( const T &val ) { push_front( val ) ; }
+  
+  /// insertion
+  inline void push( const T &val ) { push_front( val ) ; }
+  
+  /// insertion without duplicates
+  inline bool insert_unique( const T &val ) { if( !find(val)() ) {push_front( val ); return true;} return false; }
+
+
+  /// list insertion (reverse, at the begining)
+  void insert( const List<T> &l )
+    { for( const_iterator lit = l.cbegin() ; lit() ; ++lit ) insert( *lit ) ; }
+
+  /// list insertion without duplicates (reverse, at the begining)
+  void insert_unique( const List<T> &l )
+    { for( const_iterator lit = l.cbegin() ; lit() ; ++lit ) insert_unique( *lit ) ; }
+
+  /// list insertion (ordered)
+  void insert_ordered( const List<T> &l )
+    {
+      const_iterator lit = l.cbegin() ;
+      iterator it = push_back( *lit ) ;
+      for( ; lit() ; ++lit )
+        it = push_after( *lit, it ) ;
+    }
+
+
+  /// copy a list and clear its content
+  void insert_and_clear( List<T> &l )
+    {
+      if( this == &l ) return ;
+      iterator lst = last() ;
+      if( lst() )
+        lst._node->next() = l._first ;
+      else
+        _first = l._first ;
+      l._first = NULL ;
+    }
+
+//-----------------------------------------------------------------------------
+// element remotion
+public  :
+  /// removing the first element of the list
+  void remove_first()
+    {
+      node *p = _first->next() ;
+      delete _first ;
+      _first = p ;
+    }
+
+  /// removing the first element of the list
+  void pop() { remove_first() ; }
+
+  /// removing elements from the list
+  void remove_next( iterator &prev )
+    {
+      node *p ;
+      if( prev == end() )
+      { p = _first->next() ; delete _first ; _first = p ; }
+      else if( prev._node )
+      { p = prev._node->next() ; prev._node->next() = p->next() ; delete p ; }
+    }
+
+  /// removing elements from the list
+  bool remove( T &val )
+  {
+    iterator prev = end() ;
+    for( iterator it = begin() ; it() ; )
+    {
+      if( *it != val ) { prev = it ; ++it ; continue ; }
+      val = *it ;
+      node *p ;
+      if( prev == end() )
+      { p = _first->next() ; delete _first ; _first = p ; it = begin() ; }
+      else
+      { p = it._node ; prev._node->next() = it._node->next() ; delete p ; it = prev ; ++it ; }
+      return true ;
+    }
+    return false ;
+  }
+
+  /// removing elements from the list
+  clsize remove_all( const T &val )
+    {
+      lsize n = 0 ;
+      iterator prev = end() ;
+      for( iterator it = begin() ; it() ; )
+      {
+        if( *it != val ) { prev = it ; ++it ; continue ; }
+        node *p ;
+        if( prev == end() )
+        { p = _first->next() ; delete _first ; _first = p ; it = begin() ; }
+        else
+        { p = it._node ; prev._node->next() = it._node->next() ; delete p ; it = prev ; ++it ; }
+        ++n ;
+        if( !it() ) return n ;
+      }
+      return n ;
+    }
+
+
+//-----------------------------------------------------------------------------
+// sort
+public  :
+  /// array transform
+  void get_array( T *a, clsize sz /*= size()*/ )
+    {
+      lsize i = 0 ;
+      for( const_iterator it = cbegin() ; it() && i < sz ; ++it, ++i )
+        a[i] = *it ;
+    }
+
+  /// array transform
+  T *get_array( clsize sz /*= size()*/ )
+    {
+      T  *a = new T[sz] ;
+      get_array( a,sz ) ;
+      return a ;
+    }
+
+  /// array read
+  void set_array( clsize sz = 0, const T *a = (const T*)NULL )
+    {
+      clear() ;
+      if( sz == 0 ) return ;
+      push_front( a[0] ) ;
+      iterator it = begin() ;
+      for( lsize i = 1 ; i < sz ; ++i )
+        it = push_after( a[i], it ) ;
+    }
+
+  /// sort
+  void sort( int compare(const void*,const void*) )
+    {
+      clsize sz = size() ;
+      T  *a  = get_array( sz ) ;
+      qsort( (void*)a, sz, sizeof(T), compare ) ;
+      set_array( sz, a ) ;
+      delete [] a ;
+    }
+
+//-----------------------------------------------------------------------------
+// Elements
+private :
+  node  *_first; ///< link to the first element
+
+
+
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
+// node representation
+public :
+  /// node of a list
+  class node
+  {
+  public :
+  // constructors
+    /// default constructors
+    node( T val_, node *next_ = (node*)NULL ) : _val (val_) , _next (next_) {}
+
+    /// destructor
+    ~node() {}
+
+    /// copy constructor
+    node( const node &n ) : _val(n.val()), _next(n.next()) {}
+
+    /// assignment operator
+    node &operator = ( const node &n )
+    { _val = n.val(); _next = n.next(); return this; }
+
+  //-----------------------------------------------------------------------------
+  // Accessors
+  public  :
+    inline const T    &val () const { return _val  ; }  ///< accesses the value of the node
+    inline const node *next() const { return _next ; }  ///< accesses the next element
+
+    inline T     &val () { return _val  ; }  ///< accesses the value of the node
+    inline node *&next() { return _next ; }  ///< accesses the next element
+
+  //-----------------------------------------------------------------------------
+  // Elements
+  private :
+    T      _val ; ///< value
+    node  *_next; ///< link to the next element
+  };
+
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
+// const_iterator
+public :
+  /// list const iterator
+  class const_iterator
+  {
+  public :
+  // constructors
+    /// default constructors
+    const_iterator( node *n = (node*)NULL ) : _node(n) {}
+
+    /// destructor
+    ~const_iterator() {}
+
+    /// copy constructor
+    const_iterator( const const_iterator &i ) : _node(i._node) {}
+
+    /// assignment operator
+    const_iterator &operator = ( const const_iterator &i )
+    { _node = i._node; return *this; }
+
+    friend class List<T> ;
+
+  //-----------------------------------------------------------------------------
+  // Operations
+  public  :
+    inline bool            operator ==( const const_iterator &i ) const { return _node == i._node ; }  ///< equality operator
+    inline bool            operator !=( const const_iterator &i ) const { return _node != i._node ; }  ///< inequality operator
+    inline bool            operator ()() const { return _node != (node*)NULL ; }                       ///< validation operator
+    inline const T        &operator * () const { return _node->val() ; }                               ///< value accessor
+    inline const_iterator &operator ++() { _node = _node->next() ; return *this ; }              ///< accesses the next position
+
+  //-----------------------------------------------------------------------------
+  // Elements
+  private :
+    node  *_node; ///< node position
+  };
+
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
+// iterator
+public :
+  /// list iterator
+  class iterator
+  {
+  public :
+  // constructors
+    /// default constructors
+    iterator( node *n = (node*)NULL ) : _node(n) {}
+
+    /// destructor
+    ~iterator() {}
+
+    /// copy constructor
+    iterator( const iterator &i ) : _node(i._node) {}
+
+    /// assignment operator
+    iterator &operator = ( const iterator &i )
+    { _node = i._node; return *this; }
+
+    friend class List <T> ;
+
+  //-----------------------------------------------------------------------------
+  // Operations
+  public  :
+    inline bool      operator ==( const iterator &i ) const { return _node == i._node ; }  ///< equality operator
+    inline bool      operator !=( const iterator &i ) const { return _node != i._node ; }  ///< inequality operator
+    inline bool      operator ()() const { return _node != (node*)NULL ; }                 ///< validation operator
+    inline T        &operator * () const { return _node->val() ; }                         ///< value accessor
+    inline iterator &operator ++() { _node = _node->next() ; return *this ; }        ///< accesses the next position
+
+  //-----------------------------------------------------------------------------
+  // Elements
+  private :
+    node  *_node; ///< node position
+  };
+
+//-----------------------------------------------------------------------------
+// iterator creation
+public  :
+  inline const_iterator cbegin() const { return const_iterator( _first ) ; }      ///< iterator creation
+  inline const_iterator cend  () const { return const_iterator( (node*)NULL ) ; }  ///< iterator end
+  inline iterator begin() { return iterator( _first ) ; }      ///< iterator creation
+  inline iterator end  () { return iterator( (node*)NULL ) ; }  ///< iterator end
+
+  /// last position
+  iterator last () { iterator lst = end(), it = begin() ; while( it() ) { lst = it ; ++it ; } return lst ; }
+};
+//_____________________________________________________________________________
+
+
+
+
+//_____________________________________________________________________________
+/// template list class
+template <typename T> class Queue : public List<T>
+//-----------------------------------------------------------------------------
+{
+//-----------------------------------------------------------------------------
+// default constructors
+public  :
+  /// default constructors
+  Queue() : List<T>() { _last = this->end() ; }
+
+  /// one-element constructor
+  Queue( const T &val ) : List<T>( val ) { _last = this->begin() ; }
+
+  /// copy constructor (reverse order)
+  Queue( const Queue<T> &q ) : List<T>()
+    { for( typename List<T>::const_iterator it = q.cbegin() ; it() ; ++it ) Queue<T>::insert( *it ) ; }
+
+  /// assignment operator
+  Queue<T> &operator = ( const Queue<T> &q )
+   { if( this != &q) { this->clear() ;  for( typename List<T>::const_iterator it = q.cbegin() ; it() ; ++it ) insert( *it ) ; }  return *this; }
+
+  /// destructor
+  ~Queue() { this->clear() ; }
+
+
+//-----------------------------------------------------------------------------
+// element insertion
+public  :
+  /// insertion at the end
+  inline void insert( const T &val )
+    { _last = push_after( val, _last ) ; }
+
+  /// queue insertion
+  void insert( const Queue<T> &l )
+    { for( typename List<T>::const_iterator lit = l.cbegin() ; lit() ; ++lit ) insert( *lit ) ; }
+
+//-----------------------------------------------------------------------------
+// stqndqrd function
+public  :
+  /// first element
+  inline const T front() const { return this->first() ; }
+
+  /// insertion at the end
+  inline void push( const T &val ) { this->insert( val ) ; }
+
+  /// deletion at the beginning
+  inline void pop () { this->remove_first() ;  if( this->empty() ) _last = this->end() ; }
+
+
+//-----------------------------------------------------------------------------
+// Elements
+private :
+  typename List<T>::iterator _last; ///< link to the last element
+};
+//_____________________________________________________________________________
+
+
diff --git a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/morton.cpp b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/morton.cpp
new file mode 100644
index 0000000000..43799f63ef
--- /dev/null
+++ b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/morton.cpp
@@ -0,0 +1,458 @@
+/**
+ * \file    morton.cpp
+ * \author  Thomas Lewiner   <tomlew@puc-rio.br>
+ * \author  Rener Pereira de Castro <rener@mat.puc-rio.br> 
+ * \author  Matmidia Lab, Math Dept, PUC-Rio
+ * \date    10/01/2010
+ *
+ * \brief  Morton codes manipulation
+ *
+ * Morton codes manipulation
+ */
+//_____________________________________________________________________________
+
+
+#ifndef WIN32
+#pragma implementation
+#endif // WIN32
+
+#include "morton.h"
+
+//_____________________________________________________________________________
+// static
+#ifdef UNIX
+real  R_INV = strtof("NAN(char-sequence)", NULL); //nanf(0) ;
+#else
+real  R_INV = nan(0) ;
+#endif
+
+Level L_INV = (Level)-1 ;
+Point P_INV( R_INV, R_INV, R_INV ) ;
+Cube  C_INV( P_INV, L_INV ) ;
+Key   KEY_INV = 0 ;
+//_____________________________________________________________________________
+
+
+//_____________________________________________________________________________
+// Static Members Aux
+
+
+// 1 << ((dz==0)+(dy==0)+(dx==0))
+static const char nsubneighbors[27] = { 1, // Direction (-1,-1,-1)
+                                        2, // Direction (-1,-1, 0)
+                                        1, // Direction (-1,-1, 1)
+                                        2, // Direction (-1, 0,-1)
+                                        4, // Direction (-1, 0, 0)
+                                        2, // Direction (-1, 0, 1)
+                                        1, // Direction (-1, 1,-1)
+                                        2, // Direction (-1, 1, 0)
+                                        1, // Direction (-1, 1, 1)
+                                        2, // Direction ( 0,-1,-1)
+                                        4, // Direction ( 0,-1, 0)
+                                        2, // Direction ( 0,-1, 1)
+                                        4, // Direction ( 0, 0,-1)
+                                        0, // Direction ( 0, 0, 0)
+                                        4, // Direction ( 0, 0, 1)
+                                        2, // Direction ( 0, 1,-1)
+                                        4, // Direction ( 0, 1, 0)
+                                        2, // Direction ( 0, 1, 1)
+                                        1, // Direction ( 1,-1,-1)
+                                        2, // Direction ( 1,-1, 0)
+                                        1, // Direction ( 1,-1, 1)
+                                        2, // Direction ( 1, 0,-1)
+                                        4, // Direction ( 1, 0, 0)
+                                        2, // Direction ( 1, 0, 1)
+                                        1, // Direction ( 1, 1,-1)
+                                        2, // Direction ( 1, 1, 0)
+                                        1, // Direction ( 1, 1, 1)                               
+                                      };
+
+static const char l3b[27][4] = { {7,-1,-1,-1},{6, 7,-1,-1},{6,-1,-1,-1},{5, 7,-1,-1},{4, 5, 6, 7},{4, 6,-1,-1},{ 5,-1,-1,-1},
+                                 {4, 5,-1,-1},{4,-1,-1,-1},{3, 7,-1,-1},{2, 3, 6, 7},{2, 6,-1,-1},{1, 3, 5, 7},{-1,-1,-1,-1},
+                                 {0, 2, 4, 6},{1, 5,-1,-1},{0, 1, 4, 5},{0, 4,-1,-1},{3,-1,-1,-1},{2, 3,-1,-1},{ 2,-1,-1,-1},
+                                 {1, 3,-1,-1},{0, 1, 2, 3},{0, 2,-1,-1},{1,-1,-1,-1},{0, 1,-1,-1},{0,-1,-1,-1},};
+//_____________________________________________________________________________
+// Contraction and Dilatation Masks
+static const uint three_2 = 9 ;
+static const uint three_1 = 3 ;
+static const uint three_0 = 1 ;
+static const uint shift_2a = 18, shift_2b = 36 ;
+static const uint shift_1a =  6, shift_1b = 12 ;
+static const uint shift_0a =  2, shift_0b =  4 ;
+static const Key dilate_mask_2 = (Key)0x7FC0000FF80001FFLL ;  // bits 1 from 0-9, 27-36 and 54-63
+static const Key dilate_mask_1 = (Key)0x01C0E070381C0E07LL ;  // bits 1 from 0-3, 9-12, 18-21,...
+static const Key dilate_mask_0 = (Key)0x9249249249249249LL ;  // bits 1 at 0,3,6,9,12,...
+static const Key dilate_tz     = (Key)0x4924924924924924LL ;  // bits 1 at 2,5,8,11,14,...    rigth to left
+static const Key dilate_ty     = (Key)0x2492492492492492LL ;  // bits 1 at 1,4,7,10,13,...
+static const Key dilate_tx     = (Key)0x9249249249249249LL ;  // bits 1 at 0,3,6,9,12,...  
+static const Key dilate_t1     = (Key)0xB6DB6DB6DB6DB6DBLL ;  // bits 0 at 2,5,8,11,14,...    = ~tz
+static const Key dilate_t2     = (Key)0xDB6DB6DB6DB6DB6DLL ;  // bits 0 at 1,4,7,10,13,...    = ~ty
+static const Key dilate_t3     = (Key)0x6DB6DB6DB6DB6DB6LL ;  // bits 0 at 0,3,6,9,12,...     = ~tx
+
+//_____________________________________________________________________________
+// Step Directions Find Neighbours - 26                              (dz,dy,dx)
+static const Key dir_neigh[27] = { (Key)0xFFFFFFFFFFFFFFFFLL , // Direction (-1,-1,-1)
+                                   (Key)0x6DB6DB6DB6DB6DB6LL , // Direction (-1,-1, 0)
+                                   (Key)0x6DB6DB6DB6DB6DB7LL , // Direction (-1,-1, 1)
+                                   (Key)0xDB6DB6DB6DB6DB6DLL , // Direction (-1, 0,-1)
+                                   (Key)0x4924924924924924LL , // Direction (-1, 0, 0)
+                                   (Key)0x4924924924924925LL , // Direction (-1, 0, 1)
+                                   (Key)0xDB6DB6DB6DB6DB6FLL , // Direction (-1, 1,-1)
+                                   (Key)0x4924924924924926LL , // Direction (-1, 1, 0)
+                                   (Key)0x4924924924924927LL , // Direction (-1, 1, 1)
+                                   (Key)0xB6DB6DB6DB6DB6DBLL , // Direction ( 0,-1,-1)
+                                   (Key)0x2492492492492492LL , // Direction ( 0,-1, 0)
+                                   (Key)0x2492492492492493LL , // Direction ( 0,-1, 1)
+                                   (Key)0x9249249249249249LL , // Direction ( 0, 0,-1)
+                                   (Key)0x0000000000000000LL , // Direction ( 0, 0, 0)
+                                   (Key)0x0000000000000001LL , // Direction ( 0, 0, 1)
+                                   (Key)0x924924924924924BLL , // Direction ( 0, 1,-1)
+                                   (Key)0x0000000000000002LL , // Direction ( 0, 1, 0)
+                                   (Key)0x0000000000000003LL , // Direction ( 0, 1, 1)
+                                   (Key)0xB6DB6DB6DB6DB6DFLL , // Direction ( 1,-1,-1)
+                                   (Key)0x2492492492492496LL , // Direction ( 1,-1, 0)
+                                   (Key)0x2492492492492497LL , // Direction ( 1,-1, 1)
+                                   (Key)0x924924924924924DLL , // Direction ( 1, 0,-1)
+                                   (Key)0x0000000000000004LL , // Direction ( 1, 0, 0)
+                                   (Key)0x0000000000000005LL , // Direction ( 1, 0, 1)
+                                   (Key)0x924924924924924FLL , // Direction ( 1, 1,-1)
+                                   (Key)0x0000000000000006LL , // Direction ( 1, 1, 0)
+                                   (Key)0x0000000000000007LL , // Direction ( 1, 1, 1)                               
+                                 };
+
+//_____________________________________________________________________________
+
+
+
+
+
+//_____________________________________________________________________________
+// octree depth level associated to a morton key ( = (bit length - 1) / 3 )
+Level key_level ( Key k )
+//_____________________________________________________________________________
+{
+  static const real lg2_3 = 1.0 / (log(2)*3) ;
+  if( k == KEY_INV ) return L_INV ;
+  return (Level) floor( log(k) * lg2_3 ) ;
+/*
+  Level count = 0 ;
+  do
+  {
+    k >>= 3 ;
+    ++count;
+  }
+  while( k > 0 ) ;
+	  
+  return count-1 ;
+*/
+}
+//_____________________________________________________________________________
+
+
+//_____________________________________________________________________________
+// containment text implemented directly onf the key
+bool key_contains( Key k_big, Key k_small )
+//_____________________________________________________________________________
+{
+  while( (k_small!=KEY_INV) && ((k_small>>3) != k_big) )
+    k_small >>= 3;
+  return k_small != KEY_INV ;  
+  // k_small & 7
+}
+//_____________________________________________________________________________
+
+
+
+//_____________________________________________________________________________
+// convert an octree cube to a morton key using integer contraction
+Key cube2key ( const Cube &c )
+//_____________________________________________________________________________
+{
+  uint level = c.lv();
+	Key  m     = 1 << level ;
+	real sz    = (real) m ;
+	
+	Key bz = (Key) floor( c.z() * sz ) ;
+	Key by = (Key) floor( c.y() * sz ) ;
+	Key bx = (Key) floor( c.x() * sz ) ;
+	/*
+	 if( bz >= m ) bz = m-1 ;
+	 if( by >= m ) by = m-1 ;
+	 if( bx >= m ) bx = m-1 ;
+	 */
+	
+	if( level > three_2 )
+	{
+		bz = ( bz | (bz << shift_2a) | (bz << shift_2b) ) & dilate_mask_2 ;
+		by = ( by | (by << shift_2a) | (by << shift_2b) ) & dilate_mask_2 ;
+		bx = ( bx | (bx << shift_2a) | (bx << shift_2b) ) & dilate_mask_2 ;
+	}
+	if( level > three_1 )
+	{
+		bz = ( bz | (bz << shift_1a) | (bz << shift_1b) ) & dilate_mask_1 ;
+		by = ( by | (by << shift_1a) | (by << shift_1b) ) & dilate_mask_1 ;
+		bx = ( bx | (bx << shift_1a) | (bx << shift_1b) ) & dilate_mask_1 ;
+	}
+	if( level > three_0 )
+	{
+		bz = ( bz | (bz << shift_0a) | (bz << shift_0b) ) & dilate_mask_0 ;
+		by = ( by | (by << shift_0a) | (by << shift_0b) ) & dilate_mask_0 ;
+		bx = ( bx | (bx << shift_0a) | (bx << shift_0b) ) & dilate_mask_0 ;
+	}
+  return (Key(1) << (3*level)) | (bz << 2) | (by << 1) | bx ;
+}
+//_____________________________________________________________________________
+
+
+//_____________________________________________________________________________
+// convert a morton key to a key using integer dilation
+const Cube key2cube ( Key  key )
+//_____________________________________________________________________________
+{
+  if( key == KEY_INV )
+    return C_INV ;
+  
+  Level level = key_level( key ) ;
+  Key bz( (key >> 2) & dilate_mask_0 ) ;
+  Key by( (key >> 1) & dilate_mask_0 ) ;
+  Key bx( (   key  ) & dilate_mask_0 ) ;
+  
+  if( level > three_0 )
+  {
+    bz = ( bz | (bz >> shift_0a) | (bz >> shift_0b) ) & dilate_mask_1 ;
+    by = ( by | (by >> shift_0a) | (by >> shift_0b) ) & dilate_mask_1 ;
+    bx = ( bx | (bx >> shift_0a) | (bx >> shift_0b) ) & dilate_mask_1 ;
+    
+    if( level > three_1 )
+    {
+      bz = ( bz | (bz >> shift_1a) | (bz >> shift_1b) ) & dilate_mask_2 ;
+      by = ( by | (by >> shift_1a) | (by >> shift_1b) ) & dilate_mask_2 ;
+      bx = ( bx | (bx >> shift_1a) | (bx >> shift_1b) ) & dilate_mask_2 ;
+      
+      if( level > three_2 )
+      {
+        bz = bz | (bz >> shift_2a) | (bz >> shift_2b) ;
+        by = by | (by >> shift_2a) | (by >> shift_2b) ;
+        bx = bx | (bx >> shift_2a) | (bx >> shift_2b) ;
+      }
+    }
+  }
+  
+  Key length_mask = (1 << level) -1 ;
+  bz &= length_mask ;
+  by &= length_mask ;
+  bx &= length_mask ;
+  
+  Cube c ;
+  c.lv() = level ;
+  real sz  = c.sz() ;
+  real sz2 = sz*2 ;
+  c.z() = (real)(bz) * sz2 + sz ;
+  c.y() = (real)(by) * sz2 + sz ;
+  c.x() = (real)(bx) * sz2 + sz ;
+
+  return c ;
+}
+//_____________________________________________________________________________
+
+
+
+//_____________________________________________________________________________
+// addition in dilated integer
+Key addition_locate_code( const Key& N , const Key& DN )
+//-----------------------------------------------------------------------------
+{
+  return (
+          ( ((N | dilate_t1) + (DN & dilate_tz)) & dilate_tz ) |
+          ( ((N | dilate_t2) + (DN & dilate_ty)) & dilate_ty ) |
+          ( ((N | dilate_t3) + (DN & dilate_tx)) & dilate_tx ) 
+          );
+}
+//_____________________________________________________________________________
+
+
+
+//_____________________________________________________________________________
+// addition in dilated integer
+Key substraction_locate_code( const Key& N , const Key& DN )
+//-----------------------------------------------------------------------------
+{
+  return (
+          ( ((N & dilate_tz) - (DN & dilate_tz)) & dilate_tz ) |
+          ( ((N & dilate_ty) - (DN & dilate_ty)) & dilate_ty ) |
+          ( ((N & dilate_tx) - (DN & dilate_tx)) & dilate_tx ) 
+         );
+}
+//_____________________________________________________________________________
+
+
+
+//_____________________________________________________________________________
+// generate a list of 27 neighbor keys of same level, with their direction, indexed by 9*(dz+1) + 3*(dy+1) + (dx+1)
+bool neighbor_keys( Key k, Key *neighbors )
+//_____________________________________________________________________________
+{
+  Level nbits_neigh = 3*key_level(k) ;
+  for( uint dir = 0 ; dir < 27 ; ++dir ) 
+  {
+    Key &nk = neighbors[dir] ;
+    if( dir == 13 ) { nk = KEY_INV ; continue ; }
+    nk = addition_locate_code( k , dir_neigh[dir] ) ; 
+    if( (nk >> nbits_neigh) != 1 )
+      nk = KEY_INV ;
+  }
+  return true ;
+}
+//_____________________________________________________________________________
+
+
+
+//_____________________________________________________________________________
+// generate a list of the subneighbor keys from a neighbor direction
+// returns the number of subneighbors
+char subneighbor_keys( Key k, char dir, std::stack<Key> &subneighbors )
+//_____________________________________________________________________________
+{
+  k <<= 3 ;
+  char nsub = nsubneighbors[dir] ;
+  for( char i = 0 ; i < nsub ; ++i )
+  {
+    subneighbors.push( k | l3b[dir][i] ) ;
+  }
+  return nsub ; 
+}
+//_____________________________________________________________________________
+
+
+
+//_____________________________________________________________________________
+void print_binary( const Key k )
+//_____________________________________________________________________________
+{
+  printf( "0x" ) ;
+  for( char i = 63 ; i >= 0 ; --i )
+    printf( "%c", (k>>i)&1 ? '1' : '0' ) ;
+}
+//_____________________________________________________________________________
+
+
+//_____________________________________________________________________________
+// generate a list of 8 vertices keys
+Level vertices_keys( Key k, Key *verts )
+//_____________________________________________________________________________
+{
+  Level lv = key_level(k) ;
+  Key   lv_k = 1 << (3*lv) ;
+  Key   lv_K = lv_k << 1 ;
+
+  for( int i = 0 ; i < 8 ; ++i )
+  {
+    Key vk = addition_locate_code( k,i ) ;
+
+    if( vk >= lv_K || !((vk-lv_k)&dilate_tx) || !((vk-lv_k)&dilate_ty) || !((vk-lv_k)&dilate_tz) )
+    {
+      verts[i] = KEY_INV ;
+      continue ;
+    }
+    
+    verts[i] = vk << 3*(MAX_LEVEL - lv) ;
+  }
+  return lv ;
+
+/*  
+  Level lv = key_level(k) ;
+  Key   lv_k = 1 << (3*lv) ;
+  Key   lv_K = lv_k << 1 ;
+
+  Cube c = key2cube(k) ;
+  const real ix = c.x () ;
+  const real iy = c.y () ;
+  const real iz = c.z () ;
+  const real is = c.sz() ;
+  
+  for( int i = 0 ; i < 8 ; ++i )
+  {
+    Key vk = addition_locate_code( k,i ) ;
+    Cube v( (i&1) ? ix+is : ix-is,
+            (i&2) ? iy+is : iy-is,
+            (i&4) ? iz+is : iz-is,
+            MAX_LEVEL ) ;
+    bool invalid = (
+                    v.x() <= 0.0 || v.x() >= 1 ||
+                    v.y() <= 0.0 || v.y() >= 1 ||
+                    v.z() <= 0.0 || v.z() >= 1
+                   ) ;
+    bool k_invalid = vk >= lv_K || !((vk-lv_k)&dilate_tx) || !((vk-lv_k)&dilate_ty) || !((vk-lv_k)&dilate_tz) ;
+    if( invalid != k_invalid )
+      printf( "problem\n" ) ;
+    if( invalid )
+    {
+      verts[i] = KEY_INV ;
+      continue ;
+    }
+    
+    vk <<= 3*(MAX_LEVEL - lv) ;
+    verts[i] = cube2key(v) ;
+    if( vk != verts[i] )
+      printf( "problem\n" ) ;
+  }
+  return c.lv() ;
+*/
+}
+//_____________________________________________________________________________
+
+
+
+//_____________________________________________________________________________
+// generate a list of 8 dual vertices keys from a vertex key and the deepest neighbor level
+bool dual_vertices_keys( Key k, Level lv, Key *dual_verts )
+//_____________________________________________________________________________
+{
+  Key dk = k >> (3*(MAX_LEVEL - lv)) ;
+  
+  for( int i = 0 ; i < 8 ; ++i )
+  {
+    dual_verts[i] = substraction_locate_code( dk,i ) ;
+  }
+  
+  return true ;
+
+/*  
+  Key dk = k >> (3*(MAX_LEVEL - lv)) ;
+  
+  Cube c = key2cube( k ) ;
+  c.lv() = lv ;
+  
+  const real ix = c.x () ;
+  const real iy = c.y () ;
+  const real iz = c.z () ;
+  const real is = c.sz() ;
+  
+//  print_binary( k ) ;
+//  printf( " <- \n" ) ;
+  for( int i = 0 ; i < 8 ; ++i )
+  {
+    Cube dv( (i&1) ? ix+is : ix-is,
+             (i&2) ? iy+is : iy-is,
+             (i&4) ? iz+is : iz-is,
+             lv ) ;
+    
+    dual_verts[i] = cube2key(dv) ;
+    if( substraction_locate_code( dk,7-i) != dual_verts[i] )
+      printf( "problem\n" ) ;
+//    print_binary( dual_verts[i] ) ;
+//    printf( "\n" ) ;
+//    print_binary( substraction_locate_code( dk,7-i) ) ;
+//    printf( "\n" ) ;
+  }
+//  printf( "\n" ) ;
+  
+  return true ;
+*/
+}
+//_____________________________________________________________________________
+
+
+// testar que dois cubos se intersectam???
+
+
diff --git a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/morton.h b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/morton.h
new file mode 100644
index 0000000000..63563ad7f8
--- /dev/null
+++ b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/morton.h
@@ -0,0 +1,62 @@
+/**
+ * \file    morton.h
+ * \author  Thomas Lewiner   <tomlew@puc-rio.br>
+ * \author  Rener Pereira de Castro <rener@mat.puc-rio.br> 
+ * \author  Matmidia Lab, Math Dept, PUC-Rio
+ * \date    10/01/2010
+ *
+ * \brief  Morton codes manipulation
+ *
+ * Morton codes manipulation
+*/
+//_____________________________________________________________________________
+
+
+
+#pragma once
+
+#ifndef WIN32
+#pragma interface
+#endif // WIN32
+
+
+#include <stdint.h>
+#include <stdio.h>
+#include <math.h>
+#include <stack>
+#include "cube.h"
+
+typedef uint64_t Key;
+extern Key KEY_INV ;
+const uint MAX_LEVEL = (sizeof(Key)*8-1)/3 ;
+
+//_____________________________________________________________________________
+
+/// octree depth level associated to a morton key ( = (bit length - 1) / 3 )
+Level key_level ( Key k ) ;
+
+/// containment text implemented directly onf the key
+bool key_contains( Key k_big, Key k_small ) ;
+
+/// convert an octree cube to a morton key using integer contraction
+Key cube2key ( const Cube &c ) ; 
+
+/// convert a morton key to a key using integer dilation
+const Cube key2cube ( Key  k ) ; 
+
+/// generate a list of 27 neighbor keys of same level, with their direction, indexed by 9*(dx+1) + 3*(dy+1) + (dz+1)
+bool neighbor_keys( Key k, Key *neighbors ) ;
+
+/// generate a list of the subneighbor keys from a neighbor direction, and return the number of subneighbors
+char subneighbor_keys( Key k, char dir, std::stack<Key> &subneighbors ) ;
+
+/// generate a list of 8 vertices keys from a cell key
+Level vertices_keys( Key k, Key *verts ) ;
+
+/// generate a list of 8 dual vertices keys from a vertex key and the deepest neighbor level
+bool dual_vertices_keys( Key k, Level lv, Key *dual_verts ) ;
+
+//_____________________________________________________________________________
+
+
+
diff --git a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/mvector.h b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/mvector.h
new file mode 100644
index 0000000000..e38dc5bb00
--- /dev/null
+++ b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/mvector.h
@@ -0,0 +1,261 @@
+/**
+ * \file    mvector.h
+ * \author  Thomas Lewiner   <tomlew@puc-rio.br>
+ * \author  Matmidia Lab, Math Dept, PUC-Rio
+ * \date    10/01/2010
+ *
+ * \brief  light array container
+ *
+ * Light array container
+ */
+//_____________________________________________________________________________
+
+
+#pragma once
+
+#include <stdlib.h>
+#include <string.h>  // memcpy, memset
+#include <mlist.h>
+
+/// unsigned int alias
+typedef unsigned int uint ;
+/// const unsigned int alias
+typedef const uint cuint ;
+
+/// default data size
+#define INITIAL_MVECTOR_SIZE ((uint)1024)
+
+
+//_____________________________________________________________________________
+// mvector
+/// \class mvector mvector.h
+template< typename Data > class mvector
+//-----------------------------------------------------------------------------
+{
+// Constructors
+public :
+  /// Constructor
+  mvector() : _data((Data*)NULL), _allocated_size(0), _used_size(0) {} ;
+
+  /// Destructor
+  ~mvector() { clear() ; }
+
+  // no copy on purpose
+
+//------------------------------------------------
+// Operations
+public :
+  /// delete the data
+  void clear() { free(_data) ; _data = (Data*)NULL ;  _allocated_size = 0 ;  _used_size = 0 ;  _deleted.clear() ; }
+
+  /// estimation of the memory that will be used
+  bool reserve( uint n )
+  {
+    if( n < INITIAL_MVECTOR_SIZE ) n = INITIAL_MVECTOR_SIZE ;
+    if( n <= _allocated_size ) return true ;
+
+    Data *temp = _data ;
+    _data = (Data*)malloc( n*sizeof(Data) ) ;
+    if( temp ) memcpy( _data, temp, _used_size*sizeof(Data) ) ;
+    memset( _data + _used_size, 0, (n-_used_size)*sizeof(Data) ) ;
+    free( temp ) ;
+
+    _allocated_size = n ;
+    return _data != (Data*)NULL ;
+  }
+
+  /// reserve space for n new elements
+  bool reserve_more( uint n )
+  {
+    if( _used_size + n > _allocated_size + _deleted.size() )
+    {
+      uint new_size = 2*_allocated_size ;
+      if( new_size < _used_size + n ) new_size = _used_size + n ;
+      //return reserve( 2*_allocated_size ) ;
+      return reserve( new_size ) ;
+    }
+    return true ;
+  }
+
+  /// insert n new elements
+  bool allocate_more( uint n )
+  {
+    if( !reserve_more( n ) ) return false ;
+    _used_size += n ;
+    return true ;
+  }
+
+  /// add one more element and
+  Data &add( uint &id )
+  {
+    if( _deleted.empty() )
+    {
+      id = _used_size ;
+      allocate_more( 1 ) ;
+    }
+    else
+    {
+      id = _deleted.first() ;
+      _deleted.remove_first() ;
+    }
+    return at(id) ;
+  }
+
+  /// lazy remotion
+  bool remove( uint id )
+  {
+    if( id+1 == _used_size )
+      --_used_size ;
+    else
+      _deleted.insert(id) ;
+    return true ;
+  }
+
+
+//------------------------------------------------
+// Accessor
+public :
+  /// size accessor
+  uint size() {  return _used_size - _deleted.size() ; }
+
+  /// size accessor
+  uint used_size() {  return _used_size ; }
+
+  /// non checked const accessor
+  const Data &at( uint id ) const { return _data[id] ; }
+  /// non checked accessor
+  Data &at( uint id ) { return _data[id] ; }
+
+  /// non checked const accessor
+  const Data &operator[]( uint id ) const { return at(id) ; }
+  /// non checked accessor
+  Data &operator[]( uint id ) { return at(id) ; }
+
+  /// non checked pointer accessor
+  Data *operator +( uint id ) { return _data + id ; }
+
+  /// id range validity check
+  bool is_valid( uint id ) {  return (id < size() && id>=0) ; }
+
+  /// id validity check
+  bool is_deleted( uint id ) {  return is_valid(id) && _deleted.find(id) () ; }
+
+
+//------------------------------------------------
+// Elements
+private :
+  /// main data array
+  Data *_data ;
+
+  /// real data size
+  uint  _allocated_size ;
+
+  /// filled data size
+  uint  _used_size ;
+
+  /// deleted data
+  List<uint> _deleted ;
+
+
+//------------------------------------------------
+// iterator
+public :
+  /// iterator
+  class iterator
+  {
+  public :
+  // constructors
+    /// default constructors
+    iterator( mvector<Data> &vec_, uint id_ = 0 ) : _vec(vec_), _id(id_) {}
+
+    /// destructor
+    ~iterator() {}
+
+    /// copy constructor
+    iterator( const iterator &it ) : _vec(it._vec), _id(it._id) {}
+
+    /// assignment operator
+    iterator &operator = ( const iterator &it )
+    { _vec = it._vec; _id = it._id;  return *this; }
+
+  //-----------------------------------------------------------------------------
+  // Operations
+  public  :
+    /// equality operator
+    inline bool        operator ==( const iterator &it ) const { return &_vec == &it._vec && _id == it._id ; }
+    /// inequality operator
+    inline bool        operator !=( const iterator &it ) const { return &_vec != &it._vec || _id != it._id ; }
+
+    /// validation operator
+    inline bool        operator ()() const { return _vec.is_valid( _id ) ; }
+
+    /// id accessor
+    inline uint        id         () const { return _id                  ; }
+
+    /// value accessor
+    inline const Data &operator * () const { return _vec[_id]            ; }
+
+    /// value accessor
+    inline Data       &operator * ()       { return _vec[_id]            ; }
+
+    /// accesses the next position
+    inline iterator   &operator ++()       { do ++_id ; while( _vec.is_valid(_id) && _vec.is_deleted(_id) ) ;  return *this ; }
+
+  //-----------------------------------------------------------------------------
+  // Elements
+  private :
+    mvector<Data> &_vec ; ///< data vector
+    uint           _id  ; ///< node position
+  };
+
+  //------------------------------------------------
+  // const_iterator
+  public :
+  /// const_iterator
+  class const_iterator
+  {
+    public :
+    // constructors
+    /// default constructors
+    const_iterator( const mvector<Data> &vec_, uint id_ = 0 ) : _vec(vec_), _id(id_) {}
+    
+    /// destructor
+    ~const_iterator() {}
+    
+    //-----------------------------------------------------------------------------
+    // Operations
+    public  :
+    /// equality operator
+    inline bool        operator ==( const const_iterator &it ) const { return &_vec == &it._vec && _id == it._id ; }
+    /// inequality operator
+    inline bool        operator !=( const const_iterator &it ) const { return &_vec != &it._vec || _id != it._id ; }
+    
+    /// validation operator
+    inline bool        operator ()() const { return _vec.is_valid( _id ) ; }
+    
+    /// id accessor
+    inline uint        id         () const { return _id                  ; }
+    
+    /// value accessor
+    inline const Data &operator * () const { return _vec[_id]            ; }
+    
+    /// accesses the next position
+    inline const_iterator   &operator ++()       { do ++_id ; while( _vec.is_valid(_id) && _vec.is_deleted(_id) ) ;  return *this ; }
+    
+    //-----------------------------------------------------------------------------
+    // Elements
+    private :
+    const mvector<Data> &_vec ; ///< data vector
+    uint                 _id  ; ///< node position
+  };
+  
+  public :
+  /// Node iterator creation
+  iterator begin( uint id = 0 ) { return iterator( *this, id ) ; }
+  /// Node const iterator creation
+  const_iterator cbegin( uint id = 0 ) { return const_iterator( *this, id ) ; }
+
+};
+//_____________________________________________________________________________
+
+
diff --git a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/opt_octree.cpp b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/opt_octree.cpp
new file mode 100644
index 0000000000..2e2b539ee8
--- /dev/null
+++ b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/opt_octree.cpp
@@ -0,0 +1,1121 @@
+/**
+ * \file    opt_octree.cpp
+ * \author  Thomas Lewiner   <tomlew@puc-rio.br>
+ * \author  Matmidia Lab, Math Dept, PUC-Rio
+ * \date    10/01/2010
+ *
+ *  Octree structure with hashtable and optimized operations
+ */
+//_____________________________________________________________________________
+
+
+#ifndef WIN32
+#pragma implementation
+#endif // WIN32
+
+
+#include <stack>
+#include "opt_octree.h"
+
+/// invalid key
+template<> Hash<Level>::KeyData Hash<Level>::KD_INV = { KEY_INV, L_INV } ;
+
+
+//_____________________________________________________________________________
+// Create the root
+void OptOctree::init()
+//-----------------------------------------------------------------------------
+{
+  _max_field = R_INV ;
+  _opt_level = L_INV ;
+  memset( _level_dist, 0, (MAX_LEVEL+1)*sizeof(uint) ) ;
+
+  HashField::KeyData kd ;
+  kd.key  =  1  ;
+  kd.data = 0.0 ;
+  _hash.insert( kd ) ;
+
+  _level_dist[0] = 1 ;
+}
+//_____________________________________________________________________________
+
+
+
+
+//_____________________________________________________________________________
+/// Compute the optimal level
+void OptOctree::compute_opt_level()
+//-----------------------------------------------------------------------------
+{
+  Level left     = 0 ;
+  Level right    = MAX_LEVEL ;
+  uint  leftsum  =  0 ;
+  uint  rightsum =  0 ;
+  while( left < right )
+  {
+    uint leftsum_old = leftsum ;
+    if( leftsum <= rightsum )
+    {
+      leftsum += _level_dist[ left ] ;
+      ++left ;
+    }
+    if( leftsum_old >= rightsum )
+    {
+      rightsum += _level_dist[ right ] ;
+      --right ;
+    }
+  }  
+  _opt_level = right ;
+}
+//_____________________________________________________________________________
+
+
+//_____________________________________________________________________________
+// Check that each point scan or scribble is in the right node
+bool OptOctree::check ()
+//-----------------------------------------------------------------------------
+{
+  bool result = true ;
+
+  uint level_dist[MAX_LEVEL+1] ;
+  memset( level_dist, 0, (MAX_LEVEL+1)*sizeof(uint) ) ;
+  for( cell_iterator it = cells_begin() ; it() ; ++it )
+  {
+    if( is_leaf( it.key() ) )
+      level_dist[ key_level(it.key()) ] ++ ;
+    Key k = it.key() << 3 ;
+    bool has_son = false ;
+    bool all_sons = true  ;
+    for( int i = 0 ; i < 8 ; ++i )
+    {
+      if( _hash[ k | i ].key != KEY_INV )
+        has_son = true ;
+      else
+        all_sons = false ;
+    }
+    
+    if( it.is_leaf() && has_son )
+    {
+      printf("(opt) Invalid leaf %d: value %f\n", (int)k, _hash[k].data ) ;
+      result = false ;
+    }
+
+    if( has_son && !all_sons )
+    {
+      printf("(opt) Invalid subdivision %d: value %f\n", (int)k, _hash[k].data ) ;
+      result = false ;
+    }
+  }
+
+  for( Level lv = 0 ; lv <= MAX_LEVEL ; ++lv )
+  {
+    if( _level_dist[lv] != level_dist[lv] )
+    {
+      printf("(opt) Invalid level statistic %d: %d != %d\n", (int)lv, (int)_level_dist[lv], (int)level_dist[lv] ) ;
+      result = false ;
+    }
+  }
+
+  return result ;
+}
+//_____________________________________________________________________________
+
+
+
+
+
+//_____________________________________________________________________________
+// Deletes the content of the octree
+void OptOctree::clear_octree()
+//-----------------------------------------------------------------------------
+{
+  _hash .reset() ;
+  _verts.reset() ;
+  _max_field = R_INV ;
+  _opt_level = L_INV ;
+  memset( _level_dist, 0, (MAX_LEVEL+1)*sizeof(uint) ) ;
+}
+//_____________________________________________________________________________
+
+
+
+
+
+//_____________________________________________________________________________
+// set the values of each leaf from the implicit function
+bool OptOctree::set_impl( data_access *ref )
+//-----------------------------------------------------------------------------
+{
+  if( !ref ) return false ;
+  
+  _max_field = -FLT_MAX ;
+  for( cell_iterator it = cells_begin() ; it() ; ++it )
+  {
+    if( it.is_leaf() )
+    {
+      real v = (*ref).value_at( it.top() ) ;
+      *it = v ;
+      v = fabs(v) ;
+      if( _max_field < v ) _max_field = v ;
+    }
+//    else
+//      *it = R_INV ;
+  }
+  
+//  printf( "max field: %f\n", max_field() ) ;
+  return true ;
+}
+//_____________________________________________________________________________
+
+
+
+
+
+//_____________________________________________________________________________
+// Refine the octree according to the data access
+bool OptOctree::refine( data_access *ref /*= NULL*/ )
+//-----------------------------------------------------------------------------
+{
+  if( !ref ) return false ;
+
+    clear() ;  init() ;
+
+  // traversal stack: iterator has a pre-ordered stack, and cannot be recursed on
+  geom_cell it = geom_root() ;
+  std::stack< geom_cell > s ;
+  s.push( it ) ;
+  
+  // although it may refine only the leaves
+  // the leaf iterator may change during the refinement
+  bool refined = false ;
+  while( !s.empty() )
+  {
+    it = s.top() ;  s.pop() ;
+
+    // test for subdivision
+    if( !(*ref).need_refine( it ) ) continue ;
+    refined = true ;
+    
+    //_____________________________________________________________________________
+    // subdivides the cell in the tree
+    _hash[it.key()].data = it._field = R_INV ;
+    HashField::KeyData kd ;
+    kd.data = 0.0 ;
+
+    // recurse on the traversal
+    Key sk = it.key() << 3 ;
+    for( int i = 0 ; i < 8 ; ++i )
+    {
+      kd.key = sk | i ;
+      if( !_hash.insert( kd ) )
+      {
+        printf( "hash table saturated!\n" ) ;
+        exit(1) ;
+        return false ;
+      }
+      
+      s.push( geom_cell( kd.key, kd.data ) ) ;
+    }
+    Level lv = it.lv() ;
+    _level_dist[ lv ] -= 1 ;
+    _level_dist[lv+1] += 8 ;
+  }
+  
+  compute_opt_level() ;
+
+  return refined ;
+}
+//_____________________________________________________________________________
+
+
+
+//_____________________________________________________________________________
+// Refine the octree according to the data access
+bool OptOctree::adapt( data_access *ref /*= NULL*/ )
+//-----------------------------------------------------------------------------
+{
+  if( !ref ) return false ;
+
+#ifdef HASH_HAS_ERASE
+    
+  // traversal stack: iterator has a pre-ordered stack, and cannot be recursed on
+  geom_cell it = geom_root() ;
+  std::stack< geom_cell > s ;
+  s.push( it ) ;
+  
+  // although it may refine only the leaves
+  // the leaf iterator may change during the refinement
+  geom_cell sons[8] ;
+  bool refined = false ;
+  while( !s.empty() )
+  {
+    it = s.top() ;  s.pop() ;
+//    printf( "opt key %d\n", (int) it.key() ) ;
+
+    // look for the leaves
+    if( !it.is_leaf() )
+    {
+      if( !(*ref).need_refine( it ) )
+      {
+        std::stack< std::pair<Key,Level> > del_s ; // avoid level recomputation
+        del_s.push( std::make_pair( it.key(), it.lv() ) ) ;
+        while( !del_s.empty() )
+        {
+          Key n    = del_s.top().first << 3 ;
+          Level lv = del_s.top().second + 1 ;
+          del_s.pop() ;
+          
+          for( int i = 0 ; i < 8 ; ++i )
+          {
+            HashField::KeyData kd = _hash.erase( n|i ) ;
+            if( !is_inv( kd.data ) ) // is_leaf(n)
+            {
+              _level_dist[ lv ] -- ;
+              continue ;
+            }
+            del_s.push( std::make_pair( n|i, lv ) ) ;
+          }
+        }
+
+        refined = true ;
+        _level_dist[it.lv()] += 1 ;
+        _hash[it.key()].data = 0.0 ; // leaf now!
+        continue ;
+      }
+      
+      it.sons( sons, _hash ) ;
+      for( int i = 0 ; i < 8 ; ++i )
+        s.push( sons[i] ) ;
+      
+      continue ;
+    }
+
+    // test for subdivision
+    if( !(*ref).need_refine( it ) ) continue ;
+    refined = true ;
+    
+    //_____________________________________________________________________________
+    // subdivides the cell in the tree
+    _hash[it.key()].data = it._field = R_INV ;
+    HashField::KeyData kd ;
+    kd.data = 0.0 ;
+    
+    // recurse on the traversal
+    Key sk = it.key() << 3 ;
+    for( int i = 0 ; i < 8 ; ++i )
+    {
+      kd.key = sk | i ;
+      if( !_hash.insert( kd ) )
+      {
+        printf( "hash table saturated!\n" ) ;
+        exit(1) ;
+        return false ;
+      }
+      
+      s.push( geom_cell( kd.key, kd.data ) ) ;
+    }
+    
+    Level lv = it.lv() ;
+    _level_dist[ lv ] -= 1 ;
+    _level_dist[lv+1] += 8 ;
+  }
+  
+  compute_opt_level() ;
+  return refined ;
+  
+#else  // HASH_HAS_ERASE
+  // no remotion in the hash table!
+  return refine( ref ) ;
+#endif // HASH_HAS_ERASE
+}
+//_____________________________________________________________________________
+
+
+
+
+
+//_____________________________________________________________________________
+// Draw the octree with wireframe
+bool OptOctree::draw_wire()
+//-----------------------------------------------------------------------------
+{
+  for( leaf_iterator it = leaves_begin() ; it() ; ++it )
+    it.draw_wire() ;
+  
+  return true ;
+}
+//_____________________________________________________________________________
+
+
+
+
+
+//_____________________________________________________________________________
+// Draw the octree with dots
+bool OptOctree::draw_centers()
+//-----------------------------------------------------------------------------
+{
+  for( cell_iterator it = cells_begin() ; it() ; ++it )
+  {
+    ::glTexCoord1f( (GLfloat)fabs(*it / max_field()) ) ;
+    it.top().draw() ;
+  }
+  
+  return true ;
+}
+//_____________________________________________________________________________
+
+
+
+
+//_____________________________________________________________________________
+// Compute primal vertices
+bool OptOctree::compute_primal_verts()
+//-----------------------------------------------------------------------------
+{
+    
+  // add all the inner vertices
+  for( leaf_iterator l_it = leaves_begin() ; l_it() ; ++l_it )
+  {
+    Key verts_k[8] ;
+    Level lv = vertices_keys( l_it.key(), verts_k ) ;
+    
+    HashVerts::KeyData kd ;
+    kd.data = lv ;
+    Key *v_ptr = verts_k ;
+    for( int i = 0 ; i < 8 ; ++i, ++v_ptr )
+    {
+      kd.key = *v_ptr ;
+      if( kd.key == KEY_INV ) continue ;
+      
+      HashVerts::KeyData &hk = _verts[ kd.key ] ;
+      if( hk.key == KEY_INV )
+        _verts.insert( kd ) ;
+      else if( hk.data < kd.data )
+        hk.data = kd.data ;
+    }
+  }
+  
+  return true ;
+}
+//_____________________________________________________________________________
+
+
+
+//_____________________________________________________________________________
+// Octree dual caller
+bool OptOctree::dual_cubes_walk( opt_dual_walker &walker )
+//-----------------------------------------------------------------------------
+{
+  bool result = compute_primal_verts() ;
+  
+  for( HashVerts::const_iterator v_it = _verts.cbegin() ; v_it() ; ++v_it )
+  {
+    const Level lv = *v_it ;
+    Key dual_verts[8] ;
+    dual_vertices_keys( v_it.key(), lv, dual_verts ) ;
+
+    Key *dv_ptr = dual_verts ;
+    for( int i = 0 ; i < 8 ; ++i, ++dv_ptr )
+    {
+      // find_at, only the level too high case
+      Key &ki = *dv_ptr ;
+      HashField::KeyData kd ;
+      while( ki != 0 && !node_exists(ki,kd) )
+        ki >>= 3;
+    }
+    result &= walker( *this, dual_verts ) ;
+  }
+
+  return result ;
+}
+//_____________________________________________________________________________
+
+
+
+
+//_____________________________________________________________________________
+// Isosurface walker
+bool opt_isosurface_walker( OptOctree &fo, Key *keys )
+//-----------------------------------------------------------------------------
+{
+  MarchingCubes &mc = fo.mc() ;
+  
+  /** isovalues at the cube vertices */
+  real            *cube    = mc.cube() ;
+  /** geometry of the cube */
+  Point           *space   = mc.space() ;
+  /** indexes of the cube */
+  Key             *indexes = mc.indexes() ;
+  
+  for( int j = 0 ; j < 8 ; ++j )
+  {
+    int i = (j==2)?3:(j==3)?2:(j==7)?6:(j==6)?7:j ;
+    const Key k = keys[j] ;
+    OptOctree::geom_cell c = fo.geom_key(k) ;
+    cube[i] = *c ;
+    
+    space[i] = (Point)c ;
+    indexes[i] = k ;
+  }
+  
+  mc.tesselate_cube( 0.0 ) ;
+  
+  return true ;
+}
+//_____________________________________________________________________________
+
+
+
+
+//_____________________________________________________________________________
+// Build the isosurface using dual marching cubes
+bool OptOctree::build_isosurface( data_access *ref )
+//-----------------------------------------------------------------------------
+{
+  if( !ref ) return false ;
+  _mc.dat_access() = ref ;
+  _verts.reset() ;
+  
+    printf( "Build isosurface... " ) ;
+  bool result = false ;
+  
+  //_________________________________________________________________________
+  // Dual Marching Cubes
+  
+  _mc.init_all() ; 
+  
+  result = dual_cubes_walk( opt_isosurface_walker ) ;
+  
+  _mc.clean_temps() ;
+  
+  printf( "generated %d vertices and %d faces!\n", _mc.nverts(), _mc.ntrigs() ) ;
+  
+  return result ;
+}
+//_____________________________________________________________________________
+
+
+
+
+
+//_____________________________________________________________________________
+// Isosurface drawing walker
+bool opt_direct_isosurface_walker( OptOctree &fo, Key *keys )
+//-----------------------------------------------------------------------------
+{
+  MC_Draw &mc = fo.mc_draw() ;
+  
+  /** isovalues at the cube vertices */
+  real            *cube    = mc.cube() ;
+  /** geometry of the cube */
+  Point           *space   = mc.space() ;
+  
+  for( int j = 0 ; j < 8 ; ++j )
+  {
+    int i = (j==2)?3:(j==3)?2:(j==7)?6:(j==6)?7:j ;
+    const OptOctree::geom_cell c = fo.geom_key( keys[j] ) ;
+    cube[i] = *c ;
+    
+    space[i] = (Point)c ;
+  }
+  
+  mc.tesselate_cube( 0.0 ) ;
+  
+  return true ;
+}
+//_____________________________________________________________________________
+
+
+
+//_____________________________________________________________________________
+// Build the isosurface using dual marching cubes
+bool OptOctree::direct_draw_isosurface( data_access *ref )
+//-----------------------------------------------------------------------------
+{
+  if( !ref ) return false ;
+  _mc_draw.dat_access() = ref ;
+  _verts.reset() ;
+  
+    bool result = false ;
+  
+  // Dual Marching Cubes
+  ::glBegin( GL_TRIANGLES ) ;
+  {
+    result = dual_cubes_walk( opt_direct_isosurface_walker ) ;
+  }
+  ::glEnd() ; // GL_TRIANGLES
+  
+  return result ;
+}
+//_____________________________________________________________________________
+
+
+
+
+
+
+//_____________________________________________________________________________
+// Draw walker
+bool opt_draw_walker( OptOctree &fo, Key *keys )
+//-----------------------------------------------------------------------------
+{
+  Cube cells[8] ;
+  for( int i = 0 ; i < 8 ; ++i )
+    cells[i] = key2cube( keys[i] ) ;
+  
+  ((Point)cells[0]).draw() ;
+  ((Point)cells[1]).draw() ;
+  
+  ((Point)cells[1]).draw() ;
+  ((Point)cells[3]).draw() ;
+  
+  ((Point)cells[3]).draw() ;
+  ((Point)cells[2]).draw() ;
+  
+  ((Point)cells[2]).draw() ;
+  ((Point)cells[0]).draw() ;
+  
+  ((Point)cells[4]).draw() ;
+  ((Point)cells[5]).draw() ;
+  
+  ((Point)cells[5]).draw() ;
+  ((Point)cells[7]).draw() ;
+  
+  ((Point)cells[7]).draw() ;
+  ((Point)cells[6]).draw() ;
+  
+  ((Point)cells[6]).draw() ;
+  ((Point)cells[4]).draw() ;
+  
+  ((Point)cells[0]).draw() ;
+  ((Point)cells[4]).draw() ;
+  
+  ((Point)cells[1]).draw() ;
+  ((Point)cells[5]).draw() ;
+  
+  ((Point)cells[2]).draw() ;
+  ((Point)cells[6]).draw() ;
+  
+  ((Point)cells[3]).draw() ;
+  ((Point)cells[7]).draw() ;
+  
+  return true ;
+}
+//_____________________________________________________________________________
+
+
+
+
+//_____________________________________________________________________________
+// Draw the dual octree with wireframe
+bool OptOctree::draw_dual()
+//-----------------------------------------------------------------------------
+{
+  _verts.reset() ;
+
+  ::glBegin( GL_LINES ) ;
+  bool result = dual_cubes_walk( opt_draw_walker ) ;
+  ::glEnd() ;  // GL_LINES
+  
+  return result ;
+}
+//_____________________________________________________________________________
+
+
+
+
+//_____________________________________________________________________________
+// Do nothing walker, just for dual generation timing
+bool opt_timing_walker( OptOctree &fo, Key *keys )
+//-----------------------------------------------------------------------------
+{
+  return true ;
+}
+//_____________________________________________________________________________
+
+
+//_____________________________________________________________________________
+// Do nothing, just for dual generation timing
+bool OptOctree::dual_timing()
+//-----------------------------------------------------------------------------
+{
+  _verts.reset() ;
+
+    return dual_cubes_walk( opt_timing_walker ) ;
+}
+//_____________________________________________________________________________
+
+
+
+
+
+//_____________________________________________________________________________
+// Prints statistics about the octree
+void OptOctree::stats() const
+//-----------------------------------------------------------------------------
+{
+  int s = _hash.size() ;
+  printf( " number of nodes:\t%d\n", s ) ;
+#if USE_HASH_PTR
+  printf( " total memory:\t%d\n", (int) ( s * sizeof(HashField::KeyBucket) ) ) ;
+  _hash.stats() ;
+#else  // USE_HASH_PTR 
+  printf( " total memory:\t%d\n", (int) ( s * sizeof(HashField::KeyData  ) ) ) ;
+#endif // USE_HASH_PTR
+  
+  printf( " leaves' levels:\t" ) ;
+  for( Level l = 0 ; l <= MAX_LEVEL; ++l )
+    printf( "\t%d", _level_dist[l] ) ;
+  printf( "\n" ) ;
+  
+  s = _verts.size() ;
+  printf( " number of dual nodes:\t%d\n", s ) ;
+#if USE_HASH_PTR
+  printf( " total memory of dual:\t%d\n", (int) ( s * sizeof(HashVerts::KeyBucket) ) ) ;
+  _verts.stats() ;
+#else  // USE_HASH_PTR 
+  printf( " total memory of dual:\t%d\n", (int) ( s * sizeof(HashVerts::KeyData  ) ) ) ;
+#endif // USE_HASH_PTR
+}
+//_____________________________________________________________________________
+
+
+
+
+
+//_____________________________________________________________________________
+//_____________________________________________________________________________
+// search operations
+
+
+//_____________________________________________________________________________
+// Find cells of the octree at a given position
+bool OptOctree::find_leaf( Key k, Level o_lv, geom_cell &n ) const
+//-----------------------------------------------------------------------------
+{
+    
+  Level   shift = 3*(MAX_LEVEL-o_lv) ;
+  Key     ki    = k >> shift ;
+  HashField::KeyData kd ;
+  
+  // level too high
+  if( !node_exists(ki,kd) )
+  {
+    do
+    {
+      ki >>= 3;
+    }
+    while( ki !=0 && !node_exists(ki,kd) ) ;
+  }
+  // level correct or too low
+  else
+  {
+    HashField::KeyData kd_temp ;
+    do
+    {
+      kd_temp = kd ;
+      shift -= 3 ;
+      ki = k >> shift ;
+    }
+    while( ki !=0 && node_exists(ki,kd) ) ;
+    kd = kd_temp ;
+  }
+  n = geom_cell( kd ) ;
+
+  return kd.key != KEY_INV ;
+}
+//_____________________________________________________________________________
+
+
+
+//_____________________________________________________________________________
+// Find cells of the octree inside a given box of center x,y and half side r
+bool OptOctree::find_radius( real x, real y, real z, real r, List<geom_cell> &cells ) const
+//-----------------------------------------------------------------------------
+{
+    
+  cells.clear() ;
+
+  Level lv_b = (Level)floor( log(r)/log(0.5) ) ;
+  Key   k_b  = cube2key( Cube(x,y,z,lv_b) ) ;
+
+  Key neighbors[27] ;
+  neighbor_keys( k_b, neighbors ) ;
+
+  std::stack<Key> s ;
+  s.push( k_b ) ;
+  
+  Key *k_ptr = neighbors ;
+  for( int dir = 0 ; dir < 27 ; ++dir, ++k_ptr )
+    s.push( *k_ptr ) ;
+  
+  while( !s.empty() )
+  {
+    Key ki = s.top() ;
+    s.pop() ;
+    if( ki == KEY_INV ) continue ;
+    
+    HashField::KeyData kd ;
+    if( node_exists(ki,kd) )
+    {
+      if( is_leaf( kd ) )
+      {
+        geom_cell gc(kd) ;
+        real sz = gc.sz() + r ;
+
+        // test directly with the key?
+        if( fabs( x-gc.x() ) <= sz && fabs( y-gc.y() ) <= sz && fabs( z-gc.z() ) <= sz )
+          cells.insert( gc ) ;
+      }
+      else 
+      {
+        Key ski = ki << 3 ;
+        for( int i = 0 ; i < 8 ; ++i )
+          // test directly with the key before insertion?
+          s.push( ski | i ) ;
+      }
+    }        
+    else
+    {
+      HashField::KeyData kd ;
+      do
+      {
+        ki >>= 3 ;
+      } while( ki !=0 && !node_exists(ki,kd) ) ;
+      
+      if( ki > 0 )
+      {
+        geom_cell gc(kd) ;
+        real sz = gc.sz() + r ;
+
+        // test directly with the key?
+        if( fabs( x-gc.x() ) <= sz && fabs( y-gc.y() ) <= sz && fabs( z-gc.z() ) <= sz )
+          cells.insert_unique( gc ) ;
+      }
+    }
+  }
+  
+  return true ;
+}
+//_____________________________________________________________________________
+
+
+
+//_____________________________________________________________________________
+// Find neighbor cells of the octree to a given cell
+bool OptOctree::adjacent( Key k, List<geom_cell> &cells ) const
+//-----------------------------------------------------------------------------
+{
+    
+  cells.clear() ;
+
+  Key neighbors[27] ;
+  neighbor_keys( k, neighbors ) ;
+  
+  Key *k_ptr = neighbors ;
+  for( int dir = 0 ; dir < 27 ; ++dir, ++k_ptr )
+  {
+    Key ki = *k_ptr ;
+    if( ki == KEY_INV ) continue ;
+    
+    HashField::KeyData kd ;
+    if( node_exists(ki,kd) )
+    {
+      if( is_leaf( kd ) ) cells.insert( geom_cell(kd) );        
+      else 
+      {
+        std::stack<Key> subneighbors ;
+        subneighbor_keys(ki, dir, subneighbors ) ;
+        while( !subneighbors.empty() )
+        {
+          Key ski = subneighbors.top() ;
+          subneighbors.pop() ;
+          
+          real sdi ;
+          if( is_leaf( ski, sdi ) )
+            cells.insert( geom_cell( ski, sdi ) ) ;
+          else
+            subneighbor_keys(ski, dir, subneighbors ) ;
+        }
+      }
+    }        
+    else
+    {
+      HashField::KeyData kd ;
+      do
+      {
+        ki >>= 3 ;
+      } while( ki !=0 && !node_exists(ki,kd) ) ;
+
+      if( ki > 0 )
+        cells.insert_unique( geom_cell(kd) ) ;
+    }
+  }
+  
+  return true ;
+}
+//_____________________________________________________________________________
+
+
+
+//_____________________________________________________________________________
+//_____________________________________________________________________________
+// I/O
+
+//_____________________________________________________________________________
+// Draws the intersecting cells of a plane with the octree with color
+void OptOctree::draw_plane ( real nx, real ny, real nz, real d )
+//-----------------------------------------------------------------------------
+{
+  geom_cell n = geom_root() ;
+  
+  std::stack< geom_cell > s ;
+  s.push( n ) ;
+  
+  //_____________________________________________________________________________
+  // retrieve the index of the most positive cube corner
+  bool fx = nx >= 0 ;
+  bool fy = ny >= 0 ;
+  bool fz = nz >= 0 ;
+  
+  //_____________________________________________________________________________
+  
+  ::glLineWidth( 1.0f ) ;
+  ::glDisable( GL_LIGHTING ) ;
+  
+  real px,py,pz, mx,my,mz ;
+  while( !s.empty() )
+  {
+    n = s.top() ;  s.pop() ;
+    
+    if( n.is_leaf() )
+    {		
+      
+      ::glTexCoord1f( (GLfloat)fabs(*n/max_field()) ) ;
+      ::glBegin( GL_LINES ) ;
+      n.draw_wire() ;
+      ::glEnd() ;  // GL_LINES		
+      
+      continue ;
+    }
+    
+    //___________________________________________________________________________
+    // recursion
+    geom_cell sons[8] ;
+    n.sons( sons, _hash ) ;
+    real sz_ = sons[0].sz() ;
+    for( int i = 0 ; i < 8 ; ++i )
+    {
+      // get the coordinates of the extremum vertices
+      if( fx ) { px = sons[i].cx() + sz_ ;  mx = sons[i].cx() - sz_ ; }
+      else     { px = sons[i].cx() - sz_ ;  mx = sons[i].cx() + sz_ ; }
+      if( fy ) { py = sons[i].cy() + sz_ ;  my = sons[i].cy() - sz_ ; }
+      else     { py = sons[i].cy() - sz_ ;  my = sons[i].cy() + sz_ ; }
+      if( fz ) { pz = sons[i].cz() + sz_ ;  mz = sons[i].cz() - sz_ ; }
+      else     { pz = sons[i].cz() - sz_ ;  mz = sons[i].cz() + sz_ ; }
+      
+      // plane/cube intersection test
+      if( (nx * px + ny * py + nz * pz + d >= 0.0) && (nx * mx + ny * my + nz * mz + d <= 0.0)  )
+        s.push( sons[i] ) ;
+    }
+  }
+}
+//_____________________________________________________________________________
+
+
+
+
+
+//_____________________________________________________________________________
+// Draws the intersection of a plane with the octree with color
+void OptOctree::draw_slice ( real nx, real ny, real nz, real d, float alpha )
+//-----------------------------------------------------------------------------
+{
+  geom_cell n = geom_root() ;
+  
+  std::stack< geom_cell > s ;
+  s.push( n ) ;
+  
+  // retrieve the index of the most positive cube corner
+  bool fx = nx >= 0 ;
+  bool fy = ny >= 0 ;
+  bool fz = nz >= 0 ;
+  
+  
+  
+  //_____________________________________________________________________________
+  
+  ::glDisable( GL_LIGHTING ) ;
+  
+  real px,py,pz, mx,my,mz ;
+  while( !s.empty() )
+  {
+    n = s.top() ;  s.pop() ;
+    if( n.is_leaf() )
+    {
+      // retrieves the signs of each cube corner
+      real val[8] ;
+      real v   = nx * n.cx() + ny * n.cy() + nz * n.cz() + d ;
+      real sz_ = n.sz() ;
+      int zeros = 0 ;
+      for( int i = 0 ; i < 8 ; ++i )
+      {
+        val[i] = v + nx * ((i&1)?sz_:-sz_) + ny * ((i&2)?sz_:-sz_) + nz * ((i&4)?sz_:-sz_) ;
+        if( fabs(val[i]) < R_EPSILON ) { val[i] = R_EPSILON ;  ++zeros ; }
+      }
+      
+      //_________________________________________________________________________
+      // degenerated intersection
+      if( zeros > 0 )
+      {
+        int npos = 0, nneg = 0 ;
+        for( int i = 0 ; i < 8 ; ++i )
+        {
+          if( fabs(val[i]) < R_EPSILON ) continue ;
+          if( val[i] < 0 )
+            ++nneg ;
+          else
+            ++npos ;
+        }
+        float def = (nneg>npos) ? (float)R_EPSILON : -(float)R_EPSILON ;
+        
+        for( int i = 0 ; i < 8 ; ++i )
+        {
+          if( fabs(val[i]) < R_EPSILON ) val[i] = def ;
+        }
+        //        continue ;
+      }
+      
+      //_________________________________________________________________________
+      // Continuation method
+      int v0=-1, v1=-1 ;  // current edge vertices
+      
+      // get the first intersection
+      static int edges[12][2] = { {0,1}, {0,2}, {0,4}, {1,3}, {1,5}, {2,3}, {2,6}, {3,7}, {4,5}, {4,6}, {5,7}, {6,7} } ;
+      for( int e = 0 ; e < 12 ; ++e )
+      {
+        if( val[ edges[e][0] ] * val[ edges[e][1] ] < 0 )
+        {
+          v0 = edges[e][0] ;
+          v1 = edges[e][1] ;
+          break ;
+        }
+      }
+      int  ov0 = v0, ov1 = v1 ;
+      
+      
+      // equation of previous face adjacent to v0v1: v>>c & 1 == s (c-th coordinate equal to +/- 1)
+      int pf = -1 ;  bool ps ;
+      if       ( (v0 & 1) == (v1 & 1) )   { pf = 0 ; ps = ((v0 & 1) /*>> 0*/) == 1 ; }
+      else   if( (v0 & 2) == (v1 & 2) )   { pf = 1 ; ps = ((v0 & 2)   >> 1  ) == 1 ; }
+      else /*if( (v0 & 4) == (v1 & 4) )*/ { pf = 2 ; ps = ((v0 & 4)   >> 2  ) == 1 ; }
+      
+      //      printf( "cube %d %d %d %d %d %d %d %d, march : (%d,%d) ", val[0]>0, val[1]>0, val[2]>0, val[3]>0, val[4]>0, val[5]>0, val[6]>0, val[7]>0, v0, v1 ) ;
+      
+      //_________________________________________________________________________
+      // marching
+      
+      GLfloat color = (GLfloat)fabs(*n / max_field()) ;
+		  //cmap.gl_color( at(*n) ) ;	
+      ::glBegin( GL_POLYGON ) ;
+      {
+        do
+        {
+          // equation of next face adjacent to v0v1
+          int nf = -1 ;  bool ns ;
+          if       ( pf != 0 && ((v0 & 1) == (v1 & 1)) )   { nf = 0 ; ns = ((v0 & 1) /*>> 0*/) == 1 ; }
+          else   if( pf != 1 && ((v0 & 2) == (v1 & 2)) )   { nf = 1 ; ns = ((v0 & 2)   >> 1  ) == 1 ; }
+          else /*if( pf != 2 && ((v0 & 4) == (v1 & 4)) )*/ { nf = 2 ; ns = ((v0 & 4)   >> 2  ) == 1 ; }
+          
+          /* equivalent construction
+           // get the direction perpendicular to v0v1
+           int of = (v0 ^ v1) & 7 ; // only bit of difference
+           of = of==1 ? 0 : (of==2 ? 1 : 2) ;
+           
+           // compute the equation of the next face adjacent to v0v1
+           int  nf = 3 - (pf+of) ;    // third option: {pf,nf,of}={0,1,2}
+           bool ns = (v0 >> nf) & 1 ; // value of the edge on that direction
+           */
+          
+          // compute the two next vertices (invert the pf-th bit
+          int v2 = ps ? ( v0 & (~(1<<pf)) ) : ( v0 | (1<<pf) ) ;
+          int v3 = ps ? ( v1 & (~(1<<pf)) ) : ( v1 | (1<<pf) ) ;
+          
+          // get the characteristic of the square
+          int  c = (val[v3] > 0) | ((val[v2] > 0) << 1) | ((val[v1] > 0) << 2) | ((val[v0] > 0) << 3) ;
+          if( c > 7 ) c = (~c)&7 ; // consider v0 as negative, and thus v1 as positive
+          /*
+           if( c < 4 )
+           { // degenerated intesection
+           printf( "degenerated intersection %d!\n", c ) ;
+           }
+           */
+          
+          //_______________________________________________________________________
+          // method of continuity on the cube surface
+          switch( c )
+          {
+            case  4 : v0 = v3 ;  break ;
+            case  5 : v0 = v2 ;  v1 = v3 ;  break ;
+            case  6 : /* impossible case */ break ;
+            case  7 : v1 = v2 ;  break ;
+          }
+          
+          
+          
+          
+          real cx =  n.cx();
+          real cy =  n.cy(); 
+          real cz =  n.cz();
+          real sz =  sz_;   
+          real a0 = val[v0];  
+          int i0 = v0; 
+          real a1 = val[v1];  
+          int i1  = v1;
+          
+          real w0 = a1 / (a1-a0) ;
+          real w1 = a0 / (a0-a1) ;
+          
+          real x = cx + w0 * ((i0&1)?sz:-sz) + w1 * ((i1&1)?sz:-sz);
+          real y = cy + w0 * ((i0&2)?sz:-sz) + w1 * ((i1&2)?sz:-sz);
+          real z = cz + w0 * ((i0&4)?sz:-sz) + w1 * ((i1&4)?sz:-sz);
+          
+          ::glTexCoord1d( color ) ;
+          ::glVertex3d(x, y, z) ;
+          
+          // next face
+          pf = nf ;  ps = ns ;
+          
+          //          printf( "(%d,%d) ", v0, v1 ) ;
+        } while( v0 != ov0 || v1 != ov1 ) ;
+        //        printf( "\n" ) ;
+      }
+      ::glEnd() ; // GL_POLYGON
+      
+      continue ;
+    }
+    
+    //___________________________________________________________________________
+    // recursion
+    geom_cell sons[8] ;
+    n.sons( sons, _hash ) ;
+    real sz_ = sons[0].sz() ;
+    for( int i = 0 ; i < 8 ; ++i )
+    {
+      // get the coordinates of the extremum vertices
+      if( fx ) { px = sons[i].cx() + sz_ ;  mx = sons[i].cx() - sz_ ; }
+      else     { px = sons[i].cx() - sz_ ;  mx = sons[i].cx() + sz_ ; }
+      if( fy ) { py = sons[i].cy() + sz_ ;  my = sons[i].cy() - sz_ ; }
+      else     { py = sons[i].cy() - sz_ ;  my = sons[i].cy() + sz_ ; }
+      if( fz ) { pz = sons[i].cz() + sz_ ;  mz = sons[i].cz() - sz_ ; }
+      else     { pz = sons[i].cz() - sz_ ;  mz = sons[i].cz() + sz_ ; }
+      
+      // plane/cube intersection test
+      if( (nx * px + ny * py + nz * pz + d >= 0.0) && (nx * mx + ny * my + nz * mz + d <= 0.0)  )
+        s.push( sons[i] ) ;
+    }
+  }
+}
+//_____________________________________________________________________________
+
diff --git a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/opt_octree.h b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/opt_octree.h
new file mode 100644
index 0000000000..e6a90e93b0
--- /dev/null
+++ b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/opt_octree.h
@@ -0,0 +1,376 @@
+/**
+ * \file    opt_octree.h
+ * \author  Thomas Lewiner   <tomlew@puc-rio.br>
+ * \author  Matmidia Lab, Math Dept, PUC-Rio
+ * \date    10/01/2010
+ *
+ *  Octree structure with hashtable and optimized operations
+ */
+//_____________________________________________________________________________
+
+
+#pragma once
+
+
+#ifndef WIN32
+#pragma interface
+#endif // WIN32
+
+
+#include "mlist.h"
+#include "cube.h"
+#include "hash.h"
+#include "MarchingCubes.h"
+#include "mc_draw.h"
+#include "data_access.h"
+
+
+
+//_____________________________________________________________________________
+// OptOctree
+/// \class OptOctree OptOctree.h
+class OptOctree
+//-----------------------------------------------------------------------------
+{
+// forward declaration
+public:
+  class geom_cell  ;
+  class cell_iterator  ;
+  class leaf_iterator  ;
+
+// Elements
+protected:
+  /// Octree cell data structure
+  typedef Hash<real>  HashField ;
+
+  /// Hashtable of the octree nodes
+  HashField _hash ;
+  
+  /// Level distribution of the octree
+  uint _level_dist[MAX_LEVEL+1] ;
+  
+  /// Optimal level for direct search in the octree
+  Level _opt_level ;
+  
+  /// Maximal field of the octree
+  real _max_field ;
+  
+  /// Isosurface
+  MarchingCubes _mc ;
+
+  /// Isosurface Draw
+  MC_Draw _mc_draw ;
+
+private :
+  /// Octree vertices data structure
+  typedef Hash<Level> HashVerts ;
+  /// Hashtable of the octree vertices
+  HashVerts _verts ;
+
+//-----------------------------------------------------------------------------
+// Constructors
+public:
+  /// Default constructor: Constructs a octree with and empty root
+  OptOctree() { init() ; }
+
+  /// Destructor: Free memory
+  ~OptOctree() { clear() ; }
+
+
+  /// Create the root
+  void init() ;
+
+  /// Memory cleaning
+  void clear() { clear_octree() ;  _mc.clean_all() ; }
+
+  /// Delete the content of the octree
+  void clear_octree() ;
+
+  /// Compute the optimal level
+  void compute_opt_level() ;
+  
+  /// Check that only the leaves have data
+  bool check () ;
+
+  /// Prints statistics about the octree
+  void stats() const ;
+
+  /// Return the maximal level of the octree
+  Level  max_level() const { Level lv = MAX_LEVEL ; while( lv > 0 && !_level_dist[lv] ) --lv ; return lv ; }
+  
+  /// Return the optimal level of the octree
+  Level  opt_level() const { return _opt_level ; }
+  
+  /// Return the optimal level of the octree
+  Level &opt_level()  { return _opt_level ; }
+  
+  /// Return the maximal field of the octree
+  real max_field() const { return _max_field ; }
+   
+  /// Return the isosurface
+  MarchingCubes &mc() { return _mc ; }
+
+  /// Return the isosurface draw
+  MC_Draw &mc_draw() { return _mc_draw ; }
+  
+  /// set the values of each leaf from the implicit function
+  bool set_impl( data_access *ref = NULL ) ;
+  
+  /// Refine the octree according to the data access
+  bool refine( data_access *ref = NULL ) ;
+
+  /// Adapt the octree according to the data access
+  bool adapt( data_access *ref = NULL ) ;
+  
+  /// Draw the octree with wireframe
+  bool draw_wire() ;
+  
+  /// Draw the octree with dots
+  bool draw_centers() ;
+  
+  /// Dual function type
+  typedef bool opt_dual_walker( OptOctree &fo, Key *keys ) ;
+
+  /// Compute primal vertices
+  bool compute_primal_verts() ;
+  
+  /// Walk on the dual cubes
+  bool dual_cubes_walk( opt_dual_walker &walker ) ;
+
+  /// Build the isosurface using dual marching cubes
+  bool build_isosurface( data_access *ref = NULL ) ;
+  
+  /// Draw the isosurface on-the-fly using dual marching cubes
+  bool direct_draw_isosurface( data_access *ref = NULL ) ;
+  
+  /// Draw the dual octree with wireframe
+  bool draw_dual() ;
+  
+  /// Do nothing, just for dual generation timing
+  bool dual_timing() ;
+  
+//-----------------------------------------------------------------------------
+// iterators
+public:
+  /// Create an iterator traversing the tree from the root
+  inline cell_iterator cells_begin() { return cell_iterator( *this ) ; }
+
+  /// Create an iterator traversing the leaves of the tree from the root
+  inline leaf_iterator leaves_begin() { return leaf_iterator( *this ) ; }
+
+//-----------------------------------------------------------------------------
+// search operations
+public:
+  /// Find cells of the octree at a given position
+  bool find_leaf( Key k, Level o_lv, geom_cell &cell ) const ;
+  bool find_leaf( Key k, geom_cell &cell ) const { return find_leaf( k, opt_level(), cell ) ; }
+  bool find_leaf( real x, real y, real z, geom_cell &cell ) const { return find_leaf( cube2key( Cube(x,y,z,MAX_LEVEL) ), opt_level(), cell ) ; }
+
+  /// Find cells of the octree inside a given box of center x,y,z and half side r
+  bool find_radius( real x, real y, real z, real r, List<geom_cell> &cells ) const ;
+
+  /// Find adjacent cells of the octree to a given cell
+  bool adjacent( Key k, List<geom_cell> &cells ) const ;
+  bool adjacent( const geom_cell &cell, List<geom_cell> &cells ) const { return adjacent( cell.key(), cells ) ; }
+
+  /// Leaf test based on the field value
+  bool is_leaf( const HashField::KeyData &kd ) const { return !is_inv( kd.data ) ; }
+  
+  /// Leaf test based on the field value
+  bool is_leaf( Key k, real &d ) const { const HashField::KeyData &kd = _hash[k] ; d = kd.data ; return is_leaf( kd ) ; }
+
+  /// Leaf test based on the field value
+  bool is_leaf( Key k ) const { return is_leaf( _hash[k] ) ; }
+  
+  /// Node existence
+  bool node_exists( Key k, HashField::KeyData &kd ) const { kd = _hash[k] ;  return kd.key != KEY_INV ; }
+  
+  //-----------------------------------------------------------------------------
+// I/O
+public:
+
+  /// Draws the intersecting cells of a plane with the octree with color
+  void draw_plane ( real nx, real ny, real nz, real d	  ) ;
+
+  /// Draws the intersection of a plane with the octree with color
+  void draw_slice ( real nx, real ny, real nz, real d, float alpha ) ;
+
+  /// Draws the isosurface of level l inside the dual graph
+  void draw_iso   () { _mc.draw_surf() ; }
+
+//_____________________________________________________________________________
+// Iterator Cell
+public :
+  /// Auxiliary structure to traverse the octree
+  class geom_cell : public Cube
+  //---------------------------------------------------------------------------
+  {
+    friend class OptOctree ;
+
+  protected:
+    Key   _key   ;  ///< octree cell
+    real  _field ;  ///< field associated to the cell
+
+  //---------------------------------------------------------------------------
+  // Constructors
+  public:
+    /// Default constructor
+    geom_cell( Key key_ = KEY_INV, real field_ = R_INV ) : Cube(key2cube(key_)), _key(key_), _field(field_) {}
+
+    /// Default constructor
+    geom_cell( HashField::KeyData kd ) : Cube(key2cube(kd.key)), _key(kd.key), _field(kd.data) {}
+
+    /// Destructor
+    ~geom_cell() {}
+
+    /// Copy constructor
+    geom_cell( const geom_cell &i ) : Cube(i), _key(i._key), _field(i._field) {}
+
+    /// Assignment operator
+    geom_cell &operator = ( const geom_cell &i )
+    {  Cube::operator=(i) ;  _key = i._key ;  _field = i._field ;  return *this; }
+    
+
+  //---------------------------------------------------------------------------
+  // Public constant accessors
+  public  :
+    /// key const accessor
+    inline Key  key() const { return _key ; }
+    /// key accessor
+    inline Key &key() { return _key ; }
+
+    /// id const accessor
+    inline real  operator*() const { return _field ; }
+    
+    //---------------------------------------------------------------------------
+  // Tests
+  public :
+    /// equality operator
+    inline bool operator ==( const geom_cell &i ) const { return key() == i.key() ; }
+
+    /// inequality operator
+    inline bool operator !=( const geom_cell &i ) const { return key() != i.key() ; }
+
+    /// leaf test
+    inline bool is_leaf() const { return !is_inv(*(*this)) ; }
+
+    /// validation operator
+    inline bool      operator ()() const { return key() != KEY_INV ; }
+
+  //---------------------------------------------------------------------------
+  // Operations
+  public  :
+    /// sons
+    inline bool sons( geom_cell *s /*[8]*/, const HashField &hash )
+    {
+      if( is_leaf() ) return false ;
+
+      Key k = _key << 3 ;
+      for( int i = 0 ; i < 8 ; ++i )
+      {
+        s[i]._key   = k | i ;
+        s[i]._field = hash[k|i].data ;
+        (Cube&)s[i] = key2cube(s[i]._key) ;
+      }
+      return true ;
+    }
+  };
+
+  const geom_cell geom_root() const { const Key root_key = 1 ; return geom_cell( root_key, _hash[root_key].data ) ; }
+  const geom_cell geom_key ( Key k ) const { return geom_cell( k, _hash[k].data ) ; }
+
+
+
+//_____________________________________________________________________________
+// Cell Iterator
+public :
+  /// Octree cell iterator : Traverse the octree returning basic information on the cells
+  class cell_iterator
+  //---------------------------------------------------------------------------
+  {
+    friend class OptOctree ;
+
+  protected:
+    /// Octree traversal iterator
+    HashField::iterator _it ;
+
+  //---------------------------------------------------------------------------
+  // Constructors
+  public:
+    /// Default constructor : Constructs an iterator from a cell
+    cell_iterator( OptOctree &o ) : _it( o._hash.begin() ) {}
+
+    /// Destructor
+    ~cell_iterator() {}
+
+    /// Copy constructor
+    cell_iterator( const cell_iterator &i ) : _it(i._it) {}
+
+    /// Assignment operator
+    cell_iterator &operator = ( const cell_iterator &i )
+    { _it = i._it; return *this; }
+
+  //---------------------------------------------------------------------------
+  // Operations
+  public  :
+    /// equality operator
+    inline bool operator ==( const cell_iterator &i ) const { return _it == i._it ; }
+
+    /// inequality operator
+    inline bool operator !=( const cell_iterator &i ) const { return _it != i._it ; }
+
+    /// validation operator
+    inline bool      operator ()() const { return _it() ; }
+
+    /// next position
+    inline cell_iterator &operator ++() { ++_it ; return *this ; }
+
+  //---------------------------------------------------------------------------
+  // Accessors
+  public  :
+    // cell accessor
+    inline geom_cell top() const { return geom_cell( key(), *_it ) ; }
+
+    /// id accessor
+    inline real &operator*() { return *_it ; }
+
+    /// level accessor
+    inline Level lv() { return key_level(_it.key()) ; }
+
+    /// size accessor
+    inline real  sz() { return Cube(0,0,0,lv()).sz() ; }
+    
+    /// key accessor
+    inline Key   key() const { return _it.key() ; }
+    
+    /// points accessor
+    inline bool is_leaf() const { return !is_inv(*_it) ; }
+
+    /// Draws the cell wire with opengl
+    void draw_wire  () const { top().draw_wire  () ; }
+
+  };
+
+
+  /// Octree leaf iterator : Traverse the octree returning basic information on the leaves
+  class leaf_iterator : public cell_iterator
+  //---------------------------------------------------------------------------
+  {
+    public :
+    leaf_iterator( OptOctree &o ) : cell_iterator( o )
+    { if( (*this)() && !this->is_leaf() ) ++(*this) ; }
+
+    
+    /// next position
+    inline leaf_iterator &operator ++()
+    {
+      cell_iterator &it = *this ;
+      do ++it ; while ( it() && !it.is_leaf() ) ;
+      return *this ;
+    }
+  } ;
+} ;
+//_____________________________________________________________________________
+
+
+
diff --git a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/perf_main.cpp b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/perf_main.cpp
new file mode 100644
index 0000000000..17c64fd125
--- /dev/null
+++ b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/perf_main.cpp
@@ -0,0 +1,265 @@
+/**
+ * \file    perf_main.cpp
+ * \author  Thomas Lewiner   <tomlew@puc-rio.br>
+ * \author  Matmidia Lab, Math Dept, PUC-Rio
+ * \date    10/01/2010
+ *
+ *  Octree performances test
+ */
+//_____________________________________________________________________________
+
+
+/*
+with pointers
+ level 10,12: hash 27, non hash 31
+ level 8: hash 27, non hash 37
+ 
+without pointers
+ level 10: hash 21, non hash 31
+ level 8: hash 21, non hash 37/40
+*/
+
+
+#define OCTREE_SWITCH 2
+
+#ifdef OCTREE_SWITCH
+# if   OCTREE_SWITCH==0
+#  define OCTREE_PTR   1
+# elif OCTREE_SWITCH==1
+#  define OCTREE_HASH  1
+# elif OCTREE_SWITCH==2
+#  define OCTREE_OPT   1
+# elif OCTREE_SWITCH==3
+#  define OCTREE_LEAF  1
+# elif OCTREE_SWITCH==4
+#  define OCTREE_MEM   1
+# endif // OCTREE_SWITCH
+#endif // OCTREE_SWITCH
+
+
+// switch values between pointer and hash octree
+#if !OCTREE_PTR && !OCTREE_HASH && !OCTREE_OPT && !OCTREE_LEAF && !OCTREE_MEM
+// # define OCTREE_PTR  1
+// # define OCTREE_HASH 1
+# define OCTREE_OPT  1
+// # define OCTREE_LEAF 1
+// # define OCTREE_MEM  1
+#endif // !OCTREE_PTR && !OCTREE_HASH && !OCTREE_OPT && !OCTREE_LEAF && !OCTREE_MEM
+
+
+#ifdef OCTREE_PTR
+# undef OCTREE_HASH
+# undef OCTREE_OPT  
+# undef OCTREE_LEAF 
+# undef OCTREE_MEM  
+# define OCTREE_STRING "0 pointer"
+# include "ptr_octree.h"
+  /// octree type
+  typedef PtrOctree Octree ;
+#endif //OCTREE_PTR
+
+
+#ifdef OCTREE_HASH
+# undef OCTREE_PTR
+# undef OCTREE_OPT  
+# undef OCTREE_LEAF 
+# undef OCTREE_MEM  
+# define OCTREE_STRING "1 hash"
+# include "hash_octree.h"
+  /// octree type
+  typedef HashOctree Octree ;
+#endif //OCTREE_HASH
+
+
+#ifdef OCTREE_OPT
+# undef OCTREE_PTR
+# undef OCTREE_HASH
+# undef OCTREE_LEAF 
+# undef OCTREE_MEM  
+# define OCTREE_STRING "2 opt"
+# include "opt_octree.h"
+  /// octree type
+  typedef OptOctree Octree ;
+#endif //OCTREE_OPT
+
+
+#ifdef OCTREE_LEAF
+# undef OCTREE_PTR
+# undef OCTREE_HASH
+# undef OCTREE_OPT  
+# undef OCTREE_MEM  
+# define OCTREE_STRING "3 leaf"
+# include "leaf_octree.h"
+/// octree type
+typedef LeafOctree Octree ;
+#endif //OCTREE_LEAF
+
+
+#ifdef OCTREE_MEM
+# undef OCTREE_PTR
+# undef OCTREE_HASH
+# undef OCTREE_OPT  
+# undef OCTREE_LEAF 
+# define OCTREE_STRING "4 mem"
+# include "mem_octree.h"
+/// octree type
+typedef MemOctree Octree ;
+#endif //OCTREE_MEM
+
+
+#ifndef NPOINTS
+# define NPOINTS 100
+#endif // NPOINTS
+
+#ifndef RADIUS
+# define RADIUS (0.003f)
+#endif // RADIUS
+
+#ifndef NDUALS
+# define NDUALS 10
+#endif // NDUALS
+
+#ifndef MLEVEL
+# define MLEVEL 5
+#endif // MLEVEL
+
+#ifndef IMPLFUN // set to 0 for random
+# define IMPLFUN 1
+#endif // IMPLFUN
+
+#ifndef ISOVAL
+# define ISOVAL 0.5
+#endif // ISOVAL
+
+
+#include "hash.h"
+#include "implfuns.h"
+#include <stdio.h>
+
+//_____________________________________________________________________________
+//
+int main( int argc , char* argv[] )
+//-----------------------------------------------------------------------------
+{
+#if OCTREE_LEAF && !USE_HASH_PTR
+  return 0 ;
+#endif // OCTREE_LEAF && !USE_HASH_PTR
+  
+  srand(77) ;
+//  Chrono::ResetClocks() ;
+
+  printf( "\n\n\n-----------------------------------------------------------------------------\n"
+         OCTREE_STRING
+         "\n\thash\t%s\tpointers\n"
+         "\thash bits =\t%d\n"
+         "\tnon hash bits=\t%d\n"
+         "\tmax_level =\t%d\n"
+         "\tdensity =\t%f\n"
+         "\tnpoints =\t%d\n"
+         "\tradius =\t%f\n"
+         "\timplicit function =\t%s\n"
+         "\tisovalue =\t%f\n"
+         "\tnumber of duals=\t%d\n\n",
+         (USE_HASH_PTR ? "with" : "without"), HASH_BITS, NON_HASH_BITS, MLEVEL, RAND_THRES, NPOINTS, RADIUS, fun_list[IMPLFUN], ISOVAL, NDUALS ) ;
+  fflush(stdout);
+  
+  /// main data structure
+  Octree octree ;
+#if IMPLFUN==0
+  data_rand ref( MLEVEL ) ;
+  octree.refine( &ref ) ;
+#else  // IMPLFUN
+  data_func ref( MLEVEL, ISOVAL, fun_def[IMPLFUN] ) ;
+  octree.refine( &ref ) ;
+  octree.set_impl( &ref ) ;
+#endif // IMPLFUN
+  fflush(stdout);
+
+  
+/*  
+  //-------------------------------------------------
+  // search for random points
+  Chrono::ResetClocks() ;
+  printf( "\n\nRandom Points\n" ) ;
+  for( int i = 0 ; i < NPOINTS ; ++i )
+  {
+    real x = (real)rand()/(real)RAND_MAX;
+    real y = (real)rand()/(real)RAND_MAX;
+    real z = (real)rand()/(real)RAND_MAX;
+    Octree::geom_cell gc ;
+    List<Octree::geom_cell> gc_list ;
+    octree.find_leaf( x,y,z, gc ) ; 
+    octree.find_radius( x,y,z, RADIUS, gc_list ) ; gc_list.clear() ;
+    octree.adjacent( gc, gc_list ) ; gc_list.clear() ;
+  }
+  Chrono::PrintClocks() ;
+  fflush(stdout);
+  //-------------------------------------------------
+
+
+  //-------------------------------------------------
+  // search for all leaves once
+  printf( "\nLeaves\n" ) ;
+  Chrono::ResetClocks() ;
+  for( Octree::leaf_iterator it = octree.leaves_begin() ; it() ; ++it )
+  {
+    Octree::geom_cell g_it = it.top() ;
+    Octree::geom_cell gc ;
+    List<Octree::geom_cell> gc_list ;
+    octree.find_leaf( g_it.cx(), g_it.cy(), g_it.cz(), gc ) ; 
+    octree.find_radius( g_it.cx(), g_it.cy(), g_it.cz(), RADIUS, gc_list ) ; gc_list.clear() ;
+    octree.adjacent( gc, gc_list ) ; gc_list.clear() ;
+  }
+  Chrono::PrintClocks() ;
+  fflush(stdout);
+  //-------------------------------------------------
+  
+  
+  //-------------------------------------------------
+  // search for all points at the maximal level
+  printf( "\n\nGrid\n" ) ;
+  Level lv = octree.max_level() - 4 ;
+  real step = 1.0 / (1 << lv) ;
+  Chrono::ResetClocks() ;
+  for( real x = 0.0 ; x <= 1.0 ; x += step )
+  {
+    for( real y = 0.0 ; y <= 1.0 ; y += step )
+    {
+      for( real z = 0.0 ; z <= 1.0 ; z += step )
+      {
+        Octree::geom_cell gc ;
+        List<Octree::geom_cell> gc_list ;
+        octree.find_leaf( x,y,z, gc ) ; 
+        octree.find_radius( x,y,z, RADIUS, gc_list ) ; gc_list.clear() ;
+        octree.adjacent( gc, gc_list ) ; gc_list.clear() ;
+      }
+    }
+  }
+  Chrono::PrintClocks() ;
+  fflush(stdout);
+  //-------------------------------------------------
+*/
+
+  //-------------------------------------------------
+  // build many duals
+  printf( "\n\nDuals\n" ) ;
+//  Chrono::ResetClocks() ;
+  for( int i = 0 ; i < NDUALS ; ++i )
+  {
+#if IMPLFUN==0
+    octree.dual_timing() ;
+#else  // IMPLFUN
+    octree.mc().clean_all() ;
+    octree.build_isosurface(&ref) ;
+#endif // IMPLFUN
+  }
+//  Chrono::PrintClocks() ;
+  octree.stats() ;
+  fflush(stdout);
+  //-------------------------------------------------
+
+  
+  return 0; 
+}
+//_____________________________________________________________________________
+
diff --git a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/point.h b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/point.h
new file mode 100644
index 0000000000..c2e82b863b
--- /dev/null
+++ b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/point.h
@@ -0,0 +1,289 @@
+/**
+ * \file    point.h
+ * \author  Thomas Lewiner   <tomlew@puc-rio.br>
+ * \author  Matmidia Lab, Math Dept, PUC-Rio
+ * \date    10/01/2010
+ *
+ * \brief  (Point/Vector Class).
+ */
+/**------------------------------------------------------------------------------------*/
+
+
+#pragma once
+
+#include <stdlib.h>
+#include <float.h>   // FLT_EPSILON
+#include <math.h>   // nan
+#ifdef UNIX
+#include <GL/gl.h>
+#else
+#include <OpenGL/GL.h>
+#endif
+
+
+
+//------------------------------------------------
+/** real number type */
+typedef float           real ;
+typedef const real     creal ;
+#define R_PI      ((creal)3.1415926535897932384626433832795)
+#define R_EPSILON ((real)FLT_EPSILON)
+inline bool is_inv( real x ) { return isnan(x) ; }
+extern real R_INV ;
+
+/** integer number aliases */
+typedef   signed char  schar ;
+typedef unsigned char  uchar ;
+typedef unsigned  int   uint ;
+typedef const     int   cint ;
+typedef const    uint  cuint ;
+
+/** \brief Axis Definition */
+enum Axis { X = 0, Y = 1, Z = 2 } ;
+//------------------------------------------------
+
+
+/** \brief point with normal */
+class Point
+  {
+    protected :
+    real  _x, _y, _z ;
+    
+    public :
+    Point() : _x(R_INV), _y(R_INV), _z(R_INV) {}
+    Point( creal x_, creal y_, creal z_ ) : _x(x_), _y(y_), _z(z_) {}
+    Point( const Point &p_ ) : _x(p_._x), _y(p_._y), _z(p_._z) {}
+    Point  &operator = ( const Point &p_ )
+    { _x=p_._x ;  _y=p_._y ;  _z=p_._z ;  return *this; }
+    
+    
+    public :
+    inline real &x()       { return _x ; }
+    inline real &y()       { return _y ; }
+    inline real &z()       { return _z ; }
+    inline creal x() const { return _x ; }
+    inline creal y() const { return _y ; }
+    inline creal z() const { return _z ; }
+    
+    inline creal &operator[] ( Axis a ) const
+    { switch( a ) {
+      case X : return _x ;
+      case Y : return _y ;
+      case Z : return _z ;
+      default: return R_INV ;
+    } }
+    inline real  &operator[] ( Axis a )
+    { switch( a ) {
+      case X : return _x ;
+      case Y : return _y ;
+      case Z : return _z ;
+      default: return R_INV ;
+    } }    
+    
+    /**------------------------------------------------------------------------------------*/
+    inline bool valid()
+    {
+      return
+      ( !is_inv( x() ) ) &&
+      ( !is_inv( y() ) ) &&
+      ( !is_inv( z() ) ) ;
+    }
+    inline bool invalid()
+    {
+      return
+      ( is_inv( x() ) ) ||
+      ( is_inv( y() ) ) ||
+      ( is_inv( z() ) ) ;
+    }
+    
+    
+    /**------------------------------------------------------------------------------------*/
+    // Basic operations
+    
+    /// +=
+    inline Point &operator+= ( const Point &p_ )
+    {
+      x() += p_.x() ;  y() += p_.y() ;  z() += p_.z() ;
+      return *this ;
+    }
+    /// unary -
+    inline const Point operator- ()
+    {
+      x() = -x() ;  y() = -y() ;  z() = -z() ;
+      return *this ;
+    }
+    /// -=
+    inline Point &operator-= ( const Point &p_ )
+    {
+      x() -= p_.x() ;  y() -= p_.y() ;  z() -= p_.z() ;
+      return *this ;
+    }
+    /// *= scalar
+    inline Point &operator*= ( const real l )
+    {
+      x() *= l ;  y() *= l ;  z() *= l ;
+      return *this ;
+    }
+    /// /= scalar
+    inline Point &operator/= ( const real l )
+    {
+      if( fabs(l) < R_EPSILON ) return *this ;
+      real s = 1.0/l ;
+      return *this *= s ;
+    }
+
+    
+    /**------------------------------------------------------------------------------------*/
+    // Norms
+    inline real length () const
+    {
+      return hypot( hypot( x(), y() ), z() ) ;
+    }
+    inline real norm   () const { return length() ; }
+    inline real dist   ( const Point &p_ ) const { Point r = *this ; r -= p_ ;  return r.length() ; }
+
+    inline bool operator== ( const Point &p_ ) const { return dist( p_ ) < R_EPSILON ; }
+    inline bool operator!= ( const Point &p_ ) const { return !( *this == p_ ) ; }
+    
+    inline bool normalize()
+    {
+      real l = length() ;
+      if( l < R_EPSILON ) return false ;
+      *this /= l ;
+      return true ;
+    }
+    
+    /** replaces p by the by-coordinate minimum of p and p_ */
+    inline void pmin( const Point &p_ )
+    { 
+      if( x() > p_.x() ) x() = p_.x() ; 
+      if( y() > p_.y() ) y() = p_.y() ; 
+      if( z() > p_.z() ) z() = p_.z() ; 
+    }
+    
+    /** replaces p by the by-coordinate maximum of p and p_ */
+    inline void pmax( const Point &p_ )
+    { 
+      if( x() < p_.x() ) x() = p_.x() ; 
+      if( y() < p_.y() ) y() = p_.y() ; 
+      if( z() < p_.z() ) z() = p_.z() ; 
+    }
+    
+    //-----------------------------------------------------------------------------
+    // Drawing
+  public:
+    /// Draws the point with opengl
+    void draw () const { ::glVertex3f( (float)x(), (float)y(), (float)z() ) ; }
+  } ;
+
+// Valid point
+extern Point P_INV ;
+
+
+/**------------------------------------------------------------------------------------*/
+// Geometric Operations
+
+/// +
+inline const Point operator+  ( const Point &p, const Point &p_ )
+{
+  Point r = p ;
+  return (r += p_) ;
+}
+/// -
+inline const Point operator-  ( const Point &p, const Point &p_ )
+{
+  Point r = p ;
+  return r -= p_ ;
+}
+/// * scalar
+inline const Point  operator*  ( const Point &p, const real l )
+{
+  Point r = p ;
+  return r *= l ;
+}
+/// * scalar
+inline const Point  operator*  ( const real l, const Point &p )
+{
+  return p * l ;
+}
+/// / scalar
+inline const Point  operator/  ( const Point &p, const real l )
+{
+  Point r = p ;
+  return r /= l ;
+}
+
+/// scalar (dot) product
+inline real operator* ( const Point &p, const Point &p_ )
+{
+  return p.x()*p_.x() + p.y()*p_.y() + p.z()*p_.z() ;
+}
+/// vector (cross) product 
+static inline const Point operator^  ( const Point &p, const Point &p_ )
+{
+  Point r ;
+  r.x() = p.y() * p_.z()  -  p.z() * p_.y() ;
+  r.y() = p.z() * p_.x()  -  p.x() * p_.z() ;
+  r.z() = p.x() * p_.y()  -  p.y() * p_.x() ;
+  return r ;
+}
+static inline real det( const Point &p, const Point &q, const Point &r )
+{
+  return
+  p.x()*q.y()*r.z() + p.y()*q.z()*r.x() + p.z()*q.x()*r.y() -
+  p.z()*q.y()*r.x() - p.x()*q.z()*r.y() - p.y()*q.x()*r.z() ;
+}
+
+
+/**------------------------------------------------------------------------------------*/
+// Geometric Operations
+
+inline real length ( const Point &p ) { return p.length() ; }
+inline real norm   ( const Point &p ) { return p.norm() ; }
+inline real dist   ( const Point &p, const Point &p_ ) { return p.dist(p_) ; }
+inline real sqdist ( const Point &p, const Point &p_ ) { Point r = p-p_ ; return r*r ; }
+
+/** \brief Computes the normal of a triangle
+ * \param const Point &v0
+ * \param const Point &v1
+ * \param const Point &v2 */
+inline const Point normal (const Point & v0, const Point & v1, const Point & v2)
+{
+  Point n = ( v1-v0 ) ^ ( v2 - v0 ) ;
+  n.normalize() ;
+  return n ;
+}
+
+/** \brief Computes the area of a triangle
+ * \param const Point &v0
+ * \param const Point &v1
+ * \param const Point &v2 */
+inline real area (const Point & v0, const Point & v1, const Point & v2)
+{
+  return 0.5 * norm( ( v1-v0 ) ^ ( v2 - v0 ) );
+}
+
+/** \brief Computes the cotangent of ange v v1,v v2
+ * \param const Point &v
+ * \param const Point &v1
+ * \param const Point &v2 */
+inline const real cotan (const Point & v, const Point & v1, const Point & v2)
+{
+  Point u = v1-v ;
+  Point w = v2-v ;
+  return (u*w) / norm( u ^ w ) ;
+}
+
+/** \brief Computes the middle of an edge
+ * \param const Point &v0
+ * \param const Point &v1 */
+inline const Point middle (const Point & v0, const Point & v1)
+{
+  return 0.5 * (v0+v1) ;
+}
+
+
+inline void pmin( Point &p, const Point &p_ ) { p.pmin( p_ ) ; }
+inline void pmax( Point &p, const Point &p_ ) { p.pmax( p_ ) ; }
+
+
diff --git a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/ptr_octree.cpp b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/ptr_octree.cpp
new file mode 100644
index 0000000000..8b3fa39d2d
--- /dev/null
+++ b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/ptr_octree.cpp
@@ -0,0 +1,1289 @@
+/**
+ * \file    ptr_octree.cpp
+ * \author  Thomas Lewiner   <tomlew@puc-rio.br>
+ * \author  Matmidia Lab, Math Dept, PUC-Rio
+ * \date    10/01/2010
+ *
+ *  Octree structure with son-brother pointers
+ */
+//_____________________________________________________________________________
+
+
+#ifndef WIN32
+#pragma implementation
+#endif // WIN32
+
+
+#include "ptr_octree.h"
+
+
+//_____________________________________________________________________________
+// Create the root
+void PtrOctree::init()
+//-----------------------------------------------------------------------------
+{
+  _root.brother   = NULL ;
+  _root.first_son = NULL ;
+  _root.field     = 0.0  ;  
+  
+  _max_level = 0 ;
+  _max_field = R_INV ;
+}
+//_____________________________________________________________________________
+
+
+
+
+//_____________________________________________________________________________
+// Check that each point scan or scribble is in the right node
+bool PtrOctree::check ()
+//-----------------------------------------------------------------------------
+{
+  bool result = true ;
+  return result ;
+}
+//_____________________________________________________________________________
+
+
+
+
+//_____________________________________________________________________________
+// Delete the branch below a given node
+void PtrOctree::clear_branch( cell *b )
+//-----------------------------------------------------------------------------
+{
+  std::stack<cell*> s ;
+  s.push( b ) ;
+  while( !s.empty() )
+  {
+    cell *n = s.top() ;
+    cell *son  = n->first_son ;
+    cell *prev = n ;
+    while( son != (cell*)NULL ) // look two levels to be able to update pointers
+    {
+      cell *next = son->brother ;
+      if( !son->first_son ) // son is a leaf
+      {
+        delete son ;
+        if( prev == n )
+          n->first_son = next ;
+        else
+          prev->brother = next ;
+      }
+      else
+      {
+        prev = son ;
+        s.push( son ) ;
+      }
+      son = next ;
+    }
+    if( !n->first_son ) // now it is a leaf
+      s.pop() ;
+  }
+}
+//_____________________________________________________________________________
+
+
+
+
+
+//_____________________________________________________________________________
+// set the values of each leaf from the implicit function
+bool PtrOctree::set_impl( data_access *ref )
+//-----------------------------------------------------------------------------
+{  
+  if( !ref ) return false ;
+
+  _max_field = -FLT_MAX ;
+  for( cell_iterator it = cells_begin() ; it() ; ++it )
+  {
+    if( it.is_leaf() )
+    {
+      real v = (*ref).value_at( it.top() ) ;
+      *it = v ;
+      v = fabs(v) ;
+      if( _max_field < v ) _max_field = v ;
+    }
+    else
+      *it = R_INV ;
+  }
+  
+//  printf( "max field: %f\n", max_field() ) ;
+  return true ;
+}
+//_____________________________________________________________________________
+
+
+
+
+
+//_____________________________________________________________________________
+// Refine the octree according to the data access
+bool PtrOctree::refine( data_access *ref /*= NULL*/ )
+//-----------------------------------------------------------------------------
+{
+  if( !ref ) return false ;
+
+    clear() ;  init() ;
+  
+  // traversal stack: iterator has a pre-ordered stack, and cannot be recursed on
+  geom_cell it( &_root ) ;
+  std::stack< geom_cell > s ;
+  s.push( it ) ;
+  
+  // although it may refine only the leaves
+  // the leaf iterator may change during the refinement
+  bool refined = false ;
+  while( !s.empty() )
+  {
+    it = s.top() ;  s.pop() ;
+    geom_cell sons[8] ;
+    
+    // test for subdivision
+    if( !(*ref).need_refine( it ) ) continue ;
+    refined = true ;
+    
+    //_____________________________________________________________________________
+    // subdivides the cell in the tree
+    for( int i = 0 ; i < 8 ; ++i )
+    {
+      sons[i].cell     () = new cell ;
+      sons[i].first_son() = (cell*)NULL ;
+      sons[i].brother  () = (cell*)NULL ;
+      sons[i].cell()->field  = 0.0 ;
+      
+      if( i == 0 ) it.first_son() = sons[i].cell() ;
+      else sons[i-1].brother()    = sons[i].cell() ;
+    }
+    it.sons( sons ) ;
+    //if( _max_level < it.lv() ) _max_level = it.lv() ;
+    if( _max_level < sons[0].lv() ) _max_level = sons[0].lv() ;
+    
+    // recurse on the traversal
+    for( int i = 0 ; i < 8 ; ++i )
+      s.push( sons[i] ) ;
+  }
+  
+  return refined ;
+}
+//_____________________________________________________________________________
+
+
+
+//_____________________________________________________________________________
+// Refine the octree according to the data access
+bool PtrOctree::adapt( data_access *ref /*= NULL*/ )
+//-----------------------------------------------------------------------------
+{
+  if( !ref ) return false ;
+
+    _max_level = 0 ;
+  
+  // traversal stack: iterator has a pre-ordered stack, and cannot be recursed on
+  geom_cell it( &_root ) ;
+  std::stack< geom_cell > s ;
+  s.push( it ) ;
+  
+  // although it may refine only the leaves
+  // the leaf iterator may change during the refinement
+  bool refined = false ;
+  while( !s.empty() )
+  {
+    it = s.top() ;  s.pop() ;
+    geom_cell sons[8] ;
+
+    // look for the leaves
+    if( !it.is_leaf() )
+    {
+      if( !(*ref).need_refine( it ) )
+      {
+        clear_branch( it.cell() ) ;
+        refined = true ;
+        continue ;
+      }
+
+      it.sons( sons ) ;
+      for( int i = 0 ; i < 8 ; ++i )
+        s.push( sons[i] ) ;
+
+      if( _max_level < sons[0].lv() ) _max_level = sons[0].lv() ;
+      continue ;
+    }
+
+    // test for subdivision
+    if( !(*ref).need_refine( it ) ) continue ;
+    refined = true ;
+    
+    //_____________________________________________________________________________
+    // subdivides the cell in the tree
+    for( int i = 0 ; i < 8 ; ++i )
+    {
+      sons[i].cell     () = new cell ;
+      sons[i].first_son() = (cell*)NULL ;
+      sons[i].brother  () = (cell*)NULL ;
+      sons[i].cell()->field  = 0.0 ;
+      
+      if( i == 0 ) it.first_son() = sons[i].cell() ;
+      else sons[i-1].brother()    = sons[i].cell() ;
+    }
+    it.sons( sons ) ;
+    //if( _max_level < it.lv() ) _max_level = it.lv() ;
+    if( _max_level < sons[0].lv() ) _max_level = sons[0].lv() ;
+    
+    // recurse on the traversal
+    for( int i = 0 ; i < 8 ; ++i )
+      s.push( sons[i] ) ;
+  }
+  
+  return refined ;
+}
+//_____________________________________________________________________________
+
+
+
+
+//_____________________________________________________________________________
+// Draw the octree with wireframe
+bool PtrOctree::draw_wire()
+//-----------------------------------------------------------------------------
+{
+  for( leaf_iterator it = leaves_begin() ; it() ; ++it )
+    it.draw_wire() ;
+  
+  return true ;
+}
+//_____________________________________________________________________________
+
+
+
+
+
+//_____________________________________________________________________________
+// Draw the octree with dots
+bool PtrOctree::draw_centers()
+//-----------------------------------------------------------------------------
+{
+  for( cell_iterator it = cells_begin() ; it() ; ++it )
+  {
+    ::glTexCoord1f( (GLfloat)fabs(*it / max_field()) ) ;
+    it.top().draw() ;
+  }
+  
+  return true ;
+}
+//_____________________________________________________________________________
+
+
+
+
+//_____________________________________________________________________________
+// Recursion structure
+typedef struct
+//-----------------------------------------------------------------------------
+{
+  enum { DUAL_VERTEX=0, DUAL_EDGE=1, DUAL_FACE=2, DUAL_CUBE=3 } type ;
+  PtrOctree::geom_cell  cells[8]  ;
+  int                   direction ;
+} ptr_dual_iterator_struct ;
+//-----------------------------------------------------------------------------
+// edge pattern for cubes
+// direction : x -> 0, y -> 1, z -> 2, other -> -1
+static const int dir_edges[19][3] = {
+  {0,1,0}, {0,2,1}, {0,4,2}, {1,3,1}, {1,5,2}, {2,3,0}, {2,6,2}, {3,7,2}, {4,5,0}, {4,6,1}, {5,7,1}, {6,7,0},
+  {0,5,-1}, {0,6,-1}, {1,7,-1}, {2,7,-1}, {0,3,-1}, {4,7,-1}, {0,7,-1} } ;
+//_____________________________________________________________________________
+
+
+
+#define PRINT_DUAL_DEBUG 0
+
+//_____________________________________________________________________________
+// Debug print
+void print_final_cube( PtrOctree::geom_cell *cells, float M )
+{
+#if PRINT_DUAL_DEBUG
+  printf( "cube (%d,%d,%d)  (%d,%d,%d)  (%d,%d,%d)  (%d,%d,%d)  (%d,%d,%d)  (%d,%d,%d)  (%d,%d,%d)  (%d,%d,%d) \n",
+         (int)(cells[0].cx()*M), (int)(cells[0].cy()*M), (int)(cells[0].cz()*M),
+         (int)(cells[1].cx()*M), (int)(cells[1].cy()*M), (int)(cells[1].cz()*M),
+         (int)(cells[2].cx()*M), (int)(cells[2].cy()*M), (int)(cells[2].cz()*M),
+         (int)(cells[3].cx()*M), (int)(cells[3].cy()*M), (int)(cells[3].cz()*M),
+         (int)(cells[4].cx()*M), (int)(cells[4].cy()*M), (int)(cells[4].cz()*M),
+         (int)(cells[5].cx()*M), (int)(cells[5].cy()*M), (int)(cells[5].cz()*M),
+         (int)(cells[6].cx()*M), (int)(cells[6].cy()*M), (int)(cells[6].cz()*M),
+         (int)(cells[7].cx()*M), (int)(cells[7].cy()*M), (int)(cells[7].cz()*M) ) ;
+#endif  // PRINT_DUAL_DEBUG
+}
+//-----------------------------------------------------------------------------
+void print_dual_cube( const char*ori, PtrOctree::geom_cell *cells, float M )
+{
+#if PRINT_DUAL_DEBUG
+  printf( "%s->cube (%d,%d,%d)  (%d,%d,%d)  (%d,%d,%d)  (%d,%d,%d)  (%d,%d,%d)  (%d,%d,%d)  (%d,%d,%d)  (%d,%d,%d) \n", ori,
+         (int)(cells[0].cx()*M), (int)(cells[0].cy()*M), (int)(cells[0].cz()*M),
+         (int)(cells[1].cx()*M), (int)(cells[1].cy()*M), (int)(cells[1].cz()*M),
+         (int)(cells[2].cx()*M), (int)(cells[2].cy()*M), (int)(cells[2].cz()*M),
+         (int)(cells[3].cx()*M), (int)(cells[3].cy()*M), (int)(cells[3].cz()*M),
+         (int)(cells[4].cx()*M), (int)(cells[4].cy()*M), (int)(cells[4].cz()*M),
+         (int)(cells[5].cx()*M), (int)(cells[5].cy()*M), (int)(cells[5].cz()*M),
+         (int)(cells[6].cx()*M), (int)(cells[6].cy()*M), (int)(cells[6].cz()*M),
+         (int)(cells[7].cx()*M), (int)(cells[7].cy()*M), (int)(cells[7].cz()*M) ) ;
+#endif  // PRINT_DUAL_DEBUG
+}
+//-----------------------------------------------------------------------------
+void print_dual_face( const char*ori, PtrOctree::geom_cell *cells, float M )
+{
+#if PRINT_DUAL_DEBUG
+  printf( "%s->face (%d,%d,%d)  (%d,%d,%d)  (%d,%d,%d)  (%d,%d,%d)\n", ori,
+         (int)(cells[0].cx()*M), (int)(cells[0].cy()*M), (int)(cells[0].cz()*M),
+         (int)(cells[1].cx()*M), (int)(cells[1].cy()*M), (int)(cells[1].cz()*M),
+         (int)(cells[2].cx()*M), (int)(cells[2].cy()*M), (int)(cells[2].cz()*M),
+         (int)(cells[3].cx()*M), (int)(cells[3].cy()*M), (int)(cells[3].cz()*M) ) ;
+#endif  // PRINT_DUAL_DEBUG
+}
+//-----------------------------------------------------------------------------
+void print_dual_edge( const char*ori, PtrOctree::geom_cell *cells, float M )
+{
+#if PRINT_DUAL_DEBUG
+  printf( "%s->edge (%d,%d,%d)  (%d,%d,%d)\n", ori,
+         (int)(cells[0].cx()*M), (int)(cells[0].cy()*M), (int)(cells[0].cz()*M),
+         (int)(cells[1].cx()*M), (int)(cells[1].cy()*M), (int)(cells[1].cz()*M) ) ;
+#endif  // PRINT_DUAL_DEBUG
+}
+//-----------------------------------------------------------------------------
+void print_dual_vertex( const char*ori, PtrOctree::geom_cell *cells, float M )
+{
+#if PRINT_DUAL_DEBUG
+  printf( "%s->vertex (%d,%d,%d)\n", ori,
+         (int)(cells[0].cx()*M), (int)(cells[0].cy()*M), (int)(cells[0].cz()*M) ) ;
+#endif  // PRINT_DUAL_DEBUG
+}
+//_____________________________________________________________________________
+
+
+//_____________________________________________________________________________
+// Rebuild the octree dual
+bool PtrOctree::dual_cubes_walk( ptr_dual_walker &walker )
+//-----------------------------------------------------------------------------
+{
+  bool result = true ;
+  
+  float M = 1 << (max_level()+1) ;
+  
+  
+  // face pattern for a cube
+  // direction : yz -> 0, zx -> 1, xy -> 2
+  static const int faces[6][5] = {
+    {0,1,2,3, 2}, {4,5,6,7, 2}, {0,1,4,5, 1}, {2,3,6,7, 1}, {0,2,4,6, 0}, {1,3,5,7, 0} } ;
+  
+  // traversal stack: iterator has a pre-ordered stack, and cannot be recursed on
+  ptr_dual_iterator_struct dual_it ;
+  dual_it.type     = ptr_dual_iterator_struct::DUAL_VERTEX ;
+  dual_it.cells[0] = geom_cell( &_root ) ;
+  std::stack< ptr_dual_iterator_struct > s ;
+  s.push( dual_it ) ;
+  
+  _dual_temp_memory = s.size() ;
+  while( !s.empty() )
+  {
+    int s_size = s.size() ;
+    if( s_size > _dual_temp_memory ) _dual_temp_memory = s_size ;
+
+    dual_it = s.top() ;  s.pop() ;
+    
+    //_____________________________________________________________________________
+    //_____________________________________________________________________________
+    // vertex case
+    if( dual_it.type == ptr_dual_iterator_struct::DUAL_VERTEX )
+    {
+      if( dual_it.cells[0].is_leaf() ) continue ;
+      
+      geom_cell sons[8] ;
+      dual_it.cells[0].sons( sons ) ;
+      
+      //_____________________________________________________________________________
+      // vertex
+      dual_it.type = ptr_dual_iterator_struct::DUAL_VERTEX ;
+      for( int i = 0 ; i < 8 ; ++i )
+      {
+        dual_it.cells[0] = sons[i] ;
+        s.push( dual_it ) ;
+        print_dual_vertex( "vertex", dual_it.cells, M ) ;
+      }
+      
+      //_____________________________________________________________________________
+      // edge
+      dual_it.type = ptr_dual_iterator_struct::DUAL_EDGE ;
+      for( int i = 0 ; i < 12 ; ++i )
+      {
+        dual_it.cells[0] = sons[ dir_edges[i][0] ] ;
+        dual_it.cells[1] = sons[ dir_edges[i][1] ] ;
+        dual_it.direction = dir_edges[i][2] ;
+        s.push( dual_it ) ;
+        print_dual_edge( "vertex", dual_it.cells, M ) ;
+      }
+      
+      //_____________________________________________________________________________
+      // face
+      dual_it.type = ptr_dual_iterator_struct::DUAL_FACE ;
+      for( int i = 0 ; i < 6 ; ++i )
+      {
+        dual_it.cells[0] = sons[ faces[i][0] ] ;
+        dual_it.cells[1] = sons[ faces[i][1] ] ;
+        dual_it.cells[2] = sons[ faces[i][2] ] ;
+        dual_it.cells[3] = sons[ faces[i][3] ] ;
+        dual_it.direction = faces[i][4] ;
+        s.push( dual_it ) ;
+        print_dual_face( "vertex", dual_it.cells, M ) ;
+      }
+      
+      //_____________________________________________________________________________
+      // cube
+      dual_it.type = ptr_dual_iterator_struct::DUAL_CUBE ;
+      for( int i = 0 ; i < 8 ; ++i ) dual_it.cells[i] = sons[i] ;
+      s.push( dual_it ) ;
+      print_dual_cube( "vertex", dual_it.cells, M ) ;
+      
+      continue ;
+    }
+    
+    
+    //_____________________________________________________________________________
+    //_____________________________________________________________________________
+    // edge case
+    else if( dual_it.type == ptr_dual_iterator_struct::DUAL_EDGE )
+    {
+      geom_cell all_sons[2][8] ;
+      if( dual_it.cells[0].is_leaf() )
+      {
+        if( dual_it.cells[1].is_leaf() )
+          continue ;
+        
+        // repeat father
+        for( int i = 0 ; i < 8 ; ++i )
+          all_sons[0][i] = dual_it.cells[0] ;
+        
+        dual_it.cells[1].sons( all_sons[1] ) ;
+      }
+      else
+      {
+        dual_it.cells[0].sons( all_sons[0] ) ;
+        
+        if( dual_it.cells[1].is_leaf() )
+        {
+          // repeat father
+          for( int i = 0 ; i < 8 ; ++i )
+            all_sons[1][i] = dual_it.cells[1] ;
+        }
+        else
+          dual_it.cells[1].sons( all_sons[1] ) ;
+      }
+      
+      
+      //_____________________________________________________________________________
+      // local cube
+      geom_cell sons[8] ;
+      int dir = dual_it.direction ;
+      switch( dir )
+      {
+          // x-aligned edge
+        case 0 :
+          sons[0] = all_sons[0][1] ;
+          sons[1] = all_sons[1][0] ;
+          sons[2] = all_sons[0][3] ;
+          sons[3] = all_sons[1][2] ;
+          sons[4] = all_sons[0][5] ;
+          sons[5] = all_sons[1][4] ;
+          sons[6] = all_sons[0][7] ;
+          sons[7] = all_sons[1][6] ;
+          break ;
+          
+          // y-aligned edge
+        case 1 :
+          sons[0] = all_sons[0][2] ;
+          sons[1] = all_sons[0][3] ;
+          sons[2] = all_sons[1][0] ;
+          sons[3] = all_sons[1][1] ;
+          sons[4] = all_sons[0][6] ;
+          sons[5] = all_sons[0][7] ;
+          sons[6] = all_sons[1][4] ;
+          sons[7] = all_sons[1][5] ;
+          break ;
+          
+          // z-aligned edge
+        case 2 :
+          sons[0] = all_sons[0][4] ;
+          sons[1] = all_sons[0][5] ;
+          sons[2] = all_sons[0][6] ;
+          sons[3] = all_sons[0][7] ;
+          sons[4] = all_sons[1][0] ;
+          sons[5] = all_sons[1][1] ;
+          sons[6] = all_sons[1][2] ;
+          sons[7] = all_sons[1][3] ;
+          break ;
+      }
+      
+      //_____________________________________________________________________________
+      // edge
+      dual_it.direction = dir ; // same direction
+      dual_it.type = ptr_dual_iterator_struct::DUAL_EDGE ;
+      for( int i = 0 ; i < 12 ; ++i )
+      {
+        if( dir_edges[i][2] != dir ) continue ;
+        dual_it.cells[0] = sons[ dir_edges[i][0] ] ;
+        dual_it.cells[1] = sons[ dir_edges[i][1] ] ;
+        s.push( dual_it ) ;
+        print_dual_edge( "edge", dual_it.cells, M ) ;
+      }
+      
+      //_____________________________________________________________________________
+      // face
+      dual_it.type = ptr_dual_iterator_struct::DUAL_FACE ;
+      for( int i = 0 ; i < 6 ; ++i )
+      {
+        if( faces[i][4] == dir ) continue ;
+        dual_it.cells[0] = sons[ faces[i][0] ] ;
+        dual_it.cells[1] = sons[ faces[i][1] ] ;
+        dual_it.cells[2] = sons[ faces[i][2] ] ;
+        dual_it.cells[3] = sons[ faces[i][3] ] ;
+        dual_it.direction = faces[i][4] ;
+        s.push( dual_it ) ;
+        print_dual_face( "edge", dual_it.cells, M ) ;
+      }
+      
+      //_____________________________________________________________________________
+      // cube
+      dual_it.type = ptr_dual_iterator_struct::DUAL_CUBE ;
+      for( int i = 0 ; i < 8 ; ++i ) dual_it.cells[i] = sons[i] ;
+      s.push( dual_it ) ;
+      print_dual_cube( "edge", dual_it.cells, M ) ;
+      
+      continue ;
+    }
+    
+    
+    //_____________________________________________________________________________
+    //_____________________________________________________________________________
+    // face case
+    else if( dual_it.type == ptr_dual_iterator_struct::DUAL_FACE )
+    {
+      geom_cell all_sons[4][8] ;
+      bool leaf = true ;
+      for( int i = 0 ; i < 4 ; ++i )
+      {
+        if( dual_it.cells[i].is_leaf() )
+        {
+          // repeat father
+          for( int j = 0 ; j < 8 ; ++j )
+            all_sons[i][j] = dual_it.cells[i] ;
+        }
+        else
+        {
+          leaf = false ;
+          dual_it.cells[i].sons( all_sons[i] ) ;
+        }
+      }
+      if( leaf ) continue ;
+      
+      
+      //_____________________________________________________________________________
+      // local cube
+      geom_cell sons[8] ;
+      int dir = dual_it.direction ;
+      switch( dir )
+      {
+          // yz-aligned face
+        case 0 :
+          sons[0] = all_sons[0][6] ;
+          sons[1] = all_sons[0][7] ;
+          sons[2] = all_sons[1][4] ;
+          sons[3] = all_sons[1][5] ;
+          sons[4] = all_sons[2][2] ;
+          sons[5] = all_sons[2][3] ;
+          sons[6] = all_sons[3][0] ;
+          sons[7] = all_sons[3][1] ;
+          break ;
+          
+          // zx-aligned edge
+        case 1 :
+          sons[0] = all_sons[0][5] ;
+          sons[1] = all_sons[1][4] ;
+          sons[2] = all_sons[0][7] ;
+          sons[3] = all_sons[1][6] ;
+          sons[4] = all_sons[2][1] ;
+          sons[5] = all_sons[3][0] ;
+          sons[6] = all_sons[2][3] ;
+          sons[7] = all_sons[3][2] ;
+          break ;
+          
+          // xy-aligned edge
+        case 2 :
+          sons[0] = all_sons[0][3] ;
+          sons[1] = all_sons[1][2] ;
+          sons[2] = all_sons[2][1] ;
+          sons[3] = all_sons[3][0] ;
+          sons[4] = all_sons[0][7] ;
+          sons[5] = all_sons[1][6] ;
+          sons[6] = all_sons[2][5] ;
+          sons[7] = all_sons[3][4] ;
+          break ;
+      }
+      
+      //_____________________________________________________________________________
+      // face
+      // same direction
+      dual_it.direction = dir ;
+      dual_it.type = ptr_dual_iterator_struct::DUAL_FACE ;
+      for( int i = 0 ; i < 6 ; ++i )
+      {
+        if( faces[i][4] != dir ) continue ;
+        dual_it.cells[0] = sons[ faces[i][0] ] ;
+        dual_it.cells[1] = sons[ faces[i][1] ] ;
+        dual_it.cells[2] = sons[ faces[i][2] ] ;
+        dual_it.cells[3] = sons[ faces[i][3] ] ;
+        //        dual_it.direction = faces[i][4] ;
+        s.push( dual_it ) ;
+        print_dual_face( "face", dual_it.cells, M ) ;
+      }
+      
+      //_____________________________________________________________________________
+      // cube
+      dual_it.type = ptr_dual_iterator_struct::DUAL_CUBE ;
+      for( int i = 0 ; i < 8 ; ++i ) dual_it.cells[i] = sons[i] ;
+      s.push( dual_it ) ;
+      print_dual_cube( "face", dual_it.cells, M ) ;
+      
+      continue ;
+    }
+    
+    
+    //_____________________________________________________________________________
+    //_____________________________________________________________________________
+    // cube case
+    else if( dual_it.type == ptr_dual_iterator_struct::DUAL_CUBE )
+    {
+      bool leaf = true ;
+      
+      //_____________________________________________________________________________
+      // cube
+      for( int i = 0 ; i < 8 ; ++i )
+      {
+        // copy father
+        if( dual_it.cells[i].is_leaf() )
+          continue ;
+        
+        // else
+        leaf = false ;
+        geom_cell sons[8] ;
+        dual_it.cells[i].sons( sons ) ;
+        dual_it.cells[i] = sons[ 7-i ] ;
+      }
+      
+      // finally add dual cube
+      if( leaf )
+      {
+        result &= walker( *this, dual_it.cells ) ;
+        print_final_cube( dual_it.cells, M ) ;
+      }
+      else
+      {
+        s.push( dual_it ) ;
+        print_dual_cube( "cube", dual_it.cells, M ) ;
+      }
+      
+      continue ;
+    }
+    
+  }
+  
+  return result ;
+}
+//_____________________________________________________________________________
+
+
+
+
+
+#include "morton.h"
+//_____________________________________________________________________________
+// Isosurface walker
+bool ptr_isosurface_walker( PtrOctree &fo, PtrOctree::geom_cell *cells )
+//-----------------------------------------------------------------------------
+{
+  MarchingCubes &mc = fo.mc() ;
+  
+  /** isovalues at the cube vertices */
+  real            *cube    = mc.cube() ;
+  /** geometry of the cube */
+  Point           *space   = mc.space() ;
+  /** indexes of the cube */
+  Key             *indexes = mc.indexes() ;
+  
+  for( int j = 0 ; j < 8 ; ++j )
+  {
+    int i = (j==2)?3:(j==3)?2:(j==7)?6:(j==6)?7:j ;
+    const PtrOctree::geom_cell &c = cells[j] ;
+    cube[i] = c.cell()->field ;
+    
+    space[i] = (Point&)c ;
+    indexes[i] = cube2key((Cube&)c) ;
+  }
+  
+  mc.tesselate_cube( 0.0 ) ;
+  
+  return true ;
+}
+//_____________________________________________________________________________
+
+
+
+//_____________________________________________________________________________
+// Build the isosurface using dual marching cubes
+bool PtrOctree::build_isosurface( data_access *ref )
+//-----------------------------------------------------------------------------
+{
+  if( !ref ) return false ;
+  _mc.dat_access() = ref ;
+  
+    printf( "Build isosurface... " ) ;
+  bool result = false ;
+  
+  //_________________________________________________________________________
+  // Dual Marching Cubes
+  
+  _mc.init_all() ;
+  
+  result = dual_cubes_walk( ptr_isosurface_walker ) ;
+  
+  _mc.clean_temps() ;
+  
+  printf( "generated %d vertices and %d faces!\n", _mc.nverts(), _mc.ntrigs() ) ;
+  
+  return result ;
+}
+//_____________________________________________________________________________
+
+
+
+
+
+//_____________________________________________________________________________
+// Isosurface drawing walker
+bool ptr_direct_isosurface_walker( PtrOctree &fo, PtrOctree::geom_cell *cells )
+//-----------------------------------------------------------------------------
+{
+  MC_Draw &mc = fo.mc_draw() ;
+  
+  /** isovalues at the cube vertices */
+  real            *cube    = mc.cube() ;
+  /** geometry of the cube */
+  Point           *space   = mc.space() ;
+  
+  for( int j = 0 ; j < 8 ; ++j )
+  {
+    int i = (j==2)?3:(j==3)?2:(j==7)?6:(j==6)?7:j ;
+    const PtrOctree::geom_cell &c = cells[j] ;
+    cube[i] = c.cell()->field ;
+    
+    space[i] = (Point&)c ;
+  }
+  
+  mc.tesselate_cube( 0.0 ) ;
+  
+  return true ;
+}
+//_____________________________________________________________________________
+
+
+
+//_____________________________________________________________________________
+// Build the isosurface using dual marching cubes
+bool PtrOctree::direct_draw_isosurface( data_access *ref )
+//-----------------------------------------------------------------------------
+{
+  if( !ref ) return false ;
+  _mc_draw.dat_access() = ref ;
+  
+    bool result = false ;
+  
+  // Dual Marching Cubes
+  ::glBegin( GL_TRIANGLES ) ;
+  {
+    result = dual_cubes_walk( ptr_direct_isosurface_walker ) ;
+  }
+  ::glEnd() ; // GL_TRIANGLES
+  
+  return result ;
+}
+//_____________________________________________________________________________
+
+
+
+
+
+
+//_____________________________________________________________________________
+// Draw walker
+bool ptr_draw_walker( PtrOctree &fo, PtrOctree::geom_cell *cells )
+//-----------------------------------------------------------------------------
+{
+  ((Point)cells[0]).draw() ;
+  ((Point)cells[1]).draw() ;
+  
+  ((Point)cells[1]).draw() ;
+  ((Point)cells[3]).draw() ;
+  
+  ((Point)cells[3]).draw() ;
+  ((Point)cells[2]).draw() ;
+  
+  ((Point)cells[2]).draw() ;
+  ((Point)cells[0]).draw() ;
+  
+  ((Point)cells[4]).draw() ;
+  ((Point)cells[5]).draw() ;
+  
+  ((Point)cells[5]).draw() ;
+  ((Point)cells[7]).draw() ;
+  
+  ((Point)cells[7]).draw() ;
+  ((Point)cells[6]).draw() ;
+  
+  ((Point)cells[6]).draw() ;
+  ((Point)cells[4]).draw() ;
+  
+  ((Point)cells[0]).draw() ;
+  ((Point)cells[4]).draw() ;
+  
+  ((Point)cells[1]).draw() ;
+  ((Point)cells[5]).draw() ;
+  
+  ((Point)cells[2]).draw() ;
+  ((Point)cells[6]).draw() ;
+  
+  ((Point)cells[3]).draw() ;
+  ((Point)cells[7]).draw() ;
+  
+  return true ;
+}
+//_____________________________________________________________________________
+
+
+
+
+//_____________________________________________________________________________
+// Draw the dual octree with wireframe
+bool PtrOctree::draw_dual()
+//-----------------------------------------------------------------------------
+{
+  ::glBegin( GL_LINES ) ;
+  bool result = dual_cubes_walk( ptr_draw_walker ) ;
+  ::glEnd() ;  // GL_LINES
+  
+  return result ;
+}
+//_____________________________________________________________________________
+
+
+
+
+//_____________________________________________________________________________
+// Do nothing walker, just for dual generation timing
+bool ptr_timing_walker( PtrOctree &fo, PtrOctree::geom_cell *cells )
+//-----------------------------------------------------------------------------
+{
+  return true ;
+}
+//_____________________________________________________________________________
+
+
+//_____________________________________________________________________________
+// Do nothing, just for dual generation timing
+bool PtrOctree::dual_timing()
+//-----------------------------------------------------------------------------
+{
+    return dual_cubes_walk( ptr_timing_walker ) ;
+}
+//_____________________________________________________________________________
+
+
+
+
+
+//_____________________________________________________________________________
+// Prints statistics about the octree
+void PtrOctree::stats()
+//-----------------------------------------------------------------------------
+{
+  uint level_dist[MAX_LEVEL+1] ;
+  memset( level_dist, 0, (MAX_LEVEL+1)*sizeof(uint) ) ;
+  
+  int s = 0 ;
+  for( cell_iterator it = cells_begin() ; it() ; ++it )
+  {
+    ++s ;
+    if( it.is_leaf() ) level_dist[ it.lv() ] ++ ;
+  }
+  
+  printf( " number of nodes:\t%d\n", s ) ;
+  printf( " total memory:\t%d\n", (int) ( s * sizeof(cell) ) ) ;
+  
+  printf( " leaves' levels:\t" ) ;
+  for( Level l = 0 ; l <= MAX_LEVEL; ++l )
+    printf( "\t%d", level_dist[l] ) ;
+  printf( "\n" ) ;
+  
+  printf( " max size of the stack:\t%d\n", _dual_temp_memory ) ;
+  printf( " total memory of stack:\t%d\n", (int) ( _dual_temp_memory * sizeof(ptr_dual_iterator_struct) ) ) ;
+}
+//_____________________________________________________________________________
+
+
+
+
+
+//_____________________________________________________________________________
+//_____________________________________________________________________________
+// search operations
+
+
+//_____________________________________________________________________________
+// Find cells of the octree at a given position
+bool PtrOctree::find_leaf( real x, real y, real z, geom_cell &n )
+//-----------------------------------------------------------------------------
+{
+  
+  n = geom_cell( &_root ) ;
+  
+  while( !n.is_leaf() )
+  {
+    ++n.lv() ;
+    real sz = n.sz() ;
+    
+    // side test :
+    //  0->back  lower left, 1->back  lower right, 2->back  upper left, 3->back  upper right
+    //  4->front lower left, 5->front lower right, 6->front upper left, 7->front upper right
+    int i = ( (n.cz() < z) << 2 ) | ( (n.cy() < y) << 1 ) | (n.cx() < x) ;
+    n.cx() += (i&1) ? +sz : -sz ;
+    n.cy() += (i&2) ? +sz : -sz ;
+    n.cz() += (i&4) ? +sz : -sz ;
+    
+    n.cell() = n.first_son() ;
+    while( --i > -1 ) n.cell() = n.brother() ;
+  }
+  
+  return true ;
+}
+//_____________________________________________________________________________
+
+
+
+//_____________________________________________________________________________
+// Find cells of the octree inside a given box of center x,y and half side r
+bool PtrOctree::find_radius( real x, real y, real z, real r, List<geom_cell> &cells )
+//-----------------------------------------------------------------------------
+{
+    
+  cells.clear() ;
+  
+  geom_cell n( &_root ) ;
+  
+  std::stack< geom_cell > s ;
+  s.push( n ) ;
+  
+  while( !s.empty() )
+  {
+    n = s.top() ;  s.pop() ;
+//    printf( "%d\t%.4f\t%.4f\t%.4f\n", (int)n.lv(), n.x(), n.y(), n.z() ) ;
+    if( n.is_leaf() )
+    {
+      cells.insert( n ) ;
+      continue ;
+    }
+    
+    geom_cell sons[8] ;
+    n.sons( sons ) ;
+    real sz_ = sons[0].sz() + r ;
+    for( int i = 0 ; i < 8 ; ++i )
+    {
+      if( (fabs( sons[i].cx() - x ) < sz_ ) &&
+          (fabs( sons[i].cy() - y ) < sz_ ) &&
+          (fabs( sons[i].cz() - z ) < sz_ ) )
+        s.push( sons[i] ) ;
+    }
+  }
+//  printf( "\n" ) ;
+  
+  return true ;
+}
+//_____________________________________________________________________________
+
+
+
+//_____________________________________________________________________________
+// Find neighbor cells of the octree to a given cell
+bool PtrOctree::adjacent( const geom_cell &cell, List<geom_cell> &cells )
+//-----------------------------------------------------------------------------
+{
+  return find_radius( cell.cx(), cell.cy(), cell.cz(), cell.sz() + (real) 0.5 / (1 << max_level() ) , cells ) ;
+}
+//_____________________________________________________________________________
+
+
+
+//_____________________________________________________________________________
+//_____________________________________________________________________________
+// I/O
+
+//_____________________________________________________________________________
+// Draws the intersecting cells of a plane with the octree with color
+void PtrOctree::draw_plane ( real nx, real ny, real nz, real d )
+//-----------------------------------------------------------------------------
+{
+  geom_cell n( &_root ) ;
+  
+  std::stack< geom_cell > s ;
+  s.push( n ) ;
+  
+  //_____________________________________________________________________________
+  // retrieve the index of the most positive cube corner
+  bool fx = nx >= 0 ;
+  bool fy = ny >= 0 ;
+  bool fz = nz >= 0 ;
+  
+  //_____________________________________________________________________________
+  
+  ::glLineWidth( (GLfloat)1.0 ) ;
+  ::glDisable( GL_LIGHTING ) ;
+  
+  real px,py,pz, mx,my,mz ;
+  while( !s.empty() )
+  {
+    n = s.top() ;  s.pop() ;
+    
+    if( n.is_leaf() )
+    {		
+      
+      ::glTexCoord1f( (GLfloat)fabs(*n/max_field()) ) ;
+      ::glBegin( GL_LINES ) ;
+      n.draw_wire() ;
+      ::glEnd() ;  // GL_LINES		
+      
+      continue ;
+    }
+    
+    //___________________________________________________________________________
+    // recursion
+    geom_cell sons[8] ;
+    n.sons( sons ) ;
+    real sz_ = sons[0].sz() ;
+    for( int i = 0 ; i < 8 ; ++i )
+    {
+      // get the coordinates of the extremum vertices
+      if( fx ) { px = sons[i].cx() + sz_ ;  mx = sons[i].cx() - sz_ ; }
+      else     { px = sons[i].cx() - sz_ ;  mx = sons[i].cx() + sz_ ; }
+      if( fy ) { py = sons[i].cy() + sz_ ;  my = sons[i].cy() - sz_ ; }
+      else     { py = sons[i].cy() - sz_ ;  my = sons[i].cy() + sz_ ; }
+      if( fz ) { pz = sons[i].cz() + sz_ ;  mz = sons[i].cz() - sz_ ; }
+      else     { pz = sons[i].cz() - sz_ ;  mz = sons[i].cz() + sz_ ; }
+      
+      // plane/cube intersection test
+      if( (nx * px + ny * py + nz * pz + d >= 0.0) && (nx * mx + ny * my + nz * mz + d <= 0.0)  )
+        s.push( sons[i] ) ;
+    }
+  }
+}
+//_____________________________________________________________________________
+
+
+
+
+
+//_____________________________________________________________________________
+// Draws the intersection of a plane with the octree with color
+void PtrOctree::draw_slice ( real nx, real ny, real nz, real d, float alpha )
+//-----------------------------------------------------------------------------
+{
+  geom_cell n( &_root ) ;
+  
+  std::stack< geom_cell > s ;
+  s.push( n ) ;
+  
+  // retrieve the index of the most positive cube corner
+  bool fx = nx >= 0 ;
+  bool fy = ny >= 0 ;
+  bool fz = nz >= 0 ;
+  
+  
+  
+  //_____________________________________________________________________________
+  
+  ::glDisable( GL_LIGHTING ) ;
+  
+  real px,py,pz, mx,my,mz ;
+  while( !s.empty() )
+  {
+    n = s.top() ;  s.pop() ;
+    if( n.is_leaf() )
+    {
+      // retrieves the signs of each cube corner
+      real val[8] ;
+      real v   = nx * n.cx() + ny * n.cy() + nz * n.cz() + d ;
+      real sz_ = n.sz() ;
+      int zeros = 0 ;
+      for( int i = 0 ; i < 8 ; ++i )
+      {
+        val[i] = v + nx * ((i&1)?sz_:-sz_) + ny * ((i&2)?sz_:-sz_) + nz * ((i&4)?sz_:-sz_) ;
+        if( fabs(val[i]) < R_EPSILON ) { val[i] = R_EPSILON ;  ++zeros ; }
+      }
+      
+      //_________________________________________________________________________
+      // degenerated intersection
+      if( zeros > 0 )
+      {
+        int npos = 0, nneg = 0 ;
+        for( int i = 0 ; i < 8 ; ++i )
+        {
+          if( fabs(val[i]) < R_EPSILON ) continue ;
+          if( val[i] < 0 )
+            ++nneg ;
+          else
+            ++npos ;
+        }
+        float def = (nneg>npos) ? (GLfloat)R_EPSILON : (GLfloat)-R_EPSILON ;
+        
+        for( int i = 0 ; i < 8 ; ++i )
+        {
+          if( fabs(val[i]) < R_EPSILON ) val[i] = def ;
+        }
+        //        continue ;
+      }
+      
+      //_________________________________________________________________________
+      // Continuation method
+      int v0=-1, v1=-1 ;  // current edge vertices
+      
+      // get the first intersection
+      static int edges[12][2] = { {0,1}, {0,2}, {0,4}, {1,3}, {1,5}, {2,3}, {2,6}, {3,7}, {4,5}, {4,6}, {5,7}, {6,7} } ;
+      for( int e = 0 ; e < 12 ; ++e )
+      {
+        if( val[ edges[e][0] ] * val[ edges[e][1] ] < 0 )
+        {
+          v0 = edges[e][0] ;
+          v1 = edges[e][1] ;
+          break ;
+        }
+      }
+      int  ov0 = v0, ov1 = v1 ;
+      
+      
+      // equation of previous face adjacent to v0v1: v>>c & 1 == s (c-th coordinate equal to +/- 1)
+      int pf = -1 ;  bool ps ;
+      if       ( (v0 & 1) == (v1 & 1) )   { pf = 0 ; ps = ((v0 & 1) /*>> 0*/) == 1 ; }
+      else   if( (v0 & 2) == (v1 & 2) )   { pf = 1 ; ps = ((v0 & 2)   >> 1  ) == 1 ; }
+      else /*if( (v0 & 4) == (v1 & 4) )*/ { pf = 2 ; ps = ((v0 & 4)   >> 2  ) == 1 ; }
+      
+      //      printf( "cube %d %d %d %d %d %d %d %d, march : (%d,%d) ", val[0]>0, val[1]>0, val[2]>0, val[3]>0, val[4]>0, val[5]>0, val[6]>0, val[7]>0, v0, v1 ) ;
+      
+      //_________________________________________________________________________
+      // marching
+      
+      GLfloat color = (GLfloat)fabs(*n / max_field()) ;
+      ::glBegin( GL_POLYGON ) ;
+      {
+        do
+        {
+          // equation of next face adjacent to v0v1
+          int nf = -1 ;  bool ns ;
+          if       ( pf != 0 && ((v0 & 1) == (v1 & 1)) )   { nf = 0 ; ns = ((v0 & 1) /*>> 0*/) == 1 ; }
+          else   if( pf != 1 && ((v0 & 2) == (v1 & 2)) )   { nf = 1 ; ns = ((v0 & 2)   >> 1  ) == 1 ; }
+          else /*if( pf != 2 && ((v0 & 4) == (v1 & 4)) )*/ { nf = 2 ; ns = ((v0 & 4)   >> 2  ) == 1 ; }
+          
+          /* equivalent construction
+           // get the direction perpendicular to v0v1
+           int of = (v0 ^ v1) & 7 ; // only bit of difference
+           of = of==1 ? 0 : (of==2 ? 1 : 2) ;
+           
+           // compute the equation of the next face adjacent to v0v1
+           int  nf = 3 - (pf+of) ;    // third option: {pf,nf,of}={0,1,2}
+           bool ns = (v0 >> nf) & 1 ; // value of the edge on that direction
+           */
+          
+          // compute the two next vertices (invert the pf-th bit
+          int v2 = ps ? ( v0 & (~(1<<pf)) ) : ( v0 | (1<<pf) ) ;
+          int v3 = ps ? ( v1 & (~(1<<pf)) ) : ( v1 | (1<<pf) ) ;
+          
+          // get the characteristic of the square
+          int  c = (val[v3] > 0) | ((val[v2] > 0) << 1) | ((val[v1] > 0) << 2) | ((val[v0] > 0) << 3) ;
+          if( c > 7 ) c = (~c)&7 ; // consider v0 as negative, and thus v1 as positive
+          /*
+           if( c < 4 )
+           { // degenerated intesection
+           printf( "degenerated intersection %d!\n", c ) ;
+           }
+           */
+          
+          //_______________________________________________________________________
+          // method of continuity on the cube surface
+          switch( c )
+          {
+            case  4 : v0 = v3 ;  break ;
+            case  5 : v0 = v2 ;  v1 = v3 ;  break ;
+            case  6 : /* impossible case */ break ;
+            case  7 : v1 = v2 ;  break ;
+          }
+          
+          
+          
+          
+          real cx =  n.cx();
+          real cy =  n.cy(); 
+          real cz =  n.cz();
+          real sz =  sz_;   
+          real a0 = val[v0];  
+          int i0 = v0; 
+          real a1 = val[v1];  
+          int i1  = v1;
+          
+          real w0 = a1 / (a1-a0) ;
+          real w1 = a0 / (a0-a1) ;
+          
+          real x = cx + w0 * ((i0&1)?sz:-sz) + w1 * ((i1&1)?sz:-sz);
+          real y = cy + w0 * ((i0&2)?sz:-sz) + w1 * ((i1&2)?sz:-sz);
+          real z = cz + w0 * ((i0&4)?sz:-sz) + w1 * ((i1&4)?sz:-sz);
+          
+          ::glTexCoord1d( color ) ;
+          ::glVertex3d(x, y, z) ;
+          
+          // next face
+          pf = nf ;  ps = ns ;
+          
+          //          printf( "(%d,%d) ", v0, v1 ) ;
+        } while( v0 != ov0 || v1 != ov1 ) ;
+        //        printf( "\n" ) ;
+      }
+      ::glEnd() ; // GL_POLYGON
+      
+      continue ;
+    }
+    
+    //___________________________________________________________________________
+    // recursion
+    geom_cell sons[8] ;
+    n.sons( sons ) ;
+    real sz_ = sons[0].sz() ;
+    for( int i = 0 ; i < 8 ; ++i )
+    {
+      // get the coordinates of the extremum vertices
+      if( fx ) { px = sons[i].cx() + sz_ ;  mx = sons[i].cx() - sz_ ; }
+      else     { px = sons[i].cx() - sz_ ;  mx = sons[i].cx() + sz_ ; }
+      if( fy ) { py = sons[i].cy() + sz_ ;  my = sons[i].cy() - sz_ ; }
+      else     { py = sons[i].cy() - sz_ ;  my = sons[i].cy() + sz_ ; }
+      if( fz ) { pz = sons[i].cz() + sz_ ;  mz = sons[i].cz() - sz_ ; }
+      else     { pz = sons[i].cz() - sz_ ;  mz = sons[i].cz() + sz_ ; }
+      
+      // plane/cube intersection test
+      if( (nx * px + ny * py + nz * pz + d >= 0.0) && (nx * mx + ny * my + nz * mz + d <= 0.0)  )
+        s.push( sons[i] ) ;
+    }
+  }
+}
+//_____________________________________________________________________________
+
diff --git a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/ptr_octree.h b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/ptr_octree.h
new file mode 100644
index 0000000000..7907e2865c
--- /dev/null
+++ b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/ptr_octree.h
@@ -0,0 +1,400 @@
+/**
+ * \file    ptr_octree.h
+ * \author  Thomas Lewiner   <tomlew@puc-rio.br>
+ * \author  Matmidia Lab, Math Dept, PUC-Rio
+ * \date    10/01/2010
+ *
+ *  Octree structure with son-brother pointers
+ */
+//_____________________________________________________________________________
+
+
+#pragma once
+
+
+#ifndef WIN32
+#pragma interface
+#endif // WIN32
+
+
+#include <stack>
+#include "mlist.h"
+#include "cube.h"
+#include "MarchingCubes.h"
+#include "mc_draw.h"
+#include "data_access.h"
+
+
+//_____________________________________________________________________________
+// PtrOctree
+/// \class PtrOctree PtrOctree.h
+class PtrOctree
+//-----------------------------------------------------------------------------
+{
+// forward declaration
+public:
+  class geom_cell  ;
+  class cell_iterator  ;
+  class leaf_iterator  ;
+
+// Elements
+protected:
+  /// Octree cell data structure
+  typedef struct cell
+  {
+    struct cell *brother   ;  ///< next brother of the cell
+    struct cell *first_son ;  ///< first son of the cell
+    real         field     ;  ///< field supported by the cell
+  } cell ;
+
+  /// Root of the octree
+  cell _root ;
+
+  /// Maximal level of the octree (for find_adjacent)
+  Level _max_level ;
+  
+  /// Maximal field of the octree
+  real _max_field ;
+  
+  /// Isosurface
+  MarchingCubes _mc ;
+
+  /// Isosurface Draw
+  MC_Draw _mc_draw ;
+  
+  /// Dual run memory consumption
+  uint _dual_temp_memory ;
+  
+  //-----------------------------------------------------------------------------
+// Constructors
+public:
+  /// Default constructor: Constructs a octree with and empty root
+  PtrOctree() { init() ; }
+
+  /// Destructor: Free memory
+  ~PtrOctree() { clear() ; }
+
+
+  /// Create the root
+  void init() ;
+
+  /// Memory cleaning
+  void clear() { clear_octree() ;  _mc.clean_all() ; }
+
+  /// Delete the branch below a given node
+  void clear_branch( cell *b ) ;
+
+  /// Delete the content of the octree
+  void clear_octree() { clear_branch( &_root ) ; }
+
+  /// Check that only the leaves have data
+  bool check () ;
+
+  /// Prints statistics about the octree
+  void stats() ;
+  
+  
+  /// Return the maximal level of the octree
+  Level  max_level() const { return _max_level ; }
+  
+  /// Return the maximal field of the octree
+  real max_field() const { return _max_field ; }
+   
+  /// Return the isosurface
+  MarchingCubes &mc() { return _mc ; }
+  
+  /// Return the isosurface draw
+  MC_Draw &mc_draw() { return _mc_draw ; }
+  
+  /// set the values of each leaf from the implicit function
+  bool set_impl( data_access *ref = NULL ) ;
+  
+  /// Refine the octree according to the data access
+  bool refine( data_access *ref = NULL ) ;
+  
+  /// Adapt the octree according to the data access
+  bool adapt( data_access *ref = NULL ) ;
+  
+  /// Draw the octree with wireframe
+  bool draw_wire() ;
+  
+  /// Draw the octree with dots
+  bool draw_centers() ;
+  
+  /// Dual function type
+  typedef bool ptr_dual_walker( PtrOctree &fo, geom_cell *cells ) ;
+
+  /// Walk on the dual cubes
+  bool dual_cubes_walk( ptr_dual_walker &walker ) ;
+
+  /// Build the isosurface using dual marching cubes
+  bool build_isosurface( data_access *ref = NULL ) ;
+  
+  /// Draw the isosurface on-the-fly using dual marching cubes
+  bool direct_draw_isosurface( data_access *ref = NULL ) ;
+  
+  /// Draw the dual octree with wireframe
+  bool draw_dual() ;
+  
+  /// Do nothing, just for dual generation timing
+  bool dual_timing() ;
+  
+//-----------------------------------------------------------------------------
+// iterators
+public:
+  /// Create an iterator traversing the tree from the root
+  inline cell_iterator cells_begin() { return cell_iterator( &_root ) ; }
+
+  /// Create an iterator traversing the leaves of the tree from the root
+  inline leaf_iterator leaves_begin() { return leaf_iterator( &_root ) ; }
+
+//-----------------------------------------------------------------------------
+// search operations
+public:
+  /// Find cells of the octree at a given position
+  bool find_leaf( real x, real y, real z, geom_cell &cell ) ;
+
+  /// Find cells of the octree inside a given box of center x,y,z and half side r
+  bool find_radius( real x, real y, real z, real r, List<geom_cell> &cells ) ;
+
+  /// Find adjacent cells of the octree to a given cell
+  bool adjacent( const geom_cell &cell, List<geom_cell> &cells ) ;
+
+
+//-----------------------------------------------------------------------------
+// I/O
+public:
+
+  /// Draws the intersecting cells of a plane with the octree with color
+  void draw_plane ( real nx, real ny, real nz, real d	  ) ;
+
+  /// Draws the intersection of a plane with the octree with color
+  void draw_slice ( real nx, real ny, real nz, real d, float alpha ) ;
+
+  /// Draws the isosurface of level l inside the dual graph
+  void draw_iso   () { _mc.draw_surf() ; }
+
+//_____________________________________________________________________________
+// Iterator Cell
+public :
+  /// Auxiliary structure to traverse the octree
+  class geom_cell : public Cube
+  //---------------------------------------------------------------------------
+  {
+    friend class PtrOctree ;
+
+  protected:
+    PtrOctree::cell *_cell   ;  ///< octree cell
+
+  //---------------------------------------------------------------------------
+  // Constructors
+  public:
+    /// Default constructor: Constructs an iterator from a cell
+    geom_cell( PtrOctree::cell *cell_ = NULL, real cx_ = 0.5, real cy_ = 0.5, real cz_ = 0.5, Level lv_ = 0 )
+      : Cube(cx_,cy_,cz_,lv_), _cell(cell_) {}
+
+    /// Destructor
+    ~geom_cell() {}
+
+
+    /// Copy constructor
+    geom_cell( const geom_cell &i )
+      : Cube(i), _cell(i._cell) {}
+
+    /// Assignment operator
+    geom_cell &operator = ( const geom_cell &i )
+    { Cube::operator=(i); _cell=i._cell; return *this; }
+
+  //---------------------------------------------------------------------------
+  // Public constant accessors
+  public  :
+    /// cell const accessor
+    inline const PtrOctree::cell * cell() const { return _cell ; }
+    /// cell accessor
+    inline PtrOctree::cell *&cell() { return _cell ; }
+
+    /// first son const accessor
+    inline const PtrOctree::cell * first_son() const { return _cell->first_son ; }
+    /// first son accessor
+    inline PtrOctree::cell *&first_son() { return _cell->first_son ; }
+    
+    /// brother const accessor
+    inline const PtrOctree::cell * brother() const { return _cell->brother ; }
+    /// brother accessor
+    inline PtrOctree::cell *&brother() { return _cell->brother ; }
+    
+    /// id const accessor
+    inline real  operator*() const { return cell()->field ; }
+    /// id accessor
+    inline real &operator*() { return cell()->field ; }
+    
+    //---------------------------------------------------------------------------
+  // Tests
+  public :
+    /// equality operator
+    inline bool operator ==( const geom_cell &i ) const { return cell() == i.cell() ; }
+
+    /// inequality operator
+    inline bool operator !=( const geom_cell &i ) const { return cell() != i.cell() ; }
+
+    /// leaf test
+    inline bool is_leaf() const { return first_son() == NULL ; }
+
+    /// validation operator
+    inline bool      operator ()() const { return cell() != NULL ; }
+
+  //---------------------------------------------------------------------------
+  // Operations
+  public  :
+    /// sons
+    inline bool sons( geom_cell *s /*[8]*/ )
+    {
+      if( !first_son() ) return false ;
+
+      int    level_ = lv() + 1 ;
+      real sz_    = sz() / 2.0 ;
+      for( int i = 0 ; i < 8 ; ++i )
+      {
+        s[i].cell () = (i==0) ? first_son() : s[i-1].brother() ;
+        s[i].lv   () = level_ ;
+        s[i].cx   () = (i&1) ? cx() + sz_ : cx() - sz_ ;
+        s[i].cy   () = (i&2) ? cy() + sz_ : cy() - sz_ ;
+        s[i].cz   () = (i&4) ? cz() + sz_ : cz() - sz_ ;
+      }
+      return true ;
+    }
+
+    /// get son from side i
+    inline bool son( int i , geom_cell &s )
+    {
+      if( is_leaf() ) return false ;
+
+      real sz_ = s.sz() / 2.0 ;
+      ++s.lv() ;
+      s.cx() = (i&1) ? cx() + sz_ : cx() - sz_ ;
+      s.cy() = (i&2) ? cy() + sz_ : cy() - sz_ ;
+      s.cz() = (i&4) ? cz() + sz_ : cz() - sz_ ;
+
+      s.cell() = first_son() ;
+      while( --i > -1 ) s.cell() = s.brother() ;
+
+      return true ;
+    }
+  };
+
+
+//_____________________________________________________________________________
+// Cell Iterator
+public :
+  /// Octree cell iterator : Traverse the octree returning basic information on the cells
+  class cell_iterator
+  //---------------------------------------------------------------------------
+  {
+    friend class PtrOctree ;
+
+  protected:
+    /// Octree traversal stack
+    std::stack<geom_cell> _s ;
+
+  //---------------------------------------------------------------------------
+  // Constructors
+  public:
+    /// Default constructor : Constructs an iterator from a cell
+    cell_iterator( PtrOctree::cell *root = NULL, real cx_ = 0.5, real cy_ = 0.5, real cz_ = 0.5, Level lv_ = 0 )
+    { if( root ) _s.push( geom_cell( root, cx_, cy_, cz_, lv_ ) ) ; }
+
+    /// Destructor
+    ~cell_iterator() {}
+
+    /// Copy constructor
+    cell_iterator( const cell_iterator &i ) : _s(i._s) {}
+
+    /// Assignment operator
+    cell_iterator &operator = ( const cell_iterator &i )
+    { _s = i._s; return *this; }
+
+  //---------------------------------------------------------------------------
+  // Operations
+  public  :
+    /// validation operator
+    inline bool      operator ()() const { return !_s.empty() ; }
+
+    /// next position
+    inline cell_iterator &operator ++()
+    {
+      if( _s.empty() ) return *this ;
+      geom_cell n = _s.top() ;  _s.pop() ;
+      if( n.is_leaf() ) return *this ;
+
+      // depth first search
+      geom_cell sons[8] ;
+      n.sons( sons ) ;
+      for( int i = 0 ; i < 8 ; ++i )
+        _s.push( sons[i] ) ;
+
+      return *this ;
+    }
+
+  //---------------------------------------------------------------------------
+  // Accessors
+  public  :
+    /// geom_cell accessor
+    inline geom_cell &top() { return _s.top() ; }
+
+    /// id accessor
+    inline real &operator*() { return * _s.top() ; }
+
+    /// level accessor
+    inline Level  &lv() { return _s.top().lv() ; }
+
+    /// center x position accessor
+    inline real &cx() { return _s.top().cx() ; }
+
+    /// center y position accessor
+    inline real &cy() { return _s.top().cy() ; }
+
+    /// center y position accessor
+    inline real &cz() { return _s.top().cz() ; }
+
+    /// size accessor
+    inline real  sz() { return _s.top().sz() ; }
+
+    /// points accessor
+    inline bool is_leaf() const { return _s.top().is_leaf() ; }
+
+    /// inside test
+    inline bool contains( real x, real y, real z ) const { return _s.top().contains( x,y,z ) ; }
+
+    /// get son from its side:
+    inline bool son( int i , geom_cell &s_ )       { return _s.top().son(i,s_) ; }
+
+    /// Draws the cell wire with opengl
+    void draw_wire  () const { _s.top().draw_wire  () ; }
+
+  protected :
+    /// stack accessor for ad hoc iterations
+    inline std::stack< geom_cell > &s() { return _s ; }
+  };
+
+
+  /// Octree leaf iterator : Traverse the octree returning basic information on the leaves
+  class leaf_iterator : public cell_iterator
+  //---------------------------------------------------------------------------
+  {
+    public :
+    leaf_iterator( PtrOctree::cell *root = NULL, real cx_ = 0.5, real cy_ = 0.5, real cz_ = 0.5, Level lv_ = 0 ) : cell_iterator( root, cx_,cy_,cz_,lv_ )
+    { if( root && !this->is_leaf() ) ++(*this) ; }
+
+    
+    /// next position
+    inline leaf_iterator &operator ++()
+    {
+      cell_iterator &it = *this ;
+      do ++it ; while ( it() && !it.is_leaf() ) ;
+      return *this ;
+    }
+  } ;
+} ;
+//_____________________________________________________________________________
+
+
diff --git a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/viz_glui_cmdline.cpp b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/viz_glui_cmdline.cpp
new file mode 100644
index 0000000000..5625ab45bf
--- /dev/null
+++ b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/viz_glui_cmdline.cpp
@@ -0,0 +1,71 @@
+/**
+ * @file    glui_cmdline.cpp
+ * @author  Thomas Lewiner <thomas.lewiner@polytechnique.org>
+ * @author  Math Dept, PUC-Rio
+ * @version 0.1
+ * @date    20/08/2007
+ *
+ * @brief   Example Graphical interface: command line parser
+ */
+//________________________________________________
+
+
+#ifndef WIN32
+#pragma implementation "viz_glui_defs.h"
+#endif // WIN32
+
+#include "viz_glui_defs.h"
+
+
+//_____________________________________________________________________________
+// parse command line
+bool parse_command_line(int argc, char* argv[])
+//-----------------------------------------------------------------------------
+{
+  bool quit = false ;
+  
+  for( int i = 1 ; i < argc ; ++i )
+  {
+    if     ( !strcmp( argv[i], "-lv" ) )
+    {
+      if( ++i != argc ) { max_level = atoi( argv[i] ) ; }
+    }
+    
+    else if( !strcmp( argv[i], "+ortho" ) )
+    {
+      ortho = true ;
+    }
+    else if( !strcmp( argv[i], "-ortho" ) )
+    {
+      ortho = false ;
+    }
+    else if( !strcmp( argv[i], "-pos" ) )
+    {
+      if( ++i != argc ) { obj_pos[0] = atof( argv[i] ) ; }
+      if( ++i != argc ) { obj_pos[1] = atof( argv[i] ) ; }
+      if( ++i != argc ) { obj_pos[2] = atof( argv[i] ) ; }
+    }
+    else if( !strcmp( argv[i], "-rot" ) )
+    {
+      for( int j = 0 ; j < 16 ; ++j )
+        if( ++i != argc ) { view_rotate[j] = atof( argv[i] ) ; }
+    }
+    else if( !strcmp( argv[i], "-view" ) )
+    {
+      control_cb( LOAD_VIEWPORT_ID ) ;
+    }
+    else if( !strcmp( argv[i], "-q" ) )
+    {
+      quit = true ;
+    }
+    else if( !strcmp( argv[i], "-h" ) )
+    {
+      printf( "usage %s [-in file.xyz] [-q]\n", argv[0] ) ;
+    }
+  }
+  //  glui_side  ->sync_live() ;
+  glui_bottom->sync_live() ;
+  
+  return quit ;
+}
+//_____________________________________________________________________________
diff --git a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/viz_glui_controls.cpp b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/viz_glui_controls.cpp
new file mode 100644
index 0000000000..55c9fc35d2
--- /dev/null
+++ b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/viz_glui_controls.cpp
@@ -0,0 +1,346 @@
+/**
+ * @file    glui_controls.cpp
+ * @author  Thomas Lewiner <thomas.lewiner@polytechnique.org>
+ * @author  Math Dept, PUC-Rio
+ * @version 0.1
+ * @date    30/05/2006
+ *
+ * @brief   Octree graphical interface: interface controls
+ */
+//________________________________________________
+
+
+#if !defined(WIN32) || defined(__CYGWIN__)
+#pragma implementation "viz_glui_defs.h"
+#endif // WIN32
+
+
+#include "viz_glui_defs.h"
+#include "implfuns.h"
+
+
+//_____________________________________________________________________________
+// declarations of this file
+
+// main object: octree
+Octree  octree  ;
+
+// switch between implicit funciont or volumetric data
+int impl_data = SWITCH_DATA ;
+
+// octree implicit data wrapper
+data_func *dat_func = NULL ;
+
+// octree data file wrapper
+data_file  *dat_data  = NULL ;
+
+
+// maximal level of the tree
+int   max_level  = 4;
+
+// isovalue
+float iso_val    = 0.0 ;
+
+// curvature threshold
+float curv_thres = 0.5 ;
+
+// selected implicit function
+int curr_fun = 0 ;
+
+
+//-----------------------------------------------------------------------------
+
+// main glui class: (right) side panel
+GLUI *glui_side   = NULL ;
+
+// bottom panel
+GLUI *glui_bottom = NULL ;
+
+// name of the import file
+GLUI_FileBrowser *file_browser  ;
+
+// iso file
+GLUI_String filename  ;
+
+// formula of the implicit function
+GLUI_String impl_fun     ;
+
+//-----------------------------------------------------------------------------
+
+// control events callback
+void control_cb( int control ) ;
+
+// create side panel
+void create_side_panel() ;
+
+// create bottom panel
+void create_bottom_panel() ;
+
+/// set file extension
+int set_ext( const char ext[4] ) ;
+
+//_____________________________________________________________________________
+
+
+
+
+//_____________________________________________________________________________
+// control events callback
+void control_cb( int control )
+//-----------------------------------------------------------------------------
+{
+  data_access *ref = NULL ;
+  switch( impl_data )
+  {
+    case SWITCH_IMPL   : ref = dat_func   ; break ;
+    case SWITCH_DATA   : ref = dat_data   ; break ;
+  }
+  
+  switch( control )
+  {
+    case SET_IMPL_DATA_ID :
+      switch( impl_data )
+      {
+      case SWITCH_IMPL   : delete dat_func   ;  dat_func   = new data_func      ( max_level, iso_val, impl_fun ) ;  break ;
+      case SWITCH_DATA   : delete dat_data   ;  dat_data   = new data_file      ( max_level, iso_val, filename.c_str() ) ;  break ;
+      } 
+      break ;
+
+    case SET_VAL_ID :
+      if( !ref ) break ;
+      ref->_max_level = max_level ;
+      ref->_iso_val = iso_val ;
+      octree.set_impl( ref ) ;
+      octree.check() ;
+      break ;
+
+    case REFINE_ID        :
+      if( !ref ) break ;
+      ref->_max_level = max_level ;
+      ref->_iso_val = iso_val ;
+      octree.clear() ;
+      octree.refine( ref ) ;
+      octree.set_impl( ref ) ;
+      octree.check() ;
+      break ;
+      
+    case ADAPT_ID        :
+      if( !ref ) break ;
+      ref->_max_level = max_level ;
+      ref->_iso_val   = iso_val ;
+      octree.adapt( ref ) ;
+      octree.set_impl( ref ) ;
+      octree.check() ;
+      break ;
+
+    case ISO_BUILD_ID :
+      if( !ref ) break ;
+      ref->_iso_val = iso_val ;
+      octree.build_isosurface(ref) ;
+      octree.mc().writeOFF("iso.off") ;
+      octree.check() ;
+      break ;
+      
+      // set implicit function
+    case FUN_ID   :
+      if( curr_fun == 0 ) break ;
+      impl_fun.clear() ;
+      impl_fun = fun_def[curr_fun] ;
+      control_cb( SET_IMPL_DATA_ID ) ;
+      control_cb( ADAPT_ID ) ;
+      glui_bottom->sync_live() ;
+      break ;
+      
+      
+      // load/save viewpoint
+    case SAVE_VIEWPORT_ID   : save_viewport() ;  break ;
+      
+    case LOAD_VIEWPORT_ID   : load_viewport() ;  glui_bottom->sync_live() ;  break ;
+      
+      // reset rotation
+    case RESET_ROTATION_ID    :
+      view_rotate[ 0] = view_rotate[ 5] = view_rotate[10] = view_rotate[15] = 1.0f ;
+      view_rotate[ 1] = view_rotate[ 2] = view_rotate[ 3] = view_rotate[ 4] = 0.0f ;
+      view_rotate[ 6] = view_rotate[ 7] = view_rotate[ 8] = view_rotate[ 9] = 0.0f ;
+      view_rotate[11] = view_rotate[12] = view_rotate[13] = view_rotate[14] = 0.0f ;
+      break ;
+      
+      // reset translation
+    case RESET_TRANSLATION_ID :  obj_pos[0] = obj_pos[1] = 0.0f ;  break ;
+      // reset zoom
+    case RESET_ZOOM_ID        :  obj_pos[2] = 0.0f ;  break ;
+      
+      // changed a parameter
+    case REDRAW_ID          :  break ;
+      
+      // changed a parameter
+    case FILENAME_ID        :  filename = file_browser->current_dir + file_browser->get_file() ;
+      
+      // orthographic/perspective projection
+    case PROJ_ID            :  reshape   (0,0) ;  break ;
+      
+    case EXIT_ID            : 
+      delete dat_func   ;
+      delete dat_data   ;
+      octree.clear() ;
+      exit(0) ;
+      break ;
+      
+    default :  break ;
+  }
+  
+  ::glutPostRedisplay();
+}
+//_____________________________________________________________________________
+
+
+
+
+//_____________________________________________________________________________
+//_____________________________________________________________________________
+
+
+
+//_____________________________________________________________________________
+// create side panel
+void create_side_panel()
+//-----------------------------------------------------------------------------
+{
+  glui_side = NULL ;
+}
+//_____________________________________________________________________________
+
+
+
+
+
+//_____________________________________________________________________________
+// create bottom panel
+void create_bottom_panel()
+//-----------------------------------------------------------------------------
+{
+  GLUI_Rollout     *roll ;
+  GLUI_EditText    *text ;
+  GLUI_Rotation    *rot  ;
+  GLUI_Translation *trans;
+  GLUI_RadioGroup  *radio;
+  GLUI_Listbox     *list ;
+  GLUI_Scrollbar   *sb   ;
+  
+  glui_bottom = GLUI_Master.create_glui("controls") ; //create_glui_subwindow( main_window, GLUI_SUBWINDOW_BOTTOM );
+  
+  //--------------------------------------------------//
+
+  file_browser = new GLUI_FileBrowser( glui_bottom, "iso file", false, FILENAME_ID, control_cb ) ;
+  file_browser->current_dir =  "data" ;
+  file_browser->fbreaddir( "data" ) ;
+
+  filename = "data/engine.iso.gz";
+  text = glui_bottom ->add_edittext( "iso file"  , filename ) ;
+  text->set_w( 200 ) ;
+
+  list = glui_bottom->add_listbox( "Implicit Functions:", &curr_fun, FUN_ID, control_cb );
+  for( int i=0; i<NFUNS; i++ ) list->add_item( i, fun_list[i] );
+  
+  impl_fun = "";
+  text = glui_bottom ->add_edittext( "impl fun"  , impl_fun ) ;
+  text->set_w( 200 ) ;
+  
+
+  //--------------------------------------------------//
+  // 
+  roll  = glui_bottom ->add_rollout( "iso value", true );
+  sb = new GLUI_Scrollbar( roll, "iso value in [-1,1]",GLUI_SCROLL_HORIZONTAL, &iso_val, ADAPT_ID,control_cb);
+  sb->set_float_limits(-1,1);
+  sb->set_speed( .005f );
+  
+  roll  = glui_bottom ->add_rollout( "level in [2,7]", true );
+  sb = new GLUI_Scrollbar( roll, "level", GLUI_SCROLL_HORIZONTAL, &max_level, ADAPT_ID, control_cb);
+  sb->set_int_limits(2,7);
+  sb->set_speed( .005f );
+
+  //--------------------------------------------------//  
+  glui_bottom->add_column( true );
+  radio = glui_bottom->add_radiogroup( &impl_data, SET_IMPL_DATA_ID, control_cb ) ;
+  glui_bottom->add_radiobutton_to_group( radio, "Implicit function" ) ;
+  glui_bottom->add_radiobutton_to_group( radio, "Direct data file" ) ;
+
+  //--------------------------------------------------//
+  
+  
+  glui_bottom ->add_button  ( "load"      , SET_IMPL_DATA_ID, control_cb ) ;
+  glui_bottom ->add_button  ( "set values", SET_VAL_ID   , control_cb ) ;
+  glui_bottom ->add_button  ( "refine"    , REFINE_ID, control_cb ) ;
+  glui_bottom ->add_button  ( "adapt"     , ADAPT_ID , control_cb ) ;
+  
+  
+  //--------------------------------------------------//
+  // display element
+  glui_bottom->add_checkbox( "ortho"    , &ortho               , PROJ_ID  , control_cb );
+  glui_bottom->add_checkbox( "octree"   , &show_octree         , REDRAW_ID, control_cb );
+  glui_bottom->add_checkbox( "nodes"    , &show_nodes          , REDRAW_ID, control_cb );
+  glui_bottom->add_checkbox( "dual"     , &show_dual           , REDRAW_ID, control_cb );
+  glui_bottom->add_checkbox( "surface"  , &show_iso            , REDRAW_ID, control_cb );
+  glui_bottom->add_checkbox( "dir surf" , &show_direct_iso     , SET_VAL_ID, control_cb );
+  glui_bottom->add_checkbox( "dir sur w", &show_direct_iso_wire, SET_VAL_ID, control_cb );
+  
+
+  glui_bottom ->add_button  ( "Isosurface", ISO_BUILD_ID, control_cb ) ;
+  
+//  glui_bottom->add_button( "Redraw", REDRAW_ID, control_cb ) ;
+  
+  glui_bottom ->add_button( "Open View", LOAD_VIEWPORT_ID, control_cb ) ;
+  glui_bottom ->add_button( "Save View", SAVE_VIEWPORT_ID, control_cb ) ;
+  glui_bottom ->add_button( "Quit", EXIT_ID, control_cb );
+  glui_bottom->add_column( true );
+  
+  
+  glui_bottom->add_column( true );
+  
+  //--------------------------------------------------//
+  // position
+  roll  = glui_bottom ->add_rollout( "3D position", true );
+  objects_rot = glui_bottom->add_rotation_to_panel( roll, "Objects", view_rotate );
+  objects_rot->set_spin( 1.0f );
+  glui_bottom->add_button_to_panel( roll, "Reset", RESET_ROTATION_ID, control_cb ) ;
+  glui_bottom->add_column_to_panel( roll, false );
+  
+  objects_mv = glui_bottom->add_translation_to_panel( roll, "Objects XY", GLUI_TRANSLATION_XY, obj_pos );
+  objects_mv->set_speed( .005f );
+  glui_bottom->add_button_to_panel( roll, "Reset", RESET_TRANSLATION_ID, control_cb ) ;
+  glui_bottom->add_column_to_panel( roll, false );
+  
+  objects_zm = glui_bottom->add_translation_to_panel( roll, "Objects Z", GLUI_TRANSLATION_Z, &obj_pos[2] );
+  objects_zm->set_speed( .005f );
+  glui_bottom->add_button_to_panel( roll, "Reset", RESET_ZOOM_ID, control_cb ) ;
+  
+  
+  //--------------------------------------------------//
+  // Lights
+  roll = glui_bottom->add_rollout( "Lights", true );
+  rot  = glui_bottom->add_rotation_to_panel( roll, "Blue Light", light0_rotation );
+  rot->set_spin( .82f );
+  
+  rot  = glui_bottom->add_rotation_to_panel( roll, "Orange Light", light1_rotation );
+  rot->set_spin( .82f );
+  
+  
+  glui_bottom->add_column_to_panel( roll, false );
+  
+  glui_bottom->add_checkbox_to_panel( roll, "On", &light0_enabled );
+  text = glui_bottom->add_edittext_to_panel( roll, "Id (%)", GLUI_EDITTEXT_INT, &light0_intensity );
+  text->set_int_limits( 0, 100 );
+  text->set_w(4) ;
+  text = glui_bottom->add_edittext_to_panel( roll, "Is (%)", GLUI_EDITTEXT_INT, &light0_intensity2 );
+  text->set_int_limits( 0, 100 );
+  text->set_w(4) ;
+  
+  glui_bottom->add_checkbox_to_panel( roll, "On", &light1_enabled );
+  text = glui_bottom->add_edittext_to_panel( roll, "Id (%)", GLUI_EDITTEXT_INT, &light1_intensity );
+  text->set_int_limits( 0, 100 );
+  text->set_w(4) ;
+  text = glui_bottom->add_edittext_to_panel( roll, "Is (%)", GLUI_EDITTEXT_INT, &light1_intensity2 );
+  text->set_int_limits( 0, 100 );
+  text->set_w(4) ;
+}
+//_____________________________________________________________________________
diff --git a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/viz_glui_defs.h b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/viz_glui_defs.h
new file mode 100644
index 0000000000..b9760f9b81
--- /dev/null
+++ b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/viz_glui_defs.h
@@ -0,0 +1,361 @@
+/**
+ * @file    glui_defs.h
+ * @author  Thomas Lewiner <thomas.lewiner@polytechnique.org>
+ * @author  Math Dept, PUC-Rio
+ * @version 0.1
+ * @date    30/05/2006
+ *
+ * @brief   Octree graphical interface
+ */
+//________________________________________________
+
+
+#pragma once
+
+#if !defined(WIN32) || defined(__CYGWIN__)
+#pragma interface
+#endif // WIN32
+
+
+#include <GL/glui.h>      // openGL user interface
+
+
+#define OCTREE_SWITCH 4
+
+//_____________________________________________________________________________
+// octree switch
+#ifdef OCTREE_SWITCH
+# if   OCTREE_SWITCH==0
+#  define OCTREE_PTR   1
+# elif OCTREE_SWITCH==1
+#  define OCTREE_HASH  1
+# elif OCTREE_SWITCH==2
+#  define OCTREE_OPT   1
+# elif OCTREE_SWITCH==3
+#  define OCTREE_LEAF  1
+# elif OCTREE_SWITCH==4
+#  define OCTREE_MEM   1
+# endif // OCTREE_SWITCH
+#endif // OCTREE_SWITCH
+
+
+// switch values between pointer and hash octree
+#if !OCTREE_PTR && !OCTREE_HASH && !OCTREE_OPT && !OCTREE_LEAF && !OCTREE_MEM
+// # define OCTREE_PTR  1
+// # define OCTREE_HASH 1
+# define OCTREE_OPT  1
+// # define OCTREE_LEAF 1
+// # define OCTREE_MEM  1
+#endif // !OCTREE_PTR && !OCTREE_HASH && !OCTREE_OPT && !OCTREE_LEAF && !OCTREE_MEM
+
+
+#ifdef OCTREE_PTR
+# undef OCTREE_HASH
+# undef OCTREE_OPT  
+# undef OCTREE_LEAF 
+# undef OCTREE_MEM  
+# define OCTREE_STRING "pointer octree"
+# include "ptr_octree.h"
+/// octree type
+typedef PtrOctree Octree ;
+#endif //OCTREE_PTR
+
+
+#ifdef OCTREE_HASH
+# undef OCTREE_PTR
+# undef OCTREE_OPT  
+# undef OCTREE_LEAF 
+# undef OCTREE_MEM  
+# define OCTREE_STRING "hash octree"
+# include "hash_octree.h"
+/// octree type
+typedef HashOctree Octree ;
+#endif //OCTREE_HASH
+
+
+#ifdef OCTREE_OPT
+# undef OCTREE_PTR
+# undef OCTREE_HASH
+# undef OCTREE_LEAF 
+# undef OCTREE_MEM  
+# define OCTREE_STRING "optimized octree"
+# include "opt_octree.h"
+/// octree type
+typedef OptOctree Octree ;
+#endif //OCTREE_OPT
+
+
+#ifdef OCTREE_LEAF
+# undef OCTREE_PTR
+# undef OCTREE_HASH
+# undef OCTREE_OPT  
+# undef OCTREE_MEM  
+# define OCTREE_STRING "leaf octree"
+# include "leaf_octree.h"
+/// octree type
+typedef LeafOctree Octree ;
+#endif //OCTREE_LEAF
+
+
+#ifdef OCTREE_MEM
+# undef OCTREE_PTR
+# undef OCTREE_HASH
+# undef OCTREE_OPT  
+# undef OCTREE_LEAF 
+# define OCTREE_STRING "mem octree"
+# include "mem_octree.h"
+/// octree type
+typedef MemOctree Octree ;
+#endif //OCTREE_MEM
+
+
+
+#ifdef _DEBUG
+#define PRINT_GL_DEBUG  { if( ::glGetError() != GL_NO_ERROR ) printf( "openGL watch at line %d: %s\n", __LINE__, ::gluErrorString( ::glGetError() ) ) ; }
+#else  // _DEBUG
+#define PRINT_GL_DEBUG  {}
+#endif // _DEBUG
+
+
+
+//_____________________________________________________________________________
+// Main objects
+
+  /// main object: octree
+  extern Octree  octree  ;
+
+  /// switch between implicit funciont or volumetric data
+  extern int        impl_data   ;
+
+  /// switch values between implicit funciont or volumetric data
+  enum { SWITCH_IMPL = 0, SWITCH_DATA = 1 } ;
+
+  /// octree implicit data wrapper
+  extern data_func *dat_func ;
+
+  /// octree data file wrapper
+  extern data_file *dat_data  ;
+
+  /// maximal level of the tree
+  extern int   max_level ;
+
+  /// isovalue
+  extern float iso_val ;
+
+
+//-----------------------------------------------------------------------------
+// Display elements
+
+  /// display element switch: octree wireframe
+  extern int   show_octree        ;
+  /// display element switch: octree cells' centers
+  extern int   show_nodes         ;
+  /// display element switch: octree dual
+  extern int   show_dual          ;  
+  /// display element switch: isosurface of the field
+  extern int   show_iso           ;  
+  /// display element switch: direct drawing isosurface of the field
+  extern int   show_direct_iso    ;
+  /// display element switch: direct drawing wire isosurface of the field
+  extern int   show_direct_iso_wire ;  
+
+
+//-----------------------------------------------------------------------------
+// GLUI windows
+
+  /// main window id
+  extern int  main_window ;
+
+  /// main glui class: (right) side panel
+  extern GLUI *glui_side   ;
+
+  /// bottom panel
+  extern GLUI *glui_bottom ;
+
+
+/// create side panel
+void create_side_panel() ;
+
+/// create bottom panel
+void create_bottom_panel() ;
+
+/// control events callback
+void control_cb( int control ) ;
+
+/// parse command line
+bool parse_command_line(int argc, char* argv[]) ;
+
+
+//-----------------------------------------------------------------------------
+// Lights
+
+  /// enable blue light
+  extern int   light0_enabled   ;
+
+  /// enable orange light
+  extern int   light1_enabled   ;
+
+  /// blue light intensity
+  extern int   light0_intensity ;
+
+  /// orange light intensity
+  extern int   light1_intensity ;
+
+  /// blue light intensity (specular)
+  extern int   light0_intensity2 ;
+
+  /// orange light intensity (specular)
+  extern int   light1_intensity2 ;
+
+  /// blue light diffuse color
+  extern float light0_diffuse[4] ;
+
+  /// orange light diffuse color
+  extern float light1_diffuse[4] ;
+
+  /// blue light position
+  extern float light0_rotation[16] ;
+
+  /// orange light position
+  extern float light1_rotation[16] ;
+
+
+//-----------------------------------------------------------------------------
+// mouse and object movements
+
+  /// motion type (-1 -> no motion, 0 -> rotate, 1 -> zoom, 2 -> translate)
+  extern int  motion_type ;
+
+  /// window trackball
+  extern GLUI_Rotation     mouse_rot   ;
+  /// panel trackball
+  extern GLUI_Rotation    *objects_rot ;
+  /// window translation
+  extern GLUI_Translation  mouse_mv    ;
+  /// panel translation
+  extern GLUI_Translation *objects_mv  ;
+  /// window zoom
+  extern GLUI_Translation  mouse_zm    ;
+  /// panel zoom
+  extern GLUI_Translation *objects_zm  ;
+
+  /// number of calls for updating the GLUI control
+  extern int ncalls ;
+
+  /// export movie switch
+  extern int export_movie ;
+
+  /// automatic rotation
+  extern int auto_rotate  ;
+
+  /// automatic x translation
+  extern int auto_translate_x ;
+
+  /// automatic y translation
+  extern int auto_translate_y ;
+
+  /// automatic zoom
+  extern int auto_zoom ;
+
+  /// automatic plane
+  extern int auto_translate_d ;
+
+  /// mouse x position
+  extern int mouse_x ;
+
+  /// mouse y position
+  extern int mouse_y ;
+
+/// init mouse and window controls
+void init_trackballs() ;
+
+/// mouse events tracking
+void mouse(int button, int button_state, int x, int y ) ;
+
+/// mouse motion tracking
+void motion(int x, int y ) ;
+
+/// keyboard events
+void keyboard(unsigned char key, int x, int y);
+
+//-----------------------------------------------------------------------------
+// implicit function
+
+  /// implicit function formula
+  extern GLUI_String impl_fun  ;
+
+
+//-----------------------------------------------------------------------------
+// i/o filenames
+
+  /// iso file
+  extern GLUI_String filename  ;
+
+  /// file browser
+  extern GLUI_FileBrowser *file_browser ;
+
+
+
+//-----------------------------------------------------------------------------
+// drawing parameters
+
+  /// orthographic / perspective projection switch
+  extern int ortho ;
+  /// object rotation
+  extern float view_rotate[16] ;
+  /// object translation
+  extern float obj_pos    [3 ] ;
+
+  /// point size
+  extern int point_size;
+
+/// 3D projection matrix
+void project( int o, float sx, float sy, int &tx, int &ty, int &tw, int &th ) ;
+
+/// window resizing
+void reshape( int x, int y ) ;
+
+/// main drawing function
+void display() ;
+
+/// print screen
+void export_png() ;
+
+/// load viewport
+void load_viewport() ;
+/// save viewport
+void save_viewport() ;
+
+
+//_____________________________________________________________________________
+
+
+
+
+//_____________________________________________________________________________
+/// Callback ids
+enum
+{
+  SET_IMPL_DATA_ID     ,
+  SET_VAL_ID           ,
+  REFINE_ID            ,
+  ADAPT_ID             ,
+  ISO_BUILD_ID         ,
+  SEARCH_ID            ,
+  FUN_ID               ,
+
+  SAVE_VIEWPORT_ID     ,
+  LOAD_VIEWPORT_ID     ,
+
+  RESET_ROTATION_ID    ,
+  RESET_TRANSLATION_ID ,
+  RESET_ZOOM_ID        ,
+
+  REDRAW_ID            ,
+  FILENAME_ID          ,
+  PROJ_ID              ,  
+
+  EXIT_ID              
+};
+//_____________________________________________________________________________
+
diff --git a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/viz_glui_draws.cpp b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/viz_glui_draws.cpp
new file mode 100644
index 0000000000..5a8662d386
--- /dev/null
+++ b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/viz_glui_draws.cpp
@@ -0,0 +1,321 @@
+/**
+ * @file    glui_draws.cpp
+ * @author  Thomas Lewiner <thomas.lewiner@polytechnique.org>
+ * @author  Math Dept, PUC-Rio
+ * @version 0.1
+ * @date    30/05/2006
+ *
+ * @brief   Octree graphical interface: drawing commands
+ */
+//________________________________________________
+
+
+#if !defined(WIN32) || defined(__CYGWIN__)
+#pragma implementation "viz_glui_defs.h"
+#endif // WIN32
+
+
+#include "viz_glui_defs.h"
+
+
+//_____________________________________________________________________________
+// declarations of this file
+
+
+// display element switches
+int   show_octree         = 1 ;
+int   show_nodes          = 0 ;
+int   show_dual           = 0 ;
+int   show_iso            = 0 ;
+int   show_direct_iso     = 0 ;
+int   show_direct_iso_wire = 0 ;
+
+// orthographic / perspective projection
+int   ortho =   0   ;
+
+// object transformation
+float view_rotate[16] = { 1.0f,0.0f,0.0f,0.0f, 0.0f,1.0f,0.0f,0.0f, 0.0f,0.0f,1.0f,0.0f, 0.0f,0.0f,0.0f,1.0f };
+float obj_pos    [3 ] = { 0.0f, 0.0f, 0.0f };
+
+
+//-----------------------------------------------------------------------------
+// lights
+int   light0_enabled        =   1 ;
+int   light1_enabled        =   0 ;
+int   light0_intensity      = 100 ;
+int   light1_intensity      =  60 ;
+int   light0_intensity2      = 50 ;
+int   light1_intensity2      = 30 ;
+GLfloat light0_diffuse [ 4] = {.7f, .7f, 1.0f, 1.0f};
+GLfloat light1_diffuse [ 4] = {.9f, .7f, 0.2f, 1.0f};
+GLfloat light0_position[ 4] = {.5f, .5f, 10.0f, 0.0f};
+GLfloat light1_position[ 4] = {-1.0f, -1.0f, 10.0f, 0.0f};
+GLfloat light0_rotation[16] = {1,0,0,0, 0,1,0,0, 0,0,1,0, 0,0,0,1 };
+GLfloat light1_rotation[16] = {1,0,0,0, 0,1,0,0, 0,0,1,0, 0,0,0,1 };
+
+//-----------------------------------------------------------------------------
+
+// 3D projection matrix
+void project( int o, float sx, float sy, int &tx, int &ty, int &tw, int &th ) ;
+
+// window resizing
+void reshape( int x, int y ) ;
+
+// main drawing function
+void display() ;
+
+//_____________________________________________________________________________
+
+
+
+//_____________________________________________________________________________
+// 3D projection matrix
+void project( int o, float sx, float sy, int &tx, int &ty, int &tw, int &th )
+//-----------------------------------------------------------------------------
+{  
+  // get viewport
+  GLUI_Master.get_viewport_area( &tx, &ty, &tw, &th );
+
+  tw = (int)( tw * sx );
+  th = (int)( th * sy );
+  ::glViewport( tx, ty, tw, th );
+
+  // sets the projection matrix
+  ::glMatrixMode(GL_PROJECTION);
+  ::glLoadIdentity();
+
+  // sets the viewport
+  if( o )
+  {
+    if( th > tw )
+      ::glOrtho( -1.2, 1.2, -1.2*(double)th/tw, 1.2*(double)th/tw, 0.0, 10.0  ) ;
+    else
+      ::glOrtho( -1.2*(double)tw/th, 1.2*(double)tw/th, -1.2, 1.2, 0.0, 10.0  ) ;
+  }
+  else
+    ::gluPerspective( 45.0, th>0?(double)tw/th:1.0, 0.5, 10.0 );
+
+  ::gluLookAt( 0.0f,0.0f,3.0f, 0.0f,0.0f,0.5f, 0.0f,1.0f,0.0f ) ;
+
+  // switch to the modelview matrix
+  ::glMatrixMode( GL_MODELVIEW );
+  ::glLoadIdentity();
+}
+//_____________________________________________________________________________
+
+
+
+
+//_____________________________________________________________________________
+// window resizing
+void reshape( int x, int y )
+//-----------------------------------------------------------------------------
+{
+  ::glutSetWindow(main_window);
+  
+  int tx, ty, tw, th;
+  project( ortho, 1.0f, 1.0f, tx, ty, tw, th ) ;
+
+  // sets the window trackball
+  mouse_rot.set_w( tw ) ;
+  mouse_rot.set_h( th ) ;
+  mouse_mv .set_w( tw ) ;
+  mouse_mv .set_h( th ) ;
+  mouse_zm .set_w( tw ) ;
+  mouse_zm .set_h( th ) ;
+
+  // redisplay
+  ::glutPostRedisplay();
+}
+//_____________________________________________________________________________
+
+
+
+//_____________________________________________________________________________
+// main drawing function
+void display()
+//-----------------------------------------------------------------------------
+{
+  ::glutSetWindow(main_window);
+
+  // clear screen
+  ::glClear( GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT );
+  if( !true ) { ::glutSwapBuffers();  return ; }
+
+  int tx, ty, tw, th ;
+  project( ortho, 1.0f, 1.0f, tx, ty, tw, th ) ;
+  
+  ::glEnable( GL_DEPTH_TEST );
+  ::glShadeModel(GL_SMOOTH);
+  ::glEnable(GL_LIGHTING);
+
+  //::glDisable (GL_LIGHTING);
+  float val[3] ;
+  if ( light0_enabled )
+  {
+    ::glEnable( GL_LIGHT0 ) ;
+
+    val[0] = light0_diffuse[0] * light0_intensity / 100 ;
+    val[1] = light0_diffuse[1] * light0_intensity / 100 ;
+    val[2] = light0_diffuse[2] * light0_intensity / 100 ;
+    ::glLightfv(GL_LIGHT0, GL_DIFFUSE, val );
+    
+    val[0] = light0_diffuse[0] * light0_intensity2 / 100 ;
+    val[1] = light0_diffuse[1] * light0_intensity2 / 100 ;
+    val[2] = light0_diffuse[2] * light0_intensity2 / 100 ;
+    ::glLightfv(GL_LIGHT0, GL_SPECULAR, val );    
+    const GLfloat light0_ambient[4] =  {0.1f, 0.1f, 0.3f, 1.0f};
+    ::glLightfv(GL_LIGHT0, GL_AMBIENT, light0_ambient);
+    
+
+    ::glLoadIdentity();
+    ::glMultMatrixf( light0_rotation );
+    ::glLightfv(GL_LIGHT0, GL_POSITION, light0_position);
+
+  }
+  else 
+    ::glDisable( GL_LIGHT0 ); 
+  
+  if ( light1_enabled )
+  {
+    ::glEnable( GL_LIGHT1 );
+
+    val[0] = light1_diffuse[0] * light1_intensity / 100 ;
+    val[1] = light1_diffuse[1] * light1_intensity / 100 ;
+    val[2] = light1_diffuse[2] * light1_intensity / 100 ;
+    ::glLightfv(GL_LIGHT1, GL_DIFFUSE, val );
+
+    val[0] = light1_diffuse[0] * light1_intensity2 / 100 ;
+    val[1] = light1_diffuse[1] * light1_intensity2 / 100 ;
+    val[2] = light1_diffuse[2] * light1_intensity2 / 100 ;
+    ::glLightfv(GL_LIGHT1, GL_SPECULAR, val );
+    const GLfloat light1_ambient[4] =  {0.1f, 0.1f, 0.3f, 1.0f};
+    ::glLightfv(GL_LIGHT1, GL_AMBIENT, light1_ambient);
+    
+    ::glLoadIdentity();
+    ::glMultMatrixf( light1_rotation );
+    ::glLightfv(GL_LIGHT1, GL_POSITION, light1_position);
+
+  }
+  else 
+    ::glDisable( GL_LIGHT1 );  
+
+  // transformation matrix
+  ::glLoadIdentity();
+  ::glTranslatef( obj_pos[0], obj_pos[1], obj_pos[2] );
+  if( ortho )
+  {
+    ::glScalef( 1.0+obj_pos[2], 1.0+obj_pos[2], 1.0+obj_pos[2] ) ;
+     ::glEnable( GL_NORMALIZE );
+  }
+  else
+  {
+    ::glDisable( GL_NORMALIZE );
+  }
+
+  ::glMultMatrixf( view_rotate );
+  ::glTranslatef( -0.5f, -0.5f, -0.5f );
+  PRINT_GL_DEBUG ;
+
+//-----------------------------------------------------------------------------
+// 3D display
+
+  data_access *ref = NULL ;
+  switch( impl_data )
+  {
+    case SWITCH_IMPL   : ref = dat_func   ; break ;
+    case SWITCH_DATA   : ref = dat_data   ; break ;
+  }
+  if( ref )
+    ::glScalef( ref->_sx, ref->_sy, ref->_sz ) ;
+
+  // octree wireframe
+  if( show_octree         )
+  {
+    ::glDisable( GL_TEXTURE_1D ) ;
+    ::glLineWidth( 0.5 ) ;
+    ::glColor3f( 0.3f, 0.3f, 0.5f ) ;
+    ::glBegin( GL_LINES ) ;
+    {
+      octree.draw_wire() ;
+    }
+    ::glEnd() ;  // GL_LINES
+  }
+
+
+  // cells' centers
+  if( show_nodes          )
+  {
+    ::glEnable( GL_TEXTURE_1D ) ;
+    ::glPointSize( 4.0 ) ;
+    ::glColor3f( 0.0f, 0.8f, 0.2f ) ;
+    ::glBegin( GL_POINTS ) ;
+    {
+      octree.draw_centers() ;
+    }
+    ::glEnd() ;  // GL_POINTS
+  }
+
+  // octree dual
+  if( show_dual           )
+  {
+    ::glDisable( GL_TEXTURE_1D ) ;
+    ::glDisable(GL_LIGHTING);
+    octree.draw_dual() ;	 
+    ::glEnable(GL_LIGHTING);  
+  }
+  
+  // isosurface of the field
+  if( show_iso            )
+  {
+    ::glDisable( GL_TEXTURE_1D ) ;
+    ::glDisable(GL_LIGHTING);
+    ::glPolygonMode(GL_FRONT_AND_BACK, GL_LINE) ;
+    ::glColor3f( 0.3f, 0.3f, 0.5f ) ;    
+    ::glBegin( GL_TRIANGLES ) ;
+    octree.draw_iso() ;	 
+    ::glEnd() ; // GL_TRIANGLES
+
+    ::glEnable(GL_LIGHTING);  
+    ::glPolygonMode(GL_FRONT_AND_BACK, GL_FILL) ;
+    ::glColor3f( 0.6f, 0.6f, 0.7f ) ;    
+    ::glBegin( GL_TRIANGLES ) ;
+    octree.draw_iso() ;	 
+    ::glEnd() ; // GL_TRIANGLES
+  }
+  
+  if( ref && show_direct_iso_wire )
+  {
+    ::glDisable( GL_TEXTURE_1D ) ;
+    
+    ::glDisable(GL_LIGHTING);
+    ::glPolygonMode(GL_FRONT_AND_BACK, GL_LINE) ;
+    ::glColor3f( 0.3f, 0.3f, 0.5f ) ;    
+    ::glBegin( GL_TRIANGLES ) ;
+    octree.direct_draw_isosurface(ref) ;	 
+    ::glEnd() ; // GL_TRIANGLES
+  }
+
+  if( ref && show_direct_iso      )
+  {
+    ::glDisable( GL_TEXTURE_1D ) ;
+
+    ::glEnable(GL_LIGHTING);  
+    ::glPolygonMode(GL_FRONT_AND_BACK, GL_FILL) ;
+    ::glColor3f( 0.6f, 0.6f, 0.7f ) ;    
+    ::glBegin( GL_TRIANGLES ) ;
+    octree.direct_draw_isosurface(ref) ;	 
+    ::glEnd() ; // GL_TRIANGLES
+  }
+  
+  PRINT_GL_DEBUG ;
+
+  // next frame
+  ::glutSwapBuffers();
+}
+//_____________________________________________________________________________
+
+
+
+
+
diff --git a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/viz_glui_export.cpp b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/viz_glui_export.cpp
new file mode 100644
index 0000000000..948cae6ebe
--- /dev/null
+++ b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/viz_glui_export.cpp
@@ -0,0 +1,323 @@
+/**
+ * @file    glui_export.cpp
+ * @author  Thomas Lewiner <thomas.lewiner@polytechnique.org>
+ * @author  Math Dept, PUC-Rio
+ * @version 0.1
+ * @date    20/08/2007
+ *
+ * @brief   Example Graphical interface: screen image exporatation
+ */
+//________________________________________________
+
+
+#ifndef WIN32
+#pragma implementation "viz_glui_defs.h"
+#endif // WIN32
+
+#include <png.h>
+#include <stdio.h>
+#include "viz_glui_defs.h"
+
+
+
+//_____________________________________________________________________________
+// declarations of this file
+
+// set file extension of filename
+int  set_ext( const char ext[3], char *fn ) ;
+
+// PPM export
+void export_ppm() ;
+
+// PNG image export
+void export_png() ;
+
+// Viewport save
+void save_viewport() ;
+
+// Viewport load
+void load_viewport() ;
+
+//_____________________________________________________________________________
+
+
+
+//_____________________________________________________________________________
+// set file extension of filename
+int set_ext( const char ext[3], char *fn )
+//-----------------------------------------------------------------------------
+{
+  strcpy( fn, filename.c_str() ) ;
+  int l = (int)strlen(fn) ;
+  if( l == 0 ) return 0 ;
+  if( fn[l-4] != '.' )
+  {
+    strcat( fn, "." ) ;
+    strcat( fn, ext ) ;
+  }
+  else if( strcmp( fn + l-3, ext ) )
+  {
+    fn[l-3] = ext[0] ;
+    fn[l-2] = ext[1] ;
+    fn[l-1] = ext[2] ;
+  }
+
+  return l ;
+}
+//_____________________________________________________________________________
+
+
+
+//_____________________________________________________________________________
+// PPM export
+void export_ppm()
+//-----------------------------------------------------------------------------
+{
+  char fn[1024] ;
+  set_ext( "ppm", fn ) ;
+  FILE *fp = fopen( fn, "w" ) ;
+  if( !fp ) return ;
+
+  int tx, ty, tw, th;
+  glutSetWindow(main_window);
+  GLUI_Master.get_viewport_area( &tx, &ty, &tw, &th );
+
+  // read openGL buffer
+  int buf_size = (tw * th * 3);
+  unsigned char *buffer = new unsigned char[buf_size] ;
+  memset(buffer, 0, buf_size * sizeof(unsigned char)) ;
+  display() ;
+  glFinish() ;
+  glPixelStorei( GL_PACK_ALIGNMENT,  1 ); // Force 1-byte alignment
+  glPixelStorei( GL_PACK_ROW_LENGTH, 0 );
+  glPixelStorei( GL_PACK_SKIP_ROWS,  0 );
+  glPixelStorei( GL_PACK_SKIP_PIXELS,0 );
+  glReadPixels(tx, ty, tw, th, GL_RGB, GL_UNSIGNED_BYTE, buffer);
+
+  // write the header
+  fprintf(fp, "P6\n%d %d\n", tw, th);
+  fprintf(fp, "# %s (Affine Surface by Thomas Lewiner)\n", fn ) ;
+  fprintf(fp, "255\n");
+
+  // write file
+  for (int i = 0; i < buf_size; ++i)
+    fputc( buffer[i], fp ) ;
+
+  delete [] buffer ;
+
+  fclose(fp);
+  printf( "exported image to PPM file %s\n", fn ) ;
+
+}
+//_____________________________________________________________________________
+
+
+//_____________________________________________________________________________
+//
+void export_tga()
+//-----------------------------------------------------------------------------
+{
+  char fn[1024] ;
+  set_ext("tga", fn) ;
+  FILE *fp = fopen( fn, "w" ) ;
+  if (!fp)
+     return ;
+
+  int tx, ty, tw, th;
+  glutSetWindow(main_window);
+  GLUI_Master.get_viewport_area(&tx, &ty, &tw, &th);
+
+  int             buf_size  = 18 + (tw* th * 3);  // HEADER_SIZE  ==> 18
+  unsigned char*  buffer    = new unsigned char[buf_size] ;
+  memset(buffer, 0, buf_size * sizeof(unsigned char)) ;
+
+  // Header
+  buffer[2] = 2;     // Non-compressed
+  buffer[12] = tw & 255;
+  buffer[13] = (tw >> 8) & 255 ;
+  buffer[14] = th & 255;
+  buffer[15] = (th >> 8) & 255 ;
+  buffer[16] = 24;    // 24 bits per pixel
+
+  // Read openGL buffer
+  display() ;
+  glFinish() ;
+  glPixelStorei(GL_PACK_ALIGNMENT, 1); // Force 1-byte alignment
+  glPixelStorei(GL_PACK_ROW_LENGTH, 0);
+  glPixelStorei(GL_PACK_SKIP_ROWS, 0);
+  glPixelStorei(GL_PACK_SKIP_PIXELS, 0);
+  glReadPixels(tx, ty, tw, th, GL_RGB, GL_UNSIGNED_BYTE, buffer + 18);
+
+  // Conversion from RGB to BGR
+  for (int i = 18; i < buf_size; i += 3)
+  {
+     unsigned char  temp  = buffer[i];
+     buffer[i] = buffer[i + 2];
+     buffer[i + 2] = temp;
+  }
+
+  // Write file
+  fwrite(buffer, sizeof(unsigned char), buf_size, fp);
+  fclose(fp);
+  delete[] buffer ;
+  printf("exported image to TGA file %s\n", fn ) ;
+}
+//_____________________________________________________________________________
+
+
+
+//_____________________________________________________________________________
+//_____________________________________________________________________________
+
+
+
+
+//_____________________________________________________________________________
+//
+void save_viewport()
+//-----------------------------------------------------------------------------
+{
+  char fn[1024] ;
+  set_ext( "view", fn ) ;
+  FILE *fp = fopen( fn, "w" ) ;
+  if( !fp ) return ;
+  fprintf( fp, "rotate:\n\t%f %f %f %f\n\t%f %f %f %f\n\t%f %f %f %f\n\t%f %f %f %f\n\n",
+          view_rotate[ 0], view_rotate[ 1], view_rotate[ 2], view_rotate[ 3],
+          view_rotate[ 4], view_rotate[ 5], view_rotate[ 6], view_rotate[ 7],
+          view_rotate[ 8], view_rotate[ 9], view_rotate[10], view_rotate[11],
+          view_rotate[12], view_rotate[13], view_rotate[14], view_rotate[15] ) ;
+  fprintf( fp, "translate:\t%f %f %f\n", obj_pos[0], obj_pos[1], obj_pos[2] ) ;
+
+  fprintf( fp, "plane rotate:\n\t%f %f %f %f\n\t%f %f %f %f\n\t%f %f %f %f\n\t%f %f %f %f\n\t%f\n\n",
+          1.0,0.0,0.0,0.0, 0.0,1.0,0.0,0.0, 0.0,0.0,1.0,0.0, 0.0,0.0,0.0,1.0, 0.0 ) ;
+  
+  fprintf( fp, "corner size:\t%f %f\n", 0.0,0.0 ) ;
+  fprintf( fp, "corner trans:\t%f %f %f\n", 0.0,0.0,1.0 ) ;
+  
+  
+  fprintf( fp, "light 0:\n\t%d %d %d\n\t%f %f %f %f\n\t%f %f %f %f\n\t%f %f %f %f\n\t%f %f %f %f\n\t%f %f %f %f\n\n\n",
+          light0_enabled, light0_intensity, light0_intensity2, 
+          light0_diffuse [ 0], light0_diffuse [ 1], light0_diffuse [ 2], light0_diffuse [ 3],
+          light0_rotation[ 0], light0_rotation[ 1], light0_rotation[ 2], light0_rotation[ 3],
+          light0_rotation[ 4], light0_rotation[ 5], light0_rotation[ 6], light0_rotation[ 7],
+          light0_rotation[ 8], light0_rotation[ 9], light0_rotation[10], light0_rotation[11],
+          light0_rotation[12], light0_rotation[13], light0_rotation[14], light0_rotation[15] ) ;
+  
+  fprintf( fp, "light 1:\n\t%d %d %d\n\t%f %f %f %f\n\t%f %f %f %f\n\t%f %f %f %f\n\t%f %f %f %f\n\t%f %f %f %f\n\n\n",
+          light1_enabled, light1_intensity, light1_intensity2, 
+          light1_diffuse [ 0], light1_diffuse [ 1], light1_diffuse [ 2], light1_diffuse [ 3],
+          light1_rotation[ 0], light1_rotation[ 1], light1_rotation[ 2], light1_rotation[ 3],
+          light1_rotation[ 4], light1_rotation[ 5], light1_rotation[ 6], light1_rotation[ 7],
+          light1_rotation[ 8], light1_rotation[ 9], light1_rotation[10], light1_rotation[11],
+          light1_rotation[12], light1_rotation[13], light1_rotation[14], light1_rotation[15] ) ;
+  
+  fclose( fp ) ;
+
+  printf("saved viewport to file %s\n", fn ) ;
+}
+//_____________________________________________________________________________
+
+
+
+
+
+//_____________________________________________________________________________
+//
+void load_viewport()
+//-----------------------------------------------------------------------------
+{
+  char fn[1024] ;
+  set_ext("view",fn) ;
+  FILE* fp  = fopen( fn, "r" ) ;
+  if( !fp ) return ;
+  fscanf( fp, "rotate: %f %f %f %f  %f %f %f %f  %f %f %f %f  %f %f %f %f ",
+         view_rotate +  0, view_rotate +  1, view_rotate +  2, view_rotate +  3,
+         view_rotate +  4, view_rotate +  5, view_rotate +  6, view_rotate +  7,
+         view_rotate +  8, view_rotate +  9, view_rotate + 10, view_rotate + 11,
+         view_rotate + 12, view_rotate + 13, view_rotate + 14, view_rotate + 15 ) ;
+  fscanf( fp, "translate: %f %f %f ", obj_pos + 0, obj_pos + 1, obj_pos + 2 ) ;
+
+  fscanf ( fp, "plane rotate:\n\t%*f %*f %*f %*f\n\t%*f %*f %*f %*f\n\t%*f %*f %*f %*f\n\t%*f %*f %*f %*f\n\t%*f\n\n" ) ;
+  
+  fscanf ( fp, "corner size:\t%*f %*f\n" ) ;
+  fscanf ( fp, "corner trans:\t%*f %*f %*f\n" ) ;
+  
+  
+  fscanf ( fp, "light 0:\n\t%d %d %d\n\t%f %f %f %f\n\t%f %f %f %f\n\t%f %f %f %f\n\t%f %f %f %f\n\t%f %f %f %f\n\n\n",
+          &light0_enabled, &light0_intensity, &light0_intensity2, 
+          light0_diffuse  +  0, light0_diffuse  +  1, light0_diffuse  +  2, light0_diffuse  +  3,
+          light0_rotation +  0, light0_rotation +  1, light0_rotation +  2, light0_rotation +  3,
+          light0_rotation +  4, light0_rotation +  5, light0_rotation +  6, light0_rotation +  7,
+          light0_rotation +  8, light0_rotation +  9, light0_rotation + 10, light0_rotation + 11,
+          light0_rotation + 12, light0_rotation + 13, light0_rotation + 14, light0_rotation + 15 ) ;
+  
+  fscanf ( fp, "light 1:\n\t%d %d %d\n\t%f %f %f %f\n\t%f %f %f %f\n\t%f %f %f %f\n\t%f %f %f %f\n\t%f %f %f %f\n\n\n",
+          &light1_enabled, &light1_intensity, &light1_intensity2, 
+          light1_diffuse  +  0, light1_diffuse  +  1, light1_diffuse  +  2, light1_diffuse  +  3,
+          light1_rotation +  0, light1_rotation +  1, light1_rotation +  2, light1_rotation +  3,
+          light1_rotation +  4, light1_rotation +  5, light1_rotation +  6, light1_rotation +  7,
+          light1_rotation +  8, light1_rotation +  9, light1_rotation + 10, light1_rotation + 11,
+          light1_rotation + 12, light1_rotation + 13, light1_rotation + 14, light1_rotation + 15 ) ;
+
+  fclose( fp ) ;
+  
+  printf("loaded viewport from file %s\n", fn ) ;
+}
+//_____________________________________________________________________________
+
+
+
+
+
+
+//_____________________________________________________________________________
+// PNG export
+void export_png()
+//-----------------------------------------------------------------------------
+{
+  char fn[1024] ;
+  set_ext( "png", fn ) ;
+  FILE *fp = fopen( fn, "wb" ) ;
+  if( !fp ) return ;
+  
+  int tx, ty, tw, th;
+  glutSetWindow(main_window);
+  GLUI_Master.get_viewport_area( &tx, &ty, &tw, &th );
+  
+  // read openGL buffer
+  int buf_size = (tw * th * 3);
+  unsigned char *buffer = new unsigned char[buf_size] ;
+  memset(buffer, 0, buf_size * sizeof(unsigned char)) ;
+  display() ;
+  glFinish() ;
+  glPixelStorei( GL_PACK_ALIGNMENT,  1 ); // Force 1-byte alignment
+  glPixelStorei( GL_PACK_ROW_LENGTH, 0 );
+  glPixelStorei( GL_PACK_SKIP_ROWS,  0 );
+  glPixelStorei( GL_PACK_SKIP_PIXELS,0 );
+  glReadPixels(tx, ty, tw, th, GL_RGB, GL_UNSIGNED_BYTE, buffer);
+  
+
+  png_structp png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING,NULL, NULL, NULL);
+  png_infop info_ptr = png_create_info_struct(png_ptr);
+  if (setjmp(png_jmpbuf(png_ptr)))
+  {
+    png_destroy_write_struct(&png_ptr, &info_ptr);
+    fclose(fp);
+    return;
+  }
+  png_init_io(png_ptr, fp);
+  png_set_IHDR(png_ptr, info_ptr, tw, th, 8, PNG_COLOR_TYPE_RGB, PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_DEFAULT, PNG_FILTER_TYPE_DEFAULT);
+  png_write_info(png_ptr, info_ptr);
+  for (int i=0; i<th; i++)
+    png_write_row(png_ptr, &(buffer[3*tw*((th-1) - i)]));
+  png_write_end(png_ptr, NULL);
+  png_destroy_write_struct(&png_ptr, &info_ptr);
+  
+  delete [] buffer ;
+  
+  fclose(fp);
+  printf( "exported image to PNG file %s\n", fn ) ;
+}
+//_____________________________________________________________________________
+
+
diff --git a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/viz_glui_main.cpp b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/viz_glui_main.cpp
new file mode 100644
index 0000000000..1c1671f95d
--- /dev/null
+++ b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/viz_glui_main.cpp
@@ -0,0 +1,189 @@
+/**
+ * @file    glui_main.h
+ * @author  Thomas Lewiner <thomas.lewiner@polytechnique.org>
+ * @author  Math Dept, PUC-Rio
+ * @version 0.1
+ * @date    30/05/2006
+ *
+ * @brief   Octree graphical interface: commandline parser and main pipeline
+ */
+//________________________________________________
+
+
+#if !defined(WIN32) || defined(__CYGWIN__)
+#pragma implementation "viz_glui_defs.h"
+#endif // WIN32
+
+#if WIN32 && _DEBUG
+#include <vld.h>
+#endif // WIN32 && _DEBUG
+
+#include "viz_glui_defs.h"
+#include "hash.h"
+
+
+//_____________________________________________________________________________
+// declarations of this file
+
+// main window id
+int  main_window  = -1 ;
+
+// export movie switch
+int export_movie  =  0 ;
+
+//-----------------------------------------------------------------------------
+
+// idle behaviour: redraw constantly
+void idle() ;
+
+//_____________________________________________________________________________
+
+
+
+
+
+//_____________________________________________________________________________
+// idel behaviour: redraw constantly
+void idle()
+//-----------------------------------------------------------------------------
+{
+  if ( ::glutGetWindow() != main_window ) ::glutSetWindow(main_window);
+
+
+  if( auto_rotate )
+  {
+    objects_rot->iaction_mouse_down_handler( 0,0 ) ;
+    objects_rot->iaction_mouse_held_down_handler( 0,0, 1 ) ;
+    objects_rot->iaction_mouse_held_down_handler( 1,0, 1 ) ;
+    objects_rot->iaction_mouse_up_handler( 1,0, 1 ) ;
+  }
+
+  if( auto_translate_x )
+  {
+    obj_pos[0] += auto_translate_x * 0.01f ;
+    objects_mv->sync_live(0,1) ;
+  }
+
+  if( auto_translate_y )
+  {
+    obj_pos[1] += auto_translate_y * 0.01f ;
+    objects_mv->sync_live(0,1) ;
+  }
+
+  if( auto_zoom )
+  {
+    obj_pos[2] += auto_zoom * 0.01f ;
+    objects_zm->sync_live(0,1) ;
+  }
+
+  if( export_movie ) export_png() ;
+  ::glutPostRedisplay();
+}
+//_____________________________________________________________________________
+
+
+
+
+//_____________________________________________________________________________
+// main
+int main(int argc, char* argv[])
+//-----------------------------------------------------------------------------
+{
+  printf( OCTREE_STRING " (hash %s pointers, %d bits) visualization with:\n\n", (USE_HASH_PTR ? "with" : "without"), HASH_BITS ) ;
+
+  // create main window
+  ::glutInit( &argc, argv ) ;
+  ::glutInitDisplayMode( GLUT_RGB | GLUT_DOUBLE | GLUT_DEPTH );
+  ::glutInitWindowPosition( 50, 50 );
+  ::glutInitWindowSize( 800, 600 );
+  main_window = ::glutCreateWindow( "Dual Octree" );
+
+
+
+  //--------------------------------------------------//
+  // Create the side and bottom subwindow
+#ifdef WIN32
+  create_bottom_panel() ;
+  create_side_panel  () ;
+#else  // WIN32
+  create_side_panel  () ;
+  create_bottom_panel() ;
+#endif // WIN32
+
+  //--------------------------------------------------//
+  // set callback functions
+  ::glutMouseFunc        ( mouse );
+  ::glutMotionFunc       ( motion );
+  ::glutDisplayFunc      ( display );
+  ::glutKeyboardFunc     ( keyboard );
+  GLUI_Master.set_glutIdleFunc   ( idle    );
+  GLUI_Master.set_glutReshapeFunc( reshape );
+
+  //--------------------------------------------------//
+  // init trackball
+  init_trackballs() ;
+
+
+  //--------------------------------------------------//
+
+  ::glEnable( GL_DEPTH_TEST );
+  ::glEnable(GL_COLOR_MATERIAL);
+  ::glDisable(GL_NORMALIZE);
+  
+  ::glPolygonOffset( 1.0f, -0.1f );
+  ::glEnable(GL_POLYGON_OFFSET_FILL) ;
+  /*
+  ::glEnable(GL_ALPHA_TEST);
+  ::glEnable(GL_BLEND ) ;
+  ::glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA) ;  
+*/
+  ::glClearColor( 1,1,1,1 );
+  
+  ::glEnable(GL_LIGHTING);
+  const GLfloat light0_ambient[4] =  {0.1f, 0.1f, 0.3f, 1.0f};
+  ::glEnable(GL_LIGHT0);
+  ::glLightfv(GL_LIGHT0, GL_AMBIENT, light0_ambient);
+  ::glLightfv(GL_LIGHT0, GL_DIFFUSE, light0_diffuse);
+
+  const GLfloat light1_ambient[4] =  {0.1f, 0.1f, 0.3f, 1.0f};
+  ::glEnable(GL_LIGHT1);
+  ::glLightfv(GL_LIGHT1, GL_AMBIENT, light1_ambient);
+  ::glLightfv(GL_LIGHT1, GL_DIFFUSE, light1_diffuse);
+
+  ::glShadeModel(GL_SMOOTH);
+
+  //--------------------------------------------------//
+  // texture color map
+  GLuint colormap_texture;
+  
+  // allocate a texture name
+  ::glGenTextures( 1, &colormap_texture );
+  
+  // select our current texture
+  ::glBindTexture( GL_TEXTURE_1D, colormap_texture );
+  
+  // select modulate to mix texture with color for shading
+  ::glTexEnvf( GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE );
+  
+  // when texture area is small, bilinear filter the closest mipmap
+  ::glTexParameterf( GL_TEXTURE_1D, GL_TEXTURE_MIN_FILTER, GL_LINEAR );
+  // when texture area is large, bilinear filter the original
+  ::glTexParameterf( GL_TEXTURE_1D, GL_TEXTURE_MAG_FILTER, GL_LINEAR );
+  
+  // the texture wraps over at the edges (repeat)
+  ::glTexParameterf( GL_TEXTURE_1D, GL_TEXTURE_WRAP_S, GL_CLAMP );
+  
+  GLfloat color_jet[3 * 256] = { 0.000000f, 0.000000f, 0.515625f, 0.000000f, 0.000000f, 0.531250f, 0.000000f, 0.000000f, 0.546875f, 0.000000f, 0.000000f, 0.562500f, 0.000000f, 0.000000f, 0.578125f, 0.000000f, 0.000000f, 0.593750f, 0.000000f, 0.000000f, 0.609375f, 0.000000f, 0.000000f, 0.625000f, 0.000000f, 0.000000f, 0.640625f, 0.000000f, 0.000000f, 0.656250f, 0.000000f, 0.000000f, 0.671875f, 0.000000f, 0.000000f, 0.687500f, 0.000000f, 0.000000f, 0.703125f, 0.000000f, 0.000000f, 0.718750f, 0.000000f, 0.000000f, 0.734375f, 0.000000f, 0.000000f, 0.750000f, 0.000000f, 0.000000f, 0.765625f, 0.000000f, 0.000000f, 0.781250f, 0.000000f, 0.000000f, 0.796875f, 0.000000f, 0.000000f, 0.812500f, 0.000000f, 0.000000f, 0.828125f, 0.000000f, 0.000000f, 0.843750f, 0.000000f, 0.000000f, 0.859375f, 0.000000f, 0.000000f, 0.875000f, 0.000000f, 0.000000f, 0.890625f, 0.000000f, 0.000000f, 0.906250f, 0.000000f, 0.000000f, 0.921875f, 0.000000f, 0.000000f, 0.937500f, 0.000000f, 0.000000f, 0.953125f, 0.000000f, 0.000000f, 0.968750f, 0.000000f, 0.000000f, 0.984375f, 0.000000f, 0.000000f, 1.000000f, 0.000000f, 0.015625f, 1.000000f, 0.000000f, 0.031250f, 1.000000f, 0.000000f, 0.046875f, 1.000000f, 0.000000f, 0.062500f, 1.000000f, 0.000000f, 0.078125f, 1.000000f, 0.000000f, 0.093750f, 1.000000f, 0.000000f, 0.109375f, 1.000000f, 0.000000f, 0.125000f, 1.000000f, 0.000000f, 0.140625f, 1.000000f, 0.000000f, 0.156250f, 1.000000f, 0.000000f, 0.171875f, 1.000000f, 0.000000f, 0.187500f, 1.000000f, 0.000000f, 0.203125f, 1.000000f, 0.000000f, 0.218750f, 1.000000f, 0.000000f, 0.234375f, 1.000000f, 0.000000f, 0.250000f, 1.000000f, 0.000000f, 0.265625f, 1.000000f, 0.000000f, 0.281250f, 1.000000f, 0.000000f, 0.296875f, 1.000000f, 0.000000f, 0.312500f, 1.000000f, 0.000000f, 0.328125f, 1.000000f, 0.000000f, 0.343750f, 1.000000f, 0.000000f, 0.359375f, 1.000000f, 0.000000f, 0.375000f, 1.000000f, 0.000000f, 0.390625f, 1.000000f, 0.000000f, 0.406250f, 1.000000f, 0.000000f, 0.421875f, 1.000000f, 0.000000f, 0.437500f, 1.000000f, 0.000000f, 0.453125f, 1.000000f, 0.000000f, 0.468750f, 1.000000f, 0.000000f, 0.484375f, 1.000000f, 0.000000f, 0.500000f, 1.000000f, 0.000000f, 0.515625f, 1.000000f, 0.000000f, 0.531250f, 1.000000f, 0.000000f, 0.546875f, 1.000000f, 0.000000f, 0.562500f, 1.000000f, 0.000000f, 0.578125f, 1.000000f, 0.000000f, 0.593750f, 1.000000f, 0.000000f, 0.609375f, 1.000000f, 0.000000f, 0.625000f, 1.000000f, 0.000000f, 0.640625f, 1.000000f, 0.000000f, 0.656250f, 1.000000f, 0.000000f, 0.671875f, 1.000000f, 0.000000f, 0.687500f, 1.000000f, 0.000000f, 0.703125f, 1.000000f, 0.000000f, 0.718750f, 1.000000f, 0.000000f, 0.734375f, 1.000000f, 0.000000f, 0.750000f, 1.000000f, 0.000000f, 0.765625f, 1.000000f, 0.000000f, 0.781250f, 1.000000f, 0.000000f, 0.796875f, 1.000000f, 0.000000f, 0.812500f, 1.000000f, 0.000000f, 0.828125f, 1.000000f, 0.000000f, 0.843750f, 1.000000f, 0.000000f, 0.859375f, 1.000000f, 0.000000f, 0.875000f, 1.000000f, 0.000000f, 0.890625f, 1.000000f, 0.000000f, 0.906250f, 1.000000f, 0.000000f, 0.921875f, 1.000000f, 0.000000f, 0.937500f, 1.000000f, 0.000000f, 0.953125f, 1.000000f, 0.000000f, 0.968750f, 1.000000f, 0.000000f, 0.984375f, 1.000000f, 0.000000f, 1.000000f, 1.000000f, 0.015625f, 1.000000f, 1.000000f, 0.031250f, 1.000000f, 0.984375f, 0.046875f, 1.000000f, 0.968750f, 0.062500f, 1.000000f, 0.953125f, 0.078125f, 1.000000f, 0.937500f, 0.093750f, 1.000000f, 0.921875f, 0.109375f, 1.000000f, 0.906250f, 0.125000f, 1.000000f, 0.890625f, 0.140625f, 1.000000f, 0.875000f, 0.156250f, 1.000000f, 0.859375f, 0.171875f, 1.000000f, 0.843750f, 0.187500f, 1.000000f, 0.828125f, 0.203125f, 1.000000f, 0.812500f, 0.218750f, 1.000000f, 0.796875f, 0.234375f, 1.000000f, 0.781250f, 0.250000f, 1.000000f, 0.765625f, 0.265625f, 1.000000f, 0.750000f, 0.281250f, 1.000000f, 0.734375f, 0.296875f, 1.000000f, 0.718750f, 0.312500f, 1.000000f, 0.703125f, 0.328125f, 1.000000f, 0.687500f, 0.343750f, 1.000000f, 0.671875f, 0.359375f, 1.000000f, 0.656250f, 0.375000f, 1.000000f, 0.640625f, 0.390625f, 1.000000f, 0.625000f, 0.406250f, 1.000000f, 0.609375f, 0.421875f, 1.000000f, 0.593750f, 0.437500f, 1.000000f, 0.578125f, 0.453125f, 1.000000f, 0.562500f, 0.468750f, 1.000000f, 0.546875f, 0.484375f, 1.000000f, 0.531250f, 0.500000f, 1.000000f, 0.515625f, 0.515625f, 1.000000f, 0.500000f, 0.531250f, 1.000000f, 0.484375f, 0.546875f, 1.000000f, 0.468750f, 0.562500f, 1.000000f, 0.453125f, 0.578125f, 1.000000f, 0.437500f, 0.593750f, 1.000000f, 0.421875f, 0.609375f, 1.000000f, 0.406250f, 0.625000f, 1.000000f, 0.390625f, 0.640625f, 1.000000f, 0.375000f, 0.656250f, 1.000000f, 0.359375f, 0.671875f, 1.000000f, 0.343750f, 0.687500f, 1.000000f, 0.328125f, 0.703125f, 1.000000f, 0.312500f, 0.718750f, 1.000000f, 0.296875f, 0.734375f, 1.000000f, 0.281250f, 0.750000f, 1.000000f, 0.265625f, 0.765625f, 1.000000f, 0.250000f, 0.781250f, 1.000000f, 0.234375f, 0.796875f, 1.000000f, 0.218750f, 0.812500f, 1.000000f, 0.203125f, 0.828125f, 1.000000f, 0.187500f, 0.843750f, 1.000000f, 0.171875f, 0.859375f, 1.000000f, 0.156250f, 0.875000f, 1.000000f, 0.140625f, 0.890625f, 1.000000f, 0.125000f, 0.906250f, 1.000000f, 0.109375f, 0.921875f, 1.000000f, 0.093750f, 0.937500f, 1.000000f, 0.078125f, 0.953125f, 1.000000f, 0.062500f, 0.968750f, 1.000000f, 0.046875f, 0.984375f, 1.000000f, 0.031250f, 1.000000f, 1.000000f, 0.015625f, 1.000000f, 1.000000f, 0.000000f, 1.000000f, 0.984375f, 0.000000f, 1.000000f, 0.968750f, 0.000000f, 1.000000f, 0.953125f, 0.000000f, 1.000000f, 0.937500f, 0.000000f, 1.000000f, 0.921875f, 0.000000f, 1.000000f, 0.906250f, 0.000000f, 1.000000f, 0.890625f, 0.000000f, 1.000000f, 0.875000f, 0.000000f, 1.000000f, 0.859375f, 0.000000f, 1.000000f, 0.843750f, 0.000000f, 1.000000f, 0.828125f, 0.000000f, 1.000000f, 0.812500f, 0.000000f, 1.000000f, 0.796875f, 0.000000f, 1.000000f, 0.781250f, 0.000000f, 1.000000f, 0.765625f, 0.000000f, 1.000000f, 0.750000f, 0.000000f, 1.000000f, 0.734375f, 0.000000f, 1.000000f, 0.718750f, 0.000000f, 1.000000f, 0.703125f, 0.000000f, 1.000000f, 0.687500f, 0.000000f, 1.000000f, 0.671875f, 0.000000f, 1.000000f, 0.656250f, 0.000000f, 1.000000f, 0.640625f, 0.000000f, 1.000000f, 0.625000f, 0.000000f, 1.000000f, 0.609375f, 0.000000f, 1.000000f, 0.593750f, 0.000000f, 1.000000f, 0.578125f, 0.000000f, 1.000000f, 0.562500f, 0.000000f, 1.000000f, 0.546875f, 0.000000f, 1.000000f, 0.531250f, 0.000000f, 1.000000f, 0.515625f, 0.000000f, 1.000000f, 0.500000f, 0.000000f, 1.000000f, 0.484375f, 0.000000f, 1.000000f, 0.468750f, 0.000000f, 1.000000f, 0.453125f, 0.000000f, 1.000000f, 0.437500f, 0.000000f, 1.000000f, 0.421875f, 0.000000f, 1.000000f, 0.406250f, 0.000000f, 1.000000f, 0.390625f, 0.000000f, 1.000000f, 0.375000f, 0.000000f, 1.000000f, 0.359375f, 0.000000f, 1.000000f, 0.343750f, 0.000000f, 1.000000f, 0.328125f, 0.000000f, 1.000000f, 0.312500f, 0.000000f, 1.000000f, 0.296875f, 0.000000f, 1.000000f, 0.281250f, 0.000000f, 1.000000f, 0.265625f, 0.000000f, 1.000000f, 0.250000f, 0.000000f, 1.000000f, 0.234375f, 0.000000f, 1.000000f, 0.218750f, 0.000000f, 1.000000f, 0.203125f, 0.000000f, 1.000000f, 0.187500f, 0.000000f, 1.000000f, 0.171875f, 0.000000f, 1.000000f, 0.156250f, 0.000000f, 1.000000f, 0.140625f, 0.000000f, 1.000000f, 0.125000f, 0.000000f, 1.000000f, 0.109375f, 0.000000f, 1.000000f, 0.093750f, 0.000000f, 1.000000f, 0.078125f, 0.000000f, 1.000000f, 0.062500f, 0.000000f, 1.000000f, 0.046875f, 0.000000f, 1.000000f, 0.031250f, 0.000000f, 1.000000f, 0.015625f, 0.000000f, 1.000000f, 0.000000f, 0.000000f, 0.984375f, 0.000000f, 0.000000f, 0.968750f, 0.000000f, 0.000000f, 0.953125f, 0.000000f, 0.000000f, 0.937500f, 0.000000f, 0.000000f, 0.921875f, 0.000000f, 0.000000f, 0.906250f, 0.000000f, 0.000000f, 0.890625f, 0.000000f, 0.000000f, 0.875000f, 0.000000f, 0.000000f, 0.859375f, 0.000000f, 0.000000f, 0.843750f, 0.000000f, 0.000000f, 0.828125f, 0.000000f, 0.000000f, 0.812500f, 0.000000f, 0.000000f, 0.796875f, 0.000000f, 0.000000f, 0.781250f, 0.000000f, 0.000000f, 0.765625f, 0.000000f, 0.000000f, 0.750000f, 0.000000f, 0.000000f, 0.734375f, 0.000000f, 0.000000f, 0.718750f, 0.000000f, 0.000000f, 0.703125f, 0.000000f, 0.000000f, 0.687500f, 0.000000f, 0.000000f, 0.671875f, 0.000000f, 0.000000f, 0.656250f, 0.000000f, 0.000000f, 0.640625f, 0.000000f, 0.000000f, 0.625000f, 0.000000f, 0.000000f, 0.609375f, 0.000000f, 0.000000f, 0.593750f, 0.000000f, 0.000000f, 0.578125f, 0.000000f, 0.000000f, 0.562500f, 0.000000f, 0.000000f, 0.546875f, 0.000000f, 0.000000f, 0.531250f, 0.000000f, 0.000000f, 0.515625f, 0.000000f, 0.000000f };
+  ::glTexImage1D( GL_TEXTURE_1D, 0, GL_RGB, 256, 0, GL_RGB, GL_FLOAT, color_jet ) ;
+
+  //--------------------------------------------------//
+  // Parse command line
+  bool quit = parse_command_line(argc, argv) ;
+
+  //--------------------------------------------------//
+  // GLUT main loop
+  if( !quit ) ::glutMainLoop();
+
+  return 0 ;
+}
+//_____________________________________________________________________________
diff --git a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/viz_glui_mouse.cpp b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/viz_glui_mouse.cpp
new file mode 100644
index 0000000000..b46fe65f7f
--- /dev/null
+++ b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/viz_glui_mouse.cpp
@@ -0,0 +1,312 @@
+/**
+ * @file    glui_mouse.cpp
+ * @author  Thomas Lewiner <thomas.lewiner@polytechnique.org>
+ * @author  Math Dept, PUC-Rio
+ * @version 0.1
+ * @date    30/05/2006
+ *
+ * @brief   Octree Graphical interface: mouse controls
+ */
+//________________________________________________
+
+
+#if !defined(WIN32) || defined(__CYGWIN__)
+#pragma implementation "viz_glui_defs.h"
+#endif // WIN32
+
+
+#include "viz_glui_defs.h"
+
+
+//_____________________________________________________________________________
+// declarations of this file
+
+// motion type (-1 -> no motion, 0 -> rotate, 1 -> zoom, 2 -> translate)
+int motion_type = -1 ;
+
+// panel and window trackballs and sliders
+GLUI_Rotation     mouse_rot, *objects_rot, *plane_rot   ;
+GLUI_Translation  mouse_mv , *objects_mv , *plane_trans ;
+GLUI_Translation  mouse_zm , *objects_zm  ;
+
+// number of calls for updating the GLUI control
+int ncalls = 0 ;
+
+//-----------------------------------------------------------------------------
+
+// init mouse and window controls
+void init_trackballs() ;
+
+// mouse events tracking
+void mouse(int button, int button_state, int x, int y ) ;
+
+// mouse motion tracking
+void motion(int x, int y ) ;
+
+// automatic rotation
+int auto_rotate  = 0 ;
+
+// automatic x translation
+int auto_translate_x = 0 ;
+
+// automatic y translation
+int auto_translate_y = 0 ;
+
+// automatic zoom
+int auto_zoom = 0 ;
+
+// automatic plane
+int auto_translate_d = 0 ;
+
+// mouse x position
+int mouse_x = 0 ;
+
+// mouse y position
+int mouse_y = 0 ;
+
+
+//_____________________________________________________________________________
+
+
+
+
+//_____________________________________________________________________________
+// init mouse and window controls
+void init_trackballs()
+//-----------------------------------------------------------------------------
+{
+  // init trackball
+
+  int tx,ty,tw,th ;
+  GLUI_Master.get_viewport_area( &tx, &ty, &tw, &th );
+
+  mouse_rot.set_spin(0.05f) ;
+  mouse_rot.set_w( tw ) ;
+  mouse_rot.set_h( th ) ;
+  mouse_rot.set_ptr_val( view_rotate );
+  mouse_rot.init_live() ;
+
+  mouse_mv.set_speed(0.005f) ;
+  mouse_mv.set_w( tw ) ;
+  mouse_mv.set_h( th ) ;
+  mouse_mv.set_ptr_val( obj_pos );
+  mouse_mv.init_live() ;
+
+  mouse_mv.trans_type = GLUI_TRANSLATION_XY;
+  mouse_mv.float_array_size = 2 ;
+  mouse_mv.hidden = true ;
+
+  mouse_zm.set_speed(0.01f) ;
+  mouse_zm.set_w( tw ) ;
+  mouse_zm.set_h( th ) ;
+  mouse_zm.set_ptr_val( &obj_pos[2] );
+  mouse_zm.init_live() ;
+
+  mouse_zm.trans_type = GLUI_TRANSLATION_Z ;
+  mouse_zm.float_array_size = 1 ;
+  mouse_zm.hidden = true ;
+}
+//_____________________________________________________________________________
+
+
+
+//_____________________________________________________________________________
+// mouse events
+void mouse(int button, int button_state, int x, int y )
+//-----------------------------------------------------------------------------
+{
+  mouse_x = x ;
+  mouse_y = y ;
+
+  // determine motion type
+  if     ( glutGetModifiers() & GLUT_ACTIVE_CTRL  ) motion_type = 1 ;
+  else if( glutGetModifiers() & GLUT_ACTIVE_SHIFT ) motion_type = 2 ;
+  else if( glutGetModifiers() & GLUT_ACTIVE_ALT   ) motion_type = 3 ;
+  else                                              motion_type = 0 ;
+
+  switch( motion_type )
+  {
+      // rotation
+    case 0 :
+      // line selection
+      if ( button == GLUT_LEFT_BUTTON){
+        if (button_state == GLUT_DOWN )
+        {
+          mouse_rot.init_live() ;
+          mouse_rot.mouse_down_handler(x,y) ;
+        }
+        if ( button_state != GLUT_DOWN )
+        {
+          mouse_rot.mouse_up_handler(x,y,1) ;
+          motion_type = -1 ;
+        }
+        objects_rot->sync_live(0,1) ;
+      }
+      if ( button == GLUT_RIGHT_BUTTON && button_state == GLUT_DOWN)
+      {
+      }   
+      break ;
+      
+      // zoom
+    case 1 :
+      if ( button == GLUT_LEFT_BUTTON && button_state == GLUT_DOWN )
+      {
+        mouse_zm.init_live() ;
+        mouse_zm.glui = glui_bottom ;
+        mouse_zm.mouse_down_handler(x,y) ;
+        mouse_zm.glui = NULL ;
+        
+      }
+      if ( button_state != GLUT_DOWN )
+      {
+        mouse_zm.glui = glui_bottom ;
+        mouse_zm.mouse_up_handler(x,y,1) ;
+        mouse_zm.glui = NULL ;
+        motion_type = -1 ;
+      }
+      objects_zm->sync_live(0,1) ;
+      break ;
+      
+      // translation
+    case 2 :
+      if ( button == GLUT_LEFT_BUTTON && button_state == GLUT_DOWN )
+      {
+        mouse_mv.init_live() ;
+        mouse_mv.glui = glui_bottom ;
+        mouse_mv.mouse_down_handler(x,y) ;
+        mouse_mv.glui = NULL ;
+      }
+      if ( button_state != GLUT_DOWN )
+      {
+        mouse_mv.glui = glui_bottom ;
+        mouse_mv.mouse_up_handler(x,y,1) ;
+        mouse_mv.glui = NULL ;
+        motion_type = -1 ;
+      }
+      objects_mv->sync_live(0,1) ;
+      break ;
+
+    // no movement
+    default :
+      break ;
+  }
+  ncalls = 0 ;
+}
+//_____________________________________________________________________________
+
+
+//_____________________________________________________________________________
+// keyboard
+void keyboard(unsigned char key, int x, int y)
+{
+  switch(key)
+  {
+  case 's':
+	  export_png();
+	  break;
+
+  case 'S':
+	  export_movie = !export_movie;
+	  break;
+
+  case 'r' :
+    if( auto_rotate == -1 ) auto_rotate = 0 ;
+    else auto_rotate = -1 ;
+    break ;
+
+  case 'R' :
+    if( auto_rotate == +1 ) auto_rotate = 0 ;
+    else auto_rotate = +1 ;
+    break ;
+
+  case 'D' :
+    if( auto_translate_d == -1 ) auto_translate_d = 0 ;
+    else auto_translate_d = -1 ;
+    break ;
+
+  case 'd' :
+    if( auto_translate_d == +1 ) auto_translate_d = 0 ;
+    else auto_translate_d = +1 ;
+    break ;
+
+  case 'X' :
+    if( auto_translate_x == -1 ) auto_translate_x = 0 ;
+    else auto_translate_x = -1 ;
+    break ;
+
+  case 'x' :
+    if( auto_translate_x == +1 ) auto_translate_x = 0 ;
+    else auto_translate_x = +1 ;
+    break ;
+
+  case 'Y' :
+    if( auto_translate_y == -1 ) auto_translate_y = 0 ;
+    else auto_translate_y = -1 ;
+    break ;
+
+  case 'y' :
+    if( auto_translate_y == +1 ) auto_translate_y = 0 ;
+    else auto_translate_y = +1 ;
+    break ;
+
+  case 'Z' :
+    if( auto_zoom == -1 ) auto_zoom = 0 ;
+    else auto_zoom = -1 ;
+    break ;
+
+  case 'z' :
+    if( auto_zoom == +1 ) auto_zoom = 0 ;
+    else auto_zoom = +1 ;
+    break ;
+
+  default:
+    break;
+  }
+}
+//_____________________________________________________________________________
+
+
+
+//_____________________________________________________________________________
+// motion
+void motion(int x, int y )
+//-----------------------------------------------------------------------------
+{
+  mouse_x = x ;
+  mouse_y = y ;
+
+  switch( motion_type )
+  {
+      // rotation
+    case 0 :
+      mouse_rot.glui = glui_bottom ;
+      mouse_rot.iaction_mouse_held_down_handler(x,y,1);
+      mouse_rot.glui = NULL ;
+      if( ++ncalls > 10 ) { objects_rot->sync_live(0,1) ;  ncalls = 0 ; }
+      break ;
+      
+      // zoom
+    case 1 :
+      mouse_zm.glui = glui_bottom ;
+      mouse_zm.iaction_mouse_held_down_handler(x,y,1);
+      mouse_zm.glui = NULL ;
+      
+      if( ++ncalls > 10 ) { objects_zm->sync_live(0,1) ; ncalls = 0 ; }
+      break ;
+      
+      // translation
+    case 2 :
+      mouse_mv.glui = glui_bottom ;
+      mouse_mv.iaction_mouse_held_down_handler(x,y,1);
+      mouse_mv.glui = NULL ;
+      
+      if( ++ncalls > 10 ) { objects_mv->sync_live(0,1) ; ncalls = 0 ; }
+      break ;
+      
+      // no movement
+    default :
+      break ;
+  }
+  ::glutPostRedisplay() ;
+}
+//_____________________________________________________________________________
diff --git a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/marching_cubes_jgt.zip b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/marching_cubes_jgt.zip
deleted file mode 100644
index bb15279b270eb84738e70467383317685d53e425..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 170157
zcma&N1GFVex;46O+qUi6sBPP}ZQHhO+qP}Hwq4tLb-M5U-+%jb-}iEj%#mZQ5iw`X
z?~8~Tk-6j~fkB`E{yMl#W4Qlu^IsP@00aPOeFsA`a~o4ZX9HtLdSx{jfN~i!NqYq{
z$wxpG0J%S9Q2-$Re8wtHIsWgm7=J5EXXxT+ZfaxeVEk7t&VOoX1#uGls}}FrX{bPc
zn4lZ~u8E$&raFkqV3pZ}8Ubt9=u272-5xXFKD;iekbUTMlxp@tj>pg<%CI<${57G(
zd59dEW`C@5AH4o_8^m&6LwS%)gI1~mglyqcu~MIHE!>|sZb)4Kqpo#7+}ImWD#s?M
zQcIbT<FkuH#r!|;sg$#C4kKPwW|b>xl~E3Oy}o!|+_^;OW8aN+<Rrl%j)<SBQvNiH
z3lQM{YAe^j=!E|FwhAfgDmwjNO||<k!LHJ{;RYBGgiNEMC0Xbwx9tFI^n}MD+W<gS
z^PcAkHxL_86y!()+!G#EB7DtpWC7N0+jRY42>PR$c@x&qf@;`i2!jxQhIt#-IBmIL
z{|v)r%7qWEadO1Y1?O@xWYRvBU~jG0%_Gh}l|t`Wn4T7##Ndsh#zu}{3|7m(P_3mI
z+O@MgetqZDXZ?mI^udTcbjG=b1DS-Yb-6eXd6eY8%?&QKvC603-s*sWs7ICkO9l&o
zFzbdtGJs(GQ-*)0%a4DN0rHOwy1LQ=g0hNg|HzcTV*J<n-<k67i~XhE|0(wObo<vz
z{+Vw78UmvKTnU{n-G7RPp&qKCsh)w}t+bTNExbyYoF7me1~54SHefvvLg0%4j98yP
z;GZt>mj+w$v27H8G*I|+{=aEI`Y&mZ`nOd0(|_m;9Zml`=Ue_O=O2{BR2YJOY6}8`
z5=a0s<w3x>w_{*n`~wPv#$)A=(g1(K{b#7ZXPtq*m6hYa1B;Z0039#@1twTxonuyJ
zm}B;L(C;#WfFEOH0xf4$1<(&FBa~Z`>zDISjr8{i{09j!Wa3hWzX<%VB=G;%-hYtL
z)wi*6wsQWrWT2J9{(sUzFiRqrB9~i|A`}-`g^22ti1I_2;x}Ufyf{2I(EDdtide_7
zB>qqg`(J7PeKaz#b#k&Y{&!+QD?=!cDbBIZH3A@tK!JIL@LLt+<;7L$0r>OdDNVo#
zuOX0FnM18iO@jVIs03d5Hkv=^;{PjyzbA&FzQezRcaD{W>LY*=(uUsAr_&QF>Wy?d
znV@cZE@gyj)(elio1PkoifWX-cJ$wz^ADi-EMu_t@J=(c1He*`LR-3$7Qby3nP%5d
zP!5JKGEoQoUg<(Tq5T9do^Ta!seo3(+qB&4=YIYN^Q&7#SJOYNA^ykcre^X#X92Xo
zh1k&6=6@(RD)-MmKB*`-$Ew7j#309T^d~@i|BO()I)Mh#9~6ZDq0hgf5dQi7Ka2u&
zy8j9A|EvG<Pazy&ArAO~|C0&A!ng$W9~S?67e@YjdmT;b%>K0l4`W)|Zi-xb`h9@6
z3?qrB9E!5*g%uhIcZ&MaVK+EOHll^l<Q_z#j&qMkU(vi@9o}7&s4HAmNivp3$G|7@
zB#7Q8$&`N5^Syg!!+o4a>P;M0szx$OlKxUGiYrp>^@4ZQEs{cb!A7Q(H8{n4%!lpv
zDSdY?-MxBp{7SV?8RGHZbx$JNwav2M#}D+Cyk%$iabeK~vF=YStVepiU}?WobQ`pB
zp8_!g!4ro1Fv$_Bi~?Ou`)=104R2d`pDek}m}W-z@p-TCo<TP3JJt1hdVYG&xnszw
zLl9|OpN9|g2tlx*M@S%tD;N&yhqTf6VDXk036>9dPiXu6fktn$cbrhlpUd5L+d&7@
zodcb!gMSU4actUe>o&s2U=*I1)*d%gDz(R~CX921NEcN|^5+XugLtBxwvs9IwyUYw
zS|YG#y`xVS(}7tdtLwcej$H#B19X`~sR@tiLAiS0h)kCkxi{Xh50>OtCN4>`OT`2m
zQIQ>Quym%uM2_hpB7XWq`E>dbMEE^7U-<iOH8vbUrq&`&YxG|joYX3o`p$RHoS#pr
zQyqP#LjzM>p6|b+iykV=!5HY+t?oyMJ#WnzSt2DhZq*X)7+Ii&?^82^BJ<S|%AtYV
zQcJ$H8y?}vXbdok1pzph7J<#d0x~2@2+MLfQHPyzDDMRa$lEN_mBaZvNRb()9cujo
z-6P>OnRdr@$Fmf6h`ru}!N3zpyj6(I<HTNPP{jj*{RU7$jn(An*eM~X>_<j3ium6W
z>^%f9(UK;mCFo{2bQ4j;beZNUC<X%@+Qk_UK&;xt0)@DCNwQPL($tL;z`~0RG80+K
zoaFVOwV_Cmz}C;aat@PL^C$Ern1{fMFY{{*`dv$HdqByvDtQ*tN%%m?i!p5iw^L$C
zl$nOHq`U#o`uvn)`dvqD_GGkvg@BU6esDAmw7;YDK<t%!#%*vib|0%VG%IWpTw7o-
zoPQ+s?{5nBHN=&6l%CU)@lzt@oM)HK%|QO@N~SdI|G<P{L(Nh_l_T{P0?n=fI!BBx
z+uQCO9988P81FPCrC86OXbG_kUG~NB-u;2m3GVO7V80Kb`Aa~p2-s?cO14?QZ2lqO
zkbSXCBr4Nfi8O$VmL55gi?$ZIN@fyTSgj;kOZ7?FW9_mcA(l<6X_(c*>6Oo0(6h>#
zajkneB)TIFN|U)?%Iw>h=_tBx{IvvjIWhlN+1-gf3T)l9itmzS$r-!*_+?AKq<f*w
zeS-P&_q^oYVKxTml<m4+qG41%Y|OY~Q9q-5w_BfkdJ4N*eHtBJr?8eaVm>{srqSN;
zq^^*9d)Q&?Ax+a>`Pt{_=o0$g3OeJCef=QKfqK@~$f**}AMtjEW$)NPUGh(R<_OeU
z5bCkCS+mQEF@s0ryFSYq4@MW6Ct*;qSiv}r9_H?4M_Le1;ioLBOz%a^>FIgtu7*d8
z#oaAFRCEpSKgJd=isPG@B3UCyt|!Eb%W&w6R$qL{=u6y^QD`1Jf@|lH>S!X;Pv)1G
zLIQ#7jDVj{EzCD>S9L>9#Dh=7XMm3dEF@WubtL+SG+8rd7Ndrdp^!rwaVB|!wntvh
zDP=ZPR%IzGGM4StbtIm#E!R~ZH(eq~oBA}Gm9Ip+dXiq8HJ7c2P9)6&?LgL+NopT;
zxn!NG-)0unTU2H$nq5||a-vtOLiacH9=W<}Xzyk;z6hYsEV>tQoY^d&XvDXWguR7l
z(ZYxD2h1Kd)>VI73Dmm&c5c(m$0?O~bAv#eq0e#kKk@gR1l01Z1f1%6-0ShT6w{&}
zZ%)yg6seIs(2%StKGH~TKMG6#qGW<@8=U{@8N}W0(|p5I?_)L<p<xz%K2Pak!)i+?
zpekm<tdN$6^?)Lj__J70#{I#h^jn8}HK>E_H(Iflqz&*xL*0N^mCG)ojI*dNQH*Us
zI})W1M`jCUmVL5Oj=xmr6sPNq>q#eO1{I-h=12&sv3CJhUiIfHHKZ}(#7k4++Z-~b
z=Y64?sPjrr%`b5i+HKTqX#`qzlBA%R;vuZH`kBoE5!-9F1d)n}<VoZo^7+Y?$Ug*<
zX;LnV)8j~D)5Az&clKknn>{yaCO2Ik@zm(2#y^OS(`#m%--tKqyN}Fz^KwG3omN{a
zcWtZ)_5pVashzYTU5-VSh-};8SLSUL8k9#}O!)?b<Z5flS8hs8XWy67b1|08ep|f!
zI1nx5foa%}b;EkE4=&kgu;wcq1J-F07vkKkQ&UkpgsiA)+)2Ke6Wrh(@Cv|-3J`7*
zv()Y_zX3iv)<Q0BoHX1%aT|WL9<ou(8b{X(@V#X&8CgDn<>`JUp^j+%V4*>jk=DN_
zmOXiRrc?IxI1u;x>X{(b;wWvM45HVG95-_4&;Kou@G&`1*t@36Cmi+A8}<SGmurqn
zAQvI}GySGx{WS&u_hRv1T{G_Ar`$iwO<hMjGh>JU;WYl+Jx9umDg1G0%)&%*_VodP
zAm{0nw+@U9fBfoSp!i>H&42I!{$XGLBk13KjgYOIyNS8g|5=~@H`=her0pgLLJ#<u
zFG9l)R5f;QeSZMXIV5X);&6=!iAy4Y{f(%@8e;5*D3k9`xN>w#&b1$F&T!@xu{dy{
z%)2n5y_`G09&<~VHMsD>bHRPJbhLCnp5E_#_%o1CGVvXBING&lq1x?!WnP*$Z=Ez6
zG>>OZt9&+cKQ%BG`WmE0LIkgw``Tnz+NI3qs;)2CKkpu2Phez(2u?-i=Yp-KqO%;^
zPXvo%MCDs;<ONPbr|J*Yi!BiLg)=%vB$}A`71&3Nv<cg{Xw|yRrlOk%3<HPryv0G_
zv@a3Qw`KDgfy4@hC94b!hFgl8a)b;A;~81Y6`FAvz2s0_O(C|z@%IB~kP*ZYBk9SK
ztg(_MP!J%Zk=!#9<LEW}1jZ~7ATS>Ev{)|CVa-oQ1~DT=A{OT39bi~uA%t&%t;ES<
zwhlKFeG5I071r=mmX7dBFh~K*G_}~^Kqn}1S1Zvzr$W>rmfDNjH2(l>K(?HBppt)s
zQ)Jjln`coO%qYi!75>?iE~D%o$wVs<-W}_a$?}UN$h_b_0?~NDTDv%~!n@T)I#eTi
zfwN-*k6R=3ec9vA(hyaaLlD7_0s_vePQ*~;x<7Z9A327@em4VK4jps=R<0oSgaFIn
zTCrBx`#?WlWa4uILkb3*sZXQ=Hl`1gShkHNiV{YOCQiseth;>Qw^`R=ib!t6WeUlu
zzm-6P_{BOTvfSoip)Jw^{r)U4qKiN|Ltu^k*Am$;(cgZb$f&uj(9IU<X5&gFGs_KF
zSy&dBdl;f=lmQ1zg@8d>q^-jC1G^%jXKkRKWub<8)-RKaf#-^`b9DzlWXzVX!7)Ik
z`=El5A&zY8w2jfc?Q(0Wv4IRdLjYybL%@M+AtwzEKeCR~Ckz^`_N^YKnNmBmAAovI
zB;9{Qd{UFPu{9hMo)h3BMEYfRG^t{W<Of7e=!px$;9Wn;ql%?5PP{q#Qwk1QkE`A&
zjXONpbWa>bKh(t44lA?r<QY2iuG})?$llRpE4OT;$1MCl1^-DTh8zk9Qi0U$oos-b
ztVVM0b6a%|#%>JRKDwQbN@@{vI=Nl*joIajM^FD2slq3_sos<L>Kmm|!)NUp_&hB^
zlpca$;>xDGtY?Z&E)N`RZ%)74mpqFRS1knX9Hk!b2C=N8s>dmdpLqapgOWk2<bwh!
zoo;F8M0uaud1KQ!d$RDFW9xJ6XB<;4&^$>PII&9AKJBFhcb>d#Oba>8q%y9IC}EHX
z6Uz{&fn|n;1V0F<K(Z^Ch-PuJW5^a{n}5rA&v0SX(I_`&)$N_*ojPp6tI7TF2*cr%
zOnY=uzbqhdSx6Xy1Qh|_7QYwX?wtCQ5SBF(Z+W0~MwO$=UI?>|J1s@ZDwQ{K*b5JA
z#zYt35l=I)q-M_2=~KbG>fDw4GB+~S8Pw7uqyagiZR8OQOovM+m35*#>7G3=NY<a$
zYpdiGEa0aJj`O){r-;I!7tRn_V7m_mmv~eBd1r@Cjo_#sR(y>tjaWEN0z^IKl823G
zQIBHzC11Gwk#pZ0R|yr{AZ>IxhRxLh9w=pylUA}7)`!7L9L%6G2A`V2MXVk0GfYKD
z<ksp1^Q#TRp@W0P3Frp%l$wUT?*;cwb>Wg{wLSaqOCO2A&{MdJ!}`%JF8an^V_~&(
zvLai}mA7OdMupJP()ugM)|t!6+2x-quB>7e*SI9A%;ZZGk3U5P>e-QaA&gDJ<!j43
z=o#_~V~r8Tz!9LA21EPK$xaYgJ3h0A9Wn5;H*A-Xw5j`Bfs?@Xba<M{ZDv_YdfZu{
ztkkRbiJXg|EHGH=^BUE@j8ix@+Z?kuJ_sW`{zNHs8eSr~EZNe+>9!rjdNOx2n7nj$
z6Pejs)iWDsY6GCBqN-|c=+Qom%M8+eYeo$Wg_+BQLMb}5!~R(kdc0J+W;)_&*o208
zG*PzFO4)#%t?_(iz&EJ$z1h^MT<w?TiE-mvtt?(n#2A6RT8*-|C-I>&0m@94EUetS
zSaijZN35E*PHw>Q*0<rfHC^kg37spq9reknM$!+?W=RNavC{BI1SF!=`38QL@+x!n
zvH|%yiZm)fokuY_X97lp8r@djPU+4L;*HJ^-FEia9g`m4c=h^4+7=-+P^}=>SSb@G
z-=llucaBY)lg%r`&%C1D#GzPYecyJA)iWoPm>!vS?=rtm=il+G<x(+A)Cu)l^Q+?5
zOO^6iXCl>eHgQ=oqSgFu?dh~=l{z$It3Q8XZVfxWk~pRd2xSrAaA0ZvFd=Ska>X)w
z;+zca<}dbq^wHz9NXBhGHx}R{bp{rgm+mzLJq`V&`@Z!~_Fe-@&I$KK%LMw`s*=?+
z`*b1Z2~euIcFu?r&FRoIYRiqiuD>;Fh1P79YBEB=eh-zy0x=UyPg#$tm_wNe^;_u7
zG4fU&(Z@OU*pe$BHOmgRR%#uILTpyp<M)ov4DknY@*E@I^Y5!r1P0{}Yq&9QzOc>4
z-!u+?>Xy74P6lJ8*N{DBEz>btvg-EmRP1%;)$x5>2=<m5;q^s+veTOFVY?Z``1-wJ
zocY-XC?b!wiIp4eu0(QKL?k9^GO0`^ivVZbGBn?2Rp8|EN&lA#XgtDPum9sbXo&td
z=Yjb*=V9bvZe?X`^zXK2{>ybV3K8{TNQDIGL&jMHp#dg%jPP6O*+3no`Xw1A@|(>M
zmxBv}Ss<$opjc5z%^=Xk2xFvz5np0Ox&7JU`-ef9y@o0l{$o&X|Hqcdzq+Eob2G8i
zcW^ZRvu$K&_pjR#SKgMcTO;wOuDOZd0951$U7UjJ;nEJLl95S++Turq=G-wVEB$)>
zNGmXYFbrO5DqpK#xu1ls6>t7N1`I66M>~yc(X1d9mH&OTwv0T^;`459K<UsdmPs|R
zj13AS(g$Q-_2;$*j(gt<wv9m^bkICxS66RtZVJfLmD+2d1v;q1(Ir;<?f}iD@Y_pZ
zwA9T_WI#SVSn+~83AE4z-gCjxHLlZiN-tFEr4-r6X@NbjJ0J?J^T?X;Yt~OaSjnS-
zY)LdW=_cuO!J;p+?L$YBbYFw&C!wwadO`er@xs+|c!Tl)rwH6+D8@PwNC!<+BZw&t
z+<QroBUEY&3uK|*zaY8><)e>eN*msXMNk2&zUQJg2<K{(Henu0Q-DM@_Ph<9{o;tG
zuNSVB-NDVm@BN}~$*p*$i{^mGxdPuP5l56UVf2o+9Z;{-R))L;{8?bdnTb>bnc_#J
z?}19+V2nsYnM^%6tgHp5pEH|4F;u_}L2t&z!^`*b>v+Di@CIH-q9aGLA|U`V(0hnW
z=>C{WP{Dt~xSwL`o++KYmtU5!Fn+vBGr%B4OFOmkJufYk`Ep#HNj)g?UBC`-SjLUf
zY>Nl1M<$R$DzHE(<!2!g4bxRU8xbn$AzK2&bY6vL9#c0KLZ7|x0h6;6juQjQ?1J>E
z${s60o3Yl!9v?Ig2!Re}BA^#7MD^S4N9W>VVq>H$c`5p6ZOpfi6Ioiz&tIz^2#5HI
zEE)Z7&^cNS^_*=!1>L)m5e`rw*Vs2`eXyU}N;@a@Ulw>Ns~edtJ<DHkrmE{il(i@C
zYG)07Ju-vtT1WaI2ih{On2f2E3}kMP*T35i5Wi4)u%meKz3-Nva(msLhEsJvk1I_#
zXL~+AW;cDmKGqxQbFIIRE9n7vWlG0M58~6lZ`Z*Mc%ejC?M~K037`oU_Gx<I$n7B;
zc%U1GS#<n3z;B1n9PqNTc=<Sa4Cs05d~d_y$b{j)pfmDS5w&4Qq2QcFYYVF00ASSQ
zlbT{HDa`V7?w+5Zw94AF+Hyw6VX*FbsMmaJ&vKEzHHDyLyp<*oMDql-%wn${`0or-
zjG<qiUy!~NiB?kAQQvROAijH`Zf<+SSF#>B0#Z+I6TTu*vcC=egXss7KG8FYJW!oL
zqcm{3{ydzqe`(MGdEJn&!wUq;_<8oNHsjdbvdW0$#4v1oG6|W`C=`Q3#{R-R_*}YP
zt#NdUKZziqGXm;xwJD5~!r1aaAbgq#Do@@IUmntESJCTphw~eOsMNRplDHBVN&xMR
zcgO=Sm6P#zNohnE08pCkK_!W?E$?-NEkj(Yyg2f2Lbyth&;Z(X1|B`MHaK)#tenne
zayh?oWhkDJXZpk66<sdg)AtmaT$BDAkSD`65;Tv5Q;@gc$Z0n6?7PIp^E|fAo<+Hn
zw?ED!rYlyY)6#)UQdy*!-y)dZF$py5mV9B^HzRPQ8el}+@#qJbG%uUgES*z$V9{2E
zGZ_o0%IY9;C#~iat|S8N8McCbpOjWWwrv(xBr(Nq#pyKVyrP`pDh96f5K||Gv9v-O
ze;yZaOAD|BoY$Xb9?^ykyT}m+vd1*YktVGJ%c;YLg;b&iZHbJ@(+c1}@^Kn1WA){+
z%Tj*Jqbl;2jEngFVx3>8!AlY`yZd#umT(K-pJ=DRa|Sx=p%oh&5c}hk+sqo^MXSsW
zZeO*oYl;=+t$@6#hr*abGzfH=?)H#p4uVex9Eguu>hncl8~TGookJtcF{DrAL9}k$
z4=hV0Nx_*#h@sIAYmLNkzAx=VN{X-MW)&!KKo+(j2}5G_nFwiDpN+ZgGG`$V1#6^B
zCu27tzc%_#d**I2$aL8^9GTz*Jr{;H?Fb2=<&}oBsi&kMn8jD4*mNEBTZXyv;@xbF
za<8!llo|ep11=-BwfcsnYW79S+Lzv--#DX#_9K|aH>b@g9{TCTp{JEl?+YEl2uck>
zYA+X(xc^am$)50NC5s@PDqiDr*tIsdm)p(xe)|Git{jwxqG2*+iROy-VLEevlWo-?
z43=dblk%q;85k#xb)QJzFl-GFjB|2P+cgOF%M(|4&AL=8q+)?kkTH~7_yZm-T_0JG
zgpHmv1oXu;dS=@c2r>j(xO_7YDJag6Yo2&yj!^R+3oQ7ha>9bcRIvzme<VqE#8b1<
z<eu=RLZwJ%9F*Q>=pLvT>$|T(GeBs`%mEsWsHvVwt4^1In{kNSrp@4od6!be;FOV<
zQi+CPhI8u`ljcBygO#jDT~s9c4cSZk`IZiAsS|4dsXX`Qh*#JU<E5c%{oblBX5do*
zoIr~;(+dq3i(RBShUEHUSs{T}Ioayh;SVqE+}-EKCSPdk&a~PV{BAtD0(NyKSf|~&
z85t0etRg<W$7;6fM>lXO{hIR|`h!U~#KAcaxQ_wAHvA~7`5z!_GI7%-FTg=)lT=;V
z4Xt%~q+=?ff)(34H?1$4oeM4glL9Lo7?j(OXCBnXk$zVFUaE^~U!RcYo=V@r>vwOv
zwEBmMriW(rV`%8l?pr|AzdlA+(ZPK^U7cK99KfidvbHL32H94l*63;H2a^e^FX`?L
zyE-B7w4u?_v!5<*bb4T1+}SgXz88x$lhqN3T!XEbNCY+QO7Cbw>`TX}SAjnUGh3nj
zc@tnFsI1kyy|9E{yF-U>jq`euc$U?p?KZHZA77j+>U%aH83(uHN>gkQCcEsVGo_Ld
zt)hT~Q#5>3Zyuk(VS>LD<^i$LIqIHfR(=GKRIg~j+3V}^y(G;EJYUo(F_87j{a*Jy
zw$nhn)Awo)19bF2riW?*HUp*Ly2*S;>X9}l8Rwgsf29gVbJscL{#@Y8N!9<I!@EHL
zh3GL%SrIkh%Y;-ZAkhufKzF{I+&f}`mc$@5NcTSaB_VX#;Cp%@+C$-u+7mk;mpNj;
zGb&C#MklU%xpW^7iTAY>f&eob$oYgi-u(gHwr9XGz_A03=7Ud%<aCY>Lh%h`RCF`g
zWTbnfTR^bjtwE<#SeZnygnpItQscb{tr!@6zs&6)u#<)`Yymj{bRNm&|5NQ%HQSCb
z??V#%OG7yUiT5s2xgQ%<f<raWPMMuJ0zD8^Ppu~&KN$!WHj1O#@8d-U&TV*oC_WFG
z3bSz6T$VKAHJjwqHlbC^m%`QxCP7Fi>#JrWg3mR1dHN#CT}xkD5I6vhatS5w4XO1p
zKpZEyEj=+QQ#ejKB5KLBg(eb&!&3-bE_ZHc{)uQ@{pH5`@H7)GYnp}H&s-a2AGM62
zWWxWd?!HjAHiEjmW|?%OJj+L?zJX46E%D*K3FamMV_(l(>luJnu=uF5C@s|3Y5JpM
zZhO@}9z_O6&Y>u^XghcM=~o0*{ZWg;y;)A`v$Au2Czt$vdTBOyKV&P6o^#fyJf^HN
zkKDau@sXtindxMu<!O+6OIvOA19b6`092vMQeOpJgIT-UUeE0r4V=Ewl)jF?`LRQ|
zXW}IFsm|6hYz~E)p4WcM%eVLrdEjJGiXner?vH2@a;n!|Ll!-D{R|4Wc6dN4xeMk}
z=C{^m7iE~oPhm=Tp3Gs@eHuU1PY^19OobISJ=y_gz_Prf)SYWi?I8k<N#Q6RFQGxN
z&nO^@*W}hCM0@PuO4Oj#HHGe(c&dI`r&VTAndxE74C%tlAJ*7&=telXE11f%_CRzV
zbBV8bo{NbS9^aI-^;Uuk7LH{ntcNRVHd}2iG6_x*HedSizSfo|1kXhTeR%Us6lM>b
zHwgY`rocbwU!B(mfNbk-H(hR%nu9;v8F#!|)i0h(&w$G?iM?E#B#W*nQOY1%5%p~o
zOVD2?_iquD^7+cBjEU6+k~i3gbbbd!a~h@~zwmb%L|q=vwv5QgKs{{|i0gwS(c%={
z+%u>*arEdc+iu%*{-7`@OWyi1#qs3f2+}X&T;&*_cP(ZfbG0P@WL~5jYP5*cB!1`3
zAz30;m9%m;6N8|hWqyRFY7Df0ArK{j#&xr*8z>=V#%@055%@h)jN}s1$o~72(ZmqJ
zg$(o8ue6P4ufvK8s(9u0b%<bAQPO4P?!g?J%_Vbcq8V9pe<iYqn9zFg#d1H!C4Pwj
z0Wh4fQLA#zREtoAXY1lT>+bs>Kjz`KAH%0nLwu;O?Ae3OeSlY4I30h&@((MRTIR8$
zCRNs_Qdt->xPb@!8ei;Tm})THA<&&;ASJu0!61&|8qTO;f=_qtxpi&d2WcHqn8mwW
zA)ZgMQaMk@KJ-E?lZbxvfA#x4vKRD-LmPoom_OuWE_Nq=%PnbW9QV;n9^g<^95#*;
zG@4AW>`)wLo;%cJ((ZWt?4_>No4Hqz_zLg>?f_axx9ZXHDYx$&L78?i|K5lJGX*r&
zkt!ack1VsQO5QewyYbB=iYSO5PfgcXJWv1d)w5n4tUKIE=|t2I*(WS)Xv6cAcg!n@
z#%UTO4^v_&9oK`ytAQOgt1<qG8(Lkk);;l|2(M5Z$8#L@EOinM?pExqWvGR&#|PwG
z1U-Srl~NqY81DnsZkA7vw+k$#o-)^1oFTXcs#iV6Ju$yfQUeqH<1CA&!hio7c0}x~
z5J!js4sF7<3AoZ2O;Zii80WyYeK%Iu*Z21R<#ziS-1Nky7sBN9^FzK^4s!%;`e*li
z4-d39@HR!adYI5Q>d#s{hqGw^*XrBD=|gwK)anX^tCUP9Cm|4^0}Jr0J_yad_j{{V
z?UuR)K$w+-q<R4rXAmWKH1tVKhdoX>@s_y~T>E~eQ(CY_z8V<hr;$_p(08m`6$eGa
zEw`D12X$d<-&|JYGB8*bl0rVD!iBR4Zo0P7po8lHB`_o(+B6aDWfrm+=zSv#LV99N
z3-@e{OSf*bA7@Y8n!a!5U9I20SIN7}x*12jg&c{&!zgyhIcr`e1#%Ubt>e*KgYhc;
zCAaU*?PvyJP>9kV_J*-vUeM6B#0At|v7rVyQvAUj#>+=qiU8vVy3BbxgkNL=HjBDy
z3{(~H`Wjvh8qpD02rJ%VrWwRh$B7W@2~uz|q4sv{0i|jOKD5K-0p~tk1L#ImO1Yr1
zx++?%sG?-!lLqvew$-lDQWMDqcKy)C^+kF~#;mmL8*|Ng<~&lfNZ(*`%;t$2xUO&c
z$y&=sOHGs}Jfxs)V%BBYS?`c;84m@CKovNqz`zYYOA*LfH?YChcTZvxdVV{DasVF+
zVTuiTX)$cIunXl%R7MPsRih#@Nv<Fu8J5!r<XQ<ZROk3Yr<+k>W~G{7<78i-ftF6I
zRyX0h&jwG6DraHa>Ionx?HW}yXDw0AWXU1Quv%%o30N?0>a8_TDjU2s-E)AZTwPMA
zFPCAR{E|r4siD)x9E4+5+tX9CF^EFi0A9J09La6)P8;MXo$H#g^TRZRA%pq;;-S5(
z6`LD$DV+$W834gg_WPk@$CNliEv+9xBVu?LZbHq-YJbO%8v;$vCOK$lIsZmI<;Z}z
zF+vzr0fT|y<d9ceD=~67%?r~54<^j=BY@E?q2SF%{f-cAWjg-uY<<2mF!E+5W(PMr
z>n3782-$}9SQF$xoZ2{;KyU0kua4gaBxA;27Q;xVAY~P&Ot!fNgIbJcPnAuM;4}u(
z(sviLJv>&T#Qrz`z9!6XPwE9Vppc`2*_jAw+^T-lVJp{h6K>D)!gMGuLyrv%Cs6;0
zGy7uI-+|iodnB10^ohdq8_<hjFsx}7%qxoDP$9>>A*_ZO2gFV+;N4VMH&UkghM~jr
zAi>e@#B6MOq`dguTc2he%p?sNXYDeB`-OC;K{?E6sMb;JnwfB*j=x(M3s2B*WZ-9F
zbaX!+aYG0+EkrE41e>XQVk8P(MMLEG<W=%K6_-jR!u*O={T=9CJGLukwz)>^g{|sE
z4sn!LTpG@n&xT_IB(VZvzVwVF6EdJC7hPIlYp^YbS=uG~vWzw@*WUWcG+pcAsoJ*@
zY5FX#I+!vw1}`WnuoB_D5c;;Z0&2Z`eOg~TO8DQFUG=7>q`0e!i)`_Vil}GfX>lC@
z4Xb|Qz6C$rniLb67iqJa2yN{>Q0jkIkcO$0>$eA#-#E?0irp6O_*&kQSQKel_aN9#
z)t9-Oo;xj%j-qPL62zFO?<?y~IYg&v+`%dNs0=SuGKmcwL?CCeFbD^zQq9lP+o0wg
zO9gU|@K^4tB3!p$E~$>5)MlO6_aJ9+t+Q=3%jj{U+Z+NoN@<Oz*#UmFjaWhJ_YFh_
z{fPaRY}EYx0SBcu4U9+Y7G~X37lpAi14g~2-y(}<|Kh{GCl1o!<buBy@_c$VfHl`E
z?1`3SN<8V{;HmEc9U*={8@Y9rr_`Fy0ZS~&pn(`H@SAP;jIc7bax5CGkqf;PRys?G
z@M#T+yj0W_96hF9eb=>o#X91~DU~B_#I<;D$4aD(XuOKSc%6j@np2?uSA~$v;;oWa
zY1HSjGeoc{34J+McNpLfG=Z~<5zFOaxzmjj&Bk+7?8D*eu19Ft6o0=lBW1wl4?!C}
zi_;u5apgHh8_u5$;M3lihm;@5I|yee_BI7jx?bI)LL#%w=s!_|Yrm~UHydwwh;&~E
z!N&_9lKCJM9^}U6xDNme1wXK8@)FV6?JZfhzO+t@kwl`AE<csfm=P59W_{uqEY9%h
zc@crWk_0X?QJLDX0ZyMOtNSWb>}v40kNt9G0F<bl%PzYyJh9(h+`@F~u}I-iC2Gu=
zTNYq(Vpx~gT;u6vX)Sgfc25~hXu6{Xvf+N+@l4!ATX-mgcVqT6x01b*rI!_K+sl>P
zzKo|R5q{*DtoeV62+%+Byh0#{a&<sf6Lb)b3D$eW2#_!HD(EGZ5xr)|+c}HUQ3Az~
zI7L`h2mCCMAT0~5=+&hqAYPQdsr28-3G&MUT_WYOd8;Cl$sj_jm7$OnpB&RT;P`pY
z<*r!Y={L^XVKcsP&}{-Ff^inj3FDGwTbo@gxw=W@(DfrW+ct6Ob47Vu_!MX)@t(V+
zEMq%1-8!oW06FeqOocFZL|>}2UNLpxC#X}s|Gh=qPHGgg2^2(gR%zPF<C8@XkSt73
zP0|fX^iWhmF3pw8u~eh2jNsKdf&Sx+xfwt~i|Koi0FEw~OAc@gH))tYJ%ePlVNT&y
zIUXf3n!f*LutWiohHl-QwK0)bzrkR;`(@p1jBbz6=H=cpC!ZfZElWfRdc^X1z@enP
zWbsi7v?1QIb2eLg21IC;d|DusWz3C>@BlwUnrWJFMGH=*pHB_-^u+UfL1(gex<-zz
zt0>hb<HKHW(BW8yGS6;}X@`cCOnw1OF2~pRY4Jp1Lq}?s&n#Fs3A*eFe~+0GQg|R^
zb<76x6}yP){Hs9W^ATbws&OZ=PRIF>325uC2T0Lw-7jmEW=S2EOmV!my@>Tn^yJn3
zE!1p5i`gqfM?Qry^gF(kaiScirQ{rCQU8VsIg*-uwiPm~aC5^dqH7H$f)9^_60yvx
zVm`JF^xww6KtsnawgY}rivZBH>4PZce|Ob`!sKHhC$2p0AO@;)HY=k*2B`V4{pMDH
z2%Q)YJK#K82{o9m8$-}_J;kPXN#?>=VpG!M$Efj>4^}$*jeAtbW)&&YH#hej$bOVF
z!iKvZ-okFDSU7@fF^OYZR~h`G);MIj&BFAygIP_4S!>&Wi;M9E?fP<O)YxEO=<sK=
ztN;d`6k9>o_@sj7BG0i7%j{*WP#}#usQUK{UQ8dDq>ze)b#@C@z`_Xopn-sx^{5Uj
z<TlfSf%6k6s>&P00Tws-NIO|ze3BtcH<ixp#$sKYSuo*kpE4`VzVK?C<+WI;2IKk4
z#_6*p7F-2gav7xLoKi$NuSO=={Uq9~qPqT-JXfm=>U*rO!5IU^J%>czg*{{*vBM?Y
z-As9v1?Oj`!MD70#>I?TXsl_6oi$E7mN4d>T4O-%711@snO^9FX36JAVK?Xz=@gwM
zUAL6wc$yJv<ak=P)s+DUsM_+f$MQVu6mJ620{+>CvP<;KAt86>MhzJ(7&nFvKCT1z
z;w55B_~>YK_w!r-L0E}$)1I{DpHW56$)ta;a+lND&hoLPv}f>a0X=>O(NQzeacIY{
znN#6xuPg?)lJ#Cgs&ZFDTXZN3QN{=HA(*XPUwVf)H>+AjErrAU?6?sN4|^As=_CBk
zL)Dtju&{hj*`?m856xHA;uV}Soi)n!b8ZjY;(SwpE_o5kzhG#-awsN_ttB1{I-dF5
zG8my<uzLxiHbXI=wLmCunv_ykHsO9(HNommo}6LyP7Ddl-mYPSpjpF924B~Ug|b0r
z%j-Gg3I`vz<B0|N9L7?+<#o~ID&vx+(>ttEUehe>36om<NdYHHA2;IHwd{3s2Kr}<
zZF!5fWxwF$@1cZ|gl(zwk<P(idZvx&RyNiPKJUMB&(~iqI5oR_nqR}a<t8P)grUc1
z*f};Q9O{dPNbtw@;Hn3ixPqgCRDD0pNiV1+GU~Ojsg|xO0K~an-~k);+8WCcI>%Bf
z$MhW(6^~?RG#bha$3{ovqUg{ge7fZT#KW^+TjTZOcz)y<IVtPgaZ+|Q^I0L7yt+jt
z`$)43_WcB_4ROno=Nyr5ALZ8T?E${UPg9KqclN*R9=!;u-+=Wz$A71OA0jxB7d=~J
z^*K$6$q;Bgp$by<SV~%VP2PX@^{VK9a~dW9r8f88mm|3laNJ)^{<L1c?K`{W*ERT&
z72CV=aA$NE#~4C6fIrZys~U?Q{^lRWt<D3t>+$HNh_jSq4eP>GPSN<0H{{tjz!me8
zokfr0b%)AJ1lvpMrrM~Z%A0le;-wTP&g2(^Z2xE?M-9Zp`=Du!9e4i|)k&c@gfe^g
zvf!%=lNhdwTW#{zUGC{+i5a}HfKCX}<S?=7L-?Y@Jq8Sl?){;z(Wu@N^LNi-TsH@4
zCp$=FL2N05#;18F_Y07B(aQ;nucnTx3gqA$l{n~EyciQ%<0)qa)|J1OFYNbEScmqf
z`CyJNP58SW?D|BDob7!gZs=0+G_(S;bebVW$oC!dJM9Fto$nUbHwO-kmQ7ac{bntr
zE*+iifbJ)i(O%VMd1+0xat&P81pOv3(qCVCg((1BNgTsG%rsg^xL>VEXy!sQ6~!Ds
zpF$x7l!#3+>%hnczL)CM(MdIWj3Z$rz^5X{fksQa_imNIP7feB_;43TxJrpNn_>_F
z_^Z2yMoVjudyEdpFaO-xI$O%hW5ob)xuEaDS>9(pEVeq`J1aCDLHGU`B_25%VME=8
zej{$Os$^fzMvOTL%$f22c(o}OnqEYlC`^cC7v&tc#u_ux?{q126s^6xZT96v_X`Vk
z@E>@hvAS>oEPQk#xh)CDxeMb}Z{b5KZq=OV)XCeszXzddUTnsatq(`rwq(PrJza?3
z`_zsGLyWXqp7a3Os98bMt^M6WO;^n^0Z%u>)EwO&6-DO^ILME1wkg$)SDj?pOj}sJ
zu<YW+%av&u^ju>mBe1H#YA$mpHce@fv1mk`@ysQYI*rvK!qOQlIoEeXc@#i)R_efm
zmE*``buo0n6WEZU!ngHGIl_v${48pt7W`R7D8pb|y4D(~vH(WS?tMD!>P~De%D#@t
zOxI(<Wp!84X|hc}4F|&$gi2@gDj^6s4e2_n>d9wDz)GKb3yd+9RjX0B)3fMj;T0pB
zFCoyZx{jX{@xZFXa8kB(0#WH#*_tohtPMsTH>pAT&D6<c4N@xO-tx7?H(7%PiKngi
z0vV10i!I|;XU1gesU`Y3(!L`vo1pPX0rfq9&L|tVr^tLK^n`MQDKk$j%`>m@aO!S=
z;lR7NKr<0DnkKyc6sG-zAGy#_fNQ<0qsw;pH5pRiu8&m@Ypv$9F-mjZIIK3aFyxLG
zo>B~?*g9!fk8K1e+qvD!%Az;*38xr25m488wX*sfC$p~*Yp(*3zlX!}N=LaTrq;>k
z_c6Zn2e@zz{Q5PA98?WX_++?FSFg&Q>SVf3SEI_^;L%9jUMQTdhtkiM6-!aJPo<!~
zDfZct*jho^MomT4ll3dx>QOxHrds2brG+mXzMp|+)Kx7R-Mc!GYuuI9roHk%D!ESy
zSVc<6Eunn1O7wEK6BIP*>@wou(W?l!7+)V4I;N`-VkOzlm9AZ{9Al|GuwVUUN+W)-
zC|4c#S+ku8Fyh7@ySm64@ZY)COxgRnu{q+d6wh_CrqU68S!Fv*(goyQ`~=0Wa`*N=
z5zwSddSt8|>ZCELR0I1Rj#kU|E&Cn(Q48PYnKi?3&cK8A4fo?GFP_s~manUaheODj
z9$kzs?)T^E6e~k7ynwUvnIppz<8*?ZU%MPYLEB79qj}s&9*J6vX=#cYl@F8)lWaZ7
zTu;>^?C4oEDMN}rquOTETnc&M{;`U10;I*8&STXomVMuv9cQC=MhB&ItA6=Asdv2e
zdVIKa3~{%!0dOe0d~wcmqw8v-OwLIp3GFx5Zu4n}Ulm1uyrauzx<jqBh3)fPw?^xD
zQ<sf5<V4z6my}84$}c<QuO6@@Cu1zADJF1eT<(P4g?bQAPyaURt3r}Zce*c>@?`Yr
z4U$aHvs|~{7=KIjioF!fUG>3e=24L>(|0Ks5W^pS9BaRg$lVGs6Gb+ly+I#UfVGLg
z0|u+fDPLYwzo~N73<vXcbVt@pv#GooQmnQ?B?Z*1tvyBaq#3K(KUoG>eSa*IO<TEN
zRT#w4A5i40WzEmY4kJrt0$mO4PBd&u=H+_luHk9eV-S{$d!Kg2S_N<|B)%k@>Z&#_
z*+ya3CpqBqy0w6FD9)Q4Nl8}}0_&7iL@n=rQPbp(9yB?49e#_Oyp!qGVYHQOC90yU
zVFS(VAgn)Uv%ET8KxO@;7!wXgFXs_ItR&|}FV_g@QdA<!lEF?U2t`SzNJ$hS9Rn98
z{WYmxh;-yqfV6m2qK=zxHp*kU0_QL*7tYgZtrWnmQ6}{fD<YgW8zeC`AwpUN90aA!
zN-dNFvl40ExRM)&)gau67oWgtO`+ZdR*F>j;#*MDpqeYg_TodlJ`?gPC!mTsFTFxY
zW}y*_VA9oIyd8zw_Mum$_A6RqFCj2lYyq46s;1%RqntSA?eCDY5MD6OZrnWS9j{b5
ztZ|)gGgQapQ|AhT!4!az1g2k06PwytN?O&5Nf&c?^lphCAI40wK9K2_;K?u6Vm*{{
z(}~98*9zZclwW`w9A?_7#yySA!#0~c8Fj0gSEI!f^j$Bs(I%2v7AAE>JF2=glSU~?
z&+i~3T`K(#iK{2*;I;HSxQN{DFo#cj^o8`Ty+hyLU&E?{v%MHTtRD_y;a+x`_=4>;
zAf=;F0jeLe4}c&vb>?dq-1S{Ju*yt1u&uo>NEW+a=asXeViRUBsQUfVyYq8_`)URl
zaJ;@xuTQGEzF)_umHUlX^di2m4`#njT}nSxXk&=O2m7j8g0J32cu_{_P{6puVDJ+L
znS)Dd>R8sGD4LW+?~m=MWpN;8;FLj@s6nFXpiu>K^!%z?>_+3Urw4$Hy<_Cx&b3X1
zAs^tRR0bJ~p{_s+8Oc)4K{pSL-*~5O7WuqV=*b&}E^qB|oW8Xf`p1la&Ijb;^PUsX
z7)ya7DHB|>*ecx9ATb#;8=w+i^@pC@uu#O5=pP3lLIkiNi-i&Sn-iA_FejKbF&)-h
zCD)QPmv=MT6R(*?5a>bZ0lEX<fSSf@gS1i8sU4C7VDJUHyYcn2at-#!aQJDrM@;}+
zy+sO7DRei?fJMUYj?JJE2$UN6C3tC(Um{7$GL$>#pbGzdZqXj4l#P^HN4$l>A=3t!
zoPl^Cvz<Jq8Anu(tQqyk=RXG<{G3N1lF8IU3+r9hY>bxWDM<fB<;iaAofKgL0K1oM
z<N{8;{O;47tU#La2ya)lA5S-k2-=I%2<%&oXIkEM6=QnTyPa3QFQ-|zN4Yd3h23YQ
zc2+e-VLEqQI>Mmv1S`#*AZ)zANv-S?|I))mNjZ?1S;dT^&RNjXX^TXvLg5(EE^lb@
zBRW?KQV3OiLMW4-NW6o*ZLpjbLwaG2%i<D@yO*C$s?M50yHgM{nD1J{=cT@Rz_5m5
z!FqaG^=`rStJRVKR{d0v78@hb(yEW_bz&`kfpM*L4+WJUqmi26-$`Z|rEH99l)Ua{
zLI|L}1_R?>02rq2VA*UI7)M<`j6ovOS?0Egq-2&)X_cd>2tUgO8w-uq_|6?Y7T0OF
zTzp}hTnG68w2MBo<x~)YY&y_2)hK5f%pcHTEa^3-gnX)|F^4sr_wshaMTelzr?zw9
zO1&%Ls-AQ!nl&P@Ut@HM?t+kAs6l_ltJOeF))4L))me@`E0YFs;i6)eWN-(vi{_bx
zrn3#qN>`=hwon;+B5s%wS11h_lk0)A)Y^z~#}S@b7H6s~CnOe&VnQ&%6I$+WIbgNp
z+|#PjX`l|ZJ?hDk$22U!DYRS`j!gn-me}KbPoYhquJ%{~EVFVya8e3h<nPUtDUPR<
z+*w6)R(^&3QY=5|^n$YO5w)1&&PFZ15v-PLC-kWmsfi9jHuFvhfn#<l97grPY~)@#
zZt}ylsq$A7z;Ywe7l90)q#<ZKD({!A7a3kG?GI51FMZ1RmANKm^h-+cv$%fioSw{C
z>PShyb4e|_Lxul<j+Q1{33cE7wr~AzR|ogXPgpBJ+0XpFWLz4E`u5LzP?B9^V64Y{
zSW8N{wBl#j9unDH$zX`Su=+)=$+suac??v?J_vC>NoaqbccIrxH98@iJWv2lEFvj=
z{n(z6X-%PyN?A$KUpNpNo7OOy3j+;-veTfe82Z=(8Xq*OF9lNO9?*;HLT<?f@l|yR
z;5qs8YDt2E*e`cE<08EdSGGyJ1n43!=gxMi)1v6dL5`z7AQa@}r+1{T=~!oeT)>ic
zjBBijFDJx9pi|+NJ=HZ$B#5dn!W|G9`U5+U*j1I?h1}vcVu+NvJA*v&z$$$5v3QQ`
zYU}FyNCO46hwf4A*aG#G5hx@*l{vspz-TKUA}}37gAG7`<F1NU`GiK$oe@E$>5^sg
zaU$FgzC(@^^!qKU=7x%-$HP$#<j92$|K#LW4*w+24vVe^1op^vrZ9CC0T{$hqc~zR
zI!L5ZzN-#C3RtJwR1%Au44Lw+^Uv|UK7-uI;xW!V4R_*HaR#VI^9jZeuI9@A(t=IP
z47KK3WDYqsjPr_bJ@`m%K3Zp`CH)12@~27X5qbvXb1|;TFOT0JeB*{sZ>O4DDp}7!
zEVJK{$s<Z^S9fXmY~ilAUbqNmo_aKUC~>&hK`Fj5%}K{Lhzo(8g)z%Y#Wb%CmZqf>
z4XJ8e4FOEd_rl_osDIuGK#x4(EXmkaq@DDhHb>U(b;auMdf?Jr0WeJne9TAugx%a>
zJr2JDO~j;R^K)KDIgUMTc*!f_=@i<cs8;O}Y4)g=zDV=|pUZ!hGrv{=$7o~U2t~@K
zwNT`o9Yr-a2)2rTbJtNF9;-0uEQzp5ovT(IZc!d?TvopI)lx2_t_&Prc8m(CN`}rE
zR?4i4May?`(Nn!^W=&G%4)eQjDZr@uV)XnafNSU+zK#ih4qb^Z^;J9VWB!0@uiiVC
z7?re35#QF%tE7#iUXvUkt8SB8mr`qi`BAnET%-f3uubi$Xi#w@<FEJw!A1P-oTiim
zALsbCQo<1vnpFLUdSBirSiJrh-CY^amwGi@)RN9)CmzWpY1q2_MuSFxrLF6Fa=6uW
z9nA|Fe~N9Ca%y&WLdsfGYh^v;=a37Bj_KL1zP2&OWkMoTEaFwrQteK~eCgN<80agN
zMZB`7R+fpd0vY=q@$zMrm+p!+7T`jNUxqFjoGS``f1k7CwuFt29Ok<~kw$98ce4kz
zaIUEdI|;*tbn%D%s<htiG*i0tac&3k2VdfP6t6h9Mv?~>r<XLwH<hM-XjXLLIsioC
zqI*OC?yY;rrgT&oC0n=?QtI=Ga01!zBi7RX{_?tC_1awn@(ZnpzfF5uIL&h!x-e!|
zS5$h4Rvs31*)0<&Zt}pey63S)rLue7F}3v7Ce*H<3QA9RtKLI#22_P>#m>CiZWYo=
z&PWDo>{jiSlXVVkiG^yVji5y>+7`~X)>W=4w1c^u_Y4nIoGi~*q+${RFX_?@=-|)Q
ztYStdsga;|f>SH*Z}TmSQM}IqvByYy4}}!@?VgA<Gd57Wi<kQ(Tj5Tg=2N9gw{z1}
z3kQ=(1<jPqP~x)lMhrA*`42$_2jTo{iOwT=xT<1@YC>Mk?7hp=<@rk6n3;gc#J$)4
z$<#MC{kq~C3aTX60CaLwz)o?ss4yLXS{>Yvm(@bmeqDGO*;t+2O41gUrjdHpD+g0t
zT`=U0n_e*7*i4I~!qfdFSKL|FIm<3DPFk=z?Nf83`PPa_i9on@*7dq3T_brI4FKCQ
zGTowsb*9y6y`zMipxRtej4nK-9DwH9yS_Ib_R-GaNY=+}4W$ZZnv7Q3?FJp~>7|@r
z9}0NTEuq^u_AdDcB(ms*tKP1*k;t;;(>8N36~w1E8N1cdwL5+Kw#@;2InA}~--74J
z$}9RjP=Q$F>`|!x;?my1KIkVDKO#%h^J(l5QJw<A^VR26Aexiq+ZfR<+?zmu4x-tC
z&=SRj*LP&>ZRzaW2kCJa;#arDd4YJH1$9pQF&>(k7MR04GIBs&Liecr1j;)s&SP<N
zslWhHSx{VBl=DiH#WDeL5FFMksE=bxx#kTUJmt#6-Vn%0DaMCqo@)}?u!*aKJEEdy
zM#6=UB1T(rGZxJ~ARd9q(<xExk}L7CqO`Mwui=Cu$a%>Kb-fhj$i8Qv#Qea(6toh2
zs9DmgY4KnoD}SWwa{Tj9A6G*(V(8fZtN(h~7&jq7lTc#T?1LvyJSYturz3D9pc9W#
z;R{SBVs}jDX>&z6A~m8#KZ6Mwyr92*cR=@2`ML#bOpkGPPs!9Dj{c|{LJWc;ou1`4
zV}e&OOJ*Nk=cHMCu6-M<y3i_-Huh$nP*=%>p^9kQPGP(MrpyQLNWdim)Bsc8d`cVK
zok+72XDqrn3BB$4ows}?!~rV5Qck}-!A@Thgehc3kk6r&qWSwAJFDEtuZjz605#KJ
z$)Xh|ZthO5#<%&D%j4b;iDnN*S@21J{)5Pv2n$A=&ZO>ZP@cwus8|4xlFllhWyy-H
zCmsB9l;|IYp#_M^7F@-R5)ezyI^Cg|?8@RHP2+VAzHaWasTViw%Bl894VDh@#*SxH
z!x+qd&GVKv-~sOSt=Ihj(DhD1x+uZ6ZriqP+qN~^wr$(CZQJJGwlUkb-97KxH{!gU
z9Ven5>#-suv&I--Zmi)N<fd)<nBtkEqui>_a$b3pLCb@AwRH-Pwmve*Nf8dfOkXW#
zL!dbm(gi)s$maurpI?}af-3y;ynM7yqIbbW69@)FdJ>N%H_THvA8fFpw-uFyYnRMA
zZuw$wdNP(yq3PAKRDI?uv|wE&8n+&$(|Fz~v!obx9^3?Hr9L*!oliKP#lmV|hsDrg
znau<@&%rT-4}|e%hMi8oh1S~ZXmeiBh~I`<?)K(ex-8)isOy=(ce=PsV1Thp*bbp`
zy`)~1mOJyYh4tO%TAROd>`6kjE|0C+2YJxLVYoG*TUO8NOIRk5slXvFYKbs(4@O*z
z_JFe8H@~W{VLKBNP*p1%A%=7%l56W)dObSwvQTfm%Q^P2DGZ)I;NOq#X7+KUc+yBs
zSUWLIn5v!Bnucoxp-e$D<;kkfzEn|m4hs`*#ziNx#|L;Q=c3vIS+jD`wt=B1Oug=d
z?t&P`V?a8l60@1lIsoaCQG<*K!UrBGf`tdDgPQ!h0Rc*{-~*$M3y~)?jrt@T*K2~P
zTU-*#AoSsXSb9WQ%(L9Ed*FQ(VqtNZ5mFjoq1u5bF-QNqp29q0m0;KxN$WP4{Q0(F
zwGOf0I3X$GShok1*>sdvfKTJdLGG2m92aPbXl}@}jC2W}LQbHWZDt6+cn^f0RyPWT
z!Du|Qsg_djh44qVbJv6iYTZZfz>qekPT^j!Tj(Fr26i1924v<jtOk^^<g6K@$A5Kk
z1hpHRQopoNbmK;PgJ=BY$oWguPnX&Ttm?H4_`5I7uYhw?CSLbM%CT=;4yyi*&Zn&f
zVg~Q}Gmv^~{h)fGx*)Qq9`@E&r*X@r(v7Q%!i4qdABtg77I;>ZS-OQr4AVe*jdrX8
zN8Dve57OTi1=>%BbBMaHTgGGZ>tRGnIY`5HEICMjE~9pu%(|~R#)MYhVOn6>0*+&h
z#zRrufk3O&LlGk!ln7U&hhVzQCuo&1B0t`~?p1d#jy_I=mbF&x_iWrzW4vV0iH`63
z^ljUYuyl~rKw{~Pre&2e+H*@>lu)7e4TzF8qa9<m(^WP{eQ{in%(i}r*6lcgeo8Tc
zx=Mf`QvLJS+821Y(Sm~;Wl)L~xIKXh%Nlf-8HwiI5Qrm6%pbCTJt|)@oeh24{$at6
zEyXH<&LmpI!%ty7Y-w9D_+DHVDzN?adxzTcqG%4MTU%~NnjBq)Nejtj{`%zo^kj1d
z$C@9S>GBzLkk7=rYa<q_xTF8dHVdPX9vVZw#S`?m<}xMfh*IusvksB?a$9(R@72OT
z@SmUk+lu+w1ieqe&y6Ml5o+Jc<Mt1ytBg8>^Ai0I2zQM67Tm|Ag=bZ;?@_rVwTQC%
z5!_tu!10(dKO_Z~#(Kv<3>ewGC*7B<V*m0<wr+&wnocGJ-ovL(-qVB=*%wQXj7asS
z2ru=CkrN8lwwgh6$h6|UN>#sTD6Vbc;YH@F?fAinlsdfm7kIs|ve=7E%FOfOx$Oy8
z-UeZ@*Er-}uNrZmkumx3?DaD<^?1<3J_8^<dFtJFkakKBYzZt2ZUi`$9#@rS2Cksh
zj^9}EWA=rW<Ys}d6OFZ7#3gaWZ2j2QhfKicx-F(hMD8!YAT-Xb{61EhfBqM!UO@e3
z>X#QCk7W4JZ!huQq|iozjaVM!*zdJTr;s}Sr~8Q8^E=JcB3eEvn-ZVf5N=#Co6v7{
zw>A73=+1!l=$JEvOn+(H17BA+L)J}57g^v}xF9ZJg5vfl!!Ytr*bNa%8Gil+XAcaf
zv=_gJd>?)vPIkn>KT4w{vGX7!@(}I~sI_S1hN5?!yK#=P=}+Vg>Ht>Z`{_M2p!WyT
zUdP~{XHvmj*3&T_L7oF13f+t%&LC#OEFrPcpXU<l&=uV-MiM!MneU=Z5_66F^p*qn
z6;hJhEjyC)dT7hD{B&2rzq~<`Bl@eFK;~i0Bbt6)2Hrv1@t(i1t7D$xC(p?QTBuz9
zpJjD@c#s2w&1psJvfqw*V(Y@4bgW3JWX6)ii<30(TIS_mL$r$<Bb`(<End_xJ2B-r
z;9PER?OQ11ZI`#(wKCelJ)WQv;jwj(oWOskAH6>k3_2@25{rG__ZaP??^$Io{B$sc
z&~WJSmv?-}{y>MZ`U~-;eI1=+LY}a4c5H@HBnC1KngEGiq1k<t<cyo%@YXJpDvvH4
zgf~IUl&f3)616<0P{UEt&ht~t+4||kj|GM8zpH33^ZS$ZM`AqK@wF8L$t^2viZBar
zZhm~q`$U`wpX~`FJ~<sCacS}2><i&Lqe4z?CF=zx(A*<Kc9^E52z><{D*2Vw;!Bh1
zrpqEq+1yQ~MtRs7&^v)05|_51Zfr>+LPvDfMf{hgPv9QFW^Iamn${R2>FU|1JN2<&
z7_&;Ji6GL=txE&-4UC5P(+XULh!}IX1?+4ZWm}a4!9S_am51>nTd0r3;$?-Sk6v6u
zr;)4rU#LKUb`5bh*YzDMo=0GGr;#r_+#|VpaRW}58wYY#^+T4hu^0$Y!<{a|O=NSV
z`}qYw9E<)|di8XvgykDpBSxyD!%s8?g$`V=>wV1xhz1W&l=@=Rn<XK|Mvb}@=Jh_{
zx2O;}_f0`ya(|wKue~HlfUK|j8BoBY$!i|+eZnfv2hhnuxSASS?yWM!Dc)Kz1LKpb
z6!fi*zglVz+tp>{*~2`U2C?>vqbp=fN?>J*Ooko3wGos^Oz-V=KI@IAtUS;UEN)7l
zWtp??7|KkE*pIwNpxBAa0kA5!xZ=}6tSD#ON$)@8gW4BNw%riee5sbyH?s;w<i9zx
z83sjcx;L+M(c?+v`7o35yj-Kj=?fvWjh^@2+zXk#huqS~Gh{Vs*cT<cwX7k!R>9ye
z5^ooX)`2)ggP#it{DN0yN$)Mw{GD`M=iJ(C$SVnTEsgvRpGE%UxI7b;{P8?ENv?91
z<tBq>jSplq)41Q$J5}u)bp!Rea6G6XUw)rrnAE2s*RxiQK^YC_h(@cWAeqB;V>xW-
zMNN({dS}beyw|dEu2z=wgeo5rIESHoKgU-;3Pww~egMit=?_0VTGV)lV!qiogz#@e
zlYQ&pkeE^m0Z0-1TAJ*<)^5{auVsHLkh9?+gexeqpQ}wT--W94c>RnmfSFhWfS=RO
zKiu1P-!j#ha&@7xbscR#s~y(^*L<S%TIVz5B-xr9w0to+GU8D`;~r@YpI&iX6svbt
z4<NG>IVr=_zUpWds2uVBq9*(ayeE)~)dIy;<IOS?<%qKMFXZ|>71Q50AT~#M_%Hx|
zbnRLa{QWhdS^Vf*wstE8)OuIUy2nTSn-XY%tc(0Lc<{X6Bz5XSF&Fm8bNzb>wr6hG
zeq#vb3>(si|7s`s9obwQws_>mRJf;&C3zj{<>&0wYLdz`bI;D}h>F?tkrh_h!DaR;
zNfwb}8X(5QMGqKvFvf67kYII(-e%|<GZDr@ZGqCV-eBs>u1ZSRuC-h}!Lrw0hbIy<
zoFSCcyXai}_+4ftn!=`WUH8Ip1+^$dYWPCJ&OqNX0v_fr7D;IK&AI>D?2F+7)z6Qw
z)mwn3`j;gfL9;Z49lkzTHg~_6ZoYwaw^)qxtk4oqpwtrCI>6}CQ&%2x2GOX<&5pkn
zowFxcTSqLcBP!Sg#FCh_=68navjYS-MH=W-SdU;D3!IKjX>wp1A14TW1>J9hr2;UF
zt!#8N#gTIB_$|th=`N91xEtHb@kV$fJv>P3Y;U<2K1<zivoNyz&p3UD^x)jkrdKb0
z9m9BAmXzY77TKx8=GGV>oLPwfC6BL5`2N$lF+47F)I!sp$ZL&jmvqq&#EIpCEvMcM
zXT1XsZ-V`xWfA9K2N#>|vf6@u0FgeDwY|Wzt&WM>o#v1N|Dh0SK?*{+gE3{^!bLOL
zV*svW2-nt2J>_eyqPAvVueFU8Wr91>F{ZwJcY6~%I?d!8YX?N^*>0~+_~svo(tXEB
zqq*&=Gx#H1tW`AlkmNi>@~^cmdhib_&ewJi93d-e)dw4VcdD&PoRN<0^%^wC1O1^F
zU%@CWVXz`Wx)m-<w3Y(|$&W%%&KfXV*mZXbq9Na$khkx2l3n|5=dyl43*Dw2;Uqbo
zR5Hms_DH{oCih_%t2@VtX6UyNCA@vhm=9HymDa{DnD*AE9r4=eMHd6un$~K7wT7+{
z@&P!1vtIyMbp(ifI(Q1$8(?2DX<XSkON_~U>YVw!qGxUAIYx;45hOGN%W`d$%KXbE
zha5F3HyeT^f8kOU)F*!|V<A0MK`Qus=LgN$cSR93_Wg@GIO)L_bpAdJ_ue@8Ulhld
zd5K9hUMI*bOJ7BZYAaoNt;fQ&(G(BC`OK-|38uD@b}A0kAD*L>2v}{ji3KpKY;Y@-
z3;IDw#6eeP5EN2G-Z#J-bLN8{(~+>0R;uaCDnJZ5(*x}Rs&iui2MvnH?+#+wjKSz@
z6@5(wV5(vq(MgRDV9CS;r>fD~>5gL7^l#`!JHI&Yk5zWz6}{o+!q)*B4z7T%7hLV_
zX^zJ91XWWTupw$m)1nZiXZ9+Bb5aF+7lv@DL2du~f<W)yaQ9>oPag{B!FOfM2(YuO
zrWbCSj@1c!2+AK0neZ-c0G_Q!!dS34SP2E(?C`SX^)G-#0e8Pc&OAW0#xkums6kk|
zBQ}G2o!E~{=?CG7TEp*?^&#uiha^`<>JAP+m?z@%28BV+4d!Oamn!W>)KvsTggGOr
za<W_o(zf%cGv2nMGs#6<jfTf(D^X42ZN`@}u9YGx&bI7tjO(lLE{l<D)-17iiy-sl
z{U<`GmJpJopGj}6Z9Vq}QfmbBpzvqgdKCNRqw{P%y)!T9hf=g@b>Y<Y@CqRp9Dyr&
zI^IY-e}Kuk-ulit%W=&P&s!;&Q5-!R>1pZt%lnAjZG?X=G<UAcZ$A52G`5J)pQ{5P
zl2EN%3brmT1+<gz{w8MN+T2~+DSKotxLk5?u^Ns;7#5qjgobEFY3p*1pqO`-rV<Wx
z*VeZ`IgqU1?E0u?rGQ3Q)a2~gZp-6}FnQ1x^&yhqUf-u6L6#5WjDED#T3v~;4*jcd
zrPyq<zgDp0$Nru}Q2dy)*Fvp0xaK|H_`0OANw?`4+Ztp5-DhG8#P?_zx(v`Ucz4*g
z@ek|koVvR+`Sl{D=Wm9hhqmsuoS#!Dv#j<gZ&$ueMjf=}o>6WQgm^stYgjvw(GfFY
zi+larvv1=Ldx_vZSxwrXHvM818o|hg<JB<JO)Z9Y%f=fq7(Cb-YNkNQ%-b33N1dH<
zr6FcTh2GgTmaPp5hR<m#eju5xoFA6Iz!_C!#%BSIcLtfAO{z}l0Z^+!_jT8YsZ(9o
zqnXlEKFsA{)Z3EC*1iZZ6~A|R^@pxePb~RYgt~lBDt0CmfHpe$^$*%nyI|-LLw&r+
zuM`KS9B$0ls-$T7bivN3GN0p5$2L`ypk2}sjP*=Apqe-CUL8N1?xCig)6kXggD_X0
z<*1ybik70!u~uIh?5L=_pi)^T?{kK`4uPK1O|<K7ck#tDx{GqjX9@hGZdxK3(fn;p
z>0LZiq2=ScpC{rx9I~0V-tok8m*bQn>M7^CqtCEMFGC~iErXG*L)sDQcch^_3Fftg
z9s1@PY92gI^QOPjO;hTGfkl}>u44Y|Pwyrbl4mM#^xd{QaJJb+bcGd$uM#Rdk7Hw6
zX8wGVl**N`Df)yYA1mnclM>JH`7VBU$=n)LFZA9c?c2)jYOsd@P37}G1SmGU;-t7%
zNaBy<X_i`I_v3UoOE=DlRM#N+a2t^UZza*=&iGwV3k}q;GRXT!fr8~y9QUPiHnWB)
zR8n@Ux$OhFw4S<6f<W^bCMTXCE0u$4sz$fZkWOvbz%R|GHQ(!Aa`Ufy4vw2r&O0t4
z9EaoIXiWo=PsuVKqmtHFI?}r}_)lff^Mb#le^S1uoG$Cj2~+(|WCFaKrRo<bFE0gd
zQ^Wn2<G2%T4J?y7{;i>h@aQHm!pfTqDIe}BV(e7tOjbYUNsrP>+iWS<tOH(^#eDht
zNM6|P8K!I86y?bvA1n3D)(v!^#N_FJLv*GyjnA37hR{R{r`B<;eR0S`;Sq<V-)Py-
zI4cj@EBQgvPL6O_DfWeO*LlZc5=cWT-zUqDj%5GY&Me6m4pdA@BhN|e8s@b#Bjj&V
zQ?5KNscq`g(1PxxbS#uPsYT}DqiZ_fFFl13CdUDZCYCP0*CRwzp%}W0N?fsv0rduj
zyGlCTw7bsAnQKSc(GA%GhVcWN5JG-UtO|hsfzfUGn_|334#bJmhW!H%FKwXwmxL6M
zZ`tP$=Id>;3Z}~rUD-&O=T}E|=;)i4;clY(?`kGoXYzUZpV{Z#r0ZAm#y_*pf&&5x
zf7dVSl?ljQJU)95{3%j0Q@iCDL#c5xb8Nt@C8Y}l#<`{Bq&&LBI>%@`q85^Vn6w)x
zntNRC9~U|vg4<?7pCh|#j88kp{Y5}g_GQEMa<k=!2ybaDUvOk&BqIIB2-so^tlO~u
z{)O!mAWMzFbTW~czF^c~yY2enwF}{5QlR%LT*VpFn<!RPgMca^n?kWNA5uoFTkFrg
zy5wNv^B6Z<&4yF0_=Feb9X+1T9;PuaJX<iZ?ND^;2o%k<mePSMkHH+%WS?Hn#@^_6
zd`S~X^pG`PkD8@KZM5d|j^?m%QuTL$2G~zW7}2~vFkGNru<63HW<xmmccV(P1a6C5
zFo*hZ1Ft)!V^L8~BVg#^K=!Mbp+>+Q<RHjsG3c=5r7J}8l=LMU8+3mFSV+ukPP9?Z
z3#$g9@>Uwl`xCJsNvCdUMc%$J<G(jomJ1j9>8Mvz|Do<BeW09FcH+SZaXOynwp{S8
zY?$~TvMv-9Dx&X{Fm(^@D#)lU4hGZyznOXmpFN*y=FLNJjmfuxc_8hbaMAh<zBiYo
zZ?s?QKSid5mv=e)K}h4M?`0;EDp;%1eD+UI)`7Bj-XB%q>#9BWJWXUpv>P?BEP_|>
ziarL*^jx*oN-{0p4nlcov4ngyLA_TxlxiNV_k0k$gY^^C8Y{ZA{%AWepZZ4%gGnX%
z%<1TD;=cW}zz(%};xLJ61|XY?yzalH6{f=~ocy|{v_MZIB!V`{fpfhWvibRnatQ(s
zB)+>f^+5}q3!_A8FL}LQJ239on;FF&M$YDp%1P>?$~{xD91!g{b&x&0*GMA*7_~`V
zzNI^;(Y71vihb{H%8(|Ui}1a(+4DIJw>AbfHv@GS^{^ZNql2=p9SgjZ>zjr^_~O8a
z52@etGG8GUIB{HG-xCHpL@+#A8Fi}`l^ZD`Ig3oDbKWkUQrl6st6Q)PX4nO}vkV5H
z^%}RNk@CcrXu<X%d_~_SWviK}XiDm7ijfMuBUP57TDz!=4EqSfRyyPa(!qp_H${R?
zUt2Y00N-r>BG-1mtCSg-tP7HNlnu%sVbi5n0{1-cJt#dV4XH+nXEO)QdPHI7D15>N
zI9gR6vb1cXT^0XCYC^#V99=i-#cAvBAhE>y7`1Yi>z?#Vchig`7Wy_*%<6_|w%%gv
zy5}&gHkLxq5Tv0G=70VrgT!sdbgZY%o;5Gp{6gsFQU@p!!@A0(Guzf`i21{7B~9>a
z{*7~)y6ww;D*5k2KUo7@HeS~T`2?uUjgF|eLmeI>a!P@0YGK%Xrmi>$yVap$o>+kp
ze<iXd?e}%5|Ksu%q*(2SJaKPJe~+P~qwl_;u8u8tT%16n>Dd&T5}2(c5|fv=Vff7!
zY;k>VIF-iLf-DB5WUS;ZWM9`jwM*`{R6_}F1R>!8IM|S0k7BV0O74>X!)u^yXKzT<
zb9CH~4yDf_js}WZ*w@GXQIxjr$gxr=>jW!2<Fbe|gZ`5WG!KB%IqMG}sPavr?;+`y
z#2uVm5)z}nRpNJNWs6Go*S;`^%t>w4FHg$*N5a>a*N}OWK3+G0d@0xaz;gqZ!o+aW
z9_dy-6L+>(dTo>evAY=&ChYIM-8MxmWL?u9-xA$<HT~5GLj(J?)Y^6%69l!Chn559
zWn9RJ=;Mc%nWzN=E+0_sa#Od!q-T)5Zk~N%;TVmA9frc8R$5i=h3!Mv$iLrkpN66n
z+Zz)7>uwq8dza_VZ1MXt^;la>WmI;p^r8XxJpaR^KdDtCe_YW^`0xw1q9dEa+8U$3
zRY{~A>kkUV&qiuVm9fw7i=_6sJcE076`7zNGncf|h!iRqB$49>EcynUex|R?L~2kE
z;!?)N@2M&Dm9j1<+h45}=wtu$2N3zW_<pYGLckO<vybVJDy^^H4XE@klQ0MmiRbj|
z+vd`uC3<#EEH#%UZs7ObXhSZp)fIpXdqXE4rS0$H<-7Md;6qN}PrL=+jeygy{A_sn
zl4ulsa*o%7L=x!f(A`b8<xTCzc=J;|2t$vZQ04=6>u9nlFOus~jTx?Uu<%De*-5o^
z*ltz{`|u-OoM@B9zKXr@o#;JV1*`zTUowa2cpK{6_fyNSZrK9fE9L8YmA%DkSmQ0z
zwItflE%1MyMGW)%Stc#wb%Zas+YY1Wvfa6P(IvDT?;p(^A4a4dy&c`}FV7Fp={)@&
zyZ;^btj{yX8-YOt@bkEop45_f<^}ceY}CjF=lz%UZ!8I*8_5Fl#l{SK|Dk8A0fSwU
zm7sYj=q$WH$QzFMhWY)VVIdV6JwgVnI;W<PSbgHM>3=~|wwox1SD&E9o_$z$R_-OX
zb%4BXfrRGB0Is!ep|`E=cDW!c`y{ZV$^s@h{AlHK4LK-b%2?wL9w4!OrO?Hj@nY+!
z`5pkR$P2;6NTrj@VWB<<V(o6*E^_hZtc;OV09<}d<G4$mblg(;0Ik0M-1=9~BM73e
z8dqIsV%$LCK6sMlXB|a8Agwb%ANtAUG!XqX7jw$3eJ&1_dR~#i68hmqilRo=s1OFo
zF-&rLdHVX_&rbiB6x$>0bv0S0?<D29FD7o6jLj}CCBUaZ(iD8xNx`C^<|R>t(A(q0
z^F3gshj+});QNVBSd&`EZ#hh2iGW7qbIf-%3F-3qAY~3Yd4XD4K^4?`$hv$wmjiCb
zU~chg<!Ux&!UDUqn7&ZEW)8h)RzDk-EWTXK?zYRL)p(PkiN^smo*Ym&c>KeAH@H*7
z-4T+odo|yJ@<wVZ&4XI#Iw78U%aKxWCaxND!DkhH!B;>2jMuPrPZ5KfTPOx<^ALQ3
z>zT_;q;jD8Cho4T=RlNST_mIwmrG@*`%g8YmDrN2u9?(vBzL`CAmCaHdE0;!1ZO7B
zU)b3AsnFiE#wcBj@qnKPO5Z|lt&6f`=w6!tpu~Il;eoMGqqf~QWFSlYdTz9skc9Iu
zMtcd$5%tcJF)ah@1pxp{DuC9f>`tFBFE20m2J8%K<knTbCHW*6dfBJ_Ld#ZFd?!Nq
z>u1U+W^q)5dbdc%N=k&u^-zm1LHQgNh8n@5<A7g16*5({m0xKh&42&LurvGcD)F`e
z{?rC32KhhWg3pxeggYYj*&zMd&pkcpRb>w5v%f|hFo%Z%Uecg)`d&e)S~=WnJI}QG
zjntG~MuqW+TC#Vh@|-H19L)lGHFy#W6&-6Mh;h;Nw37K#66SU|o#m%K_2qQFM2=C%
z;28AZ3h%Co(_{-!lfCjsFGbh8Hh(tWBms-5&<UaABE){^C%&9B&{^ndr>t#)&OIaG
zmLEhfB{DG=5zt_b=BVrENNq-JggBbC#99fFGF6Y6e-yA<2wt1&Nl~dOO5_x2e^oGd
z8Eow#=G?pXdfDF)V+Yb&Rx+;!cexu8_gnvtEDXo=+yzTJ*p60zoE}zqMNT3^*OQw0
z=3DYt!#jtN+ct>)j7-99mH~!}wK<?%CqPl2I3b$V>el0#ymI_?CpA=}FdWztfJuc%
z60hQ(?i3Ui=NNYLa`o{Bcz(YYu@##k_jbpbd(@57OYe@r&lmUxD(2<eLqFmj?+;8|
z#3xp;<mgg6&>;M?vn(*~Ehky#S(||>`9((m{r?QE26`mRr2pvb5ElQ#l>dLxKmRw#
z{{L{U{ugw+PD97xkPFRU@=(yTO$8l^zNe*T6J3tBiS33cEhf;td`U_<8>=y!3wu1s
zh&OMqf80Hni};2`<q3q_qhQ)2*Z%7!pK%uO#?dWPH7+fteBBJj+Un==`it+qQKHBY
zv-qI+)x*|tz<2A`)ARS1?w~4xT5-;EYF@qc%LEdmXKPQc`|3BLYk57tAVGmgK2g>$
zw8K8J8*ld=qJ(|ZI9i<tlXsXC!taXZPyh@I8b3GJ%EjRY%Ee%}vH7og$>w`nZDoRn
zB@g!2+^Q{;!G_CO2`F44N;D$23M6&CgCCCkujjf5CFMD$ymRis5Bmas1$Z;F%X(2v
zVRh<4+ewPpapl{YLBIf}t(;%u+6{@7lvag45Py&WS#Ho&m^94a&gcFyf&|SdF_MK5
zdr#t6ub>>V${qPxz@HZ63Pj)s@7eGPx^k<^YI|0UrV{}`^h2rtC~Fo^%-5vz{btkI
z)5Z7q^P9pDos<7n;e#c!JCVh!>4$PZy+q1YuwjD5^w)PAlSx4S=13W9-saPgGtXV&
z1%0m`w}}s5-k!(8jhOUC#*`Xl9EC?n&SIGh<O?%goV|VM$B^d%9AJ5SvN^=u#fMLG
zcg}7+pMhsf4I{+GjTf8d<*a`q=TnhN!>Xw_k^+x>=k7&SP2sWBT?zgPp*7ZX<q1g~
zSO(QMY8`GwDz79Bm#lMDBX}yd!$}Kwk|#E$ZB^yCAAt&qUyA{~8_+AasC^F2Jo6`g
zNPX_E#KLb>4XF!nlc{+Vo4kk~ae>AMeG@5oX{HFaRtp{RaRqdb5XLFvv0GP#b2N_*
zBZ{D|U;WHb9<I_@`=&R8+a^tfLA6zq{<C=8I;eTvaZ#9BegX%eUAh3DB8*j*dNqT0
zQ^gWYDc-mp`EH5hf|49i<S6l$rbc)3BnhwQ1SB4=+^Z30R3!ufeFy~X7>d*m7i~PF
zE8HQ41*y5PZ)pXR1Vc7|<7s%tR$Rd=!6kv`gDcZtj#Vdw-k?58n(6(e-oT-f7MhJp
zIF)~loHtNwo_h!L{q;_)*C0OXG<7IdTOA4Um7g?^U7G)|<;)Z7V<Y)wLg@i)1yx^8
z4I0{vdz%Fp!M0__t!42he_#>x7He}@<fgAq%}731J5!>6TF+|0m09VcN=OnM6J~=}
zv86uHn${H>0RclyfC{dGDdaWqc%;%W-Nt4+QJY=jCs-dKF&Is64&5p&tz{BKM^!tF
z2q;8P@g^R$xdy~r8KjI7ddW)r4>yBl!jd7^T6YqW#5tNRcUdfM0#Tz5hKw>Lp0FKZ
zRMnMsfXGpu)*66U{1$ndFVR$`E7z@}0%|)~CucN+BlGiNZRX27iCHgqABOH7i~jbx
zdvh;GKvUt;l@ItCRi@osg0?0RJo(GhTJM51uI^j#+M|VUH2g`4_09wL=o{z3pPX=o
zX`k_%PW<O2lmr&$ci7N`!}f+m#wr{X$#ys~>iiH_Y`EAvZ~4a#8sQY6dB~J5CdM2a
zh=>XkhX)`Fv`aOz{zz0h>JJYocK&#7GtvunDx)bc&88qPmsJvOM0%1xri>s;Khkuk
zOtNH5UrqH#si|%iA}{yEz2={5$^gl=eSj}YIK<KKu-Q6QpLmgWK7$y=l-FtbJH5`D
zbfB-;;oCszg%Dciev4kzA5J*kdDG{L=ygK9Rd}y~D+jFDcA&~&#*%xPh8ie;?ATPX
z^P`T!<{;c{p?{c={C!^9DKz;xIbF2!D!#4RomMT<tOfNPL9SCdwYHiI$lv%>qctBN
z98b14t1%-`4P(|$n+k~ygr_d?0kc$Rhe@nkY+LOmI5Nk$iATn*7*akZQXcKB?x&&k
zFSML=S^~W!B;_z0m)hJj4o@j%Sctc+eEQz5a!n!VN$`Z`gp%#WuB$av^0Vi}{RjL%
z{6(C<BX$+wKtRO*?SA-w*Z%*#7Q@1p#qqzrA^$hu@Vf8IXPcv$>HEto|A!E1z@a&r
ze!Do=beU_i>h48r{B=vgL0VrhRcum@OqrbAAp7%cdmw8l3<ydo^``YNzuF&JG6+yZ
zCM-CJkfBSGuYs?>8MT6zaV=>IN6Fx{idr?BzWrO@=4~Ib;6u}G`zOon?Jqyn+g$`L
z|E4iC{=FL1!~}dXwokkwXpdLGW5jPPa^c+IH%br3r`S4gNgq9g;#WLaq9lA?6WLc7
zd5e0rCqKyJyfISLwyRkTaqjuHz@6}$>0nyr$|paFkG>XPG#K$kZ`25Ue`5TrCA0bm
ze@cmGf$0PQSS=}z5Qh}>u|;d9KT~KJ;ncO{m`?F1Rk2-yOtIN3QX<DtD$U<oC!>TL
zEyek8zB}_=N>JwrHKkDDo6}u1QH75`m(eiP{`uTJ;N3*2JfxBt0p`tbhjfC}_b67z
zXhNzEb7+pKoZjM0wZo*5v{VoW-?Rq_3s2#~W*5`CW|3j_G^eK{bb*eAPcN;-P-v9z
zJ)Oj2T`OYdv_(>Q?7fQZh%4MGp4t%J-Qt#FpcRv%QJXR-LU#x_`MYHH5UFH9W^x_`
zD+J@`jE)FVi{E60@lqZF0V*~8H1fOYA$d2q0XR^+j)+T1i5qDtSOfNUPLiXf>yG8B
z_v9iN4aAAe3on_3S1o8B_{+WdiSTG^drNp-@Dp0M@mG*{hnwH5N0QPu1m7Vy_r{@*
zcZ17l{7xZ0LBT^Eix+%%DN-c~HF;$bn19S~5d5zt3Lu28Vo7nZ9lO<Z!3^`j4D5P4
z>QL5Fa)O7+(v<QYmXfaeziA_uuN3|mBpXo-L-<agFLHwl59BkfuH>lT74c0S;WZu+
zV+~q%$E3t`$xy=z&IB^N?bwtP^Dcph7XI~{aDHQ(X?g=-wz40>kJrB3xeb}_)iab`
zXLyqX;p5TG98dz!Q>~614MSgY4SQ9s^%Xt#8PYiY#V(A{7u&PoQ9{+Qug-GVn_Y?>
z1qRsI?sP$x0Co397e{@y#tMk<j~l+G=+V9)8{tHuk>kDoi!{1{<X<NjvDopqlTdLO
zI5y-#d}mU9D+%nkfC`WP4y4B&<-9h<63e|1yFummXxpDsJIft{)<|-?1-l&eb>5LL
zs_>$LLjys5bfhEXqOpYqM`|!Y-eJQiz#BC#y<;S^@6*it=_WG2$Ea3}7ASxCeJ580
zv43jo{^h1M#Z9C5R<+C^lqh{bbgQp;kM{j*n?Wim&3+|DLTT3DxeKKlk8%>}7-l<^
zvC_nQ7eKhT8;U92yd>*VX@v`M2R(y-z(gVS@w9!>_;>ND5nu8L%$g@V)Rs2ycS?UT
z2i-e_u|E#bHzac=Qu934V3g4Zj=X*qMy-awS3AME=U(hudcp-n5x=?VnjL<<3Ph+*
z@oqSB1FXj>J>j}p!}0Ioh6t~Av}Daw-e%7Ur=79<nk;k|tl904?O~?AKdyvTGs<|%
z0Sr+BMdDlBoVhJ){1%a_LEFXGwloeP1+FqrF``FgqwslFC@|g|8g`os#Y*3y5e{%O
zX3FB<)$Q%()<#0Pq9&tHu5U38x^IXVa0J##GrGupW5H!{*lCGKl8I{++gr@{kt>%a
zO!~eZ@I#2Dn-B<Xh;gyzzagk=v%2Xp!2EIg?R!<h@9F2S52<PC6M&Um8Xu1AiZ_Mq
ziHHYnsjh)dyl*L)H`FRyV(Huz+&XV?z{Ya9&FIj)IyuWV1vB`UsV#`|fvH*l1wxvO
zd5_)^{K6R6rnUPWiE!1YkX%n>+(~3i3i6y8sg^ioO`bQ!3a83GlWc`4>y22TrdOJ%
z?vu$c&aidp8otFRT|T0+XE8T+C#|%SDu|CD+^>={8JwX0P?@tUc#0`;9S9{M5!xvk
zG5eoG9fMbh3oz!<8Si+-7o=oFY(Rb;TggeA9`5<sa$Q^qJ}~G+_H3Ft^0}qQo9mez
z$OrM9k;2|K@a!6Rvx~DT=v*agvNofw#rFfcVXP2u9W08lB79MZVS2H?WBbkh`E`Yf
znjIh=6!*~fY@D?`00wDX@+$&DYC4>2LvV-Lv33*bpLa(S{O4jm$-%M+zryQ_>v^OI
z|7(D6k5g^h<4*WSKu=Rg$;kHzq|@)n<nQL@9I?+q*t`Ef*8tSZr#Paw(+lRD!YO8T
z*N9Cwyx=7mnW~s~9ih&;pBwyA{h(?hZ+FFbg!#Dy_ZYCS(b>4V0AuZ>^onuZh=@W7
zC>E6y?QM@rLbqD|>2h4-e~H$Y76{e0b9lMD%1_z4rIW1z#Hr4lG4{9D!Y&C32>x5V
zJbai(CLaIx3pF?94%$%{hLS1PW=lLGws9#1xxN03SA+6orkaSm3kvdY3ku9_whh)r
zu7aN%>exb799{g*1B7Vq87C1&KSzFFH$8YPgOa@Tf<h2GvOYclY8seC6I~+U3hjJ_
zVY^!b{7-=x-ms=4h#wQYyq{<BNaI5|EO1ktffmR!kk_y>Z!Iq86?uAvU`7G(!F5A>
z4*2-_hkKx!B11kOpI>pPAIbUy-sFEc5aI{6xez_QQkPg%5DbMOCR3ZsjY?G0AT>|c
zl1<OXDJ92wDH|zPwi`W!P<bNy`afQNw#MBQFFk>1ZoVoA<Gy_{%+J6U=Kx&CI(p^;
zDhP;Vi;Uy*=Xc%SS)dHBDw?)z8^*lXz7T;r8vJ1Go@_=XMxO9fdf&8k4MKmUac#vc
zg>B?ENvcaYucBoduM1{uGn7dka?IPHVvJ*CXw1Xf=T=pAZQy?AA4-4RC+-z@`=_b?
zvxc2`a={%L<RW5;$^=`p&nX9~V8?%kRDxmCX$i~T3X>*&<E#S1Wrsm`g6Ylk(&CN&
zAXj%E;#=@)#ZzTnwOol5-wl8FJgL;%@K)xB0KjD<uv8nNo*SJ)=na1`fXZ<_I!{-R
zuKa?D`{4Es?cjNiiQ<ND;cLB(s={Euptoe-m-Jh<7C*7o(OQ)t`cfR}o|Dm@9UO#J
zq4;zGT080=R-X?@ND~+#uN!%~Y#ZXC5W>P($=to25Y*ZbLm1-^Zfq0I$;uD@fO6B?
z+y_-tJMat_Sci>by1*=|jYF#L{F!~dIf~3Rp;a7g#rSY)Mcjx5_$m(jZBun=2b_iV
zJ~|K_*YXhIl~v6uOm_-t>%=gqE_>EbWBq;C&~(0PjAgGldIe9`l`oMN2P^jEKf3U?
ziX%qE6Xdj0r*|Cvd))s%3<FS^?RMpejGAC;RI$jkwuS~$m`+X<5tEe%#+lGFfxvXO
zg6`aO(Gi-Z5LRzpxq7uSWX08}S9%SLQn@dm$B^V=;KUM<!tqQ5amnFvrr+@q9~|6+
z0wRoFv;Jk5`YF`{O2nqqS_LO#4=wo61PdKL5aWgUpvay}lUlY**7Z3+q={~Px$@C4
zBZ-rNaoJ0UA$OADl2hlQpItItNm~nFy_KyetEKs{g>a-UOL=d^$T|)0ZGvm^$U>mN
z6y{QyI)iS>N?L_CV~QD~ohMuGbO>?(V?3k)SK{$F7>_X?ox{YzF)hOQ_FYt#G-K`1
zoBfbDz{>E24tc<<x|0&!7TO?CgDpg)1t@^%xkre(qanB`P0DCi0#sL!3!fM*jw(^#
z44Z1-AmqmE40qV1DY&1ND_Ap=q4CF=l<G1yRNmLA<eRNv;u1tE<Nxp%5>uO-o5zXQ
z*`<(OyFba`IoxfH8Hah*1bzDHIYP0x`9#7K;yjDNS;J+IU9nwaI|SC1%#ra%0K>cR
zq~qy_KM<8(1Xfs$g)CfLH7=3Cyoi`U%@fTaYjfb)YBTsg4+BKulV#ZnEd^NWD0FeT
zpCL>!jW}i4m41W0Sm9u~mAFz(QGXzhbaPC+AnSO_Nk6W>LCn3@eanCx{|o7)<dQOj
zCoVa;BRjPaqe9ajBAa{UE;%iP>7|GDMXuJ9SoPiw>YR5ZQX~s60UMQ>KsL#@z!z=B
zem<OI(U8uHZk!F~N`#B+U)s38-|h>k-y$8uRnrNj)G*x)>n>vN>w{5~KwB1L2%xM)
zMzoWp{ZQ2CQ8;z<|DxA=-BCOc<?k>VRzOemM{ur2wHtwYF7KNE;5b|mb;m-$6Yuzl
zV)f9{(!LD*V9t_c9B@A<WWJX1#rU*IvJW?XOW?rePnc0g0!CWA^(^5w)%Y%SS1Q3i
z;?Y#B1UC7N8L?&J7E3jzDF&CA^62jEaM`2=OkrQ#)*u)@di5uMM*z^98ogMBEs}!*
zWm4`63WiM=;=ltbt&#ib0l;oj$igFpa>YWu-9VkK56DKya>Ai!OcATk8eu%XSoHU;
zI?UBUuVQkqpKbd8c%T5DDzJs=8-F|86P}bGIPeCMY7Sie1&Y86FU>%Lu|=<pWh|`N
zvdT+v;wkh|fr9@d#wb6mXM!f1Qrgg!(?H*B4hsu@^4g)1brJx556BsTgg$V`hD&?5
z5Lpr9mTEIv2Zz=A<anYyL{~vPgw?O^WX;Ng<Am)i#Gz>tv}UPN+*Y2-ujqs&fPfc?
zVM2mp-Y+zSbk3H>2Wtbw*|0`*Nz4@cnU7Y+@n5*ZK*n`INHLR(6-4By{+_efU{5U>
z|2>^4wGdh1wxbi9b`YAKFYBenA2*{0tH+vBUXTG1%Jv824jib-O&!{8W?JKxwfvj$
z*52dyqNSuc79a^yjqM4FEsE^OGj;eIxg$u?xv&iBmbBw0pS>CTzU^?W98W~q!=NVa
z9?$|7tQA)yY<HDMMX(Z_X3iRTu^ZtW1zxvwTfL~gfyYi@D!^B)qt_+V)1|UlyqNq5
zA+NY+XLpmEKZmxP=Iv82pw>-vf=YCq)_^-RV-NGY=_RTV%CG_9VDKNxe#mGSA`#ni
z7sIn>@KDvk;);%z4JP;pm_Lu>=y$FXH==~(Dw!7@XE>E)DO|!lIc}`SQ_qL!)OU8&
z)Y9+}Ey7HW9&i)uhS8$YzzuL~Z$*=xHEl{2zic~oYk=hOiTeiM?KNV1Vi<31G-kY1
zVb{`rd@U@mid^D9^ubmCD*T7Vx<})|UnD;-y>kjn_&6&A(OFLZBgO?9tl}q*;3s2L
z^)LqQX3YnZ2BV%Ptw`R%)HmcWu(wlmQ`Rv~N#ydHfN*8}L2F&N(Df0+|G*rZ^0H&Q
zOohuO#$XjkhjN?Q0A{EKD+-!n9y6n#O-$En{<ll+N#_rI6$~2YHK4*$8Qxwc|8=(n
zbWF19%X`f?c_R7aJBFl^KGiiV$_xQb$xbhIeMxk|O`g~ziX_8S*+k9QVEA*AL|FbV
z)`8D@J$XU|Vkta7uA?yv5v5f)V3M~R#qXF!32jc^zJ>ba?op=?#2CnNu8Lyq*V1VX
zSCKN$xu^_)Q=x7oe1i6;E4x3*sBLZ(Vb>{pFxV1BQfqc&(<BB}J~FAvQEzjHV%ot`
z5DBOF#`x@Y#e>w4WM|@NSNVJuR@XC35mehPEDzetwP+o~Lxv*2V8;)Wq@tj>!7byv
z@JJa_lGsKvg?1<NkJ_<-#I)@U{!=$}y;#p8QMQ<hYZ%;*=<>X&34FvP8n`ebeLq|u
z+~OhJV-s$XulTq+OUmM}J|_++p&1Aw8lj@2sG@owtts8d2QJv6`&XQRgGxaQdr6OS
z$FgrNP{M|{oxiRy>hIS(DH~G&e&zZ(Pvvn7uH-&oams1J`n@N$0^?fvS+aR#MxwS0
zx2c@7xEI>ymZJ7VJ`w)?rtKC^IZ+|_e2%BzSom)_WYKaTLn*VUZKszZs8*vz6&@ml
zGuUnUq|&C|tZ?Uq5L|W-R*WrQfkdW5VJO>u(|=IH3)8@Q!l&`;zD%eW|AiD#-Yzq;
zjup0U4@ZCZM|((lPxA|Fm?xQ%DEo2Y6khpH>jiC$T#ztCAnnW5t$z5uM&vo-PY_sC
zbL^gB<m@;0KbQ>dmHMz-trYM$9Uw1I;C{<YYLg%tdx@~obQuF81?ais#78VlWIE_~
zivi#o5^m1t84hbNwW07&$rxsI2JAa5KK9oxaEZu1C99MfsBe`fTJ&ZbR!A<5URFoW
zQDq6@ag=BSwu=aH8#Gwb90&fQ-yQvQ9i21=uA&hp0cQXrPsz{&Um-zd@IkUEM*6VU
zkJ~mBl!!GohE-_!o3#J>;QVEgN^);^+J<Y4Wk6X1setFGwkDQCmAbxO$k|+R6h8#4
zs3IYO`OkM|hgEd}ted^y%6I{3Rj)kmUwh?h$EW{#a}QKHqYMlhXgZzJ(2I0gOySD1
zvgThDA-sr%mjcVW07f%V!l_T7&kZD)M(*<5X#=|V#=N;}_>ujURxN4O6%+OmmUvVu
z7Mj$Qgf)9tKhDnt)ObU8#A6dNm=Bz^X~^IIM!JXh)3)N@Seoxdic)-wV({}NbIz__
zl;B8-d1qCLg!HEut7MFD>nc2n=v54#yn{{#jQidmk>|Qe!tECofkO4~V0#__7*SNk
z6JafUQ{&^J^cDC#P#t}Es&0eT5qrjkZ`p`hS6LUX?VK4{Oh&rt{Ana??^H~}m34cb
z+S?B@P8dw_&8@uS8h*K_?bf673k4mdI;jx%SNvU75hj4EpCH`CA1lIV-V6Z};y_T+
zY~Se2Wa>Zb_X4&!=TBu;&AxxdsY3odua}Cm-c9oU@*}Qu&+vsam4Aax)XtGgsr79J
zN!C|-l<99F<<XKV84RR63#ua_FerFM-$t3B;O6#@=OnM_%$B(u#%woZbH)9DHPuJ9
zG<8zLCfjjn5AMtGg&~Uuw+;GK7klOOUnMU{<#6LWESKb@I^oik0rFb&qr|z4-?|Cs
zdJtwY#dM^pw7_0p9sd8ig?Hxvto}L$;_D)rk7Sy&*xe<!`ql56f!^3z6*0n*+>>y}
zYacd=ERhoI2!9M<E@ME@hhgv%gI6>vapVGR$fYc9vc{waY0RWGX_U-bWzc7;_^p7Z
zjB-UYe~&;y;l%m0xNB)CQ1tcu37lPtdl$2$_<S~{7FSP6QlRQpDKo5YW4pfD>L9!8
z1`WBU(OC?d_;BWx6z7(3n@`BUC%Cn5!jC59{p)MwIENU)RQd8X7N$>O#3pThOO7u!
zqtvp9{KmbC52WXSOG6kS6BTiQ-lk6`zdO>Ydd<A5Z+WIux+EDCS9@K&NZu6AqOvP^
z6jNOmGz)?~lWi5{T{JnV%iCO)D+nU$a1Yf+HkHb=!xiZChI6D^yJ+tqOb)G2B8bOY
zhk=#ZwUSud_zx0ZT<=;}lPN`FBEyc^$Zs`e=}6em`iFPOH#Fc7|BOsZjS*Ye+=?hz
zBV;F+O?T8?NloLv;RPG@hkaO|0_PPP<!xA9Jc_qOqcGuIrgLL`KW`{<n<k1voFvxa
zHNQ03^G4;~+2iHjTGFyp%y@%;n6|$899Q)&`f~3li*}b=T-EuOjN%-HZ`JjZJ{Gg7
zXPo{G7bxEy|1LBCb!S)Sbj#q_xkuoIYKf}Jxly0nz(UgDTS_CedvC~kH>2I}b;c(B
zW3z+0JF)2+YXQZw6$HKfn`%C#z+!s@?Yi)2&}_=qX_QhE8m%f9dq&JcU=xZUQiTLY
zG};_$<Qu6XaCRc`S6=KLBXM;!sVp`I5Y9Keax#z8)1plwPR--Dw5Z@;`7ntJ&5#_A
z;4!y%OW4ml8}v+%42vv;sk{$W*#goNL*ULF)+||ZKqdOak1BaG>W-Yuco4BzSZKvH
zQ58+eWr=H(HFYJoj3&jikDPei#Oq2t9)#jif=1da#7ME+S^}iBzmK5Cg=OF<`8e&!
z6i2lUPQ|tJ#;a*Xf*V;|4G|32v=I=aPIZZ7gq^&!7k|G1EOaIu;r%DJexJ43!FA-}
z*r$5SKG{Ax`1vA)UjK6GIvFp6s-cbz8fhNzb$~3`5hJhw11@(|EY(Ih@GW6~+FNc2
zsW6hok$2&F9t%IAY9b7Q=A#wgv$W&<g^qWz-hN@4(vSPt(Qquwn7|yBg^_SCX^PDS
zaH(T=151;$be^UWe5cV8;`v@8HqM;D@Phd6D%HyJ^iHgRtbbO|-*ql)K)2PCpp9=)
z(EKyrGA!Y*T4Sfi8Tv`zUX@H2+C6v|_|N{}PCZKg=AGrz6K2uh!!!uLAD$AXNJ|Ti
z#C?aymsFwG);W*@5(9`HVF7JbH+{oWc3w74G|^03Tpp$p-IxCh+>aZ{t8$Ta<s3PE
z$%HZ6Q2M|Sp?HFmbfUAqiv-1vnA7y~Sl}w#J_NheUFzm)Wi^(OO5UIbg<TQKQ$$J1
z@*y-m$<QJ1BqCYa_mLUtD2qN8$}LQN7b1TT&t!oq7Cz!3k|nV{+K)WX(zLF&wlT!=
z@lEbkY(mikrfIK4bX21jkbrG*=!opkFg$mbK_}?9BHx)1Mwc*2QreO!fm$rYn&DV{
zA#>^lpNV2ITXy;}7K}oep)`d_*E#e!&;jp$;%ne#RD9Uk+ltbP#H2D26Xz(e1t(B%
zC<lgPn{Gb2*DzfhL}{}>iF2%_lV3}(xRyTStyb$;V;t5Hjc%`2d#~0sTo;WFm_@Nm
z)L)`GjmkY6>lu7N(4gp^kBL8-3i_WD-FR$0kR7FemJ&boxn*i1_xV8<5+pFSMH{bZ
zMH0N(e2>D_OB@~w8X(X@&+2#S>Sl+`aX$!wu#pbAW*_Skr+}RCs~4fX)5H7ccX8*q
zk{5A>JS;>R#hl(0nkgm`Qrz<FY-%z3pH%;86X3c^l+&FXUhQ*J5m{Ucr_sDADo47y
zS;~l?1hQ<r{mcFt+ch!?qa-G_7AsjL^iBn!=P}zBJ!>oGq^zn$(q5jDXD`U2kz_Oi
zx4p<<jcWF_BC)HWe5bjNK1+8g<v>6@zBTQTdJS`O=Z1h}2^0i@Bo&wrv9JUr7GY$y
zQP$sv9+5r*r8@8XGMqEZP!`o*QvJcxKtXky;cFP>PTeUK0?VblA8cdgNRP0-v=2sB
z7gu$z4OBNI=1KwmluEw4CQcUa*->wS(3=G+c{(_=^Js3*&C)S5W3xMB6F+0~DkF2G
z_eca<ANy4DEN;dnHa+hPr+aJ;Z*)dN;EGF=8PAq77nES3OBRr1KH`mhd=xg2E}@+%
z?x}O!KVu`iU$u&%u4K2H$#ew~*<?VJbjFw`%i!9TqJ!nIvFt0*4wla)ib!(jlmTb$
zL|I(6z=gf@oU$lF5JXi_-|AOZacWAuhEEe?OFQ)w*yqZTeTp*v@tqDy;6?-ao(-wX
z;EJb}@7;VXOEg{;U_^`h(Td+nA$}%QQDx5(O%O$18aVydBlgcKM<0Z2&jyufD?A5i
z(R~Lj78@!$@X?PGxWuj>8mVoFg6L6?1Gw;|vB{1q+2U?kZCkLV_NTuOPT+81C!yao
zI_+iZz7J@V;2~Oqp>#&qed6LJ3Q;(uD;Y$_Sq6<6p1<i*^VF{<C$Z-%a)3h?%8F6q
zMrE;lR5kx3<pTdj>ndfwS5W}8519Fzsk?;Y{PBZSrUUCGKp5foG^LA-eaZQ}Jh&c{
zf0P?2HLh>UBODCp;TE;8X6R2IAHO^)fkWX+ue>$@P->XP4vxtH>Grxe7)sS_>!Cx>
zH=~s*Z$4|o8q0?!A(g@JmAUR_;%ya4Asbfv^}8wgMn$uUdHrZ~xL95LS4e(ji4)o}
zn6(d9zbTz=(9x*vtn~85^g5-s{Boev=w#xIv{L2mry_xA5t=?<GJ3A*;fNmKn!Bu3
z3p*R73I3`#?=+!CA}l}?EF)k()UE88AzN?O;%se+!SZ)&TE$uycu2R7mQ4|Yy?#jm
zT4zfr=RN!Wp{=noO_ycumTj)u(uacr+qCtbfOHkTRRAj;OB}tcdx*(h;3ra29xMMH
ze}R*X?Ia-(QP=PO{{vh=qrdwGwqG#({=>e4t4nSZ5M0spaz*)I%lW?P8aOjp*>9dH
z7Hvt}5<|g%zVI?|$l&EwB-s~zl$i<)3<Melpb5pJ1`U_`x*r_J2_Gbo0lr*0W>xbx
z|2Yde4Bh3R{_h}ntM*L^6aAUH#;QwMzkInHj=M5L!3dgbL1xd(=Bf}JI9=S`yOU7R
zOmsgSehUnrF~vG%QG{VdLgb{G7m1iTiJe4m7;}j9Fy>R9d+oCw<7G<!nuguN9RCZv
zoH3&pChbY!n8_!~n-J3PLtnsjpX@a#zOHN!HLRD<c%gx7YjcrBd$XoPDx-sdQ_o0A
z!vrBRC=-Oppq_aK%^)E%<OT_mBY(lO==KSbN7*Mt7WK??Xx0jmL0T&WynN)~x#>bc
z&$dmh`Hd1x7IJ?qsxI6B%xi0$BsYKp8z^u9wQQi40i+qDYBdg~UOi#7rll1vtj}El
zEd*#0K!FrxjcEBB(Q*J48nHG<BcA4UbT{Iu(Fo_MOrZjAN8`yw`2ju8L4jXD)?JxO
z`!8anr@^{c`Omo56Sj-oK#Y)!w#Znl^VrQ-?!>lR<^RQ}@BhM<USq1R)XTo084Vy-
z^Fv7WUyRcMj*_l?C0$`jS7jw#86{m6N<tz*K~SS*0A3f9E4_UKbhIoBL5^8zX$bnN
z2)b;+dQ22f7Ll<RvfVh%Cih~J`}Dc8OZ_6|1?ma<#fLK2SUgMS-FVbJNfP7mY97km
zF)v~ma_h(>=|vq35z}C89;OXrLcymY4&}-N^R5+n(BR)K4We-MhlqndUbmt(%9ELS
zm1i9o7H5`w6d4QJf(vu&Opf#9vf>4r(<!I3O9}@-b!s-XaFZT~U5ZI|a&&Yi+kwqy
z)<IOQx$9~zO@MEt1H2YBKG*PdTn30~{I&)*5#C(AQpeqa0CBE7n~raS6D*$xVk*Tw
zvTC1r)jruri*>57PkMEUKA&*i6r0N(V!S)F!&=nvdM>^8ntZ98Li3E(PK=S<5X~DJ
zM0I0VNrO~yuQ;669x?bRSzq{xF&Jy_BnK1S%|+rP%CGErl-sl9;nAjf=m2}bVc>2V
zB0J}5b`@sqDoH^*izhGH<L-ix5h5(LHsbPv=Mm55ImCStm|i>0N&)Nh;09L0NM2cT
zbrBDEL<?ja3jQogAMwLe;*5QM#fcpv!#I~)F9UKX%C{oai7KhI!8ywnqiPgppYoYU
zT+O0aOR5XXZTJ^^2OIr(3<<1GgZ@%DUS`bD1x(ygsDMixf%~O+1n$<VtKXX%R``le
z`y(9VWwzpCOb#0u7m%R6u3MWQrmZI5FgDsGqoVLQ0Z-^$my_x3l`pU16EaRrS_TVQ
zIITsxo!Tm}U(Q5keaaYbGaH{F*{QMWGOk7Z(hjol=Pzo`5-&hIN5gp$+Y=LDy_iuG
z`brYo0WBQB4M%IOxk-zZ<0{RZGW9BviKDbJ9HKDld9t+Z5CvZwCxS~(4epWYB~|AG
zdO?0Bpr@aV>;*8xz#G@WEgFoT(_8Lh4=_4rl`>!5qs*MsHmC8R>t;3lYm8W}uSyPc
zOOurNjcg_ku^N%82!@Xsf)SCcG#yw@SNKw5f$metMOQM)g_RX-pm#BUEv$mp+q^lt
zHYh@G0pVK>=CmU%3Uh<h0!+1E9}(JMFDhpZS&dwU@ySvH+!!#lYLt|`TQel_?~>cG
zX!R?QmU{^)kEEy=O7Q%;qoxAuXX%_qQ;p=%JsO`rksPLZQES_5`4+>=T(z6OyOdsO
zXrjjDEOKk8ayhd9s^XXX8<h)C{8gz0X_BviUXtA12460%)0{OcpLAWdw>HN0<)mcf
zLT46K4hmRhgEd@+4coE9C@61|y97;adQscb(2(nXL%9GjcQK6lK|@<0zEiu>X8a<!
ztNDr%+^v_%6&i2s1U*>W`HqdruCrQRfL5Yj12W}=d#*l9Lkh+<bGk-P^5`bYb%$u2
z#e>8hM&0`4>PT&oUy&WvefmfheEv9L4Q`?30mkezmT8nt2U;l0N7Oy$A#D!h_pu-n
zSd*+kr-g$RjjVBO4M{7L18vgl+(5-h3QKei##`J_4a`+-`NpSS%b06LX(Fg-YRW~=
zN=;L*h@+&DVz|%KN@E@BAoa4s!--yn)_17Jzag>b=P0N2c|a0AbY<P5?Ig-N;UL-=
zb&qJfvo<4KR4yon@#tr~yY(9WrWkkvz6saQ2AB-^F&)JiYzXh|Y_RUn_<#3D`uh`M
z>HaKqd*%Hp1&}dM34^b$5O8uC0t)ZSj3(^YWqzeAub;5W&7tcS3Tw#CLTo&HO|56I
zOU{+e6~w0KnufcFuc)xPEYb<IJ_E-as%hO-U&khvRp}Y@H(GH&;;IFOWgEB2W?00n
zMt`b8xK9@0O0blW&c>oSc+z-4Er_x$^P1$$netJWGiWDC(k=$&p;LG7n+<U`^K@(D
zVCQ24L%IyZ&k^20kcf*lD7rv~A^9LHUXI!WkUosEX*a^KF__H5#oTD<<z=gUq$<w~
z9tnzSjXTPE>FlNXxGGwgw<a8q2RGtUV~M|Par)=uA$Qj=zSaerVIcEtd7bXRJwDi>
zGdr-*+dbVm!}G#QS<|hluk`~yb%UJ+a*XVvd0cVSr$;Ae`bLRU^sr^sue=uL2OB4Q
zJL~RjLDg(N&$McFn7ef6GBH<gI1=Hr^W=$}xYDCYBd~J7k$uQ7<8J1%fTpSfK#&9A
zB&Hu;t~nayKjmJh06ng(zSs-u^m|=|j`C(Llp4$~b>`Xnd;yPhwzuIGYCoe2{xkai
zhR?43EOHl04f0Y~nYw6PwEw5C*zsjG`Fb5+Ms=(Gq^GghRx}{wibZ0LC87}i{z+#V
zG#>L&w<u67@j<3w+#+P@HS7NDgb6CZw45-;S+oZZ$JHu^<6<?8(39AA+}Hp1)xvZs
zhZt$}rrTw3!p!n0U7=>Ma2%vB1YQ!8y>|Lv3oW&tCj~O}6eP8!OdS<CM&emi2$vLs
zMfszy;cXeA1?(tKO1dj_tFM{7CQVhW@J<9$kafXoFRNOFxxjZjW7$OlszRs+cUXrt
zNhA}01t$Pl29h5@!3x#t&b>qF!8&`N(y=M%%Kk7rgSi{yMb!CBY+O0koaEl|<h&b8
z2R!~zaz2RT)Ha7u*Wj6ahrW!9U+G{F`i!8te_c1o2rQ1XaSjBy8<FQO{Wx+PCw=^`
z1K7xHe<Z96)QfKafeQ9U`6*>f-l6)vf%#<x^0#us);#Srd>42JCTE!jTkK5JoPR`b
z)dX7!XBSO5)Pe-Gl+X|et?@L|WZml4^`(aQwA6B7d7LSmhC@IXSLT&SZ)95vs%ONu
zOCzo2WM;JjuZmbRUCww%iK}P$NAm)+774lxz*0@OGwn#Ug~+$)@b4taR@s}+@_k{i
zI`6>Nl5qN;ed>+#uq~P#{b$fvw>KaL<x^u1+j=n+gW6@q8#qNh>;s8X?l83r$Oj14
zL6xoSJ0-0xa4mP&o2H6>rYo5$%(MG7-+;1MNv??>Zou4q#At1F4ID}E9BSQ5AdLaF
z)FRs&)G)j!OS|LYIzun>VLL+4#hI~k*7APPQ$6(7L0m*HJ%~qgEXPoH;`L%I#AdN)
z{(SsebIa4hu++p0Klr?CzA2Xezeyy_HMH+4O#TuHGdp6=!F{)$_)ifDW)yM1=45D1
z0+U!^=>vS$qDr~zl(-Ii!@201`#4dntR$PE9W{%w7piZTA^P8{X<vrkg=#I<OftWv
zH2qeP!}Yqkx-yP=-^$ftlJ5W*2<yyRoY^Ph)ylAdfeJ5V)&m{PS{E95z3V}{%Q;CM
zho4*9z9@EctPS(eog>v*SX$aO1Mq$AW=^x-6s3yY`6RRK^*=K19s6Re2>!z((ESyE
z?%wg|szskG#+ai)rCm6q<O+d$jZ3p-M^&qmJ^Rd&DKAaLYPeHYJrELb9O`mc7|H)4
z0U<&W{*x@GYh98aJ&Su?#Dy)Q%yAlB&d7%#aWc({8Jjb53JC~Z+Ky7z6ge*g+Wo(5
zL6-rR4C|!V4-<_tF&HL!hK(b-9cFMNF!csupRO=~0Ta6#DX$o4Ljq36cyUcXjPcxX
zeg^^{p<FO?jd&T)Ng`qR&$xkgrjSyXE&fd<gGSI0ba>6rIg7p^?|GnstUMGJPB^Xl
z2|7}6l?xk6+ML#{t7>A9(+9zx3x|ARUBq1atGsAIYrXJddHleID2mT_ycBgBl)JQ^
z>!(ADWA$~JDnt~EbNvRN?F<fQ87-XMntec%cS8QyVm89%{GcW8N$MR_5tX_PcA@6l
zKUG`r9>wi4aA|Jh=)&vQdPq#BxB}36Y=LMGu5l(q=HYiU%V)@Dz7TgeQ!Vkybl)gy
zrKaPC$mY@nwK{7oVAxI#26V`Jd8c;{cL$}(F+D756{<Vy^In5kF2v@)3>-EF+4~NX
zkZP-2a@7bh$f1wD5^5;0`HA78MP8Y@t1j>J^f?Iezohg3)4NhmMs7LBWym8TRB+D;
zdH)f~6utw+lbfc@0Ac&c5^5xHFN0;{H2d<hqe4z*`W;xQG9z(8ui_2s6mEH92|uy=
zp)BIC8-bU1^LjZM^=q?fRVMYbsJCV77LQtUu~4$)EJ<%wytT3=zjoZ~T*O7m>mZ_n
z2}9XzG<j<pc^kC@m}KFy(dQ{f7LP%TBHk6fB-}Qwc{Zs{B=%8Q?YM10QxtcBL962d
z-o_;_chs+lq&pW$m8JV^`AySwxvX3TP^<vZ&PUNDx(mZ{7V{5R*b#iCS24&S#CHX2
zgh=FH<(beEJ`-rfx|lANgyn<q5>BID1j>9T;tmz4>0iX%ZZs0Qs~HBs3TuG+lGF22
z3!h*+&<LdFHvN}eU(@hCDi~Hsn9AeTm|M7M{u-r8Hcesq9ih*fCS^<A9c&lkNfLIu
z{PdD_dZg41NIw8;Syeg5<p=K#!?gPdsw~UH(;TDQQ)kAR(}E+9iU~4jnU;;a#2RV1
zH<ce*b=wYH1oRyu)@|cbC>0x%AAofev5ZdU_Lrvsy>1rC%&j3_O?{>>ZtGaWQJWvF
ziPnU1CCY}E<ad%1J1~tV#V&N5&$eC7T$FQ<SuzOb@f0d_WO*l+m!n_vEb5J(6~*S7
zyIr%{;%haou&wkJTIW5XPz-Bcx&dJg`kArMt?M9iBFql{<2f(F3W0xYDKB*X^^!SG
z&N?{h@bugw4;_M+oK1?*=il$2?r-Mdad=K;ly*e*dsNN>qWV-UKQ3Jvb6KlQEUuP$
z8fI)Of{wE(?eY{WFrD&iuDw@AcP0Eoge+>W>-IHm#|J$`J3<dLFE;I1{>0UzofDoV
z=LtIH&P#>3VFJyL-VuJvR%tvba3{@IS=IYmz|a~gxAk#yRco!_X{lUrweP+qCJ?wb
zj<m#l%O%Z^?&tv8h6_RH+bsel-)<oYZL>uH<Xb=5(9i+YZVaX8dod!}*kaP&YkM>;
z{r&9CnO51YK>sK1v8J|67)AU7_p2oRjQ7Z^>Tqh|ZNM_PoVuH?Q#}1)^Q5|_u2VcI
zWAY}4ZCQ@%j1{g@zO1hs^+5Of{H|nCp#8FK9r7sL5vnTAmYOTU;-%gMJ9EKmqgo;}
z2mZ{3dqVBQv}NR#9xuM@4(6bKHB?$d9=Ia{Pe)X3Vp%^0o_?y@=CW=KJl$9gH}&%W
z!8vk%&b$LZ-iHextfwBnf4)+$jJk1;&viD*@*5@%*;D{2-nv@=DN48kh<%@_+0I#Y
z31-(Nm|d5^TbDcrMjipNZI~=d;v7<honwCKp;X2kVQs2-(+Cw>DA9Jf7*<kV9?Zh&
zp->(N>aIt|i=jf)iSdHIRQD;YTtRgQ8oRC1Xtk948pjZKL5HA)w+JpU4$~}3|Mrzm
z9GWMJptZU`Ay>*#E4<_7qy-NzisYRi6RL=0%8M2Xr9>fOlT<^&&ytb8*kGNDFjczQ
zjF2gqBpCG0>b1U#%P-Ngw(>3SAx-|?+j(dh4Ljo-eV@L;#8;K<)-vR^BAu41RtMU;
zz*q*52UWfx&=&wq9x&EYq@JH^_|{^%nTsbWMji1aR0uoIjsr|;-&0e~+o~_~cwLL*
zq8P=eOYN@avARuKyO?>bZjjb)VIK2YQixko;Z8CD<u2)pHU9b5(ZSKl`TpVd&W~uh
z(4nx8@Tvi|NaVbMi^AHNUv}JFc_u~TrGBfkQCK(zT_x8lF7+Fn9e{xi*zy3jY``@S
z;F@)O_Nmh@Z!}<>XEN$Le*e^2y|KK!&Z^D${d24Ee;5{#f@C~K2`t6(CP`&Zb2iPQ
zu4E4qD!73s=2=r{X`4|pP@FM}RQOgt3W@jBWd^{Gmy-mqJ5q-$8+jxQiI?;1K#rV%
zuJsrb$7ol$E4~&!V7XQxm|uECNotpbl4=<d%YlKVy+*i~sh;l%;!!?LkcedMjb{5q
zSRVZx$t<~EP4-%VG;7AU5elm<&ndQg#GsK>ur_pruglrdKX(p|!+6vzZPS@*rfu%W
z?6oaeo+yGgKQ<%|?P>vuRF8{KXyLQ0zx2)0$~UKho_4t_U~|UQsHRgH<coMk1<AsX
z<D?T0k7H2ANIBWT&@+E7%9Y{{zFw~&K`0jRJvwC|be0*ta(r~~)85fxf$+jLQLwvc
zmcIDYTH3NYM}LD32q=RL!x|r*^0tU3PFDI*m2D~||D}ukimc&S<k(Hp%>k}0M|~r+
zbxx<)X`XJAq|rE#Q3DOvC-m?^0n;+K{XEj=i`lj63JatQryXKaj!3_?etWuZW>Fgo
z;_3?l>IZb9b-_wZM%u0Zpqo?p$MQxoI>yQG^6)@|t?4{pS=TQxf53f+&C}-E$Yrnd
zC(Y<mILU5g*QHR|na=ag{WIJ(amu>wlZ_wHhhpczoxXK+{F5vF50`~b;jwWFo%h|z
z(Yw9x?CP5HWiCLR@xC{A_Vy2zED~YJcJ~hs*vnjZ3D*5#uy+o(XJv1eWH-y-JbHJy
zy>apr<aQ_o)hgk|!L^ifBs3wOp6wqWQy{)v71VUMS&i8|08EfsYBoX$R&GdX{#lLS
zRWO_3l(#Kg-Y%Q(w7VCjX6%}b=E9lZ&FG!n$^x#RY)RVOsdSy5z3E77QQoO4+oxv_
zTb1C>Rlxzrb>GwdpYPn+V$Css(Zp##>~EiacgLdD>SxX#KxwYF$t?-!v;VO9_E#-4
zkn=EM4&~g)bl8lZ77|@1Bde-U%d9;*F3Z}YCs}cR^dx)9tEXA3Ry|2AT-WpM1Kcp{
zMyfS(wdtq4gfJR|IE4R&iE0KO9}?AxO<%h5z$ik9Yr8ZzQ~t^AL9z|!JhqW=Q7R~5
z1wba2;1bH#eC%A4FdnG-Sb1HrMJU_#L_mmqM)Qn8>>Rr;tw-O5LdEBarhxb~e}z0Q
zFp}yYbxp4+BwOC8$XR0p<wX?tFC1$v1E<*@_l{uxewo$CvgfG!DysZs?CX`IFKiFy
z@15vHGu-&CGycVJCLH9FYc`j7JPp2V5LbW*SjxHUd8w1nk(caxuFN9Azu>t$qFXn`
zeOtWw`y~e#db+PQ3t4%-LbvDdmt1`7!L~LFn=!;R+a<s&amqtS>g#M=iK;n>lC4#^
zDM%DoI;*ZnNM)?%7%j^|ef5P`mh+1dSsvxmoE2cbNL8AVzhoTG$mk!T263(ZRjd;J
zT6(RMu@Jdth6Lk2u|)A@7T4Ju&?xHWcoUmPPinOqnz$D&c_FTqtiO+uP9N*&@|ugj
zx?#{Z*YQPz!+ncV?QoA(0SgOnqJ?4lsl1USGk9)At!Pej#EW63AANp-=?@zx=w{zw
z3-3msN6FQQO_I+M-b*UBh!-4o0Kaj;6{6v5>|-A%+2pj7#^Z?!r~9|B7B-j59H~8=
z>}~2w9^?L~Q`}*>R=;k_4N_{KB#pY-ZeTx+qLKF89!!Ow1!CJfKyHtjR4+^)MVYEJ
z1x(h&Z@%RyB@$`V^k4%FX`cySt}e2paWvXHU|a=@Gd$!qWL?fFY&veR<I_BGI>xt@
zDlQY?79P^hNp0mqL>h;Hm>YsMsaO<Nynagz7ZNqzSok5@wafze{|42EYsr~8(`jf4
zs~Ih+P{P{$CGhicDXm)sr8r(OD0m<G60t*_X_zYZ3pHAaEn6fKUcJDxv6phc&Ap-c
zLmE$_&6`P7n~t)$KZ2@qmjrkvw-e12WF|}ny)1aXUQ8dz^v5!t?_8$9>Al**<Lk%Q
z3k`PBU<3a>Sp=MqT5-Xx<hkpd>2Dg^-XB{8xu|x?X=IJs7ZHGuutM+!`V&6LfZ+lt
zO|Ec%bI@Qhhl`Oj3^wnk4c6_$|B$~2op$4BIPd0WgUL?CpbWeV@fW?n(aY5|e|)an
zLzIAYU0y+{kt#-=@c9+NGp-_JWsq_#95H^g1Wws_L@$f}Tb{*3zXPZczduBV!NGMj
z49NihfTSExbs#}xl^qEQIbW=saV(I$Y)p5N43d=Y6H10S6VzG_7^d**MP0b`^Esc>
z;gt%SAe#J&$4xNq<1tvNpM{svhtWda!DTD09-}{#G#q7vaDsphWStuqc$dLHY9)b*
zjV@jhEmV`DMg0q14WvjTU8xPMtK+znO;SQl2Pv^za{NX}YqKVgyTxiW*b8Tl_n4sx
z|1Hxu{Q2n0oVTTb;ftKBdoeUcR2pPh7sigL_&6D}TSaOsKk<c@i0UDXDb7^*<CQ3#
zp7bRcLIRg?Nc{0ic-i2CxmMFBRGdU<ywb>hf`ju3j?O3Dwyqb^K*f>MTv==OKxlVU
zzK;Bc9{ThU1oU8Jl=+PDU9YvCJzD`-LR;7%%mt~LY#zRoB-5xR07z0vFC!>LE+~|y
zX0i!<M3!#chheBbF9q*VqT@0*K4@tlk)jac7;V53h(;|+iIl?5^m*_Z=&^nq-^2Rj
z3K<~^I~Od$qr!^kQL3tnLxtDYWsCUjCzQTOk17S{hu0ip^@VtgqJXC?qJ(%P((4>t
zsgdRo!|FMQ7-gD!h+&Dp%P14|o@12tLhQjcUov&%-A5u#c}zb*D#xW#){Q4x0*Y?L
zWgz{0#i=eH3lUyL8Bj=_X(>G7O+NUo#5)ar$A+?vwTq_TE^2sPvuTCgB#Vq>KGoau
zVQqzEj9Cw<47h=<{bZpoxM8gZVx?2<M3Q`0YrlF$1~V$zpNwVM%kRH>;V!+PNNRV7
zH8D7{n(d_lQWgf^7)33sixA&meXdph59#w6L-6ae#F~R8{_68Ty3fmp;GH;vRSNas
z(>9$7;Zs8)eEOF{_`h2rwAH^N+x?{i7G+29Y#ym3pe?cFGMAC%m(bLU!r<;2gIfTK
zYFX6$&+Z`y&5=4p`TLOEo{{Hcg}FM&)dsOgKwAS}Z5E+<;{{F_#rYzi6ojOZ_Kh`{
z%z9|){rgzV{%oTA>sr;^!%Eo3%yDI@Hr7z`4F!p+UxKP23Oyr5;%b-RG6zRx-p4P~
z9GynlBuQnTRodCu7fwy?y$w?qmVS)wzJ|5GHxD8TykqTbEGkzvVjb;x*!rEU_`)eu
zc~U4_XD#=USpWSD{z80A(y7Dx-ze+_%$6qX%PZF=Lcwu@D5(1_S)7^EU24SQSxi5-
zh046Sl`z@o52L$q<aZ#&qLiX#S*J}g;=($A<_t>SNaDcbBpycR6E;e&)<rZLklezv
z^t+Akcg}x4*xy7z++>O|L?rGDLH+15+c={O7{*~bk)i0dJ$tA!I-r6EbS1qsvUrGB
z#rLC8l;U0YA?yDdkH^5UT0RoawS{rE(*JdVC8@}}5b-zpCKNIGWH^2wkmt;ozkj$6
zdVg;)_<qrb?^V2QxDQn0n_SsT)&zhC{C&~ZqUh+K7Y)9c%G)@MCKpNfCHwh&duR7x
z<7{W!leI}%@vuqehfx0j6lw2)Y!N_o4TFMXe2Moa8})K$gr+yw{(ehadq<~`p&MbV
zn`^B0ZWLb|8+gJ;#lFLS>*($A$<FDi!Q7`H2gX~X_?qNvC<Mc(VZUQP@}9dOPE_^l
zUE#Q>K{qv6(4+%7qF|VDqj0G9I`p_7NSfLc;7WZHPaFibVy+#V70q{A9vz=9Z*-G(
zw7j;`RMN*jA6%A+?Hr%(+PRA|2|j1>WB`PIoB^cWEd)Suag+2VuQW)T75dj;wXHe}
zzWL^x<yN!#lx<z4F%11N5Ogn^{u<(D@T)%j`WFAJBx(PRuY_I1KBEHA&)YEU5Y7#C
z5RUp&kV6O2Wi)t6nvN50JLybuZy2zJFWD9zM*hcUJn?}a14>}w0L8QoAi8ye6ck<o
z=WjRu=ji18`<;{1{i8$ma{sXS@_6HH>pS(*gL|AN-DxKR#i)}r);&1u@#CX3hSn27
zJw&$%^)~9pK&frvsKw{8CacxqpNlGt`G)7g#^Ltq*2eJ;I*Tkohjn2(97hZ6C0jU7
zQji$&<j(lWn^yo{#?jRn5aN;dmkxX`P-jf<yO-RmUh>+<@)1h$S3tqvOs-!tx%S}8
z4=2m+jJhE1u<J5c|J=Pzful`Mz-Ez_cQ3VBwNyvE^@ru0s(kaXTvNg`Lc4*b6gQ&2
zgq3g~R=`^fRzBlF2s+OeYu~Uvbe9y)HIoFDk5ND3j&f)ig;)JFypgW2d+?j|REcg+
zB<y0)*v>_gWROG}br0T*LeK?vw*<^t9t8X)tMMOocFk_A45vT-C~{DAqx^oGmpSmU
zfH=Upgml}NVln@NtPyD4%h?6Y+FdpPD9GGmH!XG@u$zD#2&mIxl7NoyfJ<Af-(qc<
zAq`kRVC{gN9ykhswgBCbEZ1x7X3Z$-%vqG3BVA+tHP&96Rr;CIb&A3u>c^ww6neYw
z8vm=5p&NH5?D<nh->4PmZ`+vPm9vSSSV$WX$xJ<bO5D(^ll12JbPd~yriaHF74!J9
zbm!vc2K<qvz=heg-Hk6})c%~<(z6TD&ghb;$9;(km;L0*H9}V|4Fzaz0@_Ui7c#!|
zzYDsy3mq-~XJe}@8V-+O&R#n|{cdA>|8S4yM<OB3jkrwoYag;WIwDkf8Mt1yl=Lud
zVVm3R3v0u&i<)_>emd#0#Q+$(8zcyKySrtZ+fK+mglw)fU$oe8iZ=#yF5vNb^P8vi
zjC#0ux7K{|T)i7bee@)y-%t*UD1RA0h}t02av32&-7VeS0`ML*4+Ro0ef9J^{sY?%
zzexmAGN7ezZ{epu0JiRQECe4fpUiRI99Uhb#4y2t&ge#YRRX-Zr2|80%Pkn&moQAz
ziU>|D1W4P;xwj7V+)X5os6bT&p8C&^$kmRyv78m#gLtau_BUo8ES{G5P`KIn7}*FI
zejHA4_%zwtbNm~o9o8AZG)?b&c&VJXCI>nSQ7{f7EPs+FpQDmS96(mphOMgE&io~c
zFL&KFjmJIBf^q;^G;_=V*Me*f2uXO7F`8~bP0H&u=e#TsIcMipmHfrkZ2q+hXq1py
z?duPz{&1r|T;~sEm|Hq#{UOyKZuE!iRwc}9I%fSL)gNy3hwHTpn8~`zUcCa@%N2<;
zJX!pdt#09jaymu@_WkO1bQyOdP;x(()Df5Sr^ytRjrTC5t)6SzJ=?T<{v&(iv`_Fa
z(XrCH>EKA0qR9Di7<apaNGRxc<h-+?ljqQ~Il*X|b1Ilc100OXA&km3whUkiH1&o0
z7342*CdU8QP~buPvEdYhA`O<()>67wUtMz`FH}>nqh3K?yVO-b{*_ndA9?+P()!^}
zZml0I^;=8*s`XQqQ#GS%^_k1|TBzD{_3ImV&8S}7MJHHlx0c#f>!q(a{MFfFXD*S6
zSJULIi8p@2a6!#=S-#9zEd*^R?!qs@wREdeR;Qg+(1+;eCb`r(8zo{~jMJnOb*C^e
zK>tPeoCc$awc`Xv1+EY1+EohShy~+%HN(Mu4?&Er5xHT3tks|+OdsrXbOS5U?_<1A
z{yJtiF-v3Ck3p%e`vo`=sYHH1<(m>LcqV>er#4rfq0%ZC?ivORbnSJpbPfI5@^efD
zTsIuoO|W!xZ(J$Ig+uk;xcVFy4y$|PYI9sT6v}ZugT5W#$gkEjM2dsU<a6NQi#X$q
z+YsXi(0{*Hhd)8#Z;O6<ID(h^ji~xs)8FSU-si1ZeO>|A4aarUn$_nOaHSlVkj?kQ
z)#tc`9K9c|HpeAoU*$eud&YQ|WABS!f&68%fwSXVrN1k%f@0?qRtQ>h__wMJjS^Pi
zxN!L28&}G4(M)|`Tz!s<X4U)RYI9sP6VAa3Pn#vIkiVOgDS}qvP2qJ*@Jb1rXj9|N
zpT(Ja59Z}?+GVyjIn8h?O{2~<%`gI!Zgk>TG~zVdjeFusL_x=PG`ZrouXH4jNM@{?
zM0^Jvv~;?+<s!;0SJ~YsX4Nk59IGHorrDNYmlxt2n##g<#xy%&e<B#@w=`HzTfe<Y
z(aFolJYS^FKps+Fpg@%O53Ah1tK5FD+=p`eW#v{ZnF;&RbF198tK4?5+=g=7<>gi`
z8384|VJfaj@HHU##iYCfb5ubme$c8){k56YpSv2eCxW1ASFBa&iaS&T!T(XUTk7k)
zV_H_nIAqg3DufxH&(}$<>Ya4QDq$9>TvqI~);yhd=W1alSXAGNVsY^#WN$X@_2Le0
z!w+z$YZwp0k~OdWiF@SoTe%+d!OsI-9kwcDHMlBJvtcAeiG9`B<Z@y9!dAs(c6AYv
z*PEj-06IP69F$M_zMAF0hKAq+FKgyps5l}YA)-;4w}F2<Qteoh6PD8&tgL&u&B6x=
zng(336?QR2jl9K4m!6j}+XSUGMktA<=y2oT+IRZhpu>#v5@p{sK{uTUe^I*zcXSfL
zZqRC6XxA`IKRanE99#<txbuep%McZ_X+UvA@fzs86O0?IUF9e;*jIgE+!%D+)swlS
z?rS}UdVjDNO?J`$^RlKc2-!N=**H1>e&gWXPJ`S+t>6ZlpPaz3Kbl1SC?y<py@-k9
z3C$e2S9ZzWAqe<U4{cU*eF%pQELisqA{@45!P?hn-MSd8&-lMBw?CKMZQ-s%V$X#?
zh%FcIgBzi_L*wRSLBWP3PeZo7D$iqHpQq0}PF(Y%@QuKG*IOIJl{}+q8-xe*Leg<Q
z7cSE3=H1h97;!*R+#t+wQ$7^q!ghu|fMgD@4;w!_HT)epqctZHh;+L(x|_FEVPm+d
zmx1dg4WQ*<#qu#%R~u1Fw!`eAHsb;<aohmVD#DI%<4{CXiW>}aB%}Aw$W2>!gKpkZ
zaDQhC(Ixlsey&}6q~Ze`jgoJlJW-LojdcD}cxY+&P+L@VUpH02!?Zi6BrnOVAder3
z(gfq6;UpQvTp%bt6-l)8+B%r<5sxE~*CFl#yWN(hcQ{PrXmkjki*vu|jfO9>Njx6o
z)`O^!^2P?{!IlNj*4YSSH8$aUc{!gakklgz{>@L~D4L=dd5}wX`TotD{4m<BsvA1>
zOeYalB^j+k5A%3zpq~6PMY9U4@zVt6kpU$dvT@XjLA@srTh#iKD}JasoPglXCb&q6
z1`*$*h(}sE3PqTv;SC-=0E!P`$&pOcEE-%!89G#<{cAeL&6=bqD~Q}5W%c~zn|5%~
zIso#_idxHWF&RM$bOdnUBTmKo7vk;sBgTsy;h$Syjy%K236BT9vAcq2^<wx%BKa8E
zM<+NDK=>!pIURHjh<e<fpVE#JZLR7=6G8K8h-Q$C`Vo+NoMc(t243O_<Lo7SpNyVj
zKKL_Q!yoWx)KXaBMGIa8_yhion)svnv0l#h#)&y3e(YgUS8keY7u1zji%7@ONBtQ(
zVx&cUMuOIzsF)q%$pz#YqxdBR%YdQ@REv|RE<vew+5Nh4r=a7~OL6VJkV-yP^Jr`9
z;2rwSpKoDw@cfE<9<$v({KaED<`L+P7?0#HzyIUgjbrJ1>ue|w2<QxP+i(Z4oqYz*
zjv($07^z3gm$g(^e&+c_X!b{Tfc^6yPWI2vb`Eu&+NW(e;y>rCS9+kZSQ`}_xY}_*
zFM=wxbR!Ta;))6L98;`0PAD$cYft<w2GvLlpYQ1=UoV+M*vSiLJ3pS4aqG;kG$cap
zG0Yu8=j*c7#~E{}^I9t=FoDw{C@1I7Gaw2`(b1CM#O6#w-*LGTwFb5Z84jSMhQ*uh
zB<aq#UKTkT2ywc#^&vlY>%1-~M{(f8aZnw{i4Vs~WgMFx6r0tXvgxbFX7y^Ec~G2H
zuf~~=qG#19dgg1&*&Gy=^)RFJ+8Dj~$_6f7FY|CCS1r_z-AnMfMkj8}E{^ltNJ?iT
zysSo>iL@m~?t%SCMt0}u%*n?FHeekS4sY!bq_?;bSelQu3LNWqvq%ESCEx-qQ@a4A
z`cti~@g@#!fsNVfRy&-FT-S`LcbD_u>4CcwJ@+g$T(3Pdr3I-L^se`FplG>y$ur-3
zxX!`r6)`AtgzJ6lW4T4}p8Ai~o4-%j%^Je>3KB?OQ>YEzKY-V5)<3I4zm~iCt;+Ok
zd04+yo%LHD)(<MPe&A;PpgQXZ9@f`}<$XD+^6+zDs7lH|W~B0ezYo9tDF*z%-fe83
z7(<?D<GNzw3^y@lOm}n+YGXk68}`dI?2-Wn4KZY`Stu$8)=eH(Av-50M<@C%9=HNZ
zdilA}GSpS=<-18TF(QfhgMy&NiCagf2g#_<I%%gN3?G{1_5~Vl_2>=;TWP^g?2cT(
zvpZuRPN|UA8AM?^Nqk#!a*y&X4dX$S`anvO%eHHecGYHH33V!m*Z|0%&yW6zx*p}&
zj(WJqS+l2(A}9Pjh}+0Cv?Us)X_DI3D?<*fE&?$0?huX8WaNuReX;@4lL*}*4645(
zZXTpVbF4tiT#Gzqw%+b8?H=rDY5FcD4;2C{O6XqPet5!a!K+u#v?d|0CA@zSk!|m9
zo$c$PRc^I9QwS06m<Q|A2H7o>=_IeEs5m;<_lSKpL?Qr*vtmmlr3ae{2hnJ`Hd=aG
zx220ae2J)MF&IjrHZVkhfbe&%RcjtNN+;v2>wVfe&|_ywD=At>`9*3=OCz1Qwk01+
zMk{`=rw7%-w`jwEv0flN-@oxxq)?BiydE!R)&tQN>w#}Q_0S{8yzm8(G1n}+X%rQr
z)u<Gk7Yu;>HB(nC8u4i=2~qNX_+D&T^6UJV+QEGKah?!O2!S^Y7(1gk`U_NHuJjkE
zS6%2Y*5uw<e{cfLh|;%77q8qt-`&~SMsEYB!^&T74S%^c{0ZC|Fcw^cT`yf}-%A%f
zM%<G7I+m~4rp_Q9yW3Qyo+LbU3Bo0SON8u<x=Mf)!@7ZhT9^Ax8Pj*C)NYcLd_HxH
zr;6<=j_+&S;&u?8ML&M^3*0P83`II3;*m;<*6;VNXU}u#8W+SD&fOGY<;fG&fZ)MS
zsl!|cNTei^8^j*qWxDQ^?`6jNUS_e#_wh%RaerU=yFQ5m-Vt7Gh!AT2lUW+(eT51O
z`}>FH-?aqig@d<B62~G6B$VYX%I%F{<XFIC6q7;JHDjjr#+(C<x!V{;3m-mU><Q9H
zzkK*G9mV3|_De9H*bbKfO%9A-#&HKYIJ&Jh8_jwVC?0hN({9vH!|_Gj$-X?!9GGBE
zRCpdgw$mSHg|Z%Z8;`qnS)|bnPK9dWyFPs2K8)?;`pY-X+b<NU#6&l*f7OhLkuWg6
z=63V!U1ELL&CL@?7P*7<<#G4+OA~qwd1DZDD29kFe7*Z$%A>$r&UiYhJ?=Li_v^rM
z!|*fq1of)BjQI=-ci&mdH*tJbe?R#6W&RB^FSfKYw$0hd+SQR&XlT27OE)XDv|YWa
zXS1<Qsw1n=)JgTGo>ge-#NSkVSI)8ZX1YcQ&c!oy^;re$Qtfdcq?%(Nnq!(dJ`tFd
z;P;>(e*8j1wShQMj^EB0q_b?R9z*IZ>7pEd?n9&7g;|Zi)x(f`EreC=dm#4<hP^Vv
z8#7`d1Y)(>?UqkxYDRkK>w&j-zq(p!Dd*d}(yEZ87-prKm9(-QQ0U^mURm9Z2WU-t
zzlwoUqU{L7`+oeO1*erZ3d6nC@7oLQIi)y5r9RR;Y<SY^Wx^v;Eh;>Y(3ZF48k&S+
zZOP9Y|MSkt5oH2hwXVhs6;tr;TWR*#0`9HL@gOg35c$!MGFpC$1_Sx#4ZL|?C#xI{
zg~w=&!vL@3`IsBz+yzo`vT|CP<+=KWTqH}Kz$bh55)8p+br*2JVE)eft3xVuNZP+k
zhhSLEAJBC|T?H_>(oPp>l!f=E>v@r)SLB!>i7H7txYDQz57h|iEJPMDxXOzt0q+~&
zp4nxJWWb1}ys_dQjYXUcDS{2_U<?u0MG4jk1}^8sj>OVyhgoOy%x#@n-Q^aXGgp`_
zT)_1h{5x~)=RhiX?wx&dC+>JQIjK>$w;i_t8CpUa(a7mjyJlWo*znL)`^7^Pe*FPb
zj>yv)dWgF}1ek4)VeDTe$L~z{QT>&?tA!H`np#4t?OlpEk?oJ-iR<7?(*6YN!t7ke
zrTB-qS$k*u{Ku1>-SeHpvy=UuQy3U*NgP!WIia8WdA_EegnjBxiHGj@le7=Y$k?up
z0YkwkQg_<Wk?5re6?H^K5n1?>yxXJqcs+e$oN%H?>=yG<?lf6`GoGY_IGgBu9rT|3
zL=(E25}x{5{yQG#zwy3`>>_{0-@GL8LQo}#K)gUB9i8!*UC^U}gqLD~^)ur!CqBJf
z4sw-~ZBFAsmjPKgaYP5vUSXJ_Gcs9h=$WU<>mr!Xz$oZ{0CX!brL-qHOes2z%?^XV
z${30Mc!p>5;nCSo$2)m0n)BruF7aBN&N5FgHASMts*Wwm1TkMhlJp)7@?uoPl*w=m
zBbBOURPsy!{19e`$>bDo_JEmia-qDRGzCQYM*+iiQN0}^(>a+^K@n*LZ_-<&H(g^8
z)t)t*4Mu-Z@FqQT0I1mhmfoYV9JbXtKfOAJS~Pasx)ctIxE;ChXy#aH0n%+@jx!UM
zb8K;ZKfxia7V_}0l8;-PHbDcg4>9PX>R&gJ$f0aXHtmu$g?ppht!c$J*pqSH16Axm
zfHvx1V%PYiD3OahTmJu1)Ii^0MGe#frCdOVU~%{X^+7dy`FsBRx8JlWS(geNNIRye
z2?m}f9t;fj8QHOAG-)V#WVm-!>%#}?#j4#ie+MZ?1Y_U0YI(Ukg?Y48^}@Oipk%b_
z2_so~dD|}D=ILL%fAsxm^GI+3GH^h)oRHdHw1<VsPyb<f_z&j5R^vZ||Ng!BM|xSC
zlLDGRr0%hsCc}I?>j_s?#<*C5%<p#UMqMf>EIDx>p})~&Wt=8s_Jp0CZyg<;o^k&Y
zab8zT+&DP?ZsR<t8$4^XEM-9wMAs(Q+HZ|Rs<}Ft4;iC;c+ZjW+B~rY|I9|~!v(bE
zv!m@JwsjG~8if2<@z6EmVc}qW5gGxO=Hx#Y_x=Y>4q7L?&b#NXn=jfbK=gXKjsFzX
z|D&nuZAsUXg`uV7yO%6{%U7&gW-KR_j;}OqZGBmH<?!z)7qx5+SA#V*hqHXEIX|*1
z1&4QmQ6@w9wvZu1L{TN;z?KCEJEx~05Cp#)Yv_XQA-@sbTG_hn8~PQJ(m+_LUf*w=
z@VY&GrA%03$?vy~I5Sl*MYlXS3@9$(3dntAMdJB8+w5nvR{lzT#R`2b?z0>42R8I~
zW9J8L<$uNyk(RZ$VLXxt1aJeqiouL-$;FJPl&@$zYp_pTEs6#e<|NyawkS<$#p$hR
zhf<TeYo4fPJIYZQ#v^!*4(~?YN^M7)ei7$K^EnxGwWlzzvSk&1M`()?UL4+3`*)pW
zG>J#kNFlxdtm}32Dl=^%JwI`JenLk>(ZxWuPr3?v=h}TLXmR=`i{_;v_E?lHd!Ey`
zS|z<+Uz$!>#nAQp)1|Oy<lAB{JsW5cnYRBdPnd?jkuX1z?@43Bd{(8|`9|)zczVAY
z3f-4t_PNS3WEGCvcQwzhKLHQv9ck}5!@r@}Wb_;d@OJt9ae?MJI_hAjnO##FwZd!s
zs)9CP|6?HjvvKWTTy{4k55i?tax^UldN8w^V@a&#^w}PSokYTd!g!bnGZNi|MDd`+
zmAl+9MJ|2aG`wO-+Ql7M^K9uH>+eA4$oXbHzd5e*5O}CTFkjc~ZXBHMII^29H#yqj
zXNBX)>Fc3=7V>fSFmM;FS2kwpqj!uPaQ3@dLCzF>;J{HHQlN;V<-pM@j(Tm}>xY`R
zi2wO`c*TOMV?wJMxiE})AW-~^Cp)`%^E91wVW;SWO$J;%lgta^1>~b@E)$Z=xPYH3
zvdQg)RPtF^-8+2@3rOen>!lxM3HWN7?_Xj-^wD2p;7($o+K~B|F`4V4<NFZUfI_m)
zGn>vUIhNRu!Xavjos!{5!yr;j>4HY2y9$?rL9Z&A?j>2~%y^dWNngl2%A|&60sKow
z`5XV2jQUTIQT$$elsF@y{=XFBgdLeegdn4?)*@-Zt!Z(&@3TQuwOOmD7mxAoI36fb
zZUa<qXvb9TJnhxmDOzr{w~CC`P|U68&9jA6m2SVMEY7=VzKkA^^^%V*yesg6J~8tt
z`3@XECkGVg>$}d<l{ejpI)5_0(B|lW8;(-yKskra<wT-w)LDuh`ny}+?fJPTd#`Sf
z@|;8&-3y;tp-7y2Z-`7gfo2BTkY}%E$Aic_X6JgstKsRIg;%e9DZob|`v+^XJaq9N
zyR(N#@I<KEuEwY!h0}K4BcL=a=;+Q#J~?TeB(}C4huwTA-@GY1_a?V_g+Q5$b$FgX
zmUT|O_s->v^JilV+O(gKEl70PY=L+hhIfKpl5!E4ue7t&S)Rn!D7X|<X2;pwNc*{X
zg!(N`V}dPz6!Yp_>?tz2`SVWaczkSpSLPKpoXNa@8up#-0BATQ;A7=;Hbq|q%s%%C
z8|%zjnHP;X!OLUOasONW{t15QwoZy)8f8&>iFfZry3)muby^CS`{bfl>df&+Co=8P
z$9);}_DLF*?fpnekh>(kd7VpwO0r<jQ5jpI(Vds>7?I>bq{nVDno~+(j%p&}{!#!>
zGDC46Mt{DMt@(2J+>6xkGR}CGvHEOkI9N+Ml$b@`Md9(VNvZ$Zb~K14QDr`Gcu)Vi
z-Op5?D`?STLzqiq<5vODRXYV(INB-5BL^t07+C;GXuTGqbeRX!jYqx2H*AG@bRR$p
zog+FI7T57GI*0L}T+t(N#1t>k8?wbwbcKn6`1rH-1i*O3MIv(Z&`46;HpjHS5CA(v
zyWEqycO?UY7Q^8&3|8QSpfeFL>y*J9r%89(0hNh!2aK*2`Um5}1z+2$v*4R=zFBTH
zn@`!+MGBpkj4xn1iKf4X7)AP3AAWs{e^!#T|E3TQPkf}CD>gz!6&#DoxH9nh>g~q=
z9G#qhzjK23lr`kb{lntR<BhYe@8nC(Y5$SvJvlb!*Ta|)8J@Ig)aBhNM~*2{)Hu0|
z0!Td?C!=j#w%4{_KJGqlwhI4yI=iIWd8M5N3z9*14bN|)FkK41X*Op<4wKPRFdM2H
z-pmBLfa!KNrg$_HCW|^{>Ht4Q1Pan593*`*xM93`AsMD=1fr)!R=6%(n_TEJX-1eR
zj?oZBrO};SgRga0Nr8u9Rz(%Of`FD$YhrG7f%v$`<oMF)I8?~}h_H4qB2Wc<ApeZJ
z8GHX6N$}AtQ<EvqNB1WYaNE&1QvUL|Iv}6<WhO$Ch65R!qQNMn42ve66`kdtdYBIJ
z0vHI1(BoBq|F!7TvTi6fz#VXt@H4?_jE~1+2&Q6iH4}1<%KGIV&oyI_z=_B*yapcn
zM_EtlhS&y0wPtP5V^NI(!4UWO4Yg6XYX8u};y8sBPp7C#s(E8}aClAsFt@MJ=t;J7
zZ6cJK_+OFPb=coIGP{%Q^F4i?B<_f2U8ep~5O0shGWS*RbD)_KeArv}o*t>tH}>9T
z{GyNEbkyOD8nzRDu}z0h)|48jcr$UBPUO`kK*q9o;E?Qy2VSr?=SvhB%%ytp8T;I^
zTsmsetK?`D#ax2~5M>}e#R}~$3X@Jv;6^&LMdvb_V|$3WliZCL#hrC&h7nTIsx=>G
z%?dIaFU<i$EC(x36${wNXdDV&@Ximkx^w4mRmm^4GB=8~Dk!){<3{kb3_)>{b|ZPF
zkf2?$7mwoX0%n$YWXTNuVj0&Ktgl#O?$NcAGu)4kMw1j2k=)#k{$nz%V9DUh{d}s$
z6n7haALia_hc!hMNeH)+@l9S`OsTK)i;<!+>p-GT)M6w6DHt$t0OidoNS8!N1rL`D
zD=RA=m0$}&=g`@{?k!XKjN6*?k|{j|XW2zd{%e-}7y6Vr7B~>C%cBOyuru@Pm>qWn
z-J185-9ht&+)BkPUwD@(pvX7*omZpeit+p2<ZWG5R-id&aRnS_5_TC5?z|9tR=N;-
z><+G}TN<cz-P9*;@FKGwpWM5w9l^>7-)RdUudQA*m1G>A^7N?E_z2~Z<O7L%9d)_t
zz_H%Jg!la3Yf}HJJOvS4x-4IP8+GGwGr4B(HEr;tM;CkuMer_KV7X|@<Ahf+%0Zh?
zD4;xB{-&udYVKrFgOzoJi|eO;5@UIC$L9_U-s3dsfHKA2uObVt;@McXO54_(;(O~O
zV~-#6-}~Op2*I{Hc&VLYT6CgKI#JZka+Sc|vXWkC`L-4Jo^+dPX6K$^O~63Jb<4*n
zBLfEyH=wzlWqfKiHLF=3NA<j%c3tlH<Mb-f6Jk~cv+a<gVeZtW6G6sm%Ev$yhOP$6
z1GT(}f>VK3Mz>D;kJajG?mN~^en@3PZn89SK8UfTg88`Ii~^Ml)55uea$&xA$|-n1
ztKmQHC81~dn=P!KZm?bms*gAQEw24rzT~6h^6bgDJpJex@cR-s_gZXqoA0LkVBT$=
z%mzA}4Kttp6DNG`d;WJ8b%AF=qwKTVi*`Jz3t!nJ?ZzXLAGNg>y~hwEd=zR|k(S(N
zK(Ji#K^15VQF48j7riK|FrULFd~iX2K4G=RkPH*`+H{1`gF!A2@a|i>nRH&9zC!5o
zqPek217TMS7v6Pmwp2lLjT<a^+;MpF+D%MS#KUlGSS&%K?$L{GGDYv`?l8m~E&spZ
z9rvQ5d)bg9h#`u0>YU~h2v!Z6NW`V<slg;de@vrarZHZSH%agsW_TO2zqjN5GHUtZ
z=<k9wbUsR{gJ#(N?)75#rf%;Z<~3?I*i+l=<w~{hOhcNW;fHhM@*93UgDn%;>ueQz
zG55Y8;5X1_*_R@BkQ*4K8#krs9vT8vvqfV6V9`de)p^cE>KuQAFt2Enza0U#<3_gQ
z=1<-ZwL|Nk#&oHb_S?9MnMPb{k&+WZ;tj*)Xfnb(z3wZqPWCo+dBqm*B(Hu4X{F1m
zc_o8W5D)@)pDOke2L8Iy!M^TQGNKaJ;HzM5&5Lz57jk{N_F^@7{t#2-2BQ04GDRXW
zpi1qVN%U|m+p7tbk6yo^8$;z&@LWhQ@rLpHt?`|FvzouE#7=7lJC!k%Z01b13e};b
zjNxfv+Lpd2Pt}b0Ym2Icc{=R=>Wp8LnFq_)=IXmLG<8B6-qgK!KMC8rm`E-)vkYWI
zPNnZhz=HaN;#zu<^JnQTQqIj1w=(`jG6O%o99_SUKQ<UA?)-#A?&#uu%hboDbmaO5
zkw<MPUt(n5V%cirwo)6ow0v@@YRvnfWFNZ{TAcOE2xAoB*H>J=t0%CU{%$%Ls2i#l
z&G7(_;Y?YtfN#vaH<j}0u^1PXv{4rw*#RI0!%;o8KBIH)_QC3P0ZCH10_4q1oPmOz
zg){i*9vaXjV{n{(Q;?`_lVsbrZQIsq+qP}nwr$(CZR7N5+wR`;?M!U^vokxpu`h3*
zn~KQFtjbI`yL%g7kUan{x-acrfQnKv$TJ3JY5OFyz`4CJ1)R@RdqB}|@l^$6XVyZ%
z07c;%1hhkCr~-8bY|_k!s)v_O1f@G<*7v2#((jND?lm5wz%en*0}Hj&jR$-g#DHqI
zR39y_MlNKhrz2o_Fy9%+;#q4-Y*b5aTSSrB5|H>%8seuii`1_b`J$quqRt4!5=s!^
z1rhT?mm6DOgLlvnAqt<HhWU`Ol=yU(qZ>V=kW#`yT8KZyay+B_MBn!-RC^#MNxl-*
zU~@~|_mId{C5-b370u$SLa*XpxoG@=EL%dBEho=bloNkvlF6Ucs&g5!htp!nX`yg=
zaO#XWIiZ>GeP0F_k(DhwtVeDb%YZj$&NUuW=q#}gu&!Z6R;B56ps&VpMyHjg_ZIk+
zRC&%F13LK0r1Afo=x3`&jU!q6l5KW}rY+!!=~l?=Uix7_!YmHME|!w?dP3^;SEz^2
z!c-}^Z{WTC83gWvx5-~i+>~3(@JVP#>RolLN?<i00?1=D0iIMtmvb)ARWK9Lq}8KV
zq}_vnl5A-p!m7lWfzNXA3!4saT!F2Cr20zwq}AQ}Mk}{&TU}3FOA*9-T}Wzd2Bz#-
zl-~(Z4a+@Q4m$3>z*YrOcH|IxX@5#BydgptSFjFDGmkpLqj;cS=%%B7D7t@ZXW*m+
z>m*a$5C)xVBLJE}%kPXvBBPeBLWcQDAn~ridY(6%mQ9`8Zu!+>^A<C2BQ{~KG3d`0
zOlQb`&T)|wyEJWDwTR5#q&|tlXC(w6kvNCKo3d)<h9r3ZAW$goi$heAKreaY`*}KK
z&gVwfmmzVwRKQg(*I8AgcLH8wX3@}2m}k}49N8TXu8x|fQWp@bq^CrA-x+v&^#^n8
zRZXtUrnAq~g<Ya2S$Bsd4ZqaO-%GYeKOKQ9U=kjwF1K-|31yYa$eHeZyMCocDb<Rw
zr0eJ5j0gU&y{4KO@u?w8t|Xs3F?;McHf(yl`k?`}yLTR!bZ@X-{9{n*q_Q5Aduf_!
zY3aBNd>=9C-LYFM1-ctB=daxoRib!sc;{mvh2#z^M0h$uS7V&&UI&^o=|cM#m-t5v
z)TFxfg$v(A*^ZzRYZB<CZ|Cr-a1J8}KM}$W3J7$qt6&`PR8ayoXDEt7P9#eZAo47c
zf*Xi<%HHw5;?B?a$-*i2(VL;`GL#(9)F=w?apOtVmth6p=i?YN#uBG3T&do&IYo;0
z;p1A#F8t)Bb1jQwg4PdUuC*QBoOs@A{>uylOIkaV3^{e4XmEqco8Pmyx3a$T;J<D;
zz;?{1cQ$X45-@}L$?UzhA_{A18rS>k9lXDDTs`b(>@XG-)pc3avAGEL4hyz~C`4fU
zFyipHkw17w2_e5SZLQ487e^6zYcsJ$*|mpy0b#MJ9T7*qpqV1~PQ~u5;9O|)Uvr89
zoO9}&ggtEknlbH@L5jtXJhQJSq0k!z|7^WkPFlZQ7<TpjDW2=v+;xOS*P6>+QSffb
z&HUj0{-F6<R|M9||E2Y0cD_fdw3T+Is-?Y~nx#rAx8Er76!A*ysUQdr<%wo2CD=N7
zCy8u1V!1ub<u3~~$h!iC%n`TH9PWLDW%WiRlv%g3%GImawKt#OmCU0sG&PnS_@P9v
zHLkM>Ew;9lOwn7lr{I<<nC@!y12xeK*4MrSCDx!t>~~D#<|b9g@nk!SyhM^>jQR!h
zv?EQe{V*9s)^Q-+^ZiV%85j}F`hq|<1!MN+Y0FNVci@nnx}m?JC$?^Qo;M2dktXxB
zw_M6K$FRC(Up7#Eq3zfHwpgY)pA&X$%Y}j#_bvciD=A;xc~*~G;+Gk+mr>6gOC@~)
zaRKQKtRHrOz?d?<nU(*l&^@v;wrk{E#a$#Dh&^WgWV6mG5qcor>v5W|x-8?7=8r~h
z2q`2ynOe<X9@Ksql_edwq{JFr%%LVWEkukf#h^pRceLy22G3e$e{u`=1D6s7ZnJ>y
z#~g%w{tNjB#enh$7HC%U4)+nDMzb4YpvbpEV~IJ_K{rjG3@58?i!Fw<f!V&MmCH5w
z!EM!zl47~tGp8YSY9zBa9r0w>&91g7mkP(6butlxotbU)9ko@nU%_p8vvI!D(EE*3
z*<kvs?kHV8cd0g=0Ze3PbC<>)dlFXmA#oPGv!Lm+7r%x79nx;pc^l88s-gVAM58<0
zkSr`x;85jFiDT$Y1KL-4lp<4S4fCZmeFfFv{iLeaR)4jD#hb74ez-py<wfW24nW3U
zrI$pYxy&5bz4zYYu-$(sQjfpMo3`;w2Sax1TAwRTKv^oSd(Cu`_z>(;G7V)8KX$8z
z(FO+WQgJs}xJ-g>FuH|U9dB}{5kc5*7!$iF`@qXOUIJ(B&&$DhOn^HI-0umQ*dqKu
zCNOz{`d}S{$Jqo;6`ecr0p7@15p(^{Ui}=FfEJ8LgJACc{Fyr`Px~Z7SVCbg>Rv?n
zHf5NP?RnP1z~{0+U(Q8w=HV*VW^;K<-rLT8w>iG!(nui@?4U!Of)G>DOsWVs6$s+P
z@*wOlCnIx?Mou(Au?4E?C~8CFkaYA~&5VLoSt7nVO@S2~MALXS6Vj!>w$*K*F6<%S
z3MIhGJRt0`=xDKl-HytTji;$>dyXaQ$*zCiodXe_vkxspW{s9Oh8d-P)fudl&F7$u
zOUt*x0(18mplBfJkKRLpYFo5qR%5>$LLO3EBEFs`)W=WjQqk*|)R_DhYBD#}b>D``
z)Or5gXlgO59&?ZP03Qja%BS}Nve_^aytp>r4R=?zN9MOSMyWo<rS?=aua7r!{eUV3
zP~R)k)GQvR0$U?q)90pw6Wf#cYj-M1MKg-dWDFzg3*K?i<kW0Mzpz76H#~_Y_4{*t
z@XUqhuk9-X{GK?R5)Vs3m`hQ`@?c#Iy%~!a=Iadc9Ox&omkRfEN-UYUR3R#-3??Bf
zb)e~`vY9}en?dmNA!3rPN|Wi3Oz^iZz?yru=27C);~{R*Mr4modCdWjYf&G>{z%F<
z5bqG(Bf6EU{&p!+H2EoeaxbVyP!>ZMH}@9C^XfC}1UA)m%?EYxH9oe`n)PlF`25q{
z6EuG^`CL0#DmSGzpjRibzxUO7%yDh5oSc@Yjrpq(%`KqK<Irq*RdJxl26kX+g0kY`
zIE+S3HCP5NQQP8C)23u_8X?J+ur~nv*W7cQ8^-v%1WzHb@8dloA88_5q%#QZDhQ>M
zgyJ_--+3@3)WQrYOdXwp%bP3}+H{?UKiuDOl=Ndgg>13T{==uRkg<(0&~$5ZbP1|l
zRcP0@5H*wx>+n0MtqIn_qsuRYf>S*jONFCEge^o2GpG-pefKrTZeT%T3Zg$eRb;1_
zXYL)%W^RZt(iD-h6?314d1{!<=7D=5k`aEYWIs;MDW(8yb141C8NlgINcEeVA$FWU
z0qgzlU*ldrVn6<OAjohdFZs7V1G+Vax@pke`Le>T-Go{uz^cXzm>t?MUTxY|Zj}W%
zIG}n}h4q>25X}fedfa%;m{6M6dk7-EAxi8027`|#IS|JLA9n1|uBLzot|1`#m3d-G
zK@3^;GNQ|fF)bO*E5||e=_k4g<TR2nNCgD$0egR!nFf}vvyJaT>)Wl)Pe?0wV0)Vc
z#eU&eD{vdauYL4C^m33yh9A{D#;y(gg6HM)jz|5uZ}<8r@%T6p2CJ%@1<~_+yEVY@
zjn(h1_^YmV%7D|uUVian)BR)j@A=K$`dMElSf1&n)Yy6hj^9T!-Ms3ELXL-GVS<u{
z2Xl3f;eBPUW;b41M|gEk%lVL>t~|DHHBsy-HS0~A@v3FGHCxp<RI^ADx&2GaM>ZIr
zuNVafljD2p@cSw)L@Z&#!}Ud72qH6dZz%r@f&%OD=6Nb@Y~$)``VP2Id@C-m>~|aV
zEY{9$ujWX%opPg6=i=%}P`KLP*q740946K-h_Tm7lPNXQm=B@5C+QmC^7zD@=fB2(
zwG_-Ji0QEMDY>-wB-dpnnU^F)*N75WmQXaSrU1~mvA-9rO!Zl~mcZBy)=qBl);@n(
zW>@)j8n_ao6CawBaQ%Um`}Gyu3r@PZE&PI<%p9?};MW9Nt+h=0Yo7*lc;{~(kfF&A
zZhIHE{EiR2Y6C|QYBT!5>@5RUv>IX?m!xkR<-VSodCT^rrAoom&AOZ```5(|ShXZH
zZi?RTyP?sEgYN^~AlmGMTFUTdW3JOi1*U<esDsncFD6)n8RRE2Z)`BnX+n>Y>|;ui
zU6gy<Vfsn}@WJA;9b%<G&*RR)hBr&cHL6X_d69-m8C2+O^CNX?tcI!#Exb`j+M_&!
zD$~pcF7yOH4a)CEMV|1Kz^#C~wA$vI5@_F1+q1!@=Qf)@hHTSK-=oup>d}s~v^a&4
z15z<VvZ@p<pA~mM`yu-1(!H%)Xwh#Isk==@Q+jaI^G>I79!oPZnCajAFMLzlogo)b
z(iaobHA7GDyKI;z7pp%+tVaPOQ@SjX)6_5JK&MYc#j|TjT%?8TDEk7Pu57vaUL%H3
zo$H;Rus(Bz*pH6ifevrj(Lb=`b)dexmP~$`qB@==0jgR!Mo|}??o(eV2rvg0KnyQe
za;^fL91Cnmkk=}`cD7G{*LklIojJLZ{>Dt{qPX0h>#pYhO*)uF(l?SnslA-q3Ss&5
zJu!aSKLz&*Qcis(qi5VZUE{rwpvqyAuUPhf5V!(Zx2AAjN{0>EN^UB!mtFdTi3c5I
ziE;(?V2j{dmRH+9_&osKp+e3nu9M!-IbL|+?x>XS&2e5!MhSNd{l}&ASumE*1!?v)
zX6WyP3A$^w91&DxC*wKZlcz?qUJF%R$AvS+v?4>7cmyM!m73^cJx7$UGI7x|fy<<W
zd7bMYZuH$llB{gkMR%TxP`u8)IH|6HCKyP^F!YGtAf-@{jIk&YH63lD=5=yR^XL$~
zfL=acF2*Y_XLRxo5cId2fht1`l&OOh<dn+VX&9QQ-tbSyL2a6!pDWxiyWj2idJ|d}
zZUrT6U+YWUEo;1j0lJUs0<d0X+&fSqWF-ma0wAqh<X1nwxea3txMRU+yJKgs1tG(D
zelcdF4<>j(cNk>iS%eypy0Z|am@{^gRzF|>8m(bgzQ8|+^=l1r`~Y{I)-3xJXmp3J
z-2{2sX={mu=V#0LgWIe{<8q9Te#54WYvxlCHYU(-ozG(a1Lb)siU(OPBcI8L$28wo
z^v={6mQ^s_Dq;YTv08WlBv8vO73MWb8pC9GCpi0*wtpSP+?jwNCK49ze&LhZm-w`M
zS5n`GK5Q&G=e7=02Y(2CV$lj~>-SViC!4$fN_2hi5!8F^126az9Z-2ww^x)3xCd%>
zc3xdwv+AC7K0BxTU5}(!>>B$bm18ulBm&U+qy0;@F130$az7kmN1oX3zIY0N%5Xo1
zF+2=I9B^Y+Xn!c0dJ9o|1dp}QrVDx@kG>2z%D)F=w)DZIvD1&^MVI>B`40ix8|*=O
z_Q|zv>ufXz*iex4{Jxx;S`I<`dfYU>ww$Rnz+RTBV8W%sRD=Rbo3&HztBMu);E<$`
zv0D?>8%lEt>|Hpt`Xe-&DYScFpu9~*{x(qXvSwsW1lKt5;+_p4g^nWoV#Oz0ft_|J
ztwRolZzmu33ts$9AJ+u}X#n7<rM!Y~>i{VY=lVR^LR!X^mHcu)oS(LkFH~#olF4iT
z!}>-XXNXN80V#RltHtQ&BxeFe{;v+6U_Eli^~?CO9Gt3~Qx2keQ6Er>A>DrdCq~9J
zDIuh%l9@T3k_+pjv6uL)g*#tVGUl&OjoA%8P~6ca+jR+NmhX|9PcCB~9zBww!%Qd?
zo~ldT0Wsw-ujiZFdHvi-H`RNM76OuEAGA#a87FvP8NY+OjT6}R<FdAgBP66(Nil^F
z&o?ehcez(|+RWD&GcW@^Xgm(D$EYb`9a3RbEpeafLcx+8`$q$px!Vh0zNq#ALLE>3
zgPf3?Q`sCYFK4*TxTdA+kQO2={B>U%<?Q=N@*kRt@X&B)#cGZN)IR>}^DMzk7e}Z{
zv~de`>VnVLecUFtWbl*Sv%3#`jIKaGh=GXg(hgLG2l3s@SDCZGGp6`7MJNcV&Ta+~
z4;S>^+H`f>?gXZ6lRPN{V^(-#Y{FN!?rgIQ(jc5BViXcwkS47rbY~U@4~+O4L{gcM
zqZXvU^RSqjDVQQh#Y!l3pVdi1B)Hnz+_q0#Uu+4gLGAlp4)#u<83?EX2;9&wZ|#;X
zK?yah5l8Q?Srzl@t|QtMsw4g5@=~Tm6S+mGwu&NJ`GpoAzjl%08Gvl#$BE9~(~U8w
z>n>q&E+17fXaQu1sh=htZRaT?Qc{x@k-vBf=2Aa(xvW?zCr^3W0WJlQ`x((f-#-xe
zx9M^%!EQs-{How){%Bwqy9JLQ@|;b2Qr32FvJQa3AUgJRxzUor>qnmlmUXUM$VDy*
zm%+x{+)DYjK8zT^Ot~yVjI?t@oJ4nPe(pSS(`y#lval>Kx?8jwC&e|OlPbKUMb{u$
zMS+VhoRXNX&zcCY1HWU5LmaRKV?*ExZU9O&pTH~{0SVr77Hcy@+eMO7+7RBR8z4Y=
zk21G}NmWTh(mU6LmXBoIZ1KnLbsldl2*?<_oP2TdRN${?8iyp;5XDM%M{){qv0xe%
zk7>atQK@2AbYWsuUmCUCO*-Y1Q)d>XhN1OvKe}HiD2-Saxv~ovrTSE}SyJuZ8jm=}
zJeg7hp^;n!gdaG1HF3p&bGC1r%R^e)GRq4zcd49Hl?Ha(;w2ncSE)nfR^4aRsYS7#
zAv?RorTcPs%z9{90Gd#1?VhXKQRWkm&&FYO%{ME^P5cQZ0?Eay1_~y6pytWTV}i&x
zz@%9oev~z{p_65u#zR1HgJ_ikE-P;aiE<W8pA@#!345=&dHG7%yL{_&+icv3StyT|
zavCDB7s}NJyY`XO;9iX!j%a$ivYBRHfuQT^gjee~*bs65Yj-b;JeYGIf$)nX$Omx%
z@jH>5j3XsK6(O6-WeP$zrBgLfN$`aFB`x7<pgv`s_8Qs+5q0@**tiBaucJZ{Y_mBq
zDOE2UTV9AXrikQ5up~iCg-mVyt3lL`8st*jm}*a1=d6v?A0M!CChc0N$^8`2>{?k$
z>XE~ru(c`y`=iPV+}ci6P;*bbz{(5bKt^p%_FBX`yV`K8r%NpuM@2X^>KW~!@Kggf
z1P?1}b^Kbd4c=1=lj<^cAI!P(Z3SY(7LeH6uqY3)GY!d4*@F>dzPu5GNz9B0mGbfc
zj)s|am0IT;_<6`?-O!KhY@M+xv>Pb745H>o_8I-<4orA(Kr8!s@G{4~o!eb~x3@({
zD-O#~fuG^Mb!=b<fwn=ij4@ne(PNw){@!k4*mPY(vB9)bf+Y=E1y4l6;v?I3Bt(PJ
zWH;mOG%l`h4juk{_A=>=T6gzJxV!4aqn?ACmRbzB5(I3vISQX>-t`c4PD)xwNm1Dq
zBE#z^g_#A!X?Js~ls6^eyl#1-b#uw>3(8_$DS>1zd?p%2*-CK?U9O5xpB*R=6U-Mv
zjOXmHPiomdws=^%P-iq<<ed%s=hEuUtrpt9_Vr~)t!OBdO7E8R6c#wtlznL^BQzUn
z*<hKA2F#I>g@nZTe<GSerACv7xC^ex49Ev*xe6JPtwr+mM#N<u_O^Z6Y|mW0F!|t;
z>h5Ta+#y+!<+kI6_;JyT)jeYm6dz28WG>`hiwv*Q5ot!20Q`V9s#NplSlzgF_tTXR
zyV}>j3&(-5<v*vUFbm9^km#!&h#rZHL4zh)9S(r_%C}IVus0~;ChVCM%{RNbVGISK
zULp+Y;*W04c6ReQH}gH%878yJn#kdmu!o+FopETGO--xRx(D0}cS5bF4<9r(nhxwB
z1(Ogsm_BbNAa)7K5m1dmRUao*9)I*q_tlaYXdW(LrN}Y$&_%%#KJq-r>o%Lx5Jip`
zmFP67QyV$&P^2J@gZ$nB7abjkb8^gxDa!QC`=3A7Dv_Zv=beNZwt_Z@dSwPN+3c?+
zu(>bQTc534N_eL@g?3w@sVI%%J>Fn<!kt_d;G&c&6lJQV-XZ~#=rwiVWP9nlmbwSN
z>nk;ne-djQ{9q@3zk+k9)ub|TUO#F07Jzvp)Y4S!(wi6O(_~e@d}PrWT+jt=-JbSg
z&$l6s0PYWV6ape(bU{+P@=W8xHs)uqhs{Gz<EfP44~@`)h$H<*0i*>aGLUdM1|ztc
z`%}nX;dG(u5bw*}7*L~|>12ueLNeV0<;``Ed#p}DfS0qp_a(r!XOM1E^l{|P+fzqL
z2~2_D#)I`)wNy4(-U#v>g4hbk`wgn`wxJ_4%PSVW7?(5$`}U>$PUx~&Zh8@%EqGbg
z1cHx2Z&>09Sq!O?Dxu3BW#!sm+{)Uh*l=L(K__mkqIFbaQXWKM$s&+t23<q*>I!+q
z**<b=xv?_z`^{1VL~VW)&a+R4Im31S3M^-#{o=*5!?iOUre?NfuT5oACM#3hDAigw
zMxdT>jfqZ4!me3nWn*7Vu;6*(glM2Kx*imgK9jvq1s`w4J}_+l&Vk`ROqkWT1EyJ1
z6T9g=s0<AYK8u(PkxAnRR_n7974-;gUb5YP*Euxj*jy|9S%5UYjSXJ=PPy9lbq=_1
z;<3&n@@|F*2LPeV=7a}uxX^fSJTtM{nEgA=6~En->v=b7K`*3F=?{26+p-^?7+|x{
zev<ml7a_`SHmDoT{PjHtvIm&z#xdwEAm<&2KB-N$;(awO*G%t-yWGP!S4{a`)gIng
zca?10KF69)SsQBs@bqhj_Bjag_XlSYgEOx>tvY=_3dXN>2Cjy2w2F#O<TS~XlVeG@
zhgL<4g>>OaXff1&5l)O3;~&U>(tRBW>9nKV003TXf&L}km(eVi8{l8A|5Li}|H^gO
zRV0&o0z?7GQTMPb8b|us%PZWSwlp#0X?2=TFj9l(UN^vJgt#?s3PWJC=^~XThVx>g
zzv=3$1oPHU%-Inalh-+^tE}o=;tjxO`GG<k&`5Spy<*LFrQ5Gw``EtnIe(@rSnJ~Y
zabMvM+u#CxvI61nmuOqywdjY8eq>&<4MGn@Y_KmDrs_wLu$(i*E72e2k@jc@$dNOm
z_a#aQ2+uX_RWF^#Y2JUlzrW|j>hd38I+ma+Bn?8G>h<6;wr}ch^IIw+{yj2BA&Zqw
zDn}4GLiDWaU-yvCC_c=y<IdO>N}ezP!yB0q2W7-JqX@<$O8!+FE-@ha>isR!O!KG#
zL%Auf(Jd)39pLa8T?eJ5D^(jin#2V5NN3!D?w=t8%qM&w9Rdjq??WWnXv`;_SG<nE
zOHAu}fCB@n`KU-Y=xPA5N+WxVJv+_;i3+tvU})}1IYQinhB(o}5K9ix?M&_o%S7`#
z1MON-Q}?kN>}(Nx@lFS>=Thb*gyt&o02sdHcS$(HD{1Ahvb8%xf3jd|y$4z|Ag9Dk
z(D61VGI;VGF%Ly*Np#Mbm9cCZkyJp9Mr~wWp?{I72<P+QBcu=cnb!)|c0u^!n)8fD
zF+^x4v#JetXecODdgPILP(-b|zAVjB{R*6a%v1BwA@>9QZ>-Z3lL3QkpHxpCaY=8y
z25Dp%qFaNr8qCy-=sVWX{Q;OZameqfREY_;k$`?3vGRO`KwK0g(0M0328bS1OFw3Y
z>0dTH=cmL<eoiuyuQ);ptp><W+m!7=Q;RiqTC~|No40pM;O#GoAjzy&Q$ANUrHn7=
z>f|p_kF&CK^ji!KDSg;CfWBMd;zMpAq$PXWcEXFTCM^&=dZtS93bh?^n9v$$+x6pk
zDvp6i7_*@6N|g*7Xj}0FSW_%9wVgXNrc0DsifVLj60qrj4@i;JNQ|!7Oj)!@mfXe;
zSPYl+=3iowmzh`-uGlec-myLAaJAG%_BYyXcW98yU@sQK5I>XXpT|LLeEe1e56sCZ
zYq&hI@t2)7qgxcuXw>jS17Dmkrqy?;A?xq?TcDH@n}Zthgc$4+=S~Y6-`?Uv(-CAf
zs?p!ChqH0ORa$Sb@IDO^#fwHm4?Nl<EG{X5JCR34AO$m^z#u6g7wRwTl3(0x*$Vn*
z3DV%UA~a1ZC`}{-fg3aBwI19w#~XVBXs&eL)C7URcSHu0=qq0`Ywsiq6oHdSwc>km
z1cjCT5WOf@9Mh^wmyM08a4b92eHf`9qAk`l7(*5=D%dwQxhkqMBbeJZYI9YUQz51~
zC2qIBfX{zCb9OB}xXRscJC*I^uKU|khX=<OAzq5N-_jRQWn+za>V0qu@`)O-x{AId
z5!H+vFzBdQW|R+vLrf{*ZyD(ss_D26+y{j8f3$y-@w-}Bx3?N_GEG)mwYth3QLR<c
zJ=-`@yVK3=7=3v{TPt(C1$KATbEJ-3HE}IH8#ClPs0nDt*zmBpLY8-iKDb8fw5Zo`
zm1&~I&fnKXl7#XouWa=)y~5Y3GO{w%2=BO$n^c|3&Q~6rN7jCo?xJyE-*+dB$Ix(_
z=h3>GBcZvt$E_URS2FAvBI(@Q8Dl2h*~~8U^mLrHoGTSu8LhB}3TwGQ%`O?q>fmyt
z4h?&#9$i+o9%_ajD09wLWsmCT%bCNsyUQ-TaL`v~hjXH}I9Y!Qrzok7wml0lu27wf
zVda$iTyMHfUe%(6KPcgrJzw+~s=D~rI?7t38a2=aPkt3vz>}qLIOwW!f{*rCTur)_
zJv>rKnD@r*-*{*=<{r-oN1$&+hMeibRuqIeapM1O<0**i3^hEBBM#=5>)~EzfL^Il
zynn1nM!9IP9U6acz>OJQlG+jrm9NNyKI<LoU91SC7lH!H{9U##b-Ilk5nOhU<)7J2
zBYx&PbUMDXrlq!Qz1QRS^Sz_T2g)~+N+f=Z8T`4h#mpDt&DZzsJz*&N!x)zh4UBm&
zu=*y@n$}zVNLoTq=@G)6_*<P7vq)zjE*4u;cI`q8aIvPyTHN!e-RH>ptK8wp8Cpvf
z7PseHS!(UTiFPM&N{rYi5(76`?41XJ<Ay}IJKeKS@6*G_oz7`T1H~BfOB1#l4K2)_
z=`UqN8;ce*Dn3@EU*f}Nwyvs_PRq-qUCaY}3(zMw*i@A_qrP2>ztu6xYKF~aR-kkh
zm^^oKPdzZA#`@=FqWDi<1i(>4tR8BjHssIfCb#xJN!nAPn&?nF3o2c!-O{~H=FADr
znsyyXmOm7^dy&cRIRZUb_IypTOAmY-);rQ=%l`L4r1WqaP~S0P_AkrU>aoglQJiAr
zuPP4m!Q^c2Sj*zWBWb+k24TbPu}lY`AEhJKcd25NUsiTgThQo&BhNOMHqzgyaopi>
z5sux<Z)b_Y_j9C0Kjb~}6@#;CJUKSVUnKmxf6UxhcdPW?BtGh4(&EQr2z@G#!%W2!
zM5*>9Dc+(z9ClD%EsdmSkm6d<jZw+Gjo?B0t)zWug#6M&noJM;0$=)+hqv56Ke0>9
z+xM?@r~fz)Pa!@pL49sQS-tE=eQN;a``0+P;i&iJ{k*9WX{76W<jZ-4INSrfxn8u)
zzVz92QQIk#f3TZF-TeH62auio=X$^a03J~Q{u?|%0Du6XrzayQET^PSFJs_nWNu+=
zChTHp;zUoUXJ*Z0??m^Xpn;J-s*#z#q5iFmwCXLqYPh^VP&@`OIRZAI10_Px>l9`<
zP%I&#Ak2h?raZ3GU%xFGNMa#v9!`EW`i6W0aus@#mcn6HdQN^)W_nzTjI8wR47EhP
zYy+Er4hjyzPxLdZ^%t^~{e9)7fI(0IApYKCm8Ts4f@1*i{vP~4p4ZIU#X`@>#@O1z
z)`ZT;-d;r=2EgSnnrQ`b7XJs)^r+g%Z80Ex=ju72$P|~@aLqp(fChsg3jwL7G*}p_
z{OOc6q-@aHI@=`r{;(zomBfTbMW~qRdAsfyJ0TG)IuHbgBhEx(P|H4M8Q!2MiEeH{
zn2m7Ev4_0nJ-}477yHJj3+BCgbk#f!3oK)nu^&9;Ah)4A3@TYU5hu5o4z?A#IWJ!+
z+wLG2p_;^W-t3aaC%lTkbPb#>(=S_kv!0%1PEHolN0!KzN5el7F5DL(N|29M%$G*S
zB$Vz2IMxVVhp@&bh*uWLL<v9#Ie@00dtkE|7Aw7<TZ-DjwNnyDF@rECQ%poGO=!Kf
ziseKu-ISQwBC!@Bh6r>_m>96nj2kcFu!9wu8)7BZ>5Gzi49zZ^BHKd%6(4Pf<PdE9
zyLb1LZ@b#6`*3f|1EA)ctpxjlP@s%>ie)uiV)p`F&gd6h+i}AwF1Ec}D$ma7$_miJ
z4YxlOx`<>pNI$<Qh-^u#8Ppl2BeLbbXR^Ldf4?I2F=$7mZeEsC5Zw%ivQR*#<de2a
za=9B~INSWkB0P*QTh|v_E)KuluIIzg5WA@)Pbgv!@o3>_qECTuu0-7IM#AjoaxK$a
z3{^i+hupL`r<q1h!3k78M5s}+09)Q!cCZ4|n0y*-a2rD0sdHHLiSDRbF)M15I)!Sj
zqVeLTrbf?9w_`SGTBSyqe8n~9<lQf*i>ID{(xIj|WJPuvOZ|FI)`j6qg#upbxsDDG
zZwv}DLf&p^XKnXrsse2TTVaRWk1_p@D)}C^+(fpLIlKB8aj~0K#+_D;g6vjsz$Gfs
zrd$RUUwuYe$ABS_bzf+Rs#Oz2>xkH4s`B2GD+^u#iPc|qk1j8HgKYJSBdwrgS=7{p
z892liq$&=)Pou_r)ipJ)=BvXFUv$O{0pr>XCX6x%p%21omT)c8EG}o1I%1ZT+WpeA
zt?qm05&fScK`boCn*ag;fQ0_nBIz*wk7ytN|4<}$w$6@r)=vLgB|ZxOhWl4=teiH*
z@4Ng)XtXYnFoJ^hG`MAJjEwNrFgOTgaq6T<hXI@r6IGGc>$84*d6_-?0I<vGl%a|;
zeBI<;x|1y{nu8=y;}91Z0_W7T5(=uZI*l+hbrfWhT&S7N4Ami?$VZhM6p;B5akWl+
zhH|N~{Jw`+nnQwCB4oca4<Zd>_(kgNP|X5s>(7!EPL_^*(=e*NVrjE5xR9v9FFndR
zq*H+#sPI&*3f*C5s?GEfd4!VVOJu|Odb45cV{B<gvJq4k5EgK)V^C1@!1xo&VC2iM
zm8<SU^Kf53CB;tD2=M|Eg%6yHT;!<>{k{ctqiFPY_XL_~(A|7lX-#-k5Hd2cat(JB
za4NL|uvEc7x|k?0KO>(A<EvE>iAOn3E7`DrbL8(;ZyIgZKLEkruK*K<s;{6#L0S?U
z1!qGxAjUvU!pfi)Hnj@?m~54a*N?mZMoEwnU{G3UXmwipToxcD<FXPx#cAPV%{q-v
zz`%$#l1{3(^#V~<D@}(Es6d3BIw+K9>EI)g#pmZP7je#DV?ITZ{>+ZBn9c@BF}SvS
z5QbFE_=u1c02<1iWf_SYY-g}-tL91_4XGfqXJwMEE*gNDE^<nayJW{`73nhekJv}p
zQjY*;K+Fzc8xk+-H7*iui)b28ObUoVbRJTCyfXzUh6rd74TV4g)&PQv*3F`EKznZr
zv4P(h!xf^+_)|!`I8U(0L8J4>fKE8w4v84gDEK6v)EWfH0$B8`m6=^YtW8N39H^xR
zUfbD7r-flAv4C)VL7f>ph{+1g5F#M~L+k)oq4<g{Gp9{Lm!A1>mG}Jx&JYJ89j@R)
ztO+h?tJox(HJU}(VP1Oy4-T)w0g;P01m*Ox{vqR3_)sF>Le<x>FAApLmnfDCQHY6H
zq{Dx9RXVJB+KNEY0x{TCrGfF>*K#6;THmu%SOb{AiR_CP;FsTFcR+AVj(lR~8P&`;
zUdjapDiaW;X)5VftSG0i01*fgPx-OXEt7VJVnN6SA;^0;&-H;w+Yey-6kIg(fX!?w
z;<&lIF)Fpz=2Vn!PQ+A6i_HFIv``>w@SfO6BEc1Z(+%i{F51iXanGYETu&NYjyc@Y
zu2fl1nk+Zq6+8N*`8NUIqFsa!e*F#B2cPlYugi~MAAJ7a(e-Li?PuH9>d<-(XzIM&
z6fgFObblga%+MjBByjRCn1)comDe6K+pazPSP;n?6Bvhz(^OwLqzW5tN6pd@p{<nK
zeaN32AETL3#9d_?2;TB*A@k7sAA`${e07nVIgL-xb0-nM;oP7nf6N*5idO_#)d6^`
z**o<9C}bFm3ra6fORChEkOa*9IOQ3CvSEs9mLXEm*mc6C4Nw=oXbtL-1LxiTNW=A&
z7+vmbOMfG&;PNuwgRk9wDqHCGOii|9)4t3bKY$N778;QBsO(-7Sv}*(BnVvjvl$`s
zc^8*Ie@6z8*Xbnx?oL-QR@23E1^i)8kHI^29>IXDPDa_G8teve7bXD^#}w6{6sPi9
zMCI*75%L8ykb-!0mK5!WHneb3jJitDBoprmUwuG9qlrcW_KZ=VQ#$gHDn{E%vTWe3
zNd5cEpi^-i--6ajVPzT%R8Lg|_XQhf0w<a<6~DY(PQ27Ub}=PG&y642Amt`Zx(uFX
zz85DZYc%uT5(1}+JeIqx&5Dubpae!1X9+(pVt)O=lUa$BRbyjA#lE^qP_GU3?Y$iU
zxD&vmerKl2De{>}<A!Wdhir%z@HXQn&C};{T}rOQ>XCi;t!vBX>9fk+oJ?-Ir2jz-
z%~GQ1lKE0Ct}uh>KE9kBqF0~KtlOYk;>Z>eqb0slUpQ4C4Dp7SdBy>NmXU#bw4&ig
zJ(#qY#7V{ki!2F^Ds6*^0;&IPj0nzreUKBS{9F-z)7ds-?$LJ`jhsF4DaSa`>F}aB
z`y@+0h>=U2&6yr8!)=uCJEPVKn^ot;m6@xRY0O;qHtDZv&E5DT-SzpsPSJPA()Ba3
z5j6`mjXld$1;-qm^f<I!K*(a5FR|a3!D6HxM}0Tnm(tJDn@w=HUl!kaNF#R4ZdfF#
z({K3j8pJ_Z#qI($JO2_9ypbV}PlfISj$QjixjP-4?-%tTlr^D5M@mVDoZ=vNVQuI$
zie`eC_K60Roz?WR?EdS0JEL2@4HoNGm<L~}g1r`mkw40OSfTQ0VG|72t@O2Q@WNIm
z7@L)aV}%GIg-|tb@#r4r@PrLGb_qzdEh19`P?cej(M2Lt4uwa?pet^W(R+uqibD7j
zlVwz-%}H=bw2(f<MFh5kxlllimq7H}017bt;s;@xsw9nU{zH{UN{~!s>UhJ>v8n<z
zWf}-dMy5uSzy(l~0RVW^1pdFsM4Z(JhGDtGHQ1V|mup_meLA+T^&YXWREu?o9m%5`
z)hnY~#33;v2E<VpvS`K{?Xrz&7aZfwIg4ox!6pttUL^{TbPA7Na1s@TBq<3?lH(O4
zr7(+e_K<ZU$g>x2belb8_VCLnl63+s<8^(|Djw598Do&XH*LL`fsRd3WalI_cP|5N
z2;0Fi3iD#I*?-QX9D7{u8Z`P09XmD9Ajf&Z4$_4&wEc=2R8O=JA;=nWFi`_EPKQa>
zYdD~7_!zdS-6|5oF6n>GE}o<ruoj17Ddu7=La`PLAXyl(D#ojoA9MniuD5z6qdbTg
zt<<%7#(ewa!|ceJ6&!9ttD+K*<2Kj)X#piyQW3u{WJdx}k{n209jq?VUsW|+#Qh-y
z#h3xz+c6nl<zHK?N1;;sU7pV6vcEgi7~8zbr5Nc_+)_<kqD~Iqlp3g^6_H_zYaw&d
z-)(Lf{l@BF89}=h%mm5`oRKO>txAFH(s|_<rWle%N6;XRl9a0@oPijXU_8L_$x8ek
zT=QMBAeY!bH;gFKwhebDo?!uJ1CO-+vcFztv@VO@Ri%!B$i3&6c-VTi=v9O~&@v~s
z_Xi~&m&6TLCP<VSIyMm$-sHP%lqev;xg5s!Gg*KD#hEqY3MSfYw`4$g{wPm=iLMjk
z1Q5N)bAZ4ORUB1yL?sJ&8tgMzL7?Dplqu}S=l!)~q0`bYwafXEP}w=i&xu>P%6pl`
z*-0!6b_HknK4kkRA117E#0De^8w|Wjdo0r+k9I7S@K4UmLJxy!Gze+TmXs^ZT2pvd
z_x$ZFOdT&)S-&Z}vyg@>Joi*VlVPs$D;zfOA}{(Jg2x_EKi=p1R#2b>r{nJMfRg{=
zSYGp601uf9L@c9lSsD*P<0X>$A(fL?1RddzKM-*Unl2eBbN~pXI4#^&ga(KzRY-@r
zJ+5w_<>SW_z0Vs~YQB$no!6uFVRXWuk5suq!aPU2S<%U3BAYlV+AJv>FKxKS4jk*a
zDFe2&p(_W@$z#W6Ub?Xj?bx=lBa*Bs3A8i}4__Us5O;VqtTk_9{PuP=m_mubT}moa
ziA`tR%F=NdWoUYg=8lF2ZvN?HTiB<y_$P4lw2TDTliya&O0YI;G2Cl&xmn;kw$oR$
za=yND#-^P+Zv$~Fwy=9&0A9wXQ#)@9b2nGhSUucn-+QAvrlK1;_&=Yy<Jn`EvsQMM
zIu%%X)(=jtw@>Fz#fN35=R@R<GIGY0$!<7^oP<Y(D<TOmqIPuTmr0sY0bzbGRhK$K
zQp*SHkYAzAXLmjuT~EnEUdWm`$GjyYa&E}Yx*fUahS;I1=1=i$<xu{@)K&Aa5i&rJ
zQbc^%v{*UUCPcQSBT^K5Ckndl$!YWjpR95Bj?~xbHAi6@%YX^gKiH?p(_%%M3w4b@
zxq$5I_fV4N7`E}m^G+TLy17Ca*sJlUkwG>X2d4&lmCD6qgU2Bl6=j!SU_5Gnhc>zx
zBZoG+gK;=ZUg9Yje^%fz#%Q8E{;aP`4$el)N-8?nY;~BgWI0ytRF*-P$kxBpb{+xv
znIqMYW5ARYY)N%4>9@z#yXsk`4u$`bc0}q3a|*#Ygz2Kp!mNXT%w-~fcaKrOS%^YY
zvX&!4#P>KfO$vXBlG2>^ir{x-CFNgM>OO9)e8?hWaV5ZU(d-*ALBsCsy8c4)RBL@T
zMNB!+Fjdf1X0n{j0!1~Fv4dB^c55!(DRKHaSS@$+6bRKLdmmUmb+)Y_UjHgusScVZ
zZC|QcgA;kdAW|{hzr#N*Ej<87xuczF<1}&~!u@2`Q}vwE@op2j)A0rmVcYt0L)Yur
z_-@#_X|rpq->}7Eb0`Zf=)&6_|MT1PEwc&~ap^cd<n#$8w}lv8jG%6l3=qZjjIi9q
zpwkz}^^B9ZM(mCoL&JznIs{&waQ)A2gtm;t0=e@6fjp$oU0LdZ7r5Sa5H&L*YnhXr
zRCE|nW%%!fP*1Ts_HNacBWE9#zEX?#6j^?uw&hu(VZEwquOq`P=9oBVqOsV3hf7px
zTGe0f0*J<Lb0<Bvd14&>)HjwIt+&VU%a7Kk2tDwMvbuN@c+??##WD%oS+EOAj3l3`
z)9S;+^jOJDwi17sPN;wZHHejduLJdHh{YW)0q)>}U6-)=J-Jo+LM=V=klJi0DNZXb
zTFOai-6cOV$w^#zN=n`>Q~xUT;siAK-ovOqIo9T%m%{Rv0pXwAm5DAs_YgV#c@?l&
zM?RD&wd+k?=xxS~z>b3PL3-S2V?nA@Lr0^>G6A+iws9ilM~050>3!VrxyM`mTP>GX
z??Mt$ed0jD+iv1WoL(QuLqCB3w2+0W!CJ?#003$t|6L17_1_aj|4=UfO*i@fOchb$
z=W`tcFtTSNi3PX2JNnk@8VU-^R_cmdibh!JI{HeQ>T=05u`_Zq*OByb3~l~%WN-*p
z>7A<oOcj}${KqaB^S|zbjZIAdh1~j){kQ(NMZ?B!iw)tsR&SsMV;{uAnth95SgV1?
zffu&cW?i<8jv7LvkhUhVJRw=h?80vkw}M^DaS^Zus(E#XckJ+Px7<}u?yqj|s|ij>
zd}}?(l8>h~<)pWiqx`0g(D>-_N1Vy@MQ|GAP4MjHVZQq(`PRNH{bFojkCOYu@WB%P
zYgB=+!ytl-xM}MG{lVYrITaG~HvMsy{;}(X!e&^sZtJ7<qjBv6ZalLI2~Z1JnM9jE
zoPF&qQi2Id_BVJfaw37MbTw{Tfb-h9>)DSt&6Fozwb439fnDvHxwq9)*1-knSBU0Z
z092MW6M|4LlXl%h7H@~UhtT&|+8-3jy1f{G>9dF@9>iHPN2*Xhvj*^2+cfjyRsz?d
zWure~3+++h4%dA`e1BJ6u#%Jm52;^;G^yzKDWv4NP8}O%jno3nOemkM=Uh&{nVU>{
z4zmvC+KLSGnmTwj24!J0;{C+yuj8ktWH<~hDL~M3kndOGKuE}xxU%QUoE(La080b5
zo2ECtes%CUpg<~|tnHG%X?|n!a}y`WUQNU=GS@JzK%qm;XN?lQnhEd)R0&Ny9_KPW
zDUH-*RD&MOlO|GvO2xAV7om%jL%Qi_C^yc#bYWP^JR7q0dV-75r52lMVEy<Fo!zMe
zJEe97ODso&?QjnU<vR%f;&8V_`%FyKrWbP_JU9i@+YLUvq=IKOTwFR*7&Jnoo*Epw
zNF0YWe5FQqY(dcb8qo#?x+E5H)t<T?AKAfnCU{$gR5HDXW~Im@R4LUsKjB&>4C`mU
zC(Vu0M;?}4SHYP?-8&t;JI);c01#>s5ylZFJ6a@=H(w9$CnnUQro}S4s-%Bs45Wpt
zyw4x=L)rJ<1|ObA3_Eg*0bPxYT3e}WSLES}b~mSqCySG?`ciQye;ojhLv>dJgNGR;
zPz?<GfD?nO(Kr?iy3HHBd}f>%O6D6U*M~PR2J3xIgctKcAg>^r@5&}pEFyu~7BF!9
zWpSGP+|GxiD%*SUqU-z6`>2~OMon?&4Z8?eu8%4zDo9R3ub#BlmIQj{x24`pq^0wW
zf`MYSn<LgskMrgseu?5zeBm_lyEM>~siOix`J7147X4wby#`HbtLuhZ7cg;*XWG=~
zcgd}l7Z1sX6O=Xc;If0fXarKVB5q`7B!`-9`M&nqEr*c(X`<S@$_r7#Xs5HFg~K4M
zanwDr)rdzpj=2{wvFl9Hcmyv~=n&iGFk+$t`+a?xYqK40gTve-WzO%Ls~s;#$LgN-
z9Saxg(V0?Dq>+IhNc761d}kO8I??NV^9hkW4Fzq6M~_MhMI&;<RIxxD&;&TsHf1uR
zgRg6%Evj>@S+otP)l^}PaaE%TnlH|*9*ZQ2#PVc~*xF6w<<SX~Uh5?uS^U-q!UpSs
zdkVyWLxzQ=N!_S0?trly31YB#3Fc#c_<*Ha1!oDaPNQ6bolqQ^>~xj$4&7U2Jw=wT
z#2XDgZkTZpunmz@sL-{TNvii@SPiSPOl`1Vq3c@Zk&Mw`laC~Wt?n=&o+|B*+who+
z3>95WXW7vBv|(eXTfdtLrc~qosk1AE{wzbckv*3uJXBuK=4*4@9W&bZ!D`b%483~7
zvSY7%jEnXl8&8=rxviLL=)5u~KWe2YUy8TGC{Ot(We~J4HofWmbP0>`R2KLN2#)}D
zZwg{6cL9gV-@;e_aP<CNh!v|kbO%{)n3jeQrj3%mno!Is0uB$Hf<Nm%O+v2|pJqPC
zJUi%mM&c&UeCzjc7SsJL2g;p7STFnRX4bD<MYEllg3;fOuNrUnapXVSlr*0d)QScF
zYpiVG0_L0MwPK@k844`ssAa;7uz;0DO4e4OnbZc%J2Y?*L|K6u5cl<Q6JEjTiadU#
zFx&=HzhP3sXG0bl<L-Vc^9<ca*wY#Tn7V4#en2TDeDXO-u!J&~LO4pP(%Ca;3aS<j
z02oHBiL3oLRfr|5f!cQ{q{<kcB44JTYjG(H{6VH7iEC!NQE|q1ZxXDysObUpyUt!X
zF>hFb^c6^$ZhoqOzXK;-X!ZG<O0)6Oc9CXf(`G_sBzd-1G#-YJ0U|@;dL#NciL+~P
zNawh5&?#wfq`no(v-shVe??e`2<Bs0vOzzn1Jo}+am-8pX*xnVO07GV=X-j57v9B_
z7iGPO++`y^;eJ$sR;q<d%Q$(yy>$8#kVS0mbb)g)EetP^F`7|-+YgAs1XR(|$`hYz
z2P^3H9t%erD+jOoRYTKw0>J{0Lg*X1@eiJZ#%y#Lx?9o8fvg*njia)RVhlPiZ$fr&
z9ZqLd@dCa}fGz_@WR9T%@oU{~B<!Q`T4h8W>4#Tp+g7o8fjC!kj=>Uu>!gi8kWL-V
z7|WIy_#6=pyzeF(MMD!SbB718Eq41TvyPrW06o91CLB35)~DRYE5_GO`_;93a2MO2
zZ`(GUds#eT^gUgcih&QGu1LIS@j<lpXhU5>ONV@VWqfxl!7-i<H=*jy4&7{^o8x0X
zx4<-(4wyEn;L+z@gN}zr>?Qs(y(^2kvXXk(?~cB#8qrRw5<f;<HK)wA*jr7jxYK2Q
zY-i@@H_wd|uPhvr@@jlDYd_RS{QsZ;ipqJMy1z<S7}mc6ng1OHko;eP%zq6C{+}Vt
z#MS?g+9ly)llGq>%=rJNcKw}0`mfY3V@CtG|G?t6{kzt+qv@rzCH{AMN5wl#R#9qV
zKa2#}4LpDbFzhME110`XYa?Y!{aCB5$pq#E8`(jZ-kcQH1QQwH%~dX?wMA*y$y(f*
z$0|G9s$@MN{|iqZfbaYFx>M(Jj#$gAIm!990}ljc{}TaDCt~x&GBiZU8lzv`+wZRv
zh0{61MNE+0G{%aMX1{n7ewRZ)oFoP9fT)*WD^m0*Psl>V^f3L^tRjMIF`TKP8tiQs
ztrpkyjtXwVyo<nO(XL>+^ZZzQ@es1*+*t0oYvA<ZkXIeJjnLB2#s0D!IGuv*hCt_5
zC7wHPvvZmi%AQA0`=V)&@=LXM4KAzoQ@2;x<w#?k?@u66xMkX&tcA9Ir-AG^Z^q(*
z>oFOg^dS}!^p&u>sk#aIQA8Im`-AS#f@An@60!A<!2W6GK{2ipV{Vk-XoBlO?)#$s
zhWa%m=RM|sx|j)sfWu35w=of#39&F{_@5}w6x_mnH^Gsgl{q7C1-+jKB&Ui5Ib66-
zs|xS=o;o9NcD=<Jjo$|=<iilf#>1Tr?S%A2hJNbD8048a7#o41{FR4ciG$KR1(%`E
z=22;Q`JIi@-Hp%Z5qO39G`RB;-l)}Co75Pa^!od13J0}e|8Qu)Zr@aZA;vI65u2vT
z!6Lv~dVgjmF<-jG!h2yjy7Rco2aseR0s`7H(wNOHU%<}`;)%hzkpP;S=_m>Dv!=2@
z@+Bp<r}bsPL2hH`ITPMdoc11ytQv(&hq+7vq-2mb7-Tvn9*65kA?GxQ&?%xlXYFzj
z-9omutG3`Shx$3V-QIlgWU<aY!;hHKnKI)Z1qIt=HQ12XWQ^1tZBzz!W(sNdTSm4U
zS2HoyL{9wlSF4{3@&uOG=L7V^OCsK($BNr8$~OAnh~8nz1>DqS&Pr@?+Un>u!~3~x
z)>K&?4EN53*B4N^`DX4yajH|VoP1L3S0@$o4v%f)H25Nc73YUZ3l$sS@G#%87&|i%
zjuOytGBxZe6DS$apl>{g!s-rR8LGU(!=Zag37`QUrbnuK(8)B~>!u}}fU1s~2HA3e
zN)p|`F(+E%=z(8{V`yJ#6@0-U5l}u7A_2jT3y^U%N9*k65jy4V;{?KfMw4K>N7z<q
zGC21TNJR8F5c~oWq-s|>H^bu}*{c*g=C=c>BgpOjT^!x^n^7;oy5}RLZMWp}SNAPr
z^apbNurVjB%D^7)v+abNRPWaP&Ns~;SJJ2eG)8_kPBTn1G#@Dyt;)^cE2_1dsw-@D
ztxJ|-0;Kt&AR_<%5rYb+5?}*g9tSLhik|^wb@VR>GIkPx#YMP13p|LxMAdv|O>Jt1
z**!MRSaGV7Vz#}OI;7x^1e%F26aWNY-?{q0hlrW5DPm{rO*UavSuD2&QOMU2M4?F(
z3u*qS&b!L~pHGNyYl_B|5dYR>wQE71jfv_9=BKsEm-WfNeCcnSzS15Zz9x|#B^`g_
zVD_pevodh#A3CRxc>JoIC#3yQ-U)3UVYH1OGRof3eDzW6B=(?TvMXD(%x0(+=zzoB
zN=g0)VecHDS<L;5*0ycCo!YkBsi(GWw^L8escqY~+o^5aK2P6!e+Tz-&bfc3D_QHi
zl<p@x*-3WF5K3QxLyC1ww#TiQ#;+mNf!ZA@s9qYu=nun)+G|hw95ty%8+|ilwLOpK
zMx6GxMk=Bz#zv~5aM1BsuELzu8)@DR)EdX;DDHA@?Gu$34GUSsr4q+dO&_E;4io1>
zx*FKX^{7n*(v`8-$fePFTuYVfGn9En!mh0$mJ=S;(iqkL(k4$Xsi%{2=T=h&LAG({
z|1<jP34U;q%scF%>+bESUFa{Vz5iEr3wv9?VBAV{hD*mwb8K*^-NZ^}3LN*d-V>Wd
zX3&*j^~@|d1m03^Rc!kQ+8>EP&ktk8vcXKTRJ7hL3?XiJUCD)p(Mm&EoI&<04P1pN
zlO`MOg7lY-9SgM<*GT6C<X1s=mJQM1qFQCR3$Ok=Vso`F2{gr?+v^O_MplgEz&X5M
zQ5I6}Q?1uhvB{xkY@n7$F>nfJ%*;KFUV<DLxrm{~Q8WJ_V#0zcg}r3m9sAETcaU=k
zkYN!6#$3aML7uy=y-5lV@@2mzzbqi`6K%Q|CZaKH%|Z45^jdF5tcDFDwXc~hZ$XlE
zb$M?EJDzqL?Ixr$^^L^h?i`CWK0u#ra+2~B2jn!2k$Cgs{eb=J8D}L;KUjh}Fml5}
z8?J~m_v^XzP5WBqUi*62gdDifI3~T~lScfotC!PAS3hxFQB6ozinl1B>!XizdPFto
zr;wz?Q88wv>yI=xhLuxwaTF){T$Quy^MZ{I>9yps8+>??OUR;joPK$F!Q+pxi{rk-
zqT;A(=D_u?j-o8wdmj+oiS3b5EO<r>>OwRh1U(K4&jZmKxthhWa!6F#{xP{ec~l?v
zg)~*fz%`h!wD4@6R8j>qaY=jF3|k7{OCp&pyR}ckrj6(R)h<lLCyR<}+2NQtj3-4t
z`dcV^MgiB?apNhol&AMlbZ|%^#4J!gHwZ?bq))<Ob+XTqIIMHk5#*9FFLE-$SRWGk
zUJ2qqGP^az;u_52w!DL1y#&cw4O`6_DjX5emBc~$Sa>NYOa3lHwNo04*wdc8JyNOG
zUqNJSj)ufSNO7FId+818vKv!Z9GpOg4@`Ix!T5`dv14g@vD9a{PHdn-k^d}1P&In;
zEe|~|Ln7T(<;D{Fvo_oPb0ei5)XMzE^yK>)3~*sEQ;xo@34S$CO{2Uuh%~RA?#5mX
z{xI64XtQEc4;#lbVQ;v0?ioXx0Up+tt{>;hH{yY5gy504yUu?Y3Ymo;=HRCu4&uHO
z7K+nc8*;2Sm3{yYBaAZ~rM_w)Ky=&{je{U!eCa9}J&f~=+caX<w`w=7<K$x6GB&={
zs?b3lk{fziGkAU@hS2hyEKqWOB6G76d!pzb0(GD=H9ls|Uh&J7Sh4r<^j)|1GiMX%
zLrGC4IkJ-)?tsdFjwc(g^(uV(N!Ik!xT$aNVEyElFne~O0dB{|dsjJ(J294MWyj29
z-ALl-;!fu1;?3>q@AG_Hh+V~fi-*HUr0!qa4~`df0wkV5%5I(JDfxz>=iewyOA(pX
z5emb;bR>{o)|V8Ki>m1h_Y_hpSf_M08G4Nxb0zzB8xy@XUAQ3+SXgSvaOF_qkHTr^
zTrz^ceh?6<bJ6vNr|Y-WRgg_%@T)IGerWFgn={~MYddY>M-A%q`f*S~=b=7d$pveH
zxg$tDx+-^d=JQtcYi?eh#L(<T^#I9rT2lLN7iABhbelq6In2p3tp3YSWDsc`_dpe>
zgxtw9wV^tkgQJOketzKITD-V6!u*`>Pv(p{EGMHOJ`v%U<-61$r76AI(O4+d1IEjO
zgw;Oz<cg+LEMFgG?3aMitG=Im?;t-ZATw-^gT1Swj8J)7Y-O(20SomO(gkiJ5B3IB
z48nekh(UL{h@pNWQ4W9|`VWFz3>IF%FUKx>0R{_AKPVF4M`!LYZ{N>Xxp;Y8Hwg$n
zBHavJ^Wv&HQrbAYSYO@P^~b7B&SC`8VIwZg7#g-ZUNof2H>SYIn=oS6u=Y!Tvhd4o
z%&s|9hu&e=l0TdqUHkoKj?u=QgCZCP2q=x=e;%6ue@C~t|NGIcje&*j|NM!{e+_OM
zF|7bobk~4SRM>zaxSZ&?PK+dvay>Y!m?`0{A;mD!K<Je)lr&YP#!8nSyRV{E(c0zI
z(5lb}&^(5{y7#Xx*z^%~$w~J7r|D?LIL%1xB*YAeD_Bcaff7`w(n5&4(Ye&Gi)-Ip
z4<D;x(&*u1=5)O2JhaPJ^sJg0Q>AvIFpI#|mx|v=iRs;YlQ399b9~I7n1856_4goV
zy+8_G<HgV$mw_qxLzPmYznnK@IKul3MyQI?fyUuhp<vvQ65Zq?fln*4bewZ|3%rjO
z&zhe{fMpHv3X#-4x!QZU&jd5-ZC{eXDQrF5aKfek*$}Q>$p}cr#Lm83XA;r6(6HJC
z-;j61Y3GfJE4T_GH|5$_QX6{574`Pj-TqpFNE_lEORWpEh=op7H79CD<uLnkZ%k(=
zGyvZ~v0Pun9mH_%woSfs`85^_^?Dt^SR7x9MUsX~UOyxp(Zc^QrW1+1ikFv2&21ak
zzLTJxEEhjMhs-Q~lUQs`Y+M>Gc%xCPomU1wF4yE73_WSZZR1;+*}T^VKY2Iq^VkYZ
zgc746)C>#Bm;?Quz@#fE{?P_sZrfjh22l=Ni_Y`nWsfJOJg8CMBPq*+@Uim%=G;pf
zr+<+bWxaA&q6!l!kr~=1)QB|JQO1Ro5;0P<F2=psX+4&QXyacStc}1WL1x@1fSwix
z2EjWh%D)#K%XG{x8qu;SOJB;uEkS^90L<cJyQwvmimT9Ob+Xj}hPT=xuH9>H$f9W?
z)hguP%bL8`q<g588V-)Aq+I=iqVGrOXi<?vRkl%(WCDdvx`;tRc@+bgyU43rjpzQu
zLtI_JPD%j#%h)<RqZu_x8%nyal)n3ZcNSKqzQn}ID`pdu<Ek00lwUML1yt7pqEQHv
z>yYF9FqoLx-_Zx%^DxSX*ywTv2~pw$^?6r!dQ&GG&g-Gdjm-mo^5Ko4WX2(I{iL@(
z=l2()(VxNYk^LATr7TE{;@ZvXHrCNpm2w62%9<Z>oP{H4nV6S{P&GjV(c}hyuJ0D_
ze9ZWUCr#@xmKQV$`c-jAk8;K>OcXL`n9|FUfoLK_5$NeOrhZIgHw7Y*yCLWkxAV^9
zT@Hs0GZPknZcx>w?fy+~!w^zFjKgQKZ2tJgR^}A!{xoUL=3BN*40oL)z4miSPcqM9
zCyc4N-Nn7M6;zw^63@L7&jEFnvu{^(Z&f;CI)9n8N=40{veOYa)Q1g6N51b9Y42sf
z4Uv(fF~8>-B7Y`ArGa9>lo#p@^ujb5KCOe=eUngY?zKwy(UDz@*1crRe#VavTj$Yg
zEzb%{vSyqkKXPwpJ6jjt8I#WnME1mf4p+f)+hQn<doW6cz*+0DdQ6okHn%oGmIX8|
zwU7d8#ha$)ZG+b*W(77o$d%HfcjJoq({)wo_Q7jPZ8ztTo6K@_mtam<eCK9xG{=q0
z!l(ZnvUv*P=xAwA*9SI%qIbkoHGIlc+L-{o_|6|ClaOZCLoj?Q0tHdxdiT&jSZ^J#
ztGdY78*yD}m|kJyc7lF-<2EpPizmIf7hNT_GcIGgG_Wm(ldgazD2ALu5)(!kD&Iqv
z32=8j8^@82#E-Qv7V1b#UQfdp_A6<4;ZUgizqn43Od^if!c@K?TcZbbg_pUU(Y~D6
zD`|fzNO#*v61ycP87$Y<Z0qU@Sr4&?KT%IKOUMv3os&h={w>q|PJTqqX0njai_wOI
zIeYDWwse0-5HaO-fSIlfAb_#CChsp?xgc3JcHVF@B3c9+4_9n}M1Us6UDO^I*}v)9
zEmD0R>`r3*{q>)vl=2`?d?j!oplPK4+mrhLu#{qB^uK#fUub<ft+t?iWp)co6mzXD
z`@`?YFBLi2NGl&o_9gB=ygG&tGlL{zt(m3!w~l{(x{|+W#~-eGO(JsKQ3WqpKIJF5
zHfp6cu~v$+-rgm8B=%Sx(x-LWr`uvVcGb%s3W<)K@M>@}W6z=AS%~UVc5K{>z8x`L
z&jq(RWq))POcMR=EHx+O8qMe^HpokuUFo`s1MhfC7H5X_p0jmz_u3^}50h_SxNNL&
z^}=25IHEChmPVp-JetV9V5~NmMIfcj__1^Yb%%;0hoABpNr!ic%ArAr=Z6yHSiWev
zvh`fHV9B`rFS{o-8)6v0{E;LoW2KMS8rjoX=wm=?=9*iN0Vy*5&hrBNfzn!9i@p>L
ztLu!OGO;5%0UGx29S1n9YNcYy0UbxyPwe@ba6_D*X-UjG4;S-Zo|pPx!EITnH(Wzx
zsqw~BhJnO^`Qhlgk_t#E?IbO2MYhW2uVy>(>N-J#y_I|P)IbVpF<PS;BpkYq)eA+s
z+hod7=R$x3nv~hXmZM&xm!v_U>hy;;d>RyX(Ph>>;PDU*;-G;E6AKUN3{i!bpdXk=
z_L0uO@1EdLuU&F7AF_y~w04WhKZ^#ojJ>gl`eRl?gd1L@(A?*+j91P&b+s{#wPJCJ
z>d6Bn4H;xcSi>-6rb}C$AYCJ@Gt+I#y>0}ZPukZhg*AejE^0Zs1o%052=rn*R|(mK
zPm3)iM+1P$&PK39op5HkcNnKmya-_T{N+xuk3h}E)N2Mt_A=s*p3~yD{k7A)Vo-y+
z$4B1e@q%K`z>hL9!PG6pOfPFnA`;pN(r4n6#ex?cI=3?d^T$UBOHj$tGZ6n733a+Y
zvB`w4y=~6PB{gQ9;%2sRs|>DIGFFPiWKR~FG^B6*>TPVGe1^FGL*ut0iHj@b%67g9
z+$#?{0ItHE&S#UatA$g%D2N<nyv{IFXO^E#h6Dao2U<Do%=IA&xy?H?Inuy#%H2#y
zA70GmrczrpF<l{?l|j?sH+FvHtd&QOQlWD-hr;e#$&_khYn68sMgo&B+ivktK#q^r
zW8vzxo(;xnF(viemhuj$hCRdN?_{PmgP{#hL@KfG9_RMUMwaP=J%}GM@Bo6OL(^<O
z0h8`=33j*AHL{3!k>SG(>e}QlV%ooIi>eb%O}5Uxj}Y+|;@j4$m*p@(tua7HwgCa3
z*5lBs9_djj$y_v1`nw%;^|LmYc|xKmmT9&|>h#(gK&+1b5GR(IGK#g1^ooGpQiZO7
z_heugP@a@lx5b(^{Di$C@YYeu=cXne!=f_?rr*Z$He}=nWHf*~);!EF%u5Xp8lohf
zaD!@F=jX2xcSyb4<As{q_5P{;_~%%C9@01~eb15h=tcx1@}-PB2@&kt1?f?AJi-^K
z`d7s}+drE-#IR|iNlVgFQ@~X!Gw`X9H$4;Pk~ggM>)JjRvZXzWgh!sFLgg{cz*I|d
z9*If`UsHNL>&lptwSm$(@By|O#u75fKrc&L6tt?Oini`;Pb6M6anZjfCJ36*o2>-s
zf(i;H5!_(UtLyoAcJ8PVQ&l>eBWRB`jnPtFXxktr4+gjUt0qs2R0;@O6H8R8R@HkH
zd|upCse6!hhs{i>-+&s24i&ext3F2<d*2#KsRk|*wQt(ZJll;SEJGpkUc!h=@`8Qa
zgqSckq&9v$N?amlG<YX3mW$8(EmfAqi6!kyJ92#KN8+;|GSn6yOihQO%I}^okR$54
zsh^`(&Mnd;f9XiGW$_t{YGQ?(&@i;M(@e=hqBwqB`vzVP50LZ{grN3nuk?g=PH`|1
zyAM8;?5#x~IV?F~grKNq1T+sg=Zq-xm+#e+WbNN79#L=wVi^Z>G<B3v?h77bOvQwC
z%sTj=yAHP#xnbOtm!b%Uj>TaDE)rTiXlY?dvn0Hf`JjR!$>6`=p+Q9vK9v?Mn<|77
z3)p&>&F0lP=dpMPzUxS3M6P<A180sP?PE83ZS*Cbz*w2SnexKq)=YAr#aYzuwMq(j
zqDyKBBS}V@hHa!v%Olfmh-x57<Bwg>A=B-Qk`r@Okz^p|nedh@^S;ufFFv9|mPJR%
z)rI2JAnOwq?0K>}(XnR5DIDw%|L_b5g0X>s#Fd3ZpwCFq5khdK@2&b#gNBPj7li7c
zE#togl}e(o1tdL!3+<60WLpy_f{_FAC_ui98@xeuF5Yt(kHz%Tn|F8)BJJ;jM3?Ym
zQ*oQxk<FPI@>g`}p}5g;V(92}+i+-__`ftHa9*-U<x7&xRL`P{t~N6bO!)bIUN&@m
z9cCg*bt3gmY#8qv&bVoG82r`+<{9+5ITL%#d6a~<^6=?S)q=cN7!(TpD1|Ip33noM
z53)V;L$0ZVn5NBHxsBs%H+2sGCKeD*zKwV?%ssR+tmOuO(PWROG7uZ+<E+j3W&^IZ
zHj5Ke2}%sb_O_P<d3%3^W7O!CLt!2wdEdE7hAwE0*<OAU`nnPP7}7AgJbjFom3Gar
z;|{Lf0L}AsokPznPh$4L2jnfpg^SqnTD~SEo;ds)xo4)KJJCnSyu0R`!-L@W<k+_R
zw5eQGX1}`f4Z&x(2CL_BNjCX$20tA<BKW46(MAV&Kf9>(-&%h{<N4M@@V=`4x<mpl
z4Vu?tY4i=gdo=InG{s;|gG4R7J+_QV9bAcDFe<F4$&IYgM^0sR#b35DK>BfGzZb^}
zx%x@}2e3yG2VQN=<qLxUS3;$BEF>425d-+BlPmF&>)Jp80<_|uF*)oeJM$kAhIvkp
zYD82HGO|AjNye0ci!m5P4r}+|O)=Zo<TLN84Z-~0&~ob$B~PFN$FvUQ+Y_d^@?p<U
zR7(CzVE$O9F)~T+C!`&6Np2~bF$eEzbOyl+J(Pu6*3nzBr=N^(8Fg;&2K-#OPZ#~U
zAHGZk@LRr3p+Ps)&hjK?gKnxf*PqP2TDq)4n!#-I8%~L@Tip|1UGCFPs4rt)n<`5k
zX04Ui$VI-NR9X6R=ONUpTV0=nMtY0K`b?j(aT~7hdCpHv(<xQF7kMR5(|n*If%}g}
zcf-ojy$+e8QQCGGNAhWiK}VqoIwiGrDNFQj$azrvDu~g3)EeB)4yw9uJC;rL9n&jn
zL+rHHKa8|7U&5}d7^E`jp`+;m9ry8*>+NV15^@^F#UpjeAZlXa-6NhIzP1a#ub811
ziKx8%R_+FJX3XdhCPJu4)ReZkx;M=ax|;e_axOg<GkbJ``F+$3hhFJkz0Y&>Vh>9`
zye#;0QcC%pZE;*jMaa7Pc%vOs&(3ugTKe+2QzV36P1S#Hl5r_S8tC-Zz$QXL)Wm?a
z{!rd<qu<DjW#r!_)%HE(|K7FPpP=%XBQHMKVyGvSAG9kN`{{W#?9y13@@H12IrrU#
zvq9VlH&7*I-`$=S=Miv)_pk~+B6F_~2LbeA3Uk4(z5RN#0s_L&hstg7IX8c;#9lPt
z=k?>q_A`@N_W2d!^iWU&;G$z|&UcW8kDKcaZTt=2C}GJk4jt}Qtx;4hi!{Q)zabzZ
z!Gpnrxkm*NuQX0VTiH3Fu|WsbXW+~~i-<8tWE^X4ZjdiPGLyi(jqX&AOyC~cbbVfx
zUCFm(zOJ1Ivkmy2+5(wBb=y3-wGGsy7rCXBpL>4trF~6XSis&iA=$$sH^*}+)zhL^
z)65?B6Z4y;&PlEU!KZ&McS|H1gEynh%t=c4Jikk!dJ-Ma|7^VC6+xz^WaM`chMX|F
z;kAoi{_D9%7DlCFFYssc^2@Lr9|0jI=5@GcSPC=haQZxOq_DtBrx2Pv8Zv0-OW}oO
zXgERPvBuBa{Z(j~Wj}m&s2fh43PI}7icBI%@2$T!OU5_2aDT2=*(HbJ4)lwkhoC>>
z_3FYcTj8xu=WZSUof+0oo)41sGOBd_Un=Hl{>9dN3hJ$6-&2jhy52^LCvbWOl>*sL
zDAzNsV_&CGg)U;^rRLPvwCqb7r0&FECoe3xFD0h>ibad8j#w42POnQ}GiYdrVhqUk
z%kOiFt>nw=;Xl<1Zqu<>pRnJ{uUdfd!5&~6k_E;8?akr;u!3o0=i>Cg?AH75lRWB5
zc59q)zE9QLYB~08tPaZ7h!>3-)oY&MbI!+e7p|c}xy#a(={6q88LS(RTQTuT%hB_!
zCv3iwba5mvacEM_PmgrVLCvHX$~{Ny6REg2vNOpkWPe3ju&>edk*>p_j%T4GEnvE(
zI&FWyyxR2jmlo(E)n8%T+}uAFIKIY@0Bz2SvhVCou6(lX{pBqx)#rsMcF9@dk6Vof
zExzcmb;Cb`x3wB$GI0izRy+l#>*5;^QSI@Nj`#N<1H+K{8yzNrD71!15MweX5>ULR
z)_!68tdZQ<FMi!uOgeD1rpNFKxdHM14qcDG#P{YIy;ikW;~Jm1E)J%V7|fbiOQziG
zS^5zUDN5^ZaWS(j5qH6EZjh{o>}7B`4?ab?+>QfxdS8keuewI=A0r4M>mSiR7s5Xe
zF>WE;yLr{~2|ciW&fcqZmPkso3MSWa#A_+6-Z_>yKq9K#-$#`Cqbk`Mj_OpBR#H+{
zgs2uVm61QY#Avgb7+NIPO>D$l7UHbK&1py1X;1Ls*uJf#6WYuBnem}Okv6g115&)x
zblM}IInmvrG4P3>=5BXv8P{wUX&w*%zyenybx<?#CA>AXD?bNpDqa>e#%ajtJ{hC-
zD<h^Ud{Fl9IRlqt*0Ir)_v9W%S0gTjf^SqbGl$rv7g#*uESa_tmZ@@?JLXl@NKlpQ
z<!v{$s>zhHnNZPcLkhmv<^=mR2E#-`$H%$DmjUoZR2pray~>N~Cfh*+HKiO~l|)N%
z!h1Xv-S0|mnhoasgy7;ia%yt+a}t41*@bD*53m_d<+?-l3i9hjNeycr`lE-E+(NZd
zRNQ^AWF?RSFd6D_*$rlB8%2m#4`QXVaqrb6V%&LNlgM^!>pTs|*%I(_xK`Ul;(s<Q
z!L3s64;#UebzCF2HEeC`lVjStKdTe~C(0BDMV5EH9W6zqDvgBS`brm7=|7!HHe1T{
zcxMl_FwRFM|J;!Hxt$4PD^j_~9?WeklDfCa*7J4wsWKF8ji@g%W_j-Svyr}cv(%B!
z@T>99Y0d93#i~LD`rI`dH2%SH!X1BQ+mkY#DCZxI3t^Pgr5*d6kxb_;So^=w#{;}P
z*;}69H~DaNo`6(}S4Zw<W|0EwXK|GIKOAlh6cgs?3#{)|3pqWsBA^opC_K}adwll7
z|G^=*+(OYfZ_g;#&7d|x!{ZSii9c=nVYPH`!9l3|EN@hT*-qVEp33NrPqV3tC;aBA
zmz><H@foo7?<6ZI^;yc8;`F2cYl7CTA>r_uOm5OUDZdi7%Bglt_ebT8(h$ds3#=H4
zX<+Dv-i@P8RnF&!n`_g-loq%aQJEBW?s0(T_Ke1n#>Hh@$){ZPlb=y-fI)fSLym!!
z_$|K{ZEPJ@u-VPIEp1k#ZJVI?fXzs)E-$RoH1ae&oEKe|47~P_tXcO;_fxyZ+Rxj8
z@AX?vDmg*3jMn2Z^)YswOSRWZ`G27TbWL-z*~_{SbMJzmiGLw(8jigwb8_`$9O0gK
zOFbD%L*7r5!q1_d@y^=?)G(hcNm2{EI+g|0&LUvCm>UXz+OgG{4BEo$(?)C=xpkMA
z<L+r|fvfFlyS^;-H2X4h@~S$mOEB!SJ)}trvn-&$zMS>>eLpHKXH`gM!2plS|7B11
z|NnHjteu_JPkU7ZLu-@&u^s!ro|G3pXLe*<@mo*8?*eG{dgm^Wvhgnj0`_MQ*k<bl
zkNOjRgsVXzMcO~;E3_<SPJQ$bKi$;%NuFWFYvSo1GS&lM?Rmz^NJz1+AV=R1Il5m?
zuhaXtzT91WJUBn!J}xe@Kc8>fBMGY*yM4R8oo-HcJ}x$Pt~cJ+5HX)ZxAZ;_P7iM{
zud@l0kE*Mej=I0xy*`>l$D6P0sy?rZ$E)qGd|#^#?*;UDI|SaJ#$yl{cJw}<+tt6$
zPF-JKr&HXX)SEd%U#+@%yW8D0X6!%HJ>Q3x9^P+mClTG$Qv{^J5CsU#eBJ##GTtvQ
z-pbRneV<N3$KOQe@qE2L<}WrD`ri<TbGN)7COPb2zI<HXpWM_1HamC%z3<)x-gf}z
zGj4r6c7J>lZocoOSASkU?>G#e-W}+1mCU<)*Vi3=Rh0XAIrw=z+uz*mIaJ;af9<t=
zjz>0MAvOyzI6u34`T4P-9!f5Tj&~DW5=QTL2<Yf-2<UY2=xpHmIlK6|YnZ#ee{3A=
zJi9YbJAd8WUM$3@+aUt1$K(+3Y3p)NU8$S&dbup#Q?Mh5o@n!K_rAG#e0KkOphHht
z3;vP#=1~=Sc4o63ihkHvf_P{4P;Q%f4t2QqfZW)Pm)7uZNZ`W>@@((o#7z3uzjau8
zXjf(X>Fwb2aB2U(rH~S;ehKBQ`J~6lk5~NcN<4OU_+}Hb2h>f!%lXAS4EM&lqqnKI
ziML4rzVGt!v9o))@!HJu$(OKm_<6cPPXF{dzY&9J$5`Hvn7xR7#So*i^(l!pNoqE>
zvCi+^8Gc0P5$cxmWEXSx7yAC<o%jP6VPIOs59%vf;dL)G^tnInj_EU9Z&x7NNsDlo
zu^(&;521TRU?4Q}x#q}j33?S&>i(Tr!T!Alp0MpNzs@Jy86yYWBJ%LpM<Hs=uz@^p
zA7jkdjbq?p3WuGqrs>yUzg-IA$BkceF1;V;7YbmO=8N+a_ekofoAR0I)dcHnQs^Do
z?|2uH2TRWQ<@c~H;o_@E^M@n8cIXvU;InnTZ8iT<ceQE011p%Fon5r>*W<_FMxMb_
zwa=2@*Q%f2Gh=9WjH$)Y{+h_`mR<Dt>&tV(X-Q3}U*#h3<=RV70;mpKbu7d)c;JuW
z9)F-*O`;6EZSdga#q9?y|7{OJ2`foNbFkp7#aIF+zxiwb0KgwJ&`_k;xup}p@`9=U
zh~dBlqo<bJB8GxNNEx8~WDw3Efsp(ef~9-F@Yg$F!O4&fJ)x+e6a+KCgeaim`$1=g
z{0&J2+hEc`{~)dWB>?-A0i_@*k*qRd1u(wwb>lZl3&B~6xahA7cdbmQ44R7A75AzS
zXWwV}tad6AAx(;ST)<yYGSGMA_00wR(2MvjjCvYGSjbOSvhPX2B;`|6@{dGXj{cz+
z$NqhYc@Ky3fmn!qx^Kz-fUu1QXFIk+F8@6UXND;0ui6VFTTebeYvwJYr66U=KiV(-
zya8`>hy%iZ{=kKe*hzjhijD?71psy?;@~E=Pa$}uyjkw=W`faG&jWz!XzV5SF@XV4
z3=4Qrtph??C{V=XL_bBOVDpAf0II);d~?t(BE}wXq#F;-m%cRZTA{1*XK$jKuCqEo
z-5AQ5^AUg_5Fe4FBtNE?9;;&<01Q79;JCpTNEOz;Jf3e7Eb&_#+jGsa(08pya+}f%
zq}40~ohJZHOQfHBV`)r)3W_bh(QQmXBhprb)wB9Nh|B-Od5h{xKimzetE=%gw5tzT
zc<*&;jBwu{gI;e-`y~i(28sq=?UM-d9;DCw0MXGO(<-&%T}VXVi1*)jwX?Z4q}c(Y
zp+BlBPDhe}ISq4h=+GG9Jx*$ch!udp#~+5(8Nj$i#FCiXd<!X82xL%m3kfYmCf5(Z
zL+K-1WYT;I5+1ELk7`U3pyCgf)CchAydV*|)B4SL>ks|;1AyhPk&meaG$-PX&n*M^
zgB3}Ohd0Lv(WIlXIS>H+iZBjmoLVnIMJQf54s`%M<hu8&-}V!MY>WZ~#Hj_Zzu9i-
zWK@g}5F@1F6I?7S--U9~o|#+#4TI?>7N-DuWibbFUjG15i!jw;9$?_AWiXp8puG~J
zvUdSspg9yDqCJ2%vDgL%=qC$ChD$5Q1z758u?q~a&>S2l@)8iBGiR(BfcnLgn&aLv
zLRM*mo^LSf5HSUS@IydFh|{;Xb&ehT8TGf2^qatefZ$BF{Dou%v}11E_%DtTHpIY!
zas!|vP37AGx)MQJYeK%k2tlOtzhj{_3`+5z7@<FWTedcabCj7RaLiWI;Asa?)>LQy
z3`j+T4ZM~4x2OL?fWMoUdEkz}$pOveyC4AVtiKNofWuQ$fC2^4q@?wW1;uHQk+T6L
z4=9;hXAj^E!to#w01<~=S7crT5K|^7sQ)A*aEJ|n7zT{sMOAeIz!XMeD98Q}zhd&=
z+3#KevInp*)~aVH&dQ3`Pm#)D=u!*NT^xIY>;8EHTBxAGEdkL}qyi^g0{r{ryz~&1
zTmTU60@$i90El-1^m;r1mAcM3bASNC2wyu~7#|=)l2^(uRyEy1a_MKqF3oTOqCiz^
z?)=>$G+V_F+W>Cw`y-eBYXm@I;7|B0eRr`^1D|7nPEIOtL(NkNfC$pEiOY8&>zXD`
zZ0i7r<<V^lJ$r6s>%uC}H8~y(JhTZ^LcooL>OK`O_!E3MSHI2Q0EJHKFP(ihgrhjM
zEqz#k1Ha8z0ZLeMji5_~bgEkSr#1l_CF%j0&TsMt2Vx^z4fGJ&1O7kF|Dl@{VP+?C
z-sUlq^x*-_xoEqKLQlnVH>Pz6-wK@#0kxG7vQ(7-5n7sXB-@#9{3`AiB>)$HO+++6
z=r#b8@AR`_G!*Dtl)vWs4?t#d1}4$jZ?ymgHvqso$p!|XwBV7TpG)56DT0{<0h~0o
z=Ca@D`h+8L-z8KE+sWs>K`*x!>z%>ehXq@X#7!0e0|zN@OzNq44>*$8sGRxavmtPX
zc#i_$3sT3oqvgOP<9`8cTC7W*K9z6thd2}j0FPh_F(x{zUB2sKv%gCn5kUaTg1=Hu
z!Q1>|UTf8k)kby`gnh?8pi~2`fj;@BiE3;f8Uf+T>qW`{6yExE+<@BW9v`JEfDROR
zOo-#p2Izpo1%MrFIX3S8-v$V4Wquc^<{55)c#J7y0rXq;_~-3>`)uAb;SR`FQNwNC
zcOK@(@^%2$2vbXz19HU%BoniF_Ia-r8*v}Nb>ZU2O|U(a`^|4D2s^aw1+a|jA$Hi~
zyP}6qhHmpe`3IJ!@0$Ivh?KVZk0!yOz9oQFdGR83>;V1B;iIbnk}U_G3ScCTf0D}<
zfRrlye}m4?`k$bO?BagA4W_C6U5M*Amw!hElu&CUo4s@ZX9<we#^dc}Kr1_O4Sxdw
z_a*>VxohFWA_1`ivGO}MP@sU2=z!wxsR6Q?=nfAELVBbrzcYZhiWm;iQ&9gOolxhB
zfFQC%)-<?&tNwT95K{g5AmH;Dq}%;CTN_$_1{g#(<!jxwwjR)>)yv1xZ|S_-za5QR
z@*y;Ov0G;iauTp-$Gx7MPN#6_O$$74-2qobx;(xtuY?j-`Mx^8opc4}n-3Fuzn&q_
zN49t0FgHeqzR->J4=zmd;rIMiFvGXy_j%p{42$i(+*4!BCMDVquLguIax{inU>OcR
zuP<-+4kp_@)-T{QpI@Cj3C!LucKR14i{JV`78E!_5mPYltefvj8^+rqpXq0f#1GH>
z@`Jd}v^K1k`~<T7_Y%0UA#Dz?9P|Vi4bn|0<-y-%>!zo-`Tt~q(#jY#_0=O{7t<zt
z0u9J$YR{yEun%l;y`iL#bwKK+EJWcg3RRUHaH%?OIml-kZM;(VwMA{at#ncZCPzW#
zZVZ@HIhe_j)6%Ydg1Y@NZVi6%;?;;dz({_arV*bWo_oWT`8v?{{90|^>b~rqGsAOt
zHa_9_g@pU+GzGF~9J$nc+wgOWxXCq0*Y2@Z$SK`P(2)eQPA<^qyh26L7-?-Xz{L<6
zI}|Y;zOB3oUiz5Z$u)rI77Os@Kd$5uMuY+GvUQMyjM(Bze0axR$e`kmu7A`d=m&et
zhOs^vVnV&P(?ze1^0FQ3Z{<f{u1%W?Co)NVTkmO3|DKAqMaHoNE__o7gu)H)R&&}z
z>yx#`$%tV1po+irrPocqN-z_v6XH0M%2ZmbT$x15MDfCK3U$i2MTTx&wsn{$%~8@s
z(8|q1)wFax#s%%D;HW>tkcEHK<R{Ll5zAxIc=$7vL(~YFiIs`*CdLui1#3enpkMuY
z`$>|l$EBZ^>4{dwdiUhlvI62idFNy;w3*`le0asURVg4agh^<3RZS2LJi4=%@A>KO
z!XeTlBg9hN+WLNCm_7t}!^+dt6)t1sF5vF7JoKj#Rq;yUnF!JU!}S<VGyU3f=<by+
zZ+2G`LhRK{$8^8p1qAi_3EkpRdKU30&pprh^i(mm%;<EPHE`5;l_j*t<)$Dti3pq3
z{?>h*@+P5zP~F7k#<6kD=+^ujPnRtXKCZvqHKDN6W|Q~Gw*T^a%*=KoNAI$k453=b
zboTwaY)!49Stet#YwODBxP9S_^nOK#UkYc_`$O6BqpowPZt?JsN~!zMq@a#-WmKK{
z)B~nYMTIjs$D4OQyZuHJXsy>GpMWha2es!AeuF0FKYRGrU2B&8S}w{aXl{z2ozFi}
zuso@^NmZYR86!EuKqiWYUn+|aKRRqlhzbZbk7|9eN-SqJA;WpFuu>-LUFDkvJ6dWo
zT^17@moQKari`4}o0VTTei9QS@ZdbTnJAyOz8j94iQxRLmkU7Yu7zpUnHh@up{e~S
z`v3>no3P^C&s9+_EIh%MnZcKm$ftmg)L@JXQkbP0kNo!2vF%7FuiBqfb|6Z{So?9}
zcdd|h?dUSaKybORIN%1WBfKoGx}seLG~*7{w`{T4+Qqj_#t0TXYS5P!`d$5IvCnP@
zuIVoCa(GlnGGQU`mmr8rMR`@>q=U&gd-M4qIU>6SG*Q~<WEpwaNc@(}S|17oP*X8x
zk!#)YEmkh{<?uz&IZn#9lV0-sB)F90A7$BY<Vp&#mv!JLL=y6376E9QM=H%jV4(@D
z$YS7v5lH8UqEcNjx^YbX3?o=-C|aLfvnr6p5|DGV0Us1EkK{@V6!m1_6QX?$pnuL`
z^62}b(GBNWi#%W**ONsJ_+<a>kO_K4%oN2RTl*J2wVcx|$3~B+A~iBYbJxJ*kNjX;
z#u&m7b&{2d|AkRW6C6$&ZYY#^q)0q+3`c~2{{-|mrSYH*mS)0H27e0r(^e?jDNk5!
zWfH4)hd4+yqzkfiBm!e}IrhaERTCUCM>4JzG6CKT-ch!7^RYQ`FXK2Kj(e1)ow$Y=
z&0~>ViE;(ZvFx0)9BE2fbTvsdKN0tq9m71M{ragau6q$9h0+|m@$Tu%DO#=C_R1Bo
z&~e}2GM=zT*9V=m_OH7kJWG?#H+Z3oKm@AG3w}olduiL^>NWNv^sSj;9?`AZal^O8
z@A!D(v40~0ZVmB?(La~)l3?ANjaSofy-Rhg+ulTHaka}q;`hL=*VICehIh=_kf!>F
zAWf0g5f?|X(T-+Pms6F+(5;`2_cXtGm;pb=nxi~hc%YHa<#-zz%-L^;MuxK)4z#rz
z!<S(8gTm!UI_rpRn+RHmdx20^3|!<?l%9I1jvX#l5XUH_1z)PC9P5ZW3U>@CL|#m6
z`YG8`91%9sGPvy@g~LYoI)?i#?=|G&I)9hrJ#S>8=g|0?$;FvL$Set<MsWS1XG?p+
zh6?r{6=bE=E#^>YBcg2S=u`@WLw_7ey0;K%8W$M3V9^#5WMqq<3Z1g5|IV7eiM$+?
z@P6UX^V%TzH2}7e8s)|&MlK5T>HY+)Ugf0wS9Fp0@|SfwwLYczP`cl)GBNs<MUcDu
zwDgdb%I+#dl8HsR%xrr4h|JJNSzHru4d|MmOAL*fN>bvZZ)hbU_LK6^pmbT-obL1W
zVp3F!TP$k0msvwG$$EaOgUX(%^v~|74C&>Agd2*A5~LHsMYUd&S-_1(e@doMZ!Az%
zmS5s;sz5J&fI}K&W5y>uuwh=>TZ|;Ky7!Che;SF+nk%t7>Z&27q$;syApQABm*EPI
zY;*7qCelgBboj+ps<Qs0V2`Xq9@|Z&6ov0^j!CIEJLR6T98BEqroPPU=&&`5ZAPB?
zk4s4QV0^;X(UxSM)5jb>?U+1!Gy1(~ewg(<U!rU>=oICHU&qESlrQG;EuIv6>=_s>
zVfdrr6vpLoHw?`6py8%r^fsH3sm@EtnJ{OjL)ttu@Av-5Jcf&tQMBGljF3pM2*}G>
zCLKp3=K+D&5MtBr(Eck=q9$e&k6XIILa?+SKrn;|J0?0mtsXg)Rx~-Du8N!6Yy1sb
zHdyxRq@8<IA&&i#d$TUKQX-L&crefVFn&>(xoQ}sP55W5QHXtEGVMx+&0lqtk1mhJ
zZ|7zFE_Y$MMD4RLn{9(;#29hc3tHLxZ2|#dtTScy=pw}0hdmX=fu%pgqN>FzU3Da!
za6#t+12@u=J$lZfzOA~PYpjC|nH4U_v087R_H*b%3#%daKoAuz+Rju5<+l**s;}z+
zujY`A99F}#v`6s@q<35rQohvI^cIgp+1)iEVv1i^hsU$CgU<)Ytd_u4huM?nl-E>{
zE`F7-Y7h!8<lp|#a<{80M)KtiY@jQpD?Co`=8iv~d&6t(p@pCINXiqnvfdfT{ev6X
z(Xg!=v`mv5?fq+OX9|SL5i>FuCy`Zr_y!L$2hdgSV;(BRNs%$~F*11Aj8r?yvH1p?
zb{<7}gT!#-9xKF%R_+>8Z)T(Jgf^t1m)O<h)@V|7TY1fbXMp<gA*|6j>{zEz=kgGf
zPPR4w<hxr;3aM@FsW<O5JAT1&cR5%@SeCRqHRQ?5^%Ta6{?{J=D4y2Nz~l#E+aNox
zD|+^vgAP-5E4RxvOm%Y+eZe6ab-2M%kC>_^a?R?5d6u*{jBpnl8=}$AH9|f7Y~4`<
zE=C`Z1?zsG(Wv%my+%)sp|f+4h8#|8yILqKBiADx+s`ptb1pZByBeY~E_I9_Qi2XF
zo9fnr;~sxZh@_Zcu<hQw4$vAhQsz5P&9M|6zou@O=u(%WmPW8y(wuM|HE@~qzdoiR
zwj6cOi~v$^QroyZI~gf1SP=<Mq3wg0QA?I!U2FlsZ_P5H2EA0q9eLAr<k)tHv8x}(
zxW%v48{@7MjJ#}`i>uuZb~@`g(>_VuKfg*8WS2B|=znur$SlWc{(i+tG8D_^qfE=a
zMOa)a`4uj<Q-Kz08L!%#Cy$NJ+xill@T^D~#7^drAJTM<Rv@x->Q94~U4lltN`fsF
zpBi;67Jzp-IwqYNYpM;J<SIMD^W=y^b87srXO<p0&Zjhk7535==}BpB-@A>9@+I#w
zCMdk9=HCp?wA84(ggrV;#y`d(Zd<iH@kvOUD^kkZf$XHN-X#1ed<XRMLN2LHMQ1IN
zQ#1E;W%07m@%4c~cCN5-;z$(1)%K;}@crMpTo%OV4~Nm3sODI&+1R6bEwx}*Uu1(v
z3`X)W;ms+r^dg$D)l8F;bhC5u8d1GPLMhCo8=~+z<ncd{pNvh(a@Xs~Am>0s@{$r0
z{_alsD3jlVcFdEJ8XP1;z4#Mn0ZzI)@UdXfC7^F7YDHHs^Opt}M=R*qtpI)wAR++|
zXS$Li+92zzzs4vSULO@V3k;BPcTgUJt%yw*?v=WMRX(vtmPb>orKXXrxv2mg{mZ~E
zgl)m`v^=^H*QkH@D>mwGNU%c+D?i7c+-~S?Z;#e`dC=wyzWR1mVSS-c_}shsD`foZ
zY5v8YQJEa13yA`a>_r$<v`08VR_Js()7qY*Z=tqu(qo!&eVg<h2+{}K1Y{FK42$Fj
zkk})+Y|b>OsPJfT^555izp1wOkh*eaa%}m8J<gEoqi%!R#9`PBfM!RirJ=+yp_d=G
zu345ol*QZ=#K`-~VrlptfcFm0mwr&|KNtG%gf<2`aPI$OYJz`3BeS(DETWW7*O@Gn
zP^LrduR;H1s`cfzt7p3c?cJOxdl<OYt$njjA2Z<Y7*;za716dE2st6lW}<(*AK8~1
z<d03hno+=o=zgiD+eBZmf4~{}i#XP0^_a`QKDPMZ;+B*4A3E&q6(%rg0kAADu}qtM
zLLumk$JPwp;-e(jcNxlSXSjedOpxhL&so>_z#HSy+js3(GHZ8NQ4fTdJ_4QIlZ%wb
z_`pKm-|m-5d4{~ytSg6PM{5=^(x==J%i^zvsQ3Gc(UCvnv%G#*Y4A(oHdBUE{#K{7
z2A;9r)>F0_jYM||JJJQr?ZP=jvrrwV7*f<6%6SWW>deSlq+m!1wl}D!zj0}F0=KrF
z#QjS`{YRb&uq)^abb5uVy+P%1%~cJueIGrm1HvMlgtpN_qUT56_5hOj9H+sN8%+dr
zR)=d-DxTFCXn$Ph(V8GA_!-Q3aJkWo4z8kgifcqtkK6E;XOUS5dA#=))*_8XB{qmu
zSizAz{{2x-_@5ji?NUCNDyKVXug^kEcL*p|a&&;B8oh*#VdEji17e<Dp(w(vPCF^9
z-Oapa=P|D3&CFXX!WV|7<F@-wffBJ@med%q07J2&FHp`7^{;;!Qk<NGrI$!VoAA%&
zlh2{LS`;6?JB4wB@KMXa@cAQ2T#72p8A9lhSDt9?V!U>#Ohw-mBqHr6G-_D77ku=w
z*vH9gQ4c%0)@E*%CkA!7Ns@<&1e#!~eGySj(;jdR)ZF1uW1qd*BJ)QJq|vsgk{gpu
z%-t}Sa?!e2BLTE^5w4LRDp^Su49FUGR#M#_<8_PPp5(uqH@hI+WfD6_$y`gYSQhPu
z#O{w6Lhuk*TA;p6Zd8flEycMC5@51Qm?sS+kcZxJio|$k&C~L9&tHdqP{{N!n1*MF
z4&V^iMHn6r-oo;&o)r53!ok8^gdF1BW(jA5@-UcawZ${wyUwWnwQ4h;>M6R8pwX^V
zG1*e3{y8#y+qwi?xBDW=51Ir9PM$@_ReTBuI$gTk)_E9TDls>ezy_m6wM<u6Efgbv
zkj^(<dT(BB2Y%x{t!gMRiQ)GzRjNYMkyAXpq09*CACEAvo3^1^$G|3w{;wlLe2+0j
zi8$SVVy?c;Yo-flf;<I>l9eQHgobEBLX@OET1uFEZ5!fQKdU2eC;cN67cr=>zz$G7
z9QvKgJU4V>W+GDZTB6w%ewU;gnMXf?awrVC-~((c?0h7hsW<Yh`&|S_wvXYT*7KJ<
z!-`z#{vQjNWuRnx!~6>C8GB;q?{)LBK`kxWYs9&~i*eqU>~cokqxHe-9Euhr8bJ+3
zxzgm`3#<9)uU+#oe_p1Lgz1T&Npp9a6#kfF@CFt<1ai$eRWDdA3KVWl<T1!hm9{WU
zU@r-{wU3zcacS6DtQ0P!xJp^cm(ZS;EtAytF<h{gRJv!Chv!CMy-QEdlty6DI0s(E
zVj|L9nUnCkd2N|)h_Aj>a^u=VuL8S!>WJi3E#GF8+14+qL3TAu3Jw3Qm*|z`$6aLB
z9K^-~VcP`H^1}D3{~T=*b(f~j@pM0CzGvPF(vk4K`iWOpkKI#2Dbt;1QW!=`dFH}4
zU3xm|^#-^5oKVPnUkAcL4sL^=(8MeH8J`t70oC46|C=~jA*2SEc%{~&U_SSh(x(SR
zZ22W~16i$;!Tn++Uq*qt^SFSO@*g%1Ie26tiucxvyTQU)-aC~H%rZ!JSrAti>g{gv
z+T2ZD?w+Rgu|~5~OVzm`jK>qjNP~OGS^j|2@?Ew=SC(oA@ByXRRsK<>c}tn!C@@By
zn<_G7`S2{}VtunY?&d(6Lrr05fEQUAF!82pw$t`+8dYPN4)4QGXnFpA++3DR@SGYT
z&=7_`0=2>4_z>|<k%HQzSOw8pD$1C)#1ovH^J;TsPq&)u<3YJNk@iyoIDp@)qp32D
z_5RLGz*G~He?W2wlD4&xQW$D<t1(^=F`{h3;_MIV1G4O$$JU8<l##T{aC#d#EtHvf
zP##dY_1-LG&4HGEB1E~xvC&|BCqZFp4)-OesY>`?LjxGqeQ7mOK?3-(;G@4$K?Qvg
zNHQFV%p(UmF<frBOyc?(J~D!YRqLFS%qyY7g{ATpBLnu=*_nF;RRz!4JT>r%(cp}G
zH_(bH*hjGBy$|p>PkW7t2<;8QBs+%%tD=G=MRJ;F+@1B8pYx9F`6>32;S4PanQ`B&
zfP%{ftWTW~7~tPfwQadF*2cJIL=%R3=#=AJH2jnCoFhij&LlzfuPL!1b5dt(fiwz8
z&Sr=dSP;Z(M~3pOPoTIsW9E{a^dk}()ud%4sOmI<Qt%2QCZ*1|RDfQh*D^rW;tZn1
zxLkXC6_fEgNa#ot?Ed}*4kpWJ8|91@lc#aiEmAMg8OpsF<0=umWOwZkQ8)hm3jnem
z0TRXuEDd6eJjJz)9x7a0tpF6N!uJN*rK*UT{+`$hZD#q17|2Y$YtL3ov)O~JD--V^
zNC(qk#8HulhR`8{5G_V6l3_CFAtgyHjgY7`he|GDnk@EW@~4RZC<ohsu-FCS(OML<
zha7TdH<)#*ZkIJ3^<R9D#eQs_Di8Hk16P_yypujX1Ihrjr7+QU^wLL=b=kUshVJ|{
zlY%2c%i!;HPKEG#dWL;8JZ~dv$2hb?NeSB>uFhGP)NZ@v)x!_$=D|&sle%zQ&rSiI
z^<RAp<%JxLe>o<Sbuf7F2|qngL$t(wzy}J~-^QDphXoWEkKRuRH}y6;dAz$$IGhFU
z?vZbKQh?3mO_d+lM<;$K%QumB?OyIoyE)lEU4I@NZXeCTarNQowtv1Y%|Kc}{9INS
z!Wn2-i-xZfWmnS{Y-K=*NS;0a<z<Fmb71bcg2wXOE59R}rLWtZwIAWh;N*G-shA%v
z|JuCE&*Go@R{5+b+fc@tvXAO}-Qu5{Sr%?p#e4Ky81~r=i90sPPG1R4IImXH8%`WM
z*ur4uGBm83lryk&X`Kowg9hKFlt7;h&$L{`B_8F}f;SyY*51oLpR~k=GYB<21_mqF
zq?Uq&#SJaZ5FL&`rW36|7oF&c<Flf74C`1@#Bb)Ktpgb)i@zgDvoA@4cMb@K8P}EQ
ztnfEm1~p|(rUF@F*p2CQxRHKG!)^6ax_D&(Q8GA?tA1gFhGaw;#Ah66mShR0;V&)H
zqzNB#;#5sLa{|lj?7D@qqsnT5HW`KE=Fy;<4D<a17OkZmrnMR0?E^;l!x{&n986!3
zYJ!O6nspet)?9}rMu^`kI5bt??rT~3Ny;8(5+Jdc8IyRwM^KA{6}z|H!q2k{#_15y
zy=Te`Z3zn!^@irSPKcaQo~Ft{S@aKlGd6z`nzAQ6`yW@AHMJMU)GXsvZCv}<BmTbn
zc=C7|0wl_Em-38!)o*3QI^yS!k`LaWzglY~5;kzta$M*A**!yszD`BdE6i!GcaCi}
z!-p>H<`kRy>kSV)pTbbW_#10S8I`dFE1}$VZITPXkdih;yXCedrdtZD)Dn?^p~RVu
zfO`KC4YxNUbd4d%kx1)<xnR6DhJR}A9?0GVj)V)%AivSyZ&T%(NgEIRL?&lSyg}wg
z95>HDQW^&vBG_+LOuWW!iowq)0t@lQDwG2<1mTzr5X%|xRm4&PnWYSg%g9N-zg@9N
z6U=j54|*RqTVDrU!lv&I-OE_*4f79)XQfCm{3DD#53G+jGOlrSq(1DFE-%7A-P4E_
zkNyaQ%qIyyT1Fb`fPZ{@si;?A{F!_FIl>zFq918=2m{?ODN{z21vrXVp}<O|V48(%
zij^z&G>5LnI*RBA{>XqW37QfJ={o`^vXVb_KiX^;s4}J)u%1Oktd+G5qck&!sjwun
z5OAJsZ1@M=R1N9?FUpyQOq;pXFB2`<5z0ih7HJFU;_ILyFtWd?bh*irl|(ksEVbEz
z;;tZ0iYzX*2iCN$WK$R9<cb}JGMegRj*gi{%|^1frm@ZW2Z_n?#*~VN0)Fgt6r($u
z$4eBiX4HS{(dZwu&VQzlT^GrQN9}KgF;lDY$+TLjv`(WinnkGNDJc~k(2(|l@YHIz
zhEW9!2J#1nD!JnG;WAVF&EOof%`?;5?DOUsDlmtJRl;(Kr1F~2LNYQ<`~}C@*2_CR
zu~3x86In7vW|`rkB(A1D7i!I>G8g^vH_m_=`lB98Gd+rT9G+_&esG0TrAK|v(YElI
zlHQ$-5xn|H@!GOvTddhITjhE;y}&f!Vf#@EaTUhaqomK`un2~-rn$Dj)7>>yf%=TB
z7%I5hS`}Fo2EIQ7RHN1~Ro7q4*-{X-cQ-;?c;_7?Bd`(t#2ZyaulEB2I-Y2yY5Jvs
z&}sTmmLY7FXq@_z7>An(Q{Q0_x(wDCWgV6F68iTrCRkEU0K+m<`F~^Ut-|7Jns8Cv
z-QC^Y-QAtwuEB#dI1KItcXti$9^5TRa7l27?BV-w&U5yD=3=exuI_&8t*V}xCDnH?
zYESwCDbj~2WCCEp6>R_p&*Nmv6|?KSwr?=rVlfF?!@Fr4`6dOHr()e`DE+wJ!2pB-
z>28;88DC=vh<jLdX*7B+4*}NxeW0r^7~`Csm<t+Hoj06>tMdR?#7Oi54Yh=?1{HV{
zygSto8+RI9sp1JYpdSP>WhG35`3QX#r2ze(J)q#HCM>ux#nkY?>;<(_YE=23Typ8X
zsv#$kaKZMl6&lrom0)e$g4CKlFsyR~jCT6TgZED%ZWjXKHoV3048(f?M$}%q?IuBJ
zh}a)u+<P$>VpB&yE7zzGCEfg!q6kP#c6DF~-Xd$uwKr%0LvX%n&N;ad!4T0EWp|TY
z$~-n;-CoLVA_pgFTy4j=Tlj%?6zW7hYk?rd3{UdVPZZwm*#p1y8u7J{^uid-0%pE~
zt>wV<$U{qyXjpyfr9g){07R0yC`)NI*W9c|Vl|)^dY~l0DD#BUDAfSDt>dTEWMcW9
zLMp|@XhrLOn8<~V!#t2*)Ym`sAk|RWx>#Dj>4B4<Ok=&G{-@~(P4lIV%KF~^hUO%h
zXs=mu7&A5&xjc|TaiVNT9<B0;c|ds6ZY_tu^m3%NJar>~M@%D~lXrwM{>jN99g!l9
zjmkfXNqUXYxQ2=2P|}NXmI3`xq_?m%JyqeFjj+^aaN7X`mY~EixLmBHX<iHPwbR|u
zMrA_FHJp<AOTyQNq~Qx147uc@7il-nF?lpOPbuyZVNGzynH(Skrq=9Up4KU?^HVD;
zY=55YRQ+~5AkE1Yb=vtPw;AyDEXFTz&^a~PedIu$=XP@XWxD<L7bLK_U9aHeXXaW9
zn4r`X{x`5W<2b8BYMY7vg4<C-3V6qWBW1Gg@`3|4&IRA0tf6A&CrrTwdyZmin_1JH
zgv}4eJXZ^C;u`WT@eEfQ<Tll)?SNV;^1moWb9t(_);ZdkejTQq)S|yf>F$2)*-yQ5
zIv$O(XAuQ!v?x_G@^4yS3hc3wjF0U>Uss;|%x=7n`Avcb^-Fz>FkW$HaHPmkS0Q!8
zTESR-0H41!tam{HUa*m_7LFj_-D_q8Q@UD`Q<5;oJJfyPyMPs*Q7Q5v4$;D|A?(WJ
zX0OKRuMAc<BW)@;0NQvpW0gJO6gVs4NZmHtQ?da1O3n$p?g?jzA?e2UguDsdME*><
z37|w4T^YJ8Y>{$e_f!jb?Agh>{7+(G+}vzjLska>aMQz1me1#o$G7ZqGt?g^uY%4N
zgNvMiTnkaKNLtf%BqpDH1c!?S*cA5Wflf<aL!kl}1&HoPW25z9LY#tPCi-bB&+kk-
zdR(i~{Dzy)Zb}dQ4dp>fwOoQep+YL0QsX(#>AhIguPSCkdWqR7dxuwaEK)?ckb*ET
zom3PxL*Xc8YinlX%DT^D7*RB*5$2A5%$Cl@Z>JwVZr{*?J5oep4=g1LQPn(S{xh;g
z9ixHO%@CueJ1IdIgSJ_+W?dLwz@R4IQeAtjXXij*I6F>5pB<i=;)oMICQ)Ufs!7|>
zTqAa2C$}P}2>eqK)x)vrq4+qCIOZx&#9NT@kYqKE(El4Q!p=;-qx$C$u@U4b{&~Nb
z);f#;AeN~={J*}pt04b?*tb`-r!EvCdRSWu$1S9YVuNA0Gq01o%WKztvC?qs*MBH+
za=6=7(`F88x(cC{*bN8UT)pwm0P9fV-Bq^qBl3((hj-t^wJ&`A*=K17Ujhszy@$_n
zf72Ei5-YvlvLh|Vm_6Mf58e3&Ze~X&0|Ip;8Q`DLQe34LgFDqmbkiSU85PnoHDj_R
zW_jMG2Z*%^_~~tP5j-pm2g9`)&X9MP>EnyNnY%A2eH}8ftIf&Ns-mz+)J%yYk0QxC
zqw{M~6N`fRV$EYo03Kjr?((ZuNWA*zL}Wh-4>kFwJXKK=Wf|o!e|HV@^-@NtdmIK=
zq9ApAd&w1RB*zI?$6!Y&qW368s|k>4|Iy|95gfF|{YP|5q<g1}uUpul^4nkQP<dQ4
z(vO~3)PznE{}yLo(btbF_VdZV2O2|hJEf1)4wI?IKB8xgqb6@hxR<;M4PV}U`F9nK
z7nO5kBjdc2L)CjJd@nFqC%}2dM8YVKJ5!Qw#btYmIwM@VRJyr2HmJy8kXsq{vz+v$
z{?4s(H1J?RQVpkYw|#kU^;`G54R_dY($NK7zTK)xKpVBDx5O<XjT9%B7Q?D>lr_0c
zOPA0-L2a0`XjQzc<iyG@R@(S=WV&CAKXbjURrJ=vjQWbmg}x%_S2KEy2e*MLW(NVi
zhvjd9`7;d<edAElQ>cnT!v>16O4VoN)!vpTyu<&|+%+#|#K*mCLfj6!BRQtDefVJb
zMcP-^Fe|J#Et9ATDk(e>Czwe(dLr5}bG)FDE#Y;($pYho*py&KC!@x-a00!yf?UDA
zasA%`&9T+$jC&(jAP-kBGbh*DN!b~9>%Z}<0(OPg{w&kXwbB*ph-f5@t*<3FB9|g1
z20B{~#k;{c5Q1`r#EJNVx%Mr;N%S2-c?>ARk|Z3_5RphJFdi_pwhnexM4VpR(E2~<
z|4`9!q>dAC0EcNHq`I^lU7Z@EI)xow6fHWuzsX=CF%cTpeG6%DW9>tT$b1N88GW)t
zzK+2UB(Z)XqI4voP}&aMWw`a%zex|R>xY}Ns2)hoEXPNuHwm`@y*-dzSHiIj0sR69
z<9p(TMrdfHrm`=HKutx0eRGRrYlN%>W5lvlC1!v;iyE@ij7F~uK41nr0po|IqQxgi
zz`%fH0yvhlvJHA0?*yYIt6NLK=?iHIL1fdRmrFZF300y8%J=1e=MHpNQHouaDxmiw
z>oEmh%L!$fBM67k%V<wUM{gF`4`T5a{Ido6i4iHY8w|vwu|`MRrP*%IQ-u6hAnB8i
zflJ5uC77>{bP`-*3*1|4WE&w_3x*rGHdnFo59YUCpu~0ww}qcaq<~HmI8j#2qPjT&
zrJ!JufeJ2Y9{d5BM4Y$CL-n{Y;)5cyJ>9C+h&jRQMw{Gd2Dg;+2%~<8$w<1X{_oOz
zo{E>^TD0RaVdhyqOW828B1A$v)dk5^gN2UghZcDWe}{`fG)8|G)RlALz{XC=gMfxS
zz@FfTcvMZAq<@$A<p5|uZ*IM)h-*95$q(3u$KJf9w#qeZOlRg@=rnCu<eV$(y*Ayh
zGIRgNA4~EEQNFVn9w|af#T$wQzZD(+nqEp_7J<{+T{z1)aHc164%&p>TeS8<{>6B+
ztM8U&>Z3B$iW_aNp|a4j-}f<Mee~AP9;;FVNUoQ5&;n#VuHrHbyY*N>m(VTXHY7MO
z<5T?$XQnoG4^4Qyg~yPMBmW**1-(37Kb#mHubG>5WLkWG;+v0*=@KQ*aBK8^eE8AZ
z-oBbI!Zbgs_~ll5jQduEU6i)6o?O*QptVPU=U2C~<$BswHbuk?g5iRZsqG@ySwjQ?
zyd4c!)axjM9g6GO=yqu0eoHQb!Os9wtv{&sV}A(J#Hy2sYcP32RCUgn8%Gw2=0t%i
z)Fd7!qpnLF$*)W)BH}>}SszM;bIbW!Po+N=DBFbHt(rLeI#h0ErsNO;dj4A4dd<~k
zeuHPC^mz=_oZ4k<_1mdTviMpG+7*&zbmhJW;ityyU+Qp_ToL37OE^^F2-60KWjSg|
z6xk-Kr5<ggxt9q_A5{O#&pHy>2+f361omY);Ce~A@-GAm&+kAx!odyOl94nLvnFnQ
z2gd$XO7?xkO%Z=)NxAc%^v;(qs-5qHeU8lU`?-$>saI1g3+v&(W$KAYRW9-DO(g&2
zJZ9d&PhsGyUh*>eB?48+bHDJ?U`v7Raa1GN(`b*sn(@l9!SI7aB!=+n?%J{Ydr@CY
z!s2P*D17J4>HKnPgkij^gI>f*0zGnENcIwinp|yo*Z`xI0Y!V=@%*IHjYIQD-H52%
zY4mH9cf<*UJg;kEj^>vf>{!5vyAj6oRe+s#h3Xs(<_3&hYjrObn*;$WfI7$X_i-ne
zb5R|=Zn>C*sh^@8tlJ<%W~QR9cLZ8~fcO%&^J?`V54AZBXI!Q}T52Vs(7qvqYfLg@
z^tx#^n(l~@Y0PYZyc{gE+pht|yV~O8Hmd!YI%IUiTlV-bu^RGXQJ9)&N`l9-&qTw_
zw8jV3j|>$&lH8r})xi$-9E0*)cL5FfROtI1^ie$F!evf_nsWlzLO4*x67hchZcs5}
zX8kE+Rjiwoc_0%V)l{TC`17k(iQufB#a1kbdQy!5vH#>$aQDv0eZjv!so)m*4W?er
zWlycn=;IAE=u-H;cU!D8ju2LCYd)rq(TaggZ(n)|JJ_miBUOu4s!;)er6VD3)o3Az
zL}l@1i8qMs4?w?anRi!TA~2DNl-&e1E)2V>ofaJzRiq6^FX6;53yIi|6vN~Fc>I)7
zFf!Y^BrPX7mZ~KxT{vQ&B$alP+Ses$O_mrw%}L0MDb}G=j)H25&r>YY`Lmlm-G9zW
zO5B=kDJ3t`Rsd@CoTni97T~e85vtrTF^MLOD_cu7=6Y%a{On30tyN<#|NM`}K7e2U
z`b)@itNa;aS4oR_x<|?v=sXunRfRK|Gr2u=(pc`lTT-4s>&9Q$*i{wclgy274E5s3
z(@OP1iWHird&zK6bo+HCIQ^H@4@?u6a=UrSV+wV32fjyat@$9;pf8D$MlYQf+eiWQ
zy2uO+$Z0Sn$49U4Vc;I48ZT)jWy`XE@~N+<jUH)&F~sYepFyN&5Zd0wl9RDiu|yx9
zD}>P=?MX6NF93_Ps9uTgVoA1~y+#N^A-A$*n8?7Xr^&0xAd(X6Z?TUMx?xeFaaAXh
zCs)9r^4Z;_vJVj55v`*Wps+Pr(Y`cJU@CkqIu6OcZel#agWhA2ZDGd?PDU8xfkHPp
zVw^ToJEXwIl648b*!OYAbd<DJmz1xQ6q6N$K+Sb#q>e*ZMwYUKvZSl4S9C9~Ool<o
zZ%joVA-s+y=bLUH*D!+xb6{p!fG}pK!K8wuBV?BlE-UOHhO7YHYi_Di`*oOwyq>t0
zS(wO6R<qtg&<MFMHM{2G3Xn2c$H6|VrT=+(W%@c1`Uk2aI&Z$n-0?Spn|Q3al%vE2
zdD^IDRAThBpn)DNM{=&9xfZsx{#Mt3n>w*@3Ow1$0>nnh7ffg^IF_VrFta!y7foB0
zo+shltMyUY{_tBR=AGIa`fL=~bUT?r)|B}HvFyI(&jyJ7A{*e1fL%(6_|$a3JkywU
zRz>i#HmUGpTe*n2`@fcs8^y9WA&$e_8%rTju5T%r$~e^5-;KHtq-dg7r-S;P0rEve
zDrdS7jBR3sI<T;7&U&tAGB8Duj()>b<qpI8bhR-niorx?YcMCV<P!D4GzZH5@>P!8
z|HPWz#jso@wxQ=C9`*yHi+WQb5h%;g6x^y{Uibh);492?<&u9asi(N6OkLopu&MQO
zqiezaTv6IA+xf~zxHPND;l`x}w3Auf4`c)u2=DN~70_1|ZmfJRdJvLQrJv{fnT`q)
z&yvH|g+k&x!SE3H!E+_>F*Bc%WA#nvhhCJj@$DE+V)!bjlMP$^g0i7k4V`%bni2^L
zZq|3)gKc1?;XUEaA34+L2QVk0JUoncI_*#eA5t7-Cy9yFW~yf)HTvfB5T44}`r&s1
z$<zb#D}~AFr498b?sHjj0CKls*mxIqb(gjiE|8A=``lE);O01nfd?vv$$Xr5E4yk?
z)IP*8ri^!WtP?rm0Zvr)-*4dX?-AK^8R#tr^DJ{o8Xe`>aW!~4sJ@kTYdsTj64W4E
zD#_pcbZ|sM8S&B{CIJYKdQv3Q@iSYvL6K9)&K*+>Tej%Cy^Mw!*HO}EzYRa%PJN8q
zq|5d3)26gR>RjfeDHKc4K<<Y~ZQO}h2v+Jr1E%zFJr=PK=8s`E%n!Tjx(;H|le}1G
zMx$U8`M#GQTF#Sesbs!OjmKTcmA4${m;r^sDI%|ho1o1l_sG}WQ$2E+A1#suRd^CL
zx@I^i!+C-&pA^W4{nFBtIkkZhV)(&OFrX(9iwfME0%q`Qw#MPt_s!6)bL+^0M0i~=
z92L@tBa-jdsqE4$@nuHwuA`u@1`(Q$(O&u$T*9N#7*4+>Hc86ge9=S4CJ1#4M%)cg
z^T<K|u)*fBhr}mUuVR$TebgiCsoeXzKUrpajo%geotqnsbMjQeVy-GrDN4Z$a|{b?
z63#M-*;HFqXR+Cf)X*{?2|@Y-^FnTfL)xzS`!`(<J%}a?6k12%_tlIGXBv!*^dE^K
ze$;Wvoc;`Da#}y24AG)f?$1LwgAn*OaPIgMmw;NEx)JRnzhet-e)O{xqMw+sE%GqB
z&z^E;PABUcn+%1UjHTX0a{GKqzRBo*o0^!)aD3hLyq-!<V8dv);jVvwtdC4AdCbK=
zRJ^bAU)FM3)(#kPozXI!(X#z5Fd6RZ-gCN|{_v_QN|f>TTOII6$Bc{mA1UjfUp>Bl
zuYYc~y)a3PXv!n{x`Yt^CQVN*#u)fV+q)i|npvIo)Z+cTEB3l81b9~1Ebsm^EO~hv
zxLIcB^}5z|exIBz&Uu^ssy`{j@M6D)K+eb%X~Jy?)-yO*Z|v0Yf{hb+*j68boz87v
z;@JUKy}gvR0&Nm!xTJ9Ib{#e|-+8B-w}Rd4#>lif*LhcwzEawEW^43PEpj!5ezT3E
z0v&j*yNI(36*#Xu^EEB9pY>&u*YJesX{5N5ITQKK4MXxTWS{roWi`!JOs~Dp<SWlr
zj9IPu@2-B<JQr;B9oWDTTcltUq-v8sg8vE9U&YAQF4>;-vwql17rO?V+-Y|qi2YXY
z+nP+p)>$kFtTpLy8pOGGc(s=-mVDpnHR#y7t1#KrC9DCzpCT{JLce!-pRE7lOtVyf
zUu|urU|1aJ)S#o&hH~$a?NTapuHFYl;1v4OI$$twYq(VJG^p*n32Gy34Oj+A7VAi~
zLY}R@Xm=&I6RY=8MPQy~JXKYz_Z{ehgoZ!^9D~j)VD1$Imx}_O&JE~yJVCQ}>ezb-
zpJn8@h`n#HZS@j-%D~?{gti7QuU424MpUoe{Wr&?|6lb!9xk20d*riKo~ljrT3Wk5
z+^o3w0j}Z;t1L+zHJ3fsy^X5I0m&)6Kh%PDJp!x2ZpFiDndWc~u)9lx02f=~Zdlsh
zN9x;}Z5`Pe4uHI7g>HUH+NYn!(6j`MzYZpBSckvYBIWL4GGe#Kd#eaRH)E;f>(Cm<
ztN6QC?S9i5n9XAA>-1w%kElnv{d?3GB=bnNC4+evj;go^Zsc#=wlL%V;;G`oX|5vh
zcgfjzL1xzbYH~4WT7dSHb}#Js^kvrz1u8+|>Z;orBKz3!K8Kw+%Sj{)H~;kR+-)@B
z=wd0y{L+(p7F9zseTxITFC&C+dYzFZdNI|*|0|fD)@8YK5@i?9X5N?T2#AnCl6O&d
zAWkgO$zgLfC3vtm_^~A<5F%pM1INisj*86N4fQxO9tsgA?_=ng9Rn?gvkVd*VmfAa
zI8(ZT0(^i!DG%i(t`6Z+1Xv$+J=M`8Cx+H85NpL(FkVAP=O2Ta4SjHx`sb9|(yur0
zZ2C7bHhxZTGCC2xNlmKda=3;}gq*Te7KUMKr-n|vs>x##H3mDiO6PY@tE2HgI8NN}
z6kkLj)V!v3H)fKC94QT{Xrz@WDThZZ8)G#tY7@&aO%+#Yn-mrhk~{@gjm*SI>WIKx
zqe9Vc*eT$mhozLIHp%uYhO`+F_EL5wnP?hlA!w;x)y&}FJK-cL*wLqC!CZ+}rDjif
zy5y9GOQPr}a1gjJ;|9SZ+j&DW$&{s!q~;M%`RB7TW!*ZZ1XV9vvT#lAOP{N($8@<3
zJ@-5{GhV9@h!LH^i?%3!ad?=MdcK?#H3rzuf74*sZQTXJmH3cos+f2gi%5LWz?eJ1
zSQ<BKRaHaP%`H;Gojc*?_JYqAl7~v26bPE^EwS&vk$!gd#nl<M*@`u6L1r#6W25HR
zR$?}>lUZ&sx0G}Hwh5G}uS{ySCu=Jp0Wz{N_nZb@kJQkol!W~9b+QfF82rkHnpu?q
z2gTJ1MbNQ(2DL%&gkerJ$ClaDRW$2s;1X@cWKX56Ch<n{Eo}f8VaD53V`cwpB@wF`
zNvc4(i!h|Ubsl);Xny9Owoz$#>TW=WJ}?7)4BCO_mR5<fjJJJRR&jm1tv)BANajx!
z;^Xktkom^5lx8lK<INSF8bj-*KJiJ$4D7jNr6Gd9Uch<}xAuN_oSR6|U0N1H>!HYR
zf3X+51P>9{QkSpG(ZYX2_<tOO_H*+R34nspEmi5Zm0)a?s?HbMt;<!7m0{t_5ECp^
z)`)Gr9q_vO1;j9L`Grlt@N8PjV-=#YABm+9?RtZi<RQW)o!+YC)S(*P*pWj!TV0)D
ze|0<Eu;U+(l?};Xb(aPe#vf^wd`x1Mx+uN)TqPvL5`W+cG?HbUfIh~wEeE2W@l{2+
zH9U2773HKdXw#xk&8x>ZZikld#4I#osHLi%(9we47!OvY#_cDv%wk?(m~7<f&RL2o
zvRAd|7npRNx1X(i!^*JoNae(1lvmdN5~5gGTbz?g&{3^|ou#osm0ny#R1IAM_Z_XT
zrVB5zF}5k*twBANfs1;W^%$<KCr7qqEsT~MQ4wM=2Qt~Zr7Q>aZv;T8k5A}<V0$sC
zTcz>UR=Z=j=_VDl->OPuV`)qKCscLXdD+U++W{PXyVUsBq|~=e_;4=~S5;TkFAN=W
z+AvB<ZRcGD%UuNOT9@+7vV!^Et;bq{z$uQ6=ax|g4NdHfT@71@V~cAMo8?LgO^NKg
z05pM-c!DWlB7b;gDqglOF5R(()0Q%7!tmGjhcts3&GNNNMf3Mk>Xl0s^X(ZQPd}yV
z*P<3*WJevR{;oX|>~En2LY?J35kl3=0Dl^p{o4cP0hFu#Z_S|hr8q<K%PkB`L$8W-
zE+TgQX#u9!l^$>E0YaAfGQZA3aKiS|8$>o#ZHA%rQP$8_W*3*ML@ZMA;Lndwue9vS
zb8jlFt5PvmH1}SM&pyUQAbpA*Zd#nX3{`ys+qb@h-jKhXN1t}iWL?nnzh1udJs-c&
z1KsL>KfT%BGxrR0_9FPa@KF>0Jn}C{{-bYGm~gcgR%UZQcO_fjs#@B399nfy(3o%z
zmw|L%MC0r{UfWv``lM-1A$VDR3su^MH?w=M)g)h#&0L7}l59}Hfj9?^bSyK3bDz2I
z@<j-6X(r&o#^TH;CL2$55-j9J?1DFQ{WTVhdtyw%+DVTIa*(`mJnasLvR^t%LA<+w
zy+0Or%`mp$TF;Y=2GHL?hCU<)Fo;24i;Ii-isr;t9NZWt`Fhv(dWdv{YwPi-((ZB2
z|Fi8!KK`k|hEPjfNyPNSH^|1Am^@z1ep<{qoCVH{f_BH2c|k$3GEcx2P?VMzP(DLv
zSxh~DLsnFFJla4N<>L_>hK%i#-HEZZUt60>$Zx?Ph9D$3bX71fo9dEAye1@tJ0JG0
z6Vhn8Qwh5$ykG`MK=UG=Sb;FMl-<)$jN!3Gp68t2-uM`)2yT9($Rzil>CN{qr(U!?
z%Vx-YyX@czgCoS`6G~P;BGZWZVddHggGKOsflMwD89p4Qoh;yrU^Hb@s9+SvAWgqC
zd_J%q;PYs`@#nVG_!+umrlj35BS6%}XUxoHWs_lUSYA;=A7)uW?%R0$VoZF-X4guz
z?&bsv9u16NKjy-LCAbeHY#+U8!!MfPJYid!@cl6ILv)mG^!3@pGF}w?tl{eM{w$}p
zXsS2{j;U|{J6wGl0QtrRJhn0`3moWDah~ra@_PiC-qg~#I~B^`A*~qhV(F>zrF%KM
z?{AEKK49^RRVx`)6!FGo9<j-GfWNBz_S3Wy!^;ngEj_?&$<a+FcBZOZbX`-pMh~Wg
zz2}3-8Byw)s$|b)?By*m*p;;9@7Sci3@5VwdpL`*qsDIWxX~cP&w)*W-PesxsP(jH
zu_T#yuPUifCxQz9F_hs8c?U`yp{mP^yBZnP`@`=wkY~N`^={~Je%1fUJK%Zm<|vq@
zT|4md_vQQh@&$Ifa6^#r&xbp{s~7uTsu$b21W|z(GB?44<fHEo!UcyPy&_E5Bc6l!
zllv+xb@lDRq&k@~q91HQI(=s=6Y-|;F&(0Bhi7~5H!(hU!GHb;Q@jrCjAN6$&yCzK
zcMV+!i5ig@cTmn*Z3p#ao?c(>JO2&(7U25jWpj1<aZ_n5IMDDX`i#(O?2zkz-%pj7
z%cO$(1pU<ujf}qS$Enf{Sy|uvKgsC<|4yABhL-mtRWD#|SmiQ7NgNP<ZGB`vOE&85
zOn;*ctJ~fKe5)J#r-SV4snvJ;FaPJ>fIOr#*x=GGI-r{)fu?|YDFBM>9Y_s59**t$
zMIEIg?T8cF7IB}nk-|uxZ=~3*07<T|Qwlt5@Zf^7`FR8Y!+4Ye5UPm+i{D)zV-hRA
zlfogR%NGifeVG=+N#NTo-fha1t!pzTE-H1dl8PR}t{>;e7BK{POB1RcLj<WnT8X{H
z5z-{kv3nKze)&-(6R}E9V&-ZOHR0|jFap?+x?<2B7P5y}_x7aq1cL8ne_#O08W6t7
zlb`yYCe-|d62Lw_Pa@QkFoP&6LZrrVVlSBYy^X_wS)oSoh%^_|q%e%tkpe`;qUdBm
zkDud?(ut`MEZ*uI6yq-G0|@lsuYo!p=h=9Px*b{czeu(qj-0xxEyUvPWO2x#B;v}<
zUJ0u*hlilZa`EZKim8mge>E4&y_1C@n-OW0maT2}RV~L;`>I{RozPIf265^YfC))Z
zA}U}OvIg6_(7>_NU8;#hH`$K4KkZxuUM(DkZC!KXp5dnfa5HvI2(aELg)E8jn}HWo
zc_|hq0S`i(6FDWQzoFC~DV&sOb6^AKW)KyCt`O2S7pv74Ne0-19klhuK#rGbJ}2pe
zQHo)OYNiB2=73k|J|{sy{VB*X0okWq3w-dM9Igc!zzG(|AgTcn$jp(Gi)j7Te1K%D
z@tmaHiPQB}=uH_gfmodw>u}IInV<rETwj-}W}Hj+ZcdAkYmJqy4Q$<)7ak;WP7-~&
zxD2N%SgHDlAeM>>uRE^=%ESzK*nyAhMtk9c*tM)12Kc6te)pAnTL-A4itLcKhE66V
z0}9$x^BLI-)DLCLNRYv75pfXjZJP*K2+-CA_q8F#R9|TRq@3`EX8B4nQXFZXHGxlo
z9cTqwcETG-r*L+_%e4!t+}I)jTo}z@3f^_Is(YeKR9hxH1qSL(YBSQHmMY&)N<<}0
zQb$-}mS_cJ!E7s_zGmv`cVIvgXa$0PjzcAC;7pQ5)r4A6<IQ~-W{wyu{Y)XMVXM^q
zkA-A`WIkB^VX`!@e2;+In_{X{8Oa5noiGtb@bSvG@s?jp|EP(xAXHt7zpu$^A&MCv
z%Ho{<=s*e_BR5@WEyRcdFOWHul@}wf*{3p5T4>ezCwCX?s%ZM_fQIay;sr19M0t)S
zq!%yIxt>u>&xVh5&h$QkiVT*~Ep08k2{jcw4%7p($SJ#JzBETRWm!}K(hUshrYt~A
z(&;|oA{U{hG_s@tMT`?H;E%ARyx6ZZQh71co+(fiaD#d>Fn!N$#PHD|QG;1Bc&Dsw
zpjtV}1`hk3)O;lEqgy0^{r1hpkK`=)ubXg9NJ#<&rmj`Q@DK=vlA&z(zS9sl*f|6R
zyjbzFXfnWsJDU~bSQM>dk^^tf@;-s<R4(JCpYY=LGR3*3_CwtO59lY4G_L<n2@m%w
zyH*UKq`?PtFN-e7cp~`kE@R)*jE<g>QXBC@#`(#0^+Y$ezQ`Kj%?YFRGX=62%$$+h
zEhM$ZGxJ;{`zpbU^?Xj*KnmWi;cNLq1H+{U8aC>QO*;hlB6PPOhon|7E#s4)@iwHT
z%p&&=X=n4CnveP3!BOFo?KisPo|Kb>2GyiPP~0}Z$O`a9KXN>Q;i0C?*NuUtg8Nhl
zrKSt$1z*W`Ih)&q_=pc7N{spf^FsSYomd9}U{D=Y;)6BjQ6iY_iY%yBJr2Y1iO}kq
zvT%3~QYo>n{Y7@8q7AHK+Z~yvVBn0DK8Wfribq=VS1Pz|%Zse9bT$jS7*x*TQ`rPa
zvFoy}C?M{^6Pz9?8asGLXB()uGFpP1{=}Ojz)SbQ-sV0bRXy%i){)uZX%lMlKiYhy
zQU(=(B{R!$%c4y_Vc`Rg1xOVj&g6w9*vB*n@BsqVL6)od{(9IC32;d%&V$P!&J_Ig
zZj>8YE@K`+Mr^5d00$seqb1AX<moVh2mHB(oWNEFd4@c(F3BEJ&y^xnODz;M1evbk
zd$C7gSO@x*t;tyqh%cT588E%9HooK9k0b=L>l!3yWvc5Lu)7Y_3o3AsACIdT!k{@R
z85VR@fR?kfnh$l1M6mrq1x~qD!*@zSCvx>a#oB7(_L4N<whb?`ohMQV3ccgu(Ie^y
zWf<$QU<9CXRSX;IluN?0j9^Y_K$;xOlIW;+UQR!6oRMCxo>LfY94CGI^#7_M1u4~#
zCb85>dO2FK8&H*^(N-uiWv+ync|IiMr}gT@2;M2xhakgM66-(=3Gk8ULv@R><E{kU
zs#Bo5_kuLqSW#}ENIC7&00Ar(5)SDlUAe^oz<}($9Y(2<`XLGl!Za_Qvr7m;N&;@%
z^dgIaHvG#QS{%Qi3}h}0v?Y8J@c*3K774(nI|=!pkuU(mJfR|BbYIjh?h_7xJY@d0
zsQ8Oa|1%T@8h;l7n99hfp{T$I!hUdgVIqU6-Y0xn1d&uLE3(Gwh8-?M08#)(YAr>v
z0^C*yY&{mF;H@nnnjQ@NeG-fd6i&>ZP{YC1V%s6h8-NWEJ9fepev!s2;meox6`nf(
z=-}nNbzvD@gA?Gz@?Wp~G1Nd<T9yW+YD8VqSwlT)mqj%YrdplRA~=NY1wWyf@uxTv
zpK5f$rh?ytW`mG`6o{B`&6k8Jm<=$L#+b9cPe>NRV7wLo$*J=RzzLrsXt?nkYEbqY
zg_sd&>7gpnxs9Zaq$p%Q`!C>~@NKgRYY}`giR6+A$pd*H5<&4{a5iqgSS6&CnRe|7
za^VG<3R^c!H3twjHmPGX>|LH3KJbc9Un8qpM@IuoZ7c#UM0O+{0QN4#7K{Lea=g#w
zuw}_<|K}y7(!b_O+ieiARFcMZyTeH-wT|!9TCo4|W0+u&`F6ligMI%J7~x52(n7H%
zVUWtmP8J{<3IT;q55YV|<NJ9o^)944@&2q2`t}A%;-Q(d=&XS4(vT&CmHf3)V+^@P
zr_g0Eod2Voz>zJsle%jJk=UCr4i52iWD=B1*k5xr9sKkaAB$`dZ#Hr-5aulIYZq?`
z7suy39TYz)Ucdly=>wDjqC@m%{cqX_a#TqZiQaRMoS7vt?vzctKfX>~O#CNJ?YXrB
z`BS=AN+`?;wi?s&6AqJb2v)>D9(QV(PcVSCXlV?Yloa|R?c~xOG)RyH%%bnAxXG}{
zSA+qw+QPJ2Wb{u-IR?iZ(veBQyt6hWkc=i?6p<x)#RB)y*?a-0HJW#H^P*R9t}>;~
z8H7YHKA~}k1~>aduww%Xgj;gKm$!i+%l}sLwS@5g9jVOQLc4m=-+U@h$xsH=oa~X<
z2mB?4+8r{Dt<fzDQuK6ERu5hoC<Mtn!0t;62I8a12W#~YPad`0W5?GzMTmt*PSCG>
z>qERy8*207-u!`70R!z4RSKx$pJ-bMV4uz4X47>)q&UxB@s-4=;7&N$Oe7X0`rtnY
zOZ6_lDSlGgnP{5<DaRJ-KiG@N$UwRMS<to2%Aok9YKX(i62EizX<P#9bGjUeVRgD_
zKa1-TD3DkbcytLOxHFCr=BM#$D|i5EepqR1cgjd|JF}+A@k*lL;uuHQphAJ1u3{`d
zyrik57!~+u8BCdN4+_vA0#&X2iIYwYYFP0nwCPrmZ1*kL_$r8AXt)&StW<~;<Y*(3
zfDgiu6u{j(5={bGgvC@`wLL_`C#RwCQ99v%edMZx*yO6<|9OzxD1yq($d{zveDX@!
zxfOK5+?z1*o!P_#bWomyjzOePrKl3r>{L~pKNX@AJHRkV>_kU$oLR>)Isc@I8_X>Y
zF8tXe?KB%MaS`NFgJQj~s=@tLME~>NC~)>@1Ag-Q5C%gnTw2B*1kh3-aCQLvgm=2p
zPuPfIfDi5oPEY&k!AfE+3<y1C3Z000=%D+MpS+x*D<2F2C-25V%^E@&I)q&;mgF)R
zV4oxoEKr)|R!&J6fiCb)34R6=RBwb1Ra117tQ%+n1_8FLk4nXR4Uiu@2Kf+zS_$n>
z%zfQ-HgAvzDJ1CGolmlHcYQLo&Ip{n<HmvbG=+;o!i|pEr@9{3QxM~CNZNdZ4e${7
zTc2!zh_?9Jv;+x8qylaQQso|2{(rS^F(;Y@Ly%%8ePAGDdsGQmWCR8-botaeAk(V>
z$`lX>(P(r(;JgXIxc`fB1)_Qw!!>=G)_D+2NZ@NgufQG+0Z0joT-1HWCgF=-Fgwgo
zY@oj)oUnoL{dn1$EZlIPvuSom?uJ5vo%FkiBlzNf(v+y7mvor+Fd0z%*QVi4j_8$q
zui);`vS9E(<p6RfL^WK<pL9Y{1W7Jv6FGx0z+fh>CozF9fxJC=KQ|Zi`=@M~w<c*w
zo8J!wzP|s|UAzv?8#cte6>_Ww1?@8>jiI~D^-4Rax1!lRa>KvxZcihh{W^s9hnd^}
z@SpHfWHYxfZ~pUnP-y7j#(c()Qc&17Rx(d=Z;nXKSCBE}!|(g6Q-moI)yn_cj2odJ
zi{trHH{Ym$_@5-roh=5Pn4YO)K8aV;eFhKPh+mVxGWvgBTtTlN4i8cW4U!@M3&cyB
z@!kEmTS3eqA^+Ryz3IRIt|Eh8e)su5ZvK0C4f4KC_}csOUlPmbe~C7Z8em{=ju4=o
zLm;8Bz~Dfi|9=uo^8ag3r~gk9OD!vRkN@Y6A;J#sn|#ST<@O(tEV?Oa!cCHiSkxoG
zm)7HxuWR4*L}|Ltvo$6#sIMgyjiZ4n(}#Ve##C|*;A+6M=)XK&7E_kIbAO$=#Lh-y
za<TutKMlp;RtRSI^!4_g?TnHu3`$F|)^VZ{UI38*)|9DAgM<CW>p4b(r?aprwgMss
zzakJ1d``$nW{=c4IxJ55!f&OyvMFp<r3K+$S#ypMS6#pGe^`30niM!cp(#rWP`$hJ
z9tC}jy)%8JhJ{XWy^L{e<xY<w9hc-Q&7EI~R2JW!7w5*<rlYJHUhgD`Uj2Lb<02lO
zGK&iI*$iNh&zS#np#5=1fiKg%-)h5eccGGZ?YdG3V7ueV+kUXPD-=yQaX}Q&x;Ygg
zilA)CVJW)iA}Sgv5tUVZaQ{0-`ULB-N_dBBmiuPR^mQ>Ibln3hjvfnEp@<6QE5yHV
zzNZeuEi`_=+4R{g_QIHt-@`VfI8JE~KvzOU$=}$)2ElV}lh6{u!)aH>G7Bp1>fC>S
z1TMZ1Ulz}begNiToFYOKL+#-%O<V3U=0)2~5>4`xG$TI}dY3$ZI2R}F?+e@o-5rjR
z_FjCq8wTxP7d`Aj5xE%UeydfGREY4fMdSy@6LsdM)klYqO(=EGXJ1XF<tTlR&wxS}
zV9IG9TIgFRlePvRU|Z^6H3VNN<e_Kqn(D@B5MRQPbt1Tg&1;=j+tf>_%Esn&a5GX3
zJuA^cEN}~b+(4^J;q(Se(@#0i@bSD^46Pvf#u=_FyN4%r&tIi`m(vspQGpzPhAV7C
zeC+l03#o@Q@9~y#v|w>|2mi5i#(v2B^q14EAMoK=J)bow3L%Y{KXW&4x##767uI<=
zU!)f$<?8NjF$a)^Zv9M~xlAio2Pc%Wnu+sgV=?8d-|7fpBQX12v(=$ah?MVUj)r}k
zScI6L^<&q1CJw?#j{RyfmyowV(R?pWA9K_csRdNt1gESIUj@t>(D0Fx?do@Mw`RSF
zl^wQ@4AJ6I-v!4Ow)u3AW#QTGE+1A7!a~OS=;)RJaj-=0D?<u_THr8vQ#BOY0Cn@$
zg3Hs8whY9LxMZa`_PG@C&D(<U>V#lpoR&sIoyf+eE6cf275W>3q4JFCaRarvm2w1C
zm`k#`VL#=Ad&@Z;%6b9zD25QPb+`-jeeq3ZS!2h;v<`gx^dZ`|YfwGnmrzqq2GosU
z=jS4L`aGl!r|q*5E=E+)KbmC@(4p3?iq4xqYBID<H~tZt6;|D6PRGHRnybH?!@+IY
zyMB}kEp7F&wvFZ{%llA#(?O!b+IX=5d6XvL>8`0DZrkmk6(|qow7OhCFq{hG#Ku#L
z(-MHuP?&i+l}XHXH;-vPGi%QCFo{J#31mfdS`7|K5-ED(uzt1LVKEJ@@ZS!dLOIK9
z*|TBayeCNPIcJ^)iF-|@+i;PZj9#=Aw+odQA#*wVufY*?3?s8h-upC=W40SOZ)n(3
zwr?<up%tTZm7s&2u^kP_u(*cCm>>=axmIVj91cWqL2$d#n=`DdQgT8-rDlgmi))eC
zFBg>4n4+c8IwP^%O`Bsx6VkcWPVPk$a!<j0jg>+E{v+7i4jWT-s{(n&4TDhXaAk=J
z*K$q4C6uw82(p%j9HSjFLKSg<qU3}@P8rE@e7Kf{Qp-zREANMPh;|k^=-9ZiKdxHy
zTbs&Rn;&8Nsz%6Fuu~*F+BEM+uziOZXB2~gc;`py!08u~Y=BA;J2Qt?Z-wpIO9l*~
zR|j_`;uQnW#f>y{gR<$pZpOC|q6Pz=?7lIJlnp)gP{OFmT6yXpz-K@I=qel%ZO1jt
z7zCqauC<0STx{e9gEllK0ddo5^9S98v9fd)`7Ah`7z8%?tlSyQTrw9<IRfg>0h}Nz
zHp0~cdMjM|(}MMtMA~Uug9@tPqz)V9YrC}hLo0-Mo_9wxKrO6!!O7cIL?&3Xom6&N
z+`CYrn@%_(9o*ox)?cJrac6_;yiwd3E8PAq=ru!iU~6@Ff7;X>TKkU)P7}zfrg96q
z!P+r@Vq)!Dk1}D7?|10`xx#N&BI`0{&UMdL^SR!F`Q~vqLkw!Eb&$755=k84Y`AD=
zh{T=M+eXrufKm6kM&fJN=I{0%wV$XnfR38POx?)P(MBw~fx<p%+vBdJNE~rDY`3vi
zLt)KJ>g28+cG6Qar`L&>@q&+WgLUjXLrfrJ%u`pyg+xAL1=?`K>?2I>jd0onvi+??
ze6C}O8%!L%1dN3&Jasj!a6d`dmaU?qaaKMv_N8XOb}L7A_WzEojx~GcWe6&-EiHK(
zDVbv^vNxPM&}8Dyvdo>+&mk4v#IfG1McQkURjtV^UoPPz&0`|^ZHvQ(%17<5gLf@i
zA71U_S6kHx@PcR|F5tJyXy9{&EVG`f>Gp=<*=f+`7viZT?*_VgU&j*e8dt2JN?mU)
zahD?<&BoYlEtFbgGJvd+o~g~>yS775EAN=AjWv6yWTPF=Dllu>$&nq#%5&%`&q29n
zEX3;>`IOb<4ddm303D`a&Z#RD+FMkwpXD~ChfLo#SWF*d<H=c(IP3`(V_c|`l4ZM;
zI?`<4YHtmt-ho~b`K0BDmX;w{g<fHe3Zl7`1;{WxDGBtAs-LVW^43|!Yx^;mYB+jE
zFoc7frGI@<1&g-ygjfWGDiu_**-wka@{BW!c~tJOLdr3si|Pcrw>z8eILq(Av~42%
zDbrX>?o#OA8x1KAuGnf{9*P5ornk&b`V$J8I?o-yrEeK%DH?;mU=BCHc(@QdYl`C9
ztc%-oV_G^Tv?&+bmSEJn@hyxE?IoS?=y=qU6%Fl+D+OaKugASu7S7`J?Y63N?I5e=
zjpt!vCu4X`&Fo?!FPRoP`=9@$31bL0D4Nr9Le%6rt23*RCl$L<s=aoesiJAuzz(E0
ztkm;W@xj4A2(<qCsqO>Ndc;`HC#&KsEIs$M?$r<{eu4=_HQ3$aMCz}+m7p$OpvyPw
zuM%a%R*UWdRi0&OxAKEl7N%u-=DcwCS+<Hz^eTst3Ufh;cIZ0x&Ch;~6Cn*^T8-LO
zn`1oF3@gW-i@^k&Q^G?94@OH@(1pMo**FRXZLpgxk)Z;?@^%S~!OqZkJ(7#Dvk7Ew
zxJs@gl!xl$bFBIFwJG8Y-Pu)oqQQzH%2GcJ@#4v?fxz9L-{&9PU|)k}xs;&M(qUg4
zeT|24INV`hi5uWnU}1b3NUP(#vYW?4-{pkSDijbTuyN|0t=7!Dh1UK;MEWSL6C9&F
zKoYt@Z-S}&ylD}Fw=rc2uGNze>hQy;hjX7I1cq`)7t@?Uik@weRW;DKR64fNxHg#7
z4r?1isrv+B@+~_3#J({V)yThBTZ9I!bsC+pu1J&U+iv$c%>;~MS|r&^!urcZjM7f1
zfh1T{Ank;y>^XZt;P2rq);kyzPtFx8x5RZ?sp}%_(`0-SvB49P@P4-ljRTi0c;hKZ
z(X>61J&p^w)v3NEYR4_|JSM{GH*T2eFcV8*M?+uSpJ}#(WC3F^ai>3LF=7z8wqjj3
zGD=f@qZD)TB(M`gAy8NFi=*<-sZR6K$8*9B-+WP%hK!q{KJZzbT_|tSGL*2ElFo1c
z8F(JV{5v@W7?F!MGMb*q_D}+8e=9ay`giz83EZ4j<QhAch!Un=dUy!z@&pw0WORN*
zme%A@&wV#2s3i?D4P_-MvSh0)1n&uX3iIE)=$5)=)1N7?7?s&fo^7M_Xf{PXEpO06
zj8SZ;!&zY-@HNn@hdOsKd&h8;MBJnsfH7DrfZALd<WX#3W_GNG+FTiI)7Gn5CA=1Z
zUMb+M89cj}+0qMMK97@<f!3+#-T#Y!!A5kS;aW79XZ)>;2=MZ{+RbTx*)F3r_#~23
zJntq@P#>d*rUC1k-zOM?@@j^IJn!-==ma^v-OLH}Y;!&JZG|ZD*s!n_)tZcaZe$pJ
z^6t0y=ht76E_q?34iK>j3gLM7u;hIS!#!UaF}wOlulG2Bk=s$dH{mjrQY<3}tST2(
z^?=51(g=APUMnXD$drZ#{5bo4VcHXHLzR-C%f&N0)sQGL)dB?ae93<*CRa(28?5`l
zZ)Ip(OqA%)^grkm`?1%4KY0&O^_TXv_Wf(y?CSjSr(s+*?Mfhah^mAwCTk8}xzw;j
zT+KHWNhE$JLK7vf9d1eFyK3x6k5&QmpJS<MsEnT7()c`L_0d3rq7Bud+D`9Hgy&cN
z?Wep<W|m0TZY7qX10yct8Irn_D05T!V?GgNQn#8F_+nWb+T*e9nHA&oBenTb;DiRo
zpv_Kl@l*-@9iul+DDWcM_(l}HGdJ@65kucn$;TubQXWfok-b;m=0jLB*o<$LBPW}5
zrWNIQVvnl6Qrfw+U8J0J?T~0}OXEZ^SBRgrRSCZ!HJd+#i^#hN0(Gh9f$ExHpdl{a
z<ivnRc4~&8Wj9$!+n_g-`a(24EP&AFgCXY`n{QE(Uv-Kx90$7qff+gu)<Ler%r!<P
z5MuTWXTXA<Iq~)vAAvr$*~LBraNoYBOdy<ME*S|+d<gV>%C17}UXix1!OGUxu`F#H
zZGA@D+Mb9cUeYOsZ0wpQJ6x^ikb*2<aq*!a*b%OmL*CdC*9;Z4>zexqz?p}C;&TPr
zwUoA9K_^E4x^P;wC7h|@eV|{IDQ<dmqiVXHMsXOU;0UD;bkUO1+W&4CF-DDZ11qi%
zYEF`frnQNbN$)~wZKMg&(0PCr&zDkn0V5Q;u3SA)2C6Dj36|0i<~thb?Mzd>EB4!o
zZB{?LD%s5lPy`dS>n+M9mb3w4+&HElM+IQ(*wMM>mn#OfaylK&nA%B#U71yGtJR|<
zdRfk~J!xsMC?&Vn&=tu!sfS&?p0GF-gv~dy&5(m8^#q}&KF{xlAx0W$%mXCoKO2b+
z36HG|IpdE-47j|i*D4Lg<D9X%JF7P;Up?p7YRyX=Tx@VPwg2=o5PSvxZ|JzuKUE?p
zflge%Qqx4Ui2a?oKK?KduvAW_UoFpjPsd64mLU3d-2rmrlxA(~?05HncZR!a%lr6l
zpUSCaeC!%)5g6%|7A70{mA1C#!F=^3V9<}%HRwLGyV5N$RFKpw9N=7-)60bk@+9!5
zL>@Tf;?gNER4)_1Y;$4g_7wh&j-=<LwJ2HevN8s9T5D@-zq%&&)vx$YhfAR~+yV6J
z9~qCFi!|Z`mMRZ=tS&8{F6|HVr(3LcUi1s+)Lm|+A~W(e(30YiDP>B&W|C|AtysLs
zj{HZXddMnUbb9!%X)#p28HN+$fWra**J6y(bg9VIaSukd?uaP%)H5KL&HBtgnB`&0
zhGSf~%4S$3&%>@}^<N}AYi}V3KfCvqeGEk-ML53Jh4X&%{I#MAli-*_(r=j5#l*{-
z%6;4Z*a7TxILNqc<8JOVdmu3hkbd|%<=Wne;+K8h-MYqEf46N){J`_u-vOU?PKu6W
zEfuM5TYn?=@w-@PRg+q_VT9X=lan6Sx!+lF%wW^Ox6SjY{cP`hP+>v&D#ugmTA8B1
zI0oWO6Dzz?rhFe2S9;k~qTaXSif0o{zi-3ekza2=tbM(AlGI=r=fD&Z!=c6D!-ZeV
z==zZfoq{!zyHjk(GW>b%!PG9%*MTcTCvoWUH*R`wb^ChH_rGJTOqXB2Hv5TWS2nIT
z!YXF0ZC)5JAh@kHnCNBAept6x@K8p2z6~xcKCD*I@=``3w>%(vrj{1mt<ur`a}lqx
zK+8h$SI2Y6xqkXpRXN57S;!)X1go*amvqx}xIUJi+41$X-Zk*ZFQz|%nSH9ToLlA9
z|10@fBek_i(IIbs!7xc5o7-}Dinw|0zfFv4UkFtrb9}0F?WLf*U+bFk7}zLkLGq%2
zv5<gGNrFJTkOgl?oQLdb?s!4XYl!+DZj*a!AMW*|U)~Q{;{ca90atHam6Q<$R>0=k
z`D7V9@JGSe^*mGF^t(Fpo{^0ft|;;KB55fC!C2%TU)BnmpZnVN!0D#*F-Ony_j5<C
z>{W`7Gj@&-*741}1y#|1HQls|d3dVMMLV96BkOk8u5W~X@)@#l9$tj}3pq(Em#3~*
z5Z04gL%`Dz_k9F+U+SM#?k_MRjp)s0yNj{-cu!mwJjni8?1ltCu}l)ySFY?vhO3aV
z<F>*oHxf1RG26(W7w;NIGR&8L|BY2LaVq~&r8%J8HCCQ${CIIe<f47YYVw{@|1qVz
z`k?)hqjQ%M`S5s(UpKp8b1#yau3AtmTDw8x*X;DH+@4+a#kf}qn(@F_-@BT&XF7yR
zow`oY)5byd*El`?wO<q)x&Ro|uaRORI2FY$``?0|Ifb2bCmpZ9&Lk~@32Y-&{_^S)
zZ%n8KxY+vi4Jg^aGI}cLT3R85--#ihYvzi(LVd4PQ3y(dcTqpCW}Ff7Q1JyFsBoJ1
zv9i|-_VI`b5Y|`aGO@<AX`l71AiDOkHjS)KLS|OgbBvje_|)AVSnc2};VnX+%`w+Q
zxM`mVGo0$VceEbx#*R6g9(rOw@E2H%$PUGI*lkKZ8$HG|^qv>8Ec0)he=k-~nQJSb
zgHJ*P`1&)N=r$B-ETzBct~`#rG=zjQ?*3py;o0+MbCMz28ApY2C6Ea;&FLRUja}rr
zNf~<fT3&$>j%s_nV}0MrIrb>NrsDsOJj90~eYt5;?@Mb_FSz|{xvTlt;q^I6!1_ye
z=pQRsr-A9xeFg|g=lhKF&{d#rDdHUZU8kq<Oa9E!w|70dzId-E4`~Y-Y07KFnL~%Y
zkk;K0;4RKB!g=gnE`-k?H%I)Aq2w==%X-O;7&-BRp2mpZNJ<2?#J`D?o1S{^*F%@D
z8Wlt`x*y|qY)*6mlDg~#)c5YR2tCXJx6@nPV%vvXv*!Q46Y9NHGJG)&y}fs_`U3&^
zEj*-uJWn2Jz}_Vod1iG8`%!xrhEjrJU~W3tg=G5Zj$pcx^5u|Zdh44M_Mm4c_FNZL
z{!FvHs3HL;ImVd*-_@q_e7&Rjj@{KP$-i>5cnHA@QduYwT(r`ufRWe%15OQ0`QV8Q
zryVE$%PJvre#PR`4i(6Hk>a=5=GipsJHqKQ+OS19q4w>EJI)W2rQaD#ZJhPvZzcAZ
zl6~s1!ac&1&95#BYm>cfr``lkS6#^`Wpw{!SUqH=vg-a1VebGdO3-c#ZriqP+qP}n
zwr$(CZQD58-e=qPp7T%gCil&qxv!JzPUowxbkfPH)%C6V*7TwL(MHNthFB^)x_P;J
zZ}9S3?{IK2e{<7A$ChmL)U>2O29qnp`pw{KT8yELdNfz0DND?=u?v6x4zhQ|5NN2!
z7Vc=XU(knpyCR1yg6_su@%)@!vS#R)q%np4QyImu1&dbFc0yqbM#Gn;nC5nPu<3R_
zbc&C#_Rm*S`t|LIq5lt8k33n8L7FN{@0^t7h~0`aKMr7d#0zOuB|*_S2ki6r7Dr9#
z*ky?@^;*3Ao}KA2gJK+?L^AnuVmvr`_;~Izb&|Ofp;?F(gC2grr?adY=(9{1Tg>$1
z+@kC2eo<cJLYSkUo2QSfk6V?&I&O!zo6ExWx7)VoS|<g)fts5ypQ#x@vIW*3MGtgZ
zv_%`KYXO8*%mQKAU{rkzdA-pus>us)PK|VZQpvo;bWIb(m@BHZ1x^h{vFxEGK_+Zk
zm?Yi*G*$3P43l6J|AQfYJGMbRK_I-|yv6aKDY6GBVh^8?G>kyWbR9^al*$j0H{Qks
zmV^~&vFHn<O_f2cw-pmbT?Dg0d04bn<t18(+~lKaX`}jzJSTM_fl*99UcORnymZ&G
z7c>j;s!|2b^q4BZtavLn7}ZuRo}d^pR<y9HO{uCDdrK+~Y(mylw*ux=mSvTe6qKH#
z!jgT}Ym(4<E3%EZhSZp&wZ$M&FRT%{c{(|`u5tf#LpuN0vl?%=MQ+ZHi-gU-?C2sQ
zb%l&!yVECDr6dUG=iJ9?eQ)*L>FTQ+Lmatq`?O_1;Eo=S3tX3Ze_jK{&#RVYZce`5
zzLd3m13*`HVy{zu3r^gpBM(8_E8EwP4tGZB_4Ys_xaI8mB(BZ8oga4&3A87As7d9~
za0;IS^$0C{hk*;wkr&pBEABYQk3fHsFEFvM>^S^Rg`;axDaTkQ*KV1ljTC=>hTrYt
zJwu!aYW(+ld2F6~F&iBj8T4Y2CiPys(^=KqyN`>gx3R}l&?csgHS=3JXy`Q=$Zo_+
zM{ma`!WvU(0MBH9tU0{0UP=FdG~e^u_*>aeHlbKz=H0%ObDEg$_VH-75kqlZ=EXIi
z^Ksp?^^FDBK?pbSu7u6k?5o?MlDXj8vBzW_j@`80rEasGQL<8N4CPyFrIbS{levlS
zQ*R%yp9%8FaI#{lc5un#;WE||`Q$V|G_mI}9^97=TXL~%$@GeeGoLmo+5v<1=IE!K
z+~b(!duhMhkL8-Tp+0aYgHu#QH2Z7J;Kj9T`q=ivw@n0>B<z?&cq9Gsr0=;c4Ojx%
zMzUUBzE<Y&(Sh-NFTB-0RdwPHGL!6G<j0%fS9WAG_xL*bCrCxT`zbomQm-$6Hd)Uf
z@5TCzQ`A$=F;BVVbdrSH#Sb}w)l{RT>n#Z8Q=kBEiO%UBjn|q}P}4Xq9UPzk`J=_8
zWUo)hIK2(xC;IA9BrWvu%y?6Rv!CO0ehyI=-5h#T)8B)K#MCy$LD~?_1#fO+pCyE#
zUl1F5Bcz5{0$+N2mP6Ogy!jP8a-G(kpQp2%(EqOA@uPkFCRv3@4YdiBRrep-3{|i@
zal|d>iq(W$;KiMMbHCK?dY`W<qKx-gO8%kJB$W{IzV&PCIAARx?&9fLZSHiUM|NrZ
zJH08_Y9s34@qHp2{>9ZN^h+%5>&d!i7ie>3wVO|8q(qhIlIA3lza_)JOpfHf#DCTq
zwxW{eI5Znda1vz#0^2hzZ+GHf_yspUIBp>bFHkz0Yxzcp73HQq$1|TE4VmAZrmI{w
zxS_WjXGWflFF$i_f-aYd5-(m|F5?1j@5+D&p!{$BYwX>+9Oe6!N;wT4*MBzUe57K%
zWWM#<lK-8rzW-@J>n6ks3X)x5^bfl0{MSdI#)9cmJ~@f1Y`DoYFYfKl&4V_G9}Ygf
zlRj^MYd<|!@J6905w=p=UqdChsA-1;EKH#&Z^t5cKQ^qyW5uIEt@UF)C}P^39oHsQ
z`NrG0so2-2r=}IVvc0P_?HiuCEFcQx$W{?8Ht@a)u{Rq@63IUn#flvA%2R)Ze}58m
zHF-Kigh0dLK7(J2S{*#`Wy=q6Y?om#cZ0q}OIyo#QTHYW0j1pEgFS$}jVnWEl4i^u
z?H#7Ax$j?3q`IF*6zqr&7)I$Gr=Y`YiX^T@Cy1ddyD2mg<g3a7qR;XVg814c_<s9>
z|DO2k`RxOs1Q;S4SOg3)r;OejQ0+NMw>O=+cf=Uo$CzMk<avOS+MN2noxAawRC_%%
zt~+kFd?!GnP8-tZ@w@+wZOZeM^qLHE`j(*<>c70FKbfGvxQYp+og2!4?QA3tc!T~$
zJMAf;1k8C%b&De+lw&)c=U2~8Zf%BgF4MnHzR%QKU-OjCn@3q^Ieq37y346=aYlip
ze9$zVdkk*JowFg+eqljgHm_3P<9LbALU#DGh^c*XR=@7ixu}Y(it)YHoGeFGf5=fK
z!<1Y8Xfa-L{k@bC<2;;!fj!Q{*L$U-bI&*&uc&lXTV=#h+<zl!nu@^4`)R2m{?-4R
z#a9h2^lt}dSB|grTn4Fdg|`;W2UdcRR)|0q_zt<pLPouuWie!9$5wtk_+jDGwe7=r
z_^hicv-f<~K~yJXg^vg_>7LuDKRpLaW^kT!<OgFU$&8qyzmycJQH+T#C6@z5XdR!M
z6`0H2+BU?}MOMe)=$3GshZ#2LTKJCK3%ah%X%;?8uKQO6uV_tUELKUL1qT6we@WqA
zgouGjTnJ5Fim$!;1D>yCAW~$qEaO9jVTSI`JOv6KuEWF9quseA6F2c*MF?)vVAYCq
ztL&RxTk<FPL8U&ysjeGHeB~DL#pdK6ABMtu9S)+)9?%P)tG%7^gTu@eY}@+NZXcaf
zUa#`>MCIvumD9WQweZ_GdC9ah+&o>~+}z`^<57HJ%y_<+07j<LWB1<|P$z$mV_Vp=
zGjnsCkdPjy;o|i-^5i9oR5k{urv*arW)DwsySNXQ{JU<MjL=AAN^4H`kITJ0$hLYq
zI63-m@RsQH&&$20I9b1*lq3e6KMQq7EO_Z@{lX<*y>WTzAEMPt$usGOgSr!3(FyGk
zM-BtA@*1Twn4V7PK7^tYr52Q_>8Io6<+;#FcXbf4mVXYb0UHsh{!%+U2Q<GHqa>lp
z43dH`A|{r~z$_Z-LcZIAkch|9V1%e)UD@Gw7VsSJGhoVYU^QJn=>B1nT+JBH3JHE~
zZ;lVyWmm*Ow#r}jgXitlBaz9KJv1FwKCa<4#tpQ?5DzB#%1B_$s~p6_E#Ut)#w7KZ
za_=z>NE5!(2KlB3dBAL~#Y%pD{!R#MDjufQGC&O%+p+l2Ghsv8G?(FaO?y5$;3z6g
zu=OJBa`o84?-Ad+SV=X;$-mR35HBO_=it&bmIZ;`TGnjJ)$I`43e_PPV#&=h<z<56
zmm3<}qPpHJ2|)MZj~tGgE!BBJ*~r{Od)B&nf!vZSb61qTqAeb}{u=}vyKd`N!RY?^
zz=xBt83aGK)*z7xH@h2g%xNUs(wclv^HQ25|9o61NAjTBtu&fTnnsnQi-a&3TW;m8
zbW!_hvirFZUwG2<(gTW)%x{syI#+1*5rU!a&emOD+LRqW>BML1O_5Dm{fqt|-^-h_
zrjr$X0D$G~|H&el<o_rca5HvrvbR#zfB|q-B9s1q3@|mc?GHIn{LD(;;Z<AUyRlF$
z&aYaq))7M%1d9SXTwV-Irbxi=*cyqq45#&eKJm!m2wMVY_+s3|AI-Q=Pi}GW{T&~N
zmG|>)1tg|4r@Jct)G`~;y;5km*2t%Lez|-4IljLvecVl7s?T~;5g*E{9xL*peX%>N
zUaF%qXW0r{Xhu$CexJmK=HDnUudRCN(!)pw2m#OGpB}`}_+$jCsF@wR?cTQ4@YiqM
zV(sKDbKLIsbaVAv>Gbp7uE$0{W>05dwmI)Ob6xN5Y1s~SF0q+PY^TE-Z>OHDlUq%S
z5<JsnUqnJevTt>)Jfv#XC{9<hnCE=*UI;T)|1D=Tm+p!JQS4AZB5H3tEr*V_cve5D
zWr|Y4sH8*f@TO~{t^VLllk9uR1VRiDj|?Kp%&8`UMz4Iq0#V&3>>`9{&8-7WvC-uJ
z^00r+R2g|)ypVrw3+#uMMtYa>%L}I#<T-=H+uq_|tH#DGg3QdwmBygG^>Ul8B8R@-
z*pFkvTHqJhOpchf008bn5V1K;s$nP~y(i6ZSQ9}&Z)XKvZGwSfw1AwspC~8=4we(~
zo!<aZ{%|JJr&ehouJk~-OhNp8wp$>L+6Dp!Nr-0R$~RyHZ7ifCu#w-QU+TSd2hY?I
zEuSVxmB^U+14q?a^%bi44v~RTSWUmk0XZ>nA{cS#eXlB3xO5&RZI&*^6B1zQCMZSM
zfWlDfD0*~$29KS7i{B+@?)UjKhzDC<92gutd1ZL9{uuelfOD{RKhn6xJgyNf9rT90
z4Nq2VN{N_>RN)d)LWc$g2Ka)tE&jB~us72rXsSNV#lgN2kuInJqj6RjYosj&;h+gq
zp|ZXKw$1t}=c=rL_5pJ|dz0hLgAhoE8iUL91b@tjIM@Qc9*}Qqi4|HXpi&+Mff|ZC
z)L`TkFe3IL!=A&@rpIHUsZM?w$-rZ<3qlef0zI#+TccH@tOFqli9w02ElT3jUCEAB
z-cvXUXc}KS--tFhy7JP)0d?q32y${DDhen(G&iQ^chq#TJi0Lz-;_8N#)4TE8Rva-
z{}EWu!p@b%=L`yh!FBJ>TP>pXNj(OdQP<@@$7mBX2Ah(|ObY@xO<-<Q4~AX_7N64J
zzAoCCVOJVNz%9j0q*ibf(OpK<O&jIB_y-~7!Y*Wyw2OY#vzy`v!c>HNX*N17pid?a
zeTnyP*Q?26gG|gdgGifjddv2~FgM8b`sr4|u_uOeWt9Dp8SOYwoO1%?TL7p_P$)(v
zG7ky)b8h4@-R>_pGGpg=mkx<-o$raU^M&Zl>gAlWM8>-`rMOy{zL;8>)P67TSjC}#
zey^C*gt$`EF$1gwmVwXFC7Wl3o`iPP0<E}?(lvVJ^x!!0@n3-l{iXC@7+y@j;HQ!b
zxj2NB=%z^OLzK|g_gvK!$yxSUYPhr{@&rg4L4(P1coOi(9c@Xb7+eAm3j<)|qCcJK
z*%w~7WOjdAgfv$%eA!`~)jQR^<wB!&jbr}ssf^dxAKICKC|z0415qOHLz`Szhi8xy
zVv<VsKEDG^sx;-uX0@W{K{|fp{|EnqEVHfh{`vme{*S)DX#WlWYz-~#{=almt!lRR
zM{F=ZdIi6MX90t^jXNE(3*CkSx5nT&L0bWa>p*LYSgmonlT*3Zg}>htlWtcfl54<L
z?NM(LJ`##4$BPrbN6!Cf=%9V0gc^@`$IfnZPy)Uor%BM3Pj6f^==OaK;5-TPG>4(o
zJv<pyp838vVFyA8u|E@(FaK3WU(JK7&H(Ob*cea=Qm;yMzuiMi5{;(m*B<So)BS=+
zI`!KK+fv|s|6Uh!Uc1X9JKw4K)6YmV$qpTc55;lN>Fz~3o*QFEb$b^<bUmlOKvF%s
z_T)*l#@Lvil%F2C!4T|uA8(bq&=^dOao(U)HYrlFw_h0NT7qD&1`i1wNwr3RY2n@K
zS7NJQDZ&poe{e77QHni;F1g;|u}%Y#d^<`3pn6~N&t?t<X`Ulz{PGGz>kdP{El_IJ
zy4jeVloFb`^W>lGp)+JZWSypYcYiGOB-Ev?lGV{Z#nU*2!DBT8+oZ2AIOx^BTSdTj
zE=_^SkN)R3J<|r6M-8EK6*<_8&W%FRbCgu&6=9XMxEh>|0&X1+=326SVvt=DEi1>c
z!wywislUg>7*i7}pySqT^p2L|2s)P8MO;N{u&WouR?h;md2UuAYKm;5Wb)i(t5YD@
zr)zTZd2xX>7j;(YoeXCwq2w$Bo1=U1z`!Cl*=pDVwD1D5E4c5-2$Zv1r1P-0@o$ZU
zepiU<QE!c;Hx+<YfbYd*^(daL#J7u&VR^4-(xUV3PrTp&e+NL<=%gMLE<i5IIXzsy
z+c(GTZ~)llnrI!guL66^+pMZvB67UmjOc9`w4WiG3zrA~Sb!{Fc&)3Xd8P6W$>uZ6
zB2+nEEJie=D>Z5|4#tf~GSloN@EAqoh?SO9CH|`;B>hTfHlu{r*3__P!1z>nMg3_C
z{b+#HAbE5(LL$}O#2A?V=_aXz;=!Af(W?h1l>^I_+s7W4mS&ah%E2dhucygd!YZJO
z^~B2>@afFo^vN=RTU{KOYE@bZLiEw<EsCJ2%Oa~ODoY6Bu@vZ;z}++0$&tuiA})r_
zsk4`DG+<al?)Ohs8st3E8nqHdSY)+CGNYDJ+mKGhSecYUFPC;`*mhg%opUgx#S-eG
zH9Wekn~FU`<tb^tmfjj$ssXoz8Z<N7c2+!$p&w;vHk+WUacGg^3yVuiD6E@YqwgN`
zX;$VoKjT9hu*MP|h+~y~u``e02ejX}sV~lxTh~L8BS%B*P)PvPu4F4~lRS_OwoLg)
z3V(d(=yP{f1lOweq7*%rI}L32G1Po_9a@MV<E`j3@}Ki_BYWS=@Lc+sZ3Y+@pHmqF
zx^L(~%c;yDIO)CQ-E3pkPHo=ibz0!H%jS*5-s5*gFHpq;1O%~5p>x=wD+?KmLyAc7
z6wF`nKzw84-+XECA16jP@ZaCvo!}>j(?w6Ke*1IJKe*42UwQh)dw~A|q>_)G1m1su
z#0~d95wiadNV103re>BlrvGmWR;zC7TqJ?;gH!zluN%25h19_IF1BNvE4VhBJEme}
zMepjJE`*WjYS01r(DeGSRgVpVDmtm=GiaFQ_mO#%m-ljZMyvmf<!fLux3TgUrcCHC
zw#BUOHULpx1LA7q321KUX_386?)I9gVPhr66C{xm7cH~_ej<;fV9gpFuMTvD(<80d
zY5ZtH5BUY0%~Em<TI*5@G*>r9d2>yPW9iB5aaIx=j7E<?(Af#-!aVuWmyFM8xiaF{
zap8QAsLiW#)jD`OTAQf^Zqt!stH0NO@8kwV<>ufO+wU{@*eP5+eB7@0L~cWW!K!5l
z^9aXi?<vE{s)s|qu71TD0P+x$$O(~Q@8HzD(&_~}H-FW7rhUf}Qf(~-TSM6e-y6vZ
zju?bgZW@z>eGc(Fw-AoI|0Tw-o&N&HE>$_kH;A+At<>97*t%_l#LZ$#LRZKR0!QKe
zXdT(2CCL+X#jf4mac!?amqlS<oX5y)0t!v+l=BWxU~1kr1wRSLhk6sDE%z0Td9{-~
z+mhOIlfnM<;in+vD=gD?`?6JxT2*xkm%m*%GKL_3x4SbQAR0hr%TxFW(9nA<qiqlU
zFn!As{7V#hbh74(Ox0caDzmO0QfTZL%$IU-aS5&NpkR>+#&l=3Dqw7W6dV$=ilC5P
z8o+I>vc%}dUHzi=r(j!uc_4)_Ia|*0O|xNCeeX!0$^$;_j+oLTb3N@uIg=)K-c4ox
zq;7r+rIsl$LO3lfM<~?WhFC+o{2KOas@Ow*RBh6MJ=uWzMhh!t;93%*h6%MzJ_%6;
zA#qJ0;$4@4jXWn-6T?ysp=QpqIcKja$Hs9W-UX-*NjAd=|7!^zyP`YY9%7!^xBGCh
zcP5OCEaG1o@b;Ln&=YthJeK6uu3D?lRJTUFY^0>!hJV>SpH<8k2Y7a^zKDtuwx7PA
z?Qit!8177&<xNfEff~#QOWG%tH*g}z{!2#$hRWYSV!Aww5{tw~THSph@M(_iCoWx)
zna?$2+c5noBE55LE)Uqw_%(6rghOh$JX*tMlWo*_`jT+GAvR<c;pGX*3*w4(c-du>
z@w|-8KQxX*mPhl;q?$S)vQ$t$0d2E*TYfoi_T9XjsA^Y?{7l5^Z>!r}(LB3uzS+Fi
zEF-DrE0&WI`bO~X%%Dhzxv@gw?{^2`>i15h%|x$>sxu1LAIoPKdf+yigG0&d<I4El
zY}hu2id%3iNy@>tykSo~vWlgXhvLo@QgX&0tvU+4961?(c*=}9Wf8Vw8ouKWb|jmf
zp=7bMkS%tP&XRX=`jp|4cljH$pYNg3tQ_7-8@J)Y3wG&WE|aHir&HXrsH6<VC_AnR
zkQl@CQ$4dRk)8AQXma><lgXrs)6Y8JI(%cWmxfG&j(!L3LGaKuLhfM7fO9Vtl^&9U
za(;OU<%{ME5d4u6*VKPIORDv9GdQT-F~YCljuK!I`-SvKCT7~Vt1<(*h&!-i3%9VJ
z#(KSMOKDK0>lW6i?P{MU{uufifw?TqORYY(35MHrQ0eh!yGq1+u#xTu6~fl`$gfv|
zY51|FqU(-S!<6leUaHin1ag&tCYNICfu_6=s>YhDOy@)B^TdlT$r@{+^@`f3(-*3p
z-9E8=wEq6zC<zfw`?mBCB@q$-D@rn&vvL9amjnO5(KcB_Cu0jsJ9A-IBU9)9%HMX_
z-6fv^Q2?%Wf1S73nttC+$$o(^vY(!2+a#o#kj49)ub$?V*(X^nxqa*K!_z3T<76t4
z{%TCUe_z|9??EU4$Z{Ih&vBQ^N&tKUqOI#*1rc=UR`dD_SsmX7TVNo)eIv+tr7QY4
za&W_!Yxmw~n1VMSJFyTR5C1*m%1BDSQ$`6#eqbtm)fRU9eZ9BfkRRGL#rfugZWl|A
z_RakYC+H**Kj5%TaOcOh`@x9S_>twv6f4ePY1c_xfJfTI8Q-zHvFn~ClQs7|O{Tyx
z$(Di(Lob$0(a|$5ye^k-YyU>|m(SnN?-v1nkmbh#;QyYYAGhaem->08CsOkHy<77a
zXu4G|yz)TO(E%sv!h;{aWRMF2=?HjYxB;GdVJifHVY`7f|4!)X3FBMu+E!0aI^&ul
z(G6cKp5#g9ko_1w`**>J3lfpvS`fc?5}w6|Kg~=@UOYRJKY|~8XDH!Z_cX~0F=mQI
zBgBN2aKcP7V1hhR?g?I$D#Cm6M0k~CiVS))!jJ<@bVcIi;Pmu9>*xQuT`O6(^TrM9
zxNz8JR$CakCy7E{0>+yJD5=KJo2Sd;>%<iG)n(J`DIoQw(X33Gk8w~S#O^1Z2OD|X
zv%eP$RtQ=?$?R}CPNlBr@mx((xAk02ROdEVZ4$qcI)ivAkNM%n8C^DEx+E>0Tqe)N
zTeYJu2^WQg1CNUFmu|DxZ8~3R!``Ur<h3SjmPqXxAhW4^1P=>*Ga#lb;=uTE(7*&4
zw$!j)IKE@MA3OmGv6#%kd{bR7&Ek_^KDGKFlGVR+0h3*(PG-PJ(t4hiCnx85{UaWm
zwWPC&t#!l0?w**99WA3|8AYP74$XT$>r}};U0U+TSeAcS)}vaTj1~~(ZJ^#Wuw0&x
zpKg&Ksy6Ajzw1n0I$?Q!J-^owW5kaECunlh`{UU0dCwJLltiN3Bv~<U<`AlI6G2wI
zWW*2WnePK~P%_PBgZ5G>i@OVNK4}4b6%e1~>Hy>>Ufcm%Ew)WMC4{m}=qnyz5kwje
zoj$bBo{ObWPn=9-kXrFh3N5EONZo5t0wu;|P+N@w36v7Qz;IaeFgTqtlNl*ZN>Sl)
z9LEBNqx;Ujm(T1NDd29>!Us&0UdZgB0rFYO^ou|B{-;m5*6&gUdwl|`+q@lrqc*yI
zfi%0t`US)a#QB_nBOEXJP1Rz=ogDvb?RFPGzsDE&Rch5L42)>{3Yc6q^}s8g<M^+%
zK^$@c-^x0vlG?FNu3;<z^V^zu5G^}ka5klaDusA(kepMLKqnc6J0_IZdM9|5Y0yI&
zCJjKVb&!?j2b9=WqYx)9vdY$ydZ$8OV?9?|-&E)Y#;4WzlDeltob)G@FhmHpycol&
zZ07Am3}7nnS9o{g(iRyFQYHxF8L=lD4gv$kGVO)5+D9?w+uCYW1Aq1kfoePap!&~G
z@9)iX{6G7X@c4xlaYv9b)*ifgGC&u?Y<6>G7vMVc{asn%lU><KPlz@u65fpEsuN1U
zMxPNXM?F!%cQV(vj?ff3t@M!tayHsrsNZ@rUOvZG4&x*OUv{xDvkrufFGG`P@B~6a
zkz@uK)QxR0j}6!)VMuikMy!U)QYsRCpxHIhmN%jT@d_$}Z)*i45lTgI6kZf2lAy@C
z7{U@{BBF>o7@V#Pq5(ZJKZB)dVF&~RF<KKISYi!MM5!F7tLAa`o0U}dO^HVc=C$8F
zBk<1y1{onIuQ3`TTqM%it$3S<?VO&3Nl+Mi81~p$&4~=g`V2^``oFWz4`^*Y;}jfS
zqZ7!OShQ)_2~=u=*q183&774&^w>dB4L~B;e5+s+tsuP<R(~oeYccW-yPU$#r!c|R
z^6+wFYA_pmT1BwTms3qx|B%uAX@hXpbI|*l3gkVc$GAn0d5LZ8<IEbZhzj@8f{_b0
zM|DCr+O#SZP#cB}UrwO;MZwu%s8i^%OSNvj`EqFW*wK^QxfrN$Jsoc!y|ml7R8!~8
zdQpupGhHQyK3FHr2|~!j9ioO<Y!YsPL70+&Fw-|O$kp_cg61&t1@F=08&;QCxP835
zLj$@7gW{gxLPZ|NN-Q^;L5=Zrj7f`XRA4}R$8fKlIlg~$g5~Mc0gk7~pE=UabT-sv
zo()GhtONk*LT@Ut7N~#CW-tx_2K9S0K{KL~6U_*YFH9ncDi>gdBa8Id=ggJGn0U8f
znURx)Tsbs$3zhLs9}FQ(WkX$@yeYV^a$M&?;$r_sA?=-xs>z%-qz6z2i<^OV3q?N`
zU^WQpNqVLA@~61ndis&r<$n6Xx%izB2_EbQ+Fd=!h4JAA-kTigHuI1l@aF2t4!kwl
zcW1iG!|Ws7*XHU;5BwKwXS$PR_R$__fBf8?9_SwZ=p)|e=JL7B`(ysumm7K;9&ErS
z1E9)Bz#nHHM95*LBmY6@`KSCcQ|1goz`Lz)94jPtASzy|{!1<rXv4%=fjdO<P4(Ks
zv(1n#;*z@7N*}1QlC`2%%!NV=2^*+O9{PYT6xe}laW~P@1yLTqRx^3mnI)?r6YA^+
z-0*~8;XElf%<MFzFj-|WMF1pyMzv@*C4%pJj<9J{NKtKl*m81=!7?GZWXmQ&{pnWt
z;}!9n+akfaj$s`s=o(lM1!x3m_~&27j4vfck^_R=5av*b`3+^@aA70i_ENF7PF|J4
z*ln?30=s<D4gyA5-S@1ik}HPwd2rm!3UWbEHP6_lj7_-IvYd0p{kZv+vx&OU>d(~W
zd2B20Q29Q8X;)Tj;M8od?P%df2%3Fzls0r#m2y^(&Eamf3BIovUBU9V*@X)pNtI*m
zsf!blgFb21ckSs@BMGOB3bJlHT!xTSN`+dF-8FEi2-cxW7FQHYBCcwS&hr?ulUai7
zd5)9_;d=!tuG2;ED{}<h-1=4V4470e)nuH|5>v9lr3%uxtRxR~WO;&!a06}JX}d2u
z=~H>Lv*V5qQ0Fpt08!>!I#r}o`P5w72gn9Vna+CFd9Q4ePB)2VQ;Tt8X)Y;|XqFb5
zr4=nAX4n#=({05zH)bZ?P;Z%6p6)ZtjW*g}Z8MRBKHKvqH^duV;@7$<U$?U;hx&7O
zH4mHZcG^EynTVmEai!B-q8+a>+ul^K8->(Ey=Dl_L&isa#)yZeVsSJVOH<0|z^}B#
zue7P3R}?4*eH~Evd?Ok-nl3Yw%Z$LUw#2Wt|664JM1fs?9A?`+X4_rmrde1$<nxfq
z=MBNw(PWX4UVeOLxjpa`_unH6sQ(#ktEXJ&Uq~_CEUycrV^7zzkAB8iasFPg?<lxO
zocMKKJ?j=)ySJ#WZRg^zTc+%TbN9@?QkF08mXH4W1u8yb_UiOCQ}*$xTV|klbG>=?
ze|jGh8#Q}%>Y8QWJ9Wz(@tGq=i-G!lM~Om|JyR>|6pos4vVyFgE{^__%{2+`yWTro
z<xSlzJu{y9cSWh1N~1q>Q3q<)GimBJ9-uJ8r!#3=o-8Vn?V(Tw{j=54T>v1R64{kv
zFr0L(<;-I(H=P|6RoSIvJ$69;EC{>mA;~mXp&D4~qKx&ORlTD4Cos;@rJi-xhTFuI
z4u0*fW?6T%nRTk+z4B1YN@Fdzoj6#kAW!eK(i+P;=Wg>%2QdlbzE!xkxed4M_L<&x
zD(wj@;k_%bPHHss;MWxswt$0MdUC*!DObE@*{ShyyI4Iuj`0yjXRH>Wz5*$Pe;dKW
z;uZ*Ah)u}}gKss9b_k~I1aw5!Hilp~<0w|ps1=lL43DQ>!I<VKiqV-@Y(G7&ubaZ$
zX;33O<<52Q%OF`x#B%Wu@SU8U4R%DuU`H1d+j7BV_En2W&l9OEtFA7);L)#b5H&|g
zu!`>^kzN5`VDlp1G7!7f*xJ#ua__2(Z?7$~wa>h?v*j#$`PAB5>bR|dsB8Vc?m4ig
z_Rzbzb9D-<Pp*?>yS)sJ8xz*PThPQCoCg|Px|gbr)2go36TkGQuho3%ulVjynF?(p
zHj}qOP{0xPwx!CSmjrf9q0$9(Fn6zJI;bi<bzjLV=N>>M7TS|t#KY5w#3gRjj#+0#
znqHGH0hE6Ht1)R;Rzr0V*{SUgBV55*ZuHZKKcVU^2T=q$tqVClIr^Yd6F#vTcYA*A
zC--+s%h0-Xth+PTzP|N-?mPCjrd8<m2g-c~idM~B+}A;QH6Ju<Yhg+QsCJ`jaz5Ch
zNsO6v%E8IJ{h-@ZdC=}4^UD)&=JD#w=AUB)G0dM)ORVygzm$VAN(OumSsa9KWcEXr
zbn=i_AJFEY70RfgJ1SV3wP~D$_EIzhzgSq;^-EUP>6$E3wjJ6crRxhj{7$1S(M6WS
zMTMw&<+(oY-j%&-IPCKD+pEt*y0Y{--Fh9S=b_o<=r`yWp|QWLEL`IBY1+L_dL7jl
zq1LO=uYg_$TK~FA(mw$4i#waExf<Zk=4<?`S<Z4wuol`IzR9d~i&kQnS@G;X<y^5v
zcJajObl@{>QzHBN&-E4IAl!b<V80EANbjRfD$+cGLl%OhidbQXr~>o1C;2p=ALh?w
z=rbPF<;hUnzw_UrHhie9snBa4l(t@&?B^EDhH^mu2{`YKj0ww=?)Pp})f<$GFHg<X
zZcr-sEYsB+)XE*o>KC=d&7CGId-Td3>gpG{#7%9})js8t7dOq;TeQkvWwq=1=oP)J
zQs<})u5uo2b5=Jm;F4bJ+G4=km{Rx04fpJSBcc3fB)4{nYdg(W@3zh7kJ3?V>t}lY
zzet>I91_fKB@zTF8x*v-6R5-lA&$*`qBn=wM?I<m&ZqDP+nVsFa*A_Xpd9YM2y;8n
z4mW6jdz1s5Z~uj~;ZODOPPuNa^Nzk&w>{lwopbuLgm3FMieJ^8&wE+BpMI?PdfUzN
zclBp0U;kXKd{%ot?`HLS`Lnj~YBy`&)}O3-Tfba>ui|*y&&KukXPMuonm<EzzUW1o
z)o0k>N=~cWcuuf;n4E|<odgFyqCaa<*9m@r`47SL98#6oXVlFOP}d2YU75q(MNubW
zPG_`ttR=Y>u7BJ=440AWbPjTeGUKy;1mWn%i!WQc@WG5uP4D?dv&(qLf~NWK8GCpv
zPWe`>O||8us<t!S@-_`OPYCwM_g4Ch47BjFH0LJeX~loCT1$8=?t8OiyY!Q^68+7c
zj=*M;bQ0bxR-G#ygXwcm*&nm0M>|qIQK0Nx#@6!vr*I7~!R`aZSI7&5rk7JdB40O|
zQ)cU9xWYhuduQEPE{}n@>9tjuOJE}M@U*2E5v|tXZ)h%wfw(sMP6%G0`~%Mk!9Dsx
z2yVC*(V$UCo_|V+k_bLdlT0<l`>>y3>ZGVslw+DHB0G;Fs}DQbCptuDf#Ktv#WP&o
zvEFAZ3wj;KcW9ph!A!D8YgmrIbg<086sB)K#0+2UK5OoB|A_Ls{D>^u4Y8z*c`qX2
zV@>WnNBp@F?@VeZyPsc)vUcEV&r?s40_){sCCpMjHV=p<p~`DxPA;F9r%1#q>~h`A
zmsi1g0V-MH(--zkRxLP;99v@<&FOyblKV0O-iv+V<Z?lI5I*~j4Nl)h0XfUeJD$oZ
zM>d|!d6UUhL5jbmI;EH}*dQLS0(jn+0rE`|gIp7hcbSywnb|w6bir;$^t{ZdegRuW
z-%I_78W(|!T`p6z7+~OZ@+QjY^EDe4<%CAq>b2nH22qsMmszGh=|<&vQG_<GTyZnH
zd6ZNHL_55WRXVhty3qX6nE$&m_A|xvB0a8u63gpC{?byJ&7R8|+Z&{6bLEWnY>)Lh
zns0l>pEd4x{<i2nhS$}6lhK{oH_;l`h^`Sj&R4EDwO;SZM8R2w3@&TTTGkN9mtasW
z#uws&i1!dWZaxi&9xkJ-9-&)ROwSiYibLSpz>43^BFKCHqhheSy>g!@7f&GRi>H?M
z$pa&F?-8>bx44WrvAtN>fF#zC&c!)XJHTI|9~Pj&InhE>$_$TSoqy)zRh7T_?#gI0
zb2-$sGBhKh&ih!H<$sKvL^yTwL#xc^$K{JU6uY69#l7atn55{0zOfz8<rV{;sGc*c
z*;?kob;zQ|lW$vQzMv3pM%g;z3~Op9oOxPI!;%sTYicMWn4>v$_T(N@O_JRD)Rf28
zm8SQ{6x+(u+2c_G*<89z9mvj|&|O|SCmRV}iYVR261sDQV!XdzGpAOI<(H~;qFX+i
z;keBjapbU>sa1j|+b0t(Q&DY|2=*_c)ndLtIGTPbTx*|9_=7poFY#&v{W4*r&6_Eg
ziGXJSTq%WqGTdJX-&;f|-aUZv_*8&!9^zeH$|+sSHeFdER7PbJQ9S%aKMRwoK26xr
zpeGLf;c#&gG;ZvWR;u5`a0Cz<%DLS)nG0781-yiZzV{cg>kMUz`0+F-y~}|?G`|nw
z2N~rP%c-DJnx&MC<k5B{iW8T69@)bXMy1_znT@<59;-4N_%J+H<u-HG_$<n;qh|5h
zl<UadVza52gnLD1Q}3Jiip(b7sBf%{kFFESE#S-gz{+v{cPmG=i-KsY^dvOPr8N{M
zo;>hLYcQI}#8-YYkFT?94;IO{auJz%Vm{d-5+1+bwxk;d;#NT&y#V&;duI;Ad{tLI
z?3{;jnBW5ni7Kb)4fk>K`a;sT1Y-uQaK})XL$HlEm%c<gMS%2l!v%P959K3$T~V1O
z*?#8;Pv9vtP$w*r>N>#z516r4Uh1K*XhgJ8L=G_7bc*abHRlE+Y8Q})QHWpqErIFC
z+_*#HtPggU=KO_}(b00wXL{!;cxS4uERx8#v+|$W`FP66Hgu~<&RxG}#S2y8Pa*w9
zzu|nZGYIzG;9Un6SZakToo3z5$r|#0w3cuMCS!Q)5WkQM9;#WUrP2C#j;nCsp99ke
zJC0vCezGxf-S!+CsGZ@MYph7~wNt`x9`sj-q7M1=v4X*22n@un5yb^7O3M%6gcOt?
zwTc@N>6Z~=nht+<z-k`J6PLEvaR+u@-r>>Rc?i+ULRMo%swly^ddu<Rkz@cykI*99
ze0Do_tYdBziFs8zvEV@#838p<Xzcd4?}@Un+d9It)6uh2whvLpkI+~?x(NZBzXWs>
zLN<R1=_W*S{szH4?>+z=HFCh?7*O?{-|a4B`O;-C%p7I3#r`I<B_^{~6bLbgssa%|
zBTL-XeVJ#5*ymR?!F4K&zI0ni@ONncTlDi@8s9&0*;ob;H<ss3&iH);Mi|6pt@db4
zr<KGWVxNtsA870vGW56}A9SVgPH~5InFI^6y%Pqb<#tx4ezwut+5A_`nRsky3D_Ax
zQu@sU_9_M&q>H__H8AYT-U8uUecT?-?`t*O&qMGQeit7PUwX{2;Paq`J#tR?;hafg
z#6jFZlTK{nI-<^`yelR(q+@JWOjqHPC$}Bq$Bu$0nwQ?@Baua@O{K^l)j4>+QLWfP
zt;|8a>`txBqE=>+j~Om8LDDpZN}X9jrLgv#!x6Uz4U?QI(P_)Qu#JkXII}I4^ODcc
z2-h8<6orbtVBUnSOn;$7D2Lv_nCEYHJ0^v>adOB#S+QmngLvGhqY+Z961g;}N&!Ke
zn0+Cb){E`GYJ3rQ>m0JGfQOo0_mNErA&h(M^P@T2^R&3*sUD_o!Ol=?+C6OVYCN(g
zmS2i!d#q+>=v+%+uWCXK^U>wl^M&MXcE^d(Qk>%obF3-Ouz!y)zd*r4eR0%i*i6QW
zcL?g?A<``v308(@BS>4Ekg$+4*<r?7w|k@hz7H)v^Y-0=thjEV(%o;|`fu<3cJ%)`
z`b#_dhgL`X*^MpcMrZ=B`SusS$b8d<JLFi;G>Q}xd{516r@JbL0%|@eZ5-}o*+S?e
z_CO%FAriAfafB#yjYoNEX1<JU!exI1G|&1Llq|=_qe0S$_Trsu-vx%9yoxnz_@P8$
zN}QVllVz8Tj+8#(<n|KXC8MA;z6ia(hWF106~c!hcp>L-jH=7srzTsEs9n@OF?LA-
zI|p_;i`xv?gk4Q_Izhh0c?O>?ATA`##63N!Z6(M}P}(!Y$D;(yaQnWrzk3|bO{G>~
zLD~mjQh>SBoasX4$H=J>m?0pGx?~APVi)A8l$hE>)SBqMq)+0s81q1m4}w_XD$<&4
zMgL^!NLi=cqf4Wx?3TH@zYQPj*F}~6u)Hv10Dbi3v$_r7zZOS}WsOSatV(XLO7^Tu
zYE>sw9FRS4mLljg680$>S9*O<br{4#FTeBoi0&-9tCC7rFaDu`CUxT+IZPp)qUzgE
zu~)|@sVm!$M^*_sNbm`oqy>@3hz%qyp=TJ##NhRnGtk?d!t}(W<?}gSJ&XNbKvyhY
zw`Yh^m9tXbm;8_&@kj|c9VLVD*+KuX;L0YLgJ!~mJw@No4cyiNQ~ol?dVa5#REMo)
zy3UOJNoAspKaWLf(OV?w$c{{YtufW@tw~n@vpn79w0R^9ENCSfdoO!hzaC^H>Yoy!
zK}c(AMXOAysIH)TsMwQP1<@72Bf7@8QW7oc;0K4~j43B1damFl&af(%W~w1&1L?Dk
zs+G8qHb3wVicWH$oapbzmsGCAdy^W~j!+>G;sT5dKW3i&^>qYK{)UqdvaE-Ky0d@x
zh~E}rxYgc3=)Sff4wAT_r+qbo5gbN6m>iP}HgtHf^fRV!^7?gU$Jt}-7wsRtSKN<b
zFlOE%F6irz88hs^Bzu;x3H6iV{Oq;_@AyG<e0MEx&)4&Fe|LO+@Y;{l@1L8NL-Y;q
z;=6HM&c4_0`8kdK`^^u(+xx=*^&$6fwyI`=g+F6NeY3V>)jYxda^}F2{ZND<+cb_X
z);^k~B>bYO9D;81(oZl4e$fx!U^XpvyJU0bpWmK_Re;x=Ud;xC$ps{Lzx&13LB~+~
z_k)H9H)a{hGp0#)M3ZimuWnZy?}$iqRh;MpPY1=;7fvj;d}~V3?Uhq|rr9qz@|z8J
zO4OXvlX6H`>cJ*Pfqg9ZmCD9y42j<$r4x4l#s42g0A>NrVLaBqTvz>n&2?Fs#&Q3b
zR2Km5{~_09@xO!t;PPbB|H*XiXxlntv%~$==?Ajt(}*_OxN|K>9?3b|)jh{NGD#+P
z>tt;dx=}_>T2<ae+f2&(e*zM8-coBjrkGS^mT4vt1b`Dj7_b))7Jvi4c@_ylzIhWF
z`Ii-)Te781{=}S$q|Ld&+<nT-ivpcK2#GR<g;Vn1hM&BjhQg^=KA9(eFeiU<<^8A>
z`VlQ*ei5OcBjojS_5KQ3=IKpwC~^e_e-rz`iA)9I;KjoE;o#!_tK&Z(V@yi!ig=*N
zvDzqQ?ySRn5i7Qv)~{FZt}a^y(EgIg<K_6VwXv)(um62{FMZ2i?~Wd>*q(+-6vS=D
zwf;H3v3wi<akr+wFUE8GG+WPc<@vq4BT7@|3`iwq%7fT<wUeqC@KlV*KswdXyPw@U
zRJ*(?MAo}#0HB#tK`90LBQruE6sjiDU;%ipn>+V5Z%no=0hW4RB2tFbi(*K&W%0%i
z*(yPpMg&44Xn5;Chfn#dHCEXZLK4f&KWjAU^lgZ@bL`G){#$pUb?h?lTBPJ8j|hrz
z?h%J{2??R`fYx#hf0RDWC7h)dp)qrS^aI`Z$FYFO<z{IFYPUtc=D`0NIdQ|fZy_;8
z35hgUl3K$vbK`x}G)#W2X~;&bdRG;`W|1x&fcncGb{qiWS~%R2kacUPF5ba6<g$3o
zE1Ht-`z*}u2%&#mN<<mP>6$K4es6$s?(XiRB7YQm7``a{l;AHfNjDHJg{S!Dv0jFu
zC&aIsV-gp>5=JcD^rQHl(gzlAgZ1DmMz-p9hCM5R7~wI84jydcj3%-A-lQE(5<I^D
z3qWghM)-@%7?3kJggf_uC=D8PPwQC{LHB2&L{gV6bg=7nvwXBzFWbfZb&L9OTR9g~
z+p^=5w#kvg`(44f+Ax10iW(VLVWucrnFo+FRP&J43J&{Raz*PC-GLCO2S0ay-WZid
zofcv8XlwN!hGZ))Y3ynW92NRoUSibGlGG!R8+^FS;p&$IR(N6jon*wpr=d!Vj&EJV
z_O(4l8_(mTNXaZTph4scit$w&J~8l><iiBc5Rw!5AfX8zGG^kgD4{7Hs9546BHWn;
zR57&}Vnh!!p!kRJSsh)N%_Q0+S?!Gn5o~S1Nudv`Ac6G&7hYlP&&l+NvMUTIs1vKE
z@Ok(H0E!KzyJg8b|2@gJQ#S0U{5~#zamd^W&Kn1KOLplz@vBSI`Qqb%iZbm<I{_LK
zcW+h``kGS{`{uS$?;KgOKWFTryyIZ9zN<kR;og54b}~!@)#{W&O$#j~C#jarYAzh~
zkd?J^*1)obDyf3aGPXtxR!0q1CkrqM*%>w588y-wm;y1H9b^PykhPjPRs0(p?4Px)
zR9F%#(WgbiF-`x>QWs!;YXk9n#-!_Gc5*uJ%M-K<#H~W62v8fQO(=X|2-1;E;Wpou
z_6UX&nnWHOViNZ7m3m=S>+-7hK@6ixrjK#KI1;UV2)6~O#8A47&<W-kN#U?H#R3Vo
zA5T)|QPAX&>6R!gv>kAXqq+!?rVYE+xN7YFfRGW1xMB=Ud7Kvl7pO2JX%s<cjCjR)
zhMP@r;8szL{F{P@Lr<pCCoo5(eF$<bW)TYETIUOe901Ie;bNY_{uoG4x_jk_A{qu@
z&XdYenBIT@WqQy60}YZ+1mu5otcV<Pk0$YbxKk)Y+V2Ho5|&Sv%f~Re%MFB?l+pj2
z{9KJsS^m1_CK0R2IkhQD!WnZS&B18|%0OTY(z93{%4mkPUCxTLU+~OBjd0wfE_IN$
z^fVpwc5u}@Pljs=OrWy>;bL1*K}V<3Ej(=a>-)U{%oa#I*(-i|-}&tq4fDS3|JeQZ
zd#$l3c{#hJsVq!EGtk1hD`8*wb0TcGuDe&gG1gH0y&Ln;vjseW1XgtBL#<SaRHy|V
zb@P5+B)|jU)IZZ0sV)K=GcnF1^hU{@_XRSJ^e9U6Q2Dqk=)kEQp#00Ovk#Q&Y(oha
ztVp1S=Xl6-(m@1p(@A=%mY7SCvz}2yUMVe5Q$Q1lFNNrCuuyc86V+uTUlbRkHOp&l
z<=b@}1|4ljRjQjJ6;H2Nx8fnL&H4HD1*?bfp7r9><RnCfC_r-Zj#z}-ksXV;Hcp(N
z2ET%lsEXWY8vgFpcf6QLcQ+?*DuNDENBnleMKOmxEMiT9)Tun?J3mN*l~tYgLVvS<
zq^HZtT2DdVrVQ~6`F2q|B{ED)#0ui^eK^S(v%dl4$}`+WS)~2!=8)fOC)^!{R@bT4
z(wsiONusz&B%RIJK?tg(Pd_$oer<GBLY~l{es;5YEO`RFZ@|KK5Ux}RNh(8^rgEDq
zatiyBg>I54>t-<vd9}Fr3H}K#HZ5ACEF<dRzLqCJNej`bUQMhSU)quP02Uw4NR;9~
zJ_?7SncADJL(X~2zyU@Y{9rdJV{SO`aY4Z(6s!JczoK(VM-pnpf=_K(#vF1X8krb3
zpZW0W9)rC5<QbU%)tyk6E83MUmsMmY(kiKwRgS6Z9<x1{0~_xw<5?n0t<9CtD!+7l
zGRNA573%Ruh_=0GW~YIP%P7`(0kLqbW$QdE0H&-JsBDXx);w4usOTUJFC9d3Qv31%
zU{Q{;y|9II;8B4E%La83LS{v>F$^xMg@&AYH1vx(Sz{ovttQwyHT@-WLQXfA*(44C
zJX60{B`sXsK$n<eQ@1mJy=F8;Uf4<EiOPkq$Dm51u*&nd7>P;N+|uF@O^>xK(qH9?
zpBhgdy|?5n&(RahB1WJVmPnr_q<#r?m{dmXlBp(yM>u^M!Oe#Gwy@;Os3s+TUm>X<
zb2z~0n>6lxX9<RQ2W#4dg&pwrVJ$_qucdp}h511&)eKO5Z1!4B+s=GW;8N}KvP~#Q
zg@Aes^<d!oFx{Qf+tYDMN53M#5-VCDRd3qxFkmf0$}mZ^k2950KIB7atW~bM*5vH(
zm3oErgV)UxF>PDzX&k$d3gZtyV96?+z?AMsKET2UGN9FUpo1_~+Us?zim&+vQ7~XJ
zUNeVo{S!o=(x7})5U)XOJE=CS42<ssC2z94U<+nPzo3kI`-sc4DP!%f-X1~TrS@Ux
zF4DZ1vAw%^9+yFEOZ`MqpBH}vCSIE@xE(S<RNOu-O@nL1+aKEn81k)6gY19@O`8T)
ziT6ME_F?(9_j_ajs@;bgbTmd)F0zUOs%iw|8!bzwh3I@Nz0LE=c;QZRzVTZ20okZu
zk5u(PSLBBJr?nQ9@kS!lddIHOYTm74IBY%TBxr3M%{(=NgLejKJNXzYm1?L}H@9F_
zDwj~IYvTYX%F<3Y;R2aenUl_sq=6#)FhO?lEnD?8V*{hl4`H~2gD&A*bdnRoAt*mJ
zY9Cr^)!GeKy|7)Hwf2Kl@Lmh0s;dc#b5y6QE-_K*o1^F~R8;N;1J4E*a7O%)U3Pm#
z<fgB+{*lUiua?TY58y;=k<TrZYMDK$-uJGG=fXufJ*md`t_tVE1vw?5(yCIR@AHc*
z_Beszrj%P>;61Oh4;Kg9B434)I{i~t$A6jOe879Y?{zbG^Umfrcewt2q(@l(TP(B6
z@Iih()b1>@_AIdp+<5Vz<+9o6yr&lf|KGE4{9V?Udr>0m&3lDtGq>#FHeDAM#pMe+
zo|Ms4zAv)aB%7<YN!~?R+uf5RIzD5%A6oH8{m8HXTg*Q+P4_Vm1puJO{68^eihoR5
zUtd;GSYBC!{(lpM(bMVwZ})WnjWin@pc<PS7#ZBj%BbDJt3@aT03~1mlOtdQI#MD8
zzfEIC0L2j!3c^fIQWtQY05Gy=A&G@_csTjh=@|(M%2nw}Scyhj>pA&JndxyUFtIao
zGS`#za}00(=Y_!`a3X0gwEwaC@_+6BzkuuiN!I3UWB0$v{{PyDRhznJm(74ORv$gW
zU2s*FdI5ngd=;&`ZqOxpu0nh5CW}P=D0UdZpIX)?-xkfgq*o|rtE7|#qhOD4iu1|M
z@5_br^ZjnEoo<zOu0s!Xnmsj5;z}mUslJ(c)<Tn_$K5FPw-fo&CN+bZX}X#Ox2w+9
z*TWUOv(8>yJ@bdseDr)j?k*uL2w8x`3}9#ilq3kDgU(qPN*1*^d@%EI5i_Rs$F;dr
zuB@^r&6APCz9g)@IaaZb$~`2uhXM^R;tT@#3K9QqAvl0YDubYLpT-YkJxyai-_pxS
zmu%xIT#J6#iR!WHS+6K=gffO<2n<9JkinF&fY=a^F-(vE;??8rM*{sQdmgriN>lu?
zgPVx&De&|Y#sL4H#lku;;0X)VTLeMaE~xE;cWaVpSze7-<OM^DIFVQgu*nV3j4>bv
z8G^$Z7{wjXgv4-pw2FN4N}F7s9vPWs*qsY^QK26FO4CddRfklvkzp8XeFR(PHXc*E
zJP{{t`s?26rf``?bk(7H<`hYK_k*4d97aL!3v7=0HZcnq{RPMMn1{v@4%705T3EDc
za(_4$y($-e*Z;-ZHvrkvWnGqS+qP}vm2FqOvTfV8t6tf*?N@$f+t$?AJw4NZPfX9>
z5tDK6%^Npv?6Wd+=RW(aJbRt4rbn7JBTs8x{vq`465WccswUTsML5r8*@{S4Z<JW~
zWedW_$LfwXgR3=j=bP%-UB)ZTi<+fPXEp9~9quZ+%?AaZ^9^70V;A-e(e`)^10NjQ
z^J_Va?#Q0wHWqS2wwy3_>~p5(2Z+CX4~B+x5+4Wv-~!^``5w{#W0?7Ws{_>du8KkM
zc?5dH2g--1MZ1YNUVvS?>`ytU1pF2b+Xw{(lEPcJB2gruWWT)G;!ZjijxnM3mS_>x
zg~8jhGwsHN8!7kkfO&5qg^=W|&`361<pMsup)|S6cnGei{F2F0qubO|&-HPCEAbFF
z5qXb~C`p0``9kG+c$Ddj8m>UFPzB;_*y?JqJG1e=4>fG7ME4*OkWYoM_2)Vt1vR&h
zZOv}XWIc-=mMM03wtx8Sv{$g7uCY0Ne3_bo`)sVHT3((G9X1*Gl#a}o2|n#5w;2Ae
z{j=g;L@tEGZR?zU7NSg{C>AL<n*Kn0AWTo5SITU_%oY!zxF7f>QFU=_9)Lad^~Zwx
zo)}fEToUwkc&OYIwPz^JxMd0@44@>5Vzj?VnG{BCX&xFuxeuicTJYE6Pry9msn?wm
z?vAM<qVCwzPbV{MhfD_I_?rC|Ne*;lDB8Y2?zeVr?Qw+IxUo89$PbMcljTZ>dU<@;
z_M|z#Pq=wJF{>ZI$MR|jbr}*&;(?}vsrr*T2!cFLmLTP(m}rLcNEv(a2GZDI(P6Jj
zW{^KlE<p6gQT|r?H?i;Ud*PBH60fE22jUPfehA%4j39jqIRDt{kz&=dac*S~ic2@3
z9KaAyTRh+M%WE0J3k)W5wk>sAZho%L9f8Peq+N(#nM>Wi-zp#s9fn~PPht#|3<!*6
z+N=}%V)I~V<gH{O?T=4q%UhR1&)&8^M>js_qw(>dZ$S%g3@#V%^R$KCAc9YXu0HwS
zG^9j{0Ks7KzXw<ZiF<YZp8UAzrgAjcvaFaiu#ZS%ezc$%&!Kui6RV~o0ikzY$(Pyn
z4DjwfXgbJ*SKRS?AB(Y$OduSy2u>JGeBfO|BmSuHBYoBi6;r@~+IK1nlUG<FfN3BV
z759?JJTXLGUy1-{Jv%j~Lkvl^<N_HZ-sxKqFpD&uFfJ8L001*FN)HR7V?CHSQ(C(o
zg)@O~yQ&2%MP{Q*7!iVtwd88D%X9|<`YrY@6F!Cr>6mE1PeeH@%hgJT%XDXVYU9*V
zn5>Lo#q9B85Jx%n=X<lUS)$@{%mEc+&>ZHd_77icqIbYs0ql8cVMhcHE}QCmSxOt;
zHJ(W$174WA^gQN_D>!{jTcP7Sl{jWvaP9K*kzblpyn`d_euU3{V~z!g48M@81fU+)
zV2X5mzC4)q4c`(jdfT;|(_@3nP#NWFxMK+o4(SEDee$0=eGG~~UfBgIcKOk`MU8t%
z)t{*0h@b0gV54$%bcmjYn7Km-{v4j+F4co~gmz64e+=N=;=3Sh$%M|n>2d`P<nzuG
zE8jX~KfIffELeWe?V|ZQL({jVe9>nJ!i3P@e0A*K^tv-4#2ki-<KoeW1TH{htr&P2
zAi+6%RntD_$yiK4<DkMq7?04!D9O=`_FgMD_O548?0CoV)vu=x0jz|i=Vc^`^#{)=
zLuY3MzdNb)h3)IX3ozTvn$<(?T2AY7nq;{MB~Fe?$Z$V%ME_DHnOK)>a@zJ}ss4if
zE4t~pHbMA&PZ(c9`+Icz&Jw;i7PJ3KqLKYSqMMtMt+B~ph0gSUb+9$EWYWgp)y{vh
zX@B+Bf49m0FT@<xf7_<8s?y)=mVMj(>;3QT()~wv|8KVcE)m~Wb<FX%6Y@VlSpQ?&
zqBc$r<|dB+$UFF;oFx8&@3`}q5<NJ?wml~6_t^*d?qB{XvH90#IsW5j6;14H9nGC=
z9o+x5<vSS~sp-*4X;(TKDcYqc(ZdrJlB3chG?W9g6Yfw@N5H?~0yWtwB>Kig^>1-8
z{pYxBZJquVQG-+!MV%BKwF?D3{qlqi&DhkBu^%9e_fS%a&XG)a4+#;K_sqABN)P_!
zt$zcDHrtm>`wfi#zkrjofaU!D;eTz6{}H%<xlSsOg@3<JbFOgEOW;6s9{~mLmB06q
zx&n%z5R|s$XXN>LSVj9PSi}YU6#II6$45uUXGQu(dwYS3x=Hxi$(yw4+4)Hq<4A@~
zh6N79^bcZ+PoSVop~ON|hsjjIQV<T>S659SXa$av&`Qw^mJNUURf7KQ@Va8wPVBx9
zW9s|;zmr|(e{n^Y|LE}kPk-o!{JSUq8-K9>yDwy8$4KLSV<G#uc>c57PVt}o;2%i-
zKl#DG#;*VVJ^NPxGcj_avom!2XVHd#gt7}w4aY(WB%c)DV6i#)g&3RsH;5}MkW{Mz
zMhcMIwL2jK<@(iO0e}pf8IiB2Dj*OPGs*h*MtD9yp6<!<@$nydzaDLKtCvp=T|Q1)
zDtxOo+s!)DeEq?<UrLNxzJ5O0R%?b7zwuq~pcXxY+Hz!m0TD}tizV)xia3kvv|wIa
ztzD4bjh@R`b}-P+J`w`%ww6?DR^csV(j78akHEUw@L)W81mdx0+*prVKF@5VvKgD<
zKEc+##(_(+dE<VLL3Np5ZC|0T^u5K8QfkrOX0)3VL&L4TFwJLIc=BDhhnx|?L^M1_
z?I9##C8K7J)crEz*g$SNMD1j}N{;8(0$#qtBKIixT^l&s`RT)YGsc&;h@o=do0sKg
zYcYJb#AI#fAwNk~IWaa(jHT+x>9Wn4;tN)U<=D`F_pS40rB%yqR#hGy4SEzGRe{O#
zF~V70R>v5hCC*&7@4hJW2E(vuN)~XZUb09tj45I9gGI`IvK%w3%XiwRypG|o|IzOu
z;vT)NsXRo3PKRwM3fs@Qvp8W+c)NkE&z$=JPeX1iDn))bmS)<#;4PwWHz!>@(q`F}
z?LjsrB@+d5=$wkTA9nAAubdI6!G{aKiufaRV9bdT<H>`D{m7Jts0(%3!u9B+W;=Ax
zTbuzc6j~7{{~FN$nkUbEkQv9=-57nPW!F<610g(Cuur_RtBQu94v9tMSDe#J!CRZ5
z)3E)*Sb*-mSOetL{cG*dG`TeUR<;+Fko~H`ETpkfy(-xDB4OC4_Agwdnf^B|e)ZEn
z=+2VIZt)lTcJN<n8)E$4rve4%?A#-3Kyvo}{_n_qE5QVxKfhw=Vrp`Gj8|i*IT|X(
zRm?H=>P&!#y}S;GSL7ru(*SONAk=%qsZFl0*IRed;=}@1A9QvBajSFrY<s{>YVaxJ
zwy4w6<YD)tLSKkBhWmkA6*dl(+lJP5g^xu%lG|cWv-NYHZ!{W^V|X=W<FgT|Y-s~r
zy%~Uo7+;TGbpL7Gpy(EcWxr8c1P*Jwt1+8d?fAOX*GMVS@i5D(j`TsQ#MChk!^W<d
zcwwCr3Tey-^t8<q3t(On45}}a?8ss_!ZoIl<Zhh+v(zQTblFwCBJMR~NysPv2}6%b
z9FE7-Xxz02&cUT19+LTM>K$MO+}ijTq~?5VuT>l|*_k#!(7hlorcD9blfxUrf=EbO
zD`a<N12opyEOPTi>YbY`I_Bxx<Ez7i*e`z=18Zm>PTLTyFobzVArJYsTUd!cxn(9;
z=Fz-UjOhw!`j!o~4Y!w5r#?CTbKu78JeLKw$`3S%W_{bfnc5?o=l~oaQ`)fdX6>;*
z87ipJ$g0nSepci1W|HZFzHaSj{a76F_6yBBzSod+T#WvTo9_UfiUn;qPFK-VN65-K
z#4S9p!>*Oy08G?Qzbkh?eoR1<GgglZ|J(#hXFnSlU^U7yvH85T+1k!UhM5S}BWI*R
z%}gt@+wwZqWj8*k+d7Ns_<Z!_p!a7{PQhsi*~52J(7ml7fmujtua_ClJo%oF6-ZQV
zC9jO(VUSqBw2E3-An412I~9^R*XVTVcx!bnt=ene&}kHk-PLbbI5x5p@TXuuEz@EW
zZPJMgpZ0n67eAh(m94;l7iZOY+zL_9t<Zhk^jiPV(YGefYexEn62Pc%8cNd<xd&mK
zs097AfI0RUCWg}xdmuI=tDmQgn)6FoMnsq9jC29INQLBQhYV;1Vo-YoKMff?>d}CV
z2+KDa;dW0k_lPPr8FSV$5DP1-HVnrpgrg>yMDE)u2u;YHZ0j%>y81fVMdx@8k3LSU
z{3JL>RtmF9M%u`Cj~6D5xeD4q`HzN)P5)dq-20he4A$LeUEp~G2Of+)Ck<3k+~*Y_
zL?MyoV~QJdz{rsJfq>=rjTCF%615zU1}Y+5k5pcjRS)j71WL*E_wR(@dLt!0q02j8
zVS*I1j&@dpnezZP7%tofI-h61bUq1Ti!8ts*yrx0zW^N8uR3w;bEHkb@%l_VNXWQ3
zwM5gP^N<j(Pv1aob7TC1^YBllfQ$WVYz>z&8vh}^b?-Aa&z5S4;l4-R{i8P+LhbFx
z1M0>WkXx^<0jc?6uJWZbJCtVMBk)H3u9{!AT+i0n)4Q34(ONc5`fmcVDr5MX<S{lS
zRk0G9tNs+=!>{MQWdObtuoxp$;btm|y3t^46mKYX&1Tq%`c;3z*PvP&3nQokzwBJ3
zT5t%|x(E;S(MCpEW;bbmuXCOPvL4=ZxPpVgzDkUC>p<Gd2>3uC6rvsOZZxj<LK*nf
zi!i3gS}O=bGmp^Y6XUBI9C8U;upKDWM^uGz33h<yd(w)CDvwTHY^>6dY#sIIfZq$6
zCCGe_gPWfTzL?>4+1H$e!@lDqzG;4iJ+T9=u^&0GMtqmR-vXV-w!;jUO5NrCAaOo+
zPCnn$sm<m$9!8mhvqG<`IUZ!j74gB@-j4b=sS?vKX+c2*v)Vtyp-kLgifFHX1}~#H
zlhW(}OTwLKwa`@9%OQEw*JhAdO8Zao?vrL9x?2<SSTqirSJIRPG#(NzBG(idKQWC&
zX0)e(oS@0v4xbRamq9)C=QdJ}CXf{{&h%whr4Ue3(MGH#s9s6U{8r`3{!Jj#eXnf&
zF;-(NgHmLR`J<;63;u<HHk{a2ZsI#=q6t8|m-L*VdX|zvRvxsAp%l<Ma%75p`N)1a
zPDsB;sJg=fX>Dx^fm@6(@DfK#*-%n>y~FVh{z2s?ykdAY+;O)<7oqE;aNlNi5--$n
zmWj;eE(87)t|5sw-ES(da&v~I|6OWAh$39x)Trtv>zStp6tP7!g)8UyE~WG=4}FWJ
zD9dRhpb?X=rOYD}`%BbcW3HkU%YkJAM$$ymOXwFonsM^@DeiAd2k7{2SnCgq{H!z@
zgc%4V^r|z1G1SX-sg%V=x}R_shrj`^UlmS+R6CxOeB2qbLFcOqG|3Y&G186hFZz@O
zWxtLV#-sPO-x7+gM#s{LJ)vD*H=!7Y0>1QL4~K!qZWP5x7s=XOZTL5*LYv0W?+k>Y
zTC?C2x2xeb_O0QYxgCDfk#(VH*t$DDoSpt{tu4D#st_Vb0Dxz<f6iV<%Kz&?>c2m7
zaI&?wGI6D|{vKd5{$u3O4D$Ef_2PT+t-aRx+-yDnR;tw^3z{35o88GA3CV`;yECzz
z)v;1q%>Y_c3I$QclrE*Wtr|c@BzywM<DGb=M49^fXd8fNv7R}uuNU{zLUJ52U52-#
zvOfv3h&j;#b?lz+M<=BneHusiM^C<7UyfJ9ZEwrg_*35W5px&hZ@2w|rDhi{u6$37
z4gn`#h<mjgmm3eW7Y9SvaDeqL9lqWXvgGzWUo|eCZQ9M+Or5MyCC2){yI})4;r3Fc
zdp*Das_c3Af?pEM9nJ!_V!9OGKjp}e^lm2JE-4;!u4$vvj9zcnvUl&;UXY{0b`e~z
z@n*lUKRq^OeRca@eQF2yD)c+A?Hj=y24+d|WmS>0Nd_*4tj_l)dU3bfZ;V;rjd`WP
zyrJw5`1B?VR<fhnj@kFjU;x^aZfCXLChSf_ZbBK<C$EH})PN%)>N~dllxiW`8W^$M
zYE_&X!n|!m=FH&f8ziRJD`@c-H)}S?ujZly<7|Rlmp|&j2}ZiR=%=%>y-B0!T}nWp
z5Nr3g^x;RUk0PyOuPIH`$DhLRc%%>%s)x3Y^i2r6zomuvKf?-x@x=|-<y<00!U_Z^
zV_F*Sly~7eSJkcdC<*E}+*kxb@HRmGeb0ZuX??b)!P<*_FOwJp2&V%UYpWmXg5VXr
z{;U$0x~y+|K!Up!O~eh8f(SR%EJdgQ^@`^5>Q2$zXHW|vJ~)k?_?0<iu-%iabg}a`
zRETT%bjEXSx(kGvrvUaYV}<Qx%kX--`G#?g2+U~<zi6EXX&2=gRM?fixB5lfIj8m|
zdaevfAVt`-<sVU|Iv%cNjs^AdOm+_5u6%TBm?;hAKnZm#aHf;fqPB@Ex-c+Daev4d
zSAWd>cpV7Mre-?$wVPT1E@^}Q&fyhq$n$Y7y7^(se*|BRzw>DE^NVx1A&hYj#kfpc
zgvTz|iajWs$1T><??Ey?mt9O%s1QDv&ciaI(oWiC%ihC7@05~vLe*Guep@XgqY&2r
zWw+M}vH*Goity?X=49}qye{27so817(qm!D%>ZS~UFn@V&9SfkNYru5yKfIlN+;@D
z9S@JE|ChUBbbvV)XPPa}=Py>d<5@$++wl)q1Rq%<2um-5UPkSpCn^{{Z{6r8)5X1s
z0gauIB<Bd~Hn`DhF}j^%p+<u)SE4wio+b+svfnoq>@nn(twR>kW^E6uAKiB3Ovo%F
zB3Y6MJDBlVPc~^sAuzKcggOyVG%f?;IJr}S?tR(xaGm6rawt8|t>$(NMqd{mY1KB{
zdu9&&p^mO1n5n!u({9LId@j@s^N42KnK{9ct1=S7aGv`idR>e*ebF+hOi_VtU159W
ztjKF_4WWJ?%N%ZAARgO_Zbol1W^_v*j?}XHT8J(Kb0BmD{L|9gkB7#{bP_az_@Ut^
z=VEEJc@qKehA5LOM#u*CcX3i}dR=acF~`c1QLq_NMe2}HU;z*|UNEi;GX(0=#ZI%u
zZ%8z|P@lSbkuZ|_3gIAnK{l#GD1b{q8*qN)C7BXip^>^tpyM*>i&ZfeaOc&;=IzFu
zyy2hXDM{}J=z#4)0E(ry86W};Ftfx7Mq?QpmT7%1BsxDOQ3OB%G*pe-(DG_9GE6Jl
ziz=D{$7K=#gyy0TF_$t^#(bNw0K`vSS>-brq<!`Kz-1CiwLk<?FacJflQ=&uymNAk
z=vQy^=rJ=WpI&R>C(cg;=h@QK={G#jndjzv?SNwpaOlKthz76kki!}okr$*{@l+Ak
zA>W6bmK=@PV`)7FIS@$3<JNv+(hOlcI>6y&ed%5TWX{T+*<bW8T4cpdKCCA$G3ZEz
zQZHwc>YE%=G6-jqVyaI_1U?U}L^J9{wvhrhguTu<re>5)C840gYK?;V3y;|thI#Wu
zw6Q5XyBiTpaxRn^@@iGnKcMjS6HQS6Fu%UYyoZzY?G)bf)7T>1Q2cr>q!Cx|bU>fP
zR*~QazaMH#i+&&C$P|wZk*3F!xvjPPvPX2{upi5~45)D%P6Ef?+ns=*xnBwu#3N}b
z{gZMGgKx($WdB{<Ed_2cU7)Y1693zEG|mJ}<)pG=p@VoXalEa9#bLwSOqw7?_PMpS
zXT-n|Lgh+QC?#b3_2=j;DoG#zJ-8CHJh6Qwo!c~|?GMgsH#(R@L3OSaCjtZyJoL%w
zNiL}r<eM@_w_7Jl=_WFz3W&inTWBowW<gfE;|;3li7H3tl<u0z!lhqW3wD>DlsS>B
zT=1F+SVOdA*C^^#Q8cgzCF0>kn#`ggKl=rfQPypd>4B&^Ip|thb+wB`15xDS|CE}C
zkE=*D8^h6PC3{HqnDzFMik_Nh`yABIt0W_$CI4`N1139}<*cj*7NfyvDnG3~qyRG4
z0&qr!+W%Ps5l00fa#CV9SEW+`OM1XFD3?bi9<^XjQc?%YIA!g}#UpS)d${;0`B=}@
zXNZ<cN5dR6E|RPdglz<<>n3plGef@>*GWWgxTDlzRi~+{M02nn-&dqSQ&#EK#<IoM
z9@{lh|2bjao6(=h3f25Lam+7Gb=s3~psJe|-DlM=>8u23yK}Cq1bPZC?=M*fyljpe
zL5?b|=U7aIEk2dZdcg9B2GY|?f2?zMxAvCHBndO9ILyHMMx2w6eQ+m{y`QB$3|nYY
zFDr;89Cs|j#UZ^}==gLWL=IOup6B;TtGh&v^FRo)x22}?mPO3aQj6hEA<$(tz@?b5
zhD1q{WFkl@wMZ}26Y~R$n*TW>?jNkwTc*X6nPmubTl~=+upO^{%;9Q=;345P6{_%T
zT<$T&TXB;2?-xM4-OJy<xe@I|m}r$ySqA0+^EH6tTsfhZZhas^Zkds2t4tAx1*x5O
zeg)OGmY>=3(^O|rDZ)TwrUWTZ{P@EllPEuOjw7m%<8-O#@{m@&60&U_hHr<l%eV*%
zV<exfez<+sq0!;arw!H%$P=c@;%{_7$uJoauOd)gFJi~h_X)gm{Sf#Q)J0}z7ucH<
zxiEK)_dUq_wzk^)WFyq(dA=LAi#)FVex4@q+EQc~!9xUH;Oe>$cV}tfH1?tqiq67y
z9p7H$D0)pVE9++v{8>RWwW9B`2VQZ`xZDs>D+!$>)R2^?_E2L2@NJ0*_m879ex-1N
zrlKaRQ9NT!ISJDviWRNJa#k8b+TXW6Bb{z~hX<~qZHnzYjC@lgc1UU*5r0OIwl_cu
z8zT@tq^84@Yzb{ccEi!DHiZke0TmYgP5Y2OB_33R3Wl;Ea8ba20;N!Ti-5kjgQ!Oh
zk3pA{!_&`gr6B7khGXY@Mw$I2Wr84hkBQ>z0)j=(QXq7Uz^j#}+3aaScvY(vSP(@i
ztV56fV;9vM4Kw!>@VX(b?iON%@toQ{pf!)1d?Ak0>lvp`U%y3=W0(;0`MCNqhYo0I
z7J9Vu=ZPpXQ&6~bAZ=Hh9|44dCU}U?>xA#uz2l8OQr9hiZ3nASYK$H|uJ7quA}D$6
ztzwwW&i=6P`6G%}GK?j`Q^z(YB5-Z4<I?RxM~I?Ucczb(FPR4_-FMFox54H%!>8LE
zdQ#Ozl<dVYsqqKh*Fr&3Tq2=ZL^q1G1AD#)%{`fZC0$VXK*q?#TxsrFvQ40d&ZAyi
zZlmBKGpjFArc#GT*C8tWJg0~{+uxX?oH8Bi87ssf?G>-!8I>Z2AGKJT1dzbh1@83>
zEun7`#OvO7Bt0^LTWh}nZaP(8I>3*<Cq+iU<xr->X@}jdn`71dN+^~m?giEhWh+~}
zxKOvkSCW$3rwK#Sz?YRR-Ty)bSwEt^4f^yFvQ~I2I3#oto6fu){&W-BAj9S&2V$b@
zb(0o%_y(q{wZwwEs}d2ES!L?+hYQOXud_L)xEy<Q$sgoc8{`y@w|hKl82A+XrXdw7
zb#-@pY9}DjA2f6;X}ZanjRTl=M#J30E!G3px~7LilohhasRZ{vp&Ht`sxYLq+79}t
zs6IW>NL64ch4mfaW{IBht(dyEEzoJ(G}p{+58)X&4QPETK~L*AfxbYQ?t{_CSZD{L
zme1n}d}2bTu=xHp_{oG76H{z#MN&}W`*4Lq9RLF0WCW(AU_mXWRzny396J&meYGrn
zvT+FpmI#q2e%E$D4ItO^I+J3^S><K@j!XT9Tv=o;RYsK95sQQmy)iISnh93YR~ZL9
zOKb-Q`!Y|MuXZmd)nDhbM@7DiTYP})!P4x*J6rG?oGCoQa+`@yLayQFBDLcQDd8_P
z)QZUuSwpIdWt_^(eU(;oDe)}WyIb9qze`ftx~r*FQgz6>KrcPe**(Rlj-nSP@?0=#
zm_T?DL_-!wA+8B!I0a083ZsX>R<I}UI`4aX62K(w;z3lX4XRFyD|JMuIr8-i#uZna
zNQNxpJDt;wQj7uc=a0V-pl+IK8f~4_Q+E#S>jAb*hjQauLqxL$i@64gX$ci}G!;H&
zW>NDE9@*8j9)P5J4h<Q-+1GG*7lS{m=X})i$s^`jaWmp(nl6`(=b(CZ{60I88i|Jy
zRY(x<FJ}zg23i^i`_TJ%#$N`M(nNiKVEh!v)!kgyiHa_rPk8B%WYzXl<kXDMld9n~
zu<N%|sJArcvl{y`*zBENx{;;CQC2ZyKzP`MSb-5|5?(ur-9Q`|{F4DHZRuAAOct!B
zFrc)gxF524iL%y~VwZVJdg8(sta&IHvsvJ{F(#MELZpWHlD_cC5LX6~X5AAjYvo<J
zdHW~eyi>(vMqq)ae)bStj8a$AmWB?v5-7OPvP<)0aCJZ0l8-m{LKkDXTfHFV!CkYD
zv(jO>_2fs$aE;KC&yeV!;rnHkveL}P!~T<nf)D?Nnn{w`Io$j?w5y+Zdxd@-6Omf`
zCh)0ol-X)sj8opQoYCenN_z|?t9>I?FlQB?52XfQ&2M#{u6OZgxN|!V1W_)bw%nLR
zMU+#rxt*Jg_c^ANU^gv4#@0ehv_S>bFGwa5-s09AOnCZbh>BM`)XINCh5sgWU~UpN
zKC;YkwTUU9q$^=pDGwVNdW=u6F^R0&GeXUl)njCoGh%I)Hy+uEj<)}!ASgO8)t4n{
zAG3k)smP<v;6c`-f=ZCkt;iYd-7sK+-@Egw&XEF(_B?SeKKvDZ=*}u#1-XxM+gVZv
zra)!H&(HK}n}kgAflE<v7}Y~&S&?9LTZSaUvG?^F^2-KL?QDrJp|QPys8@V`^o?D_
zvM0eLx@Zg~dBSC{x`YC_xRrAJc{i<!X7-i7+I{HV>TV#da!M>xSSEjW77SFcccW~m
zYi5#k!Nqb?>sAMMS{@qwLXXuJGrHtpEOt&AHAZ!19IyZtM?-urYtPa(si;vQ)7%l}
z;_g&Yq^2es_10WX$I60AQ3jd>>ZXc2TttCOq*7vhjz@pZk-Cdm@<C%9kY^^}(Rnn@
z1nbMfM-#-wkU5pDfN@zOi5DX$U^1u9^fUr^oK{&?T#yt>I!VD+jJAW7T4FwuqVAJQ
z-(;d3M7F!N3~AQN-wQN^IGjQ<IhiOYfw(?Dz|UCGX{pSXkZ)y6r6t71>(qqet$7#K
z2%Z-{a@h$Rx_j61y<4q5*}|bpHxXUzOsEi>hJtXXU5-1)ym4v$<~`w<dobyWUC(tC
zQ)}~t+fjGM(AJ7xop{n89D3@G%ELtkLVm8g0|)l9xfU)>=2FTnq{;e{ZN*eDx~FgJ
zq`LoPrDPp<4?rzq<~WJfl=E<jgR$WZ*KsY0iFK+*y|dpzruod5Tuika&&?V8pocIZ
z=;+L9L>r4ZX&s@!G{~Su$5JPiJ7ouiMvCdf%CRkg{?v1$iei=y;P&y`rCo-(;I59w
zadE>8l~ehzA4@9YFCNqyrMzknI!C2R(?Kp-iX@jl1GjOePB~<La`=A*$v*0|tzV@l
z<ZEVk!_G@ysn?rc78@VGxzwjtIV)l7RP<1b_hr5PG=b;d@XU@QR92pN4OoqGQNZ{_
zIpa31Kvj&s`?-vH93WdHA?@`k`v^{_QJ)ZM)2wr|$Pzq<+dWs1+=zo@QsXUhD%<ta
zhP~{KMv-N~5vV4EJy)=DIhol$Ngu&m$^8m-bLB9zqEo!V*FH;Td%vTNUVZh^9V$M+
zTC`@QY&lX|vS_913+}&5(jGWzC5>Mf2XFgM_7TAxlJ;E9-ltn-Np5*hQ4^pe<1kmP
z!z!|NiBx+Y5pt+x0d5ZU3kq`#_s%bit3a<F32Y*aloxKIvL*+=Gv7P2kT9mEg7!+!
z&$vkDY=V3Ll@F_`HDp4%?8z5KhP}60!CIz;^%iKX(W6sF|MVSye3gP%)G4Gol>Mpr
zs*O@-VS}gOp6w<WK^gfEQAK-~L4;Kc2GH0D0?)oxqPox{oU#ZiN;qN?4FL&|KR%%u
zS8M}qq*PAMuSIK(>T8tuu|uOcQg3gB@}cJxf1d7aIifyc5647XlQn-2lOn?-YV;n{
zV#D-57_<$TJAxb``lSW>#a#0i>3W@vKMEj{#>0Y%Mkj<;8xgLF6xFgzo?b?m$By%|
zbLh%EXIPl!BQnW2Z#q4v+j2DD8swWPh%Vp~gv2JQ>4{_}@JKi3a55ZoefSn%o>Y!h
zY};<O(ENesz}g+$USVzRmw#)09Cq?PbwTj`y%y_X^V&27833Rl<DXf-e|;4D-+yNP
z&#a#d^FMgM|Meu6cimx~qkd+!rq_OPv)mB6GtsOooj5^p*vx1In=^e<DI!Hb(lSCh
zUKvNu;?o;2F3Am0QXs*alQmINs(Dr>Z|=#)uaw_g3uK!*0+}D`%bg^<m)Ni0oaJs{
z-51Zh6AM36oWJX3;pD6JD!W3DUR)pZSrUqlf9+}-$Igid115C>02b^r8Jcb@Tc#Rd
zm=Pn2E~a;mM<(@)8{^N`R<4`z?=cq5IRCM2rkE58S^P}{;}MK)<CN)`Ya^!f<df~K
z>38$jL%AB+tJ#6f9hQfl0%;z@@Z%9^TYp*beQF*eNh6*cc8m|->z2~M_ah)ShyqU*
z?pV_b08&c=`WW8Z9hI9rwN*P$)M=o5x?9s!T`u~N9!>t@AihwJr*DBO$<yEk*w?A&
zI6#5Yc^nUO-yE7w4sUGniUXA>dB)n9yv|ox4p3=7^y%J}5oypXHS_II2(Q~YZ_Kfi
zJoQ__s*nD+(=88kl!f5yY7dq>#?gHGs|LpdQrDoHp~oZvKp>ZAXeWi!7yp%8h+M^x
zVlVjP;XoL~1I>FLY--4xs;=9>Rq&+B02V|opJqiCU=+|%`_8Q7BP`eRQ0BVeBfs9q
z`4b!jH#=0(z8z-wx?Kugw=(2lcEFs>?P~PMnK(bz6m-I)psm7VxX82Y?fPYXdc%qv
zuIyfEB<`3?WRytSWT60@d(z7L1raO%#Gj~gh^8BuFXTV=DBLJJP7BT!t8j_0Y%pK)
zTZe~d^FTg{Qlg_BS-S43frD-k;oDCcoN2$Azc9-|tv8?We&3q+6P;^<<_Zvm{kWNy
ze8c8chg}d-64SMSP+PsAK*7?}PVRLvi8@`W0;*ZU+Y2)@B##MWJV-GxP~}iCE?g8r
zx}m)SW30Cc6y_hiPA+rNp*l13VZQmH9t1K@5TEw9aYa9G#^m15raWYAI|&2>4Udnt
zBKm`F@<5w0=GBU0JkGtFy3*W)J}<D0yVUlNqFd7APcBB7U1gGhxEo<*?2`zcP&Y7O
zNg;5T9b`&{aDnbt`(h^$vUi3Mpln^@`P^pNnpt8LQ>)!&?AtN;W#_4V{eAj;tevi2
z$C$ne<jP=GGiH>M&uBT2dZ|kD#!)4T37JD;P7PBh4)gqjwx?W*&m>Z%C5*Z<A@%(&
z3OBc#HjJy#i#-D)4(hvv203psbVQBi-^B0A(w&uRa>}-7{VmZHCf+_bW+z$6{gj7p
zG|5Nnk8c^;NqDolcn*gO0YXF$%evYJp-8hKq`VPN7`6w_PMuLHO@m@4+9>rs9clYB
z*x<+5@$F;tnTn>yvAG9OpBTY|hxmH7e^A+aSt0pj?Qwj(u<OLF)aP>Zk!hk{qR7k}
z8`aF$*dDZ!@ZNT0pjGFBlR<W0*CjLha!5uaOC4zh`YOwLz%xHaAL;Itfl<t=yHW|7
zZLCkX8_ZGaM@)r2KgpJ5d!A1^(-SNb?_o0%g3y7c1>*EMW$HvgNkJ^F6W~3Lctt82
zgQ=G%wTU2eluO*z>eSfaoc)@Jnu$AiB4x^NFVZuU{HbDT)_ueohaYGC%fV<zg75hu
z#}}unfnkCHt-vjI0ieL*NHh|-0LAL7%bN?nrJ|fCQV0hT>Pw#Z4Z6U>-)md|IP6%I
z36*b@#EhVQ<y9cphyW6P!|MMo87xuM@RM5KvI(t##}w4Uip{IWO5pC7tBcBKv#HDs
zf5>)?1|rkUSiS6Hl-yfn(fQVHct<^}z(igU=EhS++YAp_By#HdU13NK4FMi78KiJk
z9#l-nSR-3E4!0>mc1Znd&TAu&T(t?FVCMZ&{>VdDI?#3$im9IHZZXNAZw|J^a!WNx
z@}MYkWN0PX%TzGeQY?-;=_7^KozK|}JD@m1tdz_$<(&6}C2~&vS8My4kRGI!k^3q#
zN}l<6)A`yAww^@!vr}}9#ui&i$HDzw-VU&?up=O6c(-q84dD9+>vK%o7b}Cw!_!t~
zMEH=G+FboI87!4RZgztmR;B5|xFJ*9)51w7R3s`?d7$heUiyNHQ>ai$z^WT{Zt02&
zzdLtzfbx>E29kHb77DFA7C*$wp}n@fLYi`Nen46II86C`DO!iCsP@Q`Sxfpe9caI*
zISuihfwOn??qq|7USfHsKr;)0Bo|0Y89>;VL`u|GJPh(ZQY&7(8WVh1@Jhhd?oZ62
z=&CVrLqqz740^2$@c~?7LKjfEWHuQUbK*%83hLP9{j&ZBuT9+##4NHN)BBr(vbm9x
zo~dKU%nwBp#L9R2$dfUrHmeaf4KSaWGaBvXMC|sG?n#&&pn<i~VR@SjmR|*rN}_&r
zSxIAzKIw0eC4+%`I}j6cXZOc*Uz`bNodFA6$UiM_R~U65+uO~fYo#rurqyjd3P6Xw
zRAqvk&s2Ouh+@S_MhZ_uY`73&rt%57E6tMp#L7=7kZ{U`ovmUB2CvnX?g7TCPdJzW
z`#<?y)*s>tR~6wA2>lBbkdB*|L<6wmz$oK5aUuXD*8#@X0XSEig)~4$H^6>2g2tKO
z+3Dbp?iel#4y0o>QX!CQ2Ad0qqh$Eyw}ZhXOLrEl7<w{3q`l`+);T}${ag#t1rMmY
z%mhn45L3^1$NCw!BWAaHZC%CTSu7*1TX%pPEozBk#oa9!n5x;b56j=kSy#%`x<-ug
zr;;-`@-y~Z=Zj^jvxH);?@m)38HK%Y$N7;#Qw7)FEkDf%SNA8e%-U+x{0}Kv`S-<K
zq6|e*-qq_FS+R`C8IxkSHf>u%C!P73g)UWcc-W}Tt^I<HhV98oj5a|>oaS`IiS$Lg
zSWvsC_Cq0$V#y2|;@mR-SjdRGe);}##^iz`G9?uTRun0~=jh=@QCxi~@Z8CIGaoAS
z;Wg?WIR)gEZlv0<-Gg_^QvhrGeKJdBcxa!=TR;}^5J3QC=@B@7CmPA74gOPDUVurD
z0h<Hhli1rn{DZ&&O8n6jYs`qE7#%YnWtz#GX?Yj1fo?;9SR1!t!(M-rH`E~xKP%sg
zsW(K$uZZEWLS4;MJw_CQGqhP+2$YG@T@IBY!3}?s&$_9PyK2N`&h?j$s5#gOBbLJE
zJdozgn*i1_pArV^meKGDz~dN!<_K)r1kTN+l;iwD$4ZH%rbiLkLyFeE9M30$jA!C1
zlW2d@etNCa9s((sI&EJWQ0ScArm*Cb_$Pv0nYC>ri#8_tEtFe0hA;NP$R~qUo<<Gx
zZmq<un6K6>17?SqguxDL0Np9X(E;geX_PI}B4?OqLWv_EMI18FIoLcbjG#H*&xG<X
z5RwYgc%3*g{TN&x4<K0EH{K9Y{S;jOx6?w;>z22+)PS~BKg%E?c?mqg!5-qm*y*~0
zn3%FkJb&zc#F3jTa)5WNs$Rq7BK<>hCHfpdoaiC__Wo;w@ig~<d6XJz?w+;+YVugZ
z8HnqnAkaWH>>*~9ME@4ux<@Z0H#i%S9H`3=W7!afI-A-9AU{MA#!=7NUcIk(U*C_i
zZpL(vPv6dVXJ0d;x2EC8BL&8EJC}LN(3M8bYF=^~|7uf#4J_&DuweruGnVqOeJ)5L
zO&`|O#`lc+5+*I5yIA0a1PL&XXPDU!0P2>-fa82Ymkd(OtVBK`o>>i@WnZp*sz8L|
zACcv3qf6}hTT5-p{NIamh?39{X8aQTWdT=Mvy&E&b1WtBrv~3g2wRx*4n8v=$n90I
z_3{HG+!@`Xo-?Gq5@WX4zNP4_J)c*S^zC|rA8Rnzc<c`+socI`;txN>`JPaXk3Q;+
zf>%fVDa@6M0k#5nO-|s|^eSqzG_7lIm+{!12=DolPf&4K|CS$EH1#LyiJAH8<YErx
zdAON_y^l#qBopIeAt)c9qw+I|Pq01rWAO!79j(O{OP51cE}N(^*&K8rzh=rdPHZz&
z`c9R49F_58&Lk~#<(OViC3(OU)t}Cp3ko--SraUuem5hPW;Cd(bPILJ4-D=GMZ+&^
zPI>Ui*$s2Byw+#;O);*NE1EbzzT*si+CEe23V3?eLpxLH(|QN!m84q_pcG>L8S+FX
zi++jUi3aEnfxH5J6(iwiPGMdmX<d8nra^>ry*9K_pl{ESd>O;)Zla7+pwJi~|Foqr
z7ixC>vgVOjQLKGnNndIJ5&$<PNcjWUzkZ-%_lBQkN06m27#)kO&t?T%z!-yeZ4cC7
zewEz<RqB|OSuWNhY{EoVI<SG6FV$|9UR06h#Aw)HsI@k$k1L1he9!=VKeBz%5vx{c
zyJ;wCgZ#EGKIwAPm0Iw86}yU>lKnCRcf}s1Z<2wouyQY)De;PXe6?kA8aW_iRk1x|
z?c?t9(4Xx2=yUapGm{?j%}~4mRp!D6;#^<$io$|u{cG1Uv=oBRy-tp2x~P=wK7zF3
z%)7wSa8yGTO_4T4c1+y&Hb4cvvZ#4LRy8shoxf3dq84&0?xWcov4v4vVMDB!6?U{7
z?%D=;D(SVKt66b3hHwb4Srlf~(O?Wq#+JMq>IqkvNj_pEuF_Ja84CZ+#>Kt<8Zp!j
z2}cv{ch%fVW9Ul1z{aoKj9=Ma7%sV92o1Wdf7tLZy&8#G)=;r{k+66#ak{pM$Q0Ig
z3F&+89fLcyvmB2JuV6pj!gg$M^UOWcAHQc0eU#_K`V3*KwSaO5jO=NvCCY%G*3+1!
zlZcw6Xo6_3!oIEx=#r7&sakyup`m%F<r9XEtcx+0koVesz$g&~qaU_m>w*{lE;a<v
zVFwh0QZ8h-|I=)hvQwkpn1l2qc4sTE|IRAovxK?-T<xst8t3>0FT(_vR|wO=8`fNB
zs!pO^m}glJE<TEH8qLvUsMP~nt@&+po%c4&ja6h*n6)UGx%tM_^Af^G$gH`itmv}U
z0B*NDc)yVLavU<W3wa&@mg%w8^Bt-G<kEijkzk|iZf<B~?AYPi!0q7^c-cRHguae}
zu9^pB`3~|t+aP8%9#_XvMS4kcTVKEu|FJr3Mgu*t87n~Cx}cBf8S57pGc>L7jj|4S
zLV-g1k{!g8#2EIYXl3TqF{7(nu_ya?roT>ZlNMFy3{-lsv_{_Os+{o0MzUO!0ri&5
zmZQii*F4%>7Y;$z3PJ*`w0JM?)Q1MQbWtM0(=SuWO<QZ$8=-qo(a0uvjz^@fqI+ee
zE=rQSZ)jTGY2%Hih|Hl^579`98$t)%%o#eH$b5g3P4O5g1B_et$W8*v(|%?<hjd{`
zDRKq5O{@7G;&MqZ;2s|xarCnPW5W71)+H;{!xFtXdR{J5xE1c#$K>w9TN71VO>q~;
z)Y&3dIS|SK5C*O)scDIrG4dC1z86E)j`xs6-|%&{w--^ez%A^G=$h}a{caY&>1=Yx
z)yIq2)b94YF3T_$q~P=5q%IUhdj#xM;MS0;e00B}Nh7|Hd9yoe+&)-vN=Qs6`GCcv
zW2H$<w@xAIEJxofDl?8`q@ZZRnH$y=CN>qsPcjXoi&wPMz>l>eRwvt6wJpzAwI%G2
z2Q7|PR>lo75F7Wx-^k)U&Ex1FhlQ;9bG)*NaeNzQm6P{M9k?z&2X`<&uIua6Yf1&&
z8$nLL)UF>lGk)h^xYNJeF4PvFBRTw8ZwP+t?d&M^H=B3&oB`9qa0VfHM}KY<Azjzr
z9a!n@XF4UbEi8C8;hP*mJBWYe=KbdHB6ONNmc*kfz0}^EXp{7WKp<ya4d5LuqBfs$
za(u+LUYi{++B-uJG$e~s@)>w5RJ)J6`%CkB^T0+uqvaM67!Gfq{cDXa(kMLMD9tyi
zUAde*Tf&;l;G1)fs@XLJ;z{&>QOV~&K=^Zxkn&{7vTX(ooS$Jz4a8dt=+sTdN2A7=
zY9@?(V2A%o_qz1-B(?OG^eb^`_%gU&=d-yOlHPEo356s_nyAx#Q>({-+LQW~qNSk~
z^+SB{r)%4BKz!loMbCTcBi}BfrMMCdwvd|2M!twH=LyGfZIeP+Ov<xZqz?FGvErjg
zr$@t?7K&+`XhsFyL=!Cds=u-=09MFnzfm{e^~-phr&Kb&DK9(sd6<U50qCc#Cr8hM
zVEM-Ve9VXt)b!e}8$?k6WYldm1b8C;_?DETJS+l>LE_BWh^2q+x+I;4iWGSKU{LWi
z?*>j4C7Ha5l?Mqy`Y;>J)L8Zlug4z6aJ{$)d#^fNgbF`*>Lll<n^ni9Whpc$ZU^Dg
z=zvU*x1G~vis4rFpUyG6N*0J?*jhs>JmK``8jCn6fde6(z4V8-r0!J0Z+;=g+Nb%?
z=N`)G7X8V@JUK<zPxw&ZVG`n0CB9BDT?9Y#zGCgNz{{ebY74Fyb`-5et7M!X3^b`v
z)e+T2Aju?gS413O=!s9u(P~C4je`{%uYgSL*TttO!rrizj~y!x#vKQz5(Y`zgr1oP
z=i^MX30;YV#4mcn5|b4CLeuSBX2=~v)s6B+s^i&(L#z>RErJ1S9>gdWA0~2~-Px{0
z1HzXiWb_WJ{vI+#hHuo1Tl2F_GB!~ubFtS7fAN9kd9|$W>uWQgF#IBD#~R2J@KhyW
zBm+Qc=>7#`*~@(mDnIl}#mB%d9vy1BTD%zKBRs`WA38nn#Mzr%?gBv81-56CLybHb
ztc_O@5{R~bJw9fg{^SXBWC?Bhb4Cauv~<?Ydul#*n1WF4gpIEAlxVYek7VSuC$m7I
z<?W5+-giw?#BPyWX!ju0E{azupw!l%-l<|gvI_$)bQ3WdI_2`|W`7(?r;7^B+i^nT
zMx!1Qr>!ie<P}kp3MU=E#Wc|SfE=-v1()KVyAA&Z`d7u2b=L2(=WnLbIP3o_)A(KU
z;p}MQ@P9CkTGp}aY)GG-FR0}Tc~gdaalhY6)C5w_UF<u?h&I_yN`q+@bajl!W+%uz
z`#ztr6%%O3JendOHCY6ZGP8CjnVE4CgkK*lcQS2feA_b3kG6d7cF!W2i>AoR%Oe}g
z$P6@^e~7>gh?HNyYPZ4$e#w)g1%Q5Cy*FLc1FBD3k-OlZkl1$>V?I;6W(T>PgMDgw
z3i}ThL>hmXinD(RWs@|c<DCg37fm}22%)8G)(avKjV3fwBD)%eP6wXVOc@Ij$2H^c
zPQxv;fVoW7E1Q@eOU$Df1uzJuRR7pFeLT3OlV~H>|H8|d4vDe{grQ#*h>TmyZT3IA
z8WBWRLQ??_{7fjGA%jRSDZ@$(v>%>!@eHpkHv<MLl`vJ31eFz4aYD{dH~lqeoMlOG
zf5qN>R;nF_(qtDvnytiNz}{?IV?GMY#VP~cr#?6jOGHc}m`GAz_k#ePNGvx!@KRer
zU~Y?$o41+eowOkTfNS!?<v9s-c=g!jwhjf!=x5rwwb^PNFMPsm{+_s3xC}71lC)^V
zFUy7S;JC^Ybw%+PJF{M1N8W4xU!6y+!1SxncLY&_oD;B=YI|ErWsDxd;<m51B{VWr
zn^#&jm6weCtrO3LQla}Lyxhdc1+RekEIT^LVjjhJCM_%VgJLvbEpy4vbAql<jl~<v
zq7zPYLPbu<I^Z!Ia)J;w#p{_UomuCDrAuBujz5ZI=Yj|@DH9?}B?KkZVBN_+vWZpV
z;fYk@;rLGG`3c{+L(Ui1;Ds2J=EbL)pR1v-utLKsy|F?BF}!Pq@rkMkw&CF~$wZ-=
z`DoisiVk+D&PGNo3v(9btw=ia6+o!n=+`Xra4!x&PQT1vTV*3Xo1J-<+DIDm!yMSD
zA#%6>XoA9aBWAllw(mEfG3Y3p)~?E@&6c(|m3+XvQW4V#80mR4^m|KrpH`~Wsp~`(
zdErSLJ`7MoE5OFIG8K2^u_@NyDgKdpjKOa{y!7>iNiT`AY3C_(QYtYkhT2ewf0@h5
zWcOW<`%^>VAY&C%2Xq!$K6<@{k65aIVzc~-JlPe%X+mZ7Ww|B`Vfy}sHdg=ZQg!N6
z<55noS|#<*R><WrTy7Kx+=eL9LXZ5hs?cpph{nN1j7@V6?t=T|XC3~kI?Z#K7>N!V
zDXG~DLQrl&)kUKcAG!s5dQe50O#x5VPMD>6iR7#@lQD@=P*Pb0dD=2i-~PQc4`hIx
z{-K;XqaDUTrZQNCcet45+q_g$4H%{{1`{SzdOFdu5oHEbJmP#UrxF=0QwRf!@n~4X
z&yYDKF};ui7#?LYx$hm*-*<@($6@!$bBXyB16Wjr<iZNWPQRjZU_dd~NKDeDcunq2
zD8?Di)cG<xt8=sEu!mreXr-D%3eLvj#?quRC=FARiqhFcAsj+w<s+jAVLC*xOf0kU
zL;YRl<J3-}ZdWe}_r}1a39ubIrpzaoK6r4M3D0dc^VOyrh2#begEzyM_Ch~~e(Yx4
zq;kj|A#QXx;n#T0^4+A)dAfuGcbwGd%?11A&<E9EoZSWk07uNsoWOCLq$^!@UDQyP
zqQ#dmz7qA-*ff&&wnG%^3*9G`6tt+6K3Q0X0%UI3<5YD~1*$_DN!l#vBF6tI@BXEa
z2oMpWSn=5?^RXv0lT5CjsOcnL<sn>CzI4V@vEY6YZ_VN&yP!@gB1B6yL1oj@OhY-j
zQtu<+Kp{WZCsO~Y9jYKag&}thb?ya9G;VzdNL_1SlMT-VHbg2)7w={FVRG$`R-#r!
zkccUT^zgfpK-ESl;w+x*va3PEqgqZbLp1G}Xi`^!%sNd)!**m+iX{Lfya*1^TrAGC
z|Cj_qe+XI-QPgW(JAw4~C4B*)(6vHo&!AYNbUPO*7vp?uyn@y|f^#t{RmTz{iN*<p
zY*D=im1|*g#$3qb(E`qdQcPtdog9X25pH#I?Itg(XmX@-nuIlZ9gwOGNaofGezeL0
zV-X%n6DZ@-zDw=4Hc%pF8E%`n0;DjFE3s+@B6sNlZg6mNQM~FAQXTOX0Vq(igd(@D
zjNv*?6Lz&O_|rDy$XuRt2&N^Gf~G*A-JeU7BsgHoj*SV1D2Ya!-(u{iO7$tzIJ8un
znT2&E@h);klbyeganmC^upUKq!Yj5SQ(=m+R~IL!*$iJf#vqo}KIfeuZ7qB<r(NYt
z&h4^mEpyy)Og%kinLG|4YM=YoaI1pVu7cIHt|+bj;0t+Ok-)`p)~5%!w_q-g32O+@
zHi>1tOJ)*qdDUYFpfft*1~-rPeGIQ~tB;mlcDdnChF+<aJ-XyCC&j6q`|=Dr&qi23
zq}kI(<lc+X%T8oH>-}+OVhVm&F5f+c=OPt9tV9v5SXueH!+PQ{+)lf=-`JmsY0dbI
z>t;toT}|q<<c6#k13utyFkGi2ySOcAuBUediMbx!24YKKudi2$kKnIzSJaI>V1|b4
z{iZC+Bq-qrSMWNh0U~2ZM!twvx^&;n#>gg#2!yQwpAN7y8exQm-rRfC7COrAVD(g*
z#t)b|U*fEyP~{F}FwJh8OFcKi!%?#BGQMEi&8>v=tpeZT;A5cV2)04nOib2H1)q=k
z8goSNS<AN+79g)kelr12bhvodM>uW616`LhC_TD7gmB&Y<Xn5Fj5sm<Y}5eRWc4o6
zrL&jok4Rw!$(!{s^3>f{KJ?EG5j7WUcpUX9n#k?cH}D)veAG~8CBY}<-7jT*&nxG5
zb+7MgGGe0_=YNkwRdKv6#rNHBb~i=?-cZ!T>&#duFY!NER<xjUVa~63aw6S_r|XFM
zCZ?k6m!tvDxYYPNOSnCQmi>WqS2<&SX~mX}#2`vL&Ml>&#k+C){fD+bA>QaWL@PtD
zSU{sx>LA(9yPS&=TgnrNY!uWODFLs(b{n9wH;B)-01hnWwp07<d&rWQsuH`9m{j9L
zqj0sBQlFDy03CgV)ZP&l$5UOa1i))KV9Tz~b8jElk(oci*$=NWZg2j4D3yK~Kc1``
zH*CLP(Dbdb^&v4iy#gIhAJ_!y<Wm_5HP#jN;fsMfB0HpA6#w}jgq;JEC_vYo*S5WP
zZQHhO+qP|+cWv9YZQC}#`=;tkQb|=(HNT<f%$%pYZ&leM&^zNN?XK25^0>MbQm5}`
z=z#5@z(9<9lN3BoP`T(p+bQ7o=N2(S>^CSx2`CA0?e!P{EaH%F38Z(NC=j+l6s<EX
z?fq#2gPr6sO@FD906Ch(NE#s;=YTar!ZnHHRST_WN+cmE>C{sDUwS(+0a}{3w1dYt
zX+d=?gTodmG^1iuVxsQU8QP<3eyivG!>_fJxF9wK+4OA#rH4$1GRac~)yPb`zU}J3
z_O5e^r1agQ67v#Al#9lv+rw1|DIc2xTYhym0GhflW5RA|p7a7MGZm<4J^|W6u%t9G
zpZq7g0rR+^4#K#&)0-Tb_?w5TDMd;Ag(+$oN4Ke43|$&V6QzBkYz_Qiq2Cj8(((7r
zhv14T>DM3-`Aiy3)z1y|5WxrBW`b~Y{n$90)Z;eL%mNpO2V8k|9JVtRP^crIQ<cT%
zV~=A-{iEgp6XuZBJSw=>Q-v&|A*frVofW7;f=ej4^2EL*FX)=Sah<Q!NqUst^0nXJ
z96TTaQd?JheP##M^c|?OYrXf6&&sZu(i7QCYez#e8|^1|H1Ulj5`@pgr=NK-VY<Tc
z>v+z)QmZ#31V*g3Yzj`SOH*0(L7l&E-z)b{SnR+r9A%Jmu&1Z9B>RaRS&K)bGo~8j
zZG*;4jv>%o=cyrf!3Da!o?KWBP5Oc~QKM5agWOON+<uqpB3G)utP_at(w?M#dT46%
zjuJz^gq6sDNK=*poV>nd`CLJKa`nF8|1-A34IbBsKm!1<{R?OPU#9l4|HBsa|H+vU
zlU9+Sbv63m&DsAQ<aDi}Wp}`i;%i#;4zJP#--(4vF3rW1*+2v_Cs2UyU~!tScuWj_
zw^C2Ed7j+;^~xigEodHqV$s=H+4JrgJA3a&`vWnmcO%r|2Ck^kk3A#MesKl(D#HKX
zw6Cpz7k+E`o9C+T)bsW6GJQ{?!eAhT3$Cm!evke3ah;Wj8*_rloULp;>+?F(Up;ws
z7I$p9Or4#85F#7#WM)1X!y`}j?J%o><HUH=j6H+@tol4SIv6zg{jqQ0^!sg4-S}I+
zU44t+ZRcZ&-^}Y>#bV`$$?{a`?A;%p3xP?=q$NE)lsPoHWF^|8EWu34k#d-TP$h*~
z)F|nD0mYlYsE!olR!{0^CFQ!YH@wJ)z9M;AA8WW>f^<uI)U}^ni=5%yI?6JJ03^v=
zl{B6qslYqdWcH^#6rete|Ki;qEKg<d{rps_bu@)EdcV9^y8~^DRa$(isRK_;Ndo9h
z5>dB9Z22K4@(v;ek4x2_m*ctvwltHLS?pVB!b02+{20!Vw}9ZOoGc<c4mG1d2zdZS
z-OWrG3BQ&FWZRw^3eucnYJ9A~1Sd#UT4SyqxMtdwQct6DZ$vVRex8Ex=elY4Ul9-h
zIEefhA*b3NtiX-}K0?dqd!w_Q*Y%HJjq!j<f+UHxF;$#oUR8!!N)J$|Xy%ucON-!w
zn+Qh!TVh!8qj;7-iNqs<I5lG*|7Tuud^!xq5^-rgucz7b#%Y#oDGTqr_hIf|*x659
z92ily!B{RlXWN+>hgZWnhpfU_9vTU#0WfzW7_q^5#uf>AOGFVLX;f#REzGx8^FrI#
ztA^oYf~*)PU(W=6z<$y(LO)ZLEJ=Yg0wA9X=82~eJG)#9vpV+@xCd~)baZu;d<pa?
zJhZpkF&)J57|1r@mbNAOSi*=lIF<y?Sj}Lgm7_oZT#gQl&Pcl*<9YjCyO~PCMhT$6
z@`S0p+;A_R%g>ybN(3@MRL6#$;l&ml%OCTsR_?}sA2tV?t%IF-S%UuD2iCC)_W^rH
zljlh(p)GpSkTYFe@2js`t<S~Qecw||k_Md8!G4qH7-PmWAK8?HzG|#RC-K}!LENhb
z^E5R9A-3iKs}lW1)|BL$E!iH)hVKIZ+_A4=4vvDtLgWDTk&K=>$WX`kFKO4#ZxLnB
z@ux&twzEO$4IwO`IX)GE_SdBL&3$Oayxr*}q&zTTii{tdgQQV)dh^zQVPt@ZPVEno
z_xvVu*B(dopMEj|fT53QK|r8t4hcLe(v=Xu8UC(KLcrckD<ROhymAPIt-yBLt#Z2|
z8n~8=H{?FP^58ZpBiXqJ>X!6fqh?7`p-j9lf+HIvWdu(u-D#Rod2Wt2;prJ>mn!)s
zw$fPN>eEssb~C2sgJI(MRLB_T<Ck7Bn*+0SlxHrwR38oP@;SyG9(e3E#iNose@y_C
z<~I~D){|2`fyY-|Ffatz9|XSH3p~T*-9k)&GG31>*pjjt!e`2H(bKG2dEjB|mAS-@
zK^^n2<aR6y50bO5M|We;p#%A`hWr4sR8oynUiXVxl^Uf2{mGc8)XNIH7=Z^C>QaTe
z#{3AhqDbF(_Xi;D{J;}`@NpX?$oF<L@pDr_ti-*$fp*}E6%7sMMX%Y4dfHI@jX|0Y
z+sn9*TKj6Q?(v?2xsns3#4Xl735JZLpL9Y?I-EfEi`oC!{g1MCWjeXO{L7Fr!2W+J
zEAsyp7h-SiL2LBi{~iBRMt!WDwnm!w+*Ho_nlc)MV?!It+#7og&$OaNxVBPA&_(oi
zlM4(3m@tqQ?CH__!VRszU#}m}ZWiJ7O@#v!8%-6_AelcLKAt?DJ-k`kyiRX&4j;8q
z8%b+P*U8mX+RY<1bSot^$|+|@hOeYe8tXf%BEfur&)4~uy0Ue1QkYmMN<6+1IN$Rp
zW|!^@JfZ!p^=`pC)<zxj{8%W>WK^dtQ_3~v`1$tt8_PK<<aUn=Pe4xV_>`VXDJ{R3
zhr6mC>nX`BHJ4;yd$W%gzX<=bJdX<%$JU+<i@zG=mRC*O?s%lB$uLY@<^$QE`90ic
zgo5$!5iasmHc(W*{lU(uJh99b8r=d1qERv%?%bL==3W$<b*_}uNmi+mJyGEZ6L|PI
zy2+`knN-N<S^=QN+RopBS;Ta%IeqW`QKah~H!buo^9sW}xwWZ`y1KZ@dA!o8dE&3J
zyRu-UVOndt_9%B#@187y{yzD>vwWk|Mr^W}spM9R($LACez@P}DtxS}c%GT9>{|IA
zOjUb#FPm|0#PoHk@bYj6{-l2W>~!>1K{fm5^T4qw&-s0evs;4q(8xi};9Rnz%M=On
z=baHdZFJPk)v*}6k}HMc3w&Skc&5ca?DCzcj4G&sj>(rPM{5S#6o2Jg!ltJsRci~c
zABm{=H$-PS#n8EMSkSV7?M)Vx-|k?h75-zGg%IR%U0q#^PokjipyaQ(YabS=VAHKl
zU*z!dSjL~-J&ATujr`4=a#<kGuA02l4u#G08<7xVUIpCP+!|SHPae60rdQny(kl2u
zVwUB@&7upnQ=nOB_pMY;KY%fon*{rCe!uy<z3;#8=|084FYbyz&d-MZaCv#$D_CFj
zE_&IPejZCN(gqKEd*9yG&qc*PXXAeJb-io<{tA8X4xY+|Vcq_ImKFx3(S=>yjsDHW
zy|B~6DM#-(EYyS3!#gXT?e%(jTpT>*Tl3Au{c(5i^7DQ>ct`kX_Y!mcI_#f!^IP@1
z`n|qeC*bB(+{MS^TLmt=eZI|vxx&ZA_kDeA{3d!{oc%`xx_kIjVS0o9ek(Cx%b*`>
ze>dBXh`ir@ZSJi%vBTnB2zlc*S2Cx5!n2($R)(Eo(?j4uu=o$UGfvVzd@Ngq@OfRR
z7589~dqZ?8T3Hrk2~KMEgRn(r@H!5=8-@3>?OMa2esw;g{~XW8?Wcu!G}qmty^!D;
z++XVTgzoTOb!4P0-be6pF)@9QOvjdhntNx)>{upa5XDSoUNxnoO{;Jlo#BmC&rVkC
zV;&w&Mg7CW_te-$-b}P<WlP($DC6;qndL1iT<&Xe_RC5=UuO#QH!v$kg`S(=M1Fs<
zAD{n@ybCjtJbw*C7HmX_ZvEAzZ0;u7<@LG$dOJG4k17QAu3aK}mE|45zm;00=tb4z
z-Tl4avv?{FwM}7*l58x-RXOVx!x6+Qc=**YUd;Cdncb%b(zp0N0oTgDW6O$sQGlJM
z)9U07&h1mjx0AYrmhlG+??b;`9b2t?{ad02z9n1^=xxHjU9xc71J1g!)4PwQw$_VF
zgRw`p7!FR4zYk&R%rJ%!48?%~fxv-q6#d32UplE+xX)fImWfiBx4-tIZbW*omfqLd
zfWh@<pho7rgOJb4vh41vFV<`n2vEqCGaxEk@h}h_V=dk5T`AG6IkjJ?xH#pZYM~n4
zSbz*;g_*7ZZsy?>cpJFCRZ)0sX@B8IJJhhLTDbaGMU8B3<JQ+agXvpDY?6j~Swl50
z@_^`LAj8bay^>-Ww4OJ+a}#~5+M^Isq6_8Q0{vwCJA&_t-m;pGh2T>7<qeu9JEsq;
za~7Q5%7ga+R0!Jd;3b<s>}R)Sw*yduo+uzX{uZeS5~EUB1BW5`zBl)j2tn&$z8-(a
z)Z>ctMKc#RPtP630xwg-c<DGjo)r&47NB`g;l3FM^*0{)5E##Ej-dn7-E?Lu{`ky8
z2@vWcXrdsa5NfMB9mm@}5cdPY0r*liat15>$X(vNd5+5l28IReJP3|h0v?u$pMXjx
zMqk@wuOLSqkkla#_emd?e$bN1r6b+KWcZw-Squhw6hjTTQGG=8>(+gy(mTAdbF5ji
zNN&wpGd6ssPumiqU2I7mmbOOr?z@EFx)%RT;>SBgr&3Q{Pvz;4IijEIHGVY+Q4gc?
z`yY4*Xn%MeKuSb407J>IYGNK4KYq#Ms`8rLt!}0at#n%>Xilhx!%jC-fWu7eX*BfG
zOzSZo+Gse>S2%8>cX>9E8ro!4@0!u293rNWn{c5^z9yim=gh5a6a;*SB!`yUC{ei;
z2*Fr)#L>JM{6HYqP%#zWe7CY5>ARep+xOYo+<>xVHI;HTm&U9>EgJ=dBe^X=rvg$Z
zP8kr%No$<8vu5Dwm2ECfeHF<Gr(s%dhM=>*fKlcr?J2Q&dP5p0vtp<3XEc&W5J2ti
z;Z0C^4du+VSJw(jH11_E*IP$n1!6H~f1J<I_<QQ?Kv*{kA#f(b<2650PnB%Sqo}y8
zJ{ZK$j)l8+2Li5IH+MPnt~dbRWtbJQcC;^5;|^Lw;Y)W9c;gQmM!k;MJk!+5=x@t&
z!unqUSYf$-4Is<B1y4iuFZ@@jpKOhrS2pg4IEKeFj4u!ZH+M68fEe1KvkR6}f8g<r
z0%@<(OPnF#zGwBOD^%|H0BwG2gMshZ8Lk=_rfEZ|+*P_(x*2>kf1XLr|D2s_Dq&ht
zcqp|80peS~+n}SnqF*y1#B8nj)%BU8pn(j|^~?96oY~HyjeO4`!}>9ZA<@!gw^3OC
zJe4>3Mj!|R!StHjBOg;sJOi+Pav)iLNg91rQILYtm(PZYT3L9w77+LjAn?t1+8R>=
z-^CGcqzZe1WFEo%*}P-m6+H2ei}%L>O0WP@NSw;-wR^x!%nj?PC8+p#C$F`Nr-Dt`
zTQnjWINBd_;|FKmPd|SK9A^t}F2*bSHG!}8<y(LnFCoNeQ|(OESfhP=?5(I>w(H$b
zLw9<76Iimwo}$67ONRYkMgQo+(goHtjlo@Pa*z-Bb_`R)L4^h@7+RZgb!sOt!)<8O
z+kDF=CYZXKYvQy-TVJ}V&3zQ)D}MkPY$ODL<7yHot{2mf%__V$6w&=!S8OXawjB>C
z2Zw`M<1tv}??+mN$a~FBOS=Gy-c1{Ju6RlV;E(xryKNe;HN{O8<j^EC&(6zynE}39
zTX@SWpR<5_B&2DZGp6LCL60e_kSMU6I%<pa%yrzDN)417u6Un`cv2t$I7>MfB@<7_
z^>M|25yVm$J%G%XZlvn=B#cz7AyJeG9syb_O?u<1;ii{vV<{feBG`i>Dnv!~Ui{;H
zJk!@iEzvi9a#s)-MccU?{6Re`o>j~RexN>4D85S!F(M4lU`5IgHkzpd%Vt={qflt=
z+Doulih1{w_WbQP!y3A8?&+E7bb;9F=KVlKf=88x)d3<(^q+PfY96Q}q7ReRZU#ER
zD8;mJvaEb<i5%+)+i_ixSv51Mf~+QgNvAjvWiCnPW|GBSs3Xa%zeh?Vw68NX;aKcO
zJZz6wPX6j2tN9&f3_B6^__jd@oJxcko7CUkE*lY9L{rd>UkkF;d{|&zX))g(6C0bd
zBZQ75CLPDhkX|2M;>bJnBXeiOa&V76gdzt*n%or=4?wFFt!oPeTxS0^@K>)^&JeXC
z@hzHgHx<d`@~qRru2T*BGC5+%rJ?Y6L&U{4EMO(3ga=6mWc|;kEeno|LhU1iAUv|s
z4+JMX<J&Exdz#J~iY9i9o0g*(h*JhqbLUHBfa`D(E!Pg>+Qo9`ZzjN{Ba&V2WP&4V
zPFTPMZ?D9!JJfZC`_9U=rualzC1oD^)Za@_o<y2Paf!xuV>;OZt2l(4CceKp3L<hW
zuE)0z7m`M?ZqR=CUD*u`yJA>sC7o_>20ps9B}M^;)#z9!`oyur)3gf&B-4mjvyT=#
zM;1-ii|(Oz-a-i2K`0ss(IM}JPlO}XEqwkMd59wutIsC$(KEO^l3blbvkIz*JPYGL
zlecj2f9D3voC?USk+wYE#-fE|=79~_&Tj3(W?$o;_`sz;jyii553Y#+#z50d)hz!u
zqJI9h>{__gGYNO#9Y<Rvov$Tx0(HL^&I!z4NmqCV^W$(GP<`kbgxz&4tNsLk10L|G
zOZ&4zidLa8&V`(>BBFo5dNGM*dfCIai#1J}8F!z6I%V3dk<po1qp|*(ZLfJEa@lm`
z9luzP!);9xp~oxYX0YUGg!C`gfE3+u<h#Mt8-a~bNT7LIGjMrtiw6*9v~RpOf4p}-
zDQzI$_n_~iQiKm_wP^17q<NUHLHeR}a~F*z!=9Nb$mr$j?zsM3+8I3wpGoXX9j`h#
z3)N2;7>Ni($Q@K##1|vFUbVGk@UCpQ8w+J{mRolc3h<hf{jw$S{P-U6t)d2)+;MZW
zEu*}e;f4(O09;^wK&e24rl2&G`jxb!4teR=W4{dOT`M=`s+1_$u{d^KYy*lMOJ2!-
zly{o!$O{xcx@|xJ-aIdzF8gs}Wg6mDb7?_{b^VD(QjK_Im)bu#VR-ttXeMjeTg1aV
z17@d{g_z}97Lm&U!opxQ^@!*p`%co`#)sgFZsd2d!d;Nr^oiL$ZTa~C$cUA3B(>9R
ziUw=M9K?WBmh9*<;@{Ft6R417fpk6}w0`pr3umuou#(z~#IZ46%E%EKF6lEr$4E2X
zkI8#8ik_|}wqDGBS&DmPJ)kwshwY9xAmetV5sX%3!t{W|7hE-Si3_&IZ5?IT9WN02
zeWXoxq4$MB&W=Bpk(tTi1DR}G)5AWdhh^3prlnqIg4Nu8W9U~zZ~vMNlK07mBf}g;
zHY)Dw3n165aSn8#okMdX`N43*=_6UJs)&j0`RaL<;{E+c$Oj@YmmEW5bEhlRCE^W?
z>ijM1#KxUEx2j=qHD02>$4C&CI1<~6F!r-Ai3<`vSRc8Klt{AP?E&o*dGa<P*#gqy
z%(HFu)Tr!+W~=tbpZJLG^kot$;d|zJj}yU&1~q^CewF`Dwk8kYd=Mo_8Ydf|t0YS;
zPB$zE*ux+U61{QolN0%%_$&VIgJ%C(D`qt?vb+_pGU!{+=(Q_9tRbqo<#q$RELCy?
z<`CQqu(<@k5_HSIBoGla#i5-+4wj;JIOB$0bv~d1dCWuu$F8*&_RC4g3K?6IF^FMx
z&Rzcpg{u__@a?T|H<Y{8?_qOpq+DB~GMLG?*tQF&P?E7nZmP^(jgKV@X|c_Rv^l!&
zqwD;+)YOg;>=^#%BzEvNyw~Ro&i4mqri^FNn{?zl;o1ZFz+P3p=W$)b=|%=N+v;^~
z(lu#4AJ0*&An{(XyL2->>PIG0Wsv@CTpJ^;PyiBd!2!AU8$F(kf0i4&ojg&WJAGPy
zKhHLKNcFj|jPGO12MW$l=b$xvSgMrivDcV-6Y<o*BF^NKdEOf1P(Ns$zNC&OyP79@
zI+Se7K7HtxiW-(5Q?wX15CR<WARbQmQ0uZqo_XChG~g;<!g4QnVgz}5Z-mU7!K%>X
z$c@8V&|JXjg~<RBJ6XlS6$tTtCVEkec*|y}UnIa%;7=xm|Dk_l3el0Uv-Zd0%U%2O
z;O@|;WxfUG{m~!xSR{(65zAZ^7hAdZM|g%m#aobG6DN{)(KdTtQt73B_2GYNVS4i7
zd_QG;_D#m;YVTsuj?VD#fmAr__a1OsqWGX;J)2<C&H{Af9T#}1a{w3`j$__Ps$mAq
zeyBnFl`$q0=Uw%gl^KTh$21k^(^jm{DMX|`<G9&XaVI;%y_ei`#YQuQcpt;G;SPn1
z&Pa=g7l6%RbFDKE4p$GD;`XjJ+G8|c8<q)c=-D37$QO*pI+=J8{t<{y&LIlXKX|Z2
zK09{$I3)`6^drzB(MWigsABX*)K~)xZI^NTHI>~8(Z~tKaLCdTtY#nbvjhye&Eb7q
zQYu$!t9f1y;##hv8JUF0G0qW~4=HRD49r~g3dYpuOPJcJr|wihH@hS|{EC6ly?O_+
zYYNM~f2T)3{951CYHjl*-w1=&DWtKFWfnW#HlQEmt_@#m6$@#bHsqP>7pV@zN3srD
zT1D3}AyG>Yh{Q^bgFR-v*H(o$_n7!0n#YN0>W?Q|lS>8qSy-XCH#GM-fb=9dT;w?B
z<Bv5WaQep#o{Uo?|90t-<*f2X(L2nfXTTxf!XVvB!D_N;ZqZBP?0oH)7;p#qk<B0F
zX|9Jm?qoYNdxSL%!%`E6Q47GpxJNUh4aL;rILwIuiuu1=0-li4*r@q?EMw~TXgdW1
zPT%Ca7-`6J;2pQ5J96}~+x=NQow86k+6CT75g=y@9^{x+D~?}R1(R)pE#BUR=lLd(
z^8hf*D`gor2P73Mv0_89Qz{^#!eSH&OAA{^ffEq1_uy>NMw($4Tq}&DHQ>)!-2)#r
zI6oo-Q#y}w@93)w5I=D-L_#;WuSPv)iYGV&Ch8~2X-=F!sjg99z?AC3NJl55_PV3s
z=NrJ7K8Tvla&WaSWR!(#@I9i&&*&4D3vXWR9os25r386@e{FuXBAbbll7tSl3QZ&<
zz7<b@I=;ax=wHm=ddSo$B5t692O2Ge5q1x6R_CG-<$qC<cMhHle0<@~!L_&(8kv90
zK;h5S<BiSEz1<<GHCsM^qK0=5vpZviy5uk|)yYjO-hOjlXCa1JameghF2brWJZ1OW
z<#V`v%57ns?y7>un!+QX%XT^Og0%`HNr#lPKHfso<t9J=i7>QDKX7l4%#eiVdAN&b
zeZUJ`L_+YA!%cLydXNcD`%YA0in*0b{+M~M-t6ypz!eUeOW59^Jd_xwy@3kxH*BGI
zyIxTlJ4p$F;bpK_xd=^`D8ya%YNz6BWJRd$b{ouk;DhA5+a=|djzex+Yy)MgZjyMJ
z4|T~12o{xi7HSH&=5M?1BLYH}k9+5b39*v`ADG{Jo_O+cQn+NI?^Z;QvQU~5C?s!M
zsb7|P6R=7s*9^GxGJvG@1Vi<V>2O*)dt4`H%aLi8tXSUv@&UX#ig(xv#k)HSGzjl`
z88f+?Yj__TK(Fx~HOh33Kv&O*I${I3VS9w^>zg`dP0ZZ`lpIC-%5s3Cx=8F*=Nf0*
z&%&#2P0r=Di&O2Okfbw1LU!lNh|*HebOe`k`=;YIym&usW0mm4<(2hCe#*_8#}~*~
zE1LC5FuiN)cjPg>^e#;;cF-DO1$EJ@L2qq_Th`{Vojh4DaejOVo@6?O`0ZMiAGXk{
zxhn?Lr5e2>PRx)>Oo8FrAQ5JMopexrRPj867J}bl+uJ@ZMXghx*uijQVhD+0*sRS=
z9@OYB3W`+Tyb>Da(c-R&CN%3g1I=HvgwHY_u~^(6gCJQonX^P_J1k0KEQ&51m_BV`
z<x3bfV5*db-Y!^pV)fg#cG(}^=2{hl@nWGvG>SYv?Bgvi-IK91kw%m%y!jBtY>Y1^
zH&VOGkG3C_G@BAHjJ~WAO9sp$;IIyCp}wt9GA+KgL5mjw-m@K=jdv3g;JPCn+YOqp
zGH=>QShjO|YQU~o1g)f-;Z<SN@PT`;q|H~xU7;5gEh~m~D;Jaz(@-&}sI({t{iq|%
zMf<k@n2Q*$P(eg5mQ#kJwhGf8E|b$fAy0_k1W{gCWGc?L9sUqTBZIR6j1q$a73!TZ
zF)coRA#xsS$qoA9y3DvHZV!6J+|hiWA@bxJ<=Dy)un|>JH6jGMI~O`ld4S$BNN;e7
z#@9TnXUVm!j51MzQs?b<)C)SCl0V#bZjk9c7%_n@suCnNu$VAh9PEo3t`V($$<nz$
zZPmAM^z&^l#S051mB&VRy1>T`!15_DrRRf35URijUJIIpv0IY1^Vi_kfgb#W-{fqq
zVXKdhMj>A+IVUO$>307W9wbfCD_b8+l&gM<a5U5KcqJER8IZ8ubQi6#5RE$Ihsr3g
zF}q-i{j;;02X1j;2pqbly<wvkQ21T*D^lue#QQ`RCJnKu0-C4Jr7aD$qj0n~G&;%S
z_H6)+y%87z6s3*eJ_!CPP%x?!6rvOp$`bEn8I|atL1PK#Sb>k@&OS~oY;$f$JX?#s
z8&d9*bM0Vf%BM@G;gRRtQsWnr;M#2h)>||XTZ1}8j6jGwyA+G0I^4#Pj6jmy0f;d2
z$qqoht#Yg1BMVgQwWEW5?$(1nrE@|ZsDhwl>dXcg7kCJEgWL0q?*x~ty{l@#N?Ipe
zP}(kSYP1e{vFdLfLoI4Ag0OKD1zJN#?;#S=y^i@qK%kLl8Gv2Ud%SBM!nMAz;G^^b
z8+9A}h{_qJfc@n(^f@wvXkSqjfUpF~W=bcBgHF9DxC)H{NlZtHb`DnJqa{*9WHKn+
z<T~kY$c|&_vQFnrQ}zTCpWc`QM~qQH(9NK!jN0M**|Mh+-TAT>qOOlf#vOXU-`GUZ
zL_JeV9+PvbE2%CDd)H$r3Lo?UOJj?a@P&)jjQnE&ck7=Sj#P4QDUM-u3SMt=y#rs9
z;NaKCyYQSI{CNGBS;x1inP^)EDmWkb5l!CkCc^^f4Crg<t-$_Id`5r=3{8w=)UA5N
zH!_H;^iX#DX?)&<Nd~XlqXHzZFwzeN(k}=@Sv9;5zf#N^_EM$h;<!nBAI{eHPK#PJ
z$Sakmh`egQRN9Y#VQzr5I0rx@H*+JZ^mh4@C1`tNzm74eOE%H9=Eys!Pzlq5Tj$B=
z)!%#Oqx%&?p`>=$(%hX4t}XexeACoZqb0Bewpd5{ZUV`_X=&!O_tV^U3_}ri^u_NJ
zi37iM4S};jQ?O%{fr1Oq<nhQGbfL%vg0ro?R3`q)0*)sr^toePD^Dqwn=BQQ%WzCz
z>@2EndHD~HQB6wGwiW#jUu}>RS96o53>ig+A4EmxbR)eJvhzsboiYMnRoL}Qr+-hP
zA^sJl6hfxQwUhwQ_y+slfg0=kK#Dc9p3py(`Mtoi-VCzzoT}~?q=p|#-7M>Xd+XUX
z6IYl%7@By}(gq)!_Mhk60zciMYWh3ZYqP+9E1H?pEf&FaNrr!UOKM9>_*Ia$B6W}+
zdVMBxr8x&#2na&1vDC_`tGh5(c$pymivODF^|ZKHVbz!-T~WmM7Em-;+|wm}4Q)i7
z+k+`!j{{)+;;lo+$<0+c3lTItme3(yl`p5#rL6BL1`WYZTU~BlvsT);uM%Qt`uW*4
zRzLoGF_e;C5WaRq-96Q_s?n7m6PZGdr@(Kh-t%8q0jE0CP3j+mSOr~=q+V>%Uyv>i
zU?oZu!wN<eg-hK&tvyn!<jSK&b(+&$Wy!m|>#8oUI^EqeT@mgfH1k1K@0uD8(zrwU
z!D^=zM={4{nz}Z2nMgg$KAP}&<soIx7`7bMjAOu-$jpdCF@;MJ1N)y?kg+HG*p6%D
zK;~+m?ne`*FlrhsY-ezyKE$1-8BaGN-cfuJ09m6SbtBDR>(afX5^|VgtmoE*N}f&$
zLe!HKXWk=TD+zoKSFR$`XKA|IiWm+#_767+Pme6`-=XuJQ=qJrEW8ZGqn)PDGzkjg
zLAXFfOIHL;TZY`?h|AY;b~@&t(4BS;U?+k<OjfA3&orKkSEO+}mIr_)#KPz8fuGxf
z8pR8Umv3F_VnxLhx~U*DWcLUAh9G%bP0WCV+%FJ<c&w=Lp4i#uJD<E}M*uJVTt(x~
z%hmSrBjwD)`3M@WxsqcBS_%w4xd9mXw;+>?h{bK~YkbWWf7R>08!5y+oHJ(~9~aoJ
zl7CL3zHXy<ho*WaaV#cC2hs<|eLgb|6L5}ggJ8c=Xc5b?K^o9LL^S~Um3H6+7&u*d
zCsQYw@yb~k+ETf4iZ1~q21ZeniScQAwJ}-9k}O#-HcEjhbc`8i=o)Ue@4$UCE1cCG
znmAmrCDL7wqnp}5G;#{h4Ci!>#dV}1zB(-R;Meb>V|lCTPR*a+EV!dD!4tR;Ye=}R
z0r`o<dYm5FFe%5$Gtd%L{g{#kYXKp=JTPF626>KRFkg<M-H{q)`BvU+Gu2*ANBUN+
zub_L~2|mzKQSmm2tu&pkD6qd2j*V~jY@9z=;T>-h_Jh2^3@YR(vO?6QnKe)6Do*XB
z*g0X7<g55Y-#(cxua7-;6?ZA^>1*V455C?$eO6U8P~A4;w1~}aP?i?w-npkgMlx;<
zEWrZxG3#~15zh`}w1Q<*Ep!!Zb;Jc{MtT}3v92qBlx9)?iz^I1GRmN8oq1Lm$Ev8!
zjCoMKh9SM+*z7-p*S6Hl<_`DH-d<hJevIPSVV;Fi>(l!VrrF;vky!;ILQEY{(+^u$
zdi{Mr>*;FxJ4kPI*OxQv)LqziTuBomqLt+f3WnM7d=(j_*2iFIz3FgD`?i$gVbnZ}
zN0D_|#YTZ>3pSLKp%Oa{e5h_~`OeAZ+{y+cIL{!msG}7@2O$ZTEvQ4ws2m09VZqy%
z7z+vh$tbS%i{#<5=ras5eH=mUns%;;%Q2K_@lH)_4Nv|YX>AAzh2Pwa!q;<qj=s(f
zZ@#w9t|L(3-V|mt(l7bWnBE97vUBbZx&pClAe(`p-9J&M_9py?NQBo`34*+9^iB$@
zX^5o>#B5B!4&5uqC>VXMJ>xE$@T(cY05UF!N3H(^?Kc(;1r7Ke4xIo@D@-hR67P`>
zzE#VcH9dWUuGP)e4t+O{{JB<6yIWCx6-M$X_Hz-k0HTj%^>R{bygIFAu=YJww*K1W
z=tXaC8>=hk_DkEP-9YQRJr>KUJ0+p97;{17YK*JGoY)!c387e}9g0q`&E4`^UU&A%
zopE|5nsg3>5ZVzvwpqk%gd=a=Dsqn{N`wDn2WUU$ty@BPw507k<(49$2lrTalmx*Q
zL1vx>bSg+ZZm4^}@8dNYvbU5@aFnc9lwD{AwZ~x(Q6nbidquZ>gf^NWPZ1LQ_-XFc
zZt_{Khwo&{N*0;(#+?nQe-2kge^13KhJVQSgS`*!wuI3?Ql5G(g}^aHK<7ErW9I$y
zncK)6N$x3NYInBzsUm@lY$!Ou#NsJcu`D(<ytpP)XjMCC6p**2FNtHl&0uL@w)HbB
zxW(+|M4VVsYU5xBED-#NPexzD%7B9IyS86HhzCrQFr&@-WIqPO%z`}r_zl74&^u;W
zNt`d7z-R@2<GhBy$x^P)`5xULT=$+~!tR>&r9Wu(9BG?%ehzC`p8b@}&XO|FXd6kr
zr18tJvC>w>tsb>EJ2LngMF}Teoktph#fcOFs0!FCbST6EzS%MUMN&BgwSu=HIY!^n
zhPk@BA*GeX(UvfyqL=BsTd3h|c2G4?-#;@bo*HOr<GR){Soyo==BWv;0JyzNc$h+M
z#j4dvA%fL_7#r~ofQ*?^yRC|eKvBC9Y^{Q9HOjU_7PAhH_>PnezGOqYo;XAEJvnmQ
zsvMmZfeub23W}}@!TU66k9^0L!-T1zL{CC`2_3pFiZV<iEpzCmgmS4l$D{Yqn4&8W
z>$I;qNlDi=_ZVg{4rD8dA2tZM_TP4CFpINIk?f&%Fy)F*+NEFsv9+>pGBIyec}-{c
z`~1pbAxBGfL#-UGw`#7_>-DxG>o-5--`Pz>%Pn50`{dR2E30#8#8xn{(+r5Qviixd
z``M(ZG8FoeSM&ROVY$iiEyVNe+g{^|MO8YoI6UK@Qw-uO-F7gQ_%RRWSzUJhC2d@L
zEmEMSl)Xs#Ky%rZb77_Ep##7F%agL~D@08{PxM}rs|2e0;9dFPk+Mp@WKvVYOifHp
zV#A`MCFrRf+y4#t+y4ght>RZfkpfQkBp@E<lI4IWivC<cByE@i0|jtVQ&(K7yO-2^
zQ=TTH$}+kq__1mCbhpXlLXVB#SZcZIqQKlwcA<=K2}17LT-t*pbjLi~^f@s`#TAF&
zM&pdyHbo2ohOM{KVTVFr_pwa%cHwf%JBMk4Gn~cR;;}~@pk^2$=cC#eft^8;X@JlO
z=l69!Jb(Z5cu1Dc3E02@%mA0TXOwsXTeokWj$}icQ@&jGXB@~~cou5PEuv;$1X)dx
zE%tW&!p|6Ak#c|i{GqgiO61?I=!YJ^2lv-wC$8L6X({J9k?5C4Bi)X5hn8%!8&o1{
zs**jW?T%wN$5F^3D6;fI?$8^^@B8`=d{Cv=_X*z*Q2Iz)`YrziqE;I@(IV)TES`_V
zvZ;&kL*(UWNE`5W2$H!UbEeC6cmZ~H;mZ=@*8`_}9>t!4Wj?zk$c56s!z1Dhv{V3E
zO&JU7f#b}k40hBl9zh!)GRfj^Tm8v(gH?(wc2C<*LJA<RhuQ5zr0m@bh&7|VbJkT;
z3Daf!#l=gOxa=$%X1b4KQdoEY76I#Daw=7A$if7N1J5jHA}?hWv$9j{=TOE-OU*iy
z^Xxc<k2@aGT5T6Uws%*uyLA$ctw<`Nw`Yd$*zh)~)I_>BBKPk-z-A~I4B#I{^^~#G
z94m~iUo$7Z7v92zX=f9@8x7*g4q7w(_2SC9E@OYoZa|1SMd$sPX4}M-<L!73HM)T$
zOq-(s06&btPg4g5HIkz2oQD4S!O^@Vp6o`5hM?-?7Qz#8<T^f8j6E~^Stf9fJ#M6K
z5!A|R%zdD`tqlZ^Z-Wcq&CWt4%?^YnqBW4$lK>L8wgci2$NP8b;WT8*ox!6HHp8O6
z$<kkqWY}a~9CV|qZPQ75d4LMHW3u6&R*|}xrGzn-OPiFa3UszVrR}Dz>Ad0X<!{+F
zUDU?=8+LN@45&Ovk*XRDE=vCVss%iOvSR7apunJn#)Qr`Iss_440?Dm!37d%3w+&m
zQB|JUNd5Xg@xAEvXh0EtpKMu*zW3?gV3YRPS?P}eWI60BHXoZ+**2}#_c6DrT%YU}
zemBUUg{d~+Hlj_yr`b3TAvWeAY6U|Ec;dcGQAV4t?`v_RT{KpN83F6BHrj?8?MBtk
zGm)YjwC_t^Kj)yBh50WUMgKIX>$){`qa3Hj994$!5B8m7kmhRoHhJXHn0nmK3gu;4
zA3c90%@7=WyZW^p-cO!^9h!3Zhxc+=f1G~TfC6kcNqT_$MF_`6l+a72USDs0mE~Vc
zkupp13EZiB_}`!T?p2@m*DnDE=u9V}$Lzh*zk75KKaTXJdfWtAuvpm=3?ASUw+CAC
zS=C)D#`2HbGSKL5X5i<&@MhC&a@0!vdG4glvnVFuBKcE5u)bI2>&!{(NYgfiVi*sn
z1K3Um;IOQfUQffLaJ6b(kLYaN*W@sCFD+i?t+)8~jvOxou(<<uBmi$`7UmFN@AX+C
z422X`^d$mEaq6u&4hEr5@RIB=gz9$<^XN2#e(<F-v2v#fq<!-X`(qC{`)fCSo<UyM
z2MoUt&Dcq1?Wd$&-pT^VsqkDgWErZu*Wr*^8FHNC`Xh*2)>K4<24dFrsqF}dVR7{P
zyyBGVWr0vBvb87|o2R6czQ2$*={8V}I;xeFoy>RwrD~e)u`yLojkv}&fWBjG!nFaV
zx#!0bR{%pNXf^9CVbkX)1B~6<Bf5og_Ht9gp!nz>t{*MHQP@Fq(Z^S}6hFq%_dq6T
zjuu5%FPdp@O|Rs6DZ&ufTApWoL}Lej@9P~^^U{AD&bjk#)|6kRiMr&VYLkmR{`7}m
z1#^kjRfk^OTM9vRoOaZAK0ZU`ynT5R{HZtpduGU^4wCIakU!5dk$DG!k#J^C6CMmR
zOqjYyp_MO{$(Q$S9D@kT<$yaL^ep2hM`a&=*5-$k^d|h2Tfnm2+=u_<JN!3(hwJr(
zckKJZnXMp+q5@5OGG;ln8&x-@YM7Z^f;KP#jefx}B;VUJfp<<|mn)8J&g+5lvv8(q
zb7A&Ue6ZMb0>JPx2%Tw0Tx5AvTLh+~sy`{}X2TmQU&EW3Y08X$?}=wHi*ih6FB&7^
zx=45G)FftHd~HV-R^%iA1vQ|UrWkk095fP;l{dTQ{lv6&NRCOQ{44`SK9{>~y)kT~
z1YbNML_ioF3@Lw=6np{><YK<0NvSQfWzCvkBjg|`Tj<~!>3#IllgXkP;)HNRtU#JR
z?d%&Vp8+Jyj{6Lg)Df?m|2%tMMo4t-0)ep=1eqg9HGK<=SrC!sOn<S_r%5(g=lW<>
zVhuD(%CAnjOlC?UUDDPskxEk;B;qTlZiQXF0)L0{d(D||Pugx&FQRh*b*h)i?YgdV
z3&F|calF!Q?0nSmPUoE9593}e?*OaemW2YnxcTSbTnoCK{nMeP?s3v8tiRBUdYrSf
zvgCKB+4P;>p7{pnFnm<`hUeCP;DTYTp}~OHZj{O1Eu>vRudwQ;9U#a_t}z#RuLS9N
zS>vo+Cu#Cg*r&pe??Rjg=fawR5%3GK-bmYgHjP};8CM-uAqU~6G8%RN`h}HVmy-uN
z$}=4qjwxV(!G-McR+i4@Wso1ArxJZ@u?&+yhCE9=t>(LDm#5wniL@ey5S|SiTr)S7
zVh}%sTw2ISw1Emp1jUcA)>xP3mH!$~#P^7*`_9*64M%Q}g{u{$5Tzz`Vxf0mWz>xS
zE7dz)6WejD+OvPbY)h@KT!WQ1zxCW$xuDen-gMR>p?KJoe6q=`s$6q^GbvWp$EvN2
zapuy6eS7Y}8mgF40baECsrPIDUHW60*afFYnO%Fp!eSp&L&wSWaOY7U_g$ZM4bdJ(
zGh$frnW`dH@G2~o7+_U&)3e(|{z&T>*pb(5%m8-iyKUrqcn_tq4UQ8Hn9kGqPhNKi
zgf}`3aDzgv>_3W2*n4CDhIe+q6k8ZxOge<7<{=QgAKrGoVAIfg=QsI2vzrq@w>}<y
zJ99ezbWyb+Rj(iCss7a~o|3b_J+8l7Tp-hL08+1$P){*#j@9Xl+2ySY!i;4-Q^!jk
zOcn^n8YkqYKM&+)N4g4>{-zn^uM3eGT3!GXBC{o!>PwMy^thpz14x@Le>TDMjw@;^
z*%KRQgd(6{DEPO*O1#Xf;N~%10p|qJ1SG95C3hu6VYTJTV8my1P*FoET(F<R5`^o8
zkcw*~cO{Ptq<G;7_3?1^;ew}2#<8j%3L${%r8S=+kR+PMFwgx!C)eHhRDS+LW+j_e
z0>#F^hr%7qH!{4Y%H4_pM`^@+!SVyvUZEy_(9%{xWpj^Nr&7ByBzCu~Y}#*(H^4mD
zeAjAFncQZ*c-a}$xyBlsO2)8Or$ciJD9;A7((ps1<WHa{X?&^Z#mf_+(JV=#Wbu79
zyKiQpuzy*XG2LOrl!*zc42J6l;EzYjk5F`O0SHtUkuw>CRfLWfFs+9Hn(-+GU2;j*
zrUCxKRoU;mj?%m7*WzbfayE{ryfC$p`U1phlOh`e(2-ddu>ZD$cn2azFdb3lUtZWU
zVIc+ORQYr%%rVbNF#1jeJ8=BAkR|Ozo@G#0nJ@VuQcH;LfK~?SrgVW7TES?PaZLJy
zq!hS7{`~-fSCk_XK1Gs1e>^bH*7g^+D+|&QW=$BQD&s8YbGOZg^a;aiNTA*>lK1DD
z?KWZzOkqvlxB}Cx1V8ns+pOnSZ=!4xx=@(BY+J)30oJ<k`v8m-I&lAE7_OU^THMp-
zi5|B)5`T9K!8hH34>HhOZKgIDXG1PUaf=GV@pYI-%!oyhMd(*SC*~@*|1w?V0<8pY
zt;P!VLC^Y_2PGy-qoDp(p7~@dYioiu2Dw|~MEZN~Z$X%Na=+`(Vp)4e?CutKOy*}J
zjAG4;sHt_LN*?nO<1HfM)FEWEA{~81=}Ck3dHaH6L9P$4YL@0{pSVQ#r4qe3X5v5x
z<j$;8KkpBkW&6hM?M_Br2!I62PtQ|QRtWGx$CMvSTN|f<L(tU~0LX%ozE3Ep47U=1
z-nOu;<GE)^&rCn24qoxXDkRrqoVHQc3(Q-eML7X?Xp<Gh9UVi)avIA<jztBs!^{A`
z_F))df)o$mn@BhJ&->>ss?doj-s^GI#5t|;!XN<_4EcSe1c_NA>Bf|;LWAEFAGqCE
z!*QvCv&7lhmbf=lf(!P88d2v76rlMff@e44(!Gb2fP_|pw>dPP+WSy&hWWRDTlAEq
zno8fi9a=}p1hIoD0FeqD8(yhm#whDp&-OFX4~9(8L+RR;128y_lXhMOdx@UuDrE(V
zDer18w0q_tQRUy4EMW(ZT!r);sacJdf{b?yu~zI6Mm6W{50%4WmQo|KUWypmqo0(i
zi--0?vXDxTxA9OiQG8Yj4*U7bwh^E3X<o-n2+gw{XPQrx?`_uDhW?%72IdhDE1LMX
z!dB)==3Xs-f}u0;{Et5>VUv#yGdxoT0c~KlMF}T!SSWGy>7~c(lqNLhjX)#2Ss}{l
zW=W^Pg!l&W%3{(RGMy!LiIM~qStE2vI7Wpg57tmYu;YI(jhmJlqog^8&Xk(VxGv=n
z@5&z7DR6rU1`{ebFH=bs%}L0WM^4^fRHz`Ax{qMG4}}meRE|$1?=7IEoms;<v*=N2
znQnPQwkFZFk#in^J7w!_;wD^-dmtP#>&B!dh>dru9;$`+LF?MGR(@dVZLoTyZhQse
z80=R1u7^zQ#N>8JYOT;Wz=p>qrnx<;saU6b`&|aRB0C;r6GHB5z7<=pmvh5Ofdag;
z*V?j=W2*{<m{kSu5xTVF*R8NslxfiOIt+RMqWmwDkqGpiMxHygm5ID4tg&9K^XUgc
z-e#yUJIJ_KQzmkiwESkdCo-5(HyEZ*(KJ3<u#iwC)nV8gFPh9LA+~`ZcUGW=Xi97g
z^tN1#0GQfax>s98PKr=zWlpb{)rg$em_?4Q`4Cf_>}sTrHNBw9vMpM%QX0ES%d^+(
z;)gP7bw$42iDv><OC3($ujkr8W_F32rLgup&vm~fW>M;niMMb-nSqPQ_4Q%m#PdW-
zdae(Y=9D%hu=OI^G-FFd*=<?8w+?9qUKw%*=BG`i>k=L;OJ1SsZu37#_o%cq70O4+
z1Dgfb@Q?DkhLHLMF3i;<OC-7y|6^uIU@18Op<YM?dT}gRC~T?4+y8RRjf;dttTbeu
z+10|ut=SAd+_SK~M6#dq3G>Y@OBcwo`wSZThK|8?p{-b0E~wWs$!S?9zZ3w%IfYVR
z+G+4y+OKCURyoMYU{pOo#H*T(LZ!QZ7D4pqe^;A+_WO+aePgZm8wK+|r}&Xl?T5WY
zF3wG>Q6*Cq>X%(N$^M~-BM#8ZYChy5gRd+dbgRX6s%1zMQh2Os^@ygQbyeZdxwS}Z
z(4!MQmH4XL;Op(ulNuF-^inccbi=azTmkLS%hF&Kh3v0{u!e1w#07qm?#GsqLqn&{
z>M5)9e2sldV#!%{KY)fQ`C}zs0!m$#HV7W-)#FtP8r52(5x1s`qNDiZEC5kNJecCm
z969wVjZ9W;BcaKAl#JxCZaBNUg{jf*yY)X%x@zvges4o+4;DHQV>a<WVWXg_YUlZO
zEeeY71z3zHri-ZF{nC`o+@Jgn83K1Kp#rw8um0)wIh|z`*tf%m8z@ftbRi=jG)m;8
zi^*)F`{quIWm$dN&RfDZi;v~FaTXv5p=W&#+gNIs;}3MsP-%D#7u=QeQeVtrlc<iU
zyAmylG`6m{RZJYXwoI1T7hbX`5Xm5B7qqk6s`S`v1GZz#oRWN}j}5d~_^OGzC?#bj
zM0X>N5V}%n+Oz@?KO1O3(z{^;L5>jTCb)}@#e{NimfRIpOXJ$TlT~qTxR3wnPoKQO
z6ZgK|K5HSp8G|t|5NO|{Y{}^(L$ze#{(hZb=*x3N6$WP;Li9vsi|r#ef!hG0hy<7_
z`iW+VJPan?qon}&iYW63OS+^oz<Iz?x>&fnw$`IPt_xM-^Qj%aeL`0G=3Vs=_C)?B
zjBZfDL>*H#^3Z1G65W(!hO=j?AK06agvW`3mC$&HD@TS(7ySA32rG5En{||FG+(a=
zm<yLEhR+UfA3z}hL`C<M6H(%`)`Siqo`^D>hC+t|rmOIJR6jGnD|>+PbYx<ivaW(j
z)s7<C&!Y`F3P&O{GEypMOa+{q1ng;dd5MC=Vf}D!I=W>M)=tBwZhq}{uTh`)RB$cO
zfj>_Z=&-~BwH)~XV%dH9_OcKX_#lNR8O(#WvEPvKrmmAk;)!$AAVp+-Q29BF4c=16
zBd7irsOks{fVpGKNQ?zR-TG!vGF()R+15nOQ)CGBCh3}Eg9G=PR`g?e^BMP(`zEu@
zH~X=Y#@7oNgNr9kBRg^_;k^aI{M_x!abXFZ)p3F06dj--HyRkk)4@O(swp39YW>jA
zu?1Bf2SUCqJs@nD#7I$i0cs{z1fIWM*kIj@SQse79#w5vM1&;=N}NJUT^ZF)TTk*e
z4(bYZCMX)}$+dEcoi_7lSOG5A0<0x4Wx^}LMHwGQ?>}+iayfJ79%W4G7<kUEwqc8A
z)r#h-^+;JNp&E%#Vi^<iqQck<s4W1$)Dnxft}~F1O%;2o@e7Fy+IfCAHPUS$(;bMi
z(MnIr?a%J@8)v}^WNIaNhnN@w%-oTH-y{Sof99tb^ex+<2=LZessze8A)MU&bbBJ1
z^GPjkkUoy(-s#NbSo?i<#9R3nriDEVPksO(1$QD@=cjAnvE7P4E14p+qi#l>Gth<)
zk%Y)~!Rs`UqT7Q7_&3o<{rK1&rwGQ^aQEtnDFI<~FdCG~P?CZR&LhYHiEwI12n($Z
zWf;0g@4u3lGbg2`ss}t~HbT)gnx|VclAFArz(vKJx0BkfKtAntvDen%X#2An!lE<L
z*Uz6MAv+m8RGsy(p?e9LrVU3l8)QVoEW_Do!-$a7B@#AcUn_l5=B}&n6_{d7w4VT0
z8RDZP8RQNBzCa&miT#loS)USwm3cHi1rq?O+5;pGF-yW(KMV~N88<r6c{NNyH4}tb
z60Ei2h-YSMJW3|k8tM5{x-C0WX6J^Rm1i~*>uk698~jfw=MpgjE@Vy?+wu3t&2%v^
zj*xp)PhvTb!-Pu*EX{}^i1CWiBoV-KO=Vb<UxsK#VR+pWR3{RR-$=L$V>mUX19D-l
zwb9h=N8W>NBHw;E#Ho50u0fCX*I8Px>ooruwV>LTehaI7uz^4VJ~b}@tbTuW{OW;=
zee&UC<9vTz@k6VucQ(erdwTTZUGw>U9Ed%(WyYM}$A!(p`+cqR{$rpXAHRQJa?zO{
zzka*eIk|trKKEq)6<elhs?f(-@i2IHbQk`Dw33vO<tQz}cXkh#<IY5ujFt2;bV;SO
zucbk~f)?wLeNsIqKg=ea-`(VZva|K0?qQ~1vXW@G-Wj0~?c*W<<u9WOkVst~j|<>k
zRga(p*|#|`S_l=KDje7j(lxY_s>SHYwBllC{#R#b0aewuJ^X_-(%n+h(nyJPcX#KZ
z;m{3|(jd~(4I-tq0+P}oDczmY;CFcb@4dj)d*AyGV>1{7_|3WInz7c}d#~jX#Cx8@
zD8-%%XulM+ZHFhbDDEg=D#&F|o=?GY#3x1>GkMcmX*OpDKe%1pISTaIV_-382vtdq
zVq@#(VMW1~TWZrN=oL1q#&K^mdDs;*Kk$TGksQ1eBT8023mQIOJN#4#UR)u|*3=4?
zY!ZJBm5he0XW$FHoS~J7Wd-GHiGcpB9*v&NrM)+s#x;a5KgF17o*yhlmYJ<chWeF?
z5H)oKYq-56t2>7C%^h#B5xs)zn4?a>BmX?0z{sRCS6Av1rS*I_lJA^>_u7Buoh5!V
zAO3SYEV4nY{2wBTks<g~U7cSv6J!w?+Fm9-F=If9A0KjhU-Xy<v$vh!cx|1D!J^yg
zp!n=@;!tE7`la|Vtc`CQ)4Z68yB}6VCKlAUlitnXL}9sB4-Yf7#+YJ_3bI&>h3l5@
zP?i>A8%HC~S8^sZD(7eV*Qfe(Lh7Wx9iZ|`ars(RAMgyT<?Dxu0&_hgWno%1KNIJ-
z2H}l7YF>rj%eXr&mCl(hMi*@9)}+=Ul`>;wG^VyZ`AqTwc!!>ZkG$sWqH3Z1_XAsB
zr!;+Ak#h0ddd-m?taVjr!KRab72Gf>4uOqpyy*DFa%`wYOQfx!zo92aE#=cdb{-p#
zia8cGgjprQ+YYr@SRRq&ki_)U{K+>tk#SaynuHkk`MwE>oulSBn`X{z;jGVVo1J-q
z;9Q3$LLX$s{Kj`^4B}GDTUB3@^8K9Yn#<;@rBMgZehbD0Mr<ure7%y|VR?$$*|XLh
z4~m!cyb~Pt7D)tr#ncMAEi=s0M2zd@ACEq%Z^=!PAWDzhit$T}S`0xShsH=nJnL($
zqeosDRoYb~+IkcOp_A&LO-@B16B2smMx(d1<`dIGe_YK#8-d$4;id$unV}JL9p337
zh?B#(&SdLxl|hM%WPxbEA}dR14Kte6&xD_>&(o)H;A&x_{gU@ZXnNpCYi}b|AE&m2
zFd~dr^Ctqs<OR=HW9$Li2q{`6t^o-g@L!i0>%m(Gx->sNophwr%Ctp2sark)I#0_D
zq^}L<tk`ZJ2-T>%NMZR5R_`>wac}5unMQhPg)J(oOMpGdWLoyZPZa`nQOQKs`9+@d
ztacpdWDst*Q`14l<)o(8bbJEebPaD~NcHSgCnIsrYx~dL<kb3x+^`!_Gn1dq1ja<l
zSuy;uuRo|sSLOOebbBa_rYUfxS(pl3$GYr(#yLU37%irM>3-l`%2yH0@Y?;|)0Q#A
zVuw-MKD+jK#*sOlr=`meFNjF!8<a<B7h)t$LLOgMq4s<N7b=&0InNkQy9d#DnT6<u
zS9tt3xl0dy!@NT0&>4qq_9fx_H}~SDNIM5u_ylUB;YPC<BrA}kuZo5e)pb*Q!Um^w
z1W@;s6MG~yM~B6IRG->K#O=|cc|LAR4nKW4DA5I|`h4ZvmS#VtQUGzf@!@(9F|Zn*
zPI2VnONFekVoz0uzCNI!cM>f*B&=W(bfCyA9Mn#P+<M~WAzhi3w4unQs{H9dJ#E*I
zrfJZk9!N0~t9fdkTgk}RG88XtRr|qJw;u)i^NnrVu$XuUqDW1pO>8DkWsz325jA~^
zK-;EkQ;^iw4t0uP7ENCO1&~Ew^G!sb&{7kEE#9b#Ki+$$Omwz(B|)R`YRnpGSj1XM
z)sMMWrUAgSi?b?RtllH=Ycij?;$l$Cc(x*~W)7WfXU312P;(p9W0~NKbnp)ud4aw7
zOz{MtP0|?oDE+4QB7(A`+=tZ7w;}fJPnM!NObtR222+mqA!kV+dHWl#Stxl2eOIB;
znC8_I+kQh==q!h=RH@UFG*GD!Iw|{z;s{+GXwd~PJ~3%V0}_WLd!{txYr84x=B(JN
zyb(y#xvE||>+eKlwe~^X2=>Jw@EfcLw)_iuVN5M}K0|brW9}($I5qul)eX6i=vN_f
zp4q#wD6vC|<Iobs&|`;dPUzx1#emTMnzbXXhZJQR7WyctX~pQH19Fu`ACKSB+Q)y~
z$b$0FaKiLR`vC-;wCUnIG!uy%cOB{33ddezH~}PBk`N4l{rp$<_I3QFpW^1{`OFCX
zHwNWgsVu#p(?i>;uf46-v|!r*XyW<MoOY%bITlk%n(j?WPJcU2$&05QBF5w|XI1#0
zTBOctsrE&<CeU33OMhVzX|B?i7|1{<m{XsRh{2tXoVN6Jn{h3~Cq=cN0*-7KIYvdU
zR~I(=LspN+m(sO;Vz1`5bKNf0P9Zh`Dv4_r46-99KJ6<yKu30dn7Zfz;JC0R2nd{3
zXi;uh{gf_jU2RucvW^2%vBo_iJG2wRcvYM{&15ZQq^CAvoYmIjUQ36PDEJxE7Q3N6
zzGIsw|4oHf{d#sFbVlt!HXWl&t=LX?A3l95Xl^Q?A6ZAZoU6G~0MWv0Yn~6hL65ek
zE9m=4boEPonn<ZS3$yCYs<c{QWf(66M%|Bov6HWj9y`0iCoY+3i+U{}VLFxwn!y~d
zE+ODkTsz;!oli=sYg~~=T{_=!`(nJWGss_Vz`UKEuJ)jXONZLWNI@Pw<YBQ9LxxvQ
zbf4uUnxGt7?ZhtD7ZW=iDafos+Nsq+X>z5%fN;Tfb}ZLw#{00}*F%IUg2uqlb;L!B
zKbt(bQ%_!yA~IGpj&))cMOpAdTBf1f1g5$dtISCbl&dI>p*xLp?YY2UHLT+U_mGHZ
z8zmE3nzEd^@@PCK3hIhk?5M6A4r369s;p644YhQ-i(KoW0Rk1m)tfR0`w*zi>3KTP
zGZ8#?f=P?S#$1MZtaSC0G#LTO1S(X-25*E}QeaYt;3YfS-T-{p!e`l3C!G=h%l{mE
zT}rxB&n^G}d<8-L!~QnE-i5*Z{w@rqn%1DH8no*jydSV5C-cUU2hO#564O=LmCFIV
zQwQP)%PeWgu#}{sNFo&gVBqS$&o09ZTvJz*<tqs*|8X;%Ff%>Ca-fT=o$FrAV2FK1
zH)n0rsq_JT;i!hBs(s66Q0iW|=bV+y>&HL*qcFIT^x~ML9^&Ww%abiQB9Ut*Q&M!=
z{Ag_<i$;xmRUn4`FnV$&Ngu6Cl_FGxbT7g8vDKF$L8yLs4OKV72SIq`uPR$#@U(|<
z8XHQhDqrglCO6l!k!fi%5f2OFJ<FXB!c^%)RX6JVu22!Vn^<ikB;bTl$vI(~8bh+G
z5h<Anhm2Bys(}k>C+utw;Y(oJj7qrm3|2zjTVOak0)ps?vEFvclTu`qr$>=!^2$b#
z=w{(1vEkTr)n;zktxG(~ul9B}Yw&+ij^&uf7lw?{gdwA}AT0|ryr?vn9^HEyk6|ky
zZ$0wijAR7(TJ4#xEdmQdR9CUf?o2ES{o-aK`Xg*Y923&UdgFP@-dHOgKORa6!JKFS
z2K1r}eXO$%Yg0sEh@Xmxs3b%a0)!8uZq$OxV;nRHG*{2CcWp4@WECpqFRT+77X=B4
zg*DW(w3>n9a^L!@$lSVOq&tg|7PsC%=olEW(o}6}XB~i@`4~p-XjGmV_)W?^Wttfn
zqG_H?T3@vZ!BAHEwCo^N;hQ}PEIpR6JxB9Hov_^3v~&`$GTG1&q2!B`9urkway|~5
zI6D|Ne*XB{U%TJz<Ehy&s{@<Hr$e+P?X(!V>x0EDQwjYcPlxJDY137v>!iyqy|f6w
zt&h6>`C)B|rwL;?&pZ28jA1?<%3T{GWUJ-laF|_xg$)DE>z#k;8cNrRKwI7W1l^R{
zC&$;)x<vJ(r6ZGz>m)%f!#A~c7xg0U41CkMHnFGcd+(+D`^4^eSH`{B-31kVX1EoA
zqVOKGFZDU{8>0|rGx0v9;g)AK(AT`r^z}#slpGx0g?9{Kr2OzLZ15>fK6lOvqqR*O
z_ReY<`BK1I>J$JgIKO+5@s)*KH|&w1wsOA3z)jwkyjs$eS=lp^>_mwiu})Rg)hK61
zEP>Y)A0`cX=<C{uLKYhKfZk3%nX@vTDqZ3DaUq{?92M3)zh&zCFQ+)t*?Q(*nT@#9
zTfJk<%90ntK}nVPoRVA(SkaDtb7)Trr0w}PSo&Eb=N*e9`Z+14UN?sM9~g$hCp46Z
zT~)ajvwyS*Z*tET^)U}`8YTA8iJJM0z0k2z5OfLxDGN0eiuE&h70rLF5}mya$+q1b
z1mYL6qaO6>q#dm;IQpl$j8SzkUba<K3$pugb!4=%FFZP;R3whohL2z6E_|!PThQ4!
zlN=Hn-BH_P6RlKGh#T+xbj4>O*YS(2_{obArbGKk%$B;Wg_o2N$#z5N0<_+Y8%Q4%
z_gvHwFa=_#j}c6Z<MrEo12-Pa7s|U~JP~D4T*RqX1p30g<5+`ukeaa6xUzwpb<wy*
z){a`f8|sLz8tZ5+gHXxx<iTQa9ObKH-_&94P;}Nv^U$vhxUaSjg@<7)LNd4Ug-frS
zO*$m_-16#LYd8w54|3ka3k--A8c}j2#=V|uT9<sFJ0m!z&Y}K*LlIkWS_cmo?Z;@b
zYRjC|2Ppyx8$u%~m_j;T0WB!6Y3l{`z#KHl&4N;g$tOn@Y&}k)1b%PE+M%dx8D&Un
z`Bl}BmsJ(`cd4~H`gF_C>#%)FAwl`v7~;7DQ2Rb30+8=6(OUFZUp>!$z;ey19mD3P
z%|ja~`#yAR)wN^UA~s;KhqhL8?1fM{#DhM0Tq0^3b9mP<`-n14n+r-$PxP2?Dp&U1
zzFpQCeBy~udxTm&yk_DV`<cpTq>xP#2UwB@wVA#GEN$!i8ow-rxb}@;j94hZsw@QY
zz(XVP6S?wp$C``rdW4V*xR4K)F;Q<tj%c)uK7RGet*n}vq<Dz5Gr2V$%Fwk0BvZh<
zy#77wD;0LogWP#cU~B)|F0Ss0-cr2jJ)(7~GU{1j6)nrF8b*t~Mt(6!n=j?4{jTcK
z>{P2gU061Xuf>)b(g?J7?A;r?-2EcXH&AP4&KWv|KzLL(>1<~v-07Z)Foy(I-f2N=
z4hQ`cgt8bL5yRhg&eg7$dvjmAZcAQnG}yU+Y+D+lCW$ykk!3PtCHEzolkaC|#GsTO
zT{wUk!#CA3A7t+AdBbU6LStC;*4RsiRj6wk1|<u@p<}Pl-)bG_1IGTINyl!{FiZ#C
zV9Y*wRm|d~%RwmC{NbXPn>BUj_V`IER~ROq#$d9F);YVm9|U@M`;-GufcVl^nEr~=
zBmLy<)XT%qh!gK0LM*kx?K?~BK0abr{%8@HHBlJcu8I;s)>O}5b0O9pBWogxv!g)w
zqg)mN6u1?SHUlRPOkNFbfaxYAiIc7C8URcLu!f9Oax(@tod}b6g;9EaP54anhA2V|
z>wC#b_@(b*UpZu*i<Q-KNBi0Nx8Ud_)ieF|*Q^oNK{1@;yq@OpPA`L1)|8xjlX=?r
z+w<haKRS$C$v9#ZD^J1|HQ9VX*36%BQVJN87(({pX+w<{LhWp}d0gGyiy6$J`!TV&
zl+>ikZ^G`qhKWa28#H#2dnhLn%8xbS4qtDIF@Tuvi}#JyQ=jK4?S?GK%ZdmU9FXN)
zt((m$>PcmtpD{>JnvbgKEN(FzVQN(@MAw<el}6Cc19SZlqcFav6p-RYI+ivlh{=&3
zb5H215ia8vPLCeLVyID_GnjsPk0+l(DS<uu+-H6wg=P8L8mp5gdlAFwp&7!$d&Nax
za=8Z`pJhus+9}`|E{lPvbGEpJ0(K=f^m|J&!Yh&Di3E>0felrZiOO@!5?FJ(?_ypa
zGaoY<S!cNmUYvin<IthG%v^3D#S;$z0*n#autYVpAoXD#W$XbaNrLZ~{3>`WPG!<$
z)j~jHh<)GR^C+|DV-wYzlE`|6t<$!l_$QIaH5Z9~rwwiP*Tbhm8PfF^5E^d6i$;#2
zjHKOCltug8`Z+z|l~UZP<$KqcjJ+8Yy4(DvWPtd$_<=TWzIU{Gsj^}zEma*;NPKE9
zp+x#hzD^$h_?0X*LL0XYpsh~Eha&DAd*n^cLWzs63+4I4LsO6UCRI<(qTU462SPi5
zmVF&Ao5&-i4K|W9u7>k9!jdQV>W%m5@U)QXV=r{*0)xLk4IG3kdmX<;sH%NYD`%r_
z_GF9^NCr{d@*H^Cdj+TZsy5<mruuzLW0Vf0{WzRUtw!Wm$;z0L7nLR-EIr8+o}&95
z=34G9T+{+z71xiFx+8TI$uzy#^x^*eqY@f>$=;0Z%OH4Xe7Gy*tQ44Idtp|a^!)SD
zt#DWCAs(t=vG@8uMU?`=bOi!Y6P)_yIL_ohKv0x{&kWk)Vm)-9e>I4b*nQaby!L9!
zn$B{1wng_-xmNXuk6$Few|Ob`0aMb^c^`aaRZc*DVQ(~dzVwyo6RK}X<OLz6L}G;w
zAAebMU9)1apKi+L=<ME1WQL>;=9A8X$BVAL`(8ZTt?=~Ud?AL;T)CJW%v@G0f4pXc
zA8|1>94XF9o8@{)S_nB^j;qMT<(Fr(^j_dq+3xjs+o^}gUYS4SPd;u?5&K*l|9Is4
zT>j@yjzO1f5lILDKmf%*?Kg(`xBbQxMFfOpMD7oDbJeD8rk-Lpy@B}HIuW1T{5r+B
zEeHUqYMhcVDiX$EJ%%N~FZHS?5M3p<Vi9{=X*<`syq@<{laS>5#k}pH3Gho+2dTT4
zUaPL08K-CE)XI6r+v_D3RV8~A4J_<Q{>1PpPn30rfIJBdnM(6H1jig7(!uY7adSir
z<|!u)uvrIURVPdhFaEg3Lq7FL9J(513=b^Ge${7TD>Gw?XwS*Hg0vbqiUtBK;GlPw
z8D~}zA~(sdCt*B(vy<yVDGE)n&STM!lZPH@>X2&z6l-nn_pvZBH^pCnSEqOJ(XvGE
zGMA|8xtgMeKvrMyi$XRjh2dIt1Uemj6+~DLgIz5Ns6bgoBN?E`GMq~n4UClJ=BOJ1
zfCpKU&6b0y)o&oT{9U6Vs<Ecj!Q_`oCwt}Rxj6K?+{jfVYRx84I=%jj?1a=%U$DvI
zmXLr(Z^d0>$+V8}KXN_K3vcZwAb_szX<dJhhun||xkEJV&X~rBD<ET9gy74Tit8I%
zDmnQT4$^sh!gagQbDEam!HUgEa)V43IRPWgQiuj`T8t`)uB7FQOsuq7KWYzp2qgEj
zg3?)EADUOlqVPT}gr4PlO<YORs>LeFwN<5+$}8JTjaaoMbA|A;>01CJdxgzp)mTkf
zGa9ik*+)#<l?%hQ7iZ`CB3OMGdKu6T$EW8Z4exS~kTW`zP25U8*?f)Pl8~<^$RMEE
zGl(6e>=@#Ok!N3an0c+7L<kQEgf*tW+)>G$`Ly<q&)c(S7kLQIi2KV$FwwIQ`5ixm
zAZ5}&v8IU#>rAc;%1m#tzDs@eVYHn%t5Gsjo;uqrgBQ?VM>Y3!$t%ezX++_huJw_r
zV*@&kiA=3S1h%E9-KEewl2L|k#6r!Y+!A1us7Nqkxqd|Z2-n4%Qo<O^)l1Zul&nsf
z-A@mc>Qo|xH>>-!azQvpAuuUpMU#%W@{f%KVGmFVc<G*<0^q%nUSv*vLU>K|8M|Gz
z6j_@9%4Qa}PaEz_^qdvuF`-ig>*k&)LcV@oCqIg8d9}BJj8=QB6m8}Pn`JTu<`5E3
zbVlRjJn9^$y+=P-;&cnSQ54jihR+pztCink;m<pe#>&$35L<Y)O27E_*fzdE3U>i~
zI+Y6>6P$lK8bs}8+I$9J5lZL+;5VwX8?8X$@`P2K(7uj*vt$knYczv#V4YEEE#B&z
z#t6wkqd$IoD<KK}^xMa*?PL&uF?%DpP(Kzz<kv&)&<R0~?RY>Tg96&|_RFD=$Y2!)
z1%9t+$SIn<@1>0DPr?LT_QUhT-9q0J?PK$2pndLR1w7(3ph4SWs8*YUQYHvXT4ZCj
zl`G~cG<+S7;qft2Hz@H+bV0LL!D{}pCDX4HpA&6LkYKz4vrfeFrGP`;hwLzA8fK~h
z^W*cN7t#-N@GILpYQh#V`)1e1;pD$8ORrNH&lZ=z)PS$XQ8%%VuZ>lMeyoE`(NI<P
zcFdMxeEcCkUt7>7BjZ`M<pM&}!t!R=K+ths7Rr=#Nnlj6-`hNQJUa-*X9*0I7JWoz
z$Zu?fA=A^}z1xLe4S#Lx1imAb+)=d8BCTNbh$?@7dJ%0C%Yd8wJaT4+uv_q(b9=?R
z8AMYHTc+$3&_q3nM=!h_{l%J1ejgo*1>DB<mHwp|VK^T<j9B1D@;-5c*Vh>y0q=lY
z49IE`?Ol0kmdn^oXsbK<D8p3fGWi(g!pLf|5Z(l%PFlStd;JRP9O8sHNSuUGD7%e|
zy`vT{gPNw1nT^bnmA@7=RlSRAr&a5M_lN5EswkKBVYqK94tDsks_P-lzD)`m!F&FA
zo=@^ID>6g~tAX#3f<4Xb9GZIFlBK*hhXrM3%Ir)Jl&DrDqFF+pJh9McF)ObYAf$}?
z&}b*zvun{BZ_ps<UhpZ@*cWmuEC}*^D`*u73scmxa^ZAdwX=)4yM>#nCN5@1(s~6B
zr9y-mmP?YbN>`UEdk2^n(C{*hLn6`e1elk>uI3C>c_aFS)31wVaeZp{oKd0rAYr@-
z6#e<BKTCvJK=s;J35Eu7e|QDCE#r4=5KB_t9%e$yJ?(aCmu{#&#6toV(EIzErY<a!
z$A#7g!qXA_w5v9s2JEdl#mB2R#qt4!5@<mmCSgaLa_hevR45*$ep2F-eqnjRFjUJn
z6FfYR(1XK-G~=gDEIcsBf2x0;v!cb|huQREP$V7|unD2u?!LWN7i%-PnJ^Yn{`_EQ
zq&v1x%OgGmi8rYcu@{p#KxzM&`I=*H_HkWCM|;2<J}<WH)*~CABBzVQIm{hC^sF5K
z2TU0vB)pdj$r5Pf=?97teZMBU!Z47}>K51b^h7&dAM~8B<jTt_TCsW#IAL0gag2Ei
z1GjaPuQkz<#eoQw$PJB1@~bX8Jy+l538uFbgQktoSo;|}hZ*aW*|5wBcCR6B_V>gl
zADSYD1pow4|Eb;*|E=DF?95FZO!ORW9e_XvBaqqs%KK0yM1fkB$(Ns(H4vTRz2BP{
zn&?o}3V@+d1}Y;CBzP4I7LG?{UXcU<0C0k@-|yN?_8ZwCJtH?OppCJK!>{GTset7J
z1a%;Jm7pPcji_<jrGoZ+t%Q^k@s)HL{-ePBCZ9g(zbZiZcLm(6txX&qfF>XYBRjkM
zO>ZNZl3n6FCJObjJ1G$3$5P(PVW5|>%uVXh09Nx<GFHQ>sMV5ekQv1BbMWr%ZY~;i
zjO8G_H((u(9$)pYPGiC+;yaw2C5Y(cdt_tds<hk?)R7P!ZR|~BYqN{58@G}iSC=a>
zs^Ui8@zmsOdFM4-SU&*+^L1M>H{-+DRCx#K@%4}jG^tn#se_Zv15<^#+0(Ixxp<NX
zQB(w;mz&nLZsw;4b)7#z9dg|pk_(sCgW7R=XV$C~K0g){7JZg-DP7KbEPYU}FK8HF
zr_^InJ=!#lPoNr0FDXCy2%mOcb48@gUF(gqmz|xx%Cb>^+=*7Zs?z!~21{>MWCkv*
zIio30_(d#yIhAPCXhae&+JX7>oUmw>lm2+J{JVwKMNXEO=eoMjB^$(6q{FueSeeQC
zBHj%2JQ9->PZihHfn&$$M;dsuX-+|?$`MAX7i*$1f~29#NNcitwq^K6HyU)Xdi@5q
z#z{ypQglhqK{|NjksE#;Dkdq+G-?k&;sR>n{18M;tplQ9NI9Jtl;J`*nqOj_1K{)Z
z%<zQNLE%Y@u}A#Td@<cj%rmGsGqQ!5zO=$Lp7Ieq3|5A%Xb7}$VDdPSzp#shBhz?>
zX<sR-pCrxqbD<&D7yOOKG7iAl6&XcHE3W)4!@jMaXzWq&b10!$qMW%bf>5Z3`O38K
zGU428C71cRF>@Meur4R$p=vpDv%H^S4sOd7+NC3ksCy{U_T>u+Or|7PyF)AGm+Cg*
zvH`yzv}II%wLI^hIHEnP(xtCI=z_7t5TC7rhm0IJ3wWV<fmt6#$d(q&|7xwdq?g!U
zBRX$!jkzbxo`<C_CnTWXHkMJp`0U8=&BQtxl6i&56=N0@<>7*Nd6$~uXiy&Ihal8R
zRf=vmQ*<l1ect00r8pBIxPwrR^dw~hK~<T?v+~~AUKK7r<}*&^v+t9BSK07k)!BC6
zxIfkvW2254*4CPLV&O>jinOXZz}IV!c=BzS^9N3JJ;T@xO4_!;4T|RTMRz;Jv8M||
z67U(!#DY9Ex3bJs<j<wq7Ik`97T8UpW|~bYv}!ig#xCL~XH=jC)kk5mV*edaOrZna
zDcL#W*gj2sM5FVo0ij5m<j61(5o@1Y!EA^tKl2l^Gv;^9v{tsF`Kn$nw&v(g!-6YP
z0UGX(#kw#Mwb0v2<dNrZS(444!po<nP#1+$a>GMAYZHhNWrHe^M~GMD!zoQSC-L3F
zKupOM^g(rPEiB2MiO>a+FR}}8Wh$dLNB7KdWi$#lRacq9^Y%ZBe1C!^(q=AMfotJ2
z#2lX2RYFj$q+cS#T86x9Oc|cXye+!D#NEvQEF$w5mMkSJsinPqT3S6N&tP%fh7wPP
zUV=y714`C}jTzrst?H4AD29=aOzd%nVSY+LnvEq%-uU_@`i=+3%a_$O@F`2Gt2wwb
zj`*8pRgawfv5}!?Yz)FFeFWyTXkXH1hvw>(*7kF$r(B{pg@IT~WEM4GE#!twYHX5&
zWE?C{&D2v&!GD3mF0v}D1^NhL3D46Qr&w2gYvd?9zW$z@s&(>n)^-se#mz6&;;f*(
zmyw!_t>BMO4zfr&!Wu|m?LHK|eJ!ND|A;6w_@Xr-HR(k6!lTCiG)6f_zdotCv1fYq
zIQ803TV;9r$(a*ObcQ+UQzm$>;V1yL%hSSVn7oi6j0%QgNUmNCsNj?+!(ls77)W~$
zIDVf8t5cq5fp9P;&0Ul@e6A4M&=53Ipfoi)E(l!gc|y2HN&@oVyq-~Q*w`Vb;0MGX
zC5)M9Wb2C8_LU)E4rO)}V!y%{D5R`TdAHesUjLk&Ui<8vf9N^vL&6rDcU@sTZ;_TI
zVun@eCM`sWN}a#<e2oNdCl2<J)}{op;~<ng!_s0;Qas#Om>rgl*QwSheroyE)NgW1
znW_)kPeZ#WE{sb~e=M!IAflCU&zK*DuM>1t>e~ae1<3VhjQ0dmaUm?NA$wwxOd)ha
zskuF%>lu4O0O?=_+l25=ZMHdMZ$EuYY%{Y_h2tRM(q1c+6P5XBhOpREU4!xA51ocb
zFNZ)O4;tL@tco8&sUlUTe{q0pO<;NejpFp0v_vxN^eQIAdMJqv{x#<ahM{L0fy3MH
z9P<={hn)v3)x`TuUZ@N5IKj1?5}4p`p<(3I#I|jj5b1E>)7Q09QMThFbk_DPdiD63
z`~~>d$F~v4#$s$R8wKc8cDrAjsO+DszLM3YuXWom&4pCngkD_kT~JNOo<wr8OqHOf
z$l>3GrWTy}V6DLO$&ixX%O}&~U6);^jK;E>TlqM(J})H1RRkQ=chMtV_wAlH-gfzg
z99Pq6rZ~ild77Bj1FNE(%u6~x7~{GFUgVH`dBmxtcww_T%p0&mAwdD=;vvqc=QeQV
z(WnpMnNy;3xjc~!M)~~kpgzPi2kpC->gW=rkDZJ@XxE9O9v)lc8Y~W!@VTBK&f~nC
zLt-Vo-YF5=a(@I*M;bg#`drO(zm2$pK*;i|s$|%x7+C^N^C=Z)4*Suh<fmdub%#Oo
zMfmWkh8nVE&8U#4AS!yzB*lG$@3Po0FW#$GkvYfX3F+uJX(YsMK616M0eL~Jy{{WM
zYFiH6T+RXHA|}KMcmb2(arUn_9%Q%^ZsO4IF7ue|yv9z=9i`u<BZ8RMR6Jgw(wCP)
zCRYBmmYY;ms;0G4>}FO(oKeJXtE93<5?eu}lH`t3yxk$@LW3=kr(isu=9ud^*OmN{
zDU(-{Hmz|`?toob@9CF<4-Oj7UCdZeSSM6ocC)jZT!q2+elG=SH;GSkbwJeh?yrNC
zw8?RB8BJ~V7hGiQg5P5c=f$>jcY3AtagTG47otQPY<wA8+<ZGSR>_uVGD`o@RLSz`
zHXVVV{14ECU4}Xw7Mzw8khg$;E#WoEcIzZ(xvm&pw8zt!f^7I$iPTi*QA8I|dO>4j
z`(ZzE%W#198<M4Kcz+~Q^_*l83-z4lLBEfncq_#=(O0BS{qE|M(yYB~tkSIMz<^T2
zRE==fw()QIjZ{?0A&4uQ!XVl0KK-C1ox@(cqM#(6)WZ2sjzsRl2in34`Ybj6$eCqS
zKGe7aFEu@9{FYG`h0|NqC-J75y<qYJKd`<Y!{a3^XYw`Q6Xk0*L-dMJc#lxb+`YQf
zUNhqrT1>;!yBj|_i}HAF?XbF}NqiXdG|SLIP;Q*y=&+jlvun+cr-U(wty@jxFj-Uv
z&+hIO#mBtGZ86~$OR|ZbUNzCBf(6UO0PAWP{~a0z6<&%f(W+^D{fsq&bD5_3*rpn^
zl_c#UDeOgnov*cDA@;PxoF3y7hJ0MDc{7Cv$RWK+>X~r-wNRu7rKkkxr{560hoN@o
zTba2``T9S9EI+sAm3o$8U(`-L^I;JX7ftnqt*HWNgWY?e2}iaRD+E$*dA<Vq{dJKo
zgNVO{nZUdrcQLh8KlwW57pgDs2dCtR-mR8CqAz%|`Lvi}5zWL~WlloaLwThH*IQqm
zTp$ym=Z*HbM<YTow}2cXN<g(64^6HiHcSJyT|ulqw{T1MTV3{QBHg$sM4X$e1Id?4
zNn+O>&3<!<(XieyXFi9(Gm@N|+UY$4UABj3m<ogeUcp<2b)RJ_iWQ!fx+8&ROcM2(
z2aHn9H=`Oc_zhmoa7WH|%{uoZS}&Ex&Cri-^J$T}J^5S{<Z9D7)=-OlY#JFRJX1{W
z3xfbZDpd<-8}M8`e8njnMMn8(DQv-_)si2*R0kUy9v%tFjTSY<-&dGQ7g`bZ3G{vr
zYJYhrNY2!;0QD=*3I(qP47^__*I|q~BYFgRxh_Rs3}SL4sV1(axlw4{3sT7TmlU#P
zYVPQr6~{d5?{;$QtCL2ON6f1#;c%Ur&0%pt&55?ybdL5Z1&|UjG6e4p!FOBWB^9=d
zsfX>RUT*`~d8le0#vG($eDe^e>2J=T$HUTwNtmqZX_tAwz(T-LZeQrpfHmk_<2DwM
z62Co#wCZPTam^COtao6hPVe@nS|dL{_QQL1v9S_YuMfZ_i^6Y9bonYa8pK<#24+~A
zRpH~#U>V^Mi^0o77n;j^2{jK-KP}eKL{05J>wcFHta3hN<0gAFj_@Nx$ci|@bk%%9
zJ4IXbn-$EbjcL)7FH)BjUAp5r^DUGi{i=4P-%%-?lS60x_!(oqq_ygdQrjrHeCf(b
zO_!frT>OAjl`GNdL9j?;w>dm83HU%l3$NzcN+7#}L(9yj+?G;bL=x)i=^k%;a{cgT
zdNsyHFcN?W08~Byr|H$Bzs+ux{+iwV<}@5N4Y@@oRBs0K9}ptXeC2Ji{mil1CBCRm
z4HZ4<XqD`g$t%U_h_uQd;Jv<>l#qlQc)V8;?0Oi!O3=T|D7(1SN2T>}?g6U>{#V7e
z@dq0$D8orWZNrUnErpWN=Of{9Q7Hrw59tMkMOluR2<(orv}<b>#8nqf0C{LBRudi`
zL6ddrwa@8QXf^GFJWbd%&!3A&3gFUQA2lo{wx5uH0ajZEtCl+}SHHYatyi(yd88Vq
zTJ0duQ}9SRCHPnliGYQ&ng@;KB(%T(U4zNDu-JmJBY4eX2WmDLs4kktrU6A-3sQK-
z7V`^1F2Pr<(d~)ML+wz8g{fH9qWP}a4iqXgU1)gIFF=He0hN!|fq~xCFXXusiyfGn
z*dn&m(8x1`XqI=5W!vMND+nNYlpmZlw~7nGG$BV1cBB<k@_;_a6n~50pP|csw$PKU
z68kBTcTPVr(X|v>zVL(5#et?T5kl7`TwKRx(U?=Ta6Z34TemB5&tqxPPdMYyUr*|n
zi{CXy4)?~3j+uIA)LnnF%zPxiwP>p#Ba<C#t`hp7PaD<W9yTv=!JKU*(W!5vdeJi9
zBrTm-Z|bU2;p3DfKd;FOIg2tz7Oe?>Y;d%dhPb{9uA&q6ILOZSRk3?TLP5Q2OAN7Z
z{Izz0rY}M8me+$N2s!cw;nX7V{$9}0n2Wy3AjfyM23-2uS@4wV3@Q>-P@XaHH26!%
zU)3lin~0uB8~tc=Ab)8JK5ge+bp2jc-e#t4a{<01b7L28$t35nLFt-&!i%zJBq}9K
z3)r!wFFN8oUjZ>?MWslaKYmmTWL{v6=3VMzmf4*<4@u_s*M1RB{l>pDekDG;$Cf0j
z@bR~XyltKoXg9<Zfs7^$*O!Ov3Ocs14_aP(_c0(RMsG?KDfHRR@8WsDK}Gxe_*XKn
zhMU8r+Ao<Ut*4FX32ZP9oJ>?6T_pyqvF!)D)?CjX?!A<o?QZRY_9K<{E2d%!sRBNE
zsa&}2-4BeM3jZ9n_;rQH??)iiwK&$tp5f7U%BZCaD$j;+WO>IjLVA7QrEhGKdUfH`
zsjx=8$hl{b=+>{;m%#58{Sct371*Qa)@|EQMSm(l5z3B*zij5+^6DDrCQNbajkP2p
z0e~+^H(?6#01Fa)`vd&pF^dGBX7$$x832yupCA5h@UuVwfQ*5IkvY)DOvuU51jMMK
z4hJZdrIfN)q?G!}!34m8ziv*!S|UH8eGUE(ZU_JX_cq7x+21$}M$RChnT@T3$qms7
zOuIS0<u;KUteFKM#JU3fzfiaU0M0F9jvqBx#$C-Agq8G^z$-<60`2}(@n=(c?==<v
z7Vt`d@c{s!rzayIB&VeQpH|-JbaUOd)_ufnovs8-ZzJw1_eUfD0{%4HO(Va>fL}fZ
zH&PLNk=@cM$FKPJKnA^kXzx#U2e?b1=-o%bwgcSov2L-q{aC@ya92lgKmT0g`q>}v
z@AbzGP8@?gp9zeT2Vb|_zU}wsZ#Y8(D=YBI)y<;a?}0h&UHFn<SP1xfbVomO@NqzQ
z_4^M{&%nmU$;#<p!LiR3YUsgG3Gj8-7rXxswsmy0GWj=ExA)Lo%)m4_u;<-1r8M+?
zRgDb(Z@KW-Emt><<cZNB(L@L1z$>Bv>^m)of%zNG*5;0S9rAy;<<FkJ;h_$7Nz#E?
zH(o?~i<jeP1?K(f*>_FKpl9?i=$l>-kEIeN1FzmD;R65|x6s>u$A4E9WX1q~7Vy{Y
zzJWcuuBird05@(#bO#1R{#(1jDM#<;8t}jMPURBbL^)VTdb0cGocSA8*w)p}6lnEl
zqWG1k_wOL&ihxzz17CP|)Lg{AucomB(8|ih_}^44dxB~n19o;8Gl+XgADsJ0Q#%6(
z@KN4B7k+<lO#JCq>wK{Hk%B$xZakV9{to$%y<<<xpdID{0G!%9xaZ_X=J$bS;B9ii
zarnE=W(KD=43KYsBe++NFz?5Vz}&BKe`=@uXX^dw<2N`yvLAg~;10<LUnI9WCC5);
z?H_#nr=q_l-*_cjRsnGrINQR5k9Q=#Mc(#9SpU1CPCz{)Yh&<j0dQ2_tjzzqgKEK1
znWY+_wE`}=YQp#P8{^imxwbZr4z@Rm^DnTM!rgGc0kca_7yn@j+FJ_e_&J>aqbY85
z|1V^inndzY7Yz`WfqO3)9Itm{fc@f^${U-Qg8qvBAK+oa?Sg)TlyI_6_(N@qJ8JVl
zLi|2UnOT9={%88l0L0prgE9bI?2{M(0K!}JZNF16{ch^}iF7b<xnt`4gOD3)@e6k%
z1#pn{gHtuZ9qK6ZFR9iBK%3kB_baGom-y)-*x7)T_igKo`D-Y+IRE7mzd~9JDv=F>
ziyIIeY<F8<NAhc=trO^u2mgwC_9NQN3S3k!tsdNK{qp1cRB2mVOBFk114D2%{WIKt
z1>MQ3SQ&W)01SV-TdcPIid_Ezs%!#s{5LE315+&CfURH+w!&=>+xDAI{5SL;6VadX
z{42$C&Ksh6!E_#QQMp^Sr_=7!{~I@e3wv@p1m>Zk-RIe4-RH>|Seo1}Tle*2He=_;
z%b;I~0*5PF+5LR;D*x}iTLb&sW}W76k+>bW7T~~b`NDAC4-PF|*864Kx8<L~e>wuJ
z+}(U|gCz{5-}oaRP~VEJ9KWL8f5-=SLisOOyD#A;dJ*X#_dEh;_HDTP7P0L6XT?EQ
zHh-k{`=-7D>$p_Id4s!d6g(cdJ#63hTOIgk@bBCVY+mq(?cOwn@|Ib)1=_y;Guze3
z*4X6caN+;VVamWM*!a&v`jgKAHv4}B{ol9S)ni)#Z}h+A3#lsoIUBs05#F9B-Iu{|
zrw#W1lZ;=>`8g=4EnVZBv&UlxcLM<2#{l-*a{PM#XE`F^;tRgt{ztbzN4PsBy%7g(
zGM`Nb7DWrbIPZuP9{XQRchf9I6FXZF5Ikpf`zMLm1I_VIz|t7O7t0-q-~M-rwziJH
zlO<<?#MKx%xo!uR(+j?s@5pi+|6f{n&yXtc*>~plPGCc(5kyK6gT;UgAb{<TDD{c|
zMbzJo*aUyK+is-YHsT#`^jrJiq}?*$eK|LgYqvogL<SEYKtH|jjee8=ZL4m=*Tl$?
z!Oqb2=Epz!>#somYkvQIX3sPT0|3ZMzV92@OaHAnM_X$v6Bh<+aN=P8L)QH%(M{8=
zQ%AZ^!Lp1~?{^sD>Hm)`XVyQY-EY~AwA+WR-*pdX#0U4ra(BzYUn%haS_ZZwc%b9(
zJ83t`{PqFFcM`7O6Wo84cIP<v-;Wz^zgl;93LQ*zpZ|Y{8vh=4`|0JoFeJTS!Tzkk
zzba$5AI-wN6NV?i`>;PAfBwB{w;#5;JC8E6zfb%7!(G4U-hPJaZn0hb4fp<oTfb-D
zzJqah+-&UdH=X~wYw<6m@!JcocUQIqeeP3#aWCYyy3pWN769Nm`0Fhe0I=?VQ|bO6
D4AmLS


From e8b03e3a2586d06975ee8c1636a2e5a320f892bf Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Wed, 4 Apr 2012 16:48:46 +0100
Subject: [PATCH 160/317] COMP: cvMeshSurfaceSimplify: moved isosurface algo
 out to ThirdParty

---
 .../cvMesh/cvMeshSurfaceSimplify/Allwmake     |    10 +
 .../cvMesh/cvMeshSurfaceSimplify/Make/files   |     2 +
 .../cvMesh/cvMeshSurfaceSimplify/Make/options |     3 +-
 .../fastdualoctree_sgp/.DS_Store              |   Bin 6148 -> 0 bytes
 .../fastdualoctree_sgp/CMakeLists.txt         |    96 -
 .../fastdualoctree_sgp/Doxyfile               |  1551 ---
 .../fastdualoctree_sgp/LookUpTable.h          |  2317 ----
 .../fastdualoctree_sgp/MarchingCubes.cpp      |   850 --
 .../fastdualoctree_sgp/MarchingCubes.h        |   182 -
 .../fastdualoctree_sgp/README.txt             |   123 -
 .../fastdualoctree_sgp/cube.h                 |   256 -
 .../fastdualoctree_sgp/data_access.cpp        |   266 -
 .../fastdualoctree_sgp/data_access.h          |   192 -
 .../fp_identifier_parser.inc                  |   292 -
 .../fastdualoctree_sgp/fp_opcode_add.inc      |  4279 ------
 .../fastdualoctree_sgp/fparser.cpp            |  3070 -----
 .../fastdualoctree_sgp/fparser.h              |   159 -
 .../fastdualoctree_sgp/fpaux.h                |   599 -
 .../fastdualoctree_sgp/fpconfig.h             |   139 -
 .../fastdualoctree_sgp/fpoptimizer.cpp        | 10948 ----------------
 .../fastdualoctree_sgp/fptypes.h              |   267 -
 .../fastdualoctree_sgp/hash.h                 |    46 -
 .../fastdualoctree_sgp/hash_noptr.h           |   251 -
 .../fastdualoctree_sgp/hash_octree.cpp        |  1356 --
 .../fastdualoctree_sgp/hash_octree.h          |   352 -
 .../fastdualoctree_sgp/hash_ptr.h             |   292 -
 .../fastdualoctree_sgp/implfuns.h             |   101 -
 .../fastdualoctree_sgp/leaf_octree.cpp        |  1120 --
 .../fastdualoctree_sgp/leaf_octree.h          |   332 -
 .../fastdualoctree_sgp/mc_draw.cpp            |   695 -
 .../fastdualoctree_sgp/mc_draw.h              |   116 -
 .../fastdualoctree_sgp/mem_octree.cpp         |  1111 --
 .../fastdualoctree_sgp/mem_octree.h           |   367 -
 .../fastdualoctree_sgp/mlist.h                |   502 -
 .../fastdualoctree_sgp/morton.cpp             |   458 -
 .../fastdualoctree_sgp/morton.h               |    62 -
 .../fastdualoctree_sgp/mvector.h              |   261 -
 .../fastdualoctree_sgp/opt_octree.cpp         |  1121 --
 .../fastdualoctree_sgp/opt_octree.h           |   376 -
 .../fastdualoctree_sgp/perf_main.cpp          |   265 -
 .../fastdualoctree_sgp/point.h                |   289 -
 .../fastdualoctree_sgp/ptr_octree.cpp         |  1289 --
 .../fastdualoctree_sgp/ptr_octree.h           |   400 -
 .../fastdualoctree_sgp/viz_glui_cmdline.cpp   |    71 -
 .../fastdualoctree_sgp/viz_glui_controls.cpp  |   346 -
 .../fastdualoctree_sgp/viz_glui_defs.h        |   361 -
 .../fastdualoctree_sgp/viz_glui_draws.cpp     |   321 -
 .../fastdualoctree_sgp/viz_glui_export.cpp    |   323 -
 .../fastdualoctree_sgp/viz_glui_main.cpp      |   189 -
 .../fastdualoctree_sgp/viz_glui_mouse.cpp     |   312 -
 50 files changed, 14 insertions(+), 38672 deletions(-)
 create mode 100755 applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/Allwmake
 delete mode 100644 applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/.DS_Store
 delete mode 100644 applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/CMakeLists.txt
 delete mode 100644 applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/Doxyfile
 delete mode 100644 applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/LookUpTable.h
 delete mode 100644 applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/MarchingCubes.cpp
 delete mode 100644 applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/MarchingCubes.h
 delete mode 100644 applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/README.txt
 delete mode 100644 applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/cube.h
 delete mode 100644 applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/data_access.cpp
 delete mode 100644 applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/data_access.h
 delete mode 100644 applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/fp_identifier_parser.inc
 delete mode 100644 applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/fp_opcode_add.inc
 delete mode 100644 applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/fparser.cpp
 delete mode 100644 applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/fparser.h
 delete mode 100644 applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/fpaux.h
 delete mode 100644 applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/fpconfig.h
 delete mode 100644 applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/fpoptimizer.cpp
 delete mode 100644 applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/fptypes.h
 delete mode 100644 applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/hash.h
 delete mode 100644 applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/hash_noptr.h
 delete mode 100644 applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/hash_octree.cpp
 delete mode 100644 applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/hash_octree.h
 delete mode 100644 applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/hash_ptr.h
 delete mode 100644 applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/implfuns.h
 delete mode 100644 applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/leaf_octree.cpp
 delete mode 100644 applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/leaf_octree.h
 delete mode 100644 applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/mc_draw.cpp
 delete mode 100644 applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/mc_draw.h
 delete mode 100644 applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/mem_octree.cpp
 delete mode 100644 applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/mem_octree.h
 delete mode 100644 applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/mlist.h
 delete mode 100644 applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/morton.cpp
 delete mode 100644 applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/morton.h
 delete mode 100644 applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/mvector.h
 delete mode 100644 applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/opt_octree.cpp
 delete mode 100644 applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/opt_octree.h
 delete mode 100644 applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/perf_main.cpp
 delete mode 100644 applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/point.h
 delete mode 100644 applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/ptr_octree.cpp
 delete mode 100644 applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/ptr_octree.h
 delete mode 100644 applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/viz_glui_cmdline.cpp
 delete mode 100644 applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/viz_glui_controls.cpp
 delete mode 100644 applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/viz_glui_defs.h
 delete mode 100644 applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/viz_glui_draws.cpp
 delete mode 100644 applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/viz_glui_export.cpp
 delete mode 100644 applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/viz_glui_main.cpp
 delete mode 100644 applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/viz_glui_mouse.cpp

diff --git a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/Allwmake b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/Allwmake
new file mode 100755
index 0000000000..98dec66c76
--- /dev/null
+++ b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/Allwmake
@@ -0,0 +1,10 @@
+#!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
+set -x
+
+if [ -d "${FASTDUALOCTREE_SRC_PATH}" ]
+then
+    wmake
+fi
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/Make/files b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/Make/files
index 3d9e676a3e..fbe4cfeda6 100644
--- a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/Make/files
+++ b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/Make/files
@@ -4,6 +4,7 @@ MarchingCubes/MarchingCubes.cpp
 MarchingCubes/ply.c
 */
 
+/*
 MarchingCubes = fastdualoctree_sgp
 
 $(MarchingCubes)/data_access.cpp
@@ -14,6 +15,7 @@ $(MarchingCubes)/mc_draw.cpp
 $(MarchingCubes)/morton.cpp
 $(MarchingCubes)/opt_octree.cpp
 $(MarchingCubes)/hash_octree.cpp
+*/
 
 cvMeshSurfaceSimplify.C
 
diff --git a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/Make/options b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/Make/options
index 5118e3d004..3b9b222ba8 100644
--- a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/Make/options
+++ b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/Make/options
@@ -6,7 +6,7 @@ EXE_INC = \
     -DUNIX \
     -Wno-old-style-cast \
     /* -IMarchingCubes */ \
-    -I$(MarchingCubes) \
+    -I$(FASTDUALOCTREE_SRC_PATH) \
     -I../conformalVoronoiMesh/lnInclude \
     -I$(LIB_SRC)/edgeMesh/lnInclude \
     -I$(LIB_SRC)/triSurface/lnInclude \
@@ -14,6 +14,7 @@ EXE_INC = \
 
 EXE_LIBS = \
     $(CGAL_LIBS) \
+    -L$(FASTDUALOCTREE_SRC_PATH) -lperf_main \
     -lGL \
     -lconformalVoronoiMesh \
     -ldecompositionMethods -L$(FOAM_LIBBIN)/dummy -lscotchDecomp \
diff --git a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/.DS_Store b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/.DS_Store
deleted file mode 100644
index 34e72fcf2de0672f41dfd605d7d75558556d0f43..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6148
zcmeHK-D(p-6h70gx@i@1Q|RT;>rhig+JF~Jh~R}tA(dWOsk?4%7T0dbOd26Z7hlL%
z@G1H{eskt%Eolluu|?*<%y;Je&VH~vJ4B?q<9v&#NklP*!)OK5CF1;U%*m2ioKv|P
z*~AR9vdXajJ{KJffq}rlZDYW_yAkD-lBM*|_ct4sg|Y4SnOa(o?%cf>$1CyugZ<(p
zuO{7Ue3F~j{XsS97x__^j^40tQ#&@@bi|(B)DGZbeXpuY=m!$LU*vXh*j%4ZJKH-g
z-PxJ7^mMEJXuGAKbRN%UjYiyP{)pE$HlIG<OFz%Pe62li3ZEI42ZF!g8<gLVk(+mA
zhK|m;O1pGKBg_STqD^`aJ*DHJ&0dU+9U)?kUXkG#Ll411MIWiedV*CCXy^l5hge@#
z@1@jR(D9PoV^l}CYun3ty}#efDKlWNZ7=8b7VSkMz)O&uVL)D{c=cx5hpvHvz`!kL
zz<nPyhQma#_Q;<OOne0ZMliELcXtVwqXiSe+9Ny=<x_z^Rml}Y`E=N|#3h2YN1slL
zJEM+tR&qm8+#Pn!;iM9eVGaxg1}-wN?3Yb<{y$rM|G$_NR)K-Qz<<SnihBKC7mp-o
y>)gY+vsPog#c<-{YLA?PNsePy+)=!a!2+Ll3NR6@J;DMBKLSicm;wX;l!2cve43#E

diff --git a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/CMakeLists.txt b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/CMakeLists.txt
deleted file mode 100644
index 9140ecaa19..0000000000
--- a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/CMakeLists.txt
+++ /dev/null
@@ -1,96 +0,0 @@
-PROJECT(fastDualOctree)
-
-cmake_minimum_required(VERSION 2.8)
-
-#---------------------------------------------------
-#----- Dependencies
-#---------------------------------------------------
-FIND_PACKAGE(OpenGL REQUIRED)
-if ( OPENGL_FOUND )
-   message( "-- OpenGL found. include=${OPENGL_INCLUDE_DIR}" )
-   include_directories( ${OPENGL_INCLUDE_DIR} )
-endif ( OPENGL_FOUND )
-
-FIND_PACKAGE(ZLIB REQUIRED)
-if ( ZLIB_FOUND )
-   message( "-- zlib found. include=${ZLIB_INCLUDE_DIR}" )
-   include_directories( ${ZLIB_INCLUDE_DIR} )
-endif ( ZLIB_FOUND )
-
-FIND_PACKAGE(PNG REQUIRED)
-if ( PNG_FOUND )
-   message( "-- PNG found. include=${PNG_INCLUDE_DIR}" )
-   include_directories( ${PNG_INCLUDE_DIR} )
-endif ( PNG_FOUND )
-
-##-- GLUI dependency 
-#FIND_PATH(GLUI_INCLUDE_DIR GL/glui.h ~/pub/system/glui-2.36/src/include)
-#FIND_LIBRARY(GLUI_LIBRARIES
-#      NAMES GLUI glui
-#            GLUT glut
-#      PATHS /usr/local/lib/
-#            /usr/lib/
-#            /opt/graphics/OpenGL/lib
-#            /usr/openwin/lib
-#            /usr/shlib
-#            /usr/X11R6/lib
-#            ~/pub/system/glui-2.36/src/lib
-#    )
-#if ( GLUI_INCLUDE_DIR )
-#   message( "-- GL/glui.h found. include=${GLUI_INCLUDE_DIR}" )
-#   include_directories( ${GLUI_INCLUDE_DIR} )
-#else ( GLUI_INCLUDE_DIR )
-#   message( "-- GL/glui.h not found." )
-#endif ( GLUI_INCLUDE_DIR )
-#if ( GLUI_LIBRARIES )
-#   message( "-- libglui found. include=${GLUI_LIBRARIES}" )
-#else( GLUI_LIBRARIES )
-#   message( "-- libglui not found." )
-#endif ( GLUI_LIBRARIES )
-
-#---------------------------------------------------
-# -- Environement variables
-#---------------------------------------------------
-if (UNIX)
-  add_definitions(-DUNIX)
-endif (UNIX)
-if (WIN32)
-  add_definitions(-DWIN32)
-endif (WIN32)
-if (APPLE)
-  add_definitions(-DAPPLE)
-endif (APPLE)
-
-#---------------------------------------------------
-# -- SRCs
-#---------------------------------------------------
-
-SET(Perf_SRC ${Perf_SRC}
-  data_access.cpp  
-  hash_octree.cpp    
-  mc_draw.cpp     
-  opt_octree.cpp  
-  fparser.cpp      
-  leaf_octree.cpp    
-  mem_octree.cpp  
-  fpoptimizer.cpp  
-  MarchingCubes.cpp  
-  morton.cpp      
-  ptr_octree.cpp
-)
-
-#SET(VIZ_SRC ${VIZ_SRC}
-# viz_glui_cmdline.cpp  
-# viz_glui_controls.cpp  
-# viz_glui_draws.cpp  
-# viz_glui_export.cpp  
-# viz_glui_mouse.cpp 
-#)
-
-
-add_executable(perf_main  perf_main ${Perf_SRC})
-target_link_libraries(perf_main ${OPENGL_LIBRARIES} ${ZLIB_LIBRARIES})
-
-
-#add_executable(viz_glui_main viz_glui_main ${Perf_SRC} ${VIZ_SRC} )
-#target_link_libraries(viz_glui_main ${OPENGL_LIBRARIES} ${ZLIB_LIBRARIES} ${PNG_LIBRARIES} ${GLUI_LIBRARIES})
diff --git a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/Doxyfile b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/Doxyfile
deleted file mode 100644
index 2667a0f7b6..0000000000
--- a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/Doxyfile
+++ /dev/null
@@ -1,1551 +0,0 @@
-# Doxyfile 1.6.1
-
-# This file describes the settings to be used by the documentation system
-# doxygen (www.doxygen.org) for a project
-#
-# All text after a hash (#) is considered a comment and will be ignored
-# The format is:
-#       TAG = value [value, ...]
-# For lists items can also be appended using:
-#       TAG += value [value, ...]
-# Values that contain spaces should be placed between quotes (" ")
-
-#---------------------------------------------------------------------------
-# Project related configuration options
-#---------------------------------------------------------------------------
-
-# This tag specifies the encoding used for all characters in the config file
-# that follow. The default is UTF-8 which is also the encoding used for all
-# text before the first occurrence of this tag. Doxygen uses libiconv (or the
-# iconv built into libc) for the transcoding. See
-# http://www.gnu.org/software/libiconv for the list of possible encodings.
-
-DOXYFILE_ENCODING      = UTF-8
-
-# The PROJECT_NAME tag is a single word (or a sequence of words surrounded
-# by quotes) that should identify the project.
-
-PROJECT_NAME           = DualOctree
-
-# The PROJECT_NUMBER tag can be used to enter a project or revision number.
-# This could be handy for archiving the generated documentation or
-# if some version control system is used.
-
-PROJECT_NUMBER         = 1.0
-
-# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
-# base path where the generated documentation will be put.
-# If a relative path is entered, it will be relative to the location
-# where doxygen was started. If left blank the current directory will be used.
-
-OUTPUT_DIRECTORY       = doc
-
-# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create
-# 4096 sub-directories (in 2 levels) under the output directory of each output
-# format and will distribute the generated files over these directories.
-# Enabling this option can be useful when feeding doxygen a huge amount of
-# source files, where putting all generated files in the same directory would
-# otherwise cause performance problems for the file system.
-
-CREATE_SUBDIRS         = NO
-
-# The OUTPUT_LANGUAGE tag is used to specify the language in which all
-# documentation generated by doxygen is written. Doxygen will use this
-# information to generate all constant output in the proper language.
-# The default language is English, other supported languages are:
-# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional,
-# Croatian, Czech, Danish, Dutch, Esperanto, Farsi, Finnish, French, German,
-# Greek, Hungarian, Italian, Japanese, Japanese-en (Japanese with English
-# messages), Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian,
-# Polish, Portuguese, Romanian, Russian, Serbian, Serbian-Cyrilic, Slovak,
-# Slovene, Spanish, Swedish, Ukrainian, and Vietnamese.
-
-OUTPUT_LANGUAGE        = English
-
-# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will
-# include brief member descriptions after the members that are listed in
-# the file and class documentation (similar to JavaDoc).
-# Set to NO to disable this.
-
-BRIEF_MEMBER_DESC      = YES
-
-# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend
-# the brief description of a member or function before the detailed description.
-# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
-# brief descriptions will be completely suppressed.
-
-REPEAT_BRIEF           = YES
-
-# This tag implements a quasi-intelligent brief description abbreviator
-# that is used to form the text in various listings. Each string
-# in this list, if found as the leading text of the brief description, will be
-# stripped from the text and the result after processing the whole list, is
-# used as the annotated text. Otherwise, the brief description is used as-is.
-# If left blank, the following values are used ("$name" is automatically
-# replaced with the name of the entity): "The $name class" "The $name widget"
-# "The $name file" "is" "provides" "specifies" "contains"
-# "represents" "a" "an" "the"
-
-ABBREVIATE_BRIEF       = "The $name class" \
-                         "The $name widget" \
-                         "The $name file" \
-                         is \
-                         provides \
-                         specifies \
-                         contains \
-                         represents \
-                         a \
-                         an \
-                         the
-
-# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
-# Doxygen will generate a detailed section even if there is only a brief
-# description.
-
-ALWAYS_DETAILED_SEC    = NO
-
-# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all
-# inherited members of a class in the documentation of that class as if those
-# members were ordinary class members. Constructors, destructors and assignment
-# operators of the base classes will not be shown.
-
-INLINE_INHERITED_MEMB  = NO
-
-# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full
-# path before files name in the file list and in the header files. If set
-# to NO the shortest path that makes the file name unique will be used.
-
-FULL_PATH_NAMES        = YES
-
-# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag
-# can be used to strip a user-defined part of the path. Stripping is
-# only done if one of the specified strings matches the left-hand part of
-# the path. The tag can be used to show relative paths in the file list.
-# If left blank the directory from which doxygen is run is used as the
-# path to strip.
-
-STRIP_FROM_PATH        = "."
-
-# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of
-# the path mentioned in the documentation of a class, which tells
-# the reader which header file to include in order to use a class.
-# If left blank only the name of the header file containing the class
-# definition is used. Otherwise one should specify the include paths that
-# are normally passed to the compiler using the -I flag.
-
-STRIP_FROM_INC_PATH    =
-
-# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter
-# (but less readable) file names. This can be useful is your file systems
-# doesn't support long names like on DOS, Mac, or CD-ROM.
-
-SHORT_NAMES            = NO
-
-# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen
-# will interpret the first line (until the first dot) of a JavaDoc-style
-# comment as the brief description. If set to NO, the JavaDoc
-# comments will behave just like regular Qt-style comments
-# (thus requiring an explicit @brief command for a brief description.)
-
-JAVADOC_AUTOBRIEF      = NO
-
-# If the QT_AUTOBRIEF tag is set to YES then Doxygen will
-# interpret the first line (until the first dot) of a Qt-style
-# comment as the brief description. If set to NO, the comments
-# will behave just like regular Qt-style comments (thus requiring
-# an explicit \brief command for a brief description.)
-
-QT_AUTOBRIEF           = NO
-
-# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen
-# treat a multi-line C++ special comment block (i.e. a block of //! or ///
-# comments) as a brief description. This used to be the default behaviour.
-# The new default is to treat a multi-line C++ comment block as a detailed
-# description. Set this tag to YES if you prefer the old behaviour instead.
-
-MULTILINE_CPP_IS_BRIEF = NO
-
-# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented
-# member inherits the documentation from any documented member that it
-# re-implements.
-
-INHERIT_DOCS           = YES
-
-# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce
-# a new page for each member. If set to NO, the documentation of a member will
-# be part of the file/class/namespace that contains it.
-
-SEPARATE_MEMBER_PAGES  = NO
-
-# The TAB_SIZE tag can be used to set the number of spaces in a tab.
-# Doxygen uses this value to replace tabs by spaces in code fragments.
-
-TAB_SIZE               = 4
-
-# This tag can be used to specify a number of aliases that acts
-# as commands in the documentation. An alias has the form "name=value".
-# For example adding "sideeffect=\par Side Effects:\n" will allow you to
-# put the command \sideeffect (or @sideeffect) in the documentation, which
-# will result in a user-defined paragraph with heading "Side Effects:".
-# You can put \n's in the value part of an alias to insert newlines.
-
-ALIASES                =
-
-# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C
-# sources only. Doxygen will then generate output that is more tailored for C.
-# For instance, some of the names that are used will be different. The list
-# of all members will be omitted, etc.
-
-OPTIMIZE_OUTPUT_FOR_C  = YES
-
-# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java
-# sources only. Doxygen will then generate output that is more tailored for
-# Java. For instance, namespaces will be presented as packages, qualified
-# scopes will look different, etc.
-
-OPTIMIZE_OUTPUT_JAVA   = NO
-
-# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran
-# sources only. Doxygen will then generate output that is more tailored for
-# Fortran.
-
-OPTIMIZE_FOR_FORTRAN   = NO
-
-# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL
-# sources. Doxygen will then generate output that is tailored for
-# VHDL.
-
-OPTIMIZE_OUTPUT_VHDL   = NO
-
-# Doxygen selects the parser to use depending on the extension of the files it parses.
-# With this tag you can assign which parser to use for a given extension.
-# Doxygen has a built-in mapping, but you can override or extend it using this tag.
-# The format is ext=language, where ext is a file extension, and language is one of
-# the parsers supported by doxygen: IDL, Java, Javascript, C#, C, C++, D, PHP,
-# Objective-C, Python, Fortran, VHDL, C, C++. For instance to make doxygen treat
-# .inc files as Fortran files (default is PHP), and .f files as C (default is Fortran),
-# use: inc=Fortran f=C. Note that for custom extensions you also need to set FILE_PATTERNS otherwise the files are not read by doxygen.
-
-EXTENSION_MAPPING      =
-
-# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want
-# to include (a tag file for) the STL sources as input, then you should
-# set this tag to YES in order to let doxygen match functions declarations and
-# definitions whose arguments contain STL classes (e.g. func(std::string); v.s.
-# func(std::string) {}). This also make the inheritance and collaboration
-# diagrams that involve STL classes more complete and accurate.
-
-BUILTIN_STL_SUPPORT    = NO
-
-# If you use Microsoft's C++/CLI language, you should set this option to YES to
-# enable parsing support.
-
-CPP_CLI_SUPPORT        = NO
-
-# Set the SIP_SUPPORT tag to YES if your project consists of sip sources only.
-# Doxygen will parse them like normal C++ but will assume all classes use public
-# instead of private inheritance when no explicit protection keyword is present.
-
-SIP_SUPPORT            = NO
-
-# For Microsoft's IDL there are propget and propput attributes to indicate getter
-# and setter methods for a property. Setting this option to YES (the default)
-# will make doxygen to replace the get and set methods by a property in the
-# documentation. This will only work if the methods are indeed getting or
-# setting a simple type. If this is not the case, or you want to show the
-# methods anyway, you should set this option to NO.
-
-IDL_PROPERTY_SUPPORT   = YES
-
-# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
-# tag is set to YES, then doxygen will reuse the documentation of the first
-# member in the group (if any) for the other members of the group. By default
-# all members of a group must be documented explicitly.
-
-DISTRIBUTE_GROUP_DOC   = NO
-
-# Set the SUBGROUPING tag to YES (the default) to allow class member groups of
-# the same type (for instance a group of public functions) to be put as a
-# subgroup of that type (e.g. under the Public Functions section). Set it to
-# NO to prevent subgrouping. Alternatively, this can be done per class using
-# the \nosubgrouping command.
-
-SUBGROUPING            = YES
-
-# When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or enum
-# is documented as struct, union, or enum with the name of the typedef. So
-# typedef struct TypeS {} TypeT, will appear in the documentation as a struct
-# with name TypeT. When disabled the typedef will appear as a member of a file,
-# namespace, or class. And the struct will be named TypeS. This can typically
-# be useful for C code in case the coding convention dictates that all compound
-# types are typedef'ed and only the typedef is referenced, never the tag name.
-
-TYPEDEF_HIDES_STRUCT   = NO
-
-# The SYMBOL_CACHE_SIZE determines the size of the internal cache use to
-# determine which symbols to keep in memory and which to flush to disk.
-# When the cache is full, less often used symbols will be written to disk.
-# For small to medium size projects (<1000 input files) the default value is
-# probably good enough. For larger projects a too small cache size can cause
-# doxygen to be busy swapping symbols to and from disk most of the time
-# causing a significant performance penality.
-# If the system has enough physical memory increasing the cache will improve the
-# performance by keeping more symbols in memory. Note that the value works on
-# a logarithmic scale so increasing the size by one will rougly double the
-# memory usage. The cache size is given by this formula:
-# 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0,
-# corresponding to a cache size of 2^16 = 65536 symbols
-
-SYMBOL_CACHE_SIZE      = 0
-
-#---------------------------------------------------------------------------
-# Build related configuration options
-#---------------------------------------------------------------------------
-
-# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in
-# documentation are documented, even if no documentation was available.
-# Private class members and static file members will be hidden unless
-# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES
-
-EXTRACT_ALL            = YES
-
-# If the EXTRACT_PRIVATE tag is set to YES all private members of a class
-# will be included in the documentation.
-
-EXTRACT_PRIVATE        = YES
-
-# If the EXTRACT_STATIC tag is set to YES all static members of a file
-# will be included in the documentation.
-
-EXTRACT_STATIC         = YES
-
-# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs)
-# defined locally in source files will be included in the documentation.
-# If set to NO only classes defined in header files are included.
-
-EXTRACT_LOCAL_CLASSES  = YES
-
-# This flag is only useful for Objective-C code. When set to YES local
-# methods, which are defined in the implementation section but not in
-# the interface are included in the documentation.
-# If set to NO (the default) only methods in the interface are included.
-
-EXTRACT_LOCAL_METHODS  = NO
-
-# If this flag is set to YES, the members of anonymous namespaces will be
-# extracted and appear in the documentation as a namespace called
-# 'anonymous_namespace{file}', where file will be replaced with the base
-# name of the file that contains the anonymous namespace. By default
-# anonymous namespace are hidden.
-
-EXTRACT_ANON_NSPACES   = NO
-
-# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all
-# undocumented members of documented classes, files or namespaces.
-# If set to NO (the default) these members will be included in the
-# various overviews, but no documentation section is generated.
-# This option has no effect if EXTRACT_ALL is enabled.
-
-HIDE_UNDOC_MEMBERS     = NO
-
-# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all
-# undocumented classes that are normally visible in the class hierarchy.
-# If set to NO (the default) these classes will be included in the various
-# overviews. This option has no effect if EXTRACT_ALL is enabled.
-
-HIDE_UNDOC_CLASSES     = NO
-
-# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all
-# friend (class|struct|union) declarations.
-# If set to NO (the default) these declarations will be included in the
-# documentation.
-
-HIDE_FRIEND_COMPOUNDS  = NO
-
-# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any
-# documentation blocks found inside the body of a function.
-# If set to NO (the default) these blocks will be appended to the
-# function's detailed documentation block.
-
-HIDE_IN_BODY_DOCS      = NO
-
-# The INTERNAL_DOCS tag determines if documentation
-# that is typed after a \internal command is included. If the tag is set
-# to NO (the default) then the documentation will be excluded.
-# Set it to YES to include the internal documentation.
-
-INTERNAL_DOCS          = NO
-
-# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate
-# file names in lower-case letters. If set to YES upper-case letters are also
-# allowed. This is useful if you have classes or files whose names only differ
-# in case and if your file system supports case sensitive file names. Windows
-# and Mac users are advised to set this option to NO.
-
-CASE_SENSE_NAMES       = NO
-
-# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen
-# will show members with their full class and namespace scopes in the
-# documentation. If set to YES the scope will be hidden.
-
-HIDE_SCOPE_NAMES       = NO
-
-# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen
-# will put a list of the files that are included by a file in the documentation
-# of that file.
-
-SHOW_INCLUDE_FILES     = YES
-
-# If the INLINE_INFO tag is set to YES (the default) then a tag [inline]
-# is inserted in the documentation for inline members.
-
-INLINE_INFO            = YES
-
-# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen
-# will sort the (detailed) documentation of file and class members
-# alphabetically by member name. If set to NO the members will appear in
-# declaration order.
-
-SORT_MEMBER_DOCS       = YES
-
-# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the
-# brief documentation of file, namespace and class members alphabetically
-# by member name. If set to NO (the default) the members will appear in
-# declaration order.
-
-SORT_BRIEF_DOCS        = YES
-
-# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen will sort the (brief and detailed) documentation of class members so that constructors and destructors are listed first. If set to NO (the default) the constructors will appear in the respective orders defined by SORT_MEMBER_DOCS and SORT_BRIEF_DOCS. This tag will be ignored for brief docs if SORT_BRIEF_DOCS is set to NO and ignored for detailed docs if SORT_MEMBER_DOCS is set to NO.
-
-SORT_MEMBERS_CTORS_1ST = YES
-
-# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the
-# hierarchy of group names into alphabetical order. If set to NO (the default)
-# the group names will appear in their defined order.
-
-SORT_GROUP_NAMES       = YES
-
-# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be
-# sorted by fully-qualified names, including namespaces. If set to
-# NO (the default), the class list will be sorted only by class name,
-# not including the namespace part.
-# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
-# Note: This option applies only to the class list, not to the
-# alphabetical list.
-
-SORT_BY_SCOPE_NAME     = YES
-
-# The GENERATE_TODOLIST tag can be used to enable (YES) or
-# disable (NO) the todo list. This list is created by putting \todo
-# commands in the documentation.
-
-GENERATE_TODOLIST      = YES
-
-# The GENERATE_TESTLIST tag can be used to enable (YES) or
-# disable (NO) the test list. This list is created by putting \test
-# commands in the documentation.
-
-GENERATE_TESTLIST      = YES
-
-# The GENERATE_BUGLIST tag can be used to enable (YES) or
-# disable (NO) the bug list. This list is created by putting \bug
-# commands in the documentation.
-
-GENERATE_BUGLIST       = YES
-
-# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or
-# disable (NO) the deprecated list. This list is created by putting
-# \deprecated commands in the documentation.
-
-GENERATE_DEPRECATEDLIST= YES
-
-# The ENABLED_SECTIONS tag can be used to enable conditional
-# documentation sections, marked by \if sectionname ... \endif.
-
-ENABLED_SECTIONS       =
-
-# The MAX_INITIALIZER_LINES tag determines the maximum number of lines
-# the initial value of a variable or define consists of for it to appear in
-# the documentation. If the initializer consists of more lines than specified
-# here it will be hidden. Use a value of 0 to hide initializers completely.
-# The appearance of the initializer of individual variables and defines in the
-# documentation can be controlled using \showinitializer or \hideinitializer
-# command in the documentation regardless of this setting.
-
-MAX_INITIALIZER_LINES  = 30
-
-# Set the SHOW_USED_FILES tag to NO to disable the list of files generated
-# at the bottom of the documentation of classes and structs. If set to YES the
-# list will mention the files that were used to generate the documentation.
-
-SHOW_USED_FILES        = YES
-
-# If the sources in your project are distributed over multiple directories
-# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy
-# in the documentation. The default is NO.
-
-SHOW_DIRECTORIES       = NO
-
-# Set the SHOW_FILES tag to NO to disable the generation of the Files page.
-# This will remove the Files entry from the Quick Index and from the
-# Folder Tree View (if specified). The default is YES.
-
-SHOW_FILES             = YES
-
-# Set the SHOW_NAMESPACES tag to NO to disable the generation of the
-# Namespaces page.
-# This will remove the Namespaces entry from the Quick Index
-# and from the Folder Tree View (if specified). The default is YES.
-
-SHOW_NAMESPACES        = YES
-
-# The FILE_VERSION_FILTER tag can be used to specify a program or script that
-# doxygen should invoke to get the current version for each file (typically from
-# the version control system). Doxygen will invoke the program by executing (via
-# popen()) the command <command> <input-file>, where <command> is the value of
-# the FILE_VERSION_FILTER tag, and <input-file> is the name of an input file
-# provided by doxygen. Whatever the program writes to standard output
-# is used as the file version. See the manual for examples.
-
-FILE_VERSION_FILTER    =
-
-# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed by
-# doxygen. The layout file controls the global structure of the generated output files
-# in an output format independent way. The create the layout file that represents
-# doxygen's defaults, run doxygen with the -l option. You can optionally specify a
-# file name after the option, if omitted DoxygenLayout.xml will be used as the name
-# of the layout file.
-
-LAYOUT_FILE            =
-
-#---------------------------------------------------------------------------
-# configuration options related to warning and progress messages
-#---------------------------------------------------------------------------
-
-# The QUIET tag can be used to turn on/off the messages that are generated
-# by doxygen. Possible values are YES and NO. If left blank NO is used.
-
-QUIET                  = NO
-
-# The WARNINGS tag can be used to turn on/off the warning messages that are
-# generated by doxygen. Possible values are YES and NO. If left blank
-# NO is used.
-
-WARNINGS               = YES
-
-# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings
-# for undocumented members. If EXTRACT_ALL is set to YES then this flag will
-# automatically be disabled.
-
-WARN_IF_UNDOCUMENTED   = YES
-
-# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for
-# potential errors in the documentation, such as not documenting some
-# parameters in a documented function, or documenting parameters that
-# don't exist or using markup commands wrongly.
-
-WARN_IF_DOC_ERROR      = YES
-
-# This WARN_NO_PARAMDOC option can be abled to get warnings for
-# functions that are documented, but have no documentation for their parameters
-# or return value. If set to NO (the default) doxygen will only warn about
-# wrong or incomplete parameter documentation, but not about the absence of
-# documentation.
-
-WARN_NO_PARAMDOC       = NO
-
-# The WARN_FORMAT tag determines the format of the warning messages that
-# doxygen can produce. The string should contain the $file, $line, and $text
-# tags, which will be replaced by the file and line number from which the
-# warning originated and the warning text. Optionally the format may contain
-# $version, which will be replaced by the version of the file (if it could
-# be obtained via FILE_VERSION_FILTER)
-
-WARN_FORMAT            = "$file:$line: $text"
-
-# The WARN_LOGFILE tag can be used to specify a file to which warning
-# and error messages should be written. If left blank the output is written
-# to stderr.
-
-WARN_LOGFILE           =
-
-#---------------------------------------------------------------------------
-# configuration options related to the input files
-#---------------------------------------------------------------------------
-
-# The INPUT tag can be used to specify the files and/or directories that contain
-# documented source files. You may enter file names like "myfile.cpp" or
-# directories like "/usr/src/myproject". Separate the files or directories
-# with spaces.
-
-INPUT                  = .
-
-# This tag can be used to specify the character encoding of the source files
-# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is
-# also the default input encoding. Doxygen uses libiconv (or the iconv built
-# into libc) for the transcoding. See http://www.gnu.org/software/libiconv for
-# the list of possible encodings.
-
-INPUT_ENCODING         = UTF-8
-
-# If the value of the INPUT tag contains directories, you can use the
-# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
-# and *.h) to filter out the source-files in the directories. If left
-# blank the following patterns are tested:
-# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx
-# *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py *.f90
-
-FILE_PATTERNS          = *.c \
-                         *.cc \
-                         *.cxx \
-                         *.cpp \
-                         *.c++ \
-                         *.d \
-                         *.java \
-                         *.ii \
-                         *.ixx \
-                         *.ipp \
-                         *.i++ \
-                         *.inl \
-                         *.h \
-                         *.hh \
-                         *.hxx \
-                         *.hpp \
-                         *.h++ \
-                         *.idl \
-                         *.odl \
-                         *.cs \
-                         *.php \
-                         *.php3 \
-                         *.inc \
-                         *.m \
-                         *.mm \
-                         *.dox \
-                         *.py
-
-# The RECURSIVE tag can be used to turn specify whether or not subdirectories
-# should be searched for input files as well. Possible values are YES and NO.
-# If left blank NO is used.
-
-RECURSIVE              = NO
-
-# The EXCLUDE tag can be used to specify files and/or directories that should
-# excluded from the INPUT source files. This way you can easily exclude a
-# subdirectory from a directory tree whose root is specified with the INPUT tag.
-
-EXCLUDE                =
-
-# The EXCLUDE_SYMLINKS tag can be used select whether or not files or
-# directories that are symbolic links (a Unix filesystem feature) are excluded
-# from the input.
-
-EXCLUDE_SYMLINKS       = NO
-
-# If the value of the INPUT tag contains directories, you can use the
-# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
-# certain files from those directories. Note that the wildcards are matched
-# against the file with absolute path, so to exclude all test directories
-# for example use the pattern */test/*
-
-EXCLUDE_PATTERNS       = *gl2ps* \
-                         *mathexpr*
-
-# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
-# (namespaces, classes, functions, etc.) that should be excluded from the
-# output. The symbol name can be a fully qualified name, a word, or if the
-# wildcard * is used, a substring. Examples: ANamespace, AClass,
-# AClass::ANamespace, ANamespace::*Test
-
-EXCLUDE_SYMBOLS        =
-
-# The EXAMPLE_PATH tag can be used to specify one or more files or
-# directories that contain example code fragments that are included (see
-# the \include command).
-
-EXAMPLE_PATH           =
-
-# If the value of the EXAMPLE_PATH tag contains directories, you can use the
-# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
-# and *.h) to filter out the source-files in the directories. If left
-# blank all files are included.
-
-EXAMPLE_PATTERNS       = *
-
-# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
-# searched for input files to be used with the \include or \dontinclude
-# commands irrespective of the value of the RECURSIVE tag.
-# Possible values are YES and NO. If left blank NO is used.
-
-EXAMPLE_RECURSIVE      = NO
-
-# The IMAGE_PATH tag can be used to specify one or more files or
-# directories that contain image that are included in the documentation (see
-# the \image command).
-
-IMAGE_PATH             =
-
-# The INPUT_FILTER tag can be used to specify a program that doxygen should
-# invoke to filter for each input file. Doxygen will invoke the filter program
-# by executing (via popen()) the command <filter> <input-file>, where <filter>
-# is the value of the INPUT_FILTER tag, and <input-file> is the name of an
-# input file. Doxygen will then use the output that the filter program writes
-# to standard output.
-# If FILTER_PATTERNS is specified, this tag will be
-# ignored.
-
-INPUT_FILTER           =
-
-# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
-# basis.
-# Doxygen will compare the file name with each pattern and apply the
-# filter if there is a match.
-# The filters are a list of the form:
-# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further
-# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER
-# is applied to all files.
-
-FILTER_PATTERNS        =
-
-# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
-# INPUT_FILTER) will be used to filter the input files when producing source
-# files to browse (i.e. when SOURCE_BROWSER is set to YES).
-
-FILTER_SOURCE_FILES    = NO
-
-#---------------------------------------------------------------------------
-# configuration options related to source browsing
-#---------------------------------------------------------------------------
-
-# If the SOURCE_BROWSER tag is set to YES then a list of source files will
-# be generated. Documented entities will be cross-referenced with these sources.
-# Note: To get rid of all source code in the generated output, make sure also
-# VERBATIM_HEADERS is set to NO.
-
-SOURCE_BROWSER         = YES
-
-# Setting the INLINE_SOURCES tag to YES will include the body
-# of functions and classes directly in the documentation.
-
-INLINE_SOURCES         = NO
-
-# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct
-# doxygen to hide any special comment blocks from generated source code
-# fragments. Normal C and C++ comments will always remain visible.
-
-STRIP_CODE_COMMENTS    = YES
-
-# If the REFERENCED_BY_RELATION tag is set to YES
-# then for each documented function all documented
-# functions referencing it will be listed.
-
-REFERENCED_BY_RELATION = YES
-
-# If the REFERENCES_RELATION tag is set to YES
-# then for each documented function all documented entities
-# called/used by that function will be listed.
-
-REFERENCES_RELATION    = YES
-
-# If the REFERENCES_LINK_SOURCE tag is set to YES (the default)
-# and SOURCE_BROWSER tag is set to YES, then the hyperlinks from
-# functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will
-# link to the source code.
-# Otherwise they will link to the documentation.
-
-REFERENCES_LINK_SOURCE = YES
-
-# If the USE_HTAGS tag is set to YES then the references to source code
-# will point to the HTML generated by the htags(1) tool instead of doxygen
-# built-in source browser. The htags tool is part of GNU's global source
-# tagging system (see http://www.gnu.org/software/global/global.html). You
-# will need version 4.8.6 or higher.
-
-USE_HTAGS              = NO
-
-# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen
-# will generate a verbatim copy of the header file for each class for
-# which an include is specified. Set to NO to disable this.
-
-VERBATIM_HEADERS       = YES
-
-#---------------------------------------------------------------------------
-# configuration options related to the alphabetical class index
-#---------------------------------------------------------------------------
-
-# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index
-# of all compounds will be generated. Enable this if the project
-# contains a lot of classes, structs, unions or interfaces.
-
-ALPHABETICAL_INDEX     = NO
-
-# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then
-# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns
-# in which this list will be split (can be a number in the range [1..20])
-
-COLS_IN_ALPHA_INDEX    = 5
-
-# In case all classes in a project start with a common prefix, all
-# classes will be put under the same header in the alphabetical index.
-# The IGNORE_PREFIX tag can be used to specify one or more prefixes that
-# should be ignored while generating the index headers.
-
-IGNORE_PREFIX          =
-
-#---------------------------------------------------------------------------
-# configuration options related to the HTML output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_HTML tag is set to YES (the default) Doxygen will
-# generate HTML output.
-
-GENERATE_HTML          = YES
-
-# The HTML_OUTPUT tag is used to specify where the HTML docs will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-# put in front of it. If left blank `html' will be used as the default path.
-
-HTML_OUTPUT            = html
-
-# The HTML_FILE_EXTENSION tag can be used to specify the file extension for
-# each generated HTML page (for example: .htm,.php,.asp). If it is left blank
-# doxygen will generate files with .html extension.
-
-HTML_FILE_EXTENSION    = .html
-
-# The HTML_HEADER tag can be used to specify a personal HTML header for
-# each generated HTML page. If it is left blank doxygen will generate a
-# standard header.
-
-HTML_HEADER            =
-
-# The HTML_FOOTER tag can be used to specify a personal HTML footer for
-# each generated HTML page. If it is left blank doxygen will generate a
-# standard footer.
-
-HTML_FOOTER            =
-
-# The HTML_STYLESHEET tag can be used to specify a user-defined cascading
-# style sheet that is used by each HTML page. It can be used to
-# fine-tune the look of the HTML output. If the tag is left blank doxygen
-# will generate a default style sheet. Note that doxygen will try to copy
-# the style sheet file to the HTML output directory, so don't put your own
-# stylesheet in the HTML output directory as well, or it will be erased!
-
-HTML_STYLESHEET        =
-
-# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes,
-# files or namespaces will be aligned in HTML using tables. If set to
-# NO a bullet list will be used.
-
-HTML_ALIGN_MEMBERS     = YES
-
-# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
-# documentation will contain sections that can be hidden and shown after the
-# page has loaded. For this to work a browser that supports
-# JavaScript and DHTML is required (for instance Mozilla 1.0+, Firefox
-# Netscape 6.0+, Internet explorer 5.0+, Konqueror, or Safari).
-
-HTML_DYNAMIC_SECTIONS  = NO
-
-# If the GENERATE_DOCSET tag is set to YES, additional index files
-# will be generated that can be used as input for Apple's Xcode 3
-# integrated development environment, introduced with OSX 10.5 (Leopard).
-# To create a documentation set, doxygen will generate a Makefile in the
-# HTML output directory. Running make will produce the docset in that
-# directory and running "make install" will install the docset in
-# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find
-# it at startup.
-# See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html for more information.
-
-GENERATE_DOCSET        = NO
-
-# When GENERATE_DOCSET tag is set to YES, this tag determines the name of the
-# feed. A documentation feed provides an umbrella under which multiple
-# documentation sets from a single provider (such as a company or product suite)
-# can be grouped.
-
-DOCSET_FEEDNAME        = "Doxygen generated docs"
-
-# When GENERATE_DOCSET tag is set to YES, this tag specifies a string that
-# should uniquely identify the documentation set bundle. This should be a
-# reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen
-# will append .docset to the name.
-
-DOCSET_BUNDLE_ID       = org.doxygen.Project
-
-# If the GENERATE_HTMLHELP tag is set to YES, additional index files
-# will be generated that can be used as input for tools like the
-# Microsoft HTML help workshop to generate a compiled HTML help file (.chm)
-# of the generated HTML documentation.
-
-GENERATE_HTMLHELP      = NO
-
-# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can
-# be used to specify the file name of the resulting .chm file. You
-# can add a path in front of the file if the result should not be
-# written to the html output directory.
-
-CHM_FILE               =
-
-# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can
-# be used to specify the location (absolute path including file name) of
-# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run
-# the HTML help compiler on the generated index.hhp.
-
-HHC_LOCATION           =
-
-# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag
-# controls if a separate .chi index file is generated (YES) or that
-# it should be included in the master .chm file (NO).
-
-GENERATE_CHI           = NO
-
-# If the GENERATE_HTMLHELP tag is set to YES, the CHM_INDEX_ENCODING
-# is used to encode HtmlHelp index (hhk), content (hhc) and project file
-# content.
-
-CHM_INDEX_ENCODING     =
-
-# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag
-# controls whether a binary table of contents is generated (YES) or a
-# normal table of contents (NO) in the .chm file.
-
-BINARY_TOC             = NO
-
-# The TOC_EXPAND flag can be set to YES to add extra items for group members
-# to the contents of the HTML help documentation and to the tree view.
-
-TOC_EXPAND             = NO
-
-# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and QHP_VIRTUAL_FOLDER
-# are set, an additional index file will be generated that can be used as input for
-# Qt's qhelpgenerator to generate a Qt Compressed Help (.qch) of the generated
-# HTML documentation.
-
-GENERATE_QHP           = NO
-
-# If the QHG_LOCATION tag is specified, the QCH_FILE tag can
-# be used to specify the file name of the resulting .qch file.
-# The path specified is relative to the HTML output folder.
-
-QCH_FILE               =
-
-# The QHP_NAMESPACE tag specifies the namespace to use when generating
-# Qt Help Project output. For more information please see
-# http://doc.trolltech.com/qthelpproject.html#namespace
-
-QHP_NAMESPACE          =
-
-# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating
-# Qt Help Project output. For more information please see
-# http://doc.trolltech.com/qthelpproject.html#virtual-folders
-
-QHP_VIRTUAL_FOLDER     = doc
-
-# If QHP_CUST_FILTER_NAME is set, it specifies the name of a custom filter to add.
-# For more information please see
-# http://doc.trolltech.com/qthelpproject.html#custom-filters
-
-QHP_CUST_FILTER_NAME   =
-
-# The QHP_CUST_FILT_ATTRS tag specifies the list of the attributes of the custom filter to add.For more information please see
-# <a href="http://doc.trolltech.com/qthelpproject.html#custom-filters">Qt Help Project / Custom Filters</a>.
-
-QHP_CUST_FILTER_ATTRS  =
-
-# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this project's
-# filter section matches.
-# <a href="http://doc.trolltech.com/qthelpproject.html#filter-attributes">Qt Help Project / Filter Attributes</a>.
-
-QHP_SECT_FILTER_ATTRS  =
-
-# If the GENERATE_QHP tag is set to YES, the QHG_LOCATION tag can
-# be used to specify the location of Qt's qhelpgenerator.
-# If non-empty doxygen will try to run qhelpgenerator on the generated
-# .qhp file.
-
-QHG_LOCATION           =
-
-# The DISABLE_INDEX tag can be used to turn on/off the condensed index at
-# top of each HTML page. The value NO (the default) enables the index and
-# the value YES disables it.
-
-DISABLE_INDEX          = NO
-
-# This tag can be used to set the number of enum values (range [1..20])
-# that doxygen will group on one line in the generated HTML documentation.
-
-ENUM_VALUES_PER_LINE   = 4
-
-# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index
-# structure should be generated to display hierarchical information.
-# If the tag value is set to YES, a side panel will be generated
-# containing a tree-like index structure (just like the one that
-# is generated for HTML Help). For this to work a browser that supports
-# JavaScript, DHTML, CSS and frames is required (i.e. any modern browser).
-# Windows users are probably better off using the HTML help feature.
-
-GENERATE_TREEVIEW      = YES
-
-# By enabling USE_INLINE_TREES, doxygen will generate the Groups, Directories,
-# and Class Hierarchy pages using a tree view instead of an ordered list.
-
-USE_INLINE_TREES       = NO
-
-# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be
-# used to set the initial width (in pixels) of the frame in which the tree
-# is shown.
-
-TREEVIEW_WIDTH         = 250
-
-# Use this tag to change the font size of Latex formulas included
-# as images in the HTML documentation. The default is 10. Note that
-# when you change the font size after a successful doxygen run you need
-# to manually remove any form_*.png images from the HTML output directory
-# to force them to be regenerated.
-
-FORMULA_FONTSIZE       = 10
-
-# When the SEARCHENGINE tag is enable doxygen will generate a search box for the HTML output. The underlying search engine uses javascript
-# and DHTML and should work on any modern browser. Note that when using HTML help (GENERATE_HTMLHELP) or Qt help (GENERATE_QHP)
-# there is already a search function so this one should typically
-# be disabled.
-
-SEARCHENGINE           = NO
-
-#---------------------------------------------------------------------------
-# configuration options related to the LaTeX output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will
-# generate Latex output.
-
-GENERATE_LATEX         = NO
-
-# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-# put in front of it. If left blank `latex' will be used as the default path.
-
-LATEX_OUTPUT           = latex
-
-# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
-# invoked. If left blank `latex' will be used as the default command name.
-
-LATEX_CMD_NAME         = latex
-
-# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to
-# generate index for LaTeX. If left blank `makeindex' will be used as the
-# default command name.
-
-MAKEINDEX_CMD_NAME     = makeindex
-
-# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact
-# LaTeX documents. This may be useful for small projects and may help to
-# save some trees in general.
-
-COMPACT_LATEX          = NO
-
-# The PAPER_TYPE tag can be used to set the paper type that is used
-# by the printer. Possible values are: a4, a4wide, letter, legal and
-# executive. If left blank a4wide will be used.
-
-PAPER_TYPE             = a4wide
-
-# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX
-# packages that should be included in the LaTeX output.
-
-EXTRA_PACKAGES         =
-
-# The LATEX_HEADER tag can be used to specify a personal LaTeX header for
-# the generated latex document. The header should contain everything until
-# the first chapter. If it is left blank doxygen will generate a
-# standard header. Notice: only use this tag if you know what you are doing!
-
-LATEX_HEADER           =
-
-# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated
-# is prepared for conversion to pdf (using ps2pdf). The pdf file will
-# contain links (just like the HTML output) instead of page references
-# This makes the output suitable for online browsing using a pdf viewer.
-
-PDF_HYPERLINKS         = NO
-
-# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of
-# plain latex in the generated Makefile. Set this option to YES to get a
-# higher quality PDF documentation.
-
-USE_PDFLATEX           = NO
-
-# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode.
-# command to the generated LaTeX files. This will instruct LaTeX to keep
-# running if errors occur, instead of asking the user for help.
-# This option is also used when generating formulas in HTML.
-
-LATEX_BATCHMODE        = NO
-
-# If LATEX_HIDE_INDICES is set to YES then doxygen will not
-# include the index chapters (such as File Index, Compound Index, etc.)
-# in the output.
-
-LATEX_HIDE_INDICES     = NO
-
-# If LATEX_SOURCE_CODE is set to YES then doxygen will include source code with syntax highlighting in the LaTeX output. Note that which sources are shown also depends on other settings such as SOURCE_BROWSER.
-
-LATEX_SOURCE_CODE      = NO
-
-#---------------------------------------------------------------------------
-# configuration options related to the RTF output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output
-# The RTF output is optimized for Word 97 and may not look very pretty with
-# other RTF readers or editors.
-
-GENERATE_RTF           = NO
-
-# The RTF_OUTPUT tag is used to specify where the RTF docs will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-# put in front of it. If left blank `rtf' will be used as the default path.
-
-RTF_OUTPUT             = rtf
-
-# If the COMPACT_RTF tag is set to YES Doxygen generates more compact
-# RTF documents. This may be useful for small projects and may help to
-# save some trees in general.
-
-COMPACT_RTF            = NO
-
-# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated
-# will contain hyperlink fields. The RTF file will
-# contain links (just like the HTML output) instead of page references.
-# This makes the output suitable for online browsing using WORD or other
-# programs which support those fields.
-# Note: wordpad (write) and others do not support links.
-
-RTF_HYPERLINKS         = NO
-
-# Load stylesheet definitions from file. Syntax is similar to doxygen's
-# config file, i.e. a series of assignments. You only have to provide
-# replacements, missing definitions are set to their default value.
-
-RTF_STYLESHEET_FILE    =
-
-# Set optional variables used in the generation of an rtf document.
-# Syntax is similar to doxygen's config file.
-
-RTF_EXTENSIONS_FILE    =
-
-#---------------------------------------------------------------------------
-# configuration options related to the man page output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_MAN tag is set to YES (the default) Doxygen will
-# generate man pages
-
-GENERATE_MAN           = NO
-
-# The MAN_OUTPUT tag is used to specify where the man pages will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-# put in front of it. If left blank `man' will be used as the default path.
-
-MAN_OUTPUT             = man
-
-# The MAN_EXTENSION tag determines the extension that is added to
-# the generated man pages (default is the subroutine's section .3)
-
-MAN_EXTENSION          = .3
-
-# If the MAN_LINKS tag is set to YES and Doxygen generates man output,
-# then it will generate one additional man file for each entity
-# documented in the real man page(s). These additional files
-# only source the real man page, but without them the man command
-# would be unable to find the correct page. The default is NO.
-
-MAN_LINKS              = NO
-
-#---------------------------------------------------------------------------
-# configuration options related to the XML output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_XML tag is set to YES Doxygen will
-# generate an XML file that captures the structure of
-# the code including all documentation.
-
-GENERATE_XML           = NO
-
-# The XML_OUTPUT tag is used to specify where the XML pages will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-# put in front of it. If left blank `xml' will be used as the default path.
-
-XML_OUTPUT             = xml
-
-# The XML_SCHEMA tag can be used to specify an XML schema,
-# which can be used by a validating XML parser to check the
-# syntax of the XML files.
-
-XML_SCHEMA             =
-
-# The XML_DTD tag can be used to specify an XML DTD,
-# which can be used by a validating XML parser to check the
-# syntax of the XML files.
-
-XML_DTD                =
-
-# If the XML_PROGRAMLISTING tag is set to YES Doxygen will
-# dump the program listings (including syntax highlighting
-# and cross-referencing information) to the XML output. Note that
-# enabling this will significantly increase the size of the XML output.
-
-XML_PROGRAMLISTING     = YES
-
-#---------------------------------------------------------------------------
-# configuration options for the AutoGen Definitions output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will
-# generate an AutoGen Definitions (see autogen.sf.net) file
-# that captures the structure of the code including all
-# documentation. Note that this feature is still experimental
-# and incomplete at the moment.
-
-GENERATE_AUTOGEN_DEF   = NO
-
-#---------------------------------------------------------------------------
-# configuration options related to the Perl module output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_PERLMOD tag is set to YES Doxygen will
-# generate a Perl module file that captures the structure of
-# the code including all documentation. Note that this
-# feature is still experimental and incomplete at the
-# moment.
-
-GENERATE_PERLMOD       = NO
-
-# If the PERLMOD_LATEX tag is set to YES Doxygen will generate
-# the necessary Makefile rules, Perl scripts and LaTeX code to be able
-# to generate PDF and DVI output from the Perl module output.
-
-PERLMOD_LATEX          = NO
-
-# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be
-# nicely formatted so it can be parsed by a human reader.
-# This is useful
-# if you want to understand what is going on.
-# On the other hand, if this
-# tag is set to NO the size of the Perl module output will be much smaller
-# and Perl will parse it just the same.
-
-PERLMOD_PRETTY         = YES
-
-# The names of the make variables in the generated doxyrules.make file
-# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX.
-# This is useful so different doxyrules.make files included by the same
-# Makefile don't overwrite each other's variables.
-
-PERLMOD_MAKEVAR_PREFIX =
-
-#---------------------------------------------------------------------------
-# Configuration options related to the preprocessor
-#---------------------------------------------------------------------------
-
-# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will
-# evaluate all C-preprocessor directives found in the sources and include
-# files.
-
-ENABLE_PREPROCESSING   = YES
-
-# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro
-# names in the source code. If set to NO (the default) only conditional
-# compilation will be performed. Macro expansion can be done in a controlled
-# way by setting EXPAND_ONLY_PREDEF to YES.
-
-MACRO_EXPANSION        = NO
-
-# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES
-# then the macro expansion is limited to the macros specified with the
-# PREDEFINED and EXPAND_AS_DEFINED tags.
-
-EXPAND_ONLY_PREDEF     = NO
-
-# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files
-# in the INCLUDE_PATH (see below) will be search if a #include is found.
-
-SEARCH_INCLUDES        = YES
-
-# The INCLUDE_PATH tag can be used to specify one or more directories that
-# contain include files that are not input files but should be processed by
-# the preprocessor.
-
-INCLUDE_PATH           =
-
-# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
-# patterns (like *.h and *.hpp) to filter out the header-files in the
-# directories. If left blank, the patterns specified with FILE_PATTERNS will
-# be used.
-
-INCLUDE_FILE_PATTERNS  =
-
-# The PREDEFINED tag can be used to specify one or more macro names that
-# are defined before the preprocessor is started (similar to the -D option of
-# gcc). The argument of the tag is a list of macros of the form: name
-# or name=definition (no spaces). If the definition and the = are
-# omitted =1 is assumed. To prevent a macro definition from being
-# undefined via #undef or recursively expanded use the := operator
-# instead of the = operator.
-
-PREDEFINED             =
-
-# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then
-# this tag can be used to specify a list of macro names that should be expanded.
-# The macro definition that is found in the sources will be used.
-# Use the PREDEFINED tag if you want to use a different macro definition.
-
-EXPAND_AS_DEFINED      =
-
-# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then
-# doxygen's preprocessor will remove all function-like macros that are alone
-# on a line, have an all uppercase name, and do not end with a semicolon. Such
-# function macros are typically used for boiler-plate code, and will confuse
-# the parser if not removed.
-
-SKIP_FUNCTION_MACROS   = YES
-
-#---------------------------------------------------------------------------
-# Configuration::additions related to external references
-#---------------------------------------------------------------------------
-
-# The TAGFILES option can be used to specify one or more tagfiles.
-# Optionally an initial location of the external documentation
-# can be added for each tagfile. The format of a tag file without
-# this location is as follows:
-#
-# TAGFILES = file1 file2 ...
-# Adding location for the tag files is done as follows:
-#
-# TAGFILES = file1=loc1 "file2 = loc2" ...
-# where "loc1" and "loc2" can be relative or absolute paths or
-# URLs. If a location is present for each tag, the installdox tool
-# does not have to be run to correct the links.
-# Note that each tag file must have a unique name
-# (where the name does NOT include the path)
-# If a tag file is not located in the directory in which doxygen
-# is run, you must also specify the path to the tagfile here.
-
-TAGFILES               =
-
-# When a file name is specified after GENERATE_TAGFILE, doxygen will create
-# a tag file that is based on the input files it reads.
-
-GENERATE_TAGFILE       =
-
-# If the ALLEXTERNALS tag is set to YES all external classes will be listed
-# in the class index. If set to NO only the inherited external classes
-# will be listed.
-
-ALLEXTERNALS           = NO
-
-# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed
-# in the modules index. If set to NO, only the current project's groups will
-# be listed.
-
-EXTERNAL_GROUPS        = YES
-
-# The PERL_PATH should be the absolute path and name of the perl script
-# interpreter (i.e. the result of `which perl').
-
-PERL_PATH              = /usr/bin/perl
-
-#---------------------------------------------------------------------------
-# Configuration options related to the dot tool
-#---------------------------------------------------------------------------
-
-# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will
-# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base
-# or super classes. Setting the tag to NO turns the diagrams off. Note that
-# this option is superseded by the HAVE_DOT option below. This is only a
-# fallback. It is recommended to install and use dot, since it yields more
-# powerful graphs.
-
-CLASS_DIAGRAMS         = NO
-
-# You can define message sequence charts within doxygen comments using the \msc
-# command. Doxygen will then run the mscgen tool (see
-# http://www.mcternan.me.uk/mscgen/) to produce the chart and insert it in the
-# documentation. The MSCGEN_PATH tag allows you to specify the directory where
-# the mscgen tool resides. If left empty the tool is assumed to be found in the
-# default search path.
-
-MSCGEN_PATH            =
-
-# If set to YES, the inheritance and collaboration graphs will hide
-# inheritance and usage relations if the target is undocumented
-# or is not a class.
-
-HIDE_UNDOC_RELATIONS   = YES
-
-# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is
-# available from the path. This tool is part of Graphviz, a graph visualization
-# toolkit from AT&T and Lucent Bell Labs. The other options in this section
-# have no effect if this option is set to NO (the default)
-
-HAVE_DOT               = YES
-
-# By default doxygen will write a font called FreeSans.ttf to the output
-# directory and reference it in all dot files that doxygen generates. This
-# font does not include all possible unicode characters however, so when you need
-# these (or just want a differently looking font) you can specify the font name
-# using DOT_FONTNAME. You need need to make sure dot is able to find the font,
-# which can be done by putting it in a standard location or by setting the
-# DOTFONTPATH environment variable or by setting DOT_FONTPATH to the directory
-# containing the font.
-
-DOT_FONTNAME           = FreeSans
-
-# The DOT_FONTSIZE tag can be used to set the size of the font of dot graphs.
-# The default size is 10pt.
-
-DOT_FONTSIZE           = 10
-
-# By default doxygen will tell dot to use the output directory to look for the
-# FreeSans.ttf font (which doxygen will put there itself). If you specify a
-# different font using DOT_FONTNAME you can set the path where dot
-# can find it using this tag.
-
-DOT_FONTPATH           =
-
-# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen
-# will generate a graph for each documented class showing the direct and
-# indirect inheritance relations. Setting this tag to YES will force the
-# the CLASS_DIAGRAMS tag to NO.
-
-CLASS_GRAPH            = YES
-
-# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen
-# will generate a graph for each documented class showing the direct and
-# indirect implementation dependencies (inheritance, containment, and
-# class references variables) of the class with other documented classes.
-
-COLLABORATION_GRAPH    = YES
-
-# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen
-# will generate a graph for groups, showing the direct groups dependencies
-
-GROUP_GRAPHS           = YES
-
-# If the UML_LOOK tag is set to YES doxygen will generate inheritance and
-# collaboration diagrams in a style similar to the OMG's Unified Modeling
-# Language.
-
-UML_LOOK               = NO
-
-# If set to YES, the inheritance and collaboration graphs will show the
-# relations between templates and their instances.
-
-TEMPLATE_RELATIONS     = NO
-
-# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT
-# tags are set to YES then doxygen will generate a graph for each documented
-# file showing the direct and indirect include dependencies of the file with
-# other documented files.
-
-INCLUDE_GRAPH          = YES
-
-# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and
-# HAVE_DOT tags are set to YES then doxygen will generate a graph for each
-# documented header file showing the documented files that directly or
-# indirectly include this file.
-
-INCLUDED_BY_GRAPH      = YES
-
-# If the CALL_GRAPH and HAVE_DOT options are set to YES then
-# doxygen will generate a call dependency graph for every global function
-# or class method. Note that enabling this option will significantly increase
-# the time of a run. So in most cases it will be better to enable call graphs
-# for selected functions only using the \callgraph command.
-
-CALL_GRAPH             = YES
-
-# If the CALLER_GRAPH and HAVE_DOT tags are set to YES then
-# doxygen will generate a caller dependency graph for every global function
-# or class method. Note that enabling this option will significantly increase
-# the time of a run. So in most cases it will be better to enable caller
-# graphs for selected functions only using the \callergraph command.
-
-CALLER_GRAPH           = NO
-
-# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen
-# will graphical hierarchy of all classes instead of a textual one.
-
-GRAPHICAL_HIERARCHY    = YES
-
-# If the DIRECTORY_GRAPH, SHOW_DIRECTORIES and HAVE_DOT tags are set to YES
-# then doxygen will show the dependencies a directory has on other directories
-# in a graphical way. The dependency relations are determined by the #include
-# relations between the files in the directories.
-
-DIRECTORY_GRAPH        = YES
-
-# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
-# generated by dot. Possible values are png, jpg, or gif
-# If left blank png will be used.
-
-DOT_IMAGE_FORMAT       = png
-
-# The tag DOT_PATH can be used to specify the path where the dot tool can be
-# found. If left blank, it is assumed the dot tool can be found in the path.
-
-DOT_PATH               =
-
-# The DOTFILE_DIRS tag can be used to specify one or more directories that
-# contain dot files that are included in the documentation (see the
-# \dotfile command).
-
-DOTFILE_DIRS           =
-
-# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of
-# nodes that will be shown in the graph. If the number of nodes in a graph
-# becomes larger than this value, doxygen will truncate the graph, which is
-# visualized by representing a node as a red box. Note that doxygen if the
-# number of direct children of the root node in a graph is already larger than
-# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note
-# that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
-
-DOT_GRAPH_MAX_NODES    = 50
-
-# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the
-# graphs generated by dot. A depth value of 3 means that only nodes reachable
-# from the root by following a path via at most 3 edges will be shown. Nodes
-# that lay further from the root node will be omitted. Note that setting this
-# option to 1 or 2 may greatly reduce the computation time needed for large
-# code bases. Also note that the size of a graph can be further restricted by
-# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.
-
-MAX_DOT_GRAPH_DEPTH    = 1000
-
-# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent
-# background. This is disabled by default, because dot on Windows does not
-# seem to support this out of the box. Warning: Depending on the platform used,
-# enabling this option may lead to badly anti-aliased labels on the edges of
-# a graph (i.e. they become hard to read).
-
-DOT_TRANSPARENT        = NO
-
-# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output
-# files in one run (i.e. multiple -o and -T options on the command line). This
-# makes dot run faster, but since only newer versions of dot (>1.8.10)
-# support this, this feature is disabled by default.
-
-DOT_MULTI_TARGETS      = NO
-
-# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will
-# generate a legend page explaining the meaning of the various boxes and
-# arrows in the dot generated graphs.
-
-GENERATE_LEGEND        = YES
-
-# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will
-# remove the intermediate dot files that are used to generate
-# the various graphs.
-
-DOT_CLEANUP            = YES
diff --git a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/LookUpTable.h b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/LookUpTable.h
deleted file mode 100644
index f6b06e76b6..0000000000
--- a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/LookUpTable.h
+++ /dev/null
@@ -1,2317 +0,0 @@
-/**
- * @file    LookUpTable.h
- * @author  Thomas Lewiner <thomas.lewiner@polytechnique.org>
- * @author  Math Dept, PUC-Rio
- * @version 0.2
- * @date    12/08/2002
- *
- * @brief   LookUpTable for the MarchingCubes 33 Algorithm
- */
-//________________________________________________
-
-
-
-#pragma once
-
-
-//_____________________________________________________________________________
-/**
- * \brief case mapping
- * For each of the possible vertex states listed in this table there is a
- * specific triangulation of the edge intersection points.  The table lists
- * all of them in the form of 0-5 edge triples with the list terminated by
- * the invalid value -1.  For example: case[3] list the 2 triangles
- * formed when cube[0] and cube[1] are inside of the surface, but the rest of
- * the cube is not.
- *
- * Cube description:
- *         7 ________ 6           _____6__             ________
- *         /|       /|         7/|       /|          /|       /|
- *       /  |     /  |        /  |     /5 |        /  6     /  |
- *   4 /_______ /    |      /__4____ /    10     /_______3/    |
- *    |     |  |5    |     |    11  |     |     |     |  |   2 |
- *    |    3|__|_____|2    |     |__|__2__|     | 4   |__|_____|
- *    |    /   |    /      8   3/   9    /      |    /   |    /
- *    |  /     |  /        |  /     |  /1       |  /     5  /
- *    |/_______|/          |/___0___|/          |/_1_____|/
- *   0          1        0          1
- */
-//-----------------------------------------------------------------------------
-static const char cases[256][2] = {
-/*   0:                          */  {  0, -1 },
-/*   1: 0,                       */  {  1,  0 },
-/*   2:    1,                    */  {  1,  1 },
-/*   3: 0, 1,                    */  {  2,  0 },
-/*   4:       2,                 */  {  1,  2 },
-/*   5: 0,    2,                 */  {  3,  0 },
-/*   6:    1, 2,                 */  {  2,  3 },
-/*   7: 0, 1, 2,                 */  {  5,  0 },
-/*   8:          3,              */  {  1,  3 },
-/*   9: 0,       3,              */  {  2,  1 },
-/*  10:    1,    3,              */  {  3,  3 },
-/*  11: 0, 1,    3,              */  {  5,  1 },
-/*  12:       2, 3,              */  {  2,  5 },
-/*  13: 0,    2, 3,              */  {  5,  4 },
-/*  14:    1, 2, 3,              */  {  5,  9 },
-/*  15: 0, 1, 2, 3,              */  {  8,  0 },
-/*  16:             4,           */  {  1,  4 },
-/*  17: 0,          4,           */  {  2,  2 },
-/*  18:    1,       4,           */  {  3,  4 },
-/*  19: 0, 1,       4,           */  {  5,  2 },
-/*  20:       2,    4,           */  {  4,  2 },
-/*  21: 0,    2,    4,           */  {  6,  2 },
-/*  22:    1, 2,    4,           */  {  6,  9 },
-/*  23: 0, 1, 2,    4,           */  { 11,  0 },
-/*  24:          3, 4,           */  {  3,  8 },
-/*  25: 0,       3, 4,           */  {  5,  5 },
-/*  26:    1,    3, 4,           */  {  7,  3 },
-/*  27: 0, 1,    3, 4,           */  {  9,  1 },
-/*  28:       2, 3, 4,           */  {  6, 16 },
-/*  29: 0,    2, 3, 4,           */  { 14,  3 },
-/*  30:    1, 2, 3, 4,           */  { 12, 12 },
-/*  31: 0, 1, 2, 3, 4,           */  {  5, 24 },
-/*  32:                5,        */  {  1,  5 },
-/*  33: 0,             5,        */  {  3,  1 },
-/*  34:    1,          5,        */  {  2,  4 },
-/*  35: 0, 1,          5,        */  {  5,  3 },
-/*  36:       2,       5,        */  {  3,  6 },
-/*  37: 0,    2,       5,        */  {  7,  0 },
-/*  38:    1, 2,       5,        */  {  5, 10 },
-/*  39: 0, 1, 2,       5,        */  {  9,  0 },
-/*  40:          3,    5,        */  {  4,  3 },
-/*  41: 0,       3,    5,        */  {  6,  4 },
-/*  42:    1,    3,    5,        */  {  6, 11 },
-/*  43: 0, 1,    3,    5,        */  { 14,  1 },
-/*  44:       2, 3,    5,        */  {  6, 17 },
-/*  45: 0,    2, 3,    5,        */  { 12,  4 },
-/*  46:    1, 2, 3,    5,        */  { 11,  6 },
-/*  47: 0, 1, 2, 3,    5,        */  {  5, 25 },
-/*  48:             4, 5,        */  {  2,  8 },
-/*  49: 0,          4, 5,        */  {  5,  7 },
-/*  50:    1,       4, 5,        */  {  5, 12 },
-/*  51: 0, 1,       4, 5,        */  {  8,  1 },
-/*  52:       2,    4, 5,        */  {  6, 18 },
-/*  53: 0,    2,    4, 5,        */  { 12,  5 },
-/*  54:    1, 2,    4, 5,        */  { 14,  7 },
-/*  55: 0, 1, 2,    4, 5,        */  {  5, 28 },
-/*  56:          3, 4, 5,        */  {  6, 21 },
-/*  57: 0,       3, 4, 5,        */  { 11,  4 },
-/*  58:    1,    3, 4, 5,        */  { 12, 15 },
-/*  59: 0, 1,    3, 4, 5,        */  {  5, 30 },
-/*  60:       2, 3, 4, 5,        */  { 10,  5 },
-/*  61: 0,    2, 3, 4, 5,        */  {  6, 32 },
-/*  62:    1, 2, 3, 4, 5,        */  {  6, 39 },
-/*  63: 0, 1, 2, 3, 4, 5,        */  {  2, 12 },
-/*  64:                   6,     */  {  1,  6 },
-/*  65: 0,                6,     */  {  4,  0 },
-/*  66:    1,             6,     */  {  3,  5 },
-/*  67: 0, 1,             6,     */  {  6,  0 },
-/*  68:       2,          6,     */  {  2,  6 },
-/*  69: 0,    2,          6,     */  {  6,  3 },
-/*  70:    1, 2,          6,     */  {  5, 11 },
-/*  71: 0, 1, 2,          6,     */  { 14,  0 },
-/*  72:          3,       6,     */  {  3,  9 },
-/*  73: 0,       3,       6,     */  {  6,  5 },
-/*  74:    1,    3,       6,     */  {  7,  4 },
-/*  75: 0, 1,    3,       6,     */  { 12,  1 },
-/*  76:       2, 3,       6,     */  {  5, 14 },
-/*  77: 0,    2, 3,       6,     */  { 11,  3 },
-/*  78:    1, 2, 3,       6,     */  {  9,  4 },
-/*  79: 0, 1, 2, 3,       6,     */  {  5, 26 },
-/*  80:             4,    6,     */  {  3, 10 },
-/*  81: 0,          4,    6,     */  {  6,  6 },
-/*  82:    1,       4,    6,     */  {  7,  5 },
-/*  83: 0, 1,       4,    6,     */  { 12,  2 },
-/*  84:       2,    4,    6,     */  {  6, 19 },
-/*  85: 0,    2,    4,    6,     */  { 10,  1 },
-/*  86:    1, 2,    4,    6,     */  { 12, 13 },
-/*  87: 0, 1, 2,    4,    6,     */  {  6, 24 },
-/*  88:          3, 4,    6,     */  {  7,  7 },
-/*  89: 0,       3, 4,    6,     */  { 12,  9 },
-/*  90:    1,    3, 4,    6,     */  { 13,  1 },
-/*  91: 0, 1,    3, 4,    6,     */  {  7,  9 },
-/*  92:       2, 3, 4,    6,     */  { 12, 20 },
-/*  93: 0,    2, 3, 4,    6,     */  {  6, 33 },
-/*  94:    1, 2, 3, 4,    6,     */  {  7, 13 },
-/*  95: 0, 1, 2, 3, 4,    6,     */  {  3, 12 },
-/*  96:                5, 6,     */  {  2, 10 },
-/*  97: 0,             5, 6,     */  {  6,  7 },
-/*  98:    1,          5, 6,     */  {  5, 13 },
-/*  99: 0, 1,          5, 6,     */  { 11,  2 },
-/* 100:       2,       5, 6,     */  {  5, 16 },
-/* 101: 0,    2,       5, 6,     */  { 12,  7 },
-/* 102:    1, 2,       5, 6,     */  {  8,  3 },
-/* 103: 0, 1, 2,       5, 6,     */  {  5, 29 },
-/* 104:          3,    5, 6,     */  {  6, 22 },
-/* 105: 0,       3,    5, 6,     */  { 10,  2 },
-/* 106:    1,    3,    5, 6,     */  { 12, 17 },
-/* 107: 0, 1,    3,    5, 6,     */  {  6, 27 },
-/* 108:       2, 3,    5, 6,     */  { 14,  9 },
-/* 109: 0,    2, 3,    5, 6,     */  {  6, 34 },
-/* 110:    1, 2, 3,    5, 6,     */  {  5, 39 },
-/* 111: 0, 1, 2, 3,    5, 6,     */  {  2, 14 },
-/* 112:             4, 5, 6,     */  {  5, 20 },
-/* 113: 0,          4, 5, 6,     */  { 14,  5 },
-/* 114:    1,       4, 5, 6,     */  {  9,  5 },
-/* 115: 0, 1,       4, 5, 6,     */  {  5, 32 },
-/* 116:       2,    4, 5, 6,     */  { 11, 10 },
-/* 117: 0,    2,    4, 5, 6,     */  {  6, 35 },
-/* 118:    1, 2,    4, 5, 6,     */  {  5, 41 },
-/* 119: 0, 1, 2,    4, 5, 6,     */  {  2, 16 },
-/* 120:          3, 4, 5, 6,     */  { 12, 23 },
-/* 121: 0,       3, 4, 5, 6,     */  {  6, 37 },
-/* 122:    1,    3, 4, 5, 6,     */  {  7, 14 },
-/* 123: 0, 1,    3, 4, 5, 6,     */  {  3, 16 },
-/* 124:       2, 3, 4, 5, 6,     */  {  6, 46 },
-/* 125: 0,    2, 3, 4, 5, 6,     */  {  4,  6 },
-/* 126:    1, 2, 3, 4, 5, 6,     */  {  3, 21 },
-/* 127: 0, 1, 2, 3, 4, 5, 6,     */  {  1,  8 },
-/* 128:                      7,  */  {  1,  7 },
-/* 129: 0,                   7,  */  {  3,  2 },
-/* 130:    1,                7,  */  {  4,  1 },
-/* 131: 0, 1,                7,  */  {  6,  1 },
-/* 132:       2,             7,  */  {  3,  7 },
-/* 133: 0,    2,             7,  */  {  7,  1 },
-/* 134:    1, 2,             7,  */  {  6, 10 },
-/* 135: 0, 1, 2,             7,  */  { 12,  0 },
-/* 136:          3,          7,  */  {  2,  7 },
-/* 137: 0,       3,          7,  */  {  5,  6 },
-/* 138:    1,    3,          7,  */  {  6, 12 },
-/* 139: 0, 1,    3,          7,  */  { 11,  1 },
-/* 140:       2, 3,          7,  */  {  5, 15 },
-/* 141: 0,    2, 3,          7,  */  {  9,  2 },
-/* 142:    1, 2, 3,          7,  */  { 14,  6 },
-/* 143: 0, 1, 2, 3,          7,  */  {  5, 27 },
-/* 144:             4,       7,  */  {  2,  9 },
-/* 145: 0,          4,       7,  */  {  5,  8 },
-/* 146:    1,       4,       7,  */  {  6, 13 },
-/* 147: 0, 1,       4,       7,  */  { 14,  2 },
-/* 148:       2,    4,       7,  */  {  6, 20 },
-/* 149: 0,    2,    4,       7,  */  { 12,  6 },
-/* 150:    1, 2,    4,       7,  */  { 10,  3 },
-/* 151: 0, 1, 2,    4,       7,  */  {  6, 25 },
-/* 152:          3, 4,       7,  */  {  5, 18 },
-/* 153: 0,       3, 4,       7,  */  {  8,  2 },
-/* 154:    1,    3, 4,       7,  */  { 12, 16 },
-/* 155: 0, 1,    3, 4,       7,  */  {  5, 31 },
-/* 156:       2, 3, 4,       7,  */  { 11,  9 },
-/* 157: 0,    2, 3, 4,       7,  */  {  5, 34 },
-/* 158:    1, 2, 3, 4,       7,  */  {  6, 40 },
-/* 159: 0, 1, 2, 3, 4,       7,  */  {  2, 13 },
-/* 160:                5,    7,  */  {  3, 11 },
-/* 161: 0,             5,    7,  */  {  7,  2 },
-/* 162:    1,          5,    7,  */  {  6, 14 },
-/* 163: 0, 1,          5,    7,  */  { 12,  3 },
-/* 164:       2,       5,    7,  */  {  7,  6 },
-/* 165: 0,    2,       5,    7,  */  { 13,  0 },
-/* 166:    1, 2,       5,    7,  */  { 12, 14 },
-/* 167: 0, 1, 2,       5,    7,  */  {  7,  8 },
-/* 168:          3,    5,    7,  */  {  6, 23 },
-/* 169: 0,       3,    5,    7,  */  { 12, 10 },
-/* 170:    1,    3,    5,    7,  */  { 10,  4 },
-/* 171: 0, 1,    3,    5,    7,  */  {  6, 28 },
-/* 172:       2, 3,    5,    7,  */  { 12, 21 },
-/* 173: 0,    2, 3,    5,    7,  */  {  7, 10 },
-/* 174:    1, 2, 3,    5,    7,  */  {  6, 41 },
-/* 175: 0, 1, 2, 3,    5,    7,  */  {  3, 13 },
-/* 176:             4, 5,    7,  */  {  5, 21 },
-/* 177: 0,          4, 5,    7,  */  {  9,  3 },
-/* 178:    1,       4, 5,    7,  */  { 11,  8 },
-/* 179: 0, 1,       4, 5,    7,  */  {  5, 33 },
-/* 180:       2,    4, 5,    7,  */  { 12, 22 },
-/* 181: 0,    2,    4, 5,    7,  */  {  7, 11 },
-/* 182:    1, 2,    4, 5,    7,  */  {  6, 42 },
-/* 183: 0, 1, 2,    4, 5,    7,  */  {  3, 14 },
-/* 184:          3, 4, 5,    7,  */  { 14, 11 },
-/* 185: 0,       3, 4, 5,    7,  */  {  5, 36 },
-/* 186:    1,    3, 4, 5,    7,  */  {  6, 44 },
-/* 187: 0, 1,    3, 4, 5,    7,  */  {  2, 17 },
-/* 188:       2, 3, 4, 5,    7,  */  {  6, 47 },
-/* 189: 0,    2, 3, 4, 5,    7,  */  {  3, 18 },
-/* 190:    1, 2, 3, 4, 5,    7,  */  {  4,  7 },
-/* 191: 0, 1, 2, 3, 4, 5,    7,  */  {  1,  9 },
-/* 192:                   6, 7,  */  {  2, 11 },
-/* 193: 0,                6, 7,  */  {  6,  8 },
-/* 194:    1,             6, 7,  */  {  6, 15 },
-/* 195: 0, 1,             6, 7,  */  { 10,  0 },
-/* 196:       2,          6, 7,  */  {  5, 17 },
-/* 197: 0,    2,          6, 7,  */  { 12,  8 },
-/* 198:    1, 2,          6, 7,  */  { 11,  7 },
-/* 199: 0, 1, 2,          6, 7,  */  {  6, 26 },
-/* 200:          3,       6, 7,  */  {  5, 19 },
-/* 201: 0,       3,       6, 7,  */  { 14,  4 },
-/* 202:    1,    3,       6, 7,  */  { 12, 18 },
-/* 203: 0, 1,    3,       6, 7,  */  {  6, 29 },
-/* 204:       2, 3,       6, 7,  */  {  8,  4 },
-/* 205: 0,    2, 3,       6, 7,  */  {  5, 35 },
-/* 206:    1, 2, 3,       6, 7,  */  {  5, 40 },
-/* 207: 0, 1, 2, 3,       6, 7,  */  {  2, 15 },
-/* 208:             4,    6, 7,  */  {  5, 22 },
-/* 209: 0,          4,    6, 7,  */  { 11,  5 },
-/* 210:    1,       4,    6, 7,  */  { 12, 19 },
-/* 211: 0, 1,       4,    6, 7,  */  {  6, 30 },
-/* 212:       2,    4,    6, 7,  */  { 14, 10 },
-/* 213: 0,    2,    4,    6, 7,  */  {  6, 36 },
-/* 214:    1, 2,    4,    6, 7,  */  {  6, 43 },
-/* 215: 0, 1, 2,    4,    6, 7,  */  {  4,  4 },
-/* 216:          3, 4,    6, 7,  */  {  9,  7 },
-/* 217: 0,       3, 4,    6, 7,  */  {  5, 37 },
-/* 218:    1,    3, 4,    6, 7,  */  {  7, 15 },
-/* 219: 0, 1,    3, 4,    6, 7,  */  {  3, 17 },
-/* 220:       2, 3, 4,    6, 7,  */  {  5, 44 },
-/* 221: 0,    2, 3, 4,    6, 7,  */  {  2, 19 },
-/* 222:    1, 2, 3, 4,    6, 7,  */  {  3, 22 },
-/* 223: 0, 1, 2, 3, 4,    6, 7,  */  {  1, 10 },
-/* 224:                5, 6, 7,  */  {  5, 23 },
-/* 225: 0,             5, 6, 7,  */  { 12, 11 },
-/* 226:    1,          5, 6, 7,  */  { 14,  8 },
-/* 227: 0, 1,          5, 6, 7,  */  {  6, 31 },
-/* 228:       2,       5, 6, 7,  */  {  9,  6 },
-/* 229: 0,    2,       5, 6, 7,  */  {  7, 12 },
-/* 230:    1, 2,       5, 6, 7,  */  {  5, 42 },
-/* 231: 0, 1, 2,       5, 6, 7,  */  {  3, 15 },
-/* 232:          3,    5, 6, 7,  */  { 11, 11 },
-/* 233: 0,       3,    5, 6, 7,  */  {  6, 38 },
-/* 234:    1,    3,    5, 6, 7,  */  {  6, 45 },
-/* 235: 0, 1,    3,    5, 6, 7,  */  {  4,  5 },
-/* 236:       2, 3,    5, 6, 7,  */  {  5, 45 },
-/* 237: 0,    2, 3,    5, 6, 7,  */  {  3, 19 },
-/* 238:    1, 2, 3,    5, 6, 7,  */  {  2, 21 },
-/* 239: 0, 1, 2, 3,    5, 6, 7,  */  {  1, 11 },
-/* 240:             4, 5, 6, 7,  */  {  8,  5 },
-/* 241: 0,          4, 5, 6, 7,  */  {  5, 38 },
-/* 242:    1,       4, 5, 6, 7,  */  {  5, 43 },
-/* 243: 0, 1,       4, 5, 6, 7,  */  {  2, 18 },
-/* 244:       2,    4, 5, 6, 7,  */  {  5, 46 },
-/* 245: 0,    2,    4, 5, 6, 7,  */  {  3, 20 },
-/* 246:    1, 2,    4, 5, 6, 7,  */  {  2, 22 },
-/* 247: 0, 1, 2,    4, 5, 6, 7,  */  {  1, 12 },
-/* 248:          3, 4, 5, 6, 7,  */  {  5, 47 },
-/* 249: 0,       3, 4, 5, 6, 7,  */  {  2, 20 },
-/* 250:    1,    3, 4, 5, 6, 7,  */  {  3, 23 },
-/* 251: 0, 1,    3, 4, 5, 6, 7,  */  {  1, 13 },
-/* 252:       2, 3, 4, 5, 6, 7,  */  {  2, 23 },
-/* 253: 0,    2, 3, 4, 5, 6, 7,  */  {  1, 14 },
-/* 254:    1, 2, 3, 4, 5, 6, 7,  */  {  1, 15 },
-/* 255: 0, 1, 2, 3, 4, 5, 6, 7,  */  {  0, -1 }
-};
-//_____________________________________________________________________________
-
-
-//_____________________________________________________________________________
-/**
- * \brief tiling table for case 1
- * For each of the case above, the specific triangulation of the edge
- * intersection points is given.
- * When a case is ambiguous, there is an auxiliary table that contains
- * the face number to test and the tiling table contains the specific
- * triangulations depending on the results
- * A minus sign means to invert the result of the test.
- */
-//-----------------------------------------------------------------------------
-static const char tiling1[16][3] = {
-/*   1: 0,                       */  {  0,  8,  3 },
-/*   2:    1,                    */  {  0,  1,  9 },
-/*   4:       2,                 */  {  1,  2, 10 },
-/*   8:          3,              */  {  3, 11,  2 },
-/*  16:             4,           */  {  4,  7,  8 },
-/*  32:                5,        */  {  9,  5,  4 },
-/*  64:                   6,     */  { 10,  6,  5 },
-/* 128:                      7,  */  {  7,  6, 11 },
-/* 127: 0, 1, 2, 3, 4, 5, 6,     */  {  7, 11,  6 },
-/* 191: 0, 1, 2, 3, 4, 5,    7,  */  { 10,  5,  6 },
-/* 223: 0, 1, 2, 3, 4,    6, 7,  */  {  9,  4,  5 },
-/* 239: 0, 1, 2, 3,    5, 6, 7,  */  {  4,  8,  7 },
-/* 247: 0, 1, 2,    4, 5, 6, 7,  */  {  3,  2, 11 },
-/* 251: 0, 1,    3, 4, 5, 6, 7,  */  {  1, 10,  2 },
-/* 253: 0,    2, 3, 4, 5, 6, 7,  */  {  0,  9,  1 },
-/* 254:    1, 2, 3, 4, 5, 6, 7,  */  {  0,  3,  8 }
-};
-//_____________________________________________________________________________
-
-
-//_____________________________________________________________________________
-/**
- * \brief tiling table for case 2
- * For each of the case above, the specific triangulation of the edge
- * intersection points is given.
- * When a case is ambiguous, there is an auxiliary table that contains
- * the face number to test and the tiling table contains the specific
- * triangulations depending on the results
- * A minus sign means to invert the result of the test.
- */
-//-----------------------------------------------------------------------------
-static const char tiling2[24][6] = {
-/*   3: 0, 1,                    */  {  1,  8,  3,  9,  8,  1 },
-/*   9: 0,       3,              */  {  0, 11,  2,  8, 11,  0 },
-/*  17: 0,          4,           */  {  4,  3,  0,  7,  3,  4 },
-/*   6:    1, 2,                 */  {  9,  2, 10,  0,  2,  9 },
-/*  34:    1,          5,        */  {  0,  5,  4,  1,  5,  0 },
-/*  12:       2, 3,              */  {  3, 10,  1, 11, 10,  3 },
-/*  68:       2,          6,     */  {  1,  6,  5,  2,  6,  1 },
-/* 136:          3,          7,  */  {  7,  2,  3,  6,  2,  7 },
-/*  48:             4, 5,        */  {  9,  7,  8,  5,  7,  9 },
-/* 144:             4,       7,  */  {  6,  8,  4, 11,  8,  6 },
-/*  96:                5, 6,     */  { 10,  4,  9,  6,  4, 10 },
-/* 192:                   6, 7,  */  { 11,  5, 10,  7,  5, 11 },
-/*  63: 0, 1, 2, 3, 4, 5,        */  { 11, 10,  5,  7, 11,  5 },
-/* 159: 0, 1, 2, 3, 4,       7,  */  { 10,  9,  4,  6, 10,  4 },
-/* 111: 0, 1, 2, 3,    5, 6,     */  {  6,  4,  8, 11,  6,  8 },
-/* 207: 0, 1, 2, 3,       6, 7,  */  {  9,  8,  7,  5,  9,  7 },
-/* 119: 0, 1, 2,    4, 5, 6,     */  {  7,  3,  2,  6,  7,  2 },
-/* 187: 0, 1,    3, 4, 5,    7,  */  {  1,  5,  6,  2,  1,  6 },
-/* 243: 0, 1,       4, 5, 6, 7,  */  {  3,  1, 10, 11,  3, 10 },
-/* 221: 0,    2, 3, 4,    6, 7,  */  {  0,  4,  5,  1,  0,  5 },
-/* 249: 0,       3, 4, 5, 6, 7,  */  {  9, 10,  2,  0,  9,  2 },
-/* 238:    1, 2, 3,    5, 6, 7,  */  {  4,  0,  3,  7,  4,  3 },
-/* 246:    1, 2,    4, 5, 6, 7,  */  {  0,  2, 11,  8,  0, 11 },
-/* 252:       2, 3, 4, 5, 6, 7,  */  {  1,  3,  8,  9,  1,  8 }
-};
-//_____________________________________________________________________________
-
-//_____________________________________________________________________________
-/**
- * \brief test table for case 3
- * One face to test
- * When the test on the specified face is positive : 4 first triangles
- * When the test on the specified face is negative : 2 last triangles
- *
- * For each of the case above, the specific triangulation of the edge
- * intersection points is given.
- * When a case is ambiguous, there is an auxiliary table that contains
- * the face number to test and the tiling table contains the specific
- * triangulations depending on the results
- * A minus sign means to invert the result of the test.
- */
-//-----------------------------------------------------------------------------
-static const char test3[24] = {
-/*   5: 0,    2,                 */    5,
-/*  33: 0,             5,        */    1,
-/* 129: 0,                   7,  */    4,
-/*  10:    1,    3,              */    5,
-/*  18:    1,       4,           */    1,
-/*  66:    1,             6,     */    2,
-/*  36:       2,       5,        */    2,
-/* 132:       2,             7,  */    3,
-/*  24:          3, 4,           */    4,
-/*  72:          3,       6,     */    3,
-/*  80:             4,    6,     */    6,
-/* 160:                5,    7,  */    6,
-/*  95: 0, 1, 2, 3, 4,    6,     */   -6,
-/* 175: 0, 1, 2, 3,    5,    7,  */   -6,
-/* 183: 0, 1, 2,    4, 5,    7,  */   -3,
-/* 231: 0, 1, 2,       5, 6, 7,  */   -4,
-/* 123: 0, 1,    3, 4, 5, 6,     */   -3,
-/* 219: 0, 1,    3, 4,    6, 7,  */   -2,
-/* 189: 0,    2, 3, 4, 5,    7,  */   -2,
-/* 237: 0,    2, 3,    5, 6, 7,  */   -1,
-/* 245: 0,    2,    4, 5, 6, 7,  */   -5,
-/* 126:    1, 2, 3, 4, 5, 6,     */   -4,
-/* 222:    1, 2, 3, 4,    6, 7,  */   -1,
-/* 250:    1,    3, 4, 5, 6, 7,  */   -5
-};
-
-//_____________________________________________________________________________
-/**
- * \brief tiling table for case 3.1
- * For each of the case above, the specific triangulation of the edge
- * intersection points is given.
- * When a case is ambiguous, there is an auxiliary table that contains
- * the face number to test and the tiling table contains the specific
- * triangulations depending on the results
- * A minus sign means to invert the result of the test.
- */
-//-----------------------------------------------------------------------------
-static const char tiling3_1[24][6] = {
-/*   5: 0,    2,                 */  {  0,  8,  3,  1,  2, 10 },
-/*  33: 0,             5,        */  {  9,  5,  4,  0,  8,  3 },
-/* 129: 0,                   7,  */  {  3,  0,  8, 11,  7,  6 },
-/*  10:    1,    3,              */  {  1,  9,  0,  2,  3, 11 },
-/*  18:    1,       4,           */  {  0,  1,  9,  8,  4,  7 },
-/*  66:    1,             6,     */  {  9,  0,  1,  5, 10,  6 },
-/*  36:       2,       5,        */  {  1,  2, 10,  9,  5,  4 },
-/* 132:       2,             7,  */  { 10,  1,  2,  6, 11,  7 },
-/*  24:          3, 4,           */  {  8,  4,  7,  3, 11,  2 },
-/*  72:          3,       6,     */  {  2,  3, 11, 10,  6,  5 },
-/*  80:             4,    6,     */  {  5, 10,  6,  4,  7,  8 },
-/* 160:                5,    7,  */  {  4,  9,  5,  7,  6, 11 },
-/*  95: 0, 1, 2, 3, 4,    6,     */  {  5,  9,  4, 11,  6,  7 },
-/* 175: 0, 1, 2, 3,    5,    7,  */  {  6, 10,  5,  8,  7,  4 },
-/* 183: 0, 1, 2,    4, 5,    7,  */  { 11,  3,  2,  5,  6, 10 },
-/* 231: 0, 1, 2,       5, 6, 7,  */  {  7,  4,  8,  2, 11,  3 },
-/* 123: 0, 1,    3, 4, 5, 6,     */  {  2,  1, 10,  7, 11,  6 },
-/* 219: 0, 1,    3, 4,    6, 7,  */  { 10,  2,  1,  4,  5,  9 },
-/* 189: 0,    2, 3, 4, 5,    7,  */  {  1,  0,  9,  6, 10,  5 },
-/* 237: 0,    2, 3,    5, 6, 7,  */  {  9,  1,  0,  7,  4,  8 },
-/* 245: 0,    2,    4, 5, 6, 7,  */  {  0,  9,  1, 11,  3,  2 },
-/* 126:    1, 2, 3, 4, 5, 6,     */  {  8,  0,  3,  6,  7, 11 },
-/* 222:    1, 2, 3, 4,    6, 7,  */  {  4,  5,  9,  3,  8,  0 },
-/* 250:    1,    3, 4, 5, 6, 7,  */  {  3,  8,  0, 10,  2,  1 }
-};
-
-//_____________________________________________________________________________
-/**
- * \brief tiling table for case 3.2
- * For each of the case above, the specific triangulation of the edge
- * intersection points is given.
- * When a case is ambiguous, there is an auxiliary table that contains
- * the face number to test and the tiling table contains the specific
- * triangulations depending on the results
- * A minus sign means to invert the result of the test.
- */
-//-----------------------------------------------------------------------------
-static const char tiling3_2[24][12] = {
-/*   5: 0,    2,                 */  { 10,  3,  2, 10,  8,  3, 10,  1,  0,  8, 10,  0 },
-/*  33: 0,             5,        */  {  3,  4,  8,  3,  5,  4,  3,  0,  9,  5,  3,  9 },
-/* 129: 0,                   7,  */  {  6,  8,  7,  6,  0,  8,  6, 11,  3,  0,  6,  3 },
-/*  10:    1,    3,              */  { 11,  0,  3, 11,  9,  0, 11,  2,  1,  9, 11,  1 },
-/*  18:    1,       4,           */  {  7,  9,  4,  7,  1,  9,  7,  8,  0,  1,  7,  0 },
-/*  66:    1,             6,     */  {  6,  1, 10,  6,  0,  1,  9,  0,  6,  9,  6,  5 },
-/*  36:       2,       5,        */  {  4, 10,  5,  4,  2, 10,  4,  9,  1,  2,  4,  1 },
-/* 132:       2,             7,  */  {  7,  2, 11,  7,  1,  2,  7,  6, 10,  1,  7, 10 },
-/*  24:          3, 4,           */  {  2,  7, 11,  2,  4,  7,  2,  3,  8,  4,  2,  8 },
-/*  72:          3,       6,     */  {  5, 11,  6,  5,  3, 11,  5, 10,  2,  3,  5,  2 },
-/*  80:             4,    6,     */  {  8,  6,  7,  8, 10,  6,  8,  4,  5, 10,  8,  5 },
-/* 160:                5,    7,  */  { 11,  5,  6, 11,  9,  5, 11,  7,  4,  9, 11,  4 },
-/*  95: 0, 1, 2, 3, 4,    6,     */  {  6,  5, 11,  5,  9, 11,  4,  7, 11,  4, 11,  9 },
-/* 175: 0, 1, 2, 3,    5,    7,  */  {  7,  6,  8,  6, 10,  8,  5,  4,  8,  5,  8, 10 },
-/* 183: 0, 1, 2,    4, 5,    7,  */  {  6, 11,  5, 11,  3,  5,  2, 10,  5,  2,  5,  3 },
-/* 231: 0, 1, 2,       5, 6, 7,  */  { 11,  7,  2,  7,  4,  2,  8,  3,  2,  8,  2,  4 },
-/* 123: 0, 1,    3, 4, 5, 6,     */  { 11,  2,  7,  2,  1,  7, 10,  6,  7, 10,  7,  1 },
-/* 219: 0, 1,    3, 4,    6, 7,  */  {  5, 10,  4, 10,  2,  4,  1,  9,  4,  1,  4,  2 },
-/* 189: 0,    2, 3, 4, 5,    7,  */  { 10,  1,  6,  1,  0,  6,  6,  0,  9,  5,  6,  9 },
-/* 237: 0,    2, 3,    5, 6, 7,  */  {  4,  9,  7,  9,  1,  7,  0,  8,  7,  0,  7,  1 },
-/* 245: 0,    2,    4, 5, 6, 7,  */  {  3,  0, 11,  0,  9, 11,  1,  2, 11,  1, 11,  9 },
-/* 126:    1, 2, 3, 4, 5, 6,     */  {  7,  8,  6,  8,  0,  6,  3, 11,  6,  3,  6,  0 },
-/* 222:    1, 2, 3, 4,    6, 7,  */  {  8,  4,  3,  4,  5,  3,  9,  0,  3,  9,  3,  5 },
-/* 250:    1,    3, 4, 5, 6, 7,  */  {  2,  3, 10,  3,  8, 10,  0,  1, 10,  0, 10,  8 }
-};
-//_____________________________________________________________________________
-
-
-
-//_____________________________________________________________________________
-/**
- * \brief test table for case 4
- * Interior to test
- * When the test on the interior is negative : 2 first triangles
- * When the test on the interior is positive : 6 last triangles
- *
- * For each of the case above, the specific triangulation of the edge
- * intersection points is given.
- * When a case is ambiguous, there is an auxiliary table that contains
- * the face number to test and the tiling table contains the specific
- * triangulations depending on the results
- * A minus sign means to invert the result of the test.
- */
-//-----------------------------------------------------------------------------
-static const char test4[8] = {
-/*  65: 0,                6,     */   7,
-/* 130:    1,                7,  */   7,
-/*  20:       2,    4,           */   7,
-/*  40:          3,    5,        */   7,
-/* 215: 0, 1, 2,    4,    6, 7,  */  -7,
-/* 235: 0, 1,    3,    5, 6, 7,  */  -7,
-/* 125: 0,    2, 3, 4, 5, 6,     */  -7,
-/* 190:    1, 2, 3, 4, 5,    7,  */  -7
-};
-
-//_____________________________________________________________________________
-/**
- * \brief tiling table for case 4.1
- * For each of the case above, the specific triangulation of the edge
- * intersection points is given.
- * When a case is ambiguous, there is an auxiliary table that contains
- * the face number to test and the tiling table contains the specific
- * triangulations depending on the results
- * A minus sign means to invert the result of the test.
- */
-//-----------------------------------------------------------------------------
-static const char tiling4_1[8][6] = {
-/*  65: 0,                6,     */  {  0,  8,  3,  5, 10,  6 },
-/* 130:    1,                7,  */  {  0,  1,  9, 11,  7,  6 },
-/*  20:       2,    4,           */  {  1,  2, 10,  8,  4,  7 },
-/*  40:          3,    5,        */  {  9,  5,  4,  2,  3, 11 },
-/* 215: 0, 1, 2,    4,    6, 7,  */  {  4,  5,  9, 11,  3,  2 },
-/* 235: 0, 1,    3,    5, 6, 7,  */  { 10,  2,  1,  7,  4,  8 },
-/* 125: 0,    2, 3, 4, 5, 6,     */  {  9,  1,  0,  6,  7, 11 },
-/* 190:    1, 2, 3, 4, 5,    7,  */  {  3,  8,  0,  6, 10,  5 }
-};
-
-//_____________________________________________________________________________
-/**
- * \brief tiling table for case 4.2
- * For each of the case above, the specific triangulation of the edge
- * intersection points is given.
- * When a case is ambiguous, there is an auxiliary table that contains
- * the face number to test and the tiling table contains the specific
- * triangulations depending on the results
- * A minus sign means to invert the result of the test.
- */
-//-----------------------------------------------------------------------------
-static const char tiling4_2[8][18] = {
-/*  65: 0,                6,     */  {  8,  5,  0,  5,  8,  6,  3,  6,  8,  6,  3, 10,  0, 10,  3, 10,  0,  5 },
-/* 130:    1,                7,  */  {  9,  6,  1,  6,  9,  7,  0,  7,  9,  7,  0, 11,  1, 11,  0, 11,  1,  6 },
-/*  20:       2,    4,           */  { 10,  7,  2,  7, 10,  4,  1,  4, 10,  4,  1,  8,  2,  8,  1,  8,  2,  7 },
-/*  40:          3,    5,        */  { 11,  4,  3,  4, 11,  5,  2,  5, 11,  5,  2,  9,  3,  9,  2,  9,  3,  4 },
-/* 215: 0, 1, 2,    4,    6, 7,  */  {  3,  4, 11,  5, 11,  4, 11,  5,  2,  9,  2,  5,  2,  9,  3,  4,  3,  9 },
-/* 235: 0, 1,    3,    5, 6, 7,  */  {  2,  7, 10,  4, 10,  7, 10,  4,  1,  8,  1,  4,  1,  8,  2,  7,  2,  8 },
-/* 125: 0,    2, 3, 4, 5, 6,     */  {  1,  6,  9,  7,  9,  6,  9,  7,  0, 11,  0,  7,  0, 11,  1,  6,  1, 11 },
-/* 190:    1, 2, 3, 4, 5,    7,  */  {  0,  5,  8,  6,  8,  5,  8,  6,  3, 10,  3,  6,  3, 10,  0,  5,  0, 10 }
-};
-//_____________________________________________________________________________
-
-
-//_____________________________________________________________________________
-/**
- * \brief tiling table for case 5
- * For each of the case above, the specific triangulation of the edge
- * intersection points is given.
- * When a case is ambiguous, there is an auxiliary table that contains
- * the face number to test and the tiling table contains the specific
- * triangulations depending on the results
- * A minus sign means to invert the result of the test.
- */
-//-----------------------------------------------------------------------------
-static const char tiling5[48][9] = {
-/*   7: 0, 1, 2,                 */  {  2,  8,  3,  2, 10,  8, 10,  9,  8 },
-/*  11: 0, 1,    3,              */  {  1, 11,  2,  1,  9, 11,  9,  8, 11 },
-/*  19: 0, 1,       4,           */  {  4,  1,  9,  4,  7,  1,  7,  3,  1 },
-/*  35: 0, 1,          5,        */  {  8,  5,  4,  8,  3,  5,  3,  1,  5 },
-/*  13: 0,    2, 3,              */  {  0, 10,  1,  0,  8, 10,  8, 11, 10 },
-/*  25: 0,       3, 4,           */  { 11,  4,  7, 11,  2,  4,  2,  0,  4 },
-/* 137: 0,       3,          7,  */  {  7,  0,  8,  7,  6,  0,  6,  2,  0 },
-/*  49: 0,          4, 5,        */  {  9,  3,  0,  9,  5,  3,  5,  7,  3 },
-/* 145: 0,          4,       7,  */  {  3,  6, 11,  3,  0,  6,  0,  4,  6 },
-/*  14:    1, 2, 3,              */  {  3,  9,  0,  3, 11,  9, 11, 10,  9 },
-/*  38:    1, 2,       5,        */  {  5,  2, 10,  5,  4,  2,  4,  0,  2 },
-/*  70:    1, 2,          6,     */  {  9,  6,  5,  9,  0,  6,  0,  2,  6 },
-/*  50:    1,       4, 5,        */  {  0,  7,  8,  0,  1,  7,  1,  5,  7 },
-/*  98:    1,          5, 6,     */  { 10,  0,  1, 10,  6,  0,  6,  4,  0 },
-/*  76:       2, 3,       6,     */  {  6,  3, 11,  6,  5,  3,  5,  1,  3 },
-/* 140:       2, 3,          7,  */  { 10,  7,  6, 10,  1,  7,  1,  3,  7 },
-/* 100:       2,       5, 6,     */  {  1,  4,  9,  1,  2,  4,  2,  6,  4 },
-/* 196:       2,          6, 7,  */  { 11,  1,  2, 11,  7,  1,  7,  5,  1 },
-/* 152:          3, 4,       7,  */  {  8,  2,  3,  8,  4,  2,  4,  6,  2 },
-/* 200:          3,       6, 7,  */  {  2,  5, 10,  2,  3,  5,  3,  7,  5 },
-/* 112:             4, 5, 6,     */  {  7, 10,  6,  7,  8, 10,  8,  9, 10 },
-/* 176:             4, 5,    7,  */  {  6,  9,  5,  6, 11,  9, 11,  8,  9 },
-/* 208:             4,    6, 7,  */  {  5,  8,  4,  5, 10,  8, 10, 11,  8 },
-/* 224:                5, 6, 7,  */  {  4, 11,  7,  4,  9, 11,  9, 10, 11 },
-/*  31: 0, 1, 2, 3, 4,           */  {  4,  7, 11,  4, 11,  9,  9, 11, 10 },
-/*  47: 0, 1, 2, 3,    5,        */  {  5,  4,  8,  5,  8, 10, 10,  8, 11 },
-/*  79: 0, 1, 2, 3,       6,     */  {  6,  5,  9,  6,  9, 11, 11,  9,  8 },
-/* 143: 0, 1, 2, 3,          7,  */  {  7,  6, 10,  7, 10,  8,  8, 10,  9 },
-/*  55: 0, 1, 2,    4, 5,        */  {  2, 10,  5,  2,  5,  3,  3,  5,  7 },
-/* 103: 0, 1, 2,       5, 6,     */  {  8,  3,  2,  8,  2,  4,  4,  2,  6 },
-/*  59: 0, 1,    3, 4, 5,        */  { 11,  2,  1, 11,  1,  7,  7,  1,  5 },
-/* 155: 0, 1,    3, 4,       7,  */  {  1,  9,  4,  1,  4,  2,  2,  4,  6 },
-/* 115: 0, 1,       4, 5, 6,     */  { 10,  6,  7, 10,  7,  1,  1,  7,  3 },
-/* 179: 0, 1,       4, 5,    7,  */  {  6, 11,  3,  6,  3,  5,  5,  3,  1 },
-/* 157: 0,    2, 3, 4,       7,  */  { 10,  1,  0, 10,  0,  6,  6,  0,  4 },
-/* 205: 0,    2, 3,       6, 7,  */  {  0,  8,  7,  0,  7,  1,  1,  7,  5 },
-/* 185: 0,       3, 4, 5,    7,  */  {  9,  5,  6,  9,  6,  0,  0,  6,  2 },
-/* 217: 0,       3, 4,    6, 7,  */  {  5, 10,  2,  5,  2,  4,  4,  2,  0 },
-/* 241: 0,          4, 5, 6, 7,  */  {  3,  0,  9,  3,  9, 11, 11,  9, 10 },
-/* 110:    1, 2, 3,    5, 6,     */  {  3, 11,  6,  3,  6,  0,  0,  6,  4 },
-/* 206:    1, 2, 3,       6, 7,  */  {  9,  0,  3,  9,  3,  5,  5,  3,  7 },
-/* 118:    1, 2,    4, 5, 6,     */  {  7,  8,  0,  7,  0,  6,  6,  0,  2 },
-/* 230:    1, 2,       5, 6, 7,  */  { 11,  7,  4, 11,  4,  2,  2,  4,  0 },
-/* 242:    1,       4, 5, 6, 7,  */  {  0,  1, 10,  0, 10,  8,  8, 10, 11 },
-/* 220:       2, 3, 4,    6, 7,  */  {  8,  4,  5,  8,  5,  3,  3,  5,  1 },
-/* 236:       2, 3,    5, 6, 7,  */  {  4,  9,  1,  4,  1,  7,  7,  1,  3 },
-/* 244:       2,    4, 5, 6, 7,  */  {  1,  2, 11,  1, 11,  9,  9, 11,  8 },
-/* 248:          3, 4, 5, 6, 7,  */  {  2,  3,  8,  2,  8, 10, 10,  8,  9 }
-};
-//_____________________________________________________________________________
-
-
-//_____________________________________________________________________________
-/**
- * \brief test table for case 6
- * 1 face to test + eventually the interior
- * When the test on the specified face is positive : 5 first triangles
- * When the test on the specified face is negative :
- * - if the test on the interior is negative : 3 middle triangles
- * - if the test on the interior is positive : 8 last triangles
- * The support edge for the interior test is marked as the 3rd column.
- *
- * For each of the case above, the specific triangulation of the edge
- * intersection points is given.
- * When a case is ambiguous, there is an auxiliary table that contains
- * the face number to test and the tiling table contains the specific
- * triangulations depending on the results
- * A minus sign means to invert the result of the test.
- */
-//-----------------------------------------------------------------------------
-static const char test6[48][3] = {
-/*  67: 0, 1,             6,     */  {  2,  7,  10  },
-/* 131: 0, 1,                7,  */  {  4,  7,  11  },
-/*  21: 0,    2,    4,           */  {  5,  7,   1  },
-/*  69: 0,    2,          6,     */  {  5,  7,   3  },
-/*  41: 0,       3,    5,        */  {  1,  7,   9  },
-/*  73: 0,       3,       6,     */  {  3,  7,  10  },
-/*  81: 0,          4,    6,     */  {  6,  7,   5  },
-/*  97: 0,             5, 6,     */  {  1,  7,   8  },
-/* 193: 0,                6, 7,  */  {  4,  7,   8  },
-/*  22:    1, 2,    4,           */  {  1,  7,   8  },
-/* 134:    1, 2,             7,  */  {  3,  7,  11  },
-/*  42:    1,    3,    5,        */  {  5,  7,   2  },
-/* 138:    1,    3,          7,  */  {  5,  7,   0  },
-/* 146:    1,       4,       7,  */  {  1,  7,   9  },
-/* 162:    1,          5,    7,  */  {  6,  7,   6  },
-/* 194:    1,             6, 7,  */  {  2,  7,   9  },
-/*  28:       2, 3, 4,           */  {  4,  7,   8  },
-/*  44:       2, 3,    5,        */  {  2,  7,   9  },
-/*  52:       2,    4, 5,        */  {  2,  7,  10  },
-/*  84:       2,    4,    6,     */  {  6,  7,   7  },
-/* 148:       2,    4,       7,  */  {  3,  7,  10  },
-/*  56:          3, 4, 5,        */  {  4,  7,  11  },
-/* 104:          3,    5, 6,     */  {  3,  7,  11  },
-/* 168:          3,    5,    7,  */  {  6,  7,   4  },
-/*  87: 0, 1, 2,    4,    6,     */  { -6, -7,   4  },
-/* 151: 0, 1, 2,    4,       7,  */  { -3, -7,  11  },
-/* 199: 0, 1, 2,          6, 7,  */  { -4, -7,  11  },
-/* 107: 0, 1,    3,    5, 6,     */  { -3, -7,  10  },
-/* 171: 0, 1,    3,    5,    7,  */  { -6, -7,   7  },
-/* 203: 0, 1,    3,       6, 7,  */  { -2, -7,  10  },
-/* 211: 0, 1,       4,    6, 7,  */  { -2, -7,   9  },
-/* 227: 0, 1,          5, 6, 7,  */  { -4, -7,   8  },
-/*  61: 0,    2, 3, 4, 5,        */  { -2, -7,   9  },
-/*  93: 0,    2, 3, 4,    6,     */  { -6, -7,   6  },
-/* 109: 0,    2, 3,    5, 6,     */  { -1, -7,   9  },
-/* 117: 0,    2,    4, 5, 6,     */  { -5, -7,   0  },
-/* 213: 0,    2,    4,    6, 7,  */  { -5, -7,   2  },
-/* 121: 0,       3, 4, 5, 6,     */  { -3, -7,  11  },
-/* 233: 0,       3,    5, 6, 7,  */  { -1, -7,   8  },
-/*  62:    1, 2, 3, 4, 5,        */  { -4, -7,   8  },
-/* 158:    1, 2, 3, 4,       7,  */  { -1, -7,   8  },
-/* 174:    1, 2, 3,    5,    7,  */  { -6, -7,   5  },
-/* 182:    1, 2,    4, 5,    7,  */  { -3, -7,  10  },
-/* 214:    1, 2,    4,    6, 7,  */  { -1, -7,   9  },
-/* 186:    1,    3, 4, 5,    7,  */  { -5, -7,   3  },
-/* 234:    1,    3,    5, 6, 7,  */  { -5, -7,   1  },
-/* 124:       2, 3, 4, 5, 6,     */  { -4, -7,  11  },
-/* 188:       2, 3, 4, 5,    7,  */  { -2, -7,  10  }
-};
-
-//_____________________________________________________________________________
-/**
- * \brief tiling table for case 6.1.1
- * For each of the case above, the specific triangulation of the edge
- * intersection points is given.
- * When a case is ambiguous, there is an auxiliary table that contains
- * the face number to test and the tiling table contains the specific
- * triangulations depending on the results
- * A minus sign means to invert the result of the test.
- */
-//-----------------------------------------------------------------------------
-static const char tiling6_1_1[48][9] = {
-/*  67: 0, 1,             6,     */  {  6,  5, 10,  3,  1,  8,  9,  8,  1 },
-/* 131: 0, 1,                7,  */  { 11,  7,  6,  9,  3,  1,  3,  9,  8 },
-/*  21: 0,    2,    4,           */  {  1,  2, 10,  7,  0,  4,  0,  7,  3 },
-/*  69: 0,    2,          6,     */  {  3,  0,  8,  5,  2,  6,  2,  5,  1 },
-/*  41: 0,       3,    5,        */  {  5,  4,  9,  2,  0, 11,  8, 11,  0 },
-/*  73: 0,       3,       6,     */  { 10,  6,  5,  8,  2,  0,  2,  8, 11 },
-/*  81: 0,          4,    6,     */  { 10,  6,  5,  0,  4,  3,  7,  3,  4 },
-/*  97: 0,             5, 6,     */  {  3,  0,  8,  6,  4, 10,  9, 10,  4 },
-/* 193: 0,                6, 7,  */  {  8,  3,  0, 10,  7,  5,  7, 10, 11 },
-/*  22:    1, 2,    4,           */  {  8,  4,  7, 10,  0,  2,  0, 10,  9 },
-/* 134:    1, 2,             7,  */  {  7,  6, 11,  0,  2,  9, 10,  9,  2 },
-/*  42:    1,    3,    5,        */  {  2,  3, 11,  4,  1,  5,  1,  4,  0 },
-/* 138:    1,    3,          7,  */  {  0,  1,  9,  6,  3,  7,  3,  6,  2 },
-/* 146:    1,       4,       7,  */  {  9,  0,  1, 11,  4,  6,  4, 11,  8 },
-/* 162:    1,          5,    7,  */  { 11,  7,  6,  1,  5,  0,  4,  0,  5 },
-/* 194:    1,             6, 7,  */  {  0,  1,  9,  7,  5, 11, 10, 11,  5 },
-/*  28:       2, 3, 4,           */  {  4,  7,  8,  1,  3, 10, 11, 10,  3 },
-/*  44:       2, 3,    5,        */  {  9,  5,  4, 11,  1,  3,  1, 11, 10 },
-/*  52:       2,    4, 5,        */  { 10,  1,  2,  8,  5,  7,  5,  8,  9 },
-/*  84:       2,    4,    6,     */  {  8,  4,  7,  2,  6,  1,  5,  1,  6 },
-/* 148:       2,    4,       7,  */  {  1,  2, 10,  4,  6,  8, 11,  8,  6 },
-/*  56:          3, 4, 5,        */  {  2,  3, 11,  5,  7,  9,  8,  9,  7 },
-/* 104:          3,    5, 6,     */  { 11,  2,  3,  9,  6,  4,  6,  9, 10 },
-/* 168:          3,    5,    7,  */  {  9,  5,  4,  3,  7,  2,  6,  2,  7 },
-/*  87: 0, 1, 2,    4,    6,     */  {  4,  5,  9,  2,  7,  3,  7,  2,  6 },
-/* 151: 0, 1, 2,    4,       7,  */  {  3,  2, 11,  4,  6,  9, 10,  9,  6 },
-/* 199: 0, 1, 2,          6, 7,  */  { 11,  3,  2,  9,  7,  5,  7,  9,  8 },
-/* 107: 0, 1,    3,    5, 6,     */  { 10,  2,  1,  8,  6,  4,  6,  8, 11 },
-/* 171: 0, 1,    3,    5,    7,  */  {  7,  4,  8,  1,  6,  2,  6,  1,  5 },
-/* 203: 0, 1,    3,       6, 7,  */  {  2,  1, 10,  7,  5,  8,  9,  8,  5 },
-/* 211: 0, 1,       4,    6, 7,  */  {  4,  5,  9,  3,  1, 11, 10, 11,  1 },
-/* 227: 0, 1,          5, 6, 7,  */  {  8,  7,  4, 10,  3,  1,  3, 10, 11 },
-/*  61: 0,    2, 3, 4, 5,        */  {  9,  1,  0, 11,  5,  7,  5, 11, 10 },
-/*  93: 0,    2, 3, 4,    6,     */  {  6,  7, 11,  0,  5,  1,  5,  0,  4 },
-/* 109: 0,    2, 3,    5, 6,     */  {  1,  0,  9,  6,  4, 11,  8, 11,  4 },
-/* 117: 0,    2,    4, 5, 6,     */  {  9,  1,  0,  7,  3,  6,  2,  6,  3 },
-/* 213: 0,    2,    4,    6, 7,  */  { 11,  3,  2,  5,  1,  4,  0,  4,  1 },
-/* 121: 0,       3, 4, 5, 6,     */  { 11,  6,  7,  9,  2,  0,  2,  9, 10 },
-/* 233: 0,       3,    5, 6, 7,  */  {  7,  4,  8,  2,  0, 10,  9, 10,  0 },
-/*  62:    1, 2, 3, 4, 5,        */  {  0,  3,  8,  5,  7, 10, 11, 10,  7 },
-/* 158:    1, 2, 3, 4,       7,  */  {  8,  0,  3, 10,  4,  6,  4, 10,  9 },
-/* 174:    1, 2, 3,    5,    7,  */  {  5,  6, 10,  3,  4,  0,  4,  3,  7 },
-/* 182:    1, 2,    4, 5,    7,  */  {  5,  6, 10,  0,  2,  8, 11,  8,  2 },
-/* 214:    1, 2,    4,    6, 7,  */  {  9,  4,  5, 11,  0,  2,  0, 11,  8 },
-/* 186:    1,    3, 4, 5,    7,  */  {  8,  0,  3,  6,  2,  5,  1,  5,  2 },
-/* 234:    1,    3,    5, 6, 7,  */  { 10,  2,  1,  4,  0,  7,  3,  7,  0 },
-/* 124:       2, 3, 4, 5, 6,     */  {  6,  7, 11,  1,  3,  9,  8,  9,  3 },
-/* 188:       2, 3, 4, 5,    7,  */  { 10,  5,  6,  8,  1,  3,  1,  8,  9 }
-};
-
-//_____________________________________________________________________________
-/**
- * \brief tiling table for case 6.1.2
- * For each of the case above, the specific triangulation of the edge
- * intersection points is given.
- * When a case is ambiguous, there is an auxiliary table that contains
- * the face number to test and the tiling table contains the specific
- * triangulations depending on the results
- * A minus sign means to invert the result of the test.
- */
-//-----------------------------------------------------------------------------
-static const char tiling6_1_2[48][27] = {
-  /*  67: 0, 1,             6,     */ {  1, 12,  3,   12, 10,  3,    6,  3, 10,    3,  6,  8,    5,  8,  6,    8,  5, 12,   12,  9,  8,    1,  9, 12,   12,  5, 10  },
-  /* 131: 0, 1,                7,  */ {  1, 12,  3,    1, 11, 12,   11,  1,  6,    9,  6,  1,    6,  9,  7,   12,  7,  9,    9,  8, 12,   12,  8,  3,   11,  7, 12  },
-  /*  21: 0,    2,    4,           */ {  4, 12,  0,    4,  1, 12,    1,  4, 10,    7, 10,  4,   10,  7,  2,   12,  2,  7,    7,  3, 12,   12,  3,  0,    1,  2, 12  },
-  /*  69: 0,    2,          6,     */ {  6, 12,  2,    6,  3, 12,    3,  6,  8,    5,  8,  6,    8,  5,  0,   12,  0,  5,    5,  1, 12,   12,  1,  2,    3,  0, 12  },
-  /*  41: 0,       3,    5,        */ {  0, 12,  2,   12,  9,  2,    5,  2,  9,    2,  5, 11,    4, 11,  5,   11,  4, 12,   12,  8, 11,    0,  8, 12,   12,  4,  9  },
-  /*  73: 0,       3,       6,     */ {  0, 12,  2,    0, 10, 12,   10,  0,  5,    8,  5,  0,    5,  8,  6,   12,  6,  8,    8, 11, 12,   12, 11,  2,   10,  6, 12  },
-  /*  81: 0,          4,    6,     */ {  4, 12,  0,   12,  5,  0,   10,  0,  5,    0, 10,  3,    6,  3, 10,    3,  6, 12,   12,  7,  3,    4,  7, 12,   12,  6,  5  },
-  /*  97: 0,             5, 6,     */ {  4, 12,  6,   12,  8,  6,    3,  6,  8,    6,  3, 10,    0, 10,  3,   10,  0, 12,   12,  9, 10,    4,  9, 12,   12,  0,  8  },
-  /* 193: 0,                6, 7,  */ {  5, 12,  7,    5,  8, 12,    8,  5,  0,   10,  0,  5,    0, 10,  3,   12,  3, 10,   10, 11, 12,   12, 11,  7,    8,  3, 12  },
-  /*  22:    1, 2,    4,           */ {  2, 12,  0,    2,  8, 12,    8,  2,  7,   10,  7,  2,    7, 10,  4,   12,  4, 10,   10,  9, 12,   12,  9,  0,    8,  4, 12  },
-  /* 134:    1, 2,             7,  */ {  2, 12,  0,   12, 11,  0,    7,  0, 11,    0,  7,  9,    6,  9,  7,    9,  6, 12,   12, 10,  9,    2, 10, 12,   12,  6, 11  },
-  /*  42:    1,    3,    5,        */ {  5, 12,  1,    5,  2, 12,    2,  5, 11,    4, 11,  5,   11,  4,  3,   12,  3,  4,    4,  0, 12,   12,  0,  1,    2,  3, 12  },
-  /* 138:    1,    3,          7,  */ {  7, 12,  3,    7,  0, 12,    0,  7,  9,    6,  9,  7,    9,  6,  1,   12,  1,  6,    6,  2, 12,   12,  2,  3,    0,  1, 12  },
-  /* 146:    1,       4,       7,  */ {  6, 12,  4,    6,  9, 12,    9,  6,  1,   11,  1,  6,    1, 11,  0,   12,  0, 11,   11,  8, 12,   12,  8,  4,    9,  0, 12  },
-  /* 162:    1,          5,    7,  */ {  5, 12,  1,   12,  6,  1,   11,  1,  6,    1, 11,  0,    7,  0, 11,    0,  7, 12,   12,  4,  0,    5,  4, 12,   12,  7,  6  },
-  /* 194:    1,             6, 7,  */ {  5, 12,  7,   12,  9,  7,    0,  7,  9,    7,  0, 11,    1, 11,  0,   11,  1, 12,   12, 10, 11,    5, 10, 12,   12,  1,  9  },
-  /*  28:       2, 3, 4,           */ {  3, 12,  1,   12,  8,  1,    4,  1,  8,    1,  4, 10,    7, 10,  4,   10,  7, 12,   12, 11, 10,    3, 11, 12,   12,  7,  8  },
-  /*  44:       2, 3,    5,        */ {  3, 12,  1,    3,  9, 12,    9,  3,  4,   11,  4,  3,    4, 11,  5,   12,  5, 11,   11, 10, 12,   12, 10,  1,    9,  5, 12  },
-  /*  52:       2,    4, 5,        */ {  7, 12,  5,    7, 10, 12,   10,  7,  2,    8,  2,  7,    2,  8,  1,   12,  1,  8,    8,  9, 12,   12,  9,  5,   10,  1, 12  },
-  /*  84:       2,    4,    6,     */ {  6, 12,  2,   12,  7,  2,    8,  2,  7,    2,  8,  1,    4,  1,  8,    1,  4, 12,   12,  5,  1,    6,  5, 12,   12,  4,  7  },
-  /* 148:       2,    4,       7,  */ {  6, 12,  4,   12, 10,  4,    1,  4, 10,    4,  1,  8,    2,  8,  1,    8,  2, 12,   12, 11,  8,    6, 11, 12,   12,  2, 10  },
-  /*  56:          3, 4, 5,        */ {  7, 12,  5,   12, 11,  5,    2,  5, 11,    5,  2,  9,    3,  9,  2,    9,  3, 12,   12,  8,  9,    7,  8, 12,   12,  3, 11  },
-  /* 104:          3,    5, 6,     */ {  4, 12,  6,    4, 11, 12,   11,  4,  3,    9,  3,  4,    3,  9,  2,   12,  2,  9,    9, 10, 12,   12, 10,  6,   11,  2, 12  },
-  /* 168:          3,    5,    7,  */ {  7, 12,  3,   12,  4,  3,    9,  3,  4,    3,  9,  2,    5,  2,  9,    2,  5, 12,   12,  6,  2,    7,  6, 12,   12,  5,  4  },
-  /*  87: 0, 1, 2,    4,    6,     */ {  3, 12,  7,    3,  4, 12,    4,  3,  9,    2,  9,  3,    9,  2,  5,   12,  5,  2,    2,  6, 12,   12,  6,  7,    4,  5, 12  },
-  /* 151: 0, 1, 2,    4,       7,  */ {  6, 12,  4,   12, 11,  4,    3,  4, 11,    4,  3,  9,    2,  9,  3,    9,  2, 12,   12, 10,  9,    6, 10, 12,   12,  2, 11  },
-  /* 199: 0, 1, 2,          6, 7,  */ {  5, 12,  7,    5, 11, 12,   11,  5,  2,    9,  2,  5,    2,  9,  3,   12,  3,  9,    9,  8, 12,   12,  8,  7,   11,  3, 12  },
-  /* 107: 0, 1,    3,    5, 6,     */ {  4, 12,  6,    4, 10, 12,   10,  4,  1,    8,  1,  4,    1,  8,  2,   12,  2,  8,    8, 11, 12,   12, 11,  6,   10,  2, 12  },
-  /* 171: 0, 1,    3,    5,    7,  */ {  2, 12,  6,    2,  7, 12,    7,  2,  8,    1,  8,  2,    8,  1,  4,   12,  4,  1,    1,  5, 12,   12,  5,  6,    7,  4, 12  },
-  /* 203: 0, 1,    3,       6, 7,  */ {  5, 12,  7,   12, 10,  7,    2,  7, 10,    7,  2,  8,    1,  8,  2,    8,  1, 12,   12,  9,  8,    5,  9, 12,   12,  1, 10  },
-  /* 211: 0, 1,       4,    6, 7,  */ {  1, 12,  3,   12,  9,  3,    4,  3,  9,    3,  4, 11,    5, 11,  4,   11,  5, 12,   12, 10, 11,    1, 10, 12,   12,  5,  9  },
-  /* 227: 0, 1,          5, 6, 7,  */ {  1, 12,  3,    1,  8, 12,    8,  1,  4,   10,  4,  1,    4, 10,  7,   12,  7, 10,   10, 11, 12,   12, 11,  3,    8,  7, 12  },
-  /*  61: 0,    2, 3, 4, 5,        */ {  7, 12,  5,    7,  9, 12,    9,  7,  0,   11,  0,  7,    0, 11,  1,   12,  1, 11,   11, 10, 12,   12, 10,  5,    9,  1, 12  },
-  /*  93: 0,    2, 3, 4,    6,     */ {  1, 12,  5,    1,  6, 12,    6,  1, 11,    0, 11,  1,   11,  0,  7,   12,  7,  0,    0,  4, 12,   12,  4,  5,    6,  7, 12  },
-  /* 109: 0,    2, 3,    5, 6,     */ {  4, 12,  6,   12,  9,  6,    1,  6,  9,    6,  1, 11,    0, 11,  1,   11,  0, 12,   12,  8, 11,    4,  8, 12,   12,  0,  9  },
-  /* 117: 0,    2,    4, 5, 6,     */ {  3, 12,  7,   12,  0,  7,    9,  7,  0,    7,  9,  6,    1,  6,  9,    6,  1, 12,   12,  2,  6,    3,  2, 12,   12,  1,  0  },
-  /* 213: 0,    2,    4,    6, 7,  */ {  1, 12,  5,   12,  2,  5,   11,  5,  2,    5, 11,  4,    3,  4, 11,    4,  3, 12,   12,  0,  4,    1,  0, 12,   12,  3,  2  },
-  /* 121: 0,       3, 4, 5, 6,     */ {  0, 12,  2,    0, 11, 12,   11,  0,  7,    9,  7,  0,    7,  9,  6,   12,  6,  9,    9, 10, 12,   12, 10,  2,   11,  6, 12  },
-  /* 233: 0,       3,    5, 6, 7,  */ {  0, 12,  2,   12,  8,  2,    7,  2,  8,    2,  7, 10,    4, 10,  7,   10,  4, 12,   12,  9, 10,    0,  9, 12,   12,  4,  8  },
-  /*  62:    1, 2, 3, 4, 5,        */ {  7, 12,  5,   12,  8,  5,    0,  5,  8,    5,  0, 10,    3, 10,  0,   10,  3, 12,   12, 11, 10,    7, 11, 12,   12,  3,  8  },
-  /* 158:    1, 2, 3, 4,       7,  */ {  6, 12,  4,    6,  8, 12,    8,  6,  3,   10,  3,  6,    3, 10,  0,   12,  0, 10,   10,  9, 12,   12,  9,  4,    8,  0, 12  },
-  /* 174:    1, 2, 3,    5,    7,  */ {  0, 12,  4,    0,  5, 12,    5,  0, 10,    3, 10,  0,   10,  3,  6,   12,  6,  3,    3,  7, 12,   12,  7,  4,    5,  6, 12  },
-  /* 182:    1, 2,    4, 5,    7,  */ {  2, 12,  0,   12, 10,  0,    5,  0, 10,    0,  5,  8,    6,  8,  5,    8,  6, 12,   12, 11,  8,    2, 11, 12,   12,  6, 10  },
-  /* 214:    1, 2,    4,    6, 7,  */ {  2, 12,  0,    2,  9, 12,    9,  2,  5,   11,  5,  2,    5, 11,  4,   12,  4, 11,   11,  8, 12,   12,  8,  0,    9,  4, 12  },
-  /* 186:    1,    3, 4, 5,    7,  */ {  2, 12,  6,   12,  3,  6,    8,  6,  3,    6,  8,  5,    0,  5,  8,    5,  0, 12,   12,  1,  5,    2,  1, 12,   12,  0,  3  },
-  /* 234:    1,    3,    5, 6, 7,  */ {  0, 12,  4,   12,  1,  4,   10,  4,  1,    4, 10,  7,    2,  7, 10,    7,  2, 12,   12,  3,  7,    0,  3, 12,   12,  2,  1  },
-  /* 124:       2, 3, 4, 5, 6,     */ {  3, 12,  1,   12, 11,  1,    6,  1, 11,    1,  6,  9,    7,  9,  6,    9,  7, 12,   12,  8,  9,    3,  8, 12,   12,  7, 11  },
-  /* 188:       2, 3, 4, 5,    7,  */ {  3, 12,  1,    3, 10, 12,   10,  3,  6,    8,  6,  3,    6,  8,  5,   12,  5,  8,    8,  9, 12,   12,  9,  1,   10,  5, 12  },
-};
-
-//_____________________________________________________________________________
-/**
- * \brief tiling table for case 6.2
- * For each of the case above, the specific triangulation of the edge
- * intersection points is given.
- * When a case is ambiguous, there is an auxiliary table that contains
- * the face number to test and the tiling table contains the specific
- * triangulations depending on the results
- * A minus sign means to invert the result of the test.
- */
-//-----------------------------------------------------------------------------
-static const char tiling6_2[48][15] = {
-/*  67: 0, 1,             6,     */  {  1, 10,  3,  6,  3, 10,  3,  6,  8,  5,  8,  6,  8,  5,  9 },
-/* 131: 0, 1,                7,  */  {  1, 11,  3, 11,  1,  6,  9,  6,  1,  6,  9,  7,  8,  7,  9 },
-/*  21: 0,    2,    4,           */  {  4,  1,  0,  1,  4, 10,  7, 10,  4, 10,  7,  2,  3,  2,  7 },
-/*  69: 0,    2,          6,     */  {  6,  3,  2,  3,  6,  8,  5,  8,  6,  8,  5,  0,  1,  0,  5 },
-/*  41: 0,       3,    5,        */  {  0,  9,  2,  5,  2,  9,  2,  5, 11,  4, 11,  5, 11,  4,  8 },
-/*  73: 0,       3,       6,     */  {  0, 10,  2, 10,  0,  5,  8,  5,  0,  5,  8,  6, 11,  6,  8 },
-/*  81: 0,          4,    6,     */  {  4,  5,  0, 10,  0,  5,  0, 10,  3,  6,  3, 10,  3,  6,  7 },
-/*  97: 0,             5, 6,     */  {  4,  8,  6,  3,  6,  8,  6,  3, 10,  0, 10,  3, 10,  0,  9 },
-/* 193: 0,                6, 7,  */  {  5,  8,  7,  8,  5,  0, 10,  0,  5,  0, 10,  3, 11,  3, 10 },
-/*  22:    1, 2,    4,           */  {  2,  8,  0,  8,  2,  7, 10,  7,  2,  7, 10,  4,  9,  4, 10 },
-/* 134:    1, 2,             7,  */  {  2, 11,  0,  7,  0, 11,  0,  7,  9,  6,  9,  7,  9,  6, 10 },
-/*  42:    1,    3,    5,        */  {  5,  2,  1,  2,  5, 11,  4, 11,  5, 11,  4,  3,  0,  3,  4 },
-/* 138:    1,    3,          7,  */  {  7,  0,  3,  0,  7,  9,  6,  9,  7,  9,  6,  1,  2,  1,  6 },
-/* 146:    1,       4,       7,  */  {  6,  9,  4,  9,  6,  1, 11,  1,  6,  1, 11,  0,  8,  0, 11 },
-/* 162:    1,          5,    7,  */  {  5,  6,  1, 11,  1,  6,  1, 11,  0,  7,  0, 11,  0,  7,  4 },
-/* 194:    1,             6, 7,  */  {  5,  9,  7,  0,  7,  9,  7,  0, 11,  1, 11,  0, 11,  1, 10 },
-/*  28:       2, 3, 4,           */  {  3,  8,  1,  4,  1,  8,  1,  4, 10,  7, 10,  4, 10,  7, 11 },
-/*  44:       2, 3,    5,        */  {  3,  9,  1,  9,  3,  4, 11,  4,  3,  4, 11,  5, 10,  5, 11 },
-/*  52:       2,    4, 5,        */  {  7, 10,  5, 10,  7,  2,  8,  2,  7,  2,  8,  1,  9,  1,  8 },
-/*  84:       2,    4,    6,     */  {  6,  7,  2,  8,  2,  7,  2,  8,  1,  4,  1,  8,  1,  4,  5 },
-/* 148:       2,    4,       7,  */  {  6, 10,  4,  1,  4, 10,  4,  1,  8,  2,  8,  1,  8,  2, 11 },
-/*  56:          3, 4, 5,        */  {  7, 11,  5,  2,  5, 11,  5,  2,  9,  3,  9,  2,  9,  3,  8 },
-/* 104:          3,    5, 6,     */  {  4, 11,  6, 11,  4,  3,  9,  3,  4,  3,  9,  2, 10,  2,  9 },
-/* 168:          3,    5,    7,  */  {  7,  4,  3,  9,  3,  4,  3,  9,  2,  5,  2,  9,  2,  5,  6 },
-/*  87: 0, 1, 2,    4,    6,     */  {  3,  4,  7,  4,  3,  9,  2,  9,  3,  9,  2,  5,  6,  5,  2 },
-/* 151: 0, 1, 2,    4,       7,  */  {  6, 11,  4,  3,  4, 11,  4,  3,  9,  2,  9,  3,  9,  2, 10 },
-/* 199: 0, 1, 2,          6, 7,  */  {  5, 11,  7, 11,  5,  2,  9,  2,  5,  2,  9,  3,  8,  3,  9 },
-/* 107: 0, 1,    3,    5, 6,     */  {  4, 10,  6, 10,  4,  1,  8,  1,  4,  1,  8,  2, 11,  2,  8 },
-/* 171: 0, 1,    3,    5,    7,  */  {  2,  7,  6,  7,  2,  8,  1,  8,  2,  8,  1,  4,  5,  4,  1 },
-/* 203: 0, 1,    3,       6, 7,  */  {  5, 10,  7,  2,  7, 10,  7,  2,  8,  1,  8,  2,  8,  1,  9 },
-/* 211: 0, 1,       4,    6, 7,  */  {  1,  9,  3,  4,  3,  9,  3,  4, 11,  5, 11,  4, 11,  5, 10 },
-/* 227: 0, 1,          5, 6, 7,  */  {  1,  8,  3,  8,  1,  4, 10,  4,  1,  4, 10,  7, 11,  7, 10 },
-/*  61: 0,    2, 3, 4, 5,        */  {  7,  9,  5,  9,  7,  0, 11,  0,  7,  0, 11,  1, 10,  1, 11 },
-/*  93: 0,    2, 3, 4,    6,     */  {  1,  6,  5,  6,  1, 11,  0, 11,  1, 11,  0,  7,  4,  7,  0 },
-/* 109: 0,    2, 3,    5, 6,     */  {  4,  9,  6,  1,  6,  9,  6,  1, 11,  0, 11,  1, 11,  0,  8 },
-/* 117: 0,    2,    4, 5, 6,     */  {  3,  0,  7,  9,  7,  0,  7,  9,  6,  1,  6,  9,  6,  1,  2 },
-/* 213: 0,    2,    4,    6, 7,  */  {  1,  2,  5, 11,  5,  2,  5, 11,  4,  3,  4, 11,  4,  3,  0 },
-/* 121: 0,       3, 4, 5, 6,     */  {  0, 11,  2, 11,  0,  7,  9,  7,  0,  7,  9,  6, 10,  6,  9 },
-/* 233: 0,       3,    5, 6, 7,  */  {  0,  8,  2,  7,  2,  8,  2,  7, 10,  4, 10,  7, 10,  4,  9 },
-/*  62:    1, 2, 3, 4, 5,        */  {  7,  8,  5,  0,  5,  8,  5,  0, 10,  3, 10,  0, 10,  3, 11 },
-/* 158:    1, 2, 3, 4,       7,  */  {  6,  8,  4,  8,  6,  3, 10,  3,  6,  3, 10,  0,  9,  0, 10 },
-/* 174:    1, 2, 3,    5,    7,  */  {  0,  5,  4,  5,  0, 10,  3, 10,  0, 10,  3,  6,  7,  6,  3 },
-/* 182:    1, 2,    4, 5,    7,  */  {  2, 10,  0,  5,  0, 10,  0,  5,  8,  6,  8,  5,  8,  6, 11 },
-/* 214:    1, 2,    4,    6, 7,  */  {  2,  9,  0,  9,  2,  5, 11,  5,  2,  5, 11,  4,  8,  4, 11 },
-/* 186:    1,    3, 4, 5,    7,  */  {  2,  3,  6,  8,  6,  3,  6,  8,  5,  0,  5,  8,  5,  0,  1 },
-/* 234:    1,    3,    5, 6, 7,  */  {  0,  1,  4, 10,  4,  1,  4, 10,  7,  2,  7, 10,  7,  2,  3 },
-/* 124:       2, 3, 4, 5, 6,     */  {  3, 11,  1,  6,  1, 11,  1,  6,  9,  7,  9,  6,  9,  7,  8 },
-/* 188:       2, 3, 4, 5,    7,  */  {  3, 10,  1, 10,  3,  6,  8,  6,  3,  6,  8,  5,  9,  5,  8 }
-};
-//_____________________________________________________________________________
-
-
-
-//_____________________________________________________________________________
-/**
- * \brief test table for case 7
- * 3 faces to test + eventually the interior
- * When the tests on the 3 specified faces are positive :
- * - if the test on the interior is positive : 5 first triangles
- * - if the test on the interior is negative : 9 next triangles
- * When the tests on the first  and the second specified faces are positive : 9 next triangles
- * When the tests on the first  and the third  specified faces are positive : 9 next triangles
- * When the tests on the second and the third  specified faces are positive : 9 next triangles
- * When the test on the first  specified face is positive : 5 next triangles
- * When the test on the second specified face is positive : 5 next triangles
- * When the test on the third  specified face is positive : 5 next triangles
- * When the tests on the 3 specified faces are negative : 3 last triangles
- * The support edge for the interior test is marked as the 5th column.
- *
- * For each of the case above, the specific triangulation of the edge
- * intersection points is given.
- * When a case is ambiguous, there is an auxiliary table that contains
- * the face number to test and the tiling table contains the specific
- * triangulations depending on the results
- * A minus sign means to invert the result of the test.
- */
-//-----------------------------------------------------------------------------
-static const char test7[16][5] = {
-/*  37: 0,    2,       5,        */  {  1,  2,  5,  7,   1 },
-/* 133: 0,    2,             7,  */  {  3,  4,  5,  7,   3 },
-/* 161: 0,             5,    7,  */  {  4,  1,  6,  7,   4 },
-/*  26:    1,    3, 4,           */  {  4,  1,  5,  7,   0 },
-/*  74:    1,    3,       6,     */  {  2,  3,  5,  7,   2 },
-/*  82:    1,       4,    6,     */  {  1,  2,  6,  7,   5 },
-/* 164:       2,       5,    7,  */  {  2,  3,  6,  7,   6 },
-/*  88:          3, 4,    6,     */  {  3,  4,  6,  7,   7 },
-/* 167: 0, 1, 2,       5,    7,  */  { -3, -4, -6, -7,   7 },
-/*  91: 0, 1,    3, 4,    6,     */  { -2, -3, -6, -7,   6 },
-/* 173: 0,    2, 3,    5,    7,  */  { -1, -2, -6, -7,   5 },
-/* 181: 0,    2,    4, 5,    7,  */  { -2, -3, -5, -7,   2 },
-/* 229: 0,    2,       5, 6, 7,  */  { -4, -1, -5, -7,   0 },
-/*  94:    1, 2, 3, 4,    6,     */  { -4, -1, -6, -7,   4 },
-/* 122:    1,    3, 4, 5, 6,     */  { -3, -4, -5, -7,   3 },
-/* 218:    1,    3, 4,    6, 7,  */  { -1, -2, -5, -7,   1 }
-};
-
-//_____________________________________________________________________________
-/**
- * \brief tiling table for case 7.1
- * For each of the case above, the specific triangulation of the edge
- * intersection points is given.
- * When a case is ambiguous, there is an auxiliary table that contains
- * the face number to test and the tiling table contains the specific
- * triangulations depending on the results
- * A minus sign means to invert the result of the test.
- */
-//-----------------------------------------------------------------------------
-static const char tiling7_1[16][9] = {
-/*  37: 0,    2,       5,        */  {  9,  5,  4, 10,  1,  2,  8,  3,  0 },
-/* 133: 0,    2,             7,  */  { 11,  7,  6,  8,  3,  0, 10,  1,  2 },
-/* 161: 0,             5,    7,  */  {  3,  0,  8,  5,  4,  9,  7,  6, 11 },
-/*  26:    1,    3, 4,           */  {  8,  4,  7,  9,  0,  1, 11,  2,  3 },
-/*  74:    1,    3,       6,     */  { 10,  6,  5, 11,  2,  3,  9,  0,  1 },
-/*  82:    1,       4,    6,     */  {  0,  1,  9,  6,  5, 10,  4,  7,  8 },
-/* 164:       2,       5,    7,  */  {  1,  2, 10,  7,  6, 11,  5,  4,  9 },
-/*  88:          3, 4,    6,     */  {  2,  3, 11,  4,  7,  8,  6,  5, 10 },
-/* 167: 0, 1, 2,       5,    7,  */  { 11,  3,  2,  8,  7,  4, 10,  5,  6 },
-/*  91: 0, 1,    3, 4,    6,     */  { 10,  2,  1, 11,  6,  7,  9,  4,  5 },
-/* 173: 0,    2, 3,    5,    7,  */  {  9,  1,  0, 10,  5,  6,  8,  7,  4 },
-/* 181: 0,    2,    4, 5,    7,  */  {  5,  6, 10,  3,  2, 11,  1,  0,  9 },
-/* 229: 0,    2,       5, 6, 7,  */  {  7,  4,  8,  1,  0,  9,  3,  2, 11 },
-/*  94:    1, 2, 3, 4,    6,     */  {  8,  0,  3,  9,  4,  5, 11,  6,  7 },
-/* 122:    1,    3, 4, 5, 6,     */  {  6,  7, 11,  0,  3,  8,  2,  1, 10 },
-/* 218:    1,    3, 4,    6, 7,  */  {  4,  5,  9,  2,  1, 10,  0,  3,  8 }
-};
-
-//_____________________________________________________________________________
-/**
- * \brief tiling table for case 7.2
- * For each of the case above, the specific triangulation of the edge
- * intersection points is given.
- * When a case is ambiguous, there is an auxiliary table that contains
- * the face number to test and the tiling table contains the specific
- * triangulations depending on the results
- * A minus sign means to invert the result of the test.
- */
-//-----------------------------------------------------------------------------
-static const char tiling7_2[16][3][15] = {
-/*  37: 0,    2,       5,        */  {
- /* 1,0 */ {  1,  2, 10,  3,  4,  8,  4,  3,  5,  0,  5,  3,  5,  0,  9 },
- /* 0,1 */ {  3,  0,  8,  9,  1,  4,  2,  4,  1,  4,  2,  5, 10,  5,  2 },
- /* 1,1 */ {  9,  5,  4,  0, 10,  1, 10,  0,  8, 10,  8,  2,  3,  2,  8 }
-},
-/* 133: 0,    2,             7,  */  {
- /* 1,0 */ {  3,  0,  8,  1,  6, 10,  6,  1,  7,  2,  7,  1,  7,  2, 11 },
- /* 0,1 */ {  1,  2, 10, 11,  3,  6,  0,  6,  3,  6,  0,  7,  8,  7,  0 },
- /* 1,1 */ { 11,  7,  6,  2,  8,  3,  8,  2, 10,  8, 10,  0,  1,  0, 10 }
-},
-/* 161: 0,             5,    7,  */  {
- /* 1,0 */ {  9,  5,  4, 11,  3,  6,  0,  6,  3,  6,  0,  7,  8,  7,  0 },
- /* 0,1 */ { 11,  7,  6,  3,  4,  8,  4,  3,  5,  0,  5,  3,  5,  0,  9 },
- /* 1,1 */ {  3,  0,  8,  4,  9,  7, 11,  7,  9,  5, 11,  9, 11,  5,  6 }
-},
-/*  26:    1,    3, 4,           */  {
- /* 1,0 */ {  0,  1,  9,  2,  7, 11,  7,  2,  4,  3,  4,  2,  4,  3,  8 },
- /* 0,1 */ {  2,  3, 11,  8,  0,  7,  1,  7,  0,  7,  1,  4,  9,  4,  1 },
- /* 1,1 */ {  8,  4,  7,  3,  9,  0,  9,  3, 11,  9, 11,  1,  2,  1, 11 }
-},
-/*  74:    1,    3,       6,     */  {
- /* 1,0 */ {  2,  3, 11,  0,  5,  9,  5,  0,  6,  1,  6,  0,  6,  1, 10 },
- /* 0,1 */ {  0,  1,  9, 10,  2,  5,  3,  5,  2,  5,  3,  6, 11,  6,  3 },
- /* 1,1 */ {  6,  5, 10,  1, 11,  2, 11,  1,  9, 11,  9,  3,  0,  3,  9 }
-},
-/*  82:    1,       4,    6,     */  {
- /* 1,0 */ {  6,  5, 10,  8,  0,  7,  1,  7,  0,  7,  1,  4,  9,  4,  1 },
- /* 0,1 */ {  8,  4,  7,  0,  5,  9,  5,  0,  6,  1,  6,  0,  6,  1, 10 },
- /* 1,1 */ {  0,  1,  9,  5, 10,  4,  8,  4, 10,  6,  8, 10,  8,  6,  7 }
-},
-/* 164:       2,       5,    7,  */  {
- /* 1,0 */ { 11,  7,  6,  9,  1,  4,  2,  4,  1,  4,  2,  5, 10,  5,  2 },
- /* 0,1 */ {  9,  5,  4,  1,  6, 10,  6,  1,  7,  2,  7,  1,  7,  2, 11 },
- /* 1,1 */ {  1,  2, 10,  6, 11,  5,  9,  5, 11,  7,  9, 11,  9,  7,  4 }
-},
-/*  88:          3, 4,    6,     */  {
- /* 1,0 */ {  8,  4,  7, 10,  2,  5,  3,  5,  2,  5,  3,  6, 11,  6,  3 },
- /* 0,1 */ {  6,  5, 10,  2,  7, 11,  7,  2,  4,  3,  4,  2,  4,  3,  8 },
- /* 1,1 */ {  2,  3, 11,  7,  8,  6, 10,  6,  8,  4, 10,  8, 10,  4,  5 }
-},
-/* 167: 0, 1, 2,       5,    7,  */  {
- /* 1,0 */ {  7,  4,  8,  5,  2, 10,  2,  5,  3,  6,  3,  5,  3,  6, 11 },
- /* 0,1 */ { 10,  5,  6, 11,  7,  2,  4,  2,  7,  2,  4,  3,  8,  3,  4 },
- /* 1,1 */ { 11,  3,  2,  6,  8,  7,  8,  6, 10,  8, 10,  4,  5,  4, 10 }
-},
-/*  91: 0, 1,    3, 4,    6,     */  {
- /* 1,0 */ {  6,  7, 11,  4,  1,  9,  1,  4,  2,  5,  2,  4,  2,  5, 10 },
- /* 0,1 */ {  4,  5,  9, 10,  6,  1,  7,  1,  6,  1,  7,  2, 11,  2,  7 },
- /* 1,1 */ { 10,  2,  1,  5, 11,  6, 11,  5,  9, 11,  9,  7,  4,  7,  9 }
-},
-/* 173: 0,    2, 3,    5,    7,  */  {
- /* 1,0 */ { 10,  5,  6,  7,  0,  8,  0,  7,  1,  4,  1,  7,  1,  4,  9 },
- /* 0,1 */ {  7,  4,  8,  9,  5,  0,  6,  0,  5,  0,  6,  1, 10,  1,  6 },
- /* 1,1 */ {  9,  1,  0,  4, 10,  5, 10,  4,  8, 10,  8,  6,  7,  6,  8 }
-},
-/* 181: 0,    2,    4, 5,    7,  */  {
- /* 1,0 */ { 11,  3,  2,  9,  5,  0,  6,  0,  5,  0,  6,  1, 10,  1,  6 },
- /* 0,1 */ {  9,  1,  0,  5,  2, 10,  2,  5,  3,  6,  3,  5,  3,  6, 11 },
- /* 1,1 */ { 10,  5,  6,  2, 11,  1,  9,  1, 11,  3,  9, 11,  9,  3,  0 }
-},
-/* 229: 0,    2,       5, 6, 7,  */  {
- /* 1,0 */ {  9,  1,  0, 11,  7,  2,  4,  2,  7,  2,  4,  3,  8,  3,  4 },
- /* 0,1 */ { 11,  3,  2,  7,  0,  8,  0,  7,  1,  4,  1,  7,  1,  4,  9 },
- /* 1,1 */ {  7,  4,  8,  0,  9,  3, 11,  3,  9,  1, 11,  9, 11,  1,  2 }
-},
-/*  94:    1, 2, 3, 4,    6,     */  {
- /* 1,0 */ {  4,  5,  9,  6,  3, 11,  3,  6,  0,  7,  0,  6,  0,  7,  8 },
- /* 0,1 */ {  6,  7, 11,  8,  4,  3,  5,  3,  4,  3,  5,  0,  9,  0,  5 },
- /* 1,1 */ {  8,  0,  3,  7,  9,  4,  9,  7, 11,  9, 11,  5,  6,  5, 11 }
-},
-/* 122:    1,    3, 4, 5, 6,     */  {
- /* 1,0 */ {  8,  0,  3, 10,  6,  1,  7,  1,  6,  1,  7,  2, 11,  2,  7 },
- /* 0,1 */ { 10,  2,  1,  6,  3, 11,  3,  6,  0,  7,  0,  6,  0,  7,  8 },
- /* 1,1 */ {  6,  7, 11,  3,  8,  2, 10,  2,  8,  0, 10,  8, 10,  0,  1 }
-},
-/* 218:    1,    3, 4,    6, 7,  */  {
- /* 1,0 */ { 10,  2,  1,  8,  4,  3,  5,  3,  4,  3,  5,  0,  9,  0,  5 },
- /* 0,1 */ {  8,  0,  3,  4,  1,  9,  1,  4,  2,  5,  2,  4,  2,  5, 10 },
- /* 1,1 */ {  4,  5,  9,  1, 10,  0,  8,  0, 10,  2,  8, 10,  8,  2,  3 } }
-};
-
-//_____________________________________________________________________________
-/**
- * \brief tiling table for case 7.3
- * For each of the case above, the specific triangulation of the edge
- * intersection points is given.
- * When a case is ambiguous, there is an auxiliary table that contains
- * the face number to test and the tiling table contains the specific
- * triangulations depending on the results
- * A minus sign means to invert the result of the test.
- */
-//-----------------------------------------------------------------------------
-static const char tiling7_3[16][3][27] = {
-/*  37: 0,    2,       5,        */  {
- /* 1,0 */ { 12,  2, 10, 12, 10,  5, 12,  5,  4, 12,  4,  8, 12,  8,  3, 12,  3,  0, 12,  0,  9, 12,  9,  1, 12,  1,  2 },
- /* 0,1 */ { 12,  5,  4, 12,  4,  8, 12,  8,  3, 12,  3,  2, 12,  2, 10, 12, 10,  1, 12,  1,  0, 12,  0,  9, 12,  9,  5 },
- /* 1,1 */ {  5,  4, 12, 10,  5, 12,  2, 10, 12,  3,  2, 12,  8,  3, 12,  0,  8, 12,  1,  0, 12,  9,  1, 12,  4,  9, 12 }
-},
-/* 133: 0,    2,             7,  */  {
- /* 1,0 */ { 12,  0,  8, 12,  8,  7, 12,  7,  6, 12,  6, 10, 12, 10,  1, 12,  1,  2, 12,  2, 11, 12, 11,  3, 12,  3,  0 },
- /* 0,1 */ { 12,  7,  6, 12,  6, 10, 12, 10,  1, 12,  1,  0, 12,  0,  8, 12,  8,  3, 12,  3,  2, 12,  2, 11, 12, 11,  7 },
- /* 1,1 */ {  7,  6, 12,  8,  7, 12,  0,  8, 12,  1,  0, 12, 10,  1, 12,  2, 10, 12,  3,  2, 12, 11,  3, 12,  6, 11, 12 }
-},
-/* 161: 0,             5,    7,  */  {
- /* 1,0 */ {  9,  5, 12,  0,  9, 12,  3,  0, 12, 11,  3, 12,  6, 11, 12,  7,  6, 12,  8,  7, 12,  4,  8, 12,  5,  4, 12 },
- /* 0,1 */ {  3,  0, 12, 11,  3, 12,  6, 11, 12,  5,  6, 12,  9,  5, 12,  4,  9, 12,  7,  4, 12,  8,  7, 12,  0,  8, 12 },
- /* 1,1 */ { 12,  3,  0, 12,  0,  9, 12,  9,  5, 12,  5,  6, 12,  6, 11, 12, 11,  7, 12,  7,  4, 12,  4,  8, 12,  8,  3 }
-},
-/*  26:    1,    3, 4,           */  {
- /* 1,0 */ { 12,  1,  9, 12,  9,  4, 12,  4,  7, 12,  7, 11, 12, 11,  2, 12,  2,  3, 12,  3,  8, 12,  8,  0, 12,  0,  1 },
- /* 0,1 */ { 12,  4,  7, 12,  7, 11, 12, 11,  2, 12,  2,  1, 12,  1,  9, 12,  9,  0, 12,  0,  3, 12,  3,  8, 12,  8,  4 },
- /* 1,1 */ {  4,  7, 12,  9,  4, 12,  1,  9, 12,  2,  1, 12, 11,  2, 12,  3, 11, 12,  0,  3, 12,  8,  0, 12,  7,  8, 12 }
-},
-/*  74:    1,    3,       6,     */  {
- /* 1,0 */ { 12,  3, 11, 12, 11,  6, 12,  6,  5, 12,  5,  9, 12,  9,  0, 12,  0,  1, 12,  1, 10, 12, 10,  2, 12,  2,  3 },
- /* 0,1 */ { 12,  6,  5, 12,  5,  9, 12,  9,  0, 12,  0,  3, 12,  3, 11, 12, 11,  2, 12,  2,  1, 12,  1, 10, 12, 10,  6 },
- /* 1,1 */ {  6,  5, 12, 11,  6, 12,  3, 11, 12,  0,  3, 12,  9,  0, 12,  1,  9, 12,  2,  1, 12, 10,  2, 12,  5, 10, 12 }
-},
-/*  82:    1,       4,    6,     */  {
- /* 1,0 */ { 10,  6, 12,  1, 10, 12,  0,  1, 12,  8,  0, 12,  7,  8, 12,  4,  7, 12,  9,  4, 12,  5,  9, 12,  6,  5, 12 },
- /* 0,1 */ {  0,  1, 12,  8,  0, 12,  7,  8, 12,  6,  7, 12, 10,  6, 12,  5, 10, 12,  4,  5, 12,  9,  4, 12,  1,  9, 12 },
- /* 1,1 */ { 12,  0,  1, 12,  1, 10, 12, 10,  6, 12,  6,  7, 12,  7,  8, 12,  8,  4, 12,  4,  5, 12,  5,  9, 12,  9,  0 }
-},
-/* 164:       2,       5,    7,  */  {
- /* 1,0 */ { 11,  7, 12,  2, 11, 12,  1,  2, 12,  9,  1, 12,  4,  9, 12,  5,  4, 12, 10,  5, 12,  6, 10, 12,  7,  6, 12 },
- /* 0,1 */ {  1,  2, 12,  9,  1, 12,  4,  9, 12,  7,  4, 12, 11,  7, 12,  6, 11, 12,  5,  6, 12, 10,  5, 12,  2, 10, 12 },
- /* 1,1 */ { 12,  1,  2, 12,  2, 11, 12, 11,  7, 12,  7,  4, 12,  4,  9, 12,  9,  5, 12,  5,  6, 12,  6, 10, 12, 10,  1 }
-},
-/*  88:          3, 4,    6,     */  {
- /* 1,0 */ {  8,  4, 12,  3,  8, 12,  2,  3, 12, 10,  2, 12,  5, 10, 12,  6,  5, 12, 11,  6, 12,  7, 11, 12,  4,  7, 12 },
- /* 0,1 */ {  2,  3, 12, 10,  2, 12,  5, 10, 12,  4,  5, 12,  8,  4, 12,  7,  8, 12,  6,  7, 12, 11,  6, 12,  3, 11, 12 },
- /* 1,1 */ { 12,  2,  3, 12,  3,  8, 12,  8,  4, 12,  4,  5, 12,  5, 10, 12, 10,  6, 12,  6,  7, 12,  7, 11, 12, 11,  2 }
-},
-/* 167: 0, 1, 2,       5,    7,  */  {
- /* 1,0 */ { 12,  4,  8, 12,  8,  3, 12,  3,  2, 12,  2, 10, 12, 10,  5, 12,  5,  6, 12,  6, 11, 12, 11,  7, 12,  7,  4 },
- /* 0,1 */ { 12,  3,  2, 12,  2, 10, 12, 10,  5, 12,  5,  4, 12,  4,  8, 12,  8,  7, 12,  7,  6, 12,  6, 11, 12, 11,  3 },
- /* 1,1 */ {  3,  2, 12,  8,  3, 12,  4,  8, 12,  5,  4, 12, 10,  5, 12,  6, 10, 12,  7,  6, 12, 11,  7, 12,  2, 11, 12 }
-},
-/*  91: 0, 1,    3, 4,    6,     */  {
- /* 1,0 */ { 12,  7, 11, 12, 11,  2, 12,  2,  1, 12,  1,  9, 12,  9,  4, 12,  4,  5, 12,  5, 10, 12, 10,  6, 12,  6,  7 },
- /* 0,1 */ { 12,  2,  1, 12,  1,  9, 12,  9,  4, 12,  4,  7, 12,  7, 11, 12, 11,  6, 12,  6,  5, 12,  5, 10, 12, 10,  2 },
- /* 1,1 */ {  2,  1, 12, 11,  2, 12,  7, 11, 12,  4,  7, 12,  9,  4, 12,  5,  9, 12,  6,  5, 12, 10,  6, 12,  1, 10, 12 }
-},
-/* 173: 0,    2, 3,    5,    7,  */  {
- /* 1,0 */ { 12,  6, 10, 12, 10,  1, 12,  1,  0, 12,  0,  8, 12,  8,  7, 12,  7,  4, 12,  4,  9, 12,  9,  5, 12,  5,  6 },
- /* 0,1 */ { 12,  1,  0, 12,  0,  8, 12,  8,  7, 12,  7,  6, 12,  6, 10, 12, 10,  5, 12,  5,  4, 12,  4,  9, 12,  9,  1 },
- /* 1,1 */ {  1,  0, 12, 10,  1, 12,  6, 10, 12,  7,  6, 12,  8,  7, 12,  4,  8, 12,  5,  4, 12,  9,  5, 12,  0,  9, 12 }
-},
-/* 181: 0,    2,    4, 5,    7,  */  {
- /* 1,0 */ { 11,  3, 12,  6, 11, 12,  5,  6, 12,  9,  5, 12,  0,  9, 12,  1,  0, 12, 10,  1, 12,  2, 10, 12,  3,  2, 12 },
- /* 0,1 */ {  5,  6, 12,  9,  5, 12,  0,  9, 12,  3,  0, 12, 11,  3, 12,  2, 11, 12,  1,  2, 12, 10,  1, 12,  6, 10, 12 },
- /* 1,1 */ { 12,  5,  6, 12,  6, 11, 12, 11,  3, 12,  3,  0, 12,  0,  9, 12,  9,  1, 12,  1,  2, 12,  2, 10, 12, 10,  5 }
-},
-/* 229: 0,    2,       5, 6, 7,  */  {
- /* 1,0 */ {  9,  1, 12,  4,  9, 12,  7,  4, 12, 11,  7, 12,  2, 11, 12,  3,  2, 12,  8,  3, 12,  0,  8, 12,  1,  0, 12 },
- /* 0,1 */ {  7,  4, 12, 11,  7, 12,  2, 11, 12,  1,  2, 12,  9,  1, 12,  0,  9, 12,  3,  0, 12,  8,  3, 12,  4,  8, 12 },
- /* 1,1 */ { 12,  7,  4, 12,  4,  9, 12,  9,  1, 12,  1,  2, 12,  2, 11, 12, 11,  3, 12,  3,  0, 12,  0,  8, 12,  8,  7 }
-},
-/*  94:    1, 2, 3, 4,    6,     */  {
- /* 1,0 */ { 12,  5,  9, 12,  9,  0, 12,  0,  3, 12,  3, 11, 12, 11,  6, 12,  6,  7, 12,  7,  8, 12,  8,  4, 12,  4,  5 },
- /* 0,1 */ { 12,  0,  3, 12,  3, 11, 12, 11,  6, 12,  6,  5, 12,  5,  9, 12,  9,  4, 12,  4,  7, 12,  7,  8, 12,  8,  0 },
- /* 1,1 */ {  0,  3, 12,  9,  0, 12,  5,  9, 12,  6,  5, 12, 11,  6, 12,  7, 11, 12,  4,  7, 12,  8,  4, 12,  3,  8, 12 }
-},
-/* 122:    1,    3, 4, 5, 6,     */  {
- /* 1,0 */ {  8,  0, 12,  7,  8, 12,  6,  7, 12, 10,  6, 12,  1, 10, 12,  2,  1, 12, 11,  2, 12,  3, 11, 12,  0,  3, 12 },
- /* 0,1 */ {  6,  7, 12, 10,  6, 12,  1, 10, 12,  0,  1, 12,  8,  0, 12,  3,  8, 12,  2,  3, 12, 11,  2, 12,  7, 11, 12 },
- /* 1,1 */ { 12,  6,  7, 12,  7,  8, 12,  8,  0, 12,  0,  1, 12,  1, 10, 12, 10,  2, 12,  2,  3, 12,  3, 11, 12, 11,  6 }
-},
-/* 218:    1,    3, 4,    6, 7,  */  {
- /* 1,0 */ { 10,  2, 12,  5, 10, 12,  4,  5, 12,  8,  4, 12,  3,  8, 12,  0,  3, 12,  9,  0, 12,  1,  9, 12,  2,  1, 12 },
- /* 0,1 */ {  4,  5, 12,  8,  4, 12,  3,  8, 12,  2,  3, 12, 10,  2, 12,  1, 10, 12,  0,  1, 12,  9,  0, 12,  5,  9, 12 },
- /* 1,1 */ { 12,  4,  5, 12,  5, 10, 12, 10,  2, 12,  2,  3, 12,  3,  8, 12,  8,  0, 12,  0,  1, 12,  1,  9, 12,  9,  4 } }
-};
-
-//_____________________________________________________________________________
-/**
- * \brief tiling table for case 7.4.1
- * For each of the case above, the specific triangulation of the edge
- * intersection points is given.
- * When a case is ambiguous, there is an auxiliary table that contains
- * the face number to test and the tiling table contains the specific
- * triangulations depending on the results
- * A minus sign means to invert the result of the test.
- */
-//-----------------------------------------------------------------------------
-static const char tiling7_4_1[16][15] = {
-/*  37: 0,    2,       5,        */  {  3,  4,  8,  4,  3, 10,  2, 10,  3,  4, 10,  5,  9,  1,  0 },
-/* 133: 0,    2,             7,  */  {  1,  6, 10,  6,  1,  8,  0,  8,  1,  6,  8,  7, 11,  3,  2 },
-/* 161: 0,             5,    7,  */  { 11,  3,  6,  9,  6,  3,  6,  9,  5,  0,  9,  3,  7,  4,  8 },
-/*  26:    1,    3, 4,           */  {  2,  7, 11,  7,  2,  9,  1,  9,  2,  7,  9,  4,  8,  0,  3 },
-/*  74:    1,    3,       6,     */  {  0,  5,  9,  5,  0, 11,  3, 11,  0,  5, 11,  6, 10,  2,  1 },
-/*  82:    1,       4,    6,     */  {  8,  0,  7, 10,  7,  0,  7, 10,  6,  1, 10,  0,  4,  5,  9 },
-/* 164:       2,       5,    7,  */  {  9,  1,  4, 11,  4,  1,  4, 11,  7,  2, 11,  1,  5,  6, 10 },
-/*  88:          3, 4,    6,     */  { 10,  2,  5,  8,  5,  2,  5,  8,  4,  3,  8,  2,  6,  7, 11 },
-/* 167: 0, 1, 2,       5,    7,  */  {  5,  2, 10,  2,  5,  8,  4,  8,  5,  2,  8,  3, 11,  7,  6 },
-/*  91: 0, 1,    3, 4,    6,     */  {  4,  1,  9,  1,  4, 11,  7, 11,  4,  1, 11,  2, 10,  6,  5 },
-/* 173: 0,    2, 3,    5,    7,  */  {  7,  0,  8,  0,  7, 10,  6, 10,  7,  0, 10,  1,  9,  5,  4 },
-/* 181: 0,    2,    4, 5,    7,  */  {  9,  5,  0, 11,  0,  5,  0, 11,  3,  6, 11,  5,  1,  2, 10 },
-/* 229: 0,    2,       5, 6, 7,  */  { 11,  7,  2,  9,  2,  7,  2,  9,  1,  4,  9,  7,  3,  0,  8 },
-/*  94:    1, 2, 3, 4,    6,     */  {  6,  3, 11,  3,  6,  9,  5,  9,  6,  3,  9,  0,  8,  4,  7 },
-/* 122:    1,    3, 4, 5, 6,     */  { 10,  6,  1,  8,  1,  6,  1,  8,  0,  7,  8,  6,  2,  3, 11 },
-/* 218:    1,    3, 4,    6, 7,  */  {  8,  4,  3, 10,  3,  4,  3, 10,  2,  5, 10,  4,  0,  1,  9 }
-};
-
-//_____________________________________________________________________________
-/**
- * \brief tiling table for case 7.4.2
- * For each of the case above, the specific triangulation of the edge
- * intersection points is given.
- * When a case is ambiguous, there is an auxiliary table that contains
- * the face number to test and the tiling table contains the specific
- * triangulations depending on the results
- * A minus sign means to invert the result of the test.
- */
-//-----------------------------------------------------------------------------
-static const char tiling7_4_2[16][27] = {
-/*  37: 0,    2,       5,        */  {   9,  4,  8,  4,  9,  5, 10,  5,  9,  1, 10,  9, 10,  1,  2,  0,  2,  1,  2,  0,  3,  8,  3,  0,  9,  8,  0 },
-/* 133: 0,    2,             7,  */  {  11,  6, 10,  6, 11,  7,  8,  7, 11,  3,  8, 11,  8,  3,  0,  2,  0,  3,  0,  2,  1, 10,  1,  2, 11, 10,  2 },
-/* 161: 0,             5,    7,  */  {  11,  3,  8,  0,  8,  3,  8,  0,  9,  8,  9,  4,  5,  4,  9,  4,  5,  7,  6,  7,  5,  7,  6, 11,  7, 11,  8 },
-/*  26:    1,    3, 4,           */  {   8,  7, 11,  7,  8,  4,  9,  4,  8,  0,  9,  8,  9,  0,  1,  3,  1,  0,  1,  3,  2, 11,  2,  3,  8, 11,  3 },
-/*  74:    1,    3,       6,     */  {  10,  5,  9,  5, 10,  6, 11,  6, 10,  2, 11, 10, 11,  2,  3,  1,  3,  2,  3,  1,  0,  9,  0,  1, 10,  9,  1 },
-/*  82:    1,       4,    6,     */  {   8,  0,  9,  1,  9,  0,  9,  1, 10,  9, 10,  5,  6,  5, 10,  5,  6,  4,  7,  4,  6,  4,  7,  8,  4,  8,  9 },
-/* 164:       2,       5,    7,  */  {   9,  1, 10,  2, 10,  1, 10,  2, 11, 10, 11,  6,  7,  6, 11,  6,  7,  5,  4,  5,  7,  5,  4,  9,  5,  9, 10 },
-/*  88:          3, 4,    6,     */  {  10,  2, 11,  3, 11,  2, 11,  3,  8, 11,  8,  7,  4,  7,  8,  7,  4,  6,  5,  6,  4,  6,  5, 10,  6, 10, 11 },
-/* 167: 0, 1, 2,       5,    7,  */  {  11,  2, 10,  2, 11,  3,  8,  3, 11,  7,  8, 11,  8,  7,  4,  6,  4,  7,  4,  6,  5, 10,  5,  6, 11, 10,  6 },
-/*  91: 0, 1,    3, 4,    6,     */  {  10,  1,  9,  1, 10,  2, 11,  2, 10,  6, 11, 10, 11,  6,  7,  5,  7,  6,  7,  5,  4,  9,  4,  5, 10,  9,  5 },
-/* 173: 0,    2, 3,    5,    7,  */  {   9,  0,  8,  0,  9,  1, 10,  1,  9,  5, 10,  9, 10,  5,  6,  4,  6,  5,  6,  4,  7,  8,  7,  4,  9,  8,  4 },
-/* 181: 0,    2,    4, 5,    7,  */  {   9,  5, 10,  6, 10,  5, 10,  6, 11, 10, 11,  2,  3,  2, 11,  2,  3,  1,  0,  1,  3,  1,  0,  9,  1,  9, 10 },
-/* 229: 0,    2,       5, 6, 7,  */  {  11,  7,  8,  4,  8,  7,  8,  4,  9,  8,  9,  0,  1,  0,  9,  0,  1,  3,  2,  3,  1,  3,  2, 11,  3, 11,  8 },
-/*  94:    1, 2, 3, 4,    6,     */  {   8,  3, 11,  3,  8,  0,  9,  0,  8,  4,  9,  8,  9,  4,  5,  7,  5,  4,  5,  7,  6, 11,  6,  7,  8, 11,  7 },
-/* 122:    1,    3, 4, 5, 6,     */  {  10,  6, 11,  7, 11,  6, 11,  7,  8, 11,  8,  3,  0,  3,  8,  3,  0,  2,  1,  2,  0,  2,  1, 10,  2, 10, 11 },
-/* 218:    1,    3, 4,    6, 7,  */  {   8,  4,  9,  5,  9,  4,  9,  5, 10,  9, 10,  1,  2,  1, 10,  1,  2,  0,  3,  0,  2,  0,  3,  8,  0,  8,  9 }
-};
-//_____________________________________________________________________________
-
-
-//_____________________________________________________________________________
-/**
- * \brief tiling table for case 8
- * For each of the case above, the specific triangulation of the edge
- * intersection points is given.
- * When a case is ambiguous, there is an auxiliary table that contains
- * the face number to test and the tiling table contains the specific
- * triangulations depending on the results
- * A minus sign means to invert the result of the test.
- */
-//-----------------------------------------------------------------------------
-static const char tiling8[6][6] = {
-/*  15: 0, 1, 2, 3,              */  { 9,  8, 10, 10,  8, 11 },
-/*  51: 0, 1,       4, 5,        */  { 1,  5,  3,  3,  5,  7 },
-/* 153: 0,       3, 4,       7,  */  { 0,  4,  2,  4,  6,  2 },
-/* 102:    1, 2,       5, 6,     */  { 0,  2,  4,  4,  2,  6 },
-/* 204:       2, 3,       6, 7,  */  { 1,  3,  5,  3,  7,  5 },
-/* 240:             4, 5, 6, 7,  */  { 9, 10,  8, 10, 11,  8 }
-};
-//_____________________________________________________________________________
-
-
-//_____________________________________________________________________________
-/**
- * \brief tiling table for case 9
- * For each of the case above, the specific triangulation of the edge
- * intersection points is given.
- * When a case is ambiguous, there is an auxiliary table that contains
- * the face number to test and the tiling table contains the specific
- * triangulations depending on the results
- * A minus sign means to invert the result of the test.
- */
-//-----------------------------------------------------------------------------
-static const char tiling9[8][12] = {
-/*  39: 0, 1, 2,       5,        */  {  2, 10,  5,  3,  2,  5,  3,  5,  4,  3,  4,  8 },
-/*  27: 0, 1,    3, 4,           */  {  4,  7, 11,  9,  4, 11,  9, 11,  2,  9,  2,  1 },
-/* 141: 0,    2, 3,          7,  */  { 10,  7,  6,  1,  7, 10,  1,  8,  7,  1,  0,  8 },
-/* 177: 0,          4, 5,    7,  */  {  3,  6, 11,  0,  6,  3,  0,  5,  6,  0,  9,  5 },
-/*  78:    1, 2, 3,       6,     */  {  3, 11,  6,  0,  3,  6,  0,  6,  5,  0,  5,  9 },
-/* 114:    1,       4, 5, 6,     */  { 10,  6,  7,  1, 10,  7,  1,  7,  8,  1,  8,  0 },
-/* 228:       2,       5, 6, 7,  */  {  4, 11,  7,  9, 11,  4,  9,  2, 11,  9,  1,  2 },
-/* 216:          3, 4,    6, 7,  */  {  2,  5, 10,  3,  5,  2,  3,  4,  5,  3,  8,  4 }
-};
-//_____________________________________________________________________________
-
-
-
-//_____________________________________________________________________________
-/**
- * \brief test table for case 10
- * 2 faces to test + eventually the interior
- * When the tests on both specified faces are positive : 4 middle triangles (1)
- * When the test on the first  specified face is positive : 8 first triangles
- * When the test on the second specified face is positive : 8 next triangles
- * When the tests on both specified faces are negative :
- * - if the test on the interior is negative : 4 middle triangles
- * - if the test on the interior is positive : 8 last triangles
- *
- * For each of the case above, the specific triangulation of the edge
- * intersection points is given.
- * When a case is ambiguous, there is an auxiliary table that contains
- * the face number to test and the tiling table contains the specific
- * triangulations depending on the results
- * A minus sign means to invert the result of the test.
- */
-//-----------------------------------------------------------------------------
-static const char test10[6][3] = {
-/* 195: 0, 1,             6, 7,  */  {  2,  4,  7 },
-/*  85: 0,    2,    4,    6,     */  {  5,  6,  7 },
-/* 105: 0,       3,    5, 6,     */  {  1,  3,  7 },
-/* 150:    1, 2,    4,       7,  */  {  1,  3,  7 },
-/* 170:    1,    3,    5,    7,  */  {  5,  6,  7 },
-/*  60:       2, 3, 4, 5,        */  {  2,  4,  7 }
-};
-
-//_____________________________________________________________________________
-/**
- * \brief tiling table for case 10.1.1
- * For each of the case above, the specific triangulation of the edge
- * intersection points is given.
- * When a case is ambiguous, there is an auxiliary table that contains
- * the face number to test and the tiling table contains the specific
- * triangulations depending on the results
- * A minus sign means to invert the result of the test.
- */
-//-----------------------------------------------------------------------------
-static const char tiling10_1_1[6][12] = {
-/* 195: 0, 1,             6, 7,  */  {  5, 10,  7, 11,  7, 10,  8,  1,  9,  1,  8,  3 },
-/*  85: 0,    2,    4,    6,     */  {  1,  2,  5,  6,  5,  2,  4,  3,  0,  3,  4,  7 },
-/* 105: 0,       3,    5, 6,     */  { 11,  0,  8,  0, 11,  2,  4,  9,  6, 10,  6,  9 },
-/* 150:    1, 2,    4,       7,  */  {  9,  0, 10,  2, 10,  0,  6,  8,  4,  8,  6, 11 },
-/* 170:    1,    3,    5,    7,  */  {  7,  2,  3,  2,  7,  6,  0,  1,  4,  5,  4,  1 },
-/*  60:       2, 3, 4, 5,        */  {  7,  9,  5,  9,  7,  8, 10,  1, 11,  3, 11,  1 }
-};
-
-//_____________________________________________________________________________
-/**
- * \brief tiling table for case 10.1.1 inverted
- * For each of the case above, the specific triangulation of the edge
- * intersection points is given.
- * When a case is ambiguous, there is an auxiliary table that contains
- * the face number to test and the tiling table contains the specific
- * triangulations depending on the results
- * A minus sign means to invert the result of the test.
- */
-//-----------------------------------------------------------------------------
-static const char tiling10_1_1_[6][12] = {
-/* 195: 0, 1,             6, 7,  */  {  5,  9,  7,  8,  7,  9, 11,  1, 10,  1, 11,  3 },
-/*  85: 0,    2,    4,    6,     */  {  3,  2,  7,  6,  7,  2,  4,  1,  0,  1,  4,  5 },
-/* 105: 0,       3,    5, 6,     */  { 10,  0,  9,  0, 10,  2,  4,  8,  6, 11,  6,  8 },
-/* 150:    1, 2,    4,       7,  */  {  8,  0, 11,  2, 11,  0,  6,  9,  4,  9,  6, 10 },
-/* 170:    1,    3,    5,    7,  */  {  5,  2,  1,  2,  5,  6,  0,  3,  4,  7,  4,  3 },
-/*  60:       2, 3, 4, 5,        */  {  7, 10,  5, 10,  7, 11,  9,  1,  8,  3,  8,  1 }
-};
-
-//_____________________________________________________________________________
-/**
- * \brief tiling table for case 10.1.2
- * For each of the case above, the specific triangulation of the edge
- * intersection points is given.
- * When a case is ambiguous, there is an auxiliary table that contains
- * the face number to test and the tiling table contains the specific
- * triangulations depending on the results
- * A minus sign means to invert the result of the test.
- */
-//-----------------------------------------------------------------------------
-static const char tiling10_1_2[6][24] = {
-/* 195: 0, 1,             6, 7,  */  {  3, 11,  7,  3,  7,  8,  9,  8,  7,  5,  9,  7,  9,  5, 10,  9, 10,  1,  3,  1, 10, 11,  3, 10 },
-/*  85: 0,    2,    4,    6,     */  {  7,  6,  5,  7,  5,  4,  0,  4,  5,  1,  0,  5,  0,  1,  2,  0,  2,  3,  7,  3,  2,  6,  7,  2 },
-/* 105: 0,       3,    5, 6,     */  { 11,  2, 10,  6, 11, 10, 11,  6,  4, 11,  4,  8,  0,  8,  4,  9,  0,  4,  0,  9, 10,  0, 10,  2 },
-/* 150:    1, 2,    4,       7,  */  { 11,  2, 10, 11, 10,  6,  4,  6, 10,  9,  4, 10,  4,  9,  0,  4,  0,  8, 11,  8,  0,  2, 11,  0 },
-/* 170:    1,    3,    5,    7,  */  {  7,  6,  5,  4,  7,  5,  7,  4,  0,  7,  0,  3,  2,  3,  0,  1,  2,  0,  2,  1,  5,  2,  5,  6 },
-/*  60:       2, 3, 4, 5,        */  {  7,  8,  3, 11,  7,  3,  7, 11, 10,  7, 10,  5,  9,  5, 10,  1,  9, 10,  9,  1,  3,  9,  3,  8 }
-};
-
-//_____________________________________________________________________________
-/**
- * \brief tiling table for case 10.2
- * For each of the case above, the specific triangulation of the edge
- * intersection points is given.
- * When a case is ambiguous, there is an auxiliary table that contains
- * the face number to test and the tiling table contains the specific
- * triangulations depending on the results
- * A minus sign means to invert the result of the test.
- */
-//-----------------------------------------------------------------------------
-static const char tiling10_2[6][24] = {
-/* 195: 0, 1,             6, 7,  */  { 12,  5,  9, 12,  9,  8, 12,  8,  3, 12,  3,  1, 12,  1, 10, 12, 10, 11, 12, 11,  7, 12,  7,  5 },
-/*  85: 0,    2,    4,    6,     */  { 12,  1,  0, 12,  0,  4, 12,  4,  7, 12,  7,  3, 12,  3,  2, 12,  2,  6, 12,  6,  5, 12,  5,  1 },
-/* 105: 0,       3,    5, 6,     */  {  4,  8, 12,  6,  4, 12, 10,  6, 12,  9, 10, 12,  0,  9, 12,  2,  0, 12, 11,  2, 12,  8, 11, 12 },
-/* 150:    1, 2,    4,       7,  */  { 12,  9,  4, 12,  4,  6, 12,  6, 11, 12, 11,  8, 12,  8,  0, 12,  0,  2, 12,  2, 10, 12, 10,  9 },
-/* 170:    1,    3,    5,    7,  */  {  0,  3, 12,  4,  0, 12,  5,  4, 12,  1,  5, 12,  2,  1, 12,  6,  2, 12,  7,  6, 12,  3,  7, 12 },
-/*  60:       2, 3, 4, 5,        */  { 10,  5, 12, 11, 10, 12,  3, 11, 12,  1,  3, 12,  9,  1, 12,  8,  9, 12,  7,  8, 12,  5,  7, 12 }
-};
-
-//_____________________________________________________________________________
-/**
- * \brief tiling table for case 10.2 inverted
- * For each of the case above, the specific triangulation of the edge
- * intersection points is given.
- * When a case is ambiguous, there is an auxiliary table that contains
- * the face number to test and the tiling table contains the specific
- * triangulations depending on the results
- * A minus sign means to invert the result of the test.
- */
-//-----------------------------------------------------------------------------
-static const char tiling10_2_[6][24] = {
-/* 195: 0, 1,             6, 7,  */  {  8,  7, 12,  9,  8, 12,  1,  9, 12,  3,  1, 12, 11,  3, 12, 10, 11, 12,  5, 10, 12,  7,  5, 12 },
-/*  85: 0,    2,    4,    6,     */  {  4,  5, 12,  0,  4, 12,  3,  0, 12,  7,  3, 12,  6,  7, 12,  2,  6, 12,  1,  2, 12,  5,  1, 12 },
-/* 105: 0,       3,    5, 6,     */  { 12, 11,  6, 12,  6,  4, 12,  4,  9, 12,  9, 10, 12, 10,  2, 12,  2,  0, 12,  0,  8, 12,  8, 11 },
-/* 150:    1, 2,    4,       7,  */  {  6, 10, 12,  4,  6, 12,  8,  4, 12, 11,  8, 12,  2, 11, 12,  0,  2, 12,  9,  0, 12, 10,  9, 12 },
-/* 170:    1,    3,    5,    7,  */  { 12,  7,  4, 12,  4,  0, 12,  0,  1, 12,  1,  5, 12,  5,  6, 12,  6,  2, 12,  2,  3, 12,  3,  7 },
-/*  60:       2, 3, 4, 5,        */  { 12,  7, 11, 12, 11, 10, 12, 10,  1, 12,  1,  3, 12,  3,  8, 12,  8,  9, 12,  9,  5, 12,  5,  7 }
-};
-//_____________________________________________________________________________
-
-
-//_____________________________________________________________________________
-/**
- * \brief tiling table for case 11
- * For each of the case above, the specific triangulation of the edge
- * intersection points is given.
- * When a case is ambiguous, there is an auxiliary table that contains
- * the face number to test and the tiling table contains the specific
- * triangulations depending on the results
- * A minus sign means to invert the result of the test.
- */
-//-----------------------------------------------------------------------------
-static const char tiling11[12][12] = {
-/*  23: 0, 1, 2,    4,           */  { 2, 10,  9,  2,  9,  7,  2,  7,  3,  7,  9,  4 },
-/* 139: 0, 1,    3,          7,  */  { 1,  6,  2,  1,  8,  6,  1,  9,  8,  8,  7,  6 },
-/*  99: 0, 1,          5, 6,     */  { 8,  3,  1,  8,  1,  6,  8,  6,  4,  6,  1, 10 },
-/*  77: 0,    2, 3,       6,     */  { 0,  8, 11,  0, 11,  5,  0,  5,  1,  5, 11,  6 },
-/*  57: 0,       3, 4, 5,        */  { 9,  5,  7,  9,  7,  2,  9,  2,  0,  2,  7, 11 },
-/* 209: 0,          4,    6, 7,  */  { 5,  0,  4,  5, 11,  0,  5, 10, 11, 11,  3,  0 },
-/*  46:    1, 2, 3,    5,        */  { 5,  4,  0,  5,  0, 11,  5, 11, 10, 11,  0,  3 },
-/* 198:    1, 2,          6, 7,  */  { 9,  7,  5,  9,  2,  7,  9,  0,  2,  2, 11,  7 },
-/* 178:    1,       4, 5,    7,  */  { 0, 11,  8,  0,  5, 11,  0,  1,  5,  5,  6, 11 },
-/* 156:       2, 3, 4,       7,  */  { 8,  1,  3,  8,  6,  1,  8,  4,  6,  6, 10,  1 },
-/* 116:       2,    4, 5, 6,     */  { 1,  2,  6,  1,  6,  8,  1,  8,  9,  8,  6,  7 },
-/* 232:          3,    5, 6, 7,  */  { 2,  9, 10,  2,  7,  9,  2,  3,  7,  7,  4,  9 }
-};
-//_____________________________________________________________________________
-
-
-//_____________________________________________________________________________
-/**
- * \brief test table for case 12
- * 2 faces to test + eventually the interior
- * When the tests on both specified faces are positive : 4 middle triangles (1)
- * When the test on the first  specified face is positive : 8 first triangles
- * When the test on the second specified face is positive : 8 next triangles
- * When the tests on both specified faces are negative :
- * - if the test on the interior is negative : 4 middle triangles
- * - if the test on the interior is positive : 8 last triangles
- * The support edge for the interior test is marked as the 4th column.
- *
- * For each of the case above, the specific triangulation of the edge
- * intersection points is given.
- * When a case is ambiguous, there is an auxiliary table that contains
- * the face number to test and the tiling table contains the specific
- * triangulations depending on the results
- * A minus sign means to invert the result of the test.
- */
-//-----------------------------------------------------------------------------
-static const char test12[24][4] = {
-/* 135: 0, 1, 2,             7,  */  {  4,  3,  7,  11 },
-/*  75: 0, 1,    3,       6,     */  {  3,  2,  7,  10 },
-/*  83: 0, 1,       4,    6,     */  {  2,  6,  7,   5 },
-/* 163: 0, 1,          5,    7,  */  {  6,  4,  7,   7 },
-/*  45: 0,    2, 3,    5,        */  {  2,  1,  7,   9 },
-/*  53: 0,    2,    4, 5,        */  {  5,  2,  7,   1 },
-/* 149: 0,    2,    4,       7,  */  {  5,  3,  7,   2 },
-/* 101: 0,    2,       5, 6,     */  {  5,  1,  7,   0 },
-/* 197: 0,    2,          6, 7,  */  {  5,  4,  7,   3 },
-/*  89: 0,       3, 4,    6,     */  {  6,  3,  7,   6 },
-/* 169: 0,       3,    5,    7,  */  {  1,  6,  7,   4 },
-/* 225: 0,             5, 6, 7,  */  {  1,  4,  7,   8 },
-/*  30:    1, 2, 3, 4,           */  {  4,  1,  7,   8 },
-/*  86:    1, 2,    4,    6,     */  {  6,  1,  7,   4 },
-/* 166:    1, 2,       5,    7,  */  {  3,  6,  7,   6 },
-/*  58:    1,    3, 4, 5,        */  {  4,  5,  7,   3 },
-/* 154:    1,    3, 4,       7,  */  {  1,  5,  7,   0 },
-/* 106:    1,    3,    5, 6,     */  {  3,  5,  7,   2 },
-/* 202:    1,    3,       6, 7,  */  {  2,  5,  7,   1 },
-/* 210:    1,       4,    6, 7,  */  {  1,  2,  7,   9 },
-/*  92:       2, 3, 4,    6,     */  {  4,  6,  7,   7 },
-/* 172:       2, 3,    5,    7,  */  {  6,  2,  7,   5 },
-/* 180:       2,    4, 5,    7,  */  {  2,  3,  7,  10 },
-/* 120:          3, 4, 5, 6,     */  {  3,  4,  7,  11 }
-};
-
-//_____________________________________________________________________________
-/**
- * \brief tiling table for case 12.1.1
- * For each of the case above, the specific triangulation of the edge
- * intersection points is given.
- * When a case is ambiguous, there is an auxiliary table that contains
- * the face number to test and the tiling table contains the specific
- * triangulations depending on the results
- * A minus sign means to invert the result of the test.
- */
-//-----------------------------------------------------------------------------
-static const char tiling12_1_1[24][12] = {
-/* 135: 0, 1, 2,             7,  */  {  7,  6, 11, 10,  3,  2,  3, 10,  8,  9,  8, 10 },
-/*  75: 0, 1,    3,       6,     */  {  6,  5, 10,  9,  2,  1,  2,  9, 11,  8, 11,  9 },
-/*  83: 0, 1,       4,    6,     */  { 10,  6,  5,  7,  9,  4,  9,  7,  1,  3,  1,  7 },
-/* 163: 0, 1,          5,    7,  */  {  7,  6, 11,  4,  8,  5,  3,  5,  8,  5,  3,  1 },
-/*  45: 0,    2, 3,    5,        */  {  5,  4,  9,  8,  1,  0,  1,  8, 10, 11, 10,  8 },
-/*  53: 0,    2,    4, 5,        */  {  1,  2, 10,  0,  9,  3,  5,  3,  9,  3,  5,  7 },
-/* 149: 0,    2,    4,       7,  */  { 10,  1,  2,  0, 11,  3, 11,  0,  6,  4,  6,  0 },
-/* 101: 0,    2,       5, 6,     */  {  8,  3,  0,  2,  9,  1,  9,  2,  4,  6,  4,  2 },
-/* 197: 0,    2,          6, 7,  */  {  3,  0,  8,  2, 11,  1,  7,  1, 11,  1,  7,  5 },
-/*  89: 0,       3, 4,    6,     */  {  6,  5, 10,  7, 11,  4,  2,  4, 11,  4,  2,  0 },
-/* 169: 0,       3,    5,    7,  */  {  9,  5,  4,  6,  8,  7,  8,  6,  0,  2,  0,  6 },
-/* 225: 0,             5, 6, 7,  */  {  8,  3,  0,  7,  4, 11,  9, 11,  4, 11,  9, 10 },
-/*  30:    1, 2, 3, 4,           */  {  4,  7,  8, 11,  0,  3,  0, 11,  9, 10,  9, 11 },
-/*  86:    1, 2,    4,    6,     */  {  4,  7,  8,  5,  9,  6,  0,  6,  9,  6,  0,  2 },
-/* 166:    1, 2,       5,    7,  */  { 11,  7,  6,  4, 10,  5, 10,  4,  2,  0,  2,  4 },
-/*  58:    1,    3, 4, 5,        */  { 11,  2,  3,  1,  8,  0,  8,  1,  7,  5,  7,  1 },
-/* 154:    1,    3, 4,       7,  */  {  0,  1,  9,  3,  8,  2,  4,  2,  8,  2,  4,  6 },
-/* 106:    1,    3,    5, 6,     */  {  2,  3, 11,  1, 10,  0,  6,  0, 10,  0,  6,  4 },
-/* 202:    1,    3,       6, 7,  */  {  9,  0,  1,  3, 10,  2, 10,  3,  5,  7,  5,  3 },
-/* 210:    1,       4,    6, 7,  */  {  9,  0,  1,  4,  5,  8, 10,  8,  5,  8, 10, 11 },
-/*  92:       2, 3, 4,    6,     */  {  8,  4,  7,  5, 11,  6, 11,  5,  3,  1,  3,  5 },
-/* 172:       2, 3,    5,    7,  */  {  5,  4,  9,  6, 10,  7,  1,  7, 10,  7,  1,  3 },
-/* 180:       2,    4, 5,    7,  */  { 10,  1,  2,  5,  6,  9, 11,  9,  6,  9, 11,  8 },
-/* 120:          3, 4, 5, 6,     */  { 11,  2,  3,  6,  7, 10,  8, 10,  7, 10,  8,  9 }
-};
-
-//_____________________________________________________________________________
-/**
- * \brief tiling table for case 12.1.1 inverted
- * For each of the case above, the specific triangulation of the edge
- * intersection points is given.
- * When a case is ambiguous, there is an auxiliary table that contains
- * the face number to test and the tiling table contains the specific
- * triangulations depending on the results
- * A minus sign means to invert the result of the test.
- */
-//-----------------------------------------------------------------------------
-static const char tiling12_1_1_[24][12] = {
-/* 135: 0, 1, 2,             7,  */  {  3,  2, 11, 10,  7,  6,  7, 10,  8,  9,  8, 10 },
-/*  75: 0, 1,    3,       6,     */  {  2,  1, 10,  9,  6,  5,  6,  9, 11,  8, 11,  9 },
-/*  83: 0, 1,       4,    6,     */  {  9,  4,  5,  7, 10,  6, 10,  7,  1,  3,  1,  7 },
-/* 163: 0, 1,          5,    7,  */  {  7,  4,  8,  6, 11,  5,  3,  5, 11,  5,  3,  1 },
-/*  45: 0,    2, 3,    5,        */  {  1,  0,  9,  8,  5,  4,  5,  8, 10, 11, 10,  8 },
-/*  53: 0,    2,    4, 5,        */  {  1,  0,  9,  2, 10,  3,  5,  3, 10,  3,  5,  7 },
-/* 149: 0,    2,    4,       7,  */  { 11,  3,  2,  0, 10,  1, 10,  0,  6,  4,  6,  0 },
-/* 101: 0,    2,       5, 6,     */  {  9,  1,  0,  2,  8,  3,  8,  2,  4,  6,  4,  2 },
-/* 197: 0,    2,          6, 7,  */  {  3,  2, 11,  0,  8,  1,  7,  1,  8,  1,  7,  5 },
-/*  89: 0,       3, 4,    6,     */  {  6,  7, 11,  5, 10,  4,  2,  4, 10,  4,  2,  0 },
-/* 169: 0,       3,    5,    7,  */  {  8,  7,  4,  6,  9,  5,  9,  6,  0,  2,  0,  6 },
-/* 225: 0,             5, 6, 7,  */  {  8,  7,  4,  3,  0, 11,  9, 11,  0, 11,  9, 10 },
-/*  30:    1, 2, 3, 4,           */  {  0,  3,  8, 11,  4,  7,  4, 11,  9, 10,  9, 11 },
-/*  86:    1, 2,    4,    6,     */  {  4,  5,  9,  7,  8,  6,  0,  6,  8,  6,  0,  2 },
-/* 166:    1, 2,       5,    7,  */  { 10,  5,  6,  4, 11,  7, 11,  4,  2,  0,  2,  4 },
-/*  58:    1,    3, 4, 5,        */  {  8,  0,  3,  1, 11,  2, 11,  1,  7,  5,  7,  1 },
-/* 154:    1,    3, 4,       7,  */  {  0,  3,  8,  1,  9,  2,  4,  2,  9,  2,  4,  6 },
-/* 106:    1,    3,    5, 6,     */  {  2,  1, 10,  3, 11,  0,  6,  0, 11,  0,  6,  4 },
-/* 202:    1,    3,       6, 7,  */  { 10,  2,  1,  3,  9,  0,  9,  3,  5,  7,  5,  3 },
-/* 210:    1,       4,    6, 7,  */  {  9,  4,  5,  0,  1,  8, 10,  8,  1,  8, 10, 11 },
-/*  92:       2, 3, 4,    6,     */  { 11,  6,  7,  5,  8,  4,  8,  5,  3,  1,  3,  5 },
-/* 172:       2, 3,    5,    7,  */  {  5,  6, 10,  4,  9,  7,  1,  7,  9,  7,  1,  3 },
-/* 180:       2,    4, 5,    7,  */  { 10,  5,  6,  1,  2,  9, 11,  9,  2,  9, 11,  8 },
-/* 120:          3, 4, 5, 6,     */  { 11,  6,  7,  2,  3, 10,  8, 10,  3, 10,  8,  9 }
-};
-
-//_____________________________________________________________________________
-/**
- * \brief tiling table for case 12.1.2
- * For each of the case above, the specific triangulation of the edge
- * intersection points is given.
- * When a case is ambiguous, there is an auxiliary table that contains
- * the face number to test and the tiling table contains the specific
- * triangulations depending on the results
- * A minus sign means to invert the result of the test.
- */
-//-----------------------------------------------------------------------------
-static const char tiling12_1_2[24][24] = {
-/* 135: 0, 1, 2,             7,  */  {  7,  3, 11,  3,  7,  8,  9,  8,  7,  6,  9,  7,  9,  6, 10,  2, 10,  6, 11,  2,  6,  2, 11,  3 },
-/*  75: 0, 1,    3,       6,     */  {  6,  2, 10,  2,  6, 11,  8, 11,  6,  5,  8,  6,  8,  5,  9,  1,  9,  5, 10,  1,  5,  1, 10,  2 },
-/*  83: 0, 1,       4,    6,     */  { 10,  9,  5,  9, 10,  1,  3,  1, 10,  6,  3, 10,  3,  6,  7,  4,  7,  6,  5,  4,  6,  4,  5,  9 },
-/* 163: 0, 1,          5,    7,  */  {  7,  8, 11,  3, 11,  8, 11,  3,  1, 11,  1,  6,  5,  6,  1,  6,  5,  4,  6,  4,  7,  8,  7,  4 },
-/*  45: 0,    2, 3,    5,        */  {  5,  1,  9,  1,  5, 10, 11, 10,  5,  4, 11,  5, 11,  4,  8,  0,  8,  4,  9,  0,  4,  0,  9,  1 },
-/*  53: 0,    2,    4, 5,        */  {  1,  9, 10,  5, 10,  9, 10,  5,  7, 10,  7,  2,  3,  2,  7,  2,  3,  0,  2,  0,  1,  9,  1,  0 },
-/* 149: 0,    2,    4,       7,  */  { 10, 11,  2, 11, 10,  6,  4,  6, 10,  1,  4, 10,  4,  1,  0,  3,  0,  1,  2,  3,  1,  3,  2, 11 },
-/* 101: 0,    2,       5, 6,     */  {  8,  9,  0,  9,  8,  4,  6,  4,  8,  3,  6,  8,  6,  3,  2,  1,  2,  3,  0,  1,  3,  1,  0,  9 },
-/* 197: 0,    2,          6, 7,  */  {  3, 11,  8,  7,  8, 11,  8,  7,  5,  8,  5,  0,  1,  0,  5,  0,  1,  2,  0,  2,  3, 11,  3,  2 },
-/*  89: 0,       3, 4,    6,     */  {  6, 11, 10,  2, 10, 11, 10,  2,  0, 10,  0,  5,  4,  5,  0,  5,  4,  7,  5,  7,  6, 11,  6,  7 },
-/* 169: 0,       3,    5,    7,  */  {  9,  8,  4,  8,  9,  0,  2,  0,  9,  5,  2,  9,  2,  5,  6,  7,  6,  5,  4,  7,  5,  7,  4,  8 },
-/* 225: 0,             5, 6, 7,  */  {  8,  4,  0,  9,  0,  4,  0,  9, 10,  0, 10,  3, 11,  3, 10,  3, 11,  7,  3,  7,  8,  4,  8,  7 },
-/*  30:    1, 2, 3, 4,           */  {  4,  0,  8,  0,  4,  9, 10,  9,  4,  7, 10,  4, 10,  7, 11,  3, 11,  7,  8,  3,  7,  3,  8,  0 },
-/*  86:    1, 2,    4,    6,     */  {  4,  9,  8,  0,  8,  9,  8,  0,  2,  8,  2,  7,  6,  7,  2,  7,  6,  5,  7,  5,  4,  9,  4,  5 },
-/* 166:    1, 2,       5,    7,  */  { 11, 10,  6, 10, 11,  2,  0,  2, 11,  7,  0, 11,  0,  7,  4,  5,  4,  7,  6,  5,  7,  5,  6, 10 },
-/*  58:    1,    3, 4, 5,        */  { 11,  8,  3,  8, 11,  7,  5,  7, 11,  2,  5, 11,  5,  2,  1,  0,  1,  2,  3,  0,  2,  0,  3,  8 },
-/* 154:    1,    3, 4,       7,  */  {  0,  8,  9,  4,  9,  8,  9,  4,  6,  9,  6,  1,  2,  1,  6,  1,  2,  3,  1,  3,  0,  8,  0,  3 },
-/* 106:    1,    3,    5, 6,     */  {  2, 10, 11,  6, 11, 10, 11,  6,  4, 11,  4,  3,  0,  3,  4,  3,  0,  1,  3,  1,  2, 10,  2,  1 },
-/* 202:    1,    3,       6, 7,  */  {  9, 10,  1, 10,  9,  5,  7,  5,  9,  0,  7,  9,  7,  0,  3,  2,  3,  0,  1,  2,  0,  2,  1, 10 },
-/* 210:    1,       4,    6, 7,  */  {  9,  5,  1, 10,  1,  5,  1, 10, 11,  1, 11,  0,  8,  0, 11,  0,  8,  4,  0,  4,  9,  5,  9,  4 },
-/*  92:       2, 3, 4,    6,     */  {  8, 11,  7, 11,  8,  3,  1,  3,  8,  4,  1,  8,  1,  4,  5,  6,  5,  4,  7,  6,  4,  6,  7, 11 },
-/* 172:       2, 3,    5,    7,  */  {  5, 10,  9,  1,  9, 10,  9,  1,  3,  9,  3,  4,  7,  4,  3,  4,  7,  6,  4,  6,  5, 10,  5,  6 },
-/* 180:       2,    4, 5,    7,  */  { 10,  6,  2, 11,  2,  6,  2, 11,  8,  2,  8,  1,  9,  1,  8,  1,  9,  5,  1,  5, 10,  6, 10,  5 },
-/* 120:          3, 4, 5, 6,     */  { 11,  7,  3,  8,  3,  7,  3,  8,  9,  3,  9,  2, 10,  2,  9,  2, 10,  6,  2,  6, 11,  7, 11,  6 }
-};
-
-//_____________________________________________________________________________
-/**
- * \brief tiling table for case 12.2
- * For each of the case above, the specific triangulation of the edge
- * intersection points is given.
- * When a case is ambiguous, there is an auxiliary table that contains
- * the face number to test and the tiling table contains the specific
- * triangulations depending on the results
- * A minus sign means to invert the result of the test.
- */
-//-----------------------------------------------------------------------------
-static const char tiling12_2[24][24] = {
-/* 135: 0, 1, 2,             7,  */  {   9,  8, 12, 10,  9, 12,  2, 10, 12,  3,  2, 12, 11,  3, 12,  6, 11, 12,  7,  6, 12,  8,  7, 12 },
-/*  75: 0, 1,    3,       6,     */  {   8, 11, 12,  9,  8, 12,  1,  9, 12,  2,  1, 12, 10,  2, 12,  5, 10, 12,  6,  5, 12, 11,  6, 12 },
-/*  83: 0, 1,       4,    6,     */  {   3,  1, 12,  7,  3, 12,  4,  7, 12,  9,  4, 12,  5,  9, 12,  6,  5, 12, 10,  6, 12,  1, 10, 12 },
-/* 163: 0, 1,          5,    7,  */  {  12,  3,  1, 12,  1,  5, 12,  5,  6, 12,  6, 11, 12, 11,  7, 12,  7,  4, 12,  4,  8, 12,  8,  3 },
-/*  45: 0,    2, 3,    5,        */  {  11, 10, 12,  8, 11, 12,  0,  8, 12,  1,  0, 12,  9,  1, 12,  4,  9, 12,  5,  4, 12, 10,  5, 12 },
-/*  53: 0,    2,    4, 5,        */  {  12,  5,  7, 12,  7,  3, 12,  3,  2, 12,  2, 10, 12, 10,  1, 12,  1,  0, 12,  0,  9, 12,  9,  5 },
-/* 149: 0,    2,    4,       7,  */  {   4,  6, 12,  0,  4, 12,  1,  0, 12, 10,  1, 12,  2, 10, 12,  3,  2, 12, 11,  3, 12,  6, 11, 12 },
-/* 101: 0,    2,       5, 6,     */  {   6,  4, 12,  2,  6, 12,  3,  2, 12,  8,  3, 12,  0,  8, 12,  1,  0, 12,  9,  1, 12,  4,  9, 12 },
-/* 197: 0,    2,          6, 7,  */  {  12,  7,  5, 12,  5,  1, 12,  1,  0, 12,  0,  8, 12,  8,  3, 12,  3,  2, 12,  2, 11, 12, 11,  7 },
-/*  89: 0,       3, 4,    6,     */  {  12,  2,  0, 12,  0,  4, 12,  4,  5, 12,  5, 10, 12, 10,  6, 12,  6,  7, 12,  7, 11, 12, 11,  2 },
-/* 169: 0,       3,    5,    7,  */  {   2,  0, 12,  6,  2, 12,  7,  6, 12,  8,  7, 12,  4,  8, 12,  5,  4, 12,  9,  5, 12,  0,  9, 12 },
-/* 225: 0,             5, 6, 7,  */  {  12,  9, 10, 12, 10, 11, 12, 11,  7, 12,  7,  4, 12,  4,  8, 12,  8,  3, 12,  3,  0, 12,  0,  9 },
-/*  30:    1, 2, 3, 4,           */  {  10,  9, 12, 11, 10, 12,  7, 11, 12,  4,  7, 12,  8,  4, 12,  3,  8, 12,  0,  3, 12,  9,  0, 12 },
-/*  86:    1, 2,    4,    6,     */  {  12,  0,  2, 12,  2,  6, 12,  6,  7, 12,  7,  8, 12,  8,  4, 12,  4,  5, 12,  5,  9, 12,  9,  0 },
-/* 166:    1, 2,       5,    7,  */  {   0,  2, 12,  4,  0, 12,  5,  4, 12, 10,  5, 12,  6, 10, 12,  7,  6, 12, 11,  7, 12,  2, 11, 12 },
-/*  58:    1,    3, 4, 5,        */  {   5,  7, 12,  1,  5, 12,  0,  1, 12,  8,  0, 12,  3,  8, 12,  2,  3, 12, 11,  2, 12,  7, 11, 12 },
-/* 154:    1,    3, 4,       7,  */  {  12,  4,  6, 12,  6,  2, 12,  2,  3, 12,  3,  8, 12,  8,  0, 12,  0,  1, 12,  1,  9, 12,  9,  4 },
-/* 106:    1,    3,    5, 6,     */  {  12,  6,  4, 12,  4,  0, 12,  0,  1, 12,  1, 10, 12, 10,  2, 12,  2,  3, 12,  3, 11, 12, 11,  6 },
-/* 202:    1,    3,       6, 7,  */  {   7,  5, 12,  3,  7, 12,  2,  3, 12, 10,  2, 12,  1, 10, 12,  0,  1, 12,  9,  0, 12,  5,  9, 12 },
-/* 210:    1,       4,    6, 7,  */  {  12, 10, 11, 12, 11,  8, 12,  8,  0, 12,  0,  1, 12,  1,  9, 12,  9,  4, 12,  4,  5, 12,  5, 10 },
-/*  92:       2, 3, 4,    6,     */  {   1,  3, 12,  5,  1, 12,  6,  5, 12, 11,  6, 12,  7, 11, 12,  4,  7, 12,  8,  4, 12,  3,  8, 12 },
-/* 172:       2, 3,    5,    7,  */  {  12,  1,  3, 12,  3,  7, 12,  7,  4, 12,  4,  9, 12,  9,  5, 12,  5,  6, 12,  6, 10, 12, 10,  1 },
-/* 180:       2,    4, 5,    7,  */  {  12, 11,  8, 12,  8,  9, 12,  9,  1, 12,  1,  2, 12,  2, 10, 12, 10,  5, 12,  5,  6, 12,  6, 11 },
-/* 120:          3, 4, 5, 6,     */  {  12,  8,  9, 12,  9, 10, 12, 10,  2, 12,  2,  3, 12,  3, 11, 12, 11,  6, 12,  6,  7, 12,  7,  8 }
-};
-
-//_____________________________________________________________________________
-/**
- * \brief tiling table for case 12.2 inverted
- * For each of the case above, the specific triangulation of the edge
- * intersection points is given.
- * When a case is ambiguous, there is an auxiliary table that contains
- * the face number to test and the tiling table contains the specific
- * triangulations depending on the results
- * A minus sign means to invert the result of the test.
- */
-//-----------------------------------------------------------------------------
-static const char tiling12_2_[24][24] = {
-/* 135: 0, 1, 2,             7,  */  { 12,  2, 11, 12, 11,  7, 12,  7,  6, 12,  6, 10, 12, 10,  9, 12,  9,  8, 12,  8,  3, 12,  3,  2 },
-/*  75: 0, 1,    3,       6,     */  { 12,  1, 10, 12, 10,  6, 12,  6,  5, 12,  5,  9, 12,  9,  8, 12,  8, 11, 12, 11,  2, 12,  2,  1 },
-/*  83: 0, 1,       4,    6,     */  { 12,  4,  5, 12,  5, 10, 12, 10,  6, 12,  6,  7, 12,  7,  3, 12,  3,  1, 12,  1,  9, 12,  9,  4 },
-/* 163: 0, 1,          5,    7,  */  {  7,  6, 12,  8,  7, 12,  4,  8, 12,  5,  4, 12,  1,  5, 12,  3,  1, 12, 11,  3, 12,  6, 11, 12 },
-/*  45: 0,    2, 3,    5,        */  { 12,  0,  9, 12,  9,  5, 12,  5,  4, 12,  4,  8, 12,  8, 11, 12, 11, 10, 12, 10,  1, 12,  1,  0 },
-/*  53: 0,    2,    4, 5,        */  {  1,  2, 12,  9,  1, 12,  0,  9, 12,  3,  0, 12,  7,  3, 12,  5,  7, 12, 10,  5, 12,  2, 10, 12 },
-/* 149: 0,    2,    4,       7,  */  { 12,  1,  2, 12,  2, 11, 12, 11,  3, 12,  3,  0, 12,  0,  4, 12,  4,  6, 12,  6, 10, 12, 10,  1 },
-/* 101: 0,    2,       5, 6,     */  { 12,  3,  0, 12,  0,  9, 12,  9,  1, 12,  1,  2, 12,  2,  6, 12,  6,  4, 12,  4,  8, 12,  8,  3 },
-/* 197: 0,    2,          6, 7,  */  {  3,  0, 12, 11,  3, 12,  2, 11, 12,  1,  2, 12,  5,  1, 12,  7,  5, 12,  8,  7, 12,  0,  8, 12 },
-/*  89: 0,       3, 4,    6,     */  {  6,  5, 12, 11,  6, 12,  7, 11, 12,  4,  7, 12,  0,  4, 12,  2,  0, 12, 10,  2, 12,  5, 10, 12 },
-/* 169: 0,       3,    5,    7,  */  { 12,  7,  4, 12,  4,  9, 12,  9,  5, 12,  5,  6, 12,  6,  2, 12,  2,  0, 12,  0,  8, 12,  8,  7 },
-/* 225: 0,             5, 6, 7,  */  {  8,  7, 12,  0,  8, 12,  3,  0, 12, 11,  3, 12, 10, 11, 12,  9, 10, 12,  4,  9, 12,  7,  4, 12 },
-/*  30:    1, 2, 3, 4,           */  { 12,  7,  8, 12,  8,  0, 12,  0,  3, 12,  3, 11, 12, 11, 10, 12, 10,  9, 12,  9,  4, 12,  4,  7 },
-/*  86:    1, 2,    4,    6,     */  {  4,  7, 12,  9,  4, 12,  5,  9, 12,  6,  5, 12,  2,  6, 12,  0,  2, 12,  8,  0, 12,  7,  8, 12 },
-/* 166:    1, 2,       5,    7,  */  { 12,  5,  6, 12,  6, 11, 12, 11,  7, 12,  7,  4, 12,  4,  0, 12,  0,  2, 12,  2, 10, 12, 10,  5 },
-/*  58:    1,    3, 4, 5,        */  { 12,  0,  3, 12,  3, 11, 12, 11,  2, 12,  2,  1, 12,  1,  5, 12,  5,  7, 12,  7,  8, 12,  8,  0 },
-/* 154:    1,    3, 4,       7,  */  {  0,  3, 12,  9,  0, 12,  1,  9, 12,  2,  1, 12,  6,  2, 12,  4,  6, 12,  8,  4, 12,  3,  8, 12 },
-/* 106:    1,    3,    5, 6,     */  {  2,  1, 12, 11,  2, 12,  3, 11, 12,  0,  3, 12,  4,  0, 12,  6,  4, 12, 10,  6, 12,  1, 10, 12 },
-/* 202:    1,    3,       6, 7,  */  { 12,  2,  1, 12,  1,  9, 12,  9,  0, 12,  0,  3, 12,  3,  7, 12,  7,  5, 12,  5, 10, 12, 10,  2 },
-/* 210:    1,       4,    6, 7,  */  {  9,  0, 12,  5,  9, 12,  4,  5, 12,  8,  4, 12, 11,  8, 12, 10, 11, 12,  1, 10, 12,  0,  1, 12 },
-/*  92:       2, 3, 4,    6,     */  { 12,  6,  7, 12,  7,  8, 12,  8,  4, 12,  4,  5, 12,  5,  1, 12,  1,  3, 12,  3, 11, 12, 11,  6 },
-/* 172:       2, 3,    5,    7,  */  {  5,  4, 12, 10,  5, 12,  6, 10, 12,  7,  6, 12,  3,  7, 12,  1,  3, 12,  9,  1, 12,  4,  9, 12 },
-/* 180:       2,    4, 5,    7,  */  { 10,  1, 12,  6, 10, 12,  5,  6, 12,  9,  5, 12,  8,  9, 12, 11,  8, 12,  2, 11, 12,  1,  2, 12 },
-/* 120:          3, 4, 5, 6,     */  { 11,  2, 12,  7, 11, 12,  6,  7, 12, 10,  6, 12,  9, 10, 12,  8,  9, 12,  3,  8, 12,  2,  3, 12 }
-};
-//_____________________________________________________________________________
-
-
-
-//_____________________________________________________________________________
-/**
- * \brief test table for case 13
- * All faces are to be tested
- *
- * For each of the case above, the specific triangulation of the edge
- * intersection points is given.
- * When a case is ambiguous, there is an auxiliary table that contains
- * the face number to test and the tiling table contains the specific
- * triangulations depending on the results
- * A minus sign means to invert the result of the test.
- */
-//-----------------------------------------------------------------------------
-/* 13: face test */
-static const char test13[2][7] = {
-/* 165: 0,    2,       5,    7,  */  { 1,2,3,4,5,6, 7 },
-/*  90:    1,    3, 4,    6,     */  { 2,3,4,1,5,6,-7 },
-};
-
-
-
-//_____________________________________________________________________________
-/**
- * \brief subconfiguration table for case 13
- * Hard-coded tests for the subconfiguration determination
- *
- * For each of the case above, the specific triangulation of the edge
- * intersection points is given.
- * When a case is ambiguous, there is an auxiliary table that contains
- * the face number to test and the tiling table contains the specific
- * triangulations depending on the results
- * A minus sign means to invert the result of the test.
- */
-//-----------------------------------------------------------------------------
-/* 13: sub configs */
-static const char subconfig13[64] = {
-/*  0: 0,0,0,0,0,0 */   0,
-/*  1: 1,0,0,0,0,0 */   1,
-/*  2: 0,1,0,0,0,0 */   2,
-/*  3: 1,1,0,0,0,0 */   7,
-/*  4: 0,0,1,0,0,0 */   3,
-/*  5: 1,0,1,0,0,0 */  -1,
-/*  6: 0,1,1,0,0,0 */  11,
-/*  7: 1,1,1,0,0,0 */  -1,
-/*  8: 0,0,0,1,0,0 */   4,
-/*  9: 1,0,0,1,0,0 */   8,
-/* 10: 0,1,0,1,0,0 */  -1,
-/* 11: 1,1,0,1,0,0 */  -1,
-/* 12: 0,0,1,1,0,0 */  14,
-/* 13: 1,0,1,1,0,0 */  -1,
-/* 14: 0,1,1,1,0,0 */  -1,
-/* 15: 1,1,1,1,0,0 */  -1,
-/* 16: 0,0,0,0,1,0 */   5,
-/* 17: 1,0,0,0,1,0 */   9,
-/* 18: 0,1,0,0,1,0 */  12,
-/* 19: 1,1,0,0,1,0 */  23,
-/* 20: 0,0,1,0,1,0 */  15,
-/* 21: 1,0,1,0,1,0 */  -1,
-/* 22: 0,1,1,0,1,0 */  21,
-/* 23: 1,1,1,0,1,0 */  38,
-/* 24: 0,0,0,1,1,0 */  17,
-/* 25: 1,0,0,1,1,0 */  20,
-/* 26: 0,1,0,1,1,0 */  -1,
-/* 27: 1,1,0,1,1,0 */  36,
-/* 28: 0,0,1,1,1,0 */  26,
-/* 29: 1,0,1,1,1,0 */  33,
-/* 30: 0,1,1,1,1,0 */  30,
-/* 31: 1,1,1,1,1,0 */  44,
-/* 32: 0,0,0,0,0,1 */   6,
-/* 33: 1,0,0,0,0,1 */  10,
-/* 34: 0,1,0,0,0,1 */  13,
-/* 35: 1,1,0,0,0,1 */  19,
-/* 36: 0,0,1,0,0,1 */  16,
-/* 37: 1,0,1,0,0,1 */  -1,
-/* 38: 0,1,1,0,0,1 */  25,
-/* 39: 1,1,1,0,0,1 */  37,
-/* 40: 0,0,0,1,0,1 */  18,
-/* 41: 1,0,0,1,0,1 */  24,
-/* 42: 0,1,0,1,0,1 */  -1,
-/* 43: 1,1,0,1,0,1 */  35,
-/* 44: 0,0,1,1,0,1 */  22,
-/* 45: 1,0,1,1,0,1 */  32,
-/* 46: 0,1,1,1,0,1 */  29,
-/* 47: 1,1,1,1,0,1 */  43,
-/* 48: 0,0,0,0,1,1 */  -1,
-/* 49: 1,0,0,0,1,1 */  -1,
-/* 50: 0,1,0,0,1,1 */  -1,
-/* 51: 1,1,0,0,1,1 */  34,
-/* 52: 0,0,1,0,1,1 */  -1,
-/* 53: 1,0,1,0,1,1 */  -1,
-/* 54: 0,1,1,0,1,1 */  28,
-/* 55: 1,1,1,0,1,1 */  42,
-/* 56: 0,0,0,1,1,1 */  -1,
-/* 57: 1,0,0,1,1,1 */  31,
-/* 58: 0,1,0,1,1,1 */  -1,
-/* 59: 1,1,0,1,1,1 */  41,
-/* 60: 0,0,1,1,1,1 */  27,
-/* 61: 1,0,1,1,1,1 */  40,
-/* 62: 0,1,1,1,1,1 */  39,
-/* 63: 1,1,1,1,1,1 */  45,
-};
-
-
-//_____________________________________________________________________________
-/**
- * \brief tiling table for case 13.1
- * For each of the case above, the specific triangulation of the edge
- * intersection points is given.
- * When a case is ambiguous, there is an auxiliary table that contains
- * the face number to test and the tiling table contains the specific
- * triangulations depending on the results
- * A minus sign means to invert the result of the test.
- */
-//-----------------------------------------------------------------------------
-/* 13.1 */
-static const char tiling13_1[2][12] = {
-/* 165: 0,    2,       5,    7,  */  { 11,  7,  6,  1,  2, 10,  8,  3,  0,  9,  5, 4 },
-/*  90:    1,    3, 4,    6,     */  {  8,  4,  7,  2,  3, 11,  9,  0,  1, 10,  6, 5 }
-};
-
-//_____________________________________________________________________________
-/**
- * \brief tiling table for case 13.1 inverted
- * For each of the case above, the specific triangulation of the edge
- * intersection points is given.
- * When a case is ambiguous, there is an auxiliary table that contains
- * the face number to test and the tiling table contains the specific
- * triangulations depending on the results
- * A minus sign means to invert the result of the test.
- */
-//-----------------------------------------------------------------------------
-/* 13.1 */
-static const char tiling13_1_[2][12] = {
-/* 165: 0,    2,       5,    7,  */  { 7,  4,  8, 11,  3,  2,  1,  0,  9,  5,  6, 10 },
-/*  90:    1,    3, 4,    6,     */  { 6,  7, 11, 10,  2,  1,  0,  3,  8,  4,  5,  9 }
-};
-
-//_____________________________________________________________________________
-/**
- * \brief tiling table for case 13.2
- * For each of the case above, the specific triangulation of the edge
- * intersection points is given.
- * When a case is ambiguous, there is an auxiliary table that contains
- * the face number to test and the tiling table contains the specific
- * triangulations depending on the results
- * A minus sign means to invert the result of the test.
- */
-//-----------------------------------------------------------------------------
-/* 13.2 */
-static const char tiling13_2[2][6][18] = {
-/* 165: 0,    2,       5,    7,  */  {
- /* 1 */ { 1,  2, 10, 11,  7,  6,  3,  4,  8,  4,  3,  5,  0,  5,  3,  5,  0,  9 },
- /* 2 */ { 8,  3,  0, 11,  7,  6,  9,  1,  4,  2,  4,  1,  4,  2,  5, 10,  5,  2 },
- /* 3 */ { 9,  5,  4,  8,  3,  0,  1,  6, 10,  6,  1,  7,  2,  7,  1,  7,  2, 11 },
- /* 4 */ { 9,  5,  4,  1,  2, 10, 11,  3,  6,  0,  6,  3,  6,  0,  7,  8,  7,  0 },
- /* 5 */ { 9,  5,  4, 11,  7,  6,  0, 10,  1, 10,  0,  8, 10,  8,  2,  3,  2,  8 },
- /* 6 */ { 1,  2, 10,  3,  0,  8,  4,  9,  7, 11,  7,  9,  5, 11,  9, 11,  5,  6 }
-},
-/*  90:    1,    3, 4,    6,     */  {
- /* 1 */ { 2,  3, 11,  8,  4,  7,  0,  5,  9,  5,  0,  6,  1,  6,  0,  6,  1, 10 },
- /* 2 */ { 9,  0,  1,  8,  4,  7, 10,  2,  5,  3,  5,  2,  5,  3,  6, 11,  6,  3 },
- /* 3 */ { 6,  5, 10,  9,  0,  1,  2,  7, 11,  7,  2,  4,  3,  4,  2,  4,  3,  8 },
- /* 4 */ { 6,  5, 10,  2,  3, 11,  8,  0,  7,  1,  7,  0,  7,  1,  4,  9,  4,  1 },
- /* 5 */ { 6,  5, 10,  8,  4,  7,  1, 11,  2, 11,  1,  9, 11,  9,  3,  0,  3,  9 },
- /* 6 */ { 2,  3, 11,  0,  1,  9,  5, 10,  4,  8,  4, 10,  6,  8, 10,  8,  6,  7 }
-} };
-
-//_____________________________________________________________________________
-/**
- * \brief tiling table for case 13.2 inverted
- * For each of the case above, the specific triangulation of the edge
- * intersection points is given.
- * When a case is ambiguous, there is an auxiliary table that contains
- * the face number to test and the tiling table contains the specific
- * triangulations depending on the results
- * A minus sign means to invert the result of the test.
- */
-//-----------------------------------------------------------------------------
-/* 13.2 */
-static const char tiling13_2_[2][6][18] = {
-/* 165: 0,    2,       5,    7,  */  {
- /* 1 */ { 10,  5,  6, 11,  3,  2,  7,  0,  8,  0,  7,  1,  4,  1,  7,  1,  4,  9 },
- /* 2 */ { 11,  3,  2,  7,  4,  8,  9,  5,  0,  6,  0,  5,  0,  6,  1, 10,  1,  6 },
- /* 3 */ {  1,  0,  9,  7,  4,  8,  5,  2, 10,  2,  5,  3,  6,  3,  5,  3,  6, 11 },
- /* 4 */ { 10,  5,  6,  1,  0,  9, 11,  7,  2,  4,  2,  7,  2,  4,  3,  8,  3,  4 },
- /* 5 */ { 10,  5,  6,  7,  4,  8,  2, 11,  1,  9,  1, 11,  3,  9, 11,  9,  3,  0 },
- /* 6 */ { 11,  3,  2,  9,  1,  0,  4, 10,  5, 10,  4,  8, 10,  8,  6,  7,  6,  8 }
-},
-/*  90:    1,    3, 4,    6,     */  {
- /* 1 */ {  6,  7, 11,  8,  0,  3,  4,  1,  9,  1,  4,  2,  5,  2,  4,  2,  5, 10 },
- /* 2 */ {  8,  0,  3,  4,  5,  9, 10,  6,  1,  7,  1,  6,  1,  7,  2, 11,  2,  7 },
- /* 3 */ {  2,  1, 10,  4,  5,  9,  6,  3, 11,  3,  6,  0,  7,  0,  6,  0,  7,  8 },
- /* 4 */ {  6,  7, 11,  2,  1, 10,  8,  4,  3,  5,  3,  4,  3,  5,  0,  9,  0,  5 },
- /* 5 */ {  6,  7, 11,  4,  5,  9,  3,  8,  2, 10,  2,  8,  0, 10,  8, 10,  0,  1 },
- /* 6 */ {  8,  0,  3, 10,  2,  1,  5, 11,  6, 11,  5,  9, 11,  9,  7,  4,  7,  9 }
-} };
-
-//_____________________________________________________________________________
-/**
- * \brief tiling table for case 13.3
- * For each of the case above, the specific triangulation of the edge
- * intersection points is given.
- * When a case is ambiguous, there is an auxiliary table that contains
- * the face number to test and the tiling table contains the specific
- * triangulations depending on the results
- * A minus sign means to invert the result of the test.
- */
-//-----------------------------------------------------------------------------
-/* 13.3 */
-static const char tiling13_3[2][12][30] = {
-/* 165: 0,    2,       5,    7,  */  {
- /* 1,2 */ { 11,  7,  6, 12,  2, 10, 12, 10,  5, 12,  5,  4, 12,  4,  8, 12,  8,  3, 12,  3,  0, 12,  0,  9, 12,  9,  1, 12,  1,  2 },
- /* 1,4 */ {  1,  2, 10,  9,  5, 12,  0,  9, 12,  3,  0, 12, 11,  3, 12,  6, 11, 12,  7,  6, 12,  8,  7, 12,  4,  8, 12,  5,  4, 12 },
- /* 1,5 */ { 11,  7,  6, 12,  5,  4, 12,  4,  8, 12,  8,  3, 12,  3,  2, 12,  2, 10, 12, 10,  1, 12,  1,  0, 12,  0,  9, 12,  9,  5 },
- /* 1,6 */ {  1,  2, 10, 12,  3,  0, 12,  0,  9, 12,  9,  5, 12,  5,  6, 12,  6, 11, 12, 11,  7, 12,  7,  4, 12,  4,  8, 12,  8,  3 },
- /* 2,3 */ {  8,  3,  0, 11,  7, 12,  2, 11, 12,  1,  2, 12,  9,  1, 12,  4,  9, 12,  5,  4, 12, 10,  5, 12,  6, 10, 12,  7,  6, 12 },
- /* 2,5 */ { 11,  7,  6,  5,  4, 12, 10,  5, 12,  2, 10, 12,  3,  2, 12,  8,  3, 12,  0,  8, 12,  1,  0, 12,  9,  1, 12,  4,  9, 12 },
- /* 2,6 */ {  8,  3,  0,  1,  2, 12,  9,  1, 12,  4,  9, 12,  7,  4, 12, 11,  7, 12,  6, 11, 12,  5,  6, 12, 10,  5, 12,  2, 10, 12 },
- /* 3,4 */ {  9,  5,  4, 12,  0,  8, 12,  8,  7, 12,  7,  6, 12,  6, 10, 12, 10,  1, 12,  1,  2, 12,  2, 11, 12, 11,  3, 12,  3,  0 },
- /* 3,5 */ {  9,  5,  4, 12,  7,  6, 12,  6, 10, 12, 10,  1, 12,  1,  0, 12,  0,  8, 12,  8,  3, 12,  3,  2, 12,  2, 11, 12, 11,  7 },
- /* 3,6 */ {  8,  3,  0, 12,  1,  2, 12,  2, 11, 12, 11,  7, 12,  7,  4, 12,  4,  9, 12,  9,  5, 12,  5,  6, 12,  6, 10, 12, 10,  1 },
- /* 4,5 */ {  9,  5,  4,  7,  6, 12,  8,  7, 12,  0,  8, 12,  1,  0, 12, 10,  1, 12,  2, 10, 12,  3,  2, 12, 11,  3, 12,  6, 11, 12 },
- /* 4,6 */ {  1,  2, 10,  3,  0, 12, 11,  3, 12,  6, 11, 12,  5,  6, 12,  9,  5, 12,  4,  9, 12,  7,  4, 12,  8,  7, 12,  0,  8, 12 }
-},
-/*  90:    1,    3, 4,    6,     */  {
- /* 1,2 */ {  8,  4,  7, 12,  3, 11, 12, 11,  6, 12,  6,  5, 12,  5,  9, 12,  9,  0, 12,  0,  1, 12,  1, 10, 12, 10,  2, 12,  2,  3 },
- /* 1,4 */ {  2,  3, 11, 10,  6, 12,  1, 10, 12,  0,  1, 12,  8,  0, 12,  7,  8, 12,  4,  7, 12,  9,  4, 12,  5,  9, 12,  6,  5, 12 },
- /* 1,5 */ {  8,  4,  7, 12,  6,  5, 12,  5,  9, 12,  9,  0, 12,  0,  3, 12,  3, 11, 12, 11,  2, 12,  2,  1, 12,  1, 10, 12, 10,  6 },
- /* 1,6 */ {  2,  3, 11, 12,  0,  1, 12,  1, 10, 12, 10,  6, 12,  6,  7, 12,  7,  8, 12,  8,  4, 12,  4,  5, 12,  5,  9, 12,  9,  0 },
- /* 2,3 */ {  0,  1,  9,  8,  4, 12,  3,  8, 12,  2,  3, 12, 10,  2, 12,  5, 10, 12,  6,  5, 12, 11,  6, 12,  7, 11, 12,  4,  7, 12 },
- /* 2,5 */ {  8,  4,  7,  6,  5, 12, 11,  6, 12,  3, 11, 12,  0,  3, 12,  9,  0, 12,  1,  9, 12,  2,  1, 12, 10,  2, 12,  5, 10, 12 },
- /* 2,6 */ {  9,  0,  1,  2,  3, 12, 10,  2, 12,  5, 10, 12,  4,  5, 12,  8,  4, 12,  7,  8, 12,  6,  7, 12, 11,  6, 12,  3, 11, 12 },
- /* 3,4 */ {  6,  5, 10, 12,  1,  9, 12,  9,  4, 12,  4,  7, 12,  7, 11, 12, 11,  2, 12,  2,  3, 12,  3,  8, 12,  8,  0, 12,  0,  1 },
- /* 3,5 */ {  6,  5, 10, 12,  4,  7, 12,  7, 11, 12, 11,  2, 12,  2,  1, 12,  1,  9, 12,  9,  0, 12,  0,  3, 12,  3,  8, 12,  8,  4 },
- /* 3,6 */ {  9,  0,  1, 12,  2,  3, 12,  3,  8, 12,  8,  4, 12,  4,  5, 12,  5, 10, 12, 10,  6, 12,  6,  7, 12,  7, 11, 12, 11,  2 },
- /* 4,5 */ {  6,  5, 10,  4,  7, 12,  9,  4, 12,  1,  9, 12,  2,  1, 12, 11,  2, 12,  3, 11, 12,  0,  3, 12,  8,  0, 12,  7,  8, 12 },
- /* 4,6 */ {  2,  3, 11,  0,  1, 12,  8,  0, 12,  7,  8, 12,  6,  7, 12, 10,  6, 12,  5, 10, 12,  4,  5, 12,  9,  4, 12,  1,  9, 12 }
-} };
-
-//_____________________________________________________________________________
-/**
- * \brief tiling table for case 13.3, inverted
- * For each of the case above, the specific triangulation of the edge
- * intersection points is given.
- * When a case is ambiguous, there is an auxiliary table that contains
- * the face number to test and the tiling table contains the specific
- * triangulations depending on the results
- * A minus sign means to invert the result of the test.
- */
-//-----------------------------------------------------------------------------
-/* 13.3 */
-static const char tiling13_3_[2][12][30] = {
-/* 165: 0,    2,       5,    7,  */  {
- /* 1,2 */ {  3,  2, 11,  8,  7, 12,  0,  8, 12,  1,  0, 12, 10,  1, 12,  6, 10, 12,  5,  6, 12,  9,  5, 12,  4,  9, 12,  7,  4, 12 },
- /* 1,4 */ {  5,  6, 10, 12,  2, 11, 12, 11,  7, 12,  7,  4, 12,  4,  9, 12,  9,  1, 12,  1,  0, 12,  0,  8, 12,  8,  3, 12,  3,  2 },
- /* 1,5 */ { 10,  5,  6, 12,  7,  4, 12,  4,  9, 12,  9,  1, 12,  1,  2, 12,  2, 11, 12, 11,  3, 12,  3,  0, 12,  0,  8, 12,  8,  7 },
- /* 1,6 */ { 11,  3,  2, 12,  1,  0, 12,  0,  8, 12,  8,  7, 12,  7,  6, 12,  6, 10, 12, 10,  5, 12,  5,  4, 12,  4,  9, 12,  9,  1 },
- /* 2,3 */ {  7,  4,  8, 11,  3, 12,  6, 11, 12,  5,  6, 12,  9,  5, 12,  0,  9, 12,  1,  0, 12, 10,  1, 12,  2, 10, 12,  3,  2, 12 },
- /* 2,5 */ {  7,  4,  8,  5,  6, 12,  9,  5, 12,  0,  9, 12,  3,  0, 12, 11,  3, 12,  2, 11, 12,  1,  2, 12, 10,  1, 12,  6, 10, 12 },
- /* 2,6 */ { 11,  3,  2,  1,  0, 12, 10,  1, 12,  6, 10, 12,  7,  6, 12,  8,  7, 12,  4,  8, 12,  5,  4, 12,  9,  5, 12,  0,  9, 12 },
- /* 3,4 */ {  1,  0,  9, 12,  4,  8, 12,  8,  3, 12,  3,  2, 12,  2, 10, 12, 10,  5, 12,  5,  6, 12,  6, 11, 12, 11,  7, 12,  7,  4 },
- /* 3,5 */ {  7,  4,  8, 12,  5,  6, 12,  6, 11, 12, 11,  3, 12,  3,  0, 12,  0,  9, 12,  9,  1, 12,  1,  2, 12,  2, 10, 12, 10,  5 },
- /* 3,6 */ {  1,  0,  9, 12,  3,  2, 12,  2, 10, 12, 10,  5, 12,  5,  4, 12,  4,  8, 12,  8,  7, 12,  7,  6, 12,  6, 11, 12, 11,  3 },
- /* 4,5 */ { 10,  5,  6,  7,  4, 12, 11,  7, 12,  2, 11, 12,  1,  2, 12,  9,  1, 12,  0,  9, 12,  3,  0, 12,  8,  3, 12,  4,  8, 12 },
- /* 4,6 */ {  9,  1,  0,  3,  2, 12,  8,  3, 12,  4,  8, 12,  5,  4, 12, 10,  5, 12,  6, 10, 12,  7,  6, 12, 11,  7, 12,  2, 11, 12 }
-},
-/*  90:    1,    3, 4,    6,     */  {
- /* 1,2 */ {  0,  3,  8,  9,  4, 12,  1,  9, 12,  2,  1, 12, 11,  2, 12,  7, 11, 12,  6,  7, 12, 10,  6, 12,  5, 10, 12,  4,  5, 12 },
- /* 1,4 */ { 11,  6,  7, 12,  3,  8, 12,  8,  4, 12,  4,  5, 12,  5, 10, 12, 10,  2, 12,  2,  1, 12,  1,  9, 12,  9,  0, 12,  0,  3 },
- /* 1,5 */ {  6,  7, 11, 12,  4,  5, 12,  5, 10, 12, 10,  2, 12,  2,  3, 12,  3,  8, 12,  8,  0, 12,  0,  1, 12,  1,  9, 12,  9,  4 },
- /* 1,6 */ {  8,  0,  3, 12,  2,  1, 12,  1,  9, 12,  9,  4, 12,  4,  7, 12,  7, 11, 12, 11,  6, 12,  6,  5, 12,  5, 10, 12, 10,  2 },
- /* 2,3 */ {  4,  5,  9,  8,  0, 12,  7,  8, 12,  6,  7, 12, 10,  6, 12,  1, 10, 12,  2,  1, 12, 11,  2, 12,  3, 11, 12,  0,  3, 12 },
- /* 2,5 */ {  4,  5,  9,  6,  7, 12, 10,  6, 12,  1, 10, 12,  0,  1, 12,  8,  0, 12,  3,  8, 12,  2,  3, 12, 11,  2, 12,  7, 11, 12 },
- /* 2,6 */ {  8,  0,  3,  2,  1, 12, 11,  2, 12,  7, 11, 12,  4,  7, 12,  9,  4, 12,  5,  9, 12,  6,  5, 12, 10,  6, 12,  1, 10, 12 },
- /* 3,4 */ {  2,  1, 10, 12,  5,  9, 12,  9,  0, 12,  0,  3, 12,  3, 11, 12, 11,  6, 12,  6,  7, 12,  7,  8, 12,  8,  4, 12,  4,  5 },
- /* 3,5 */ {  4,  5,  9, 12,  6,  7, 12,  7,  8, 12,  8,  0, 12,  0,  1, 12,  1, 10, 12, 10,  2, 12,  2,  3, 12,  3, 11, 12, 11,  6 },
- /* 3,6 */ {  2,  1, 10, 12,  0,  3, 12,  3, 11, 12, 11,  6, 12,  6,  5, 12,  5,  9, 12,  9,  4, 12,  4,  7, 12,  7,  8, 12,  8,  0 },
- /* 4,5 */ {  6,  7, 11,  4,  5, 12,  8,  4, 12,  3,  8, 12,  2,  3, 12, 10,  2, 12,  1, 10, 12,  0,  1, 12,  9,  0, 12,  5,  9, 12 },
- /* 4,6 */ { 10,  2,  1,  0,  3, 12,  9,  0, 12,  5,  9, 12,  6,  5, 12, 11,  6, 12,  7, 11, 12,  4,  7, 12,  8,  4, 12,  3,  8, 12 }
-} };
-
-//_____________________________________________________________________________
-/**
- * \brief tiling table for case 13.4
- * For each of the case above, the specific triangulation of the edge
- * intersection points is given.
- * When a case is ambiguous, there is an auxiliary table that contains
- * the face number to test and the tiling table contains the specific
- * triangulations depending on the results
- * A minus sign means to invert the result of the test.
- */
-//-----------------------------------------------------------------------------
-/* 13.4 */
-static const char tiling13_4[2][4][36] = {
-/* 165: 0,    2,       5,    7,  */  {
-/* 1,2,6 */  { 12,  2, 10, 12, 10,  5, 12,  5,  6, 12,  6, 11, 12, 11,  7, 12,  7,  4, 12,  4,  8, 12,  8,  3, 12,  3,  0, 12,  0,  9, 12,  9,  1, 12,  1,  2 },
-/* 1,4,5 */  { 11,  3, 12,  6, 11, 12,  7,  6, 12,  8,  7, 12,  4,  8, 12,  5,  4, 12,  9,  5, 12,  0,  9, 12,  1,  0, 12, 10,  1, 12,  2, 10, 12,  3,  2, 12 },
-/* 2,3,5 */  {  9,  1, 12,  4,  9, 12,  5,  4, 12, 10,  5, 12,  6, 10, 12,  7,  6, 12, 11,  7, 12,  2, 11, 12,  3,  2, 12,  8,  3, 12,  0,  8, 12,  1,  0, 12 },
-/* 3,4,6 */  { 12,  0,  8, 12,  8,  7, 12,  7,  4, 12,  4,  9, 12,  9,  5, 12,  5,  6, 12,  6, 10, 12, 10,  1, 12,  1,  2, 12,  2, 11, 12, 11,  3, 12,  3,  0 }
-},
-/*  90:    1,    3, 4,    6,     */  {
-/* 1,2,6 */  { 12,  3, 11, 12, 11,  6, 12,  6,  7, 12,  7,  8, 12,  8,  4, 12,  4,  5, 12,  5,  9, 12,  9,  0, 12,  0,  1, 12,  1, 10, 12, 10,  2, 12,  2,  3 },
-/* 1,4,5 */  {  8,  0, 12,  7,  8, 12,  4,  7, 12,  9,  4, 12,  5,  9, 12,  6,  5, 12, 10,  6, 12,  1, 10, 12,  2,  1, 12, 11,  2, 12,  3, 11, 12,  0,  3, 12 },
-/* 2,3,5 */  { 10,  2, 12,  5, 10, 12,  6,  5, 12, 11,  6, 12,  7, 11, 12,  4,  7, 12,  8,  4, 12,  3,  8, 12,  0,  3, 12,  9,  0, 12,  1,  9, 12,  2,  1, 12 },
-/* 3,4,6 */  { 12,  1,  9, 12,  9,  4, 12,  4,  5, 12,  5, 10, 12, 10,  6, 12,  6,  7, 12,  7, 11, 12, 11,  2, 12,  2,  3, 12,  3,  8, 12,  8,  0, 12,  0,  1 }
-} };
-
-//_____________________________________________________________________________
-/**
- * \brief tiling table for case 13.5.1
- * The support edge for the interior test is marked as the 1st column.
- * For each of the case above, the specific triangulation of the edge
- * intersection points is given.
- * When a case is ambiguous, there is an auxiliary table that contains
- * the face number to test and the tiling table contains the specific
- * triangulations depending on the results
- * A minus sign means to invert the result of the test.
- */
-//-----------------------------------------------------------------------------
-/* 13.5.1 */
-static const char tiling13_5_1[2][4][18] = {
-/* 165: 0,    2,       5,    7,  */  {
-/* 1,2,5 */  {  7,  6, 11,  1,  0,  9, 10,  3,  2,  3, 10,  5,  3,  5,  8,  4,  8, 5 },
-/* 1,4,6 */  {  1,  2, 10,  7,  4,  8,  3,  0, 11,  6, 11,  0,  9,  6,  0,  6,  9, 5 },
-/* 2,3,6 */  {  3,  0,  8,  5,  6, 10,  1,  2,  9,  4,  9,  2, 11,  4,  2,  4, 11, 7 },
-/* 3,4,5 */  {  5,  4,  9,  3,  2, 11,  8,  1,  0,  1,  8,  7,  1,  7, 10,  6, 10, 7 }
-},
-/*  90:    1,    3, 4,    6,     */  {
-/* 1,2,5 */  {  4,  7,  8,  2,  1, 10, 11,  0,  3,  0, 11,  6,  0,  6,  9,  5,  9, 6 },
-/* 1,4,6 */  {  2,  3, 11,  4,  5,  9,  0,  1,  8,  7,  8,  1, 10,  7,  1,  7, 10, 6 },
-/* 2,3,6 */  {  0,  1,  9,  6,  7, 11,  2,  3, 10,  5, 10,  3,  8,  5,  3,  5,  8, 4 },
-/* 3,4,5 */  {  6,  5, 10,  0,  3,  8,  9,  2,  1,  2,  9,  4,  2,  4, 11,  7, 11, 4 }
-} };
-
-//_____________________________________________________________________________
-/**
- * \brief tiling table for case 13.5.2
- * For each of the case above, the specific triangulation of the edge
- * intersection points is given.
- * When a case is ambiguous, there is an auxiliary table that contains
- * the face number to test and the tiling table contains the specific
- * triangulations depending on the results
- * A minus sign means to invert the result of the test.
- */
-//-----------------------------------------------------------------------------
-/* 13.5.2 */
-static const char tiling13_5_2[2][4][30] = {
-/* 165: 0,    2,       5,    7,  */  {
-/* 1,2,5 */  { 1,  0,  9,  7,  4,  8,  7,  8,  3,  7,  3, 11,  2, 11,  3, 11,  2, 10, 11, 10,  6,  5,  6, 10,  6,  5,  7,  4,  7, 5 },
-/* 1,4,6 */  { 7,  4,  8, 11,  3,  2,  6, 11,  2, 10,  6,  2,  6, 10,  5,  9,  5, 10,  1,  9, 10,  9,  1,  0,  2,  0,  1,  0,  2, 3 },
-/* 2,3,6 */  { 5,  6, 10,  9,  1,  0,  4,  9,  0,  8,  4,  0,  4,  8,  7, 11,  7,  8,  3, 11,  8, 11,  3,  2,  0,  2,  3,  2,  0, 1 },
-/* 3,4,5 */  { 3,  2, 11,  5,  6, 10,  5, 10,  1,  5,  1,  9,  0,  9,  1,  9,  0,  8,  9,  8,  4,  4,  8,  7,  4,  7,  5,  6,  5, 7 }
-},
-/*  90:    1,    3, 4,    6,     */  {
-/* 1,2,5 */  { 2,  1, 10,  4,  5,  9,  4,  9,  0,  4,  0,  8,  3,  8,  0,  8,  3, 11,  8, 11,  7,  6,  7, 11,  7,  6,  4,  5,  4, 6 },
-/* 1,4,6 */  { 4,  5,  9,  8,  0,  3,  7,  8,  3, 11,  7,  3,  7, 11,  6, 10,  6, 11,  2, 10, 11, 10,  2,  1,  3,  1,  2,  1,  3, 0 },
-/* 2,3,6 */  { 6,  7, 11, 10,  2,  1,  5, 10,  1,  9,  5,  1,  5,  9,  4,  8,  4,  9,  0,  8,  9,  8,  0,  3,  1,  3,  0,  3,  1, 2 },
-/* 3,4,5 */  { 0,  3,  8,  6,  7, 11,  6, 11,  2,  6,  2, 10,  1, 10,  2, 10,  1,  9, 10,  9,  5,  5,  9,  4,  5,  4,  6,  7,  6, 4 }
-} };
-//_____________________________________________________________________________
-
-
-
-//_____________________________________________________________________________
-/**
- * \brief tiling table for case 14
- * For each of the case above, the specific triangulation of the edge
- * intersection points is given.
- * When a case is ambiguous, there is an auxiliary table that contains
- * the face number to test and the tiling table contains the specific
- * triangulations depending on the results
- * A minus sign means to invert the result of the test.
- */
-//-----------------------------------------------------------------------------
-static const char tiling14[12][12] = {
-/*  71: 0, 1, 2,          6,     */  {  5,  9,  8,  5,  8,  2,  5,  2,  6,  3,  2,  8 },
-/*  43: 0, 1,    3,    5,        */  {  2,  1,  5,  2,  5,  8,  2,  8, 11,  4,  8,  5 },
-/* 147: 0, 1,       4,       7,  */  {  9,  4,  6,  9,  6,  3,  9,  3,  1, 11,  3,  6 },
-/*  29: 0,    2, 3, 4,           */  {  1, 11, 10,  1,  4, 11,  1,  0,  4,  7, 11,  4 },
-/* 201: 0,       3,       6, 7,  */  {  8,  2,  0,  8,  5,  2,  8,  7,  5, 10,  2,  5 },
-/* 113: 0,          4, 5, 6,     */  {  0,  7,  3,  0, 10,  7,  0,  9, 10,  6,  7, 10 },
-/* 142:    1, 2, 3,          7,  */  {  0,  3,  7,  0,  7, 10,  0, 10,  9,  6, 10,  7 },
-/*  54:    1, 2,    4, 5,        */  {  8,  0,  2,  8,  2,  5,  8,  5,  7, 10,  5,  2 },
-/* 226:    1,          5, 6, 7,  */  {  1, 10, 11,  1, 11,  4,  1,  4,  0,  7,  4, 11 },
-/* 108:       2, 3,    5, 6,     */  {  9,  6,  4,  9,  3,  6,  9,  1,  3, 11,  6,  3 },
-/* 212:       2,    4,    6, 7,  */  {  2,  5,  1,  2,  8,  5,  2, 11,  8,  4,  5,  8 },
-/* 184:          3, 4, 5,    7,  */  {  5,  8,  9,  5,  2,  8,  5,  6,  2,  3,  8,  2 }
-};
-//_____________________________________________________________________________
-
-
-
-//_____________________________________________________________________________
-/**
- * \brief original Marching Cubes implementation
- * For each of the possible vertex states listed in this table there is a
- * specific triangulation of the edge intersection points.  The table lists
- * all of them in the form of 0-5 edge triples with the list terminated by
- * the invalid value -1.  For example: casesClassic[3] list the 2 triangles
- * formed when cube[0] and cube[1] are inside of the surface, but the rest of
- * the cube is not.
- */
-//-----------------------------------------------------------------------------
-static const char casesClassic[256][16] = {
-/*   0:                          */  { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 },
-/*   1: 0,                       */  {  0,  8,  3, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 },
-/*   2:    1,                    */  {  0,  1,  9, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 },
-/*   3: 0, 1,                    */  {  1,  8,  3,  9,  8,  1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 },
-/*   4:       2,                 */  {  1,  2, 10, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 },
-/*   5: 0,    2,                 */  {  0,  8,  3,  1,  2, 10, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 },
-/*   6:    1, 2,                 */  {  9,  2, 10,  0,  2,  9, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 },
-/*   7: 0, 1, 2,                 */  {  2,  8,  3,  2, 10,  8, 10,  9,  8, -1, -1, -1, -1, -1, -1, -1 },
-/*   8:          3,              */  {  3, 11,  2, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 },
-/*   9: 0,       3,              */  {  0, 11,  2,  8, 11,  0, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 },
-/*  10:    1,    3,              */  {  1,  9,  0,  2,  3, 11, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 },
-/*  11: 0, 1,    3,              */  {  1, 11,  2,  1,  9, 11,  9,  8, 11, -1, -1, -1, -1, -1, -1, -1 },
-/*  12:       2, 3,              */  {  3, 10,  1, 11, 10,  3, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 },
-/*  13: 0,    2, 3,              */  {  0, 10,  1,  0,  8, 10,  8, 11, 10, -1, -1, -1, -1, -1, -1, -1 },
-/*  14:    1, 2, 3,              */  {  3,  9,  0,  3, 11,  9, 11, 10,  9, -1, -1, -1, -1, -1, -1, -1 },
-/*  15: 0, 1, 2, 3,              */  {  9,  8, 10, 10,  8, 11, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 },
-/*  16:             4,           */  {  4,  7,  8, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 },
-/*  17: 0,          4,           */  {  4,  3,  0,  7,  3,  4, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 },
-/*  18:    1,       4,           */  {  0,  1,  9,  8,  4,  7, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 },
-/*  19: 0, 1,       4,           */  {  4,  1,  9,  4,  7,  1,  7,  3,  1, -1, -1, -1, -1, -1, -1, -1 },
-/*  20:       2,    4,           */  {  1,  2, 10,  8,  4,  7, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 },
-/*  21: 0,    2,    4,           */  {  3,  4,  7,  3,  0,  4,  1,  2, 10, -1, -1, -1, -1, -1, -1, -1 },
-/*  22:    1, 2,    4,           */  {  9,  2, 10,  9,  0,  2,  8,  4,  7, -1, -1, -1, -1, -1, -1, -1 },
-/*  23: 0, 1, 2,    4,           */  {  2, 10,  9,  2,  9,  7,  2,  7,  3,  7,  9,  4, -1, -1, -1, -1 },
-/*  24:          3, 4,           */  {  8,  4,  7,  3, 11,  2, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 },
-/*  25: 0,       3, 4,           */  { 11,  4,  7, 11,  2,  4,  2,  0,  4, -1, -1, -1, -1, -1, -1, -1 },
-/*  26:    1,    3, 4,           */  {  9,  0,  1,  8,  4,  7,  2,  3, 11, -1, -1, -1, -1, -1, -1, -1 },
-/*  27: 0, 1,    3, 4,           */  {  4,  7, 11,  9,  4, 11,  9, 11,  2,  9,  2,  1, -1, -1, -1, -1 },
-/*  28:       2, 3, 4,           */  {  3, 10,  1,  3, 11, 10,  7,  8,  4, -1, -1, -1, -1, -1, -1, -1 },
-/*  29: 0,    2, 3, 4,           */  {  1, 11, 10,  1,  4, 11,  1,  0,  4,  7, 11,  4, -1, -1, -1, -1 },
-/*  30:    1, 2, 3, 4,           */  {  4,  7,  8,  9,  0, 11,  9, 11, 10, 11,  0,  3, -1, -1, -1, -1 },
-/*  31: 0, 1, 2, 3, 4,           */  {  4,  7, 11,  4, 11,  9,  9, 11, 10, -1, -1, -1, -1, -1, -1, -1 },
-/*  32:                5,        */  {  9,  5,  4, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 },
-/*  33: 0,             5,        */  {  9,  5,  4,  0,  8,  3, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 },
-/*  34:    1,          5,        */  {  0,  5,  4,  1,  5,  0, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 },
-/*  35: 0, 1,          5,        */  {  8,  5,  4,  8,  3,  5,  3,  1,  5, -1, -1, -1, -1, -1, -1, -1 },
-/*  36:       2,       5,        */  {  1,  2, 10,  9,  5,  4, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 },
-/*  37: 0,    2,       5,        */  {  3,  0,  8,  1,  2, 10,  4,  9,  5, -1, -1, -1, -1, -1, -1, -1 },
-/*  38:    1, 2,       5,        */  {  5,  2, 10,  5,  4,  2,  4,  0,  2, -1, -1, -1, -1, -1, -1, -1 },
-/*  39: 0, 1, 2,       5,        */  {  2, 10,  5,  3,  2,  5,  3,  5,  4,  3,  4,  8, -1, -1, -1, -1 },
-/*  40:          3,    5,        */  {  9,  5,  4,  2,  3, 11, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 },
-/*  41: 0,       3,    5,        */  {  0, 11,  2,  0,  8, 11,  4,  9,  5, -1, -1, -1, -1, -1, -1, -1 },
-/*  42:    1,    3,    5,        */  {  0,  5,  4,  0,  1,  5,  2,  3, 11, -1, -1, -1, -1, -1, -1, -1 },
-/*  43: 0, 1,    3,    5,        */  {  2,  1,  5,  2,  5,  8,  2,  8, 11,  4,  8,  5, -1, -1, -1, -1 },
-/*  44:       2, 3,    5,        */  { 10,  3, 11, 10,  1,  3,  9,  5,  4, -1, -1, -1, -1, -1, -1, -1 },
-/*  45: 0,    2, 3,    5,        */  {  4,  9,  5,  0,  8,  1,  8, 10,  1,  8, 11, 10, -1, -1, -1, -1 },
-/*  46:    1, 2, 3,    5,        */  {  5,  4,  0,  5,  0, 11,  5, 11, 10, 11,  0,  3, -1, -1, -1, -1 },
-/*  47: 0, 1, 2, 3,    5,        */  {  5,  4,  8,  5,  8, 10, 10,  8, 11, -1, -1, -1, -1, -1, -1, -1 },
-/*  48:             4, 5,        */  {  9,  7,  8,  5,  7,  9, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 },
-/*  49: 0,          4, 5,        */  {  9,  3,  0,  9,  5,  3,  5,  7,  3, -1, -1, -1, -1, -1, -1, -1 },
-/*  50:    1,       4, 5,        */  {  0,  7,  8,  0,  1,  7,  1,  5,  7, -1, -1, -1, -1, -1, -1, -1 },
-/*  51: 0, 1,       4, 5,        */  {  1,  5,  3,  3,  5,  7, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 },
-/*  52:       2,    4, 5,        */  {  9,  7,  8,  9,  5,  7, 10,  1,  2, -1, -1, -1, -1, -1, -1, -1 },
-/*  53: 0,    2,    4, 5,        */  { 10,  1,  2,  9,  5,  0,  5,  3,  0,  5,  7,  3, -1, -1, -1, -1 },
-/*  54:    1, 2,    4, 5,        */  {  8,  0,  2,  8,  2,  5,  8,  5,  7, 10,  5,  2, -1, -1, -1, -1 },
-/*  55: 0, 1, 2,    4, 5,        */  {  2, 10,  5,  2,  5,  3,  3,  5,  7, -1, -1, -1, -1, -1, -1, -1 },
-/*  56:          3, 4, 5,        */  {  7,  9,  5,  7,  8,  9,  3, 11,  2, -1, -1, -1, -1, -1, -1, -1 },
-/*  57: 0,       3, 4, 5,        */  {  9,  5,  7,  9,  7,  2,  9,  2,  0,  2,  7, 11, -1, -1, -1, -1 },
-/*  58:    1,    3, 4, 5,        */  {  2,  3, 11,  0,  1,  8,  1,  7,  8,  1,  5,  7, -1, -1, -1, -1 },
-/*  59: 0, 1,    3, 4, 5,        */  { 11,  2,  1, 11,  1,  7,  7,  1,  5, -1, -1, -1, -1, -1, -1, -1 },
-/*  60:       2, 3, 4, 5,        */  {  9,  5,  8,  8,  5,  7, 10,  1,  3, 10,  3, 11, -1, -1, -1, -1 },
-/*  61: 0,    2, 3, 4, 5,        */  {  5,  7,  0,  5,  0,  9,  7, 11,  0,  1,  0, 10, 11, 10,  0, -1 },
-/*  62:    1, 2, 3, 4, 5,        */  { 11, 10,  0, 11,  0,  3, 10,  5,  0,  8,  0,  7,  5,  7,  0, -1 },
-/*  63: 0, 1, 2, 3, 4, 5,        */  { 11, 10,  5,  7, 11,  5, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 },
-/*  64:                   6,     */  { 10,  6,  5, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 },
-/*  65: 0,                6,     */  {  0,  8,  3,  5, 10,  6, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 },
-/*  66:    1,             6,     */  {  9,  0,  1,  5, 10,  6, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 },
-/*  67: 0, 1,             6,     */  {  1,  8,  3,  1,  9,  8,  5, 10,  6, -1, -1, -1, -1, -1, -1, -1 },
-/*  68:       2,          6,     */  {  1,  6,  5,  2,  6,  1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 },
-/*  69: 0,    2,          6,     */  {  1,  6,  5,  1,  2,  6,  3,  0,  8, -1, -1, -1, -1, -1, -1, -1 },
-/*  70:    1, 2,          6,     */  {  9,  6,  5,  9,  0,  6,  0,  2,  6, -1, -1, -1, -1, -1, -1, -1 },
-/*  71: 0, 1, 2,          6,     */  {  5,  9,  8,  5,  8,  2,  5,  2,  6,  3,  2,  8, -1, -1, -1, -1 },
-/*  72:          3,       6,     */  {  2,  3, 11, 10,  6,  5, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 },
-/*  73: 0,       3,       6,     */  { 11,  0,  8, 11,  2,  0, 10,  6,  5, -1, -1, -1, -1, -1, -1, -1 },
-/*  74:    1,    3,       6,     */  {  0,  1,  9,  2,  3, 11,  5, 10,  6, -1, -1, -1, -1, -1, -1, -1 },
-/*  75: 0, 1,    3,       6,     */  {  5, 10,  6,  1,  9,  2,  9, 11,  2,  9,  8, 11, -1, -1, -1, -1 },
-/*  76:       2, 3,       6,     */  {  6,  3, 11,  6,  5,  3,  5,  1,  3, -1, -1, -1, -1, -1, -1, -1 },
-/*  77: 0,    2, 3,       6,     */  {  0,  8, 11,  0, 11,  5,  0,  5,  1,  5, 11,  6, -1, -1, -1, -1 },
-/*  78:    1, 2, 3,       6,     */  {  3, 11,  6,  0,  3,  6,  0,  6,  5,  0,  5,  9, -1, -1, -1, -1 },
-/*  79: 0, 1, 2, 3,       6,     */  {  6,  5,  9,  6,  9, 11, 11,  9,  8, -1, -1, -1, -1, -1, -1, -1 },
-/*  80:             4,    6,     */  {  5, 10,  6,  4,  7,  8, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 },
-/*  81: 0,          4,    6,     */  {  4,  3,  0,  4,  7,  3,  6,  5, 10, -1, -1, -1, -1, -1, -1, -1 },
-/*  82:    1,       4,    6,     */  {  1,  9,  0,  5, 10,  6,  8,  4,  7, -1, -1, -1, -1, -1, -1, -1 },
-/*  83: 0, 1,       4,    6,     */  { 10,  6,  5,  1,  9,  7,  1,  7,  3,  7,  9,  4, -1, -1, -1, -1 },
-/*  84:       2,    4,    6,     */  {  6,  1,  2,  6,  5,  1,  4,  7,  8, -1, -1, -1, -1, -1, -1, -1 },
-/*  85: 0,    2,    4,    6,     */  {  1,  2,  5,  5,  2,  6,  3,  0,  4,  3,  4,  7, -1, -1, -1, -1 },
-/*  86:    1, 2,    4,    6,     */  {  8,  4,  7,  9,  0,  5,  0,  6,  5,  0,  2,  6, -1, -1, -1, -1 },
-/*  87: 0, 1, 2,    4,    6,     */  {  7,  3,  9,  7,  9,  4,  3,  2,  9,  5,  9,  6,  2,  6,  9, -1 },
-/*  88:          3, 4,    6,     */  {  3, 11,  2,  7,  8,  4, 10,  6,  5, -1, -1, -1, -1, -1, -1, -1 },
-/*  89: 0,       3, 4,    6,     */  {  5, 10,  6,  4,  7,  2,  4,  2,  0,  2,  7, 11, -1, -1, -1, -1 },
-/*  90:    1,    3, 4,    6,     */  {  0,  1,  9,  4,  7,  8,  2,  3, 11,  5, 10,  6, -1, -1, -1, -1 },
-/*  91: 0, 1,    3, 4,    6,     */  {  9,  2,  1,  9, 11,  2,  9,  4, 11,  7, 11,  4,  5, 10,  6, -1 },
-/*  92:       2, 3, 4,    6,     */  {  8,  4,  7,  3, 11,  5,  3,  5,  1,  5, 11,  6, -1, -1, -1, -1 },
-/*  93: 0,    2, 3, 4,    6,     */  {  5,  1, 11,  5, 11,  6,  1,  0, 11,  7, 11,  4,  0,  4, 11, -1 },
-/*  94:    1, 2, 3, 4,    6,     */  {  0,  5,  9,  0,  6,  5,  0,  3,  6, 11,  6,  3,  8,  4,  7, -1 },
-/*  95: 0, 1, 2, 3, 4,    6,     */  {  6,  5,  9,  6,  9, 11,  4,  7,  9,  7, 11,  9, -1, -1, -1, -1 },
-/*  96:                5, 6,     */  { 10,  4,  9,  6,  4, 10, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 },
-/*  97: 0,             5, 6,     */  {  4, 10,  6,  4,  9, 10,  0,  8,  3, -1, -1, -1, -1, -1, -1, -1 },
-/*  98:    1,          5, 6,     */  { 10,  0,  1, 10,  6,  0,  6,  4,  0, -1, -1, -1, -1, -1, -1, -1 },
-/*  99: 0, 1,          5, 6,     */  {  8,  3,  1,  8,  1,  6,  8,  6,  4,  6,  1, 10, -1, -1, -1, -1 },
-/* 100:       2,       5, 6,     */  {  1,  4,  9,  1,  2,  4,  2,  6,  4, -1, -1, -1, -1, -1, -1, -1 },
-/* 101: 0,    2,       5, 6,     */  {  3,  0,  8,  1,  2,  9,  2,  4,  9,  2,  6,  4, -1, -1, -1, -1 },
-/* 102:    1, 2,       5, 6,     */  {  0,  2,  4,  4,  2,  6, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 },
-/* 103: 0, 1, 2,       5, 6,     */  {  8,  3,  2,  8,  2,  4,  4,  2,  6, -1, -1, -1, -1, -1, -1, -1 },
-/* 104:          3,    5, 6,     */  { 10,  4,  9, 10,  6,  4, 11,  2,  3, -1, -1, -1, -1, -1, -1, -1 },
-/* 105: 0,       3,    5, 6,     */  {  0,  8,  2,  2,  8, 11,  4,  9, 10,  4, 10,  6, -1, -1, -1, -1 },
-/* 106:    1,    3,    5, 6,     */  {  3, 11,  2,  0,  1,  6,  0,  6,  4,  6,  1, 10, -1, -1, -1, -1 },
-/* 107: 0, 1,    3,    5, 6,     */  {  6,  4,  1,  6,  1, 10,  4,  8,  1,  2,  1, 11,  8, 11,  1, -1 },
-/* 108:       2, 3,    5, 6,     */  {  9,  6,  4,  9,  3,  6,  9,  1,  3, 11,  6,  3, -1, -1, -1, -1 },
-/* 109: 0,    2, 3,    5, 6,     */  {  8, 11,  1,  8,  1,  0, 11,  6,  1,  9,  1,  4,  6,  4,  1, -1 },
-/* 110:    1, 2, 3,    5, 6,     */  {  3, 11,  6,  3,  6,  0,  0,  6,  4, -1, -1, -1, -1, -1, -1, -1 },
-/* 111: 0, 1, 2, 3,    5, 6,     */  {  6,  4,  8, 11,  6,  8, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 },
-/* 112:             4, 5, 6,     */  {  7, 10,  6,  7,  8, 10,  8,  9, 10, -1, -1, -1, -1, -1, -1, -1 },
-/* 113: 0,          4, 5, 6,     */  {  0,  7,  3,  0, 10,  7,  0,  9, 10,  6,  7, 10, -1, -1, -1, -1 },
-/* 114:    1,       4, 5, 6,     */  { 10,  6,  7,  1, 10,  7,  1,  7,  8,  1,  8,  0, -1, -1, -1, -1 },
-/* 115: 0, 1,       4, 5, 6,     */  { 10,  6,  7, 10,  7,  1,  1,  7,  3, -1, -1, -1, -1, -1, -1, -1 },
-/* 116:       2,    4, 5, 6,     */  {  1,  2,  6,  1,  6,  8,  1,  8,  9,  8,  6,  7, -1, -1, -1, -1 },
-/* 117: 0,    2,    4, 5, 6,     */  {  2,  6,  9,  2,  9,  1,  6,  7,  9,  0,  9,  3,  7,  3,  9, -1 },
-/* 118:    1, 2,    4, 5, 6,     */  {  7,  8,  0,  7,  0,  6,  6,  0,  2, -1, -1, -1, -1, -1, -1, -1 },
-/* 119: 0, 1, 2,    4, 5, 6,     */  {  7,  3,  2,  6,  7,  2, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 },
-/* 120:          3, 4, 5, 6,     */  {  2,  3, 11, 10,  6,  8, 10,  8,  9,  8,  6,  7, -1, -1, -1, -1 },
-/* 121: 0,       3, 4, 5, 6,     */  {  2,  0,  7,  2,  7, 11,  0,  9,  7,  6,  7, 10,  9, 10,  7, -1 },
-/* 122:    1,    3, 4, 5, 6,     */  {  1,  8,  0,  1,  7,  8,  1, 10,  7,  6,  7, 10,  2,  3, 11, -1 },
-/* 123: 0, 1,    3, 4, 5, 6,     */  { 11,  2,  1, 11,  1,  7, 10,  6,  1,  6,  7,  1, -1, -1, -1, -1 },
-/* 124:       2, 3, 4, 5, 6,     */  {  8,  9,  6,  8,  6,  7,  9,  1,  6, 11,  6,  3,  1,  3,  6, -1 },
-/* 125: 0,    2, 3, 4, 5, 6,     */  {  0,  9,  1, 11,  6,  7, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 },
-/* 126:    1, 2, 3, 4, 5, 6,     */  {  7,  8,  0,  7,  0,  6,  3, 11,  0, 11,  6,  0, -1, -1, -1, -1 },
-/* 127: 0, 1, 2, 3, 4, 5, 6,     */  {  7, 11,  6, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 },
-/* 128:                      7,  */  {  7,  6, 11, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 },
-/* 129: 0,                   7,  */  {  3,  0,  8, 11,  7,  6, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 },
-/* 130:    1,                7,  */  {  0,  1,  9, 11,  7,  6, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 },
-/* 131: 0, 1,                7,  */  {  8,  1,  9,  8,  3,  1, 11,  7,  6, -1, -1, -1, -1, -1, -1, -1 },
-/* 132:       2,             7,  */  { 10,  1,  2,  6, 11,  7, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 },
-/* 133: 0,    2,             7,  */  {  1,  2, 10,  3,  0,  8,  6, 11,  7, -1, -1, -1, -1, -1, -1, -1 },
-/* 134:    1, 2,             7,  */  {  2,  9,  0,  2, 10,  9,  6, 11,  7, -1, -1, -1, -1, -1, -1, -1 },
-/* 135: 0, 1, 2,             7,  */  {  6, 11,  7,  2, 10,  3, 10,  8,  3, 10,  9,  8, -1, -1, -1, -1 },
-/* 136:          3,          7,  */  {  7,  2,  3,  6,  2,  7, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 },
-/* 137: 0,       3,          7,  */  {  7,  0,  8,  7,  6,  0,  6,  2,  0, -1, -1, -1, -1, -1, -1, -1 },
-/* 138:    1,    3,          7,  */  {  2,  7,  6,  2,  3,  7,  0,  1,  9, -1, -1, -1, -1, -1, -1, -1 },
-/* 139: 0, 1,    3,          7,  */  {  1,  6,  2,  1,  8,  6,  1,  9,  8,  8,  7,  6, -1, -1, -1, -1 },
-/* 140:       2, 3,          7,  */  { 10,  7,  6, 10,  1,  7,  1,  3,  7, -1, -1, -1, -1, -1, -1, -1 },
-/* 141: 0,    2, 3,          7,  */  { 10,  7,  6,  1,  7, 10,  1,  8,  7,  1,  0,  8, -1, -1, -1, -1 },
-/* 142:    1, 2, 3,          7,  */  {  0,  3,  7,  0,  7, 10,  0, 10,  9,  6, 10,  7, -1, -1, -1, -1 },
-/* 143: 0, 1, 2, 3,          7,  */  {  7,  6, 10,  7, 10,  8,  8, 10,  9, -1, -1, -1, -1, -1, -1, -1 },
-/* 144:             4,       7,  */  {  6,  8,  4, 11,  8,  6, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 },
-/* 145: 0,          4,       7,  */  {  3,  6, 11,  3,  0,  6,  0,  4,  6, -1, -1, -1, -1, -1, -1, -1 },
-/* 146:    1,       4,       7,  */  {  8,  6, 11,  8,  4,  6,  9,  0,  1, -1, -1, -1, -1, -1, -1, -1 },
-/* 147: 0, 1,       4,       7,  */  {  9,  4,  6,  9,  6,  3,  9,  3,  1, 11,  3,  6, -1, -1, -1, -1 },
-/* 148:       2,    4,       7,  */  {  6,  8,  4,  6, 11,  8,  2, 10,  1, -1, -1, -1, -1, -1, -1, -1 },
-/* 149: 0,    2,    4,       7,  */  {  1,  2, 10,  3,  0, 11,  0,  6, 11,  0,  4,  6, -1, -1, -1, -1 },
-/* 150:    1, 2,    4,       7,  */  {  4, 11,  8,  4,  6, 11,  0,  2,  9,  2, 10,  9, -1, -1, -1, -1 },
-/* 151: 0, 1, 2,    4,       7,  */  { 10,  9,  3, 10,  3,  2,  9,  4,  3, 11,  3,  6,  4,  6,  3, -1 },
-/* 152:          3, 4,       7,  */  {  8,  2,  3,  8,  4,  2,  4,  6,  2, -1, -1, -1, -1, -1, -1, -1 },
-/* 153: 0,       3, 4,       7,  */  {  0,  4,  2,  4,  6,  2, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 },
-/* 154:    1,    3, 4,       7,  */  {  1,  9,  0,  2,  3,  4,  2,  4,  6,  4,  3,  8, -1, -1, -1, -1 },
-/* 155: 0, 1,    3, 4,       7,  */  {  1,  9,  4,  1,  4,  2,  2,  4,  6, -1, -1, -1, -1, -1, -1, -1 },
-/* 156:       2, 3, 4,       7,  */  {  8,  1,  3,  8,  6,  1,  8,  4,  6,  6, 10,  1, -1, -1, -1, -1 },
-/* 157: 0,    2, 3, 4,       7,  */  { 10,  1,  0, 10,  0,  6,  6,  0,  4, -1, -1, -1, -1, -1, -1, -1 },
-/* 158:    1, 2, 3, 4,       7,  */  {  4,  6,  3,  4,  3,  8,  6, 10,  3,  0,  3,  9, 10,  9,  3, -1 },
-/* 159: 0, 1, 2, 3, 4,       7,  */  { 10,  9,  4,  6, 10,  4, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 },
-/* 160:                5,    7,  */  {  4,  9,  5,  7,  6, 11, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 },
-/* 161: 0,             5,    7,  */  {  0,  8,  3,  4,  9,  5, 11,  7,  6, -1, -1, -1, -1, -1, -1, -1 },
-/* 162:    1,          5,    7,  */  {  5,  0,  1,  5,  4,  0,  7,  6, 11, -1, -1, -1, -1, -1, -1, -1 },
-/* 163: 0, 1,          5,    7,  */  { 11,  7,  6,  8,  3,  4,  3,  5,  4,  3,  1,  5, -1, -1, -1, -1 },
-/* 164:       2,       5,    7,  */  {  9,  5,  4, 10,  1,  2,  7,  6, 11, -1, -1, -1, -1, -1, -1, -1 },
-/* 165: 0,    2,       5,    7,  */  {  6, 11,  7,  1,  2, 10,  0,  8,  3,  4,  9,  5, -1, -1, -1, -1 },
-/* 166:    1, 2,       5,    7,  */  {  7,  6, 11,  5,  4, 10,  4,  2, 10,  4,  0,  2, -1, -1, -1, -1 },
-/* 167: 0, 1, 2,       5,    7,  */  {  3,  4,  8,  3,  5,  4,  3,  2,  5, 10,  5,  2, 11,  7,  6, -1 },
-/* 168:          3,    5,    7,  */  {  7,  2,  3,  7,  6,  2,  5,  4,  9, -1, -1, -1, -1, -1, -1, -1 },
-/* 169: 0,       3,    5,    7,  */  {  9,  5,  4,  0,  8,  6,  0,  6,  2,  6,  8,  7, -1, -1, -1, -1 },
-/* 170:    1,    3,    5,    7,  */  {  3,  6,  2,  3,  7,  6,  1,  5,  0,  5,  4,  0, -1, -1, -1, -1 },
-/* 171: 0, 1,    3,    5,    7,  */  {  6,  2,  8,  6,  8,  7,  2,  1,  8,  4,  8,  5,  1,  5,  8, -1 },
-/* 172:       2, 3,    5,    7,  */  {  9,  5,  4, 10,  1,  6,  1,  7,  6,  1,  3,  7, -1, -1, -1, -1 },
-/* 173: 0,    2, 3,    5,    7,  */  {  1,  6, 10,  1,  7,  6,  1,  0,  7,  8,  7,  0,  9,  5,  4, -1 },
-/* 174:    1, 2, 3,    5,    7,  */  {  4,  0, 10,  4, 10,  5,  0,  3, 10,  6, 10,  7,  3,  7, 10, -1 },
-/* 175: 0, 1, 2, 3,    5,    7,  */  {  7,  6, 10,  7, 10,  8,  5,  4, 10,  4,  8, 10, -1, -1, -1, -1 },
-/* 176:             4, 5,    7,  */  {  6,  9,  5,  6, 11,  9, 11,  8,  9, -1, -1, -1, -1, -1, -1, -1 },
-/* 177: 0,          4, 5,    7,  */  {  3,  6, 11,  0,  6,  3,  0,  5,  6,  0,  9,  5, -1, -1, -1, -1 },
-/* 178:    1,       4, 5,    7,  */  {  0, 11,  8,  0,  5, 11,  0,  1,  5,  5,  6, 11, -1, -1, -1, -1 },
-/* 179: 0, 1,       4, 5,    7,  */  {  6, 11,  3,  6,  3,  5,  5,  3,  1, -1, -1, -1, -1, -1, -1, -1 },
-/* 180:       2,    4, 5,    7,  */  {  1,  2, 10,  9,  5, 11,  9, 11,  8, 11,  5,  6, -1, -1, -1, -1 },
-/* 181: 0,    2,    4, 5,    7,  */  {  0, 11,  3,  0,  6, 11,  0,  9,  6,  5,  6,  9,  1,  2, 10, -1 },
-/* 182:    1, 2,    4, 5,    7,  */  { 11,  8,  5, 11,  5,  6,  8,  0,  5, 10,  5,  2,  0,  2,  5, -1 },
-/* 183: 0, 1, 2,    4, 5,    7,  */  {  6, 11,  3,  6,  3,  5,  2, 10,  3, 10,  5,  3, -1, -1, -1, -1 },
-/* 184:          3, 4, 5,    7,  */  {  5,  8,  9,  5,  2,  8,  5,  6,  2,  3,  8,  2, -1, -1, -1, -1 },
-/* 185: 0,       3, 4, 5,    7,  */  {  9,  5,  6,  9,  6,  0,  0,  6,  2, -1, -1, -1, -1, -1, -1, -1 },
-/* 186:    1,    3, 4, 5,    7,  */  {  1,  5,  8,  1,  8,  0,  5,  6,  8,  3,  8,  2,  6,  2,  8, -1 },
-/* 187: 0, 1,    3, 4, 5,    7,  */  {  1,  5,  6,  2,  1,  6, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 },
-/* 188:       2, 3, 4, 5,    7,  */  {  1,  3,  6,  1,  6, 10,  3,  8,  6,  5,  6,  9,  8,  9,  6, -1 },
-/* 189: 0,    2, 3, 4, 5,    7,  */  { 10,  1,  0, 10,  0,  6,  9,  5,  0,  5,  6,  0, -1, -1, -1, -1 },
-/* 190:    1, 2, 3, 4, 5,    7,  */  {  0,  3,  8,  5,  6, 10, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 },
-/* 191: 0, 1, 2, 3, 4, 5,    7,  */  { 10,  5,  6, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 },
-/* 192:                   6, 7,  */  { 11,  5, 10,  7,  5, 11, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 },
-/* 193: 0,                6, 7,  */  { 11,  5, 10, 11,  7,  5,  8,  3,  0, -1, -1, -1, -1, -1, -1, -1 },
-/* 194:    1,             6, 7,  */  {  5, 11,  7,  5, 10, 11,  1,  9,  0, -1, -1, -1, -1, -1, -1, -1 },
-/* 195: 0, 1,             6, 7,  */  { 10,  7,  5, 10, 11,  7,  9,  8,  1,  8,  3,  1, -1, -1, -1, -1 },
-/* 196:       2,          6, 7,  */  { 11,  1,  2, 11,  7,  1,  7,  5,  1, -1, -1, -1, -1, -1, -1, -1 },
-/* 197: 0,    2,          6, 7,  */  {  0,  8,  3,  1,  2,  7,  1,  7,  5,  7,  2, 11, -1, -1, -1, -1 },
-/* 198:    1, 2,          6, 7,  */  {  9,  7,  5,  9,  2,  7,  9,  0,  2,  2, 11,  7, -1, -1, -1, -1 },
-/* 199: 0, 1, 2,          6, 7,  */  {  7,  5,  2,  7,  2, 11,  5,  9,  2,  3,  2,  8,  9,  8,  2, -1 },
-/* 200:          3,       6, 7,  */  {  2,  5, 10,  2,  3,  5,  3,  7,  5, -1, -1, -1, -1, -1, -1, -1 },
-/* 201: 0,       3,       6, 7,  */  {  8,  2,  0,  8,  5,  2,  8,  7,  5, 10,  2,  5, -1, -1, -1, -1 },
-/* 202:    1,    3,       6, 7,  */  {  9,  0,  1,  5, 10,  3,  5,  3,  7,  3, 10,  2, -1, -1, -1, -1 },
-/* 203: 0, 1,    3,       6, 7,  */  {  9,  8,  2,  9,  2,  1,  8,  7,  2, 10,  2,  5,  7,  5,  2, -1 },
-/* 204:       2, 3,       6, 7,  */  {  1,  3,  5,  3,  7,  5, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 },
-/* 205: 0,    2, 3,       6, 7,  */  {  0,  8,  7,  0,  7,  1,  1,  7,  5, -1, -1, -1, -1, -1, -1, -1 },
-/* 206:    1, 2, 3,       6, 7,  */  {  9,  0,  3,  9,  3,  5,  5,  3,  7, -1, -1, -1, -1, -1, -1, -1 },
-/* 207: 0, 1, 2, 3,       6, 7,  */  {  9,  8,  7,  5,  9,  7, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 },
-/* 208:             4,    6, 7,  */  {  5,  8,  4,  5, 10,  8, 10, 11,  8, -1, -1, -1, -1, -1, -1, -1 },
-/* 209: 0,          4,    6, 7,  */  {  5,  0,  4,  5, 11,  0,  5, 10, 11, 11,  3,  0, -1, -1, -1, -1 },
-/* 210:    1,       4,    6, 7,  */  {  0,  1,  9,  8,  4, 10,  8, 10, 11, 10,  4,  5, -1, -1, -1, -1 },
-/* 211: 0, 1,       4,    6, 7,  */  { 10, 11,  4, 10,  4,  5, 11,  3,  4,  9,  4,  1,  3,  1,  4, -1 },
-/* 212:       2,    4,    6, 7,  */  {  2,  5,  1,  2,  8,  5,  2, 11,  8,  4,  5,  8, -1, -1, -1, -1 },
-/* 213: 0,    2,    4,    6, 7,  */  {  0,  4, 11,  0, 11,  3,  4,  5, 11,  2, 11,  1,  5,  1, 11, -1 },
-/* 214:    1, 2,    4,    6, 7,  */  {  0,  2,  5,  0,  5,  9,  2, 11,  5,  4,  5,  8, 11,  8,  5, -1 },
-/* 215: 0, 1, 2,    4,    6, 7,  */  {  9,  4,  5,  2, 11,  3, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 },
-/* 216:          3, 4,    6, 7,  */  {  2,  5, 10,  3,  5,  2,  3,  4,  5,  3,  8,  4, -1, -1, -1, -1 },
-/* 217: 0,       3, 4,    6, 7,  */  {  5, 10,  2,  5,  2,  4,  4,  2,  0, -1, -1, -1, -1, -1, -1, -1 },
-/* 218:    1,    3, 4,    6, 7,  */  {  3, 10,  2,  3,  5, 10,  3,  8,  5,  4,  5,  8,  0,  1,  9, -1 },
-/* 219: 0, 1,    3, 4,    6, 7,  */  {  5, 10,  2,  5,  2,  4,  1,  9,  2,  9,  4,  2, -1, -1, -1, -1 },
-/* 220:       2, 3, 4,    6, 7,  */  {  8,  4,  5,  8,  5,  3,  3,  5,  1, -1, -1, -1, -1, -1, -1, -1 },
-/* 221: 0,    2, 3, 4,    6, 7,  */  {  0,  4,  5,  1,  0,  5, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 },
-/* 222:    1, 2, 3, 4,    6, 7,  */  {  8,  4,  5,  8,  5,  3,  9,  0,  5,  0,  3,  5, -1, -1, -1, -1 },
-/* 223: 0, 1, 2, 3, 4,    6, 7,  */  {  9,  4,  5, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 },
-/* 224:                5, 6, 7,  */  {  4, 11,  7,  4,  9, 11,  9, 10, 11, -1, -1, -1, -1, -1, -1, -1 },
-/* 225: 0,             5, 6, 7,  */  {  0,  8,  3,  4,  9,  7,  9, 11,  7,  9, 10, 11, -1, -1, -1, -1 },
-/* 226:    1,          5, 6, 7,  */  {  1, 10, 11,  1, 11,  4,  1,  4,  0,  7,  4, 11, -1, -1, -1, -1 },
-/* 227: 0, 1,          5, 6, 7,  */  {  3,  1,  4,  3,  4,  8,  1, 10,  4,  7,  4, 11, 10, 11,  4, -1 },
-/* 228:       2,       5, 6, 7,  */  {  4, 11,  7,  9, 11,  4,  9,  2, 11,  9,  1,  2, -1, -1, -1, -1 },
-/* 229: 0,    2,       5, 6, 7,  */  {  9,  7,  4,  9, 11,  7,  9,  1, 11,  2, 11,  1,  0,  8,  3, -1 },
-/* 230:    1, 2,       5, 6, 7,  */  { 11,  7,  4, 11,  4,  2,  2,  4,  0, -1, -1, -1, -1, -1, -1, -1 },
-/* 231: 0, 1, 2,       5, 6, 7,  */  { 11,  7,  4, 11,  4,  2,  8,  3,  4,  3,  2,  4, -1, -1, -1, -1 },
-/* 232:          3,    5, 6, 7,  */  {  2,  9, 10,  2,  7,  9,  2,  3,  7,  7,  4,  9, -1, -1, -1, -1 },
-/* 233: 0,       3,    5, 6, 7,  */  {  9, 10,  7,  9,  7,  4, 10,  2,  7,  8,  7,  0,  2,  0,  7, -1 },
-/* 234:    1,    3,    5, 6, 7,  */  {  3,  7, 10,  3, 10,  2,  7,  4, 10,  1, 10,  0,  4,  0, 10, -1 },
-/* 235: 0, 1,    3,    5, 6, 7,  */  {  1, 10,  2,  8,  7,  4, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 },
-/* 236:       2, 3,    5, 6, 7,  */  {  4,  9,  1,  4,  1,  7,  7,  1,  3, -1, -1, -1, -1, -1, -1, -1 },
-/* 237: 0,    2, 3,    5, 6, 7,  */  {  4,  9,  1,  4,  1,  7,  0,  8,  1,  8,  7,  1, -1, -1, -1, -1 },
-/* 238:    1, 2, 3,    5, 6, 7,  */  {  4,  0,  3,  7,  4,  3, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 },
-/* 239: 0, 1, 2, 3,    5, 6, 7,  */  {  4,  8,  7, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 },
-/* 240:             4, 5, 6, 7,  */  {  9, 10,  8, 10, 11,  8, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 },
-/* 241: 0,          4, 5, 6, 7,  */  {  3,  0,  9,  3,  9, 11, 11,  9, 10, -1, -1, -1, -1, -1, -1, -1 },
-/* 242:    1,       4, 5, 6, 7,  */  {  0,  1, 10,  0, 10,  8,  8, 10, 11, -1, -1, -1, -1, -1, -1, -1 },
-/* 243: 0, 1,       4, 5, 6, 7,  */  {  3,  1, 10, 11,  3, 10, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 },
-/* 244:       2,    4, 5, 6, 7,  */  {  1,  2, 11,  1, 11,  9,  9, 11,  8, -1, -1, -1, -1, -1, -1, -1 },
-/* 245: 0,    2,    4, 5, 6, 7,  */  {  3,  0,  9,  3,  9, 11,  1,  2,  9,  2, 11,  9, -1, -1, -1, -1 },
-/* 246:    1, 2,    4, 5, 6, 7,  */  {  0,  2, 11,  8,  0, 11, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 },
-/* 247: 0, 1, 2,    4, 5, 6, 7,  */  {  3,  2, 11, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 },
-/* 248:          3, 4, 5, 6, 7,  */  {  2,  3,  8,  2,  8, 10, 10,  8,  9, -1, -1, -1, -1, -1, -1, -1 },
-/* 249: 0,       3, 4, 5, 6, 7,  */  {  9, 10,  2,  0,  9,  2, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 },
-/* 250:    1,    3, 4, 5, 6, 7,  */  {  2,  3,  8,  2,  8, 10,  0,  1,  8,  1, 10,  8, -1, -1, -1, -1 },
-/* 251: 0, 1,    3, 4, 5, 6, 7,  */  {  1, 10,  2, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 },
-/* 252:       2, 3, 4, 5, 6, 7,  */  {  1,  3,  8,  9,  1,  8, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 },
-/* 253: 0,    2, 3, 4, 5, 6, 7,  */  {  0,  9,  1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 },
-/* 254:    1, 2, 3, 4, 5, 6, 7,  */  {  0,  3,  8, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 },
-/* 255: 0, 1, 2, 3, 4, 5, 6, 7,  */  { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 }
-};
-//_____________________________________________________________________________
-
-
-
diff --git a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/MarchingCubes.cpp b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/MarchingCubes.cpp
deleted file mode 100644
index 0197e8d1b2..0000000000
--- a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/MarchingCubes.cpp
+++ /dev/null
@@ -1,850 +0,0 @@
-/**
- * @file    MarchingCubes.cpp
- * @author  Thomas Lewiner <thomas.lewiner@polytechnique.org>
- * @author  Math Dept, PUC-Rio
- * @version 0.2
- * @date    12/08/2002
- *
- * @brief   MarchingCubes Algorithm
- */
-//________________________________________________
-
-
-#if !defined(WIN32) || defined(__CYGWIN__)
-#pragma implementation
-#endif // WIN32
-
-#include <math.h>
-#include <time.h>
-#include <memory.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <float.h>
-#include "MarchingCubes.h"
-#include "LookUpTable.h"
-
-// step size of the arrays of vertices and triangles
-#define ALLOC_SIZE 65536
-
-//_____________________________________________________________________________
-// print cube for debug
-void MarchingCubes::print_cube() { printf( "\t%f %f %f %f %f %f %f %f\n", _cube[0], _cube[1], _cube[2], _cube[3], _cube[4], _cube[5], _cube[6], _cube[7]) ; }
-//_____________________________________________________________________________
-
-
-
-//_____________________________________________________________________________
-// Constructor
-MarchingCubes::MarchingCubes() :
-//-----------------------------------------------------------------------------
-  _originalMC(true),
-  _nverts    (0),
-  _ntrigs    (0),
-  _Nverts    (0),
-  _Ntrigs    (0),
-  _vertices  (( Point  *)NULL),
-  _triangles ((Triangle*)NULL)
-{}
-//_____________________________________________________________________________
-
-
-
-//_____________________________________________________________________________
-// Destructor
-MarchingCubes::~MarchingCubes()
-//-----------------------------------------------------------------------------
-{
-  clean_all() ;
-}
-//_____________________________________________________________________________
-
-
-
-//_____________________________________________________________________________
-// main algorithm
-bool MarchingCubes::tesselate_cube( real iso )
-//-----------------------------------------------------------------------------
-{
-  for( int p = 0 ; p < 8 ; ++p )
-  {
-    real &v = _cube[p] ;
-    v -= iso ;
-    if( fabs( v ) < R_EPSILON ) v = R_EPSILON ;
-//    printf( "%d - %+0.2f\t", (int)_indexes[p], v ) ;
-  }
-//  printf( "\n" ) ;
-  
-  if( !compute_intersection_points() ) return false ;
-
-  _lut_entry = 0 ;
-  for( int p = 0 ; p < 8 ; ++p )
-  {
-    if( _cube[p] > 0 ) _lut_entry += 1 << p ;
-  }
-
-  return process_cube( ) ;
-}
-//_____________________________________________________________________________
-
-
-
-//_____________________________________________________________________________
-// init all structures (must set sizes before call)
-void MarchingCubes::init_all ()
-//-----------------------------------------------------------------------------
-{
-  _nverts = _ntrigs = 0 ;
-  _Nverts = _Ntrigs = ALLOC_SIZE ;
-  _vertices  = new Point   [_Nverts] ;
-  _triangles = new Triangle[_Ntrigs] ;
-}
-//_____________________________________________________________________________
-
-
-
-//_____________________________________________________________________________
-// clean temporary structures
-void MarchingCubes::clean_temps()
-//-----------------------------------------------------------------------------
-{
-  _stored_vertices.clear() ;
-}
-//_____________________________________________________________________________
-
-
-
-//_____________________________________________________________________________
-// clean all structures
-void MarchingCubes::clean_all()
-//-----------------------------------------------------------------------------
-{
-  clean_temps() ;
-  delete [] _vertices  ;
-  delete [] _triangles ;
-  _vertices  = (Point   *)NULL ;
-  _triangles = (Triangle *)NULL ;
-  _nverts = _ntrigs = 0 ;
-  _Nverts = _Ntrigs = 0 ;
-}
-//_____________________________________________________________________________
-
-
-
-//_____________________________________________________________________________
-//_____________________________________________________________________________
-
-
-//_____________________________________________________________________________
-// Compute the intersection points
-bool MarchingCubes::compute_intersection_points()
-//-----------------------------------------------------------------------------
-{
-  bool res = false ;
-  res |= add_vertex( 0,1 ) ;
-  res |= add_vertex( 1,2 ) ;
-  res |= add_vertex( 2,3 ) ;
-  res |= add_vertex( 3,0 ) ;
-
-  res |= add_vertex( 4,5 ) ;
-  res |= add_vertex( 5,6 ) ;
-  res |= add_vertex( 6,7 ) ;
-  res |= add_vertex( 7,4 ) ;
-
-  res |= add_vertex( 0,4 ) ;
-  res |= add_vertex( 1,5 ) ;
-  res |= add_vertex( 2,6 ) ;
-  res |= add_vertex( 3,7 ) ;
-  
-  return res ;
-}
-//_____________________________________________________________________________
-
-
-
-
-
-//_____________________________________________________________________________
-// Test a face
-// if face>0 return true if the face contains a part of the surface
-bool MarchingCubes::test_face( schar face )
-//-----------------------------------------------------------------------------
-{
-  real A,B,C,D ;
-
-  switch( face )
-  {
-  case -1 : case 1 :  A = _cube[0] ;  B = _cube[4] ;  C = _cube[5] ;  D = _cube[1] ;  break ;
-  case -2 : case 2 :  A = _cube[1] ;  B = _cube[5] ;  C = _cube[6] ;  D = _cube[2] ;  break ;
-  case -3 : case 3 :  A = _cube[2] ;  B = _cube[6] ;  C = _cube[7] ;  D = _cube[3] ;  break ;
-  case -4 : case 4 :  A = _cube[3] ;  B = _cube[7] ;  C = _cube[4] ;  D = _cube[0] ;  break ;
-  case -5 : case 5 :  A = _cube[0] ;  B = _cube[3] ;  C = _cube[2] ;  D = _cube[1] ;  break ;
-  case -6 : case 6 :  A = _cube[4] ;  B = _cube[7] ;  C = _cube[6] ;  D = _cube[5] ;  break ;
-  default : printf( "Invalid face code %d\n", face ) ;  print_cube() ;  A = B = C = D = 0 ;
-  };
-
-  if( fabs( A*C - B*D ) < R_EPSILON )
-    return face >= 0 ;
-  return face * A * ( A*C - B*D ) >= 0  ;  // face and A invert signs
-}
-//_____________________________________________________________________________
-
-
-
-
-
-//_____________________________________________________________________________
-// Test the interior of a cube
-// if s == 7, return true  if the interior is empty
-// if s ==-7, return false if the interior is empty
-bool MarchingCubes::test_interior( schar s )
-//-----------------------------------------------------------------------------
-{
-  real t, At=0, Bt=0, Ct=0, Dt=0, a, b ;
-  char  test =  0 ;
-  char  edge = -1 ; // reference edge of the triangulation
-
-  switch( _case )
-  {
-  case  4 :
-  case 10 :
-  case 13 :
-    a = ( _cube[4] - _cube[0] ) * ( _cube[6] - _cube[2] ) - ( _cube[7] - _cube[3] ) * ( _cube[5] - _cube[1] ) ;
-    b =  _cube[2] * ( _cube[4] - _cube[0] ) + _cube[0] * ( _cube[6] - _cube[2] )
-             - _cube[1] * ( _cube[7] - _cube[3] ) - _cube[3] * ( _cube[5] - _cube[1] ) ;
-    t = - b / (2*a) ;
-    if( t<0 || t>1 ) return s>0 ;
-
-    At = _cube[0] + ( _cube[4] - _cube[0] ) * t ;
-    Bt = _cube[3] + ( _cube[7] - _cube[3] ) * t ;
-    Ct = _cube[2] + ( _cube[6] - _cube[2] ) * t ;
-    Dt = _cube[1] + ( _cube[5] - _cube[1] ) * t ;
-    break ;
-
-  case  6 :
-  case  7 :
-  case 12 :
-    switch( _case )
-    {
-    case  6 : edge = test6 [_config][2] ; break ;
-    case  7 : edge = test7 [_config][4] ; break ;
-    case 12 : edge = test12[_config][3] ; break ;
-    }
-    switch( edge )
-    {
-    case  0 :
-      t  = _cube[0] / ( _cube[0] - _cube[1] ) ;
-      At = 0 ;
-      Bt = _cube[3] + ( _cube[2] - _cube[3] ) * t ;
-      Ct = _cube[7] + ( _cube[6] - _cube[7] ) * t ;
-      Dt = _cube[4] + ( _cube[5] - _cube[4] ) * t ;
-      break ;
-    case  1 :
-      t  = _cube[1] / ( _cube[1] - _cube[2] ) ;
-      At = 0 ;
-      Bt = _cube[0] + ( _cube[3] - _cube[0] ) * t ;
-      Ct = _cube[4] + ( _cube[7] - _cube[4] ) * t ;
-      Dt = _cube[5] + ( _cube[6] - _cube[5] ) * t ;
-      break ;
-    case  2 :
-      t  = _cube[2] / ( _cube[2] - _cube[3] ) ;
-      At = 0 ;
-      Bt = _cube[1] + ( _cube[0] - _cube[1] ) * t ;
-      Ct = _cube[5] + ( _cube[4] - _cube[5] ) * t ;
-      Dt = _cube[6] + ( _cube[7] - _cube[6] ) * t ;
-      break ;
-    case  3 :
-      t  = _cube[3] / ( _cube[3] - _cube[0] ) ;
-      At = 0 ;
-      Bt = _cube[2] + ( _cube[1] - _cube[2] ) * t ;
-      Ct = _cube[6] + ( _cube[5] - _cube[6] ) * t ;
-      Dt = _cube[7] + ( _cube[4] - _cube[7] ) * t ;
-      break ;
-    case  4 :
-      t  = _cube[4] / ( _cube[4] - _cube[5] ) ;
-      At = 0 ;
-      Bt = _cube[7] + ( _cube[6] - _cube[7] ) * t ;
-      Ct = _cube[3] + ( _cube[2] - _cube[3] ) * t ;
-      Dt = _cube[0] + ( _cube[1] - _cube[0] ) * t ;
-      break ;
-    case  5 :
-      t  = _cube[5] / ( _cube[5] - _cube[6] ) ;
-      At = 0 ;
-      Bt = _cube[4] + ( _cube[7] - _cube[4] ) * t ;
-      Ct = _cube[0] + ( _cube[3] - _cube[0] ) * t ;
-      Dt = _cube[1] + ( _cube[2] - _cube[1] ) * t ;
-      break ;
-    case  6 :
-      t  = _cube[6] / ( _cube[6] - _cube[7] ) ;
-      At = 0 ;
-      Bt = _cube[5] + ( _cube[4] - _cube[5] ) * t ;
-      Ct = _cube[1] + ( _cube[0] - _cube[1] ) * t ;
-      Dt = _cube[2] + ( _cube[3] - _cube[2] ) * t ;
-      break ;
-    case  7 :
-      t  = _cube[7] / ( _cube[7] - _cube[4] ) ;
-      At = 0 ;
-      Bt = _cube[6] + ( _cube[5] - _cube[6] ) * t ;
-      Ct = _cube[2] + ( _cube[1] - _cube[2] ) * t ;
-      Dt = _cube[3] + ( _cube[0] - _cube[3] ) * t ;
-      break ;
-    case  8 :
-      t  = _cube[0] / ( _cube[0] - _cube[4] ) ;
-      At = 0 ;
-      Bt = _cube[3] + ( _cube[7] - _cube[3] ) * t ;
-      Ct = _cube[2] + ( _cube[6] - _cube[2] ) * t ;
-      Dt = _cube[1] + ( _cube[5] - _cube[1] ) * t ;
-      break ;
-    case  9 :
-      t  = _cube[1] / ( _cube[1] - _cube[5] ) ;
-      At = 0 ;
-      Bt = _cube[0] + ( _cube[4] - _cube[0] ) * t ;
-      Ct = _cube[3] + ( _cube[7] - _cube[3] ) * t ;
-      Dt = _cube[2] + ( _cube[6] - _cube[2] ) * t ;
-      break ;
-    case 10 :
-      t  = _cube[2] / ( _cube[2] - _cube[6] ) ;
-      At = 0 ;
-      Bt = _cube[1] + ( _cube[5] - _cube[1] ) * t ;
-      Ct = _cube[0] + ( _cube[4] - _cube[0] ) * t ;
-      Dt = _cube[3] + ( _cube[7] - _cube[3] ) * t ;
-      break ;
-    case 11 :
-      t  = _cube[3] / ( _cube[3] - _cube[7] ) ;
-      At = 0 ;
-      Bt = _cube[2] + ( _cube[6] - _cube[2] ) * t ;
-      Ct = _cube[1] + ( _cube[5] - _cube[1] ) * t ;
-      Dt = _cube[0] + ( _cube[4] - _cube[0] ) * t ;
-      break ;
-    default : printf( "Invalid edge %d\n", edge ) ;  print_cube() ;  break ;
-    }
-    break ;
-
-  default : printf( "Invalid ambiguous case %d\n", _case ) ;  print_cube() ;  break ;
-  }
-
-  if( At >= 0 ) test ++ ;
-  if( Bt >= 0 ) test += 2 ;
-  if( Ct >= 0 ) test += 4 ;
-  if( Dt >= 0 ) test += 8 ;
-  switch( test )
-  {
-  case  0 : return s>0 ;
-  case  1 : return s>0 ;
-  case  2 : return s>0 ;
-  case  3 : return s>0 ;
-  case  4 : return s>0 ;
-  case  5 : if( At * Ct - Bt * Dt <  R_EPSILON ) return s>0 ; break ;
-  case  6 : return s>0 ;
-  case  7 : return s<0 ;
-  case  8 : return s>0 ;
-  case  9 : return s>0 ;
-  case 10 : if( At * Ct - Bt * Dt >= R_EPSILON ) return s>0 ; break ;
-  case 11 : return s<0 ;
-  case 12 : return s>0 ;
-  case 13 : return s<0 ;
-  case 14 : return s<0 ;
-  case 15 : return s<0 ;
-  }
-
-  return s<0 ;
-}
-//_____________________________________________________________________________
-
-
-
-
-//_____________________________________________________________________________
-// Process a unit cube
-bool MarchingCubes::process_cube( )
-//-----------------------------------------------------------------------------
-{
-  if( _originalMC )
-  {
-    char nt = 0 ;
-    while( casesClassic[_lut_entry][3*nt] != -1 ) nt++ ;
-    add_triangle( casesClassic[_lut_entry], nt ) ;
-    return true ;
-  }
-
-  int   v12 = -1 ;
-  _case   = cases[_lut_entry][0] ;
-  _config = cases[_lut_entry][1] ;
-  _subconfig = 0 ;
-
-  switch( _case )
-  {
-  case  0 :
-    break ;
-
-  case  1 :
-    add_triangle( tiling1[_config], 1 ) ;
-    break ;
-
-  case  2 :
-    add_triangle( tiling2[_config], 2 ) ;
-    break ;
-
-  case  3 :
-    if( test_face( test3[_config]) )
-      add_triangle( tiling3_2[_config], 4 ) ; // 3.2
-    else
-      add_triangle( tiling3_1[_config], 2 ) ; // 3.1
-    break ;
-
-  case  4 :
-    if( test_interior( test4[_config]) )
-      add_triangle( tiling4_1[_config], 2 ) ; // 4.1.1
-    else
-      add_triangle( tiling4_2[_config], 6 ) ; // 4.1.2
-    break ;
-
-  case  5 :
-    add_triangle( tiling5[_config], 3 ) ;
-    break ;
-
-  case  6 :
-    if( test_face( test6[_config][0]) )
-      add_triangle( tiling6_2[_config], 5 ) ; // 6.2
-    else
-    {
-      if( test_interior( test6[_config][1]) )
-        add_triangle( tiling6_1_1[_config], 3 ) ; // 6.1.1
-      else
-	  {
-        v12 = add_c_vertex() ;
-        add_triangle( tiling6_1_2[_config], 9 , v12) ; // 6.1.2
-      }
-    }
-    break ;
-
-  case  7 :
-    if( test_face( test7[_config][0] ) ) _subconfig +=  1 ;
-    if( test_face( test7[_config][1] ) ) _subconfig +=  2 ;
-    if( test_face( test7[_config][2] ) ) _subconfig +=  4 ;
-    switch( _subconfig )
-      {
-      case 0 :
-        add_triangle( tiling7_1[_config], 3 ) ; break ;
-      case 1 :
-        add_triangle( tiling7_2[_config][0], 5 ) ; break ;
-      case 2 :
-        add_triangle( tiling7_2[_config][1], 5 ) ; break ;
-      case 3 :
-        v12 = add_c_vertex() ;
-        add_triangle( tiling7_3[_config][0], 9, v12 ) ; break ;
-      case 4 :
-        add_triangle( tiling7_2[_config][2], 5 ) ; break ;
-      case 5 :
-        v12 = add_c_vertex() ;
-        add_triangle( tiling7_3[_config][1], 9, v12 ) ; break ;
-      case 6 :
-        v12 = add_c_vertex() ;
-        add_triangle( tiling7_3[_config][2], 9, v12 ) ; break ;
-      case 7 :
-        if( test_interior( test7[_config][3]) )
-          add_triangle( tiling7_4_2[_config], 9 ) ;
-        else
-          add_triangle( tiling7_4_1[_config], 5 ) ;
-        break ;
-      };
-    break ;
-
-  case  8 :
-    add_triangle( tiling8[_config], 2 ) ;
-    break ;
-
-  case  9 :
-    add_triangle( tiling9[_config], 4 ) ;
-    break ;
-
-  case 10 :
-    if( test_face( test10[_config][0]) )
-    {
-      if( test_face( test10[_config][1]) )
-        add_triangle( tiling10_1_1_[_config], 4 ) ; // 10.1.1
-      else
-      {
-        v12 = add_c_vertex() ;
-        add_triangle( tiling10_2[_config], 8, v12 ) ; // 10.2
-      }
-    }
-    else
-    {
-      if( test_face( test10[_config][1]) )
-      {
-        v12 = add_c_vertex() ;
-        add_triangle( tiling10_2_[_config], 8, v12 ) ; // 10.2
-      }
-      else
-      {
-        if( test_interior( test10[_config][2]) )
-          add_triangle( tiling10_1_1[_config], 4 ) ; // 10.1.1
-        else
-          add_triangle( tiling10_1_2[_config], 8 ) ; // 10.1.2
-      }
-    }
-    break ;
-
-  case 11 :
-    add_triangle( tiling11[_config], 4 ) ;
-    break ;
-
-  case 12 :
-    if( test_face( test12[_config][0]) )
-    {
-      if( test_face( test12[_config][1]) )
-        add_triangle( tiling12_1_1_[_config], 4 ) ; // 12.1.1
-      else
-      {
-        v12 = add_c_vertex() ;
-        add_triangle( tiling12_2[_config], 8, v12 ) ; // 12.2
-      }
-    }
-    else
-    {
-      if( test_face( test12[_config][1]) )
-      {
-        v12 = add_c_vertex() ;
-        add_triangle( tiling12_2_[_config], 8, v12 ) ; // 12.2
-      }
-      else
-      {
-        if( test_interior( test12[_config][2]) )
-          add_triangle( tiling12_1_1[_config], 4 ) ; // 12.1.1
-        else
-          add_triangle( tiling12_1_2[_config], 8 ) ; // 12.1.2
-      }
-    }
-    break ;
-
-  case 13 :
-    if( test_face( test13[_config][0] ) ) _subconfig +=  1 ;
-    if( test_face( test13[_config][1] ) ) _subconfig +=  2 ;
-    if( test_face( test13[_config][2] ) ) _subconfig +=  4 ;
-    if( test_face( test13[_config][3] ) ) _subconfig +=  8 ;
-    if( test_face( test13[_config][4] ) ) _subconfig += 16 ;
-    if( test_face( test13[_config][5] ) ) _subconfig += 32 ;
-    switch( subconfig13[_subconfig] )
-    {
-      case 0 :/* 13.1 */
-        add_triangle( tiling13_1[_config], 4 ) ; break ;
-
-      case 1 :/* 13.2 */
-        add_triangle( tiling13_2[_config][0], 6 ) ; break ;
-      case 2 :/* 13.2 */
-        add_triangle( tiling13_2[_config][1], 6 ) ; break ;
-      case 3 :/* 13.2 */
-        add_triangle( tiling13_2[_config][2], 6 ) ; break ;
-      case 4 :/* 13.2 */
-        add_triangle( tiling13_2[_config][3], 6 ) ; break ;
-      case 5 :/* 13.2 */
-        add_triangle( tiling13_2[_config][4], 6 ) ; break ;
-      case 6 :/* 13.2 */
-        add_triangle( tiling13_2[_config][5], 6 ) ; break ;
-
-      case 7 :/* 13.3 */
-        v12 = add_c_vertex() ;
-        add_triangle( tiling13_3[_config][0], 10, v12 ) ; break ;
-      case 8 :/* 13.3 */
-        v12 = add_c_vertex() ;
-        add_triangle( tiling13_3[_config][1], 10, v12 ) ; break ;
-      case 9 :/* 13.3 */
-        v12 = add_c_vertex() ;
-        add_triangle( tiling13_3[_config][2], 10, v12 ) ; break ;
-      case 10 :/* 13.3 */
-        v12 = add_c_vertex() ;
-        add_triangle( tiling13_3[_config][3], 10, v12 ) ; break ;
-      case 11 :/* 13.3 */
-        v12 = add_c_vertex() ;
-        add_triangle( tiling13_3[_config][4], 10, v12 ) ; break ;
-      case 12 :/* 13.3 */
-        v12 = add_c_vertex() ;
-        add_triangle( tiling13_3[_config][5], 10, v12 ) ; break ;
-      case 13 :/* 13.3 */
-        v12 = add_c_vertex() ;
-        add_triangle( tiling13_3[_config][6], 10, v12 ) ; break ;
-      case 14 :/* 13.3 */
-        v12 = add_c_vertex() ;
-        add_triangle( tiling13_3[_config][7], 10, v12 ) ; break ;
-      case 15 :/* 13.3 */
-        v12 = add_c_vertex() ;
-        add_triangle( tiling13_3[_config][8], 10, v12 ) ; break ;
-      case 16 :/* 13.3 */
-        v12 = add_c_vertex() ;
-        add_triangle( tiling13_3[_config][9], 10, v12 ) ; break ;
-      case 17 :/* 13.3 */
-        v12 = add_c_vertex() ;
-        add_triangle( tiling13_3[_config][10], 10, v12 ) ; break ;
-      case 18 :/* 13.3 */
-        v12 = add_c_vertex() ;
-        add_triangle( tiling13_3[_config][11], 10, v12 ) ; break ;
-
-      case 19 :/* 13.4 */
-        v12 = add_c_vertex() ;
-        add_triangle( tiling13_4[_config][0], 12, v12 ) ; break ;
-      case 20 :/* 13.4 */
-        v12 = add_c_vertex() ;
-        add_triangle( tiling13_4[_config][1], 12, v12 ) ; break ;
-      case 21 :/* 13.4 */
-        v12 = add_c_vertex() ;
-        add_triangle( tiling13_4[_config][2], 12, v12 ) ; break ;
-      case 22 :/* 13.4 */
-        v12 = add_c_vertex() ;
-        add_triangle( tiling13_4[_config][3], 12, v12 ) ; break ;
-
-      case 23 :/* 13.5 */
-        _subconfig = 0 ;
-        if( test_interior( test13[_config][6] ) )
-          add_triangle( tiling13_5_1[_config][0], 6 ) ;
-        else
-          add_triangle( tiling13_5_2[_config][0], 10 ) ;
-        break ;
-      case 24 :/* 13.5 */
-        _subconfig = 1 ;
-        if( test_interior( test13[_config][6] ) )
-          add_triangle( tiling13_5_1[_config][1], 6 ) ;
-        else
-          add_triangle( tiling13_5_2[_config][1], 10 ) ;
-        break ;
-      case 25 :/* 13.5 */
-        _subconfig = 2 ;
-        if( test_interior( test13[_config][6] ) )
-          add_triangle( tiling13_5_1[_config][2], 6 ) ;
-        else
-          add_triangle( tiling13_5_2[_config][2], 10 ) ;
-        break ;
-      case 26 :/* 13.5 */
-        _subconfig = 3 ;
-        if( test_interior( test13[_config][6] ) )
-          add_triangle( tiling13_5_1[_config][3], 6 ) ;
-        else
-          add_triangle( tiling13_5_2[_config][3], 10 ) ;
-        break ;
-
-      case 27 :/* 13.3 */
-        v12 = add_c_vertex() ;
-        add_triangle( tiling13_3_[_config][0], 10, v12 ) ; break ;
-      case 28 :/* 13.3 */
-        v12 = add_c_vertex() ;
-        add_triangle( tiling13_3_[_config][1], 10, v12 ) ; break ;
-      case 29 :/* 13.3 */
-        v12 = add_c_vertex() ;
-        add_triangle( tiling13_3_[_config][2], 10, v12 ) ; break ;
-      case 30 :/* 13.3 */
-        v12 = add_c_vertex() ;
-        add_triangle( tiling13_3_[_config][3], 10, v12 ) ; break ;
-      case 31 :/* 13.3 */
-        v12 = add_c_vertex() ;
-        add_triangle( tiling13_3_[_config][4], 10, v12 ) ; break ;
-      case 32 :/* 13.3 */
-        v12 = add_c_vertex() ;
-        add_triangle( tiling13_3_[_config][5], 10, v12 ) ; break ;
-      case 33 :/* 13.3 */
-        v12 = add_c_vertex() ;
-        add_triangle( tiling13_3_[_config][6], 10, v12 ) ; break ;
-      case 34 :/* 13.3 */
-        v12 = add_c_vertex() ;
-        add_triangle( tiling13_3_[_config][7], 10, v12 ) ; break ;
-      case 35 :/* 13.3 */
-        v12 = add_c_vertex() ;
-        add_triangle( tiling13_3_[_config][8], 10, v12 ) ; break ;
-      case 36 :/* 13.3 */
-        v12 = add_c_vertex() ;
-        add_triangle( tiling13_3_[_config][9], 10, v12 ) ; break ;
-      case 37 :/* 13.3 */
-        v12 = add_c_vertex() ;
-        add_triangle( tiling13_3_[_config][10], 10, v12 ) ; break ;
-      case 38 :/* 13.3 */
-        v12 = add_c_vertex() ;
-        add_triangle( tiling13_3_[_config][11], 10, v12 ) ; break ;
-
-      case 39 :/* 13.2 */
-        add_triangle( tiling13_2_[_config][0], 6 ) ; break ;
-      case 40 :/* 13.2 */
-        add_triangle( tiling13_2_[_config][1], 6 ) ; break ;
-      case 41 :/* 13.2 */
-        add_triangle( tiling13_2_[_config][2], 6 ) ; break ;
-      case 42 :/* 13.2 */
-        add_triangle( tiling13_2_[_config][3], 6 ) ; break ;
-      case 43 :/* 13.2 */
-        add_triangle( tiling13_2_[_config][4], 6 ) ; break ;
-      case 44 :/* 13.2 */
-        add_triangle( tiling13_2_[_config][5], 6 ) ; break ;
-
-      case 45 :/* 13.1 */
-        add_triangle( tiling13_1_[_config], 4 ) ; break ;
-
-      default :
-        printf("Marching Cubes: Impossible case 13?\n" ) ;  print_cube() ;
-      }
-      break ;
-
-  case 14 :
-    add_triangle( tiling14[_config], 4 ) ;
-    break ;
-  };
-  
-  return true ;
-}
-//_____________________________________________________________________________
-
-
-
-//_____________________________________________________________________________
-// Adding triangles
-void MarchingCubes::add_triangle( const char* trig_, char n, int v12 )
-//-----------------------------------------------------------------------------
-{
-  int    tv[3] ;
-
-  for( int t = 0 ; t < 3*n ; t++ )
-  {
-    switch( trig_[t] )
-    {
-    case  0 : tv[ t % 3 ] = get_vertex(0,1) ; break ;
-    case  1 : tv[ t % 3 ] = get_vertex(1,2) ; break ;
-    case  2 : tv[ t % 3 ] = get_vertex(2,3) ; break ;
-    case  3 : tv[ t % 3 ] = get_vertex(3,0) ; break ;
-    case  4 : tv[ t % 3 ] = get_vertex(4,5) ; break ;
-    case  5 : tv[ t % 3 ] = get_vertex(5,6) ; break ;
-    case  6 : tv[ t % 3 ] = get_vertex(6,7) ; break ;
-    case  7 : tv[ t % 3 ] = get_vertex(7,4) ; break ;
-    case  8 : tv[ t % 3 ] = get_vertex(0,4) ; break ;
-    case  9 : tv[ t % 3 ] = get_vertex(1,5) ; break ;
-    case 10 : tv[ t % 3 ] = get_vertex(2,6) ; break ;
-    case 11 : tv[ t % 3 ] = get_vertex(3,7) ; break ;
-    case 12 : tv[ t % 3 ] = v12 ; break ;
-    default : break ;
-    }
-
-    if( tv[t%3] == -1 )
-    {
-      printf("Marching Cubes: invalid triangle %d\n", _ntrigs+1) ;
-      print_cube() ;
-    }
-
-    if( t%3 == 2 )
-    {
-      if( _ntrigs >= _Ntrigs )
-      {
-        Triangle *temp = _triangles ;
-        _triangles = new Triangle[ 2*_Ntrigs ] ;
-        memcpy( _triangles, temp, _Ntrigs*sizeof(Triangle) ) ;
-        delete[] temp ;
-        printf("%d allocated triangles\n", _Ntrigs) ;
-        _Ntrigs *= 2 ;
-      }
-
-      Triangle *T = _triangles + _ntrigs++ ;
-      T->v1    = tv[0] ;
-      T->v2    = tv[1] ;
-      T->v3    = tv[2] ;
-    }
-  }
-}
-//_____________________________________________________________________________
-
-
-
-
-//_____________________________________________________________________________
-// Adding vertices
-
-void MarchingCubes::test_vertex_addition()
-{
-  if( _nverts >= _Nverts )
-  {
-    Point  *temp = _vertices ;
-    _vertices = new Point [ _Nverts*2 ] ;
-    memcpy( _vertices, temp, _Nverts*sizeof(Point ) ) ;
-    delete[] temp ;
-    printf("%d allocated vertices\n", _Nverts) ;
-    _Nverts *= 2 ;
-  }
-}
-
-
-bool MarchingCubes::add_vertex( char i, char j )
-//-----------------------------------------------------------------------------
-{
-  real ci = _cube[i] ;
-  real cj = _cube[j] ;
-  if( ci * cj >= 0 ) return false ;
-  
-  Key ki = _indexes[i] ;
-  Key kj = _indexes[j] ;
-  std::pair<Key,Key> ij_key = std::make_pair( ki,kj ) ;
-  if( _stored_vertices.find( ij_key ) != _stored_vertices.end() ) return true ;
-
-  test_vertex_addition() ;
-  
-  Point p ;
-  _dat_access->interpolate( ci,cj, _space[i],_space[j], p ) ;
-
-  _stored_vertices[ ij_key ] = _nverts ;
-  _stored_vertices[ std::make_pair( kj,ki ) ] = _nverts ;
-  _vertices[_nverts++] = p ;
-
-  return true ;
-}
-//-----------------------------------------------------------------------------
-
-int MarchingCubes::add_c_vertex( )
-//-----------------------------------------------------------------------------
-{
-  test_vertex_addition() ;
-  Point  &vert_ = _vertices[_nverts++] ;
-
-  real u = 0 ;
-  int   vid ;
-
-  vert_.x() = vert_.y() = vert_.z() = 0 ;
-
-  // Computes the average of the intersection points of the cube
-  vid = get_vertex( 0,1 ) ;  if( vid != -1 ) { ++u ; vert_ += _vertices[vid] ; }
-  vid = get_vertex( 1,2 ) ;  if( vid != -1 ) { ++u ; vert_ += _vertices[vid] ; }
-  vid = get_vertex( 2,3 ) ;  if( vid != -1 ) { ++u ; vert_ += _vertices[vid] ; }
-  vid = get_vertex( 3,0 ) ;  if( vid != -1 ) { ++u ; vert_ += _vertices[vid] ; }
-  vid = get_vertex( 4,5 ) ;  if( vid != -1 ) { ++u ; vert_ += _vertices[vid] ; }
-  vid = get_vertex( 5,6 ) ;  if( vid != -1 ) { ++u ; vert_ += _vertices[vid] ; }
-  vid = get_vertex( 6,7 ) ;  if( vid != -1 ) { ++u ; vert_ += _vertices[vid] ; }
-  vid = get_vertex( 7,4 ) ;  if( vid != -1 ) { ++u ; vert_ += _vertices[vid] ; }
-  vid = get_vertex( 0,4 ) ;  if( vid != -1 ) { ++u ; vert_ += _vertices[vid] ; }
-  vid = get_vertex( 1,5 ) ;  if( vid != -1 ) { ++u ; vert_ += _vertices[vid] ; }
-  vid = get_vertex( 2,6 ) ;  if( vid != -1 ) { ++u ; vert_ += _vertices[vid] ; }
-  vid = get_vertex( 3,7 ) ;  if( vid != -1 ) { ++u ; vert_ += _vertices[vid] ; }
-
-  vert_  /= u ;
-
-  return _nverts-1 ;
-}
-//_____________________________________________________________________________
-
-
-
-//_____________________________________________________________________________
-//_____________________________________________________________________________
-
-
-
-//_____________________________________________________________________________
-// OFF ascii exportation
-void MarchingCubes::writeOFF(const char *fn )
-//-----------------------------------------------------------------------------
-{
-  FILE *fp = fopen( fn, "w" ) ;
-  int   i ;
-
-  printf("Marching Cubes::exportOFF(%s)...", fn) ;
-
-  fprintf( fp, "OFF\n%d %d 0\n", _nverts, _ntrigs ) ;
-  for ( i = 0; i < _nverts; i++ )
-    fprintf( fp, " %f %f %f\n", _vertices[i].x(), _vertices[i].y(), _vertices[i].z() ) ;
-  printf("   %d vertices written\n", _nverts ) ;
-
-  for ( i = 0; i < _ntrigs; i++ )
-    fprintf( fp, "3 %d %d %d\n", _triangles[i].v1, _triangles[i].v2, _triangles[i].v3 ) ;
-  fclose( fp ) ;
-  printf("   %d triangles written\n", _ntrigs ) ;
-}
-//_____________________________________________________________________________
diff --git a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/MarchingCubes.h b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/MarchingCubes.h
deleted file mode 100644
index 9be9aff343..0000000000
--- a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/MarchingCubes.h
+++ /dev/null
@@ -1,182 +0,0 @@
-/**
- * @file    MarchingCubes.h
- * @author  Thomas Lewiner <thomas.lewiner@polytechnique.org>
- * @author  Math Dept, PUC-Rio
- * @version 0.2
- * @date    12/08/2002
- *
- * @brief   MarchingCubes Algorithm
- */
-//________________________________________________
-
-
-#pragma once
-
-#if !defined(WIN32) || defined(__CYGWIN__)
-#pragma interface
-#endif // WIN32
-
-#include <map>
-#include "morton.h"
-#include "point.h"
-#include "data_access.h"
-
-//-----------------------------------------------------------------------------
-// Triangle structure
-/** \struct Triangle "MarchingCubes.h" MarchingCubes
- * Indices of the oriented triange vertices
- * \brief triangle structure
- * \param v1 First vertex index
- * \param v2 Second vertex index
- * \param v3 Third vertex index
- */
-typedef struct
-{
-  int v1,v2,v3 ;  /**< Triangle vertices */
-} Triangle ;
-//_____________________________________________________________________________
-
-
-
-//_____________________________________________________________________________
-/** Marching Cubes algorithm wrapper */
-/** \class MarchingCubes
-  * \brief Marching Cubes algorithm.
-  */
-class MarchingCubes
-//-----------------------------------------------------------------------------
-{
-// Constructors
-public :
-  /**
-   * Main and default constructor
-   * \brief constructor
-   */
-  MarchingCubes () ;
-  /** Destructor */
-  ~MarchingCubes() ;
-
-//-----------------------------------------------------------------------------
-// Accessors
-public :
-  /** accesses the number of vertices of the generated mesh */
-  inline const int nverts() const { return _nverts ; }
-  /** accesses the number of triangles of the generated mesh */
-  inline const int ntrigs() const { return _ntrigs ; }
-  /** accesses a specific vertex of the generated mesh */
-  inline Point    * vert( const int i ) const { if( i < 0  || i >= _nverts ) return ( Point  *)NULL ; return _vertices  + i ; }
-  /** accesses a specific triangle of the generated mesh */
-  inline Triangle * trig( const int i ) const { if( i < 0  || i >= _ntrigs ) return (Triangle*)NULL ; return _triangles + i ; }
-
-  /** accesses the vertex buffer of the generated mesh */
-  inline Point    *vertices () { return _vertices  ; }
-  /** accesses the triangle buffer of the generated mesh */
-  inline Triangle *triangles() { return _triangles ; }
-
-  /**
-   * selects wether the algorithm will use the enhanced topologically controlled lookup table or the original MarchingCubes
-   * \param originalMC true for the original Marching Cubes
-   */
-  inline void set_method    ( const bool originalMC = false ) { _originalMC = originalMC ; }
-
-  // Data initialization
-  /** inits all structures (must set sizes before call) : the temporary structures and the mesh buffers */
-  void init_all   () ;
-  /** clears temporary structures : the grid and the main */
-  void clean_temps() ;
-  /** clears all structures : the temporary structures and the mesh buffers */
-  void clean_all  () ;
-
-
-//-----------------------------------------------------------------------------
-// Exportation
-public :
-  /**
-   * OFF exportation of the generated mesh
-   * \param fn  name of the IV file to create
-   */
-  void writeOFF( const char *fn ) ;
-
-
-//-----------------------------------------------------------------------------
-// Algorithm
-public :
-  /** retrieves the isovalues at the cube vertices */
-  real             *cube   () { return _cube ; }
-  /** retrieves the geometry of the cube */
-  Point            *space  () { return _space; }
-  /** retrieves the indexes of the cube */
-  Key              *indexes() { return _indexes; }
-  /** retrieves the data accessor */
-  data_access     *&dat_access() { return _dat_access ; }
-  /**
-   * Main algorithm
-   * \param iso isovalue
-   */
-  bool tesselate_cube( real iso ) ;
-
-protected :
-  /** tesselates one cube */
-  bool process_cube ()             ;
-  /** tests if the components of the tesselation of the cube should be connected by the interior of an ambiguous face */
-  bool test_face    ( schar face ) ;
-  /** tests if the components of the tesselation of the cube should be connected through the interior of the cube */
-  bool test_interior( schar s )    ;
-
-
-//-----------------------------------------------------------------------------
-// Operations
-protected :
-  /** computes almost all the vertices of the mesh by interpolation along the cubes edges */
-  bool compute_intersection_points() ;
-
-  /**
-   * routine to add a triangle to the mesh
-   * \param trig the code for the triangle as a sequence of edges index
-   * \param n    the number of triangles to produce
-   * \param v12  the index of the interior vertex to use, if necessary
-   */
-  void add_triangle ( const char* trig, char n, int v12 = -1 ) ;
-
-  /** tests and eventually doubles the vertex buffer capacity for a new vertex insertion */
-  void test_vertex_addition() ;
-  /** adds a vertex on edge cube[i] cube[j] */
-  bool add_vertex( char i, char j ) ;
-  /** gets the vertex of edge cube[i] cube[j] (no check) */
-  int  get_vertex( char i, char j ) { std::map< std::pair< Key,Key >, int >::const_iterator it = _stored_vertices.find( std::make_pair( _indexes[i],_indexes[j] ) ) ; if( it == _stored_vertices.end() ) return -1 ; else return it->second ; }
-  /** adds a vertex inside the current cube */
-  int add_c_vertex() ;
-
-  /** prints cube for debug */
-  void print_cube() ;
-
-public:  
-  /** draw the surface using openGL */
-  void draw_surf() { Triangle *ptr = _triangles ; for( int i = 0 ; i < _ntrigs ; ++i, ++ptr ) { _vertices[ptr->v1].draw() ; _vertices[ptr->v2].draw() ; _vertices[ptr->v3].draw() ; } }
-  
-//-----------------------------------------------------------------------------
-// Elements
-protected :
-  bool      _originalMC ;   /**< selects wether the algorithm will use the enhanced topologically controlled lookup table or the original MarchingCubes */
-
-  int       _nverts     ;  /**< number of allocated vertices  in the vertex   buffer */
-  int       _ntrigs     ;  /**< number of allocated triangles in the triangle buffer */
-  int       _Nverts     ;  /**< size of the vertex   buffer */
-  int       _Ntrigs     ;  /**< size of the triangle buffer */
-  Point    *_vertices   ;  /**< vertex   buffer */
-  Triangle *_triangles  ;  /**< triangle buffer */
-
-  std::map< std::pair< Key,Key >, int > _stored_vertices ;
-  
-  real      _cube[8]    ;  /**< values of the implicit function on the active cube */
-  Point     _space[8]   ;  /**< coordinates of the active cube */
-  Key       _indexes[8] ;  /**< indiexs of the active cube */
-  uchar     _lut_entry  ;  /**< cube sign representation in [0..255] */
-  uchar     _case       ;  /**< case of the active cube in [0..15] */
-  uchar     _config     ;  /**< configuration of the active cube */
-  uchar     _subconfig  ;  /**< subconfiguration of the active cube */
-  data_access *_dat_access ;  /**< data accessor */
-};
-//_____________________________________________________________________________
-
-
diff --git a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/README.txt b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/README.txt
deleted file mode 100644
index 01cb605922..0000000000
--- a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/README.txt
+++ /dev/null
@@ -1,123 +0,0 @@
-
- Statistical optimization of octree searches
- Fast generation of pointerless octree duals
----------------------------------------------------
-Rener Castro, Thomas Lewiner, HŽlio Lopes, Geovan Tavares, Alex Bordignon
-Thomas Lewiner, Vin’cius Mello, Adelailson Peixoto, SinŽsio Pesco, HŽlio Lopes
-
-
-http://www.matmidia.mat.puc-rio.br/tomlew/publication_page.php?pubkey=octree_cgf
-http://www.matmidia.mat.puc-rio.br/tomlew/publication_page.php?pubkey=fastdualoctree_sgp
-
-1. Disclaimer
-2. Available code compared to the papers
-3. Octrees implementations
-4. Morton codes
-5. Data
-6. Hash table
-7. Requirements
-
-
-Disclaimer
---------------
-  This code is implements fast searches and the dual generation of static
-or dynamic pointer-based or pointerless octrees. It is provided "as is"
-and can be used freely. We just ask the users who would use this code to
-mention in their academic paper, patent or software documentation the
-original articles:
-
-@article{octree_cgf,
-    author = {Rener Castro and Thomas Lewiner and HŽlio Lopes and Geovan Tavares and Alex Bordignon},
-    title = {Statistical optimization of octree searches},
-    year = {2008},
-    month = {march},
-    journal = {Computer Graphics Forum},
-    volume = {27},
-    number = {6},
-    pages = {1557--1566},
-    publisher = {Eurographics},
-    doi = {10.1111/j.1467-8659.2007.01104.x},
-    url = {\url{http://www.matmidia.mat.puc-rio.br/tomlew/pdfs/octree_cgf.pdf}}
-}
-
-@article{fastdualoctree_sgp,
-    author = {Thomas Lewiner and Vin’cius Mello and Adelailson Peixoto and SinŽsio Pesco and HŽlio Lopes},
-    title = {Fast Generation of Pointerless Octree Duals},
-    year = {2010},
-    month = {july},
-    journal = {Symposium on Geometry Processing 2010},
-    booktitle = {Computer Graphics Forum},
-    volume = {29},
-    number = {5},
-    pages = {1661--1669},
-    publisher = {Wiley},
-    address = {Lyon, France},
-    url = {\url{http://www.matmidia.mat.puc-rio.br/tomlew/pdfs/fastdualoctree_sgp.pdf}}
-}
-
-
-
-If you have any comment, correction, question, please feel free to
-contact me at : lewiner@gmail.com .
-Thank to David Coeurjolly for the code porting to UNIX.
-
-
-
-
-Available code compared to the paper
-----------------------------------------------
-  The code contains simple implementations used to generate the result of
-our papers. We stripped down the time measurements (which are platform
-specific) and the robust dual marching cubes
-(http://www.matmidia.mat.puc-rio.br/tomlew/publication_page.php?pubkey=adaptive_implicit_sibgrapi)
-code.
-
-
-
-Octrees implementations
-------------------------------
-  The code contains implementations of a pointer-based octree
-("ptr_octree.*" files), pointerless octrees with recursive dual
-generation ("hash_octree.*"), pointerless octrees with optimized dual
-generation for the static strategy representing all the nodes
-("opt_octree.*") or only the leaves ("leaf_octree.*"), and the dynamic
-strategy ("mem_octree.*"). The octree is chosen at compilation time
-through the OCTREE_SWITCH macro.
-
-
-Morton codes
------------------
-  The Morton code operations in dilated integers are all grouped in the
-"morton.*" files.
-
-
-Data
-------
-  The data (implicit function or isogrid) is accessed through the
-data_access class. The isogrid must be in "iso" format, i.e. a binary
-file with 32-bits integers nx, ny and nz for the size of the grid,
-32-bits floats xmin, xmax, yminÉ for the geometry of the cube, followed
-by nx.ny.nz 32-bits floats for the data.
-
-
-Hash table
--------------
-  Finally, we made a very simple naive and simple implementations for the
-hashtable, in open ("hash_ptr.h") or close ("has_noptr.h") modes. The
-parameters of the hash function are chosen at compilation time through
-macros defined in the "hash.h" file.
-
-
-Requirements
-------------
-
-  The graphical interfaces require the openGL libraries with the GLU, glut
-and glui extension, available at http://glui.sourceforge.net/ .
-
-  We use Juha Nieminen, Joel Yliluoma's function parser for the implicit
-function, and our Marching Cube's implementation
-(http://www.matmidia.mat.puc-rio.br/tomlew/publication_page.php?pubkey=marching_cubes_jgt).
-
-
-Thank you for your interest, and have fun!
-http://www.matmidia.mat.puc-rio.br/tomlew/
diff --git a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/cube.h b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/cube.h
deleted file mode 100644
index dc0652f9b3..0000000000
--- a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/cube.h
+++ /dev/null
@@ -1,256 +0,0 @@
-/**
- * \file    cube.h
- * \author  Thomas Lewiner   <tomlew@puc-rio.br>
- * \author  Matmidia Lab, Math Dept, PUC-Rio
- * \date    10/01/2010
- *
- * \brief  Simple cube class
- *
- * Simple cube class
- */
-//_____________________________________________________________________________
-
-
-
-#pragma once
-
-
-#include "point.h"
-
-typedef uchar Level ;
-extern Level L_INV ;
-
-//_____________________________________________________________________________
-/// Simple cube class
-class Cube : public Point
-{
-  // Elements
-protected :
-  Level    _lv ;  ///< cube level (from 0 on): cube corners have coordinates c(xyz) (+/-) (1/2^(lv+1))
-
-  //-----------------------------------------------------------------------------
-  // Constructors
-public:
-  /// Default constructor
-  Cube( const real &cx_ = R_INV, const real &cy_ = R_INV, const real &cz_ = R_INV, Level lv_ = L_INV )
-    : Point(cx_,cy_,cz_), _lv(lv_) {}
-
-  /// Default constructor
-  Cube( const Point& c_, Level lv_ = L_INV )
-    : Point(c_), _lv(lv_) {}
-  
-  /// Default constructor
-  Cube( const Cube& c_ )
-    : Point((const Point&)c_), _lv(c_._lv) {}
-  
-  /// Destructor
-  ~Cube() {}
-    
-  /// Assignment operator
-  Cube &operator= ( const Cube &c )
-  {  Point::operator=(c) ;  _lv = c._lv ;  return *this; }
-  
-  //-----------------------------------------------------------------------------
-  // Accessors
-public:
-  /// const accessor for point center: x coordinate
-  real  cx() const { return Point::x() ; }
-  /// accessor for point center: x coordinate
-  real &cx() { return Point::x() ; }
-
-  /// const accessor for point center: y coordinate
-  real  cy() const { return Point::y() ; }
-  /// accessor for point center: y coordinate
-  real &cy() { return Point::y() ; }
-
-  /// const accessor for point center: z coordinate
-  real  cz() const { return Point::z() ; }
-  /// accessor for point center: z coordinate
-  real &cz() { return Point::z() ; }
-
-  /// const accessor for a coordinate
-  real  coord( Axis a ) const { return Point::operator[](a) ; }
-  /// accessor for a coordinate
-  real &coord( Axis a ) { return Point::operator[](a) ; }
-
-
-  /// const accessor for the cube half size
-  real   sz() const { return (real)1.0 / (2<<_lv) ; }
-  /// const accessor for cube level
-  Level  lv() const { return _lv ; }
-  /// accessor for cube level
-  Level &lv() { return _lv ; }
-
-  /// const accessor for cube center: min x coordinate
-  real  xmin() const { return cx() - sz() ; }
-  /// const accessor for cube center: max x coordinate
-  real  xmax() const { return cx() + sz() ; }
-
-  /// const accessor for cube center: min y coordinate
-  real  ymin() const { return cy() - sz() ; }
-  /// const accessor for cube center: max y coordinate
-  real  ymax() const { return cy() + sz() ; }
-
-  /// const accessor for cube center: min z coordinate
-  real  zmin() const { return cz() - sz() ; }
-  /// const accessor for cube center: max z coordinate
-  real  zmax() const { return cz() + sz() ; }
-
-  /// const accessor for cube center: min coordinate
-  real  coordmin( Axis a ) const { return coord(a) - this->sz() ; }
-  /// const accessor for cube center: max coordinate
-  real  coordmax( Axis a ) const { return coord(a) + this->sz() ; }
-
-  //------------------------------------------------
-  // Test
-public :
-  /// conained
-  bool contains( const real &x_, const real &y_, const real &z_ ) const
-  {
-    real sz_ = sz() ;
-    return
-      ( fabs(x_-cx()) <= sz_ ) &&
-      ( fabs(y_-cy()) <= sz_ ) &&
-      ( fabs(z_-cz()) <= sz_ ) ;
-  }
-
-  /// conained
-  bool contains( const Point &p ) const { return contains( p.x(), p.y(), p.z() ) ; }
-
-  /// epsilon-conained
-  bool contains( const real &x_, const real &y_, const real &z_, const real &epsilon ) const
-  {
-    real sz_ = sz() + epsilon ;
-    return
-      ( fabs(x_-cx()) <= sz_ ) &&
-      ( fabs(y_-cy()) <= sz_ ) &&
-      ( fabs(z_-cz()) <= sz_ ) ;
-  }
-
-  /// epsilon-conained
-  bool contains( const Point &p, const real &epsilon ) const { return contains( p.x(), p.y(), p.z(), epsilon ) ; }
-
-  //-----------------------------------------------------------------------------
-  // Drawing
-public:
-  /// Draws the cube center with opengl
-  void draw_center () const { ::glVertex3f( (float)x(), (float)y(), (float)z() ) ; }
-
-  /// Draws the cube corners with opengl
-  void draw_corners( real fact = 0.9 ) const
-  {
-    const float ix = (const float) x() ;
-    const float iy = (const float) y() ;
-    const float iz = (const float) z() ;
-    const float is = (const float) (fact*sz()) ;
-
-    ::glVertex3f( ix-is, iy-is, iz-is ) ;
-    ::glVertex3f( ix+is, iy-is, iz-is ) ;
-    ::glVertex3f( ix-is, iy+is, iz-is ) ;
-    ::glVertex3f( ix+is, iy+is, iz-is ) ;
-    ::glVertex3f( ix-is, iy-is, iz+is ) ;
-    ::glVertex3f( ix+is, iy-is, iz+is ) ;
-    ::glVertex3f( ix-is, iy+is, iz+is ) ;
-    ::glVertex3f( ix+is, iy+is, iz+is ) ;
-  }
-
-  /// Draws the cube wire with opengl
-  void draw_wire  ( real fact = 0.9 ) const
-  {
-    const float ix = (const float) x() ;
-    const float iy = (const float) y() ;
-    const float iz = (const float) z() ;
-    const float is = (const float) (fact*sz()) ;
-    
-    ::glVertex3f( ix-is, iy-is, iz-is ) ;
-    ::glVertex3f( ix-is, iy+is, iz-is ) ;
-
-    ::glVertex3f( ix-is, iy-is, iz-is ) ;
-    ::glVertex3f( ix+is, iy-is, iz-is ) ;
-
-    ::glVertex3f( ix+is, iy-is, iz-is ) ;
-    ::glVertex3f( ix+is, iy+is, iz-is ) ;
-
-    ::glVertex3f( ix-is, iy+is, iz-is ) ;
-    ::glVertex3f( ix+is, iy+is, iz-is ) ;
-
-
-    ::glVertex3f( ix-is, iy-is, iz+is ) ;
-    ::glVertex3f( ix-is, iy+is, iz+is ) ;
-
-    ::glVertex3f( ix-is, iy-is, iz+is ) ;
-    ::glVertex3f( ix+is, iy-is, iz+is ) ;
-
-    ::glVertex3f( ix+is, iy-is, iz+is ) ;
-    ::glVertex3f( ix+is, iy+is, iz+is ) ;
-
-    ::glVertex3f( ix-is, iy+is, iz+is ) ;
-    ::glVertex3f( ix+is, iy+is, iz+is ) ;
-
-
-    ::glVertex3f( ix-is, iy-is, iz-is ) ;
-    ::glVertex3f( ix-is, iy-is, iz+is ) ;
-
-    ::glVertex3f( ix+is, iy-is, iz-is ) ;
-    ::glVertex3f( ix+is, iy-is, iz+is ) ;
-
-    ::glVertex3f( ix-is, iy+is, iz-is ) ;
-    ::glVertex3f( ix-is, iy+is, iz+is ) ;
-
-    ::glVertex3f( ix+is, iy+is, iz-is ) ;
-    ::glVertex3f( ix+is, iy+is, iz+is ) ;
-  }
-
-
-
-  /// Draws the cube wire with opengl
-  void draw_fill  ( real fact = 0.9 ) const
-  {
-    const float ix = (const float) x() ;
-    const float iy = (const float) y() ;
-    const float iz = (const float) z() ;
-    const float is = (const float) (fact*sz()) ;
-    
-    ::glNormal3f(0,0,-1);
-    ::glVertex3f( ix-is, iy-is, iz-is ) ;
-    ::glVertex3f( ix-is, iy+is, iz-is ) ;
-    ::glVertex3f( ix+is, iy+is, iz-is ) ;
-    ::glVertex3f( ix+is, iy-is, iz-is ) ;
-
-    ::glNormal3f(0,0,1);
-    ::glVertex3f( ix-is, iy-is, iz+is ) ;
-    ::glVertex3f( ix-is, iy+is, iz+is ) ;
-    ::glVertex3f( ix+is, iy+is, iz+is ) ;
-    ::glVertex3f( ix+is, iy-is, iz+is ) ;
-
-    ::glNormal3f(-1,0,0);
-    ::glVertex3f( ix-is, iy-is, iz-is ) ;
-    ::glVertex3f( ix-is, iy+is, iz-is ) ;
-    ::glVertex3f( ix-is, iy+is, iz+is ) ;
-    ::glVertex3f( ix-is, iy-is, iz+is ) ;
-
-    ::glNormal3f(1,0,0);
-    ::glVertex3f( ix+is, iy-is, iz-is ) ;
-    ::glVertex3f( ix+is, iy+is, iz-is ) ;
-    ::glVertex3f( ix+is, iy+is, iz+is ) ;
-    ::glVertex3f( ix+is, iy-is, iz+is ) ;
-
-    ::glNormal3f(0,-1,0);
-    ::glVertex3f( ix-is, iy-is, iz-is ) ;
-    ::glVertex3f( ix-is, iy-is, iz+is ) ;
-    ::glVertex3f( ix+is, iy-is, iz+is ) ;
-    ::glVertex3f( ix+is, iy-is, iz-is ) ;
-
-    ::glNormal3f(0,1,0);
-    ::glVertex3f( ix-is, iy+is, iz-is ) ;
-    ::glVertex3f( ix-is, iy+is, iz+is ) ;
-    ::glVertex3f( ix+is, iy+is, iz+is ) ;
-    ::glVertex3f( ix+is, iy+is, iz-is ) ;
-  }
-};
-//_____________________________________________________________________________
-
-// Invalid cube
-extern Cube C_INV ;
-
-
diff --git a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/data_access.cpp b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/data_access.cpp
deleted file mode 100644
index a536fda18c..0000000000
--- a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/data_access.cpp
+++ /dev/null
@@ -1,266 +0,0 @@
-/**
- * @file    data_access.cpp
- * \author  Thomas Lewiner   <thomas.lewiner@polytechnique.org>
- * \author  Math Dept, PUC-Rio
- * \author  Matmidia Labs
- * \date    14/02/2006
- *
- * @brief   data accesss
- */
-//________________________________________________
-
-
-
-#ifndef WIN32
-#pragma implementation
-#endif // WIN32
-
-#include "data_access.h"
-
-
-//_____________________________________________________________________________
-//_____________________________________________________________________________
-// data_func
-
-//_____________________________________________________________________________
-// crossing data access: parser
-void data_func::parse()
-//-----------------------------------------------------------------------------
-{
-  if( _formula.empty() )
-    return ;
-  std::string vars("x,y,z") ;
-  int i = _parser.Parse( _formula, vars ) ;
-  if( _parser.GetParseErrorType() != FunctionParser::FP_NO_ERROR )
-    printf( "%s\n%s\n% *d\n", _parser.ErrorMsg(), _formula.c_str(), i, 1 ) ;
-  else
-    _parser.Optimize() ;
-}
-//_____________________________________________________________________________
-
-
-
-//_____________________________________________________________________________
-// crossing data access
-bool data_func::need_refine( const Cube &c )
-//-----------------------------------------------------------------------------
-{
-    if( _parser.GetParseErrorType() != FunctionParser::FP_NO_ERROR ) return false ;
-  int l = c.lv() ;
-  if( l < 2 ) return true ;
-  if( l >= _max_level ) return false ;
-  
-  real cx = c.cx() ;
-  real cy = c.cy() ;
-  real cz = c.cz() ;
-  _v[X] = cx ;
-  _v[Y] = cy ;
-  _v[Z] = cz ;
-  
-  real ref_val = _parser.Eval(_v) - _iso_val ;
-  if( fabs(ref_val) < R_EPSILON ) return true ;
-  
-  real sz = c.sz() ;
-  for( _v[X] = cx-sz ; _v[X] <= cx+sz ; _v[X] += sz )
-  {
-    for( _v[Y] = cy-sz ; _v[Y] <= cy+sz ; _v[Y] += sz )
-    {
-      for( _v[Z] = cz-sz ; _v[Z] <= cz+sz ; _v[Z] += sz )
-      {
-        real val = _parser.Eval(_v) - _iso_val ;
-        if( ref_val * val < 0 ) return true ;
-      }
-    }
-  }
-  
-  return false ;
-}
-//_____________________________________________________________________________
-
-
-#ifndef BISSEC_ITER
-#define BISSEC_ITER 3
-#endif // BISSEC_ITER
-
-//_____________________________________________________________________________
-// interpolation function
-void data_func::interpolate( real ci, real cj, const Point &pi, const Point &pj, Point &p )
-//-----------------------------------------------------------------------------
-{
-    real u ;
-  Point qi = pi ;
-  Point qj = pj ;
-  for( int i = 0 ; i < BISSEC_ITER ; ++i )
-  {
-    u = ( ci ) / ( ci - cj ) ;
-    p = ((1-u)*qi) + (u*qj) ;
-    
-    real c = value_at(p) ;
-    if( c*ci < 0 )
-    {
-      qj = p ;
-      cj = c ;
-    }
-    else if( c*cj < 0 )
-    {
-      qi = p ;
-      ci = c ;
-    }
-    else break ;
-  }
-  u = ( ci ) / ( ci - cj ) ;
-  p = ((1-u)*qi) + (u*qj) ;
-}
-//_____________________________________________________________________________
-
-
-
-
-
-//_____________________________________________________________________________
-//_____________________________________________________________________________
-// data_file
-
-
-#include <errno.h>
-#include <string.h>
-#include <zlib.h>
-
-//_____________________________________________________________________________
-// data data access: load file
-bool data_file::load_data( const char *fn  )
-//-----------------------------------------------------------------------------
-{
-  errno = 0;
-  gzFile isofile = gzopen( fn, "rb" ) ;
-  if( !isofile )
-  {
-    printf( "data_file::load_data couldn't open file %s: %s\n", fn, strerror (errno));
-    return false ;
-  }
-  
-  // read size
-  unsigned char buf[sizeof(float)] ;
-  if( gzread( isofile, buf, sizeof(float) ) < 1 ) return false ;
-  _size_x = * (int*)buf ;
-  if( gzread( isofile, buf, sizeof(float) ) < 1 ) return false ;
-  _size_y = * (int*)buf ;
-  if( gzread( isofile, buf, sizeof(float) ) < 1 ) return false ;
-  _size_z = * (int*)buf ;
-  
-  if( gzread( isofile, buf, sizeof(float) ) < 1 ) return false ;
-  float xmin = * (float*)buf ;
-  if( gzread( isofile, buf, sizeof(float) ) < 1 ) return false ;
-  float xmax = * (float*)buf ;
-  if( gzread( isofile, buf, sizeof(float) ) < 1 ) return false ;
-  float ymin = * (float*)buf ;
-  if( gzread( isofile, buf, sizeof(float) ) < 1 ) return false ;
-  float ymax = * (float*)buf ;
-  if( gzread( isofile, buf, sizeof(float) ) < 1 ) return false ;
-  float zmin = * (float*)buf ;
-  if( gzread( isofile, buf, sizeof(float) ) < 1 ) return false ;
-  float zmax = * (float*)buf ;
-  
-  // allocate data
-  delete [] _data ;
-  _size_yz = _size_z * _size_y ;
-  uint total_size = _size_x * _size_yz ;
-  if( total_size == 0 ) return false ;
-  
-  // cube fitting
-  _max_size = _size_x ;
-  if( _max_size < _size_y ) _max_size = _size_y ;
-  if( _max_size < _size_z ) _max_size = _size_z ;
-  Level p = (Level)floor( log(_max_size)/log(2) ) ;
-  if( _max_size != (1<<p) ) _max_size = 1 << (p+1) ;
-  
-  _data = new float[ total_size ] ;
-  if( _data == (float*)NULL ) return false ;
-  
-  float min_field =  FLT_MAX ;
-  float max_field = -FLT_MAX ;
-  float *data_ptr = _data ;
-  for( uint i = 0 ; i < total_size ; ++i, ++data_ptr )
-  {
-    if( gzread( isofile, buf, sizeof(float) ) < 1 ) return false ;
-    float v = * (float*) buf ;
-    *data_ptr = v ;
-    if( v < min_field ) min_field = v ;
-    if( v > max_field ) max_field = v ;
-  }
-  
-  gzclose( isofile ) ;
-  
-  printf( "data %s: %dx%dx%d, field originally in [ %f , %f ]\n", fn, (int)_size_x, (int)_size_y, (int)_size_z, min_field, max_field ) ;
-  
-  // rescale data in [-1.1]
-  float v_scale = 2.0 / (max_field - min_field) ;
-  data_ptr = _data ;
-  for( uint i = 0 ; i < total_size ; ++i, ++data_ptr )
-  {
-    *data_ptr = v_scale * ( (*data_ptr) - min_field ) - 1.0 ;
-  }
-  
-  // cube scaling
-  _sx = (xmax - xmin)/_size_x ;
-  _sy = (ymax - ymin)/_size_y ;
-  _sz = (zmax - zmin)/_size_z ;
-  float s = _sx ;
-  if( s < _sy ) s = _sy ;
-  if( s < _sz ) s = _sz ;
-  _sx /= s ;
-  _sy /= s ;
-  _sz /= s ;
-  
-  return true ;
-}
-//_____________________________________________________________________________
-
-
-
-
-//_____________________________________________________________________________
-// data data access
-bool data_file::need_refine( const Cube &c )
-//-----------------------------------------------------------------------------
-{
-    int l = c.lv() ;
-  if( l < 2 ) return true ;
-  if( l >= _max_level ) return false ;
-  
-  // ajustar se o dado nao for cubico!
-  real sz = c.sz() ;
-  uint i  = floor( (c.cx()-sz) * _max_size ) ;
-  uint iM = ceil ( (c.cx()+sz) * _max_size ) ;
-  uint j  = floor( (c.cy()-sz) * _max_size ) ;
-  uint jM = ceil ( (c.cy()+sz) * _max_size ) ;
-  uint k  = floor( (c.cz()-sz) * _max_size ) ;
-  uint kM = ceil ( (c.cz()+sz) * _max_size ) ;
-  
-  if( iM >= _size_x ) iM = _size_x-1 ;
-  if( jM >= _size_y ) jM = _size_y-1 ;
-  if( kM >= _size_z ) kM = _size_z-1 ;
-  
-  float iso_min = get_data(iM,jM,kM) ;
-  float iso_max = iso_min ;
-  for( ; i <= iM ; ++i )
-  {
-    for( ; j <= jM ; ++j )
-    {
-      for( ; k <= kM ; ++k )
-      {
-        float iso = get_data(i,j,k) ;
-        if( iso_min > iso ) iso_min = iso ;
-        if( iso_max < iso ) iso_max = iso ;
-        
-        if( iso_min*iso_max < 0 ) return true ;
-      }
-    }
-  }
-  
-  return false ;
-}
-//_____________________________________________________________________________
-
-
-
diff --git a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/data_access.h b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/data_access.h
deleted file mode 100644
index 2574333e23..0000000000
--- a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/data_access.h
+++ /dev/null
@@ -1,192 +0,0 @@
-/**
- * @file    data_access.h
- * \author  Thomas Lewiner   <thomas.lewiner@polytechnique.org>
- * \author  Math Dept, PUC-Rio
- * \author  Matmidia Labs
- * \date    14/02/2006
- *
- * @brief   data accesss
- */
-//________________________________________________
-
-
-#pragma once
-
-#ifndef WIN32
-#pragma interface
-#endif // WIN32
-
-#include <string>
-#include <stdio.h>
-#include "cube.h"
-
-
-//_____________________________________________________________________________
-/// data access abstract class
-class data_access
-//_____________________________________________________________________________
-{
-  public :
-  Level  _max_level;  ///< maximal level of a cell
-  real   _iso_val;  ///< iso value
-  float  _sx ;  ///< grid x proportion
-  float  _sy ;  ///< grid y proportion
-  float  _sz ;  ///< grid z proportion
-  
-  
-  public :
-  /// constructor
-  data_access( Level max_level_ = 4, real iso_val_ = 0.0 ) : _max_level(max_level_), _iso_val(iso_val_), _sx(1.0f), _sy(1.0f), _sz(1.0f) {}
-  /// destructor
-  virtual ~data_access() {}
-  /// test function
-  virtual bool need_refine( const Cube &c ) = 0 ;
-  /// data function
-  virtual real value_at   ( const Cube &c ) = 0 ;
-  /// interpolation function
-  virtual void interpolate( real ci, real cj, const Point &pi, const Point &pj, Point &p )
-  {
-    real u = ( ci ) / ( ci - cj ) ;
-    p = ((1-u)*pi) + (u*pj) ;
-  }
-} ;
-//-----------------------------------------------------------------------------
-
-
-
-// may be overridden by the preprocessor
-#ifndef RAND_THRES
-# define RAND_THRES 0.2
-#endif // RAND_THRES
-
-//_____________________________________________________________________________
-/// basic data access
-class data_rand : public data_access
-//-----------------------------------------------------------------------------
-{
-public:
-  /// test function
-  bool need_refine( const Cube &c )
-  {
-    int l = c.lv() ;
-    if( l < 2 ) return true ;
-    if( l >= _max_level ) return false ;
-    return value_at(c) > RAND_THRES ;
-  }
-  
-  /// data function
-  real value_at( const Cube &c ) { return ( (real)rand() ) / ( RAND_MAX >> 1 ) - 1.0 ; }
-  
-  /// interpolation function
-  void interpolate( real ci, real cj, const Point &pi, const Point &pj, Point &p )
-  {
-    real u = ( (real)rand() ) / ( RAND_MAX ) ;
-    p = ((1-u)*pi) + (u*pj) ;
-  }
-
-  //-----------------------------------------------------------------------------
-  // Basics
-public:
-  /// default constructor
-  data_rand( Level max_level_ ) : data_access(max_level_) {}
-  /// destructor
-  virtual ~data_rand() {}
-} ;
-//_____________________________________________________________________________
-
-
-
-#include "fptypes.h"
-#include "fparser.h"
-
-//_____________________________________________________________________________
-/// function crossing data access
-class data_func : public data_access
-//-----------------------------------------------------------------------------
-{
-public:
-  /// implicit function
-  std::string _formula ; 
-  
-protected:
-  double          _v[3]   ;
-  FunctionParser  _parser ;
-  
-protected:
-  void parse() ;
-  
-public:
-  /// test function
-  bool need_refine( const Cube &c ) ;
-  
-  /// data function
-  real value_at( const Cube &c )
-  {
-    if( _parser.GetParseErrorType() != FunctionParser::FP_NO_ERROR ) return false ;
-    _v[X] = c.cx() ;
-    _v[Y] = c.cy() ;
-    _v[Z] = c.cz() ;
-    real v = _parser.Eval(_v) - _iso_val ;
-    if( _parser.EvalError() ) return -1.0 ;
-    return v ;
-  }
-  
-  /// interpolation function
-  void interpolate( real ci, real cj, const Point &pi, const Point &pj, Point &p ) ;  
-  
-  //-----------------------------------------------------------------------------
-  // Basics
-public:
-  /// default constructor
-  data_func( Level max_level_, real iso_val_, const std::string &formula_ ) : data_access(max_level_,iso_val_), _formula(formula_) { parse() ; }
-  /// destructor
-  virtual ~data_func() {}  
-} ;
-//_____________________________________________________________________________
-
-
-
-
-//_____________________________________________________________________________
-/// iso file data access
-class data_file : public data_access
-//-----------------------------------------------------------------------------
-{
-public:
-  uint   _size_x     ;  ///< width  of the grid
-  uint   _size_y     ;  ///< depth  of the grid
-  uint   _size_z     ;  ///< height of the grid
-  
-protected:
-  float *_data       ;  /**< implicit function values sampled on the grid */
-  uint   _size_yz    ;  /**< k skip size */
-  uint   _max_size   ;  /**< bigger side to fit into the cube */
-  
-  
-public:
-  bool  load_data  ( const char *fn ) ;
-  bool  has_data   ( uint i, uint j, uint k ) { return (i < _size_x) && (j < _size_y) && (k < _size_z) ; }
-  float get_data   ( uint i, uint j, uint k ) { return _data[ k + j*_size_z + i*_size_yz] - _iso_val ; }
-  
-  /// test function
-  bool  need_refine( const Cube &c ) ;
-  /// data function
-  real value_at( const Cube &c )
-  {
-    uint i = (uint)(c.cx()*_max_size) ;
-    uint j = (uint)(c.cy()*_max_size) ;
-    uint k = (uint)(c.cz()*_max_size) ;
-    if( has_data(i,j,k) ) return (real)get_data(i,j,k) ;
-    return -1.0 ;
-  }
-  // linear interpolation: no specification
-  
-  //-----------------------------------------------------------------------------
-  // Basics
-public:
-  /// default constructor
-  data_file( Level max_level_, real iso_val_, const char *fn ) : data_access(max_level_,iso_val_), _data((float*)NULL) { load_data( fn ) ; }
-  /// destructor
-  virtual ~data_file() {}  
-} ;
-//_____________________________________________________________________________
diff --git a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/fp_identifier_parser.inc b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/fp_identifier_parser.inc
deleted file mode 100644
index 723c80d74e..0000000000
--- a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/fp_identifier_parser.inc
+++ /dev/null
@@ -1,292 +0,0 @@
-        unsigned nameLength = 0;
-        const unsigned maximumNameLength = 0x80000000U-8;
-        /*
-        Due to the manner the identifier lengths are returned from
-        the readOpcode() function, the maximum supported length for
-        identifiers is 0x7FFFFFFF bytes. We minus 8 here to add some
-        buffer, because of the multibyteness of UTF-8.
-        Function names are limited to 0xFFFF bytes instead, but because
-        function names that long just are not defined, the point is moot.
-        */
-        const unsigned char* const uptr = (const unsigned char*) input;
-        typedef signed char schar;
-        while(likely(nameLength < maximumNameLength))
-        {
-            unsigned char byte = uptr[nameLength+0];
-            /* Handle the common case of A-Za-z first */
-            if(byte >= 0x40)
-            {
-                if(byte < 0x80) // 0x40..0x7F - most common case
-                {
-                    // Valid characters in 40..7F: A-Za-z_
-                    // Valid bitmask for 40..5F: 01111111111111111111111111100001
-                    // Valid bitmask for 60..7F: 01111111111111111111111111100000
-                    if(sizeof(unsigned long) == 8)
-                    {
-                        const unsigned n = sizeof(unsigned long)*8-32;
-                        // ^ avoids compiler warning when not 64-bit
-                        unsigned long masklow6bits = 1UL << (byte & 0x3F);
-                        if(masklow6bits & ~((1UL << 0) | (0x0FUL << (0x1B  ))
-                                          | (1UL << n) | (0x1FUL << (0x1B+n))))
-                            { ++nameLength; continue; }
-                    }
-                    else
-                    {
-                        unsigned masklow5bits = 1 << (byte & 0x1F);
-                        if((masklow5bits & ~(1 | (0x1F << 0x1B))) || byte == '_')
-                            { ++nameLength; continue; }
-                    }
-                    break;
-                }
-                if(byte < 0xF0)
-                {
-                    if(byte < 0xE0)
-                    {
-                        if(byte < 0xC2) break; // 0x80..0xC1
-                        if(byte == 0xC2 && uptr[nameLength+1]==0xA0) break; // skip nbsp
-                        // C2-DF - next common case when >= 0x40
-                        // Valid sequence: C2-DF 80-BF
-                        if(schar(uptr[nameLength+1]) > schar(0xBF)) break;
-                        nameLength += 2;
-                        continue;
-                    }
-                    if(byte == 0xE0) // E0
-                    {
-                        // Valid sequence: E0 A0-BF 80-BF
-                        if((unsigned char)(uptr[nameLength+1] - 0xA0) > (0xBF-0xA0)) break;
-                    }
-                    else
-                    {
-                        if(byte == 0xED) break; // ED is invalid
-                        // Valid sequence: E1-EC 80-BF 80-BF
-                        //            And: EE-EF 80-BF 80-BF
-                        if(byte == 0xE2)
-                        {
-                            // break on various space characters
-                            if(uptr[nameLength+1] == 0x80
-                            && (schar(uptr[nameLength+2]) <= schar(0x8B)
-                            || (uptr[nameLength+2] == 0xAF))) break;
-                            if(uptr[nameLength+1] == 0x81
-                            && uptr[nameLength+2] == 0x9F) break;
-                        } else
-                        if(byte == 0xE3 && uptr[nameLength+1] == 0x80
-                        && uptr[nameLength+2] == 0x80) break; // this too
-
-                        if(schar(uptr[nameLength+1]) > schar(0xBF)) break;
-                    }
-                    if(schar(uptr[nameLength+2]) > schar(0xBF)) break;
-                    nameLength += 3;
-                    continue;
-                }
-                if(byte == 0xF0) // F0
-                {
-                    // Valid sequence: F0 90-BF 80-BF 80-BF
-                    if((unsigned char)(uptr[nameLength+1] - 0x90) > (0xBF-0x90)) break;
-                }
-                else
-                {
-                    if(byte > 0xF4) break; // F5-FF are invalid
-                    if(byte == 0xF4) // F4
-                    {
-                        // Valid sequence: F4 80-8F
-                        if(schar(uptr[nameLength+1]) > schar(0x8F)) break;
-                    }
-                    else
-                    {
-                        // F1-F3
-                        // Valid sequence: F1-F3 80-BF 80-BF 80-BF
-                        if(schar(uptr[nameLength+1]) > schar(0xBF)) break;
-                    }
-                }
-                if(schar(uptr[nameLength+2]) > schar(0xBF)) break;
-                if(schar(uptr[nameLength+3]) > schar(0xBF)) break;
-                nameLength += 4;
-                continue;
-            }
-            if(nameLength > 0)
-            {
-                if(sizeof(unsigned long) == 8)
-                {
-                    // Valid bitmask for 00..1F: 00000000000000000000000000000000
-                    // Valid bitmask for 20..3F: 00000000000000001111111111000000
-                    const unsigned n = sizeof(unsigned long)*8-32;
-                    // ^ avoids compiler warning when not 64-bit
-                    unsigned long masklow6bits = 1UL << byte;
-                    if(masklow6bits & (((1UL << 10)-1UL) << (16+n)))
-                        { ++nameLength; continue; }
-                }
-                else
-                {
-                    if(byte >= '0' && byte <= '9')
-                        { ++nameLength; continue; }
-                }
-            }
-            break;
-        }
-
-        /* This function generated with make_function_name_parser.cc */
-        switch(nameLength)
-        {
-             case 2:
-    /* prefix  */if('i' == uptr[0]
-    && 'f' == uptr[1]) return Functions[cIf].enabled() ? (cIf<<16) | 0x80000002U : 2;
-    return 2;
-             case 3:
-    /* prefix  */switch(uptr[0]) {
-    case 'a':
-    /* prefix a */if('b' == uptr[1]
-    && 's' == uptr[2]) return Functions[cAbs].enabled() ? (cAbs<<16) | 0x80000003U : 3;
-    return 3;
-    case 'c':
-    /* prefix c */switch(uptr[1]) {
-    case 'o':
-    /* prefix co */switch(uptr[2]) {
-    case 's':
-    /* prefix cos */return Functions[cCos].enabled() ? (cCos<<16) | 0x80000003U : 3;
-    case 't':
-    /* prefix cot */return Functions[cCot].enabled() ? (cCot<<16) | 0x80000003U : 3;
-    default: return 3; }
-    case 's':
-    /* prefix cs */if('c' == uptr[2]) return Functions[cCsc].enabled() ? (cCsc<<16) | 0x80000003U : 3;
-    return 3;
-    default: return 3; }
-    case 'e':
-    /* prefix e */if('x' == uptr[1]
-    && 'p' == uptr[2]) return Functions[cExp].enabled() ? (cExp<<16) | 0x80000003U : 3;
-    return 3;
-    case 'i':
-    /* prefix i */if('n' == uptr[1]
-    && 't' == uptr[2]) return Functions[cInt].enabled() ? (cInt<<16) | 0x80000003U : 3;
-    return 3;
-    case 'l':
-    /* prefix l */if('o' == uptr[1]
-    && 'g' == uptr[2]) return Functions[cLog].enabled() ? (cLog<<16) | 0x80000003U : 3;
-    return 3;
-    case 'm':
-    /* prefix m */switch(uptr[1]) {
-    case 'a':
-    /* prefix ma */if('x' == uptr[2]) return Functions[cMax].enabled() ? (cMax<<16) | 0x80000003U : 3;
-    return 3;
-    case 'i':
-    /* prefix mi */if('n' == uptr[2]) return Functions[cMin].enabled() ? (cMin<<16) | 0x80000003U : 3;
-    return 3;
-    default: return 3; }
-    case 'p':
-    /* prefix p */if('o' == uptr[1]
-    && 'w' == uptr[2]) return Functions[cPow].enabled() ? (cPow<<16) | 0x80000003U : 3;
-    return 3;
-    case 's':
-    /* prefix s */switch(uptr[1]) {
-    case 'e':
-    /* prefix se */if('c' == uptr[2]) return Functions[cSec].enabled() ? (cSec<<16) | 0x80000003U : 3;
-    return 3;
-    case 'i':
-    /* prefix si */if('n' == uptr[2]) return Functions[cSin].enabled() ? (cSin<<16) | 0x80000003U : 3;
-    return 3;
-    default: return 3; }
-    case 't':
-    /* prefix t */if('a' == uptr[1]
-    && 'n' == uptr[2]) return Functions[cTan].enabled() ? (cTan<<16) | 0x80000003U : 3;
-    return 3;
-    default: return 3; }
-             case 4:
-    /* prefix  */switch(uptr[0]) {
-    case 'a':
-    /* prefix a */switch(uptr[1]) {
-    case 'c':
-    /* prefix ac */if('o' == uptr[2]
-    && 's' == uptr[3]) return Functions[cAcos].enabled() ? (cAcos<<16) | 0x80000004U : 4;
-    return 4;
-    case 's':
-    /* prefix as */if('i' == uptr[2]
-    && 'n' == uptr[3]) return Functions[cAsin].enabled() ? (cAsin<<16) | 0x80000004U : 4;
-    return 4;
-    case 't':
-    /* prefix at */if('a' == uptr[2]
-    && 'n' == uptr[3]) return Functions[cAtan].enabled() ? (cAtan<<16) | 0x80000004U : 4;
-    return 4;
-    default: return 4; }
-    case 'c':
-    /* prefix c */switch(uptr[1]) {
-    case 'b':
-    /* prefix cb */if('r' == uptr[2]
-    && 't' == uptr[3]) return Functions[cCbrt].enabled() ? (cCbrt<<16) | 0x80000004U : 4;
-    return 4;
-    case 'e':
-    /* prefix ce */if('i' == uptr[2]
-    && 'l' == uptr[3]) return Functions[cCeil].enabled() ? (cCeil<<16) | 0x80000004U : 4;
-    return 4;
-    case 'o':
-    /* prefix co */if('s' == uptr[2]
-    && 'h' == uptr[3]) return Functions[cCosh].enabled() ? (cCosh<<16) | 0x80000004U : 4;
-    return 4;
-    default: return 4; }
-    case 'e':
-    /* prefix e */switch(uptr[1]) {
-    case 'v':
-    /* prefix ev */if('a' == uptr[2]
-    && 'l' == uptr[3]) return Functions[cEval].enabled() ? (cEval<<16) | 0x80000004U : 4;
-    return 4;
-    case 'x':
-    /* prefix ex */if('p' == uptr[2]
-    && '2' == uptr[3]) return Functions[cExp2].enabled() ? (cExp2<<16) | 0x80000004U : 4;
-    return 4;
-    default: return 4; }
-    case 'l':
-    /* prefix l */{static const char tmp[3] = {'o','g','2'};
-    if(std::memcmp(uptr+1, tmp, 3) == 0) return Functions[cLog2].enabled() ? (cLog2<<16) | 0x80000004U : 4;
-    return 4; }
-    case 's':
-    /* prefix s */switch(uptr[1]) {
-    case 'i':
-    /* prefix si */if('n' == uptr[2]
-    && 'h' == uptr[3]) return Functions[cSinh].enabled() ? (cSinh<<16) | 0x80000004U : 4;
-    return 4;
-    case 'q':
-    /* prefix sq */if('r' == uptr[2]
-    && 't' == uptr[3]) return Functions[cSqrt].enabled() ? (cSqrt<<16) | 0x80000004U : 4;
-    return 4;
-    default: return 4; }
-    case 't':
-    /* prefix t */{static const char tmp[3] = {'a','n','h'};
-    if(std::memcmp(uptr+1, tmp, 3) == 0) return Functions[cTanh].enabled() ? (cTanh<<16) | 0x80000004U : 4;
-    return 4; }
-    default: return 4; }
-             case 5:
-    /* prefix  */switch(uptr[0]) {
-    case 'a':
-    /* prefix a */switch(uptr[1]) {
-    case 'c':
-    /* prefix ac */{static const char tmp[3] = {'o','s','h'};
-    if(std::memcmp(uptr+2, tmp, 3) == 0) return Functions[cAcosh].enabled() ? (cAcosh<<16) | 0x80000005U : 5;
-    return 5; }
-    case 's':
-    /* prefix as */{static const char tmp[3] = {'i','n','h'};
-    if(std::memcmp(uptr+2, tmp, 3) == 0) return Functions[cAsinh].enabled() ? (cAsinh<<16) | 0x80000005U : 5;
-    return 5; }
-    case 't':
-    /* prefix at */if('a' == uptr[2]) {
-    /* prefix ata */if('n' == uptr[3]) {
-    /* prefix atan */switch(uptr[4]) {
-    case '2':
-    /* prefix atan2 */return Functions[cAtan2].enabled() ? (cAtan2<<16) | 0x80000005U : 5;
-    case 'h':
-    /* prefix atanh */return Functions[cAtanh].enabled() ? (cAtanh<<16) | 0x80000005U : 5;
-    default: return 5; }
-    }return 5;}return 5;default: return 5; }
-    case 'f':
-    /* prefix f */{static const char tmp[4] = {'l','o','o','r'};
-    if(std::memcmp(uptr+1, tmp, 4) == 0) return Functions[cFloor].enabled() ? (cFloor<<16) | 0x80000005U : 5;
-    return 5; }
-    case 'l':
-    /* prefix l */{static const char tmp[4] = {'o','g','1','0'};
-    if(std::memcmp(uptr+1, tmp, 4) == 0) return Functions[cLog10].enabled() ? (cLog10<<16) | 0x80000005U : 5;
-    return 5; }
-    case 't':
-    /* prefix t */{static const char tmp[4] = {'r','u','n','c'};
-    if(std::memcmp(uptr+1, tmp, 4) == 0) return Functions[cTrunc].enabled() ? (cTrunc<<16) | 0x80000005U : 5;
-    return 5; }
-    default: return 5; }
-            default: break;
-        }
-        return nameLength;
diff --git a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/fp_opcode_add.inc b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/fp_opcode_add.inc
deleted file mode 100644
index 47e29382ff..0000000000
--- a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/fp_opcode_add.inc
+++ /dev/null
@@ -1,4279 +0,0 @@
-/* Function Parser for C++ v4.0.3   
-
-   Note: This file contains generated code and is thus not
-   intended to be to be modified by hand. It was generated by
-   fpoptimizer/bytecoderules_parser which is available in the
-   development package.
-
-   Note: You don't need to add this file to your project. It's
-   enough for it to be in the same directory as fparser.cc. This
-   file is internally #included by fparser.cc.
-*/
-
-#define FP_TRACE_OPCODENAME(op) \
-    (op < VarBegin \
-        ? FP_GetOpcodeName(OPCODE(op)) \
-        : findName(data->namePtrs,op,NameData<Value_t>::VARIABLE))
-#define FP_TRACE_BYTECODE_OPTIMIZATION(srcline,from,to,with) \
-    /*std::cout << "Changing \"" from "\"\t(line " #srcline ")\n" \
-                   "    into \"" to "\"\n" with*/
-
-  static unsigned DummyOpList[1] = {cNop};
-  /* DummyOpList is needed to prevent crash when 1+x
-   * is changed into x+1 and the bytecode containing just "x"
-   * is tested against the rule which changes "x x" into "x cDup".
-   */
-  unsigned* ByteCodePtr;
-  Value_t*   ImmedPtr;
-
-  #define FP_ReDefinePointers() \
-    ByteCodePtr = !data->ByteCode.empty() ? &data->ByteCode[0] + data->ByteCode.size() - 1 : &DummyOpList[0]; \
-    ImmedPtr    = !data->Immed.empty()    ? &data->Immed[0]    + data->Immed.size()    - 1 : 0;
-  FP_ReDefinePointers();
-
-#if(!FP_FLOAT_VERSION)
-	Value_t x;
-	unsigned A;
-	Value_t y;
-	unsigned B;
-	unsigned C;
-	unsigned D;
-	switch(opcode)
-	{
-	TailCall_cAbs:
-	case cAbs:
-		switch(ByteCodePtr[0])
-		{
-		case cNeg:
-			FP_TRACE_BYTECODE_OPTIMIZATION(189,"cNeg cAbs", "cAbs", "");
-			/* opcode = cAbs; */ // redundant, matches cAbs @ 0
-			goto Laa;
-		case cImmed:
-			x = ImmedPtr[0];
-			FP_TRACE_BYTECODE_OPTIMIZATION(40,
-				"x cAbs",
-				"[fp_abs(x)]",
-				"    with x = " << x << "\n");
-			/* ByteCodePtr[0] = cImmed; */ // redundant, matches x @ 1
-			goto Lab;
-		default:
-			A = ByteCodePtr[0];
-			if(IsNeverNegativeValueOpcode(A))
-			{
-				FP_TRACE_BYTECODE_OPTIMIZATION(244,
-					"A[IsNeverNegativeValueOpcode(A)] cAbs",
-					"A",
-					"    with A = " << FP_TRACE_OPCODENAME(A) << "\n");
-				/* ByteCodePtr[0] = A; */ // redundant, matches A @ 1
-				return;
-			}
-		}
-		goto Default0;
-	TailCall_cAdd:
-	case cAdd:
-		switch(ByteCodePtr[0])
-		{
-		case cDup:
-			if(ByteCodePtr[-1] == cAdd)
-			{
-				if(ByteCodePtr[-2] == cDup)
-				{
-					FP_TRACE_BYTECODE_OPTIMIZATION(108,"cDup cAdd cDup cAdd", "[Value_t(4)] cMul", "");
-					goto Lac;
-				}
-			}
-			break;
-		case cNeg:
-			FP_TRACE_BYTECODE_OPTIMIZATION(196,"cNeg cAdd", "cSub", "");
-			goto Lad;
-		case cImmed:
-			x = ImmedPtr[0];
-			switch(ByteCodePtr[-1])
-			{
-			case cAdd:
-				if(ByteCodePtr[-2] == cImmed)
-				{
-					y = ImmedPtr[-1];
-					FP_TRACE_BYTECODE_OPTIMIZATION(142,
-						"y cAdd x cAdd",
-						"[y+x] cAdd",
-						"    with x = " << x
-						    << ", y = " << y
-						    << "\n");
-					/* ByteCodePtr[-2] = cImmed; */ // redundant, matches y @ 3
-					/* opcode = cAdd; */ // redundant, matches cAdd @ 0
-					goto Lae;
-				}
-				break;
-			case cImmed:
-				y = ImmedPtr[-1];
-				FP_TRACE_BYTECODE_OPTIMIZATION(76,
-					"y x cAdd",
-					"[y+x]",
-					"    with x = " << x
-					    << ", y = " << y
-					    << "\n");
-				/* ByteCodePtr[-1] = cImmed; */ // redundant, matches y @ 2
-				goto Laf;
-			}
-			if(x==Value_t(0))
-			{
-				FP_TRACE_BYTECODE_OPTIMIZATION(75,
-					"x[x==Value_t(0)] cAdd",
-					"",
-					"    with x = " << x << "\n");
-				goto Lag;
-			}
-			break;
-		}
-		goto Default0;
-	TailCall_cAnd:
-	case cAnd:
-		if(ByteCodePtr[0] == cImmed)
-		{
-			x = ImmedPtr[0];
-			if(ByteCodePtr[-1] == cImmed)
-			{
-				y = ImmedPtr[-1];
-				FP_TRACE_BYTECODE_OPTIMIZATION(131,
-					"y x cAnd",
-					"[truthValue(x)&&truthValue(y)]",
-					"    with x = " << x
-					    << ", y = " << y
-					    << "\n");
-				/* ByteCodePtr[-1] = cImmed; */ // redundant, matches y @ 2
-				goto Lah;
-			}
-		}
-		goto Default0;
-	TailCall_cDiv:
-	case cDiv:
-		switch(ByteCodePtr[0])
-		{
-		case cDup:
-			FP_TRACE_BYTECODE_OPTIMIZATION(121,"cDup cDiv", "[Value_t(0)] cMul [Value_t(1)] cAdd", "");
-			goto Lai;
-		case cImmed:
-			x = ImmedPtr[0];
-			if(x!=Value_t(0))
-			{
-				switch(ByteCodePtr[-1])
-				{
-				case cNeg:
-					FP_TRACE_BYTECODE_OPTIMIZATION(139,
-						"cNeg x[x!=Value_t(0)] cDiv",
-						"[-x] cDiv",
-						"    with x = " << x << "\n");
-					/* opcode = cDiv; */ // redundant, matches cDiv @ 0
-					goto Laj;
-				case cImmed:
-					y = ImmedPtr[-1];
-					FP_TRACE_BYTECODE_OPTIMIZATION(73,
-						"y x[x!=Value_t(0)] cDiv",
-						"[y/x]",
-						"    with x = " << x
-						    << ", y = " << y
-						    << "\n");
-					/* ByteCodePtr[-1] = cImmed; */ // redundant, matches y @ 2
-					goto Lak;
-				}
-			}
-			if(x==Value_t(1))
-			{
-				FP_TRACE_BYTECODE_OPTIMIZATION(72,
-					"x[x==Value_t(1)] cDiv",
-					"",
-					"    with x = " << x << "\n");
-				goto Lag;
-			}
-			break;
-		}
-		goto Default0;
-	TailCall_cEqual:
-	case cEqual:
-		if(ByteCodePtr[0] == cImmed)
-		{
-			x = ImmedPtr[0];
-			if(x==Value_t(1))
-			{
-				A = ByteCodePtr[-1];
-				if(IsLogicalOpcode(A))
-				{
-					FP_TRACE_BYTECODE_OPTIMIZATION(272,
-						"A[IsLogicalOpcode(A)] x[x==Value_t(1)] cEqual",
-						"A",
-						"    with x = " << x
-						    << ", A = " << FP_TRACE_OPCODENAME(A)
-						    << "\n");
-					/* ByteCodePtr[-1] = A; */ // redundant, matches A @ 2
-					goto Lag;
-				}
-			}
-			if(ByteCodePtr[-1] == cImmed)
-			{
-				y = ImmedPtr[-1];
-				FP_TRACE_BYTECODE_OPTIMIZATION(129,
-					"y x cEqual",
-					"[fp_equal(y,x)]",
-					"    with x = " << x
-					    << ", y = " << y
-					    << "\n");
-				/* ByteCodePtr[-1] = cImmed; */ // redundant, matches y @ 2
-				goto Lal;
-			}
-			if(x==Value_t(0))
-			{
-				switch(ByteCodePtr[-1])
-				{
-				case cAbs:
-					FP_TRACE_BYTECODE_OPTIMIZATION(208,
-						"cAbs x[x==Value_t(0)] cEqual",
-						"[x] cEqual",
-						"    with x = " << x << "\n");
-					/* ImmedPtr[0] = x; */ // redundant, matches x @ 1
-					/* opcode = cEqual; */ // redundant, matches cEqual @ 0
-					goto Lam;
-				case cSqr:
-					FP_TRACE_BYTECODE_OPTIMIZATION(210,
-						"cSqr x[x==Value_t(0)] cEqual",
-						"[x] cEqual",
-						"    with x = " << x << "\n");
-					/* ImmedPtr[0] = x; */ // redundant, matches x @ 1
-					/* opcode = cEqual; */ // redundant, matches cEqual @ 0
-					goto Lam;
-				}
-				FP_TRACE_BYTECODE_OPTIMIZATION(262,
-					"x[x==Value_t(0)] cEqual",
-					"cNot",
-					"    with x = " << x << "\n");
-				goto Lan;
-			}
-		}
-		goto Default0;
-	TailCall_cGreater:
-	case cGreater:
-		if(ByteCodePtr[0] == cImmed)
-		{
-			x = ImmedPtr[0];
-			if(x==Value_t(0))
-			{
-				switch(ByteCodePtr[-1])
-				{
-				case cAbs:
-					FP_TRACE_BYTECODE_OPTIMIZATION(264,
-						"cAbs x[x==Value_t(0)] cGreater",
-						"cNotNot",
-						"    with x = " << x << "\n");
-					goto Lao;
-				default:
-					A = ByteCodePtr[-1];
-					if(IsNeverNegativeValueOpcode(A))
-					{
-						FP_TRACE_BYTECODE_OPTIMIZATION(268,
-							"A[IsNeverNegativeValueOpcode(A)] x[x==Value_t(0)] cGreater",
-							"A cNotNot",
-							"    with x = " << x
-							    << ", A = " << FP_TRACE_OPCODENAME(A)
-							    << "\n");
-						/* ByteCodePtr[-1] = A; */ // redundant, matches A @ 2
-						goto Lap;
-					}
-				}
-			}
-			if(ByteCodePtr[-1] == cImmed)
-			{
-				y = ImmedPtr[-1];
-				FP_TRACE_BYTECODE_OPTIMIZATION(127,
-					"y x cGreater",
-					"[fp_less(x,y)]",
-					"    with x = " << x
-					    << ", y = " << y
-					    << "\n");
-				/* ByteCodePtr[-1] = cImmed; */ // redundant, matches y @ 2
-				goto Lba;
-			}
-		}
-		goto Default0;
-	TailCall_cGreaterOrEq:
-	case cGreaterOrEq:
-		if(ByteCodePtr[0] == cImmed)
-		{
-			x = ImmedPtr[0];
-			if(x==Value_t(1))
-			{
-				switch(ByteCodePtr[-1])
-				{
-				case cAbs:
-					FP_TRACE_BYTECODE_OPTIMIZATION(265,
-						"cAbs x[x==Value_t(1)] cGreaterOrEq",
-						"cNotNot",
-						"    with x = " << x << "\n");
-					goto Lao;
-				default:
-					A = ByteCodePtr[-1];
-					if(IsNeverNegativeValueOpcode(A))
-					{
-						FP_TRACE_BYTECODE_OPTIMIZATION(269,
-							"A[IsNeverNegativeValueOpcode(A)] x[x==Value_t(1)] cGreaterOrEq",
-							"A cNotNot",
-							"    with x = " << x
-							    << ", A = " << FP_TRACE_OPCODENAME(A)
-							    << "\n");
-						/* ByteCodePtr[-1] = A; */ // redundant, matches A @ 2
-						goto Lap;
-					}
-				}
-			}
-			if(ByteCodePtr[-1] == cImmed)
-			{
-				y = ImmedPtr[-1];
-				FP_TRACE_BYTECODE_OPTIMIZATION(128,
-					"y x cGreaterOrEq",
-					"[fp_lessOrEq(x,y)]",
-					"    with x = " << x
-					    << ", y = " << y
-					    << "\n");
-				/* ByteCodePtr[-1] = cImmed; */ // redundant, matches y @ 2
-				goto Lbb;
-			}
-		}
-		goto Default0;
-	TailCall_cInv:
-	case cInv:
-		switch(ByteCodePtr[0])
-		{
-		case cInv:
-			FP_TRACE_BYTECODE_OPTIMIZATION(190,"cInv cInv", "", "");
-			goto Lbc;
-		case cSqrt:
-			FP_TRACE_BYTECODE_OPTIMIZATION(67,"cSqrt cInv", "cRSqrt", "");
-			goto Lbd;
-		case cImmed:
-			x = ImmedPtr[0];
-			if(x!=Value_t(0))
-			{
-				FP_TRACE_BYTECODE_OPTIMIZATION(69,
-					"x[x!=Value_t(0)] cInv",
-					"[Value_t(1)/x]",
-					"    with x = " << x << "\n");
-				/* ByteCodePtr[0] = cImmed; */ // redundant, matches x @ 1
-				goto Lbe;
-			}
-			break;
-		}
-		goto Default0;
-	TailCall_cLess:
-	case cLess:
-		if(ByteCodePtr[0] == cImmed)
-		{
-			x = ImmedPtr[0];
-			if(x==Value_t(1))
-			{
-				switch(ByteCodePtr[-1])
-				{
-				case cAbs:
-					FP_TRACE_BYTECODE_OPTIMIZATION(266,
-						"cAbs x[x==Value_t(1)] cLess",
-						"cNot",
-						"    with x = " << x << "\n");
-					goto Lbf;
-				default:
-					A = ByteCodePtr[-1];
-					if(IsNeverNegativeValueOpcode(A))
-					{
-						FP_TRACE_BYTECODE_OPTIMIZATION(270,
-							"A[IsNeverNegativeValueOpcode(A)] x[x==Value_t(1)] cLess",
-							"A cNot",
-							"    with x = " << x
-							    << ", A = " << FP_TRACE_OPCODENAME(A)
-							    << "\n");
-						/* ByteCodePtr[-1] = A; */ // redundant, matches A @ 2
-						goto Lan;
-					}
-				}
-			}
-			if(ByteCodePtr[-1] == cImmed)
-			{
-				y = ImmedPtr[-1];
-				FP_TRACE_BYTECODE_OPTIMIZATION(125,
-					"y x cLess",
-					"[fp_less(y,x)]",
-					"    with x = " << x
-					    << ", y = " << y
-					    << "\n");
-				/* ByteCodePtr[-1] = cImmed; */ // redundant, matches y @ 2
-				goto Lbg;
-			}
-		}
-		goto Default0;
-	TailCall_cLessOrEq:
-	case cLessOrEq:
-		if(ByteCodePtr[0] == cImmed)
-		{
-			x = ImmedPtr[0];
-			if(x==Value_t(0))
-			{
-				switch(ByteCodePtr[-1])
-				{
-				case cAbs:
-					FP_TRACE_BYTECODE_OPTIMIZATION(267,
-						"cAbs x[x==Value_t(0)] cLessOrEq",
-						"cNot",
-						"    with x = " << x << "\n");
-					goto Lbf;
-				default:
-					A = ByteCodePtr[-1];
-					if(IsNeverNegativeValueOpcode(A))
-					{
-						FP_TRACE_BYTECODE_OPTIMIZATION(271,
-							"A[IsNeverNegativeValueOpcode(A)] x[x==Value_t(0)] cLessOrEq",
-							"A cNot",
-							"    with x = " << x
-							    << ", A = " << FP_TRACE_OPCODENAME(A)
-							    << "\n");
-						/* ByteCodePtr[-1] = A; */ // redundant, matches A @ 2
-						goto Lan;
-					}
-				}
-			}
-			if(ByteCodePtr[-1] == cImmed)
-			{
-				y = ImmedPtr[-1];
-				FP_TRACE_BYTECODE_OPTIMIZATION(126,
-					"y x cLessOrEq",
-					"[fp_lessOrEq(y,x)]",
-					"    with x = " << x
-					    << ", y = " << y
-					    << "\n");
-				/* ByteCodePtr[-1] = cImmed; */ // redundant, matches y @ 2
-				goto Lbh;
-			}
-		}
-		goto Default0;
-	TailCall_cMax:
-	case cMax:
-		switch(ByteCodePtr[0])
-		{
-		case cDup:
-			FP_TRACE_BYTECODE_OPTIMIZATION(111,"cDup cMax", "", "");
-			goto Lbc;
-		case cImmed:
-			x = ImmedPtr[0];
-			if(ByteCodePtr[-1] == cImmed)
-			{
-				y = ImmedPtr[-1];
-				FP_TRACE_BYTECODE_OPTIMIZATION(82,
-					"y x cMax",
-					"[Max(x,y)]",
-					"    with x = " << x
-					    << ", y = " << y
-					    << "\n");
-				/* ByteCodePtr[-1] = cImmed; */ // redundant, matches y @ 2
-				goto Lbi;
-			}
-			break;
-		default:
-			A = ByteCodePtr[0];
-			if(A>=VarBegin)
-			{
-				switch(ByteCodePtr[-1])
-				{
-				case cDup:
-					B = ByteCodePtr[-2];
-					if(B==A)
-					{
-						FP_TRACE_BYTECODE_OPTIMIZATION(113,
-							"B[B==A] cDup A[A>=VarBegin] cMax",
-							"B cDup",
-							"    with A = " << FP_TRACE_OPCODENAME(A)
-							    << ", B = " << FP_TRACE_OPCODENAME(B)
-							    << "\n");
-						/* ByteCodePtr[-2] = B; */ // redundant, matches B @ 3
-						/* ByteCodePtr[-1] = cDup; */ // redundant, matches cDup @ 2
-						goto Lbc;
-					}
-					break;
-				case cMax:
-					B = ByteCodePtr[-2];
-					if(B==A)
-					{
-						FP_TRACE_BYTECODE_OPTIMIZATION(115,
-							"B[B==A] cMax A[A>=VarBegin] cMax",
-							"B cMax",
-							"    with A = " << FP_TRACE_OPCODENAME(A)
-							    << ", B = " << FP_TRACE_OPCODENAME(B)
-							    << "\n");
-						/* ByteCodePtr[-2] = B; */ // redundant, matches B @ 3
-						/* ByteCodePtr[-1] = cMax; */ // redundant, matches cMax @ 2
-						goto Lbc;
-					}
-					break;
-				}
-			}
-		}
-		goto Default0;
-	TailCall_cMin:
-	case cMin:
-		switch(ByteCodePtr[0])
-		{
-		case cDup:
-			FP_TRACE_BYTECODE_OPTIMIZATION(110,"cDup cMin", "", "");
-			goto Lbc;
-		case cImmed:
-			x = ImmedPtr[0];
-			if(ByteCodePtr[-1] == cImmed)
-			{
-				y = ImmedPtr[-1];
-				FP_TRACE_BYTECODE_OPTIMIZATION(81,
-					"y x cMin",
-					"[Min(x,y)]",
-					"    with x = " << x
-					    << ", y = " << y
-					    << "\n");
-				/* ByteCodePtr[-1] = cImmed; */ // redundant, matches y @ 2
-				goto Lbj;
-			}
-			break;
-		default:
-			A = ByteCodePtr[0];
-			if(A>=VarBegin)
-			{
-				switch(ByteCodePtr[-1])
-				{
-				case cDup:
-					B = ByteCodePtr[-2];
-					if(B==A)
-					{
-						FP_TRACE_BYTECODE_OPTIMIZATION(112,
-							"B[B==A] cDup A[A>=VarBegin] cMin",
-							"B cDup",
-							"    with A = " << FP_TRACE_OPCODENAME(A)
-							    << ", B = " << FP_TRACE_OPCODENAME(B)
-							    << "\n");
-						/* ByteCodePtr[-2] = B; */ // redundant, matches B @ 3
-						/* ByteCodePtr[-1] = cDup; */ // redundant, matches cDup @ 2
-						goto Lbc;
-					}
-					break;
-				case cMin:
-					B = ByteCodePtr[-2];
-					if(B==A)
-					{
-						FP_TRACE_BYTECODE_OPTIMIZATION(114,
-							"B[B==A] cMin A[A>=VarBegin] cMin",
-							"B cMin",
-							"    with A = " << FP_TRACE_OPCODENAME(A)
-							    << ", B = " << FP_TRACE_OPCODENAME(B)
-							    << "\n");
-						/* ByteCodePtr[-2] = B; */ // redundant, matches B @ 3
-						/* ByteCodePtr[-1] = cMin; */ // redundant, matches cMin @ 2
-						goto Lbc;
-					}
-					break;
-				}
-			}
-		}
-		goto Default0;
-	TailCall_cMod:
-	case cMod:
-		if(ByteCodePtr[0] == cImmed)
-		{
-			x = ImmedPtr[0];
-			if(x!=Value_t(0))
-			{
-				if(ByteCodePtr[-1] == cImmed)
-				{
-					y = ImmedPtr[-1];
-					FP_TRACE_BYTECODE_OPTIMIZATION(74,
-						"y x[x!=Value_t(0)] cMod",
-						"[fp_mod(y,x)]",
-						"    with x = " << x
-						    << ", y = " << y
-						    << "\n");
-					/* ByteCodePtr[-1] = cImmed; */ // redundant, matches y @ 2
-					goto Lbk;
-				}
-			}
-		}
-		goto Default0;
-	TailCall_cMul:
-	case cMul:
-		switch(ByteCodePtr[0])
-		{
-		case cDup:
-			FP_TRACE_BYTECODE_OPTIMIZATION(338,"cDup cMul", "cSqr", "");
-			goto Lbl;
-		case cInv:
-			FP_TRACE_BYTECODE_OPTIMIZATION(195,"cInv cMul", "cDiv", "");
-			goto Lbm;
-		case cNeg:
-			A = ByteCodePtr[-1];
-			if(A>=VarBegin)
-			{
-				switch(ByteCodePtr[-2])
-				{
-				case cMul:
-					B = ByteCodePtr[-3];
-					if(B==A)
-					{
-						FP_TRACE_BYTECODE_OPTIMIZATION(330,
-							"B[B==A] cMul A[A>=VarBegin] cNeg cMul",
-							"B cSqr cMul cNeg",
-							"    with A = " << FP_TRACE_OPCODENAME(A)
-							    << ", B = " << FP_TRACE_OPCODENAME(B)
-							    << "\n");
-						/* ByteCodePtr[-3] = B; */ // redundant, matches B @ 4
-						goto Lbn;
-					}
-					goto Default1;
-				default: Default1:;
-					B = ByteCodePtr[-2];
-					if(B==A)
-					{
-						FP_TRACE_BYTECODE_OPTIMIZATION(324,
-							"B[B==A] A[A>=VarBegin] cNeg cMul",
-							"B cSqr cNeg",
-							"    with A = " << FP_TRACE_OPCODENAME(A)
-							    << ", B = " << FP_TRACE_OPCODENAME(B)
-							    << "\n");
-						/* ByteCodePtr[-2] = B; */ // redundant, matches B @ 3
-						goto Lbo;
-					}
-				}
-			}
-			goto Default2;
-		case cImmed:
-			x = ImmedPtr[0];
-			if(x==Value_t(0))
-			{
-				switch(ByteCodePtr[-1])
-				{
-				case cMul:
-					A = ByteCodePtr[-2];
-					if(A>=VarBegin)
-					{
-						FP_TRACE_BYTECODE_OPTIMIZATION(94,
-							"A[A>=VarBegin] cMul x[x==Value_t(0)] cMul",
-							"[x] cMul",
-							"    with x = " << x
-							    << ", A = " << FP_TRACE_OPCODENAME(A)
-							    << "\n");
-						/* ImmedPtr[0] = x; */ // redundant, matches x @ 1
-						/* opcode = cMul; */ // redundant, matches cMul @ 0
-						goto Lbp;
-					}
-					goto Default3;
-				default: Default3:;
-					A = ByteCodePtr[-1];
-					if(IsBinaryOpcode(A)&&!HasInvalidRangesOpcode(A))
-					{
-						switch(ByteCodePtr[-2])
-						{
-						case cImmed:
-							y = ImmedPtr[-1];
-							FP_TRACE_BYTECODE_OPTIMIZATION(93,
-								"y A[IsBinaryOpcode(A)&&!HasInvalidRangesOpcode(A)] x[x==Value_t(0)] cMul",
-								"[x] cMul",
-								"    with x = " << x
-								    << ", A = " << FP_TRACE_OPCODENAME(A)
-								    << ", y = " << y
-								    << "\n");
-							/* ByteCodePtr[-2] = cImmed; */ // redundant, matches y @ 3
-							/* opcode = cMul; */ // redundant, matches cMul @ 0
-							goto Lca;
-						default:
-							B = ByteCodePtr[-2];
-							if(IsBinaryOpcode(B)&&!HasInvalidRangesOpcode(B))
-							{
-								switch(ByteCodePtr[-3])
-								{
-								case cImmed:
-									y = ImmedPtr[-1];
-									FP_TRACE_BYTECODE_OPTIMIZATION(97,
-										"y B[IsBinaryOpcode(B)&&!HasInvalidRangesOpcode(B)] A[IsBinaryOpcode(A)&&!HasInvalidRangesOpcode(A)] x[x==Value_t(0)] cMul",
-										"A [x] cMul",
-										"    with x = " << x
-										    << ", A = " << FP_TRACE_OPCODENAME(A)
-										    << ", B = " << FP_TRACE_OPCODENAME(B)
-										    << ", y = " << y
-										    << "\n");
-									/* opcode = cMul; */ // redundant, matches cMul @ 0
-									goto Lcb;
-								default:
-									C = ByteCodePtr[-3];
-									if(C>=VarBegin)
-									{
-										FP_TRACE_BYTECODE_OPTIMIZATION(95,
-											"C[C>=VarBegin] B[IsBinaryOpcode(B)&&!HasInvalidRangesOpcode(B)] A[IsBinaryOpcode(A)&&!HasInvalidRangesOpcode(A)] x[x==Value_t(0)] cMul",
-											"A [x] cMul",
-											"    with x = " << x
-											    << ", A = " << FP_TRACE_OPCODENAME(A)
-											    << ", B = " << FP_TRACE_OPCODENAME(B)
-											    << ", C = " << FP_TRACE_OPCODENAME(C)
-											    << "\n");
-										/* opcode = cMul; */ // redundant, matches cMul @ 0
-										goto Lcc;
-									}
-									if(IsUnaryOpcode(C)&&!HasInvalidRangesOpcode(C))
-									{
-										FP_TRACE_BYTECODE_OPTIMIZATION(96,
-											"C[IsUnaryOpcode(C)&&!HasInvalidRangesOpcode(C)] B[IsBinaryOpcode(B)&&!HasInvalidRangesOpcode(B)] A[IsBinaryOpcode(A)&&!HasInvalidRangesOpcode(A)] x[x==Value_t(0)] cMul",
-											"B A [x] cMul",
-											"    with x = " << x
-											    << ", A = " << FP_TRACE_OPCODENAME(A)
-											    << ", B = " << FP_TRACE_OPCODENAME(B)
-											    << ", C = " << FP_TRACE_OPCODENAME(C)
-											    << "\n");
-										/* opcode = cMul; */ // redundant, matches cMul @ 0
-										goto Lcd;
-									}
-								}
-							}
-							if(B>=VarBegin)
-							{
-								FP_TRACE_BYTECODE_OPTIMIZATION(91,
-									"B[B>=VarBegin] A[IsBinaryOpcode(A)&&!HasInvalidRangesOpcode(A)] x[x==Value_t(0)] cMul",
-									"[x] cMul",
-									"    with x = " << x
-									    << ", A = " << FP_TRACE_OPCODENAME(A)
-									    << ", B = " << FP_TRACE_OPCODENAME(B)
-									    << "\n");
-								/* ImmedPtr[0] = x; */ // redundant, matches x @ 1
-								/* opcode = cMul; */ // redundant, matches cMul @ 0
-								goto Lbp;
-							}
-							if(IsUnaryOpcode(B)&&!HasInvalidRangesOpcode(B))
-							{
-								FP_TRACE_BYTECODE_OPTIMIZATION(92,
-									"B[IsUnaryOpcode(B)&&!HasInvalidRangesOpcode(B)] A[IsBinaryOpcode(A)&&!HasInvalidRangesOpcode(A)] x[x==Value_t(0)] cMul",
-									"A [x] cMul",
-									"    with x = " << x
-									    << ", A = " << FP_TRACE_OPCODENAME(A)
-									    << ", B = " << FP_TRACE_OPCODENAME(B)
-									    << "\n");
-								/* opcode = cMul; */ // redundant, matches cMul @ 0
-								goto Lce;
-							}
-						}
-					}
-					if(A>=VarBegin)
-					{
-						FP_TRACE_BYTECODE_OPTIMIZATION(89,
-							"A[A>=VarBegin] x[x==Value_t(0)] cMul",
-							"[x]",
-							"    with x = " << x
-							    << ", A = " << FP_TRACE_OPCODENAME(A)
-							    << "\n");
-						/* ImmedPtr[0] = x; */ // redundant, matches x @ 1
-						goto Lcf;
-					}
-					if(IsUnaryOpcode(A)&&!HasInvalidRangesOpcode(A))
-					{
-						FP_TRACE_BYTECODE_OPTIMIZATION(90,
-							"A[IsUnaryOpcode(A)&&!HasInvalidRangesOpcode(A)] x[x==Value_t(0)] cMul",
-							"[x] cMul",
-							"    with x = " << x
-							    << ", A = " << FP_TRACE_OPCODENAME(A)
-							    << "\n");
-						/* ImmedPtr[0] = x; */ // redundant, matches x @ 1
-						/* opcode = cMul; */ // redundant, matches cMul @ 0
-						goto Lcg;
-					}
-				}
-			}
-			switch(ByteCodePtr[-1])
-			{
-			case cAdd:
-				if(ByteCodePtr[-2] == cDup)
-				{
-					if(x+x==Value_t(1))
-					{
-						FP_TRACE_BYTECODE_OPTIMIZATION(148,
-							"cDup[x+x==Value_t(1)] cAdd x cMul",
-							"",
-							"    with x = " << x << "\n");
-						goto Lch;
-					}
-					FP_TRACE_BYTECODE_OPTIMIZATION(149,
-						"cDup cAdd x cMul",
-						"[x+x] cMul",
-						"    with x = " << x << "\n");
-					/* opcode = cMul; */ // redundant, matches cMul @ 0
-					goto Lci;
-				}
-				break;
-			case cMul:
-				if(ByteCodePtr[-2] == cImmed)
-				{
-					y = ImmedPtr[-1];
-					if(y*x==Value_t(1))
-					{
-						FP_TRACE_BYTECODE_OPTIMIZATION(146,
-							"y[y*x==Value_t(1)] cMul x cMul",
-							"",
-							"    with x = " << x
-							    << ", y = " << y
-							    << "\n");
-						goto Lcj;
-					}
-					FP_TRACE_BYTECODE_OPTIMIZATION(147,
-						"y cMul x cMul",
-						"[y*x] cMul",
-						"    with x = " << x
-						    << ", y = " << y
-						    << "\n");
-					/* ByteCodePtr[-2] = cImmed; */ // redundant, matches y @ 3
-					/* opcode = cMul; */ // redundant, matches cMul @ 0
-					goto Lck;
-				}
-				break;
-			case cNeg:
-				FP_TRACE_BYTECODE_OPTIMIZATION(136,
-					"cNeg x cMul",
-					"[-x] cMul",
-					"    with x = " << x << "\n");
-				/* opcode = cMul; */ // redundant, matches cMul @ 0
-				goto Lcl;
-			case cImmed:
-				y = ImmedPtr[-1];
-				FP_TRACE_BYTECODE_OPTIMIZATION(71,
-					"y x cMul",
-					"[y*x]",
-					"    with x = " << x
-					    << ", y = " << y
-					    << "\n");
-				/* ByteCodePtr[-1] = cImmed; */ // redundant, matches y @ 2
-				goto Lcm;
-			}
-			if(x==Value_t(1))
-			{
-				FP_TRACE_BYTECODE_OPTIMIZATION(70,
-					"x[x==Value_t(1)] cMul",
-					"",
-					"    with x = " << x << "\n");
-				goto Lag;
-			}
-			if(x==Value_t(2))
-			{
-				FP_TRACE_BYTECODE_OPTIMIZATION(100,
-					"x[x==Value_t(2)] cMul",
-					"cDup cAdd",
-					"    with x = " << x << "\n");
-				goto Lcn;
-			}
-			if(x==Value_t(-1))
-			{
-				FP_TRACE_BYTECODE_OPTIMIZATION(138,
-					"x[x==Value_t(-1)] cMul",
-					"cNeg",
-					"    with x = " << x << "\n");
-				goto Lco;
-			}
-			break;
-		default: Default2:;
-			A = ByteCodePtr[0];
-			if(A>=VarBegin)
-			{
-				switch(ByteCodePtr[-1])
-				{
-				case cMul:
-					switch(ByteCodePtr[-2])
-					{
-					case cNeg:
-						B = ByteCodePtr[-3];
-						if(B==A)
-						{
-							FP_TRACE_BYTECODE_OPTIMIZATION(327,
-								"B[B==A] cNeg cMul A[A>=VarBegin] cMul",
-								"B cSqr cMul cNeg",
-								"    with A = " << FP_TRACE_OPCODENAME(A)
-								    << ", B = " << FP_TRACE_OPCODENAME(B)
-								    << "\n");
-							/* ByteCodePtr[-3] = B; */ // redundant, matches B @ 4
-							goto Lbn;
-						}
-						goto Default4;
-					default: Default4:;
-						B = ByteCodePtr[-2];
-						if(B==A)
-						{
-							FP_TRACE_BYTECODE_OPTIMIZATION(318,
-								"B[B==A] cMul A[A>=VarBegin] cMul",
-								"B cSqr cMul",
-								"    with A = " << FP_TRACE_OPCODENAME(A)
-								    << ", B = " << FP_TRACE_OPCODENAME(B)
-								    << "\n");
-							/* ByteCodePtr[-2] = B; */ // redundant, matches B @ 3
-							/* opcode = cMul; */ // redundant, matches cMul @ 0
-							goto Lcp;
-						}
-					}
-					goto Default5;
-				case cNeg:
-					B = ByteCodePtr[-2];
-					if(B==A)
-					{
-						FP_TRACE_BYTECODE_OPTIMIZATION(321,
-							"B[B==A] cNeg A[A>=VarBegin] cMul",
-							"B cSqr cNeg",
-							"    with A = " << FP_TRACE_OPCODENAME(A)
-							    << ", B = " << FP_TRACE_OPCODENAME(B)
-							    << "\n");
-						/* ByteCodePtr[-2] = B; */ // redundant, matches B @ 3
-						goto Lbo;
-					}
-					goto Default5;
-				default: Default5:;
-					B = ByteCodePtr[-1];
-					if(B==A)
-					{
-						FP_TRACE_BYTECODE_OPTIMIZATION(315,
-							"B[B==A] A[A>=VarBegin] cMul",
-							"B cSqr",
-							"    with A = " << FP_TRACE_OPCODENAME(A)
-							    << ", B = " << FP_TRACE_OPCODENAME(B)
-							    << "\n");
-						/* ByteCodePtr[-1] = B; */ // redundant, matches B @ 2
-						goto Lbl;
-					}
-				}
-			}
-			if(IsUnaryOpcode(A))
-			{
-				B = ByteCodePtr[-1];
-				if(B>=VarBegin)
-				{
-					if(ByteCodePtr[-2] == cMul)
-					{
-						C = ByteCodePtr[-3];
-						if(C==A)
-						{
-							D = ByteCodePtr[-4];
-							if(D==B)
-							{
-								FP_TRACE_BYTECODE_OPTIMIZATION(337,
-									"D[D==B] C[C==A] cMul B[B>=VarBegin] A[IsUnaryOpcode(A)] cMul",
-									"D C cSqr cMul",
-									"    with A = " << FP_TRACE_OPCODENAME(A)
-									    << ", B = " << FP_TRACE_OPCODENAME(B)
-									    << ", C = " << FP_TRACE_OPCODENAME(C)
-									    << ", D = " << FP_TRACE_OPCODENAME(D)
-									    << "\n");
-								/* ByteCodePtr[-4] = D; */ // redundant, matches D @ 5
-								/* ByteCodePtr[-3] = C; */ // redundant, matches C @ 4
-								/* opcode = cMul; */ // redundant, matches cMul @ 0
-								goto Lda;
-							}
-						}
-					}
-				}
-			}
-		}
-		goto Default0;
-	TailCall_cNEqual:
-	case cNEqual:
-		if(ByteCodePtr[0] == cImmed)
-		{
-			x = ImmedPtr[0];
-			if(x==Value_t(1))
-			{
-				A = ByteCodePtr[-1];
-				if(IsLogicalOpcode(A))
-				{
-					FP_TRACE_BYTECODE_OPTIMIZATION(273,
-						"A[IsLogicalOpcode(A)] x[x==Value_t(1)] cNEqual",
-						"A cNot",
-						"    with x = " << x
-						    << ", A = " << FP_TRACE_OPCODENAME(A)
-						    << "\n");
-					/* ByteCodePtr[-1] = A; */ // redundant, matches A @ 2
-					goto Lan;
-				}
-			}
-			if(ByteCodePtr[-1] == cImmed)
-			{
-				y = ImmedPtr[-1];
-				FP_TRACE_BYTECODE_OPTIMIZATION(130,
-					"y x cNEqual",
-					"[fp_nequal(y,x)]",
-					"    with x = " << x
-					    << ", y = " << y
-					    << "\n");
-				/* ByteCodePtr[-1] = cImmed; */ // redundant, matches y @ 2
-				goto Ldb;
-			}
-			if(x==Value_t(0))
-			{
-				switch(ByteCodePtr[-1])
-				{
-				case cAbs:
-					FP_TRACE_BYTECODE_OPTIMIZATION(209,
-						"cAbs x[x==Value_t(0)] cNEqual",
-						"[x] cNEqual",
-						"    with x = " << x << "\n");
-					/* ImmedPtr[0] = x; */ // redundant, matches x @ 1
-					/* opcode = cNEqual; */ // redundant, matches cNEqual @ 0
-					goto Ldc;
-				case cSqr:
-					FP_TRACE_BYTECODE_OPTIMIZATION(211,
-						"cSqr x[x==Value_t(0)] cNEqual",
-						"[x] cNEqual",
-						"    with x = " << x << "\n");
-					/* ImmedPtr[0] = x; */ // redundant, matches x @ 1
-					/* opcode = cNEqual; */ // redundant, matches cNEqual @ 0
-					goto Ldc;
-				}
-				FP_TRACE_BYTECODE_OPTIMIZATION(263,
-					"x[x==Value_t(0)] cNEqual",
-					"cNotNot",
-					"    with x = " << x << "\n");
-				goto Lap;
-			}
-		}
-		goto Default0;
-	TailCall_cNeg:
-	case cNeg:
-		switch(ByteCodePtr[0])
-		{
-		case cMul:
-			if(ByteCodePtr[-1] == cImmed)
-			{
-				x = ImmedPtr[0];
-				FP_TRACE_BYTECODE_OPTIMIZATION(137,
-					"x cMul cNeg",
-					"[-x] cMul",
-					"    with x = " << x << "\n");
-				/* ByteCodePtr[-1] = cImmed; */ // redundant, matches x @ 2
-				goto Ldd;
-			}
-			break;
-		case cNeg:
-			FP_TRACE_BYTECODE_OPTIMIZATION(191,"cNeg cNeg", "", "");
-			goto Lbc;
-		case cImmed:
-			x = ImmedPtr[0];
-			FP_TRACE_BYTECODE_OPTIMIZATION(68,
-				"x cNeg",
-				"[-x]",
-				"    with x = " << x << "\n");
-			/* ByteCodePtr[0] = cImmed; */ // redundant, matches x @ 1
-			goto Lde;
-		}
-		goto Default0;
-	TailCall_cNot:
-	case cNot:
-		switch(ByteCodePtr[0])
-		{
-		case cAbs:
-			FP_TRACE_BYTECODE_OPTIMIZATION(235,"cAbs cNot", "cNot", "");
-			/* opcode = cNot; */ // redundant, matches cNot @ 0
-			goto Ldf;
-		case cAbsNot:
-			A = ByteCodePtr[-1];
-			if(IsLogicalOpcode(A))
-			{
-				FP_TRACE_BYTECODE_OPTIMIZATION(240,
-					"A[IsLogicalOpcode(A)] cAbsNot cNot",
-					"A",
-					"    with A = " << FP_TRACE_OPCODENAME(A) << "\n");
-				/* ByteCodePtr[-1] = A; */ // redundant, matches A @ 2
-				goto Lbc;
-			}
-			if(A!=cImmed)
-			{
-				FP_TRACE_BYTECODE_OPTIMIZATION(241,
-					"A[A!=cImmed] cAbsNot cNot",
-					"A cAbsNotNot",
-					"    with A = " << FP_TRACE_OPCODENAME(A) << "\n");
-				/* ByteCodePtr[-1] = A; */ // redundant, matches A @ 2
-				goto Ldg;
-			}
-			goto Default6;
-		case cAbsNotNot:
-			FP_TRACE_BYTECODE_OPTIMIZATION(238,"cAbsNotNot cNot", "cAbsNot", "");
-			goto Ldh;
-		case cEqual:
-			FP_TRACE_BYTECODE_OPTIMIZATION(205,"cEqual cNot", "cNEqual", "");
-			goto Ldi;
-		case cGreater:
-			FP_TRACE_BYTECODE_OPTIMIZATION(203,"cGreater cNot", "cLessOrEq", "");
-			goto Ldj;
-		case cGreaterOrEq:
-			FP_TRACE_BYTECODE_OPTIMIZATION(204,"cGreaterOrEq cNot", "cLess", "");
-			goto Ldk;
-		case cLess:
-			FP_TRACE_BYTECODE_OPTIMIZATION(201,"cLess cNot", "cGreaterOrEq", "");
-			goto Ldl;
-		case cLessOrEq:
-			FP_TRACE_BYTECODE_OPTIMIZATION(202,"cLessOrEq cNot", "cGreater", "");
-			goto Ldm;
-		case cNEqual:
-			FP_TRACE_BYTECODE_OPTIMIZATION(206,"cNEqual cNot", "cEqual", "");
-			goto Ldn;
-		case cNeg:
-			FP_TRACE_BYTECODE_OPTIMIZATION(234,"cNeg cNot", "cNot", "");
-			/* opcode = cNot; */ // redundant, matches cNot @ 0
-			goto Ldf;
-		case cNot:
-			FP_TRACE_BYTECODE_OPTIMIZATION(236,"cNot cNot", "cNotNot", "");
-			goto Ldo;
-		case cNotNot:
-			FP_TRACE_BYTECODE_OPTIMIZATION(237,"cNotNot cNot", "cNot", "");
-			/* opcode = cNot; */ // redundant, matches cNot @ 0
-			goto Ldf;
-		case cImmed:
-			x = ImmedPtr[0];
-			FP_TRACE_BYTECODE_OPTIMIZATION(85,
-				"x cNot",
-				"[!truthValue(x)]",
-				"    with x = " << x << "\n");
-			/* ByteCodePtr[0] = cImmed; */ // redundant, matches x @ 1
-			goto Ldp;
-		default: Default6:;
-			A = ByteCodePtr[0];
-			if(IsNeverNegativeValueOpcode(A))
-			{
-				FP_TRACE_BYTECODE_OPTIMIZATION(242,
-					"A[IsNeverNegativeValueOpcode(A)] cNot",
-					"A cAbsNot",
-					"    with A = " << FP_TRACE_OPCODENAME(A) << "\n");
-				/* ByteCodePtr[0] = A; */ // redundant, matches A @ 1
-				goto Lea;
-			}
-		}
-		goto Default0;
-	TailCall_cOr:
-	case cOr:
-		if(ByteCodePtr[0] == cImmed)
-		{
-			x = ImmedPtr[0];
-			if(ByteCodePtr[-1] == cImmed)
-			{
-				y = ImmedPtr[-1];
-				FP_TRACE_BYTECODE_OPTIMIZATION(132,
-					"y x cOr",
-					"[truthValue(x)||truthValue(y)]",
-					"    with x = " << x
-					    << ", y = " << y
-					    << "\n");
-				/* ByteCodePtr[-1] = cImmed; */ // redundant, matches y @ 2
-				goto Leb;
-			}
-		}
-		goto Default0;
-	TailCall_cSqr:
-	case cSqr:
-		switch(ByteCodePtr[0])
-		{
-		case cAbs:
-			FP_TRACE_BYTECODE_OPTIMIZATION(333,"cAbs cSqr", "cSqr", "");
-			/* opcode = cSqr; */ // redundant, matches cSqr @ 0
-			goto Lec;
-		case cNeg:
-			FP_TRACE_BYTECODE_OPTIMIZATION(332,"cNeg cSqr", "cSqr", "");
-			/* opcode = cSqr; */ // redundant, matches cSqr @ 0
-			goto Lec;
-		}
-		goto Default0;
-	TailCall_cSub:
-	case cSub:
-		switch(ByteCodePtr[0])
-		{
-		case cNeg:
-			FP_TRACE_BYTECODE_OPTIMIZATION(197,"cNeg cSub", "cAdd", "");
-			goto Led;
-		case cImmed:
-			x = ImmedPtr[0];
-			if(x==Value_t(0))
-			{
-				FP_TRACE_BYTECODE_OPTIMIZATION(77,
-					"x[x==Value_t(0)] cSub",
-					"",
-					"    with x = " << x << "\n");
-				goto Lag;
-			}
-			if(ByteCodePtr[-1] == cImmed)
-			{
-				y = ImmedPtr[-1];
-				FP_TRACE_BYTECODE_OPTIMIZATION(78,
-					"y x cSub",
-					"[y-x]",
-					"    with x = " << x
-					    << ", y = " << y
-					    << "\n");
-				/* ByteCodePtr[-1] = cImmed; */ // redundant, matches y @ 2
-				goto Lee;
-			}
-			FP_TRACE_BYTECODE_OPTIMIZATION(160,
-				"x cSub",
-				"[-x] cAdd",
-				"    with x = " << x << "\n");
-			/* ByteCodePtr[0] = cImmed; */ // redundant, matches x @ 1
-			goto Lef;
-		}
-		goto Default0;
-	default: Default0:;
-		A = opcode;
-		if(IsComparisonOpcode(A))
-		{
-			if(ByteCodePtr[0] == cImmed)
-			{
-				x = ImmedPtr[0];
-				switch(ByteCodePtr[-1])
-				{
-				case cAdd:
-					if(ByteCodePtr[-2] == cImmed)
-					{
-						y = ImmedPtr[-1];
-						FP_TRACE_BYTECODE_OPTIMIZATION(213,
-							"y cAdd x A[IsComparisonOpcode(A)]",
-							"[x-y] A",
-							"    with A = " << FP_TRACE_OPCODENAME(A)
-							    << ", x = " << x
-							    << ", y = " << y
-							    << "\n");
-						/* ByteCodePtr[-2] = cImmed; */ // redundant, matches y @ 3
-						goto Leg;
-					}
-					break;
-				case cNeg:
-					FP_TRACE_BYTECODE_OPTIMIZATION(214,
-						"cNeg x A[IsComparisonOpcode(A)]",
-						"[-x] {OppositeComparisonOpcode(A)}",
-						"    with A = " << FP_TRACE_OPCODENAME(A)
-						    << ", x = " << x
-						    << "\n");
-					goto Leh;
-				}
-			}
-		}
-		if(A>=VarBegin)
-		{
-			B = ByteCodePtr[0];
-			if(B==A)
-			{
-				FP_TRACE_BYTECODE_OPTIMIZATION(335,
-					"B[B==A] A[A>=VarBegin]",
-					"B cDup",
-					"    with A = " << FP_TRACE_OPCODENAME(A)
-					    << ", B = " << FP_TRACE_OPCODENAME(B)
-					    << "\n");
-				/* ByteCodePtr[0] = B; */ // redundant, matches B @ 1
-				goto Lei;
-			}
-		}
-		if(IsUnaryOpcode(A))
-		{
-			B = ByteCodePtr[0];
-			if(B>=VarBegin)
-			{
-				C = ByteCodePtr[-1];
-				if(C==A)
-				{
-					D = ByteCodePtr[-2];
-					if(D==B)
-					{
-						FP_TRACE_BYTECODE_OPTIMIZATION(336,
-							"D[D==B] C[C==A] B[B>=VarBegin] A[IsUnaryOpcode(A)]",
-							"D C cDup",
-							"    with A = " << FP_TRACE_OPCODENAME(A)
-							    << ", B = " << FP_TRACE_OPCODENAME(B)
-							    << ", C = " << FP_TRACE_OPCODENAME(C)
-							    << ", D = " << FP_TRACE_OPCODENAME(D)
-							    << "\n");
-						/* ByteCodePtr[-2] = D; */ // redundant, matches D @ 3
-						/* ByteCodePtr[-1] = C; */ // redundant, matches C @ 2
-						goto Lej;
-					}
-				}
-			}
-		}
-	}
-	goto Lek;
-Laa: ByteCodePtr -= 1;
-     data->ByteCode.pop_back();
-     goto TailCall_cAbs;
-Lab: ImmedPtr[0] = fp_abs(x); return;
-Lac: data->Immed.push_back(Value_t(4));
-     ByteCodePtr[-2] = cImmed;
-     ByteCodePtr -= 2;
-     data->ByteCode.pop_back();
-     data->ByteCode.pop_back();
-     opcode = cMul;
-Lel: FP_ReDefinePointers();
-Lem: goto TailCall_cMul;
-Lad: ByteCodePtr -= 1;
-     data->ByteCode.pop_back();
-     opcode = cSub;
-     goto TailCall_cSub;
-Lae: ImmedPtr[-1] = y+x;
-     data->Immed.pop_back();
-     data->ByteCode.pop_back();
-     data->ByteCode.pop_back();
-Len: FP_ReDefinePointers();
-Leo: goto TailCall_cAdd;
-Laf: ImmedPtr[-1] = y+x;
-Lag: data->Immed.pop_back();
-Lbc: data->ByteCode.pop_back(); return;
-Lah: ImmedPtr[-1] = truthValue(x)&&truthValue(y); goto Lag;
-Lai: data->Immed.push_back(Value_t(0));
-     ByteCodePtr[0] = cImmed;
-     AddFunctionOpcode(cMul);
-     data->Immed.push_back(Value_t(1));
-     data->ByteCode.push_back(cImmed);
-     opcode = cAdd; goto Len;
-Laj: ImmedPtr[0] = -x;
-     ByteCodePtr[-1] = cImmed;
-     ByteCodePtr -= 1;
-     data->ByteCode.pop_back();
-Lep: goto TailCall_cDiv;
-Lak: ImmedPtr[-1] = y/x; goto Lag;
-Lal: ImmedPtr[-1] = fp_equal(y,x); goto Lag;
-Lam: ByteCodePtr[-1] = cImmed;
-     ByteCodePtr -= 1;
-     data->ByteCode.pop_back();
-Lfa: goto TailCall_cEqual;
-Lan: data->Immed.pop_back();
-Lfb: data->ByteCode.pop_back();
-     opcode = cNot;
-     FP_ReDefinePointers();
-Lfc: goto TailCall_cNot;
-Lao: data->Immed.pop_back();
-     data->ByteCode.pop_back();
-Ldo: data->ByteCode.pop_back();
-     AddFunctionOpcode(cNotNot); return;
-Lap: data->Immed.pop_back(); goto Ldo;
-Lba: ImmedPtr[-1] = fp_less(x,y); goto Lag;
-Lbb: ImmedPtr[-1] = fp_lessOrEq(x,y); goto Lag;
-Lbd: data->ByteCode.pop_back();
-     AddFunctionOpcode(cRSqrt); return;
-Lbe: ImmedPtr[0] = Value_t(1)/x; return;
-Lbf: data->Immed.pop_back();
-     data->ByteCode.pop_back(); goto Lfb;
-Lbg: ImmedPtr[-1] = fp_less(y,x); goto Lag;
-Lbh: ImmedPtr[-1] = fp_lessOrEq(y,x); goto Lag;
-Lbi: ImmedPtr[-1] = Max(x,y); goto Lag;
-Lbj: ImmedPtr[-1] = Min(x,y); goto Lag;
-Lbk: ImmedPtr[-1] = fp_mod(y,x); goto Lag;
-Lbl: ByteCodePtr -= 1;
-     data->ByteCode.pop_back();
-     opcode = cSqr;
-Lfd: goto TailCall_cSqr;
-Lbm: ByteCodePtr -= 1;
-     data->ByteCode.pop_back();
-     opcode = cDiv; goto Lep;
-Lbn: data->ByteCode.pop_back();
-     data->ByteCode.pop_back();
-     data->ByteCode.pop_back();
-     AddFunctionOpcode(cSqr);
-     AddFunctionOpcode(cMul);
-Lfe: opcode = cNeg;
-     FP_ReDefinePointers();
-     goto TailCall_cNeg;
-Lbo: data->ByteCode.pop_back();
-     data->ByteCode.pop_back();
-     AddFunctionOpcode(cSqr); goto Lfe;
-Lbp: ByteCodePtr[-2] = cImmed;
-     ByteCodePtr -= 2;
-     data->ByteCode.pop_back();
-Lff: data->ByteCode.pop_back(); goto Lem;
-Lca: ImmedPtr[-1] = x;
-Lfg: data->Immed.pop_back();
-     data->ByteCode.pop_back();
-     data->ByteCode.pop_back(); goto Lel;
-Lcb: data->Immed.pop_back();
-Lcc: data->Immed.pop_back();
-     data->ByteCode.pop_back();
-Lfh: data->ByteCode.pop_back();
-     data->ByteCode.pop_back();
-     data->ByteCode.pop_back();
-Lfi: AddFunctionOpcode(A);
-     data->Immed.push_back(x);
-     data->ByteCode.push_back(cImmed); goto Lel;
-Lcd: data->Immed.pop_back();
-     data->ByteCode.pop_back();
-     data->ByteCode.pop_back();
-     data->ByteCode.pop_back();
-     data->ByteCode.pop_back();
-     AddFunctionOpcode(B); goto Lfi;
-Lce: data->Immed.pop_back(); goto Lfh;
-Lcf: ByteCodePtr[-1] = cImmed; goto Lbc;
-Lcg: ByteCodePtr[-1] = cImmed;
-     ByteCodePtr -= 1; goto Lff;
-Lch: data->Immed.pop_back();
-     data->ByteCode.pop_back();
-     data->ByteCode.pop_back(); goto Lbc;
-Lci: ImmedPtr[0] = x+x; goto Lbp;
-Lcj: data->Immed.pop_back(); goto Lch;
-Lck: ImmedPtr[-1] = y*x; goto Lfg;
-Lcl: ImmedPtr[0] = -x; goto Lcg;
-Lcm: ImmedPtr[-1] = y*x; goto Lag;
-Lcn: ByteCodePtr[0] = cDup;
-     ImmedPtr -= 1;
-     data->Immed.pop_back();
-Lfj: opcode = cAdd; goto Leo;
-Lco: data->Immed.pop_back();
-     data->ByteCode.pop_back(); goto Lfe;
-Lcp: data->ByteCode.pop_back();
-     data->ByteCode.pop_back();
-     AddFunctionOpcode(cSqr); goto Lel;
-Lda: data->ByteCode.pop_back(); goto Lcp;
-Ldb: ImmedPtr[-1] = fp_nequal(y,x); goto Lag;
-Ldc: ByteCodePtr[-1] = cImmed;
-     ByteCodePtr -= 1;
-     data->ByteCode.pop_back();
-Lfk: goto TailCall_cNEqual;
-Ldd: ImmedPtr[0] = -x;
-     ByteCodePtr -= 1;
-     data->ByteCode.pop_back();
-     opcode = cMul; goto Lem;
-Lde: ImmedPtr[0] = -x; return;
-Ldf: ByteCodePtr -= 1;
-     data->ByteCode.pop_back(); goto Lfc;
-Ldg: data->ByteCode.pop_back();
-     AddFunctionOpcode(cAbsNotNot); return;
-Ldh: data->ByteCode.pop_back();
-Lea: AddFunctionOpcode(cAbsNot); return;
-Ldi: ByteCodePtr -= 1;
-     data->ByteCode.pop_back();
-     opcode = cNEqual; goto Lfk;
-Ldj: ByteCodePtr -= 1;
-     data->ByteCode.pop_back();
-     opcode = cLessOrEq;
-     goto TailCall_cLessOrEq;
-Ldk: ByteCodePtr -= 1;
-     data->ByteCode.pop_back();
-     opcode = cLess;
-     goto TailCall_cLess;
-Ldl: ByteCodePtr -= 1;
-     data->ByteCode.pop_back();
-     opcode = cGreaterOrEq;
-     goto TailCall_cGreaterOrEq;
-Ldm: ByteCodePtr -= 1;
-     data->ByteCode.pop_back();
-     opcode = cGreater;
-     goto TailCall_cGreater;
-Ldn: ByteCodePtr -= 1;
-     data->ByteCode.pop_back();
-     opcode = cEqual; goto Lfa;
-Ldp: ImmedPtr[0] = !truthValue(x); return;
-Leb: ImmedPtr[-1] = truthValue(x)||truthValue(y); goto Lag;
-Lec: ByteCodePtr -= 1;
-     data->ByteCode.pop_back(); goto Lfd;
-Led: ByteCodePtr -= 1;
-     data->ByteCode.pop_back(); goto Lfj;
-Lee: ImmedPtr[-1] = y-x; goto Lag;
-Lef: ImmedPtr[0] = -x; goto Lfj;
-Leg: ImmedPtr[-1] = x-y;
-     data->Immed.pop_back();
-     data->ByteCode.pop_back();
-     data->ByteCode.pop_back();
-     AddFunctionOpcode(A); return;
-Leh: ImmedPtr[0] = -x;
-     ByteCodePtr[-1] = cImmed;
-     data->ByteCode.pop_back();
-     AddFunctionOpcode(OppositeComparisonOpcode(A)); return;
-Lei: data->ByteCode.push_back(cDup); return;
-Lej: ByteCodePtr[0] = cDup; return;
-Lek: data->ByteCode.push_back(opcode); return;
-return;
-// This list of dummy gotos is here to inhibit
-// compiler warnings on unused labels
-goto TailCall_cAnd;goto TailCall_cInv;goto TailCall_cMax;
-goto TailCall_cMin;goto TailCall_cMod;goto TailCall_cNeg;
-goto TailCall_cOr;goto TailCall_cSub;
-#endif
-
-#if(FP_FLOAT_VERSION)
-	Value_t x;
-	unsigned A;
-	Value_t y;
-	unsigned B;
-	unsigned C;
-	unsigned D;
-	switch(opcode)
-	{
-	TailCall_cAbs:
-	case cAbs:
-		switch(ByteCodePtr[0])
-		{
-		case cNeg:
-			FP_TRACE_BYTECODE_OPTIMIZATION(189,"cNeg cAbs", "cAbs", "");
-			/* opcode = cAbs; */ // redundant, matches cAbs @ 0
-			goto Laa;
-		case cImmed:
-			x = ImmedPtr[0];
-			FP_TRACE_BYTECODE_OPTIMIZATION(40,
-				"x cAbs",
-				"[fp_abs(x)]",
-				"    with x = " << x << "\n");
-			/* ByteCodePtr[0] = cImmed; */ // redundant, matches x @ 1
-			goto Lab;
-		default:
-			A = ByteCodePtr[0];
-			if(IsNeverNegativeValueOpcode(A))
-			{
-				FP_TRACE_BYTECODE_OPTIMIZATION(244,
-					"A[IsNeverNegativeValueOpcode(A)] cAbs",
-					"A",
-					"    with A = " << FP_TRACE_OPCODENAME(A) << "\n");
-				/* ByteCodePtr[0] = A; */ // redundant, matches A @ 1
-				return;
-			}
-		}
-		goto Default0;
-	TailCall_cAcos:
-	case cAcos:
-		if(ByteCodePtr[0] == cImmed)
-		{
-			x = ImmedPtr[0];
-			if(x>=Value_t(-1)&&x<=Value_t(1))
-			{
-				FP_TRACE_BYTECODE_OPTIMIZATION(44,
-					"x[x>=Value_t(-1)&&x<=Value_t(1)] cAcos",
-					"[fp_acos(x)]",
-					"    with x = " << x << "\n");
-				/* ByteCodePtr[0] = cImmed; */ // redundant, matches x @ 1
-				goto Lac;
-			}
-		}
-		goto Default0;
-	TailCall_cAcosh:
-	case cAcosh:
-		if(ByteCodePtr[0] == cImmed)
-		{
-			x = ImmedPtr[0];
-			if(x>=Value_t(1))
-			{
-				FP_TRACE_BYTECODE_OPTIMIZATION(41,
-					"x[x>=Value_t(1)] cAcosh",
-					"[fp_acosh(x)]",
-					"    with x = " << x << "\n");
-				/* ByteCodePtr[0] = cImmed; */ // redundant, matches x @ 1
-				goto Lad;
-			}
-		}
-		goto Default0;
-	TailCall_cAdd:
-	case cAdd:
-		switch(ByteCodePtr[0])
-		{
-		case cDup:
-			if(ByteCodePtr[-1] == cAdd)
-			{
-				if(ByteCodePtr[-2] == cDup)
-				{
-					FP_TRACE_BYTECODE_OPTIMIZATION(108,"cDup cAdd cDup cAdd", "[Value_t(4)] cMul", "");
-					goto Lae;
-				}
-			}
-			break;
-		case cNeg:
-			FP_TRACE_BYTECODE_OPTIMIZATION(196,"cNeg cAdd", "cSub", "");
-			goto Laf;
-		case cImmed:
-			x = ImmedPtr[0];
-			switch(ByteCodePtr[-1])
-			{
-			case cAdd:
-				if(ByteCodePtr[-2] == cImmed)
-				{
-					y = ImmedPtr[-1];
-					FP_TRACE_BYTECODE_OPTIMIZATION(142,
-						"y cAdd x cAdd",
-						"[y+x] cAdd",
-						"    with x = " << x
-						    << ", y = " << y
-						    << "\n");
-					/* ByteCodePtr[-2] = cImmed; */ // redundant, matches y @ 3
-					/* opcode = cAdd; */ // redundant, matches cAdd @ 0
-					goto Lag;
-				}
-				break;
-			case cImmed:
-				y = ImmedPtr[-1];
-				FP_TRACE_BYTECODE_OPTIMIZATION(76,
-					"y x cAdd",
-					"[y+x]",
-					"    with x = " << x
-					    << ", y = " << y
-					    << "\n");
-				/* ByteCodePtr[-1] = cImmed; */ // redundant, matches y @ 2
-				goto Lah;
-			}
-			if(x==Value_t(0))
-			{
-				FP_TRACE_BYTECODE_OPTIMIZATION(75,
-					"x[x==Value_t(0)] cAdd",
-					"",
-					"    with x = " << x << "\n");
-				goto Lai;
-			}
-			break;
-		}
-		goto Default0;
-	TailCall_cAnd:
-	case cAnd:
-		if(ByteCodePtr[0] == cImmed)
-		{
-			x = ImmedPtr[0];
-			if(ByteCodePtr[-1] == cImmed)
-			{
-				y = ImmedPtr[-1];
-				FP_TRACE_BYTECODE_OPTIMIZATION(131,
-					"y x cAnd",
-					"[truthValue(x)&&truthValue(y)]",
-					"    with x = " << x
-					    << ", y = " << y
-					    << "\n");
-				/* ByteCodePtr[-1] = cImmed; */ // redundant, matches y @ 2
-				goto Laj;
-			}
-		}
-		goto Default0;
-	TailCall_cAsin:
-	case cAsin:
-		if(ByteCodePtr[0] == cImmed)
-		{
-			x = ImmedPtr[0];
-			if(x>=Value_t(-1)&&x<=Value_t(1))
-			{
-				FP_TRACE_BYTECODE_OPTIMIZATION(45,
-					"x[x>=Value_t(-1)&&x<=Value_t(1)] cAsin",
-					"[fp_asin(x)]",
-					"    with x = " << x << "\n");
-				/* ByteCodePtr[0] = cImmed; */ // redundant, matches x @ 1
-				goto Lak;
-			}
-		}
-		goto Default0;
-	TailCall_cAsinh:
-	case cAsinh:
-		if(ByteCodePtr[0] == cImmed)
-		{
-			x = ImmedPtr[0];
-			FP_TRACE_BYTECODE_OPTIMIZATION(42,
-				"x cAsinh",
-				"[fp_asinh(x)]",
-				"    with x = " << x << "\n");
-			/* ByteCodePtr[0] = cImmed; */ // redundant, matches x @ 1
-			goto Lal;
-		}
-		goto Default0;
-	TailCall_cAtan:
-	case cAtan:
-		if(ByteCodePtr[0] == cImmed)
-		{
-			x = ImmedPtr[0];
-			FP_TRACE_BYTECODE_OPTIMIZATION(46,
-				"x cAtan",
-				"[fp_atan(x)]",
-				"    with x = " << x << "\n");
-			/* ByteCodePtr[0] = cImmed; */ // redundant, matches x @ 1
-			goto Lam;
-		}
-		goto Default0;
-	TailCall_cAtan2:
-	case cAtan2:
-		if(ByteCodePtr[0] == cImmed)
-		{
-			x = ImmedPtr[0];
-			if(ByteCodePtr[-1] == cImmed)
-			{
-				y = ImmedPtr[-1];
-				FP_TRACE_BYTECODE_OPTIMIZATION(83,
-					"y x cAtan2",
-					"[fp_atan2(y,x)]",
-					"    with x = " << x
-					    << ", y = " << y
-					    << "\n");
-				/* ByteCodePtr[-1] = cImmed; */ // redundant, matches y @ 2
-				goto Lan;
-			}
-		}
-		goto Default0;
-	TailCall_cAtanh:
-	case cAtanh:
-		if(ByteCodePtr[0] == cImmed)
-		{
-			x = ImmedPtr[0];
-			if(x>Value_t(-1)&&x<Value_t(1))
-			{
-				FP_TRACE_BYTECODE_OPTIMIZATION(43,
-					"x[x>Value_t(-1)&&x<Value_t(1)] cAtanh",
-					"[fp_atanh(x)]",
-					"    with x = " << x << "\n");
-				/* ByteCodePtr[0] = cImmed; */ // redundant, matches x @ 1
-				goto Lao;
-			}
-		}
-		goto Default0;
-	TailCall_cCbrt:
-	case cCbrt:
-		if(ByteCodePtr[0] == cImmed)
-		{
-			x = ImmedPtr[0];
-			FP_TRACE_BYTECODE_OPTIMIZATION(47,
-				"x cCbrt",
-				"[fp_cbrt(x)]",
-				"    with x = " << x << "\n");
-			/* ByteCodePtr[0] = cImmed; */ // redundant, matches x @ 1
-			goto Lap;
-		}
-		goto Default0;
-	TailCall_cCeil:
-	case cCeil:
-		switch(ByteCodePtr[0])
-		{
-		case cNeg:
-			FP_TRACE_BYTECODE_OPTIMIZATION(253,"cNeg cCeil", "cFloor cNeg", "");
-			goto Lba;
-		case cImmed:
-			x = ImmedPtr[0];
-			FP_TRACE_BYTECODE_OPTIMIZATION(48,
-				"x cCeil",
-				"[fp_ceil(x)]",
-				"    with x = " << x << "\n");
-			/* ByteCodePtr[0] = cImmed; */ // redundant, matches x @ 1
-			goto Lbb;
-		default:
-			A = ByteCodePtr[0];
-			if(IsAlwaysIntegerOpcode(A))
-			{
-				FP_TRACE_BYTECODE_OPTIMIZATION(247,
-					"A[IsAlwaysIntegerOpcode(A)] cCeil",
-					"A",
-					"    with A = " << FP_TRACE_OPCODENAME(A) << "\n");
-				/* ByteCodePtr[0] = A; */ // redundant, matches A @ 1
-				return;
-			}
-		}
-		goto Default0;
-	TailCall_cCos:
-	case cCos:
-		switch(ByteCodePtr[0])
-		{
-		case cAbs:
-			FP_TRACE_BYTECODE_OPTIMIZATION(281,"cAbs cCos", "cCos", "");
-			/* opcode = cCos; */ // redundant, matches cCos @ 0
-			goto Lbc;
-		case cNeg:
-			FP_TRACE_BYTECODE_OPTIMIZATION(283,"cNeg cCos", "cCos", "");
-			/* opcode = cCos; */ // redundant, matches cCos @ 0
-			goto Lbc;
-		case cImmed:
-			x = ImmedPtr[0];
-			FP_TRACE_BYTECODE_OPTIMIZATION(49,
-				"x cCos",
-				"[fp_cos(x)]",
-				"    with x = " << x << "\n");
-			/* ByteCodePtr[0] = cImmed; */ // redundant, matches x @ 1
-			goto Lbd;
-		}
-		goto Default0;
-	TailCall_cCosh:
-	case cCosh:
-		switch(ByteCodePtr[0])
-		{
-		case cAbs:
-			FP_TRACE_BYTECODE_OPTIMIZATION(282,"cAbs cCosh", "cCosh", "");
-			/* opcode = cCosh; */ // redundant, matches cCosh @ 0
-			goto Lbe;
-		case cAcosh:
-			FP_TRACE_BYTECODE_OPTIMIZATION(185,"cAcosh cCosh", "", "");
-			goto Lbf;
-		case cAsinh:
-			FP_TRACE_BYTECODE_OPTIMIZATION(295,"cAsinh cCosh", "[DO_STACKPLUS1] cSqr [Value_t(1)] cAdd cSqrt", "");
-			incStackPtr();
-			--StackPtr;
-			goto Lbg;
-		case cNeg:
-			FP_TRACE_BYTECODE_OPTIMIZATION(284,"cNeg cCosh", "cCosh", "");
-			/* opcode = cCosh; */ // redundant, matches cCosh @ 0
-			goto Lbe;
-		case cImmed:
-			x = ImmedPtr[0];
-			FP_TRACE_BYTECODE_OPTIMIZATION(50,
-				"x cCosh",
-				"[fp_cosh(x)]",
-				"    with x = " << x << "\n");
-			/* ByteCodePtr[0] = cImmed; */ // redundant, matches x @ 1
-			goto Lbh;
-		}
-		goto Default0;
-	TailCall_cDeg:
-	case cDeg:
-		if(ByteCodePtr[0] == cImmed)
-		{
-			x = ImmedPtr[0];
-			FP_TRACE_BYTECODE_OPTIMIZATION(65,
-				"x cDeg",
-				"[RadiansToDegrees(x)]",
-				"    with x = " << x << "\n");
-			/* ByteCodePtr[0] = cImmed; */ // redundant, matches x @ 1
-			goto Lbi;
-		}
-		goto Default0;
-	TailCall_cDiv:
-	case cDiv:
-		switch(ByteCodePtr[0])
-		{
-		case cCos:
-			FP_TRACE_BYTECODE_OPTIMIZATION(298,"cCos cDiv", "cSec cMul", "");
-			goto Lbj;
-		case cCot:
-			FP_TRACE_BYTECODE_OPTIMIZATION(302,"cCot cDiv", "cTan cMul", "");
-			goto Lbk;
-		case cCsc:
-			FP_TRACE_BYTECODE_OPTIMIZATION(300,"cCsc cDiv", "cSin cMul", "");
-			goto Lbl;
-		case cDup:
-			FP_TRACE_BYTECODE_OPTIMIZATION(121,"cDup cDiv", "[Value_t(0)] cMul [Value_t(1)] cAdd", "");
-			goto Lbm;
-		case cExp:
-			FP_TRACE_BYTECODE_OPTIMIZATION(259,"cExp cDiv", "cNeg cExp cMul", "");
-			goto Lbn;
-		case cExp2:
-			FP_TRACE_BYTECODE_OPTIMIZATION(260,"cExp2 cDiv", "cNeg cExp2 cMul", "");
-			goto Lbo;
-		case cInv:
-			FP_TRACE_BYTECODE_OPTIMIZATION(194,"cInv cDiv", "cMul", "");
-			goto Lbp;
-		case cPow:
-			FP_TRACE_BYTECODE_OPTIMIZATION(258,"cPow cDiv", "cNeg cPow cMul", "");
-			goto Lca;
-		case cSec:
-			FP_TRACE_BYTECODE_OPTIMIZATION(301,"cSec cDiv", "cCos cMul", "");
-			goto Lcb;
-		case cSin:
-			FP_TRACE_BYTECODE_OPTIMIZATION(297,"cSin cDiv", "cCsc cMul", "");
-			goto Lcc;
-		case cTan:
-			FP_TRACE_BYTECODE_OPTIMIZATION(299,"cTan cDiv", "cCot cMul", "");
-			goto Lcd;
-		case cImmed:
-			x = ImmedPtr[0];
-			if(x==Value_t(1))
-			{
-				FP_TRACE_BYTECODE_OPTIMIZATION(72,
-					"x[x==Value_t(1)] cDiv",
-					"",
-					"    with x = " << x << "\n");
-				goto Lai;
-			}
-			if(x!=Value_t(0))
-			{
-				switch(ByteCodePtr[-1])
-				{
-				case cMul:
-					if(ByteCodePtr[-2] == cImmed)
-					{
-						y = ImmedPtr[-1];
-						if((y/x)==GetRadiansToDegreesFactor<Value_t>())
-						{
-							FP_TRACE_BYTECODE_OPTIMIZATION(151,
-								"y[(y/x)==GetRadiansToDegreesFactor<Value_t>()] cMul x[x!=Value_t(0)] cDiv",
-								"cDeg",
-								"    with x = " << x
-								    << ", y = " << y
-								    << "\n");
-							goto Lce;
-						}
-						if((y/x)==GetDegreesToRadiansFactor<Value_t>())
-						{
-							FP_TRACE_BYTECODE_OPTIMIZATION(152,
-								"y[(y/x)==GetDegreesToRadiansFactor<Value_t>()] cMul x[x!=Value_t(0)] cDiv",
-								"cRad",
-								"    with x = " << x
-								    << ", y = " << y
-								    << "\n");
-							goto Lcf;
-						}
-						FP_TRACE_BYTECODE_OPTIMIZATION(153,
-							"y cMul x[x!=Value_t(0)] cDiv",
-							"[y/x] cMul",
-							"    with x = " << x
-							    << ", y = " << y
-							    << "\n");
-						/* ByteCodePtr[-2] = cImmed; */ // redundant, matches y @ 3
-						goto Lcg;
-					}
-					break;
-				case cNeg:
-					FP_TRACE_BYTECODE_OPTIMIZATION(139,
-						"cNeg x[x!=Value_t(0)] cDiv",
-						"[-x] cDiv",
-						"    with x = " << x << "\n");
-					/* opcode = cDiv; */ // redundant, matches cDiv @ 0
-					goto Lch;
-				case cImmed:
-					y = ImmedPtr[-1];
-					FP_TRACE_BYTECODE_OPTIMIZATION(73,
-						"y x[x!=Value_t(0)] cDiv",
-						"[y/x]",
-						"    with x = " << x
-						    << ", y = " << y
-						    << "\n");
-					/* ByteCodePtr[-1] = cImmed; */ // redundant, matches y @ 2
-					goto Lci;
-				}
-				FP_TRACE_BYTECODE_OPTIMIZATION(155,
-					"x[x!=Value_t(0)] cDiv",
-					"[Value_t(1)/x] cMul",
-					"    with x = " << x << "\n");
-				/* ByteCodePtr[0] = cImmed; */ // redundant, matches x @ 1
-				goto Lcj;
-			}
-			break;
-		}
-		goto Default0;
-	TailCall_cEqual:
-	case cEqual:
-		if(ByteCodePtr[0] == cImmed)
-		{
-			x = ImmedPtr[0];
-			if(x==Value_t(0))
-			{
-				switch(ByteCodePtr[-1])
-				{
-				case cAbs:
-					FP_TRACE_BYTECODE_OPTIMIZATION(208,
-						"cAbs x[x==Value_t(0)] cEqual",
-						"[x] cEqual",
-						"    with x = " << x << "\n");
-					/* ImmedPtr[0] = x; */ // redundant, matches x @ 1
-					/* opcode = cEqual; */ // redundant, matches cEqual @ 0
-					goto Lck;
-				case cSqr:
-					FP_TRACE_BYTECODE_OPTIMIZATION(210,
-						"cSqr x[x==Value_t(0)] cEqual",
-						"[x] cEqual",
-						"    with x = " << x << "\n");
-					/* ImmedPtr[0] = x; */ // redundant, matches x @ 1
-					/* opcode = cEqual; */ // redundant, matches cEqual @ 0
-					goto Lck;
-				}
-			}
-			if(ByteCodePtr[-1] == cImmed)
-			{
-				y = ImmedPtr[-1];
-				FP_TRACE_BYTECODE_OPTIMIZATION(129,
-					"y x cEqual",
-					"[fp_equal(y,x)]",
-					"    with x = " << x
-					    << ", y = " << y
-					    << "\n");
-				/* ByteCodePtr[-1] = cImmed; */ // redundant, matches y @ 2
-				goto Lcl;
-			}
-		}
-		goto Default0;
-	TailCall_cExp:
-	case cExp:
-		switch(ByteCodePtr[0])
-		{
-		case cAdd:
-			if(ByteCodePtr[-1] == cImmed)
-			{
-				x = ImmedPtr[0];
-				FP_TRACE_BYTECODE_OPTIMIZATION(255,
-					"x cAdd cExp",
-					"cExp [fp_exp(x)] cMul",
-					"    with x = " << x << "\n");
-				goto Lcm;
-			}
-			break;
-		case cLog:
-			A = ByteCodePtr[-1];
-			if(IsNeverNegativeValueOpcode(A))
-			{
-				FP_TRACE_BYTECODE_OPTIMIZATION(175,
-					"A[IsNeverNegativeValueOpcode(A)] cLog cExp",
-					"A",
-					"    with A = " << FP_TRACE_OPCODENAME(A) << "\n");
-				/* ByteCodePtr[-1] = A; */ // redundant, matches A @ 2
-				goto Lbf;
-			}
-			break;
-		case cImmed:
-			x = ImmedPtr[0];
-			FP_TRACE_BYTECODE_OPTIMIZATION(51,
-				"x cExp",
-				"[fp_exp(x)]",
-				"    with x = " << x << "\n");
-			/* ByteCodePtr[0] = cImmed; */ // redundant, matches x @ 1
-			goto Lcn;
-		}
-		goto Default0;
-	TailCall_cExp2:
-	case cExp2:
-		switch(ByteCodePtr[0])
-		{
-		case cAdd:
-			if(ByteCodePtr[-1] == cImmed)
-			{
-				x = ImmedPtr[0];
-				FP_TRACE_BYTECODE_OPTIMIZATION(256,
-					"x cAdd cExp2",
-					"cExp2 [fp_exp2(x)] cMul",
-					"    with x = " << x << "\n");
-				goto Lco;
-			}
-			break;
-		case cLog2:
-			A = ByteCodePtr[-1];
-			if(IsNeverNegativeValueOpcode(A))
-			{
-				FP_TRACE_BYTECODE_OPTIMIZATION(176,
-					"A[IsNeverNegativeValueOpcode(A)] cLog2 cExp2",
-					"A",
-					"    with A = " << FP_TRACE_OPCODENAME(A) << "\n");
-				/* ByteCodePtr[-1] = A; */ // redundant, matches A @ 2
-				goto Lbf;
-			}
-			break;
-		case cImmed:
-			x = ImmedPtr[0];
-			FP_TRACE_BYTECODE_OPTIMIZATION(52,
-				"x cExp2",
-				"[fp_exp2(x)]",
-				"    with x = " << x << "\n");
-			/* ByteCodePtr[0] = cImmed; */ // redundant, matches x @ 1
-			goto Lcp;
-		}
-		FP_TRACE_BYTECODE_OPTIMIZATION(341,"cExp2", "[DO_STACKPLUS1] [fp_log(Value_t(2))] cMul cExp", "");
-		incStackPtr();
-		--StackPtr;
-		goto Lda;
-	TailCall_cFloor:
-	case cFloor:
-		switch(ByteCodePtr[0])
-		{
-		case cNeg:
-			FP_TRACE_BYTECODE_OPTIMIZATION(252,"cNeg cFloor", "cCeil cNeg", "");
-			goto Ldb;
-		case cImmed:
-			x = ImmedPtr[0];
-			FP_TRACE_BYTECODE_OPTIMIZATION(53,
-				"x cFloor",
-				"[fp_floor(x)]",
-				"    with x = " << x << "\n");
-			/* ByteCodePtr[0] = cImmed; */ // redundant, matches x @ 1
-			goto Ldc;
-		default:
-			A = ByteCodePtr[0];
-			if(IsAlwaysIntegerOpcode(A))
-			{
-				FP_TRACE_BYTECODE_OPTIMIZATION(246,
-					"A[IsAlwaysIntegerOpcode(A)] cFloor",
-					"A",
-					"    with A = " << FP_TRACE_OPCODENAME(A) << "\n");
-				/* ByteCodePtr[0] = A; */ // redundant, matches A @ 1
-				return;
-			}
-		}
-		goto Default0;
-	TailCall_cGreater:
-	case cGreater:
-		if(ByteCodePtr[0] == cImmed)
-		{
-			x = ImmedPtr[0];
-			if(ByteCodePtr[-1] == cImmed)
-			{
-				y = ImmedPtr[-1];
-				FP_TRACE_BYTECODE_OPTIMIZATION(127,
-					"y x cGreater",
-					"[fp_less(x,y)]",
-					"    with x = " << x
-					    << ", y = " << y
-					    << "\n");
-				/* ByteCodePtr[-1] = cImmed; */ // redundant, matches y @ 2
-				goto Ldd;
-			}
-		}
-		goto Default0;
-	TailCall_cGreaterOrEq:
-	case cGreaterOrEq:
-		if(ByteCodePtr[0] == cImmed)
-		{
-			x = ImmedPtr[0];
-			if(x!=Value_t(0))
-			{
-				if(ByteCodePtr[-1] == cAbs)
-				{
-					FP_TRACE_BYTECODE_OPTIMIZATION(276,
-						"cAbs x[x!=Value_t(0)] cGreaterOrEq",
-						"[Value_t(0.5)/x] cMul cNotNot",
-						"    with x = " << x << "\n");
-					goto Lde;
-				}
-			}
-			if(ByteCodePtr[-1] == cImmed)
-			{
-				y = ImmedPtr[-1];
-				FP_TRACE_BYTECODE_OPTIMIZATION(128,
-					"y x cGreaterOrEq",
-					"[fp_lessOrEq(x,y)]",
-					"    with x = " << x
-					    << ", y = " << y
-					    << "\n");
-				/* ByteCodePtr[-1] = cImmed; */ // redundant, matches y @ 2
-				goto Ldf;
-			}
-		}
-		goto Default0;
-	TailCall_cInt:
-	case cInt:
-		switch(ByteCodePtr[0])
-		{
-		case cImmed:
-			x = ImmedPtr[0];
-			FP_TRACE_BYTECODE_OPTIMIZATION(54,
-				"x cInt",
-				"[fp_int(x)]",
-				"    with x = " << x << "\n");
-			/* ByteCodePtr[0] = cImmed; */ // redundant, matches x @ 1
-			goto Ldg;
-		default:
-			A = ByteCodePtr[0];
-			if(IsAlwaysIntegerOpcode(A))
-			{
-				FP_TRACE_BYTECODE_OPTIMIZATION(248,
-					"A[IsAlwaysIntegerOpcode(A)] cInt",
-					"A",
-					"    with A = " << FP_TRACE_OPCODENAME(A) << "\n");
-				/* ByteCodePtr[0] = A; */ // redundant, matches A @ 1
-				return;
-			}
-		}
-		goto Default0;
-	TailCall_cInv:
-	case cInv:
-		switch(ByteCodePtr[0])
-		{
-		case cCos:
-			FP_TRACE_BYTECODE_OPTIMIZATION(304,"cCos cInv", "cSec", "");
-			goto Ldh;
-		case cCot:
-			FP_TRACE_BYTECODE_OPTIMIZATION(308,"cCot cInv", "cTan", "");
-			goto Ldi;
-		case cCsc:
-			FP_TRACE_BYTECODE_OPTIMIZATION(306,"cCsc cInv", "cSin", "");
-			goto Ldj;
-		case cInv:
-			FP_TRACE_BYTECODE_OPTIMIZATION(190,"cInv cInv", "", "");
-			goto Lbf;
-		case cPow:
-			FP_TRACE_BYTECODE_OPTIMIZATION(192,"cPow cInv", "cNeg cPow", "");
-			goto Ldk;
-		case cSec:
-			FP_TRACE_BYTECODE_OPTIMIZATION(307,"cSec cInv", "cCos", "");
-			goto Ldl;
-		case cSin:
-			FP_TRACE_BYTECODE_OPTIMIZATION(303,"cSin cInv", "cCsc", "");
-			goto Ldm;
-		case cSqrt:
-			FP_TRACE_BYTECODE_OPTIMIZATION(67,"cSqrt cInv", "cRSqrt", "");
-			goto Ldn;
-		case cTan:
-			FP_TRACE_BYTECODE_OPTIMIZATION(305,"cTan cInv", "cCot", "");
-			goto Ldo;
-		case cImmed:
-			x = ImmedPtr[0];
-			if(x!=Value_t(0))
-			{
-				FP_TRACE_BYTECODE_OPTIMIZATION(69,
-					"x[x!=Value_t(0)] cInv",
-					"[Value_t(1)/x]",
-					"    with x = " << x << "\n");
-				/* ByteCodePtr[0] = cImmed; */ // redundant, matches x @ 1
-				goto Ldp;
-			}
-			break;
-		}
-		goto Default0;
-	TailCall_cLess:
-	case cLess:
-		if(ByteCodePtr[0] == cImmed)
-		{
-			x = ImmedPtr[0];
-			if(x!=Value_t(0))
-			{
-				if(ByteCodePtr[-1] == cAbs)
-				{
-					FP_TRACE_BYTECODE_OPTIMIZATION(275,
-						"cAbs x[x!=Value_t(0)] cLess",
-						"[Value_t(0.5)/x] cMul cNot",
-						"    with x = " << x << "\n");
-					goto Lea;
-				}
-			}
-			if(ByteCodePtr[-1] == cImmed)
-			{
-				y = ImmedPtr[-1];
-				FP_TRACE_BYTECODE_OPTIMIZATION(125,
-					"y x cLess",
-					"[fp_less(y,x)]",
-					"    with x = " << x
-					    << ", y = " << y
-					    << "\n");
-				/* ByteCodePtr[-1] = cImmed; */ // redundant, matches y @ 2
-				goto Leb;
-			}
-		}
-		goto Default0;
-	TailCall_cLessOrEq:
-	case cLessOrEq:
-		if(ByteCodePtr[0] == cImmed)
-		{
-			x = ImmedPtr[0];
-			if(ByteCodePtr[-1] == cImmed)
-			{
-				y = ImmedPtr[-1];
-				FP_TRACE_BYTECODE_OPTIMIZATION(126,
-					"y x cLessOrEq",
-					"[fp_lessOrEq(y,x)]",
-					"    with x = " << x
-					    << ", y = " << y
-					    << "\n");
-				/* ByteCodePtr[-1] = cImmed; */ // redundant, matches y @ 2
-				goto Lec;
-			}
-		}
-		goto Default0;
-	TailCall_cLog:
-	case cLog:
-		switch(ByteCodePtr[0])
-		{
-		case cExp:
-			FP_TRACE_BYTECODE_OPTIMIZATION(178,"cExp cLog", "", "");
-			goto Lbf;
-		case cMul:
-			if(ByteCodePtr[-1] == cImmed)
-			{
-				x = ImmedPtr[0];
-				if(x>Value_t(0))
-				{
-					FP_TRACE_BYTECODE_OPTIMIZATION(353,
-						"x[x>Value_t(0)] cMul cLog",
-						"cLog [fp_log(x)] cAdd",
-						"    with x = " << x << "\n");
-					goto Led;
-				}
-			}
-			break;
-		case cSqr:
-			FP_TRACE_BYTECODE_OPTIMIZATION(103,"cSqr cLog", "cAbs cLog cDup cAdd", "");
-			goto Lee;
-		case cImmed:
-			x = ImmedPtr[0];
-			if(x>Value_t(0))
-			{
-				FP_TRACE_BYTECODE_OPTIMIZATION(55,
-					"x[x>Value_t(0)] cLog",
-					"[fp_log(x)]",
-					"    with x = " << x << "\n");
-				/* ByteCodePtr[0] = cImmed; */ // redundant, matches x @ 1
-				goto Lef;
-			}
-			break;
-		}
-		goto Default0;
-	TailCall_cLog10:
-	case cLog10:
-		switch(ByteCodePtr[0])
-		{
-		case cExp:
-			FP_TRACE_BYTECODE_OPTIMIZATION(343,"cExp cLog10", "[DO_STACKPLUS1] [fp_log10(const_e<Value_t>())] cMul", "");
-			incStackPtr();
-			--StackPtr;
-			goto Leg;
-		case cMul:
-			if(ByteCodePtr[-1] == cImmed)
-			{
-				x = ImmedPtr[0];
-				if(x>Value_t(0))
-				{
-					FP_TRACE_BYTECODE_OPTIMIZATION(354,
-						"x[x>Value_t(0)] cMul cLog10",
-						"cLog10 [fp_log10(x)] cAdd",
-						"    with x = " << x << "\n");
-					goto Leh;
-				}
-			}
-			break;
-		case cSqr:
-			FP_TRACE_BYTECODE_OPTIMIZATION(105,"cSqr cLog10", "cAbs cLog10 cDup cAdd", "");
-			goto Lei;
-		case cImmed:
-			x = ImmedPtr[0];
-			if(x>Value_t(0))
-			{
-				FP_TRACE_BYTECODE_OPTIMIZATION(56,
-					"x[x>Value_t(0)] cLog10",
-					"[fp_log10(x)]",
-					"    with x = " << x << "\n");
-				/* ByteCodePtr[0] = cImmed; */ // redundant, matches x @ 1
-				goto Lej;
-			}
-			break;
-		}
-		goto Default0;
-	TailCall_cLog2:
-	case cLog2:
-		switch(ByteCodePtr[0])
-		{
-		case cExp:
-			FP_TRACE_BYTECODE_OPTIMIZATION(342,"cExp cLog2", "[DO_STACKPLUS1] [fp_log2(const_e<Value_t>())] cMul", "");
-			incStackPtr();
-			--StackPtr;
-			goto Lek;
-		case cExp2:
-			FP_TRACE_BYTECODE_OPTIMIZATION(179,"cExp2 cLog2", "", "");
-			goto Lbf;
-		case cMul:
-			if(ByteCodePtr[-1] == cImmed)
-			{
-				x = ImmedPtr[0];
-				if(x>Value_t(0))
-				{
-					FP_TRACE_BYTECODE_OPTIMIZATION(352,
-						"x[x>Value_t(0)] cMul cLog2",
-						"cLog2 [fp_log2(x)] cAdd",
-						"    with x = " << x << "\n");
-					goto Lel;
-				}
-			}
-			break;
-		case cSqr:
-			FP_TRACE_BYTECODE_OPTIMIZATION(104,"cSqr cLog2", "cAbs cLog2 cDup cAdd", "");
-			goto Lem;
-		case cImmed:
-			x = ImmedPtr[0];
-			if(x>Value_t(0))
-			{
-				FP_TRACE_BYTECODE_OPTIMIZATION(57,
-					"x[x>Value_t(0)] cLog2",
-					"[fp_log2(x)]",
-					"    with x = " << x << "\n");
-				/* ByteCodePtr[0] = cImmed; */ // redundant, matches x @ 1
-				goto Len;
-			}
-			break;
-		}
-		goto Default0;
-	TailCall_cMax:
-	case cMax:
-		switch(ByteCodePtr[0])
-		{
-		case cDup:
-			FP_TRACE_BYTECODE_OPTIMIZATION(111,"cDup cMax", "", "");
-			goto Lbf;
-		case cImmed:
-			x = ImmedPtr[0];
-			if(ByteCodePtr[-1] == cImmed)
-			{
-				y = ImmedPtr[-1];
-				FP_TRACE_BYTECODE_OPTIMIZATION(82,
-					"y x cMax",
-					"[Max(x,y)]",
-					"    with x = " << x
-					    << ", y = " << y
-					    << "\n");
-				/* ByteCodePtr[-1] = cImmed; */ // redundant, matches y @ 2
-				goto Leo;
-			}
-			break;
-		default:
-			A = ByteCodePtr[0];
-			if(A>=VarBegin)
-			{
-				switch(ByteCodePtr[-1])
-				{
-				case cDup:
-					B = ByteCodePtr[-2];
-					if(B==A)
-					{
-						FP_TRACE_BYTECODE_OPTIMIZATION(113,
-							"B[B==A] cDup A[A>=VarBegin] cMax",
-							"B cDup",
-							"    with A = " << FP_TRACE_OPCODENAME(A)
-							    << ", B = " << FP_TRACE_OPCODENAME(B)
-							    << "\n");
-						/* ByteCodePtr[-2] = B; */ // redundant, matches B @ 3
-						/* ByteCodePtr[-1] = cDup; */ // redundant, matches cDup @ 2
-						goto Lbf;
-					}
-					break;
-				case cMax:
-					B = ByteCodePtr[-2];
-					if(B==A)
-					{
-						FP_TRACE_BYTECODE_OPTIMIZATION(115,
-							"B[B==A] cMax A[A>=VarBegin] cMax",
-							"B cMax",
-							"    with A = " << FP_TRACE_OPCODENAME(A)
-							    << ", B = " << FP_TRACE_OPCODENAME(B)
-							    << "\n");
-						/* ByteCodePtr[-2] = B; */ // redundant, matches B @ 3
-						/* ByteCodePtr[-1] = cMax; */ // redundant, matches cMax @ 2
-						goto Lbf;
-					}
-					break;
-				}
-			}
-		}
-		goto Default0;
-	TailCall_cMin:
-	case cMin:
-		switch(ByteCodePtr[0])
-		{
-		case cDup:
-			FP_TRACE_BYTECODE_OPTIMIZATION(110,"cDup cMin", "", "");
-			goto Lbf;
-		case cImmed:
-			x = ImmedPtr[0];
-			if(ByteCodePtr[-1] == cImmed)
-			{
-				y = ImmedPtr[-1];
-				FP_TRACE_BYTECODE_OPTIMIZATION(81,
-					"y x cMin",
-					"[Min(x,y)]",
-					"    with x = " << x
-					    << ", y = " << y
-					    << "\n");
-				/* ByteCodePtr[-1] = cImmed; */ // redundant, matches y @ 2
-				goto Lep;
-			}
-			break;
-		default:
-			A = ByteCodePtr[0];
-			if(A>=VarBegin)
-			{
-				switch(ByteCodePtr[-1])
-				{
-				case cDup:
-					B = ByteCodePtr[-2];
-					if(B==A)
-					{
-						FP_TRACE_BYTECODE_OPTIMIZATION(112,
-							"B[B==A] cDup A[A>=VarBegin] cMin",
-							"B cDup",
-							"    with A = " << FP_TRACE_OPCODENAME(A)
-							    << ", B = " << FP_TRACE_OPCODENAME(B)
-							    << "\n");
-						/* ByteCodePtr[-2] = B; */ // redundant, matches B @ 3
-						/* ByteCodePtr[-1] = cDup; */ // redundant, matches cDup @ 2
-						goto Lbf;
-					}
-					break;
-				case cMin:
-					B = ByteCodePtr[-2];
-					if(B==A)
-					{
-						FP_TRACE_BYTECODE_OPTIMIZATION(114,
-							"B[B==A] cMin A[A>=VarBegin] cMin",
-							"B cMin",
-							"    with A = " << FP_TRACE_OPCODENAME(A)
-							    << ", B = " << FP_TRACE_OPCODENAME(B)
-							    << "\n");
-						/* ByteCodePtr[-2] = B; */ // redundant, matches B @ 3
-						/* ByteCodePtr[-1] = cMin; */ // redundant, matches cMin @ 2
-						goto Lbf;
-					}
-					break;
-				}
-			}
-		}
-		goto Default0;
-	TailCall_cMod:
-	case cMod:
-		if(ByteCodePtr[0] == cImmed)
-		{
-			x = ImmedPtr[0];
-			if(x!=Value_t(0))
-			{
-				if(ByteCodePtr[-1] == cImmed)
-				{
-					y = ImmedPtr[-1];
-					FP_TRACE_BYTECODE_OPTIMIZATION(74,
-						"y x[x!=Value_t(0)] cMod",
-						"[fp_mod(y,x)]",
-						"    with x = " << x
-						    << ", y = " << y
-						    << "\n");
-					/* ByteCodePtr[-1] = cImmed; */ // redundant, matches y @ 2
-					goto Lfa;
-				}
-			}
-		}
-		goto Default0;
-	TailCall_cMul:
-	case cMul:
-		switch(ByteCodePtr[0])
-		{
-		case cDup:
-			FP_TRACE_BYTECODE_OPTIMIZATION(338,"cDup cMul", "cSqr", "");
-			goto Lfb;
-		case cInv:
-			FP_TRACE_BYTECODE_OPTIMIZATION(195,"cInv cMul", "cDiv", "");
-			goto Lfc;
-		case cNeg:
-			A = ByteCodePtr[-1];
-			if(A>=VarBegin)
-			{
-				switch(ByteCodePtr[-2])
-				{
-				case cMul:
-					B = ByteCodePtr[-3];
-					if(B==A)
-					{
-						FP_TRACE_BYTECODE_OPTIMIZATION(330,
-							"B[B==A] cMul A[A>=VarBegin] cNeg cMul",
-							"B cSqr cMul cNeg",
-							"    with A = " << FP_TRACE_OPCODENAME(A)
-							    << ", B = " << FP_TRACE_OPCODENAME(B)
-							    << "\n");
-						/* ByteCodePtr[-3] = B; */ // redundant, matches B @ 4
-						goto Lfd;
-					}
-					goto Default1;
-				default: Default1:;
-					B = ByteCodePtr[-2];
-					if(B==A)
-					{
-						FP_TRACE_BYTECODE_OPTIMIZATION(324,
-							"B[B==A] A[A>=VarBegin] cNeg cMul",
-							"B cSqr cNeg",
-							"    with A = " << FP_TRACE_OPCODENAME(A)
-							    << ", B = " << FP_TRACE_OPCODENAME(B)
-							    << "\n");
-						/* ByteCodePtr[-2] = B; */ // redundant, matches B @ 3
-						goto Lfe;
-					}
-				}
-			}
-			goto Default2;
-		case cImmed:
-			x = ImmedPtr[0];
-			if(x==Value_t(0))
-			{
-				switch(ByteCodePtr[-1])
-				{
-				case cMul:
-					A = ByteCodePtr[-2];
-					if(A>=VarBegin)
-					{
-						FP_TRACE_BYTECODE_OPTIMIZATION(94,
-							"A[A>=VarBegin] cMul x[x==Value_t(0)] cMul",
-							"[x] cMul",
-							"    with x = " << x
-							    << ", A = " << FP_TRACE_OPCODENAME(A)
-							    << "\n");
-						/* ImmedPtr[0] = x; */ // redundant, matches x @ 1
-						/* opcode = cMul; */ // redundant, matches cMul @ 0
-						goto Lff;
-					}
-					goto Default3;
-				default: Default3:;
-					A = ByteCodePtr[-1];
-					if(IsBinaryOpcode(A)&&!HasInvalidRangesOpcode(A))
-					{
-						switch(ByteCodePtr[-2])
-						{
-						case cImmed:
-							y = ImmedPtr[-1];
-							FP_TRACE_BYTECODE_OPTIMIZATION(93,
-								"y A[IsBinaryOpcode(A)&&!HasInvalidRangesOpcode(A)] x[x==Value_t(0)] cMul",
-								"[x] cMul",
-								"    with x = " << x
-								    << ", A = " << FP_TRACE_OPCODENAME(A)
-								    << ", y = " << y
-								    << "\n");
-							/* ByteCodePtr[-2] = cImmed; */ // redundant, matches y @ 3
-							/* opcode = cMul; */ // redundant, matches cMul @ 0
-							goto Lfg;
-						default:
-							B = ByteCodePtr[-2];
-							if(IsBinaryOpcode(B)&&!HasInvalidRangesOpcode(B))
-							{
-								switch(ByteCodePtr[-3])
-								{
-								case cImmed:
-									y = ImmedPtr[-1];
-									FP_TRACE_BYTECODE_OPTIMIZATION(97,
-										"y B[IsBinaryOpcode(B)&&!HasInvalidRangesOpcode(B)] A[IsBinaryOpcode(A)&&!HasInvalidRangesOpcode(A)] x[x==Value_t(0)] cMul",
-										"A [x] cMul",
-										"    with x = " << x
-										    << ", A = " << FP_TRACE_OPCODENAME(A)
-										    << ", B = " << FP_TRACE_OPCODENAME(B)
-										    << ", y = " << y
-										    << "\n");
-									/* opcode = cMul; */ // redundant, matches cMul @ 0
-									goto Lfh;
-								default:
-									C = ByteCodePtr[-3];
-									if(C>=VarBegin)
-									{
-										FP_TRACE_BYTECODE_OPTIMIZATION(95,
-											"C[C>=VarBegin] B[IsBinaryOpcode(B)&&!HasInvalidRangesOpcode(B)] A[IsBinaryOpcode(A)&&!HasInvalidRangesOpcode(A)] x[x==Value_t(0)] cMul",
-											"A [x] cMul",
-											"    with x = " << x
-											    << ", A = " << FP_TRACE_OPCODENAME(A)
-											    << ", B = " << FP_TRACE_OPCODENAME(B)
-											    << ", C = " << FP_TRACE_OPCODENAME(C)
-											    << "\n");
-										/* opcode = cMul; */ // redundant, matches cMul @ 0
-										goto Lfi;
-									}
-									if(IsUnaryOpcode(C)&&!HasInvalidRangesOpcode(C))
-									{
-										FP_TRACE_BYTECODE_OPTIMIZATION(96,
-											"C[IsUnaryOpcode(C)&&!HasInvalidRangesOpcode(C)] B[IsBinaryOpcode(B)&&!HasInvalidRangesOpcode(B)] A[IsBinaryOpcode(A)&&!HasInvalidRangesOpcode(A)] x[x==Value_t(0)] cMul",
-											"B A [x] cMul",
-											"    with x = " << x
-											    << ", A = " << FP_TRACE_OPCODENAME(A)
-											    << ", B = " << FP_TRACE_OPCODENAME(B)
-											    << ", C = " << FP_TRACE_OPCODENAME(C)
-											    << "\n");
-										/* opcode = cMul; */ // redundant, matches cMul @ 0
-										goto Lfj;
-									}
-								}
-							}
-							if(B>=VarBegin)
-							{
-								FP_TRACE_BYTECODE_OPTIMIZATION(91,
-									"B[B>=VarBegin] A[IsBinaryOpcode(A)&&!HasInvalidRangesOpcode(A)] x[x==Value_t(0)] cMul",
-									"[x] cMul",
-									"    with x = " << x
-									    << ", A = " << FP_TRACE_OPCODENAME(A)
-									    << ", B = " << FP_TRACE_OPCODENAME(B)
-									    << "\n");
-								/* ImmedPtr[0] = x; */ // redundant, matches x @ 1
-								/* opcode = cMul; */ // redundant, matches cMul @ 0
-								goto Lff;
-							}
-							if(IsUnaryOpcode(B)&&!HasInvalidRangesOpcode(B))
-							{
-								FP_TRACE_BYTECODE_OPTIMIZATION(92,
-									"B[IsUnaryOpcode(B)&&!HasInvalidRangesOpcode(B)] A[IsBinaryOpcode(A)&&!HasInvalidRangesOpcode(A)] x[x==Value_t(0)] cMul",
-									"A [x] cMul",
-									"    with x = " << x
-									    << ", A = " << FP_TRACE_OPCODENAME(A)
-									    << ", B = " << FP_TRACE_OPCODENAME(B)
-									    << "\n");
-								/* opcode = cMul; */ // redundant, matches cMul @ 0
-								goto Lfk;
-							}
-						}
-					}
-					if(A>=VarBegin)
-					{
-						FP_TRACE_BYTECODE_OPTIMIZATION(89,
-							"A[A>=VarBegin] x[x==Value_t(0)] cMul",
-							"[x]",
-							"    with x = " << x
-							    << ", A = " << FP_TRACE_OPCODENAME(A)
-							    << "\n");
-						/* ImmedPtr[0] = x; */ // redundant, matches x @ 1
-						goto Lfl;
-					}
-					if(IsUnaryOpcode(A)&&!HasInvalidRangesOpcode(A))
-					{
-						FP_TRACE_BYTECODE_OPTIMIZATION(90,
-							"A[IsUnaryOpcode(A)&&!HasInvalidRangesOpcode(A)] x[x==Value_t(0)] cMul",
-							"[x] cMul",
-							"    with x = " << x
-							    << ", A = " << FP_TRACE_OPCODENAME(A)
-							    << "\n");
-						/* ImmedPtr[0] = x; */ // redundant, matches x @ 1
-						/* opcode = cMul; */ // redundant, matches cMul @ 0
-						goto Lfm;
-					}
-				}
-			}
-			switch(ByteCodePtr[-1])
-			{
-			case cAdd:
-				if(ByteCodePtr[-2] == cDup)
-				{
-					if(x+x==Value_t(1))
-					{
-						FP_TRACE_BYTECODE_OPTIMIZATION(148,
-							"cDup[x+x==Value_t(1)] cAdd x cMul",
-							"",
-							"    with x = " << x << "\n");
-						goto Lfn;
-					}
-					FP_TRACE_BYTECODE_OPTIMIZATION(149,
-						"cDup cAdd x cMul",
-						"[x+x] cMul",
-						"    with x = " << x << "\n");
-					/* opcode = cMul; */ // redundant, matches cMul @ 0
-					goto Lfo;
-				}
-				break;
-			case cDeg:
-				FP_TRACE_BYTECODE_OPTIMIZATION(106,
-					"cDeg x cMul",
-					"[RadiansToDegrees(x)] cMul",
-					"    with x = " << x << "\n");
-				/* opcode = cMul; */ // redundant, matches cMul @ 0
-				goto Lfp;
-			case cMul:
-				if(ByteCodePtr[-2] == cImmed)
-				{
-					y = ImmedPtr[-1];
-					if((y*x)==GetRadiansToDegreesFactor<Value_t>())
-					{
-						FP_TRACE_BYTECODE_OPTIMIZATION(144,
-							"y[(y*x)==GetRadiansToDegreesFactor<Value_t>()] cMul x cMul",
-							"cDeg",
-							"    with x = " << x
-							    << ", y = " << y
-							    << "\n");
-						goto Lce;
-					}
-					if((y*x)==GetDegreesToRadiansFactor<Value_t>())
-					{
-						FP_TRACE_BYTECODE_OPTIMIZATION(145,
-							"y[(y*x)==GetDegreesToRadiansFactor<Value_t>()] cMul x cMul",
-							"cRad",
-							"    with x = " << x
-							    << ", y = " << y
-							    << "\n");
-						goto Lcf;
-					}
-					if(y*x==Value_t(1))
-					{
-						FP_TRACE_BYTECODE_OPTIMIZATION(146,
-							"y[y*x==Value_t(1)] cMul x cMul",
-							"",
-							"    with x = " << x
-							    << ", y = " << y
-							    << "\n");
-						goto Lga;
-					}
-					FP_TRACE_BYTECODE_OPTIMIZATION(147,
-						"y cMul x cMul",
-						"[y*x] cMul",
-						"    with x = " << x
-						    << ", y = " << y
-						    << "\n");
-					/* ByteCodePtr[-2] = cImmed; */ // redundant, matches y @ 3
-					/* opcode = cMul; */ // redundant, matches cMul @ 0
-					goto Lgb;
-				}
-				break;
-			case cNeg:
-				FP_TRACE_BYTECODE_OPTIMIZATION(136,
-					"cNeg x cMul",
-					"[-x] cMul",
-					"    with x = " << x << "\n");
-				/* opcode = cMul; */ // redundant, matches cMul @ 0
-				goto Lgc;
-			case cRad:
-				FP_TRACE_BYTECODE_OPTIMIZATION(107,
-					"cRad x cMul",
-					"[DegreesToRadians(x)] cMul",
-					"    with x = " << x << "\n");
-				/* opcode = cMul; */ // redundant, matches cMul @ 0
-				goto Lgd;
-			case cImmed:
-				y = ImmedPtr[-1];
-				FP_TRACE_BYTECODE_OPTIMIZATION(71,
-					"y x cMul",
-					"[y*x]",
-					"    with x = " << x
-					    << ", y = " << y
-					    << "\n");
-				/* ByteCodePtr[-1] = cImmed; */ // redundant, matches y @ 2
-				goto Lge;
-			}
-			if(x==Value_t(1))
-			{
-				FP_TRACE_BYTECODE_OPTIMIZATION(70,
-					"x[x==Value_t(1)] cMul",
-					"",
-					"    with x = " << x << "\n");
-				goto Lai;
-			}
-			if(x==Value_t(2))
-			{
-				FP_TRACE_BYTECODE_OPTIMIZATION(100,
-					"x[x==Value_t(2)] cMul",
-					"cDup cAdd",
-					"    with x = " << x << "\n");
-				goto Lgf;
-			}
-			if(x==GetRadiansToDegreesFactor<Value_t>())
-			{
-				FP_TRACE_BYTECODE_OPTIMIZATION(101,
-					"x[x==GetRadiansToDegreesFactor<Value_t>()] cMul",
-					"cDeg",
-					"    with x = " << x << "\n");
-				goto Lgg;
-			}
-			if(x==GetDegreesToRadiansFactor<Value_t>())
-			{
-				FP_TRACE_BYTECODE_OPTIMIZATION(102,
-					"x[x==GetDegreesToRadiansFactor<Value_t>()] cMul",
-					"cRad",
-					"    with x = " << x << "\n");
-				goto Lgh;
-			}
-			if(x==Value_t(-1))
-			{
-				FP_TRACE_BYTECODE_OPTIMIZATION(138,
-					"x[x==Value_t(-1)] cMul",
-					"cNeg",
-					"    with x = " << x << "\n");
-				goto Lgi;
-			}
-			break;
-		default: Default2:;
-			A = ByteCodePtr[0];
-			if(A>=VarBegin)
-			{
-				switch(ByteCodePtr[-1])
-				{
-				case cMul:
-					switch(ByteCodePtr[-2])
-					{
-					case cNeg:
-						B = ByteCodePtr[-3];
-						if(B==A)
-						{
-							FP_TRACE_BYTECODE_OPTIMIZATION(327,
-								"B[B==A] cNeg cMul A[A>=VarBegin] cMul",
-								"B cSqr cMul cNeg",
-								"    with A = " << FP_TRACE_OPCODENAME(A)
-								    << ", B = " << FP_TRACE_OPCODENAME(B)
-								    << "\n");
-							/* ByteCodePtr[-3] = B; */ // redundant, matches B @ 4
-							goto Lfd;
-						}
-						goto Default4;
-					default: Default4:;
-						B = ByteCodePtr[-2];
-						if(B==A)
-						{
-							FP_TRACE_BYTECODE_OPTIMIZATION(318,
-								"B[B==A] cMul A[A>=VarBegin] cMul",
-								"B cSqr cMul",
-								"    with A = " << FP_TRACE_OPCODENAME(A)
-								    << ", B = " << FP_TRACE_OPCODENAME(B)
-								    << "\n");
-							/* ByteCodePtr[-2] = B; */ // redundant, matches B @ 3
-							/* opcode = cMul; */ // redundant, matches cMul @ 0
-							goto Lgj;
-						}
-					}
-					goto Default5;
-				case cNeg:
-					B = ByteCodePtr[-2];
-					if(B==A)
-					{
-						FP_TRACE_BYTECODE_OPTIMIZATION(321,
-							"B[B==A] cNeg A[A>=VarBegin] cMul",
-							"B cSqr cNeg",
-							"    with A = " << FP_TRACE_OPCODENAME(A)
-							    << ", B = " << FP_TRACE_OPCODENAME(B)
-							    << "\n");
-						/* ByteCodePtr[-2] = B; */ // redundant, matches B @ 3
-						goto Lfe;
-					}
-					goto Default5;
-				default: Default5:;
-					B = ByteCodePtr[-1];
-					if(B==A)
-					{
-						FP_TRACE_BYTECODE_OPTIMIZATION(315,
-							"B[B==A] A[A>=VarBegin] cMul",
-							"B cSqr",
-							"    with A = " << FP_TRACE_OPCODENAME(A)
-							    << ", B = " << FP_TRACE_OPCODENAME(B)
-							    << "\n");
-						/* ByteCodePtr[-1] = B; */ // redundant, matches B @ 2
-						goto Lfb;
-					}
-				}
-			}
-			if(IsUnaryOpcode(A))
-			{
-				B = ByteCodePtr[-1];
-				if(B>=VarBegin)
-				{
-					if(ByteCodePtr[-2] == cMul)
-					{
-						C = ByteCodePtr[-3];
-						if(C==A)
-						{
-							D = ByteCodePtr[-4];
-							if(D==B)
-							{
-								FP_TRACE_BYTECODE_OPTIMIZATION(337,
-									"D[D==B] C[C==A] cMul B[B>=VarBegin] A[IsUnaryOpcode(A)] cMul",
-									"D C cSqr cMul",
-									"    with A = " << FP_TRACE_OPCODENAME(A)
-									    << ", B = " << FP_TRACE_OPCODENAME(B)
-									    << ", C = " << FP_TRACE_OPCODENAME(C)
-									    << ", D = " << FP_TRACE_OPCODENAME(D)
-									    << "\n");
-								/* ByteCodePtr[-4] = D; */ // redundant, matches D @ 5
-								/* ByteCodePtr[-3] = C; */ // redundant, matches C @ 4
-								/* opcode = cMul; */ // redundant, matches cMul @ 0
-								goto Lgk;
-							}
-						}
-					}
-				}
-			}
-		}
-		goto Default0;
-	TailCall_cNEqual:
-	case cNEqual:
-		if(ByteCodePtr[0] == cImmed)
-		{
-			x = ImmedPtr[0];
-			if(x==Value_t(0))
-			{
-				switch(ByteCodePtr[-1])
-				{
-				case cAbs:
-					FP_TRACE_BYTECODE_OPTIMIZATION(209,
-						"cAbs x[x==Value_t(0)] cNEqual",
-						"[x] cNEqual",
-						"    with x = " << x << "\n");
-					/* ImmedPtr[0] = x; */ // redundant, matches x @ 1
-					/* opcode = cNEqual; */ // redundant, matches cNEqual @ 0
-					goto Lgl;
-				case cSqr:
-					FP_TRACE_BYTECODE_OPTIMIZATION(211,
-						"cSqr x[x==Value_t(0)] cNEqual",
-						"[x] cNEqual",
-						"    with x = " << x << "\n");
-					/* ImmedPtr[0] = x; */ // redundant, matches x @ 1
-					/* opcode = cNEqual; */ // redundant, matches cNEqual @ 0
-					goto Lgl;
-				}
-			}
-			if(ByteCodePtr[-1] == cImmed)
-			{
-				y = ImmedPtr[-1];
-				FP_TRACE_BYTECODE_OPTIMIZATION(130,
-					"y x cNEqual",
-					"[fp_nequal(y,x)]",
-					"    with x = " << x
-					    << ", y = " << y
-					    << "\n");
-				/* ByteCodePtr[-1] = cImmed; */ // redundant, matches y @ 2
-				goto Lgm;
-			}
-		}
-		goto Default0;
-	TailCall_cNeg:
-	case cNeg:
-		switch(ByteCodePtr[0])
-		{
-		case cMul:
-			if(ByteCodePtr[-1] == cImmed)
-			{
-				x = ImmedPtr[0];
-				FP_TRACE_BYTECODE_OPTIMIZATION(137,
-					"x cMul cNeg",
-					"[-x] cMul",
-					"    with x = " << x << "\n");
-				/* ByteCodePtr[-1] = cImmed; */ // redundant, matches x @ 2
-				goto Lgn;
-			}
-			break;
-		case cNeg:
-			FP_TRACE_BYTECODE_OPTIMIZATION(191,"cNeg cNeg", "", "");
-			goto Lbf;
-		case cSin:
-			if(ByteCodePtr[-1] == cMul)
-			{
-				if(ByteCodePtr[-2] == cImmed)
-				{
-					x = ImmedPtr[0];
-					FP_TRACE_BYTECODE_OPTIMIZATION(289,
-						"x cMul cSin cNeg",
-						"[-x] cMul cSin",
-						"    with x = " << x << "\n");
-					/* ByteCodePtr[-2] = cImmed; */ // redundant, matches x @ 3
-					goto Lgo;
-				}
-			}
-			break;
-		case cSinh:
-			if(ByteCodePtr[-1] == cMul)
-			{
-				if(ByteCodePtr[-2] == cImmed)
-				{
-					x = ImmedPtr[0];
-					FP_TRACE_BYTECODE_OPTIMIZATION(290,
-						"x cMul cSinh cNeg",
-						"[-x] cMul cSinh",
-						"    with x = " << x << "\n");
-					/* ByteCodePtr[-2] = cImmed; */ // redundant, matches x @ 3
-					goto Lgp;
-				}
-			}
-			break;
-		case cTan:
-			if(ByteCodePtr[-1] == cMul)
-			{
-				if(ByteCodePtr[-2] == cImmed)
-				{
-					x = ImmedPtr[0];
-					FP_TRACE_BYTECODE_OPTIMIZATION(291,
-						"x cMul cTan cNeg",
-						"[-x] cMul cTan",
-						"    with x = " << x << "\n");
-					/* ByteCodePtr[-2] = cImmed; */ // redundant, matches x @ 3
-					goto Lha;
-				}
-			}
-			break;
-		case cTanh:
-			if(ByteCodePtr[-1] == cMul)
-			{
-				if(ByteCodePtr[-2] == cImmed)
-				{
-					x = ImmedPtr[0];
-					FP_TRACE_BYTECODE_OPTIMIZATION(292,
-						"x cMul cTanh cNeg",
-						"[-x] cMul cTanh",
-						"    with x = " << x << "\n");
-					/* ByteCodePtr[-2] = cImmed; */ // redundant, matches x @ 3
-					goto Lhb;
-				}
-			}
-			break;
-		case cImmed:
-			x = ImmedPtr[0];
-			FP_TRACE_BYTECODE_OPTIMIZATION(68,
-				"x cNeg",
-				"[-x]",
-				"    with x = " << x << "\n");
-			/* ByteCodePtr[0] = cImmed; */ // redundant, matches x @ 1
-			goto Lhc;
-		}
-		goto Default0;
-	TailCall_cNot:
-	case cNot:
-		switch(ByteCodePtr[0])
-		{
-		case cAbs:
-			FP_TRACE_BYTECODE_OPTIMIZATION(235,"cAbs cNot", "cNot", "");
-			/* opcode = cNot; */ // redundant, matches cNot @ 0
-			goto Lhd;
-		case cAbsNot:
-			A = ByteCodePtr[-1];
-			if(IsLogicalOpcode(A))
-			{
-				FP_TRACE_BYTECODE_OPTIMIZATION(240,
-					"A[IsLogicalOpcode(A)] cAbsNot cNot",
-					"A",
-					"    with A = " << FP_TRACE_OPCODENAME(A) << "\n");
-				/* ByteCodePtr[-1] = A; */ // redundant, matches A @ 2
-				goto Lbf;
-			}
-			if(A!=cImmed)
-			{
-				FP_TRACE_BYTECODE_OPTIMIZATION(241,
-					"A[A!=cImmed] cAbsNot cNot",
-					"A cAbsNotNot",
-					"    with A = " << FP_TRACE_OPCODENAME(A) << "\n");
-				/* ByteCodePtr[-1] = A; */ // redundant, matches A @ 2
-				goto Lhe;
-			}
-			goto Default6;
-		case cAbsNotNot:
-			FP_TRACE_BYTECODE_OPTIMIZATION(238,"cAbsNotNot cNot", "cAbsNot", "");
-			goto Lhf;
-		case cEqual:
-			FP_TRACE_BYTECODE_OPTIMIZATION(205,"cEqual cNot", "cNEqual", "");
-			goto Lhg;
-		case cGreater:
-			FP_TRACE_BYTECODE_OPTIMIZATION(203,"cGreater cNot", "cLessOrEq", "");
-			goto Lhh;
-		case cGreaterOrEq:
-			FP_TRACE_BYTECODE_OPTIMIZATION(204,"cGreaterOrEq cNot", "cLess", "");
-			goto Lhi;
-		case cLess:
-			FP_TRACE_BYTECODE_OPTIMIZATION(201,"cLess cNot", "cGreaterOrEq", "");
-			goto Lhj;
-		case cLessOrEq:
-			FP_TRACE_BYTECODE_OPTIMIZATION(202,"cLessOrEq cNot", "cGreater", "");
-			goto Lhk;
-		case cNEqual:
-			FP_TRACE_BYTECODE_OPTIMIZATION(206,"cNEqual cNot", "cEqual", "");
-			goto Lhl;
-		case cNeg:
-			FP_TRACE_BYTECODE_OPTIMIZATION(234,"cNeg cNot", "cNot", "");
-			/* opcode = cNot; */ // redundant, matches cNot @ 0
-			goto Lhd;
-		case cNot:
-			FP_TRACE_BYTECODE_OPTIMIZATION(236,"cNot cNot", "cNotNot", "");
-			goto Lhm;
-		case cNotNot:
-			FP_TRACE_BYTECODE_OPTIMIZATION(237,"cNotNot cNot", "cNot", "");
-			/* opcode = cNot; */ // redundant, matches cNot @ 0
-			goto Lhd;
-		case cImmed:
-			x = ImmedPtr[0];
-			FP_TRACE_BYTECODE_OPTIMIZATION(85,
-				"x cNot",
-				"[!truthValue(x)]",
-				"    with x = " << x << "\n");
-			/* ByteCodePtr[0] = cImmed; */ // redundant, matches x @ 1
-			goto Lhn;
-		default: Default6:;
-			A = ByteCodePtr[0];
-			if(IsNeverNegativeValueOpcode(A))
-			{
-				FP_TRACE_BYTECODE_OPTIMIZATION(242,
-					"A[IsNeverNegativeValueOpcode(A)] cNot",
-					"A cAbsNot",
-					"    with A = " << FP_TRACE_OPCODENAME(A) << "\n");
-				/* ByteCodePtr[0] = A; */ // redundant, matches A @ 1
-				goto Lho;
-			}
-		}
-		goto Default0;
-	TailCall_cOr:
-	case cOr:
-		if(ByteCodePtr[0] == cImmed)
-		{
-			x = ImmedPtr[0];
-			if(ByteCodePtr[-1] == cImmed)
-			{
-				y = ImmedPtr[-1];
-				FP_TRACE_BYTECODE_OPTIMIZATION(132,
-					"y x cOr",
-					"[truthValue(x)||truthValue(y)]",
-					"    with x = " << x
-					    << ", y = " << y
-					    << "\n");
-				/* ByteCodePtr[-1] = cImmed; */ // redundant, matches y @ 2
-				goto Lhp;
-			}
-		}
-		goto Default0;
-	TailCall_cPow:
-	case cPow:
-		if(ByteCodePtr[0] == cImmed)
-		{
-			x = ImmedPtr[0];
-			if(!isEvenInteger(x+x))
-			{
-				if(ByteCodePtr[-1] == cSqr)
-				{
-					FP_TRACE_BYTECODE_OPTIMIZATION(14,
-						"cSqr x[!isEvenInteger(x+x)] cPow",
-						"cAbs [x+x] cPow",
-						"    with x = " << x << "\n");
-					/* opcode = cPow; */ // redundant, matches cPow @ 0
-					goto Lia;
-				}
-			}
-			if(IsIntegerConst(x))
-			{
-				switch(ByteCodePtr[-1])
-				{
-				case cExp:
-					FP_TRACE_BYTECODE_OPTIMIZATION(35,
-						"cExp x[IsIntegerConst(x)] cPow",
-						"[x] cMul cExp",
-						"    with x = " << x << "\n");
-					/* ImmedPtr[0] = x; */ // redundant, matches x @ 1
-					goto Lib;
-				case cExp2:
-					FP_TRACE_BYTECODE_OPTIMIZATION(36,
-						"cExp2 x[IsIntegerConst(x)] cPow",
-						"[x] cMul cExp2",
-						"    with x = " << x << "\n");
-					/* ImmedPtr[0] = x; */ // redundant, matches x @ 1
-					goto Lic;
-				case cPow:
-					if(ByteCodePtr[-2] == cImmed)
-					{
-						y = ImmedPtr[-1];
-						if(!IsIntegerConst(y))
-						{
-							FP_TRACE_BYTECODE_OPTIMIZATION(34,
-								"y[!IsIntegerConst(y)] cPow x[IsIntegerConst(x)] cPow",
-								"[y*x] cPow",
-								"    with x = " << x
-								    << ", y = " << y
-								    << "\n");
-							/* ByteCodePtr[-2] = cImmed; */ // redundant, matches y @ 3
-							/* opcode = cPow; */ // redundant, matches cPow @ 0
-							goto Lid;
-						}
-					}
-					FP_TRACE_BYTECODE_OPTIMIZATION(37,
-						"cPow x[IsIntegerConst(x)] cPow",
-						"[x] cMul cPow",
-						"    with x = " << x << "\n");
-					/* ImmedPtr[0] = x; */ // redundant, matches x @ 1
-					/* opcode = cPow; */ // redundant, matches cPow @ 0
-					goto Lie;
-				}
-			}
-			if(isEvenInteger(x))
-			{
-				switch(ByteCodePtr[-1])
-				{
-				case cAbs:
-					FP_TRACE_BYTECODE_OPTIMIZATION(278,
-						"cAbs x[isEvenInteger(x)] cPow",
-						"[x] cPow",
-						"    with x = " << x << "\n");
-					/* ImmedPtr[0] = x; */ // redundant, matches x @ 1
-					/* opcode = cPow; */ // redundant, matches cPow @ 0
-					goto Lif;
-				case cMul:
-					if(ByteCodePtr[-2] == cAbs)
-					{
-						FP_TRACE_BYTECODE_OPTIMIZATION(279,
-							"cAbs cMul x[isEvenInteger(x)] cPow",
-							"cMul [x] cPow",
-							"    with x = " << x << "\n");
-						/* opcode = cPow; */ // redundant, matches cPow @ 0
-						goto Lig;
-					}
-					break;
-				}
-			}
-			
-      if(x==Value_t(0))
-			{
-				FP_TRACE_BYTECODE_OPTIMIZATION(123,
-					"x[x==Value_t(0)] cPow",
-					"[Value_t(0)] cMul [Value_t(1)] cAdd",
-					"    with x = " << x << "\n");
-				/* ByteCodePtr[0] = cImmed; */ // redundant, matches x @ 1
-				goto Lih;
-			}
-			if(x==Value_t(0.5))
-			{
-				FP_TRACE_BYTECODE_OPTIMIZATION(167,
-					"x[x==Value_t(0.5)] cPow",
-					"cSqrt",
-					"    with x = " << x << "\n");
-				goto Lii;
-			}
-			if(x==Value_t(1)/Value_t(3))
-			{
-				FP_TRACE_BYTECODE_OPTIMIZATION(168,
-					"x[x==Value_t(1)/Value_t(3)] cPow",
-					"cCbrt",
-					"    with x = " << x << "\n");
-				goto Lij;
-			}
-			if(x==Value_t(1)/Value_t(-3))
-			{
-				FP_TRACE_BYTECODE_OPTIMIZATION(169,
-					"x[x==Value_t(1)/Value_t(-3)] cPow",
-					"cCbrt cInv",
-					"    with x = " << x << "\n");
-				goto Lik;
-			}
-			if(x==Value_t(-0.5))
-			{
-				FP_TRACE_BYTECODE_OPTIMIZATION(170,
-					"x[x==Value_t(-0.5)] cPow",
-					"cRSqrt",
-					"    with x = " << x << "\n");
-				goto Lil;
-			}
-			if(x==Value_t(-1))
-			{
-				FP_TRACE_BYTECODE_OPTIMIZATION(171,
-					"x[x==Value_t(-1)] cPow",
-					"cInv",
-					"    with x = " << x << "\n");
-				goto Lim;
-			}
-			switch(ByteCodePtr[-1])
-			{
-			case cPow:
-				if(ByteCodePtr[-2] == cImmed)
-				{
-					y = ImmedPtr[-1];
-
-					if(isEvenInteger(y)&&!isEvenInteger(x*y))
-					{
-						FP_TRACE_BYTECODE_OPTIMIZATION(13,
-							"y[isEvenInteger(y)&&!isEvenInteger(x*y)] cPow x cPow",
-							"cAbs [y*x] cPow",
-							"    with x = " << x
-							    << ", y = " << y
-							    << "\n");
-						/* opcode = cPow; */ // redundant, matches cPow @ 0
-						goto Lin;
-					}
-
-					FP_TRACE_BYTECODE_OPTIMIZATION(165,
-						"y cPow x cPow",
-						"[y*x] cPow",
-						"    with x = " << x
-						    << ", y = " << y
-						    << "\n");
-					/* ByteCodePtr[-2] = cImmed; */ // redundant, matches y @ 3
-					/* opcode = cPow; */ // redundant, matches cPow @ 0
-					goto Lid;
-				}
-				break;
-			case cSqr:
-				FP_TRACE_BYTECODE_OPTIMIZATION(38,
-					"cSqr x cPow",
-					"[x+x] cPow",
-					"    with x = " << x << "\n");
-				/* opcode = cPow; */ // redundant, matches cPow @ 0
-				goto Lio;
-			case cImmed:
-				y = ImmedPtr[-1];
-				if(y!=Value_t(0)||x>=Value_t(0))
-				{
-					FP_TRACE_BYTECODE_OPTIMIZATION(84,
-						"y[y!=Value_t(0)||x>=Value_t(0)] x cPow",
-						"[fp_pow(y,x)]",
-						"    with x = " << x
-						    << ", y = " << y
-						    << "\n");
-					/* ByteCodePtr[-1] = cImmed; */ // redundant, matches y @ 2
-					goto Lip;
-				}
-				break;
-			}
-			FP_TRACE_BYTECODE_OPTIMIZATION(312,
-				"x cPow",
-				"[DO_POWI]",
-				"    with x = " << x << "\n");
-			if(TryCompilePowi(x))
-			  return;
-		}
-		goto Default0;
-	TailCall_cRad:
-	case cRad:
-		if(ByteCodePtr[0] == cImmed)
-		{
-			x = ImmedPtr[0];
-			FP_TRACE_BYTECODE_OPTIMIZATION(66,
-				"x cRad",
-				"[DegreesToRadians(x)]",
-				"    with x = " << x << "\n");
-			/* ByteCodePtr[0] = cImmed; */ // redundant, matches x @ 1
-			goto Lja;
-		}
-		goto Default0;
-	TailCall_cSin:
-	case cSin:
-		switch(ByteCodePtr[0])
-		{
-		case cNeg:
-			FP_TRACE_BYTECODE_OPTIMIZATION(285,"cNeg cSin", "cSin cNeg", "");
-			goto Ljb;
-		case cImmed:
-			x = ImmedPtr[0];
-			FP_TRACE_BYTECODE_OPTIMIZATION(58,
-				"x cSin",
-				"[fp_sin(x)]",
-				"    with x = " << x << "\n");
-			/* ByteCodePtr[0] = cImmed; */ // redundant, matches x @ 1
-			goto Ljc;
-		}
-		goto Default0;
-	TailCall_cSinh:
-	case cSinh:
-		switch(ByteCodePtr[0])
-		{
-		case cAcosh:
-			FP_TRACE_BYTECODE_OPTIMIZATION(294,"cAcosh cSinh", "[DO_STACKPLUS1] cSqr [Value_t(-1)] cAdd cSqrt", "");
-			incStackPtr();
-			--StackPtr;
-			goto Ljd;
-		case cAsinh:
-			FP_TRACE_BYTECODE_OPTIMIZATION(184,"cAsinh cSinh", "", "");
-			goto Lbf;
-		case cNeg:
-			FP_TRACE_BYTECODE_OPTIMIZATION(286,"cNeg cSinh", "cSinh cNeg", "");
-			goto Lje;
-		case cImmed:
-			x = ImmedPtr[0];
-			FP_TRACE_BYTECODE_OPTIMIZATION(59,
-				"x cSinh",
-				"[fp_sinh(x)]",
-				"    with x = " << x << "\n");
-			/* ByteCodePtr[0] = cImmed; */ // redundant, matches x @ 1
-			goto Ljf;
-		}
-		goto Default0;
-	TailCall_cSqr:
-	case cSqr:
-		switch(ByteCodePtr[0])
-		{
-		case cAbs:
-			FP_TRACE_BYTECODE_OPTIMIZATION(333,"cAbs cSqr", "cSqr", "");
-			/* opcode = cSqr; */ // redundant, matches cSqr @ 0
-			goto Ljg;
-		case cNeg:
-			FP_TRACE_BYTECODE_OPTIMIZATION(332,"cNeg cSqr", "cSqr", "");
-			/* opcode = cSqr; */ // redundant, matches cSqr @ 0
-			goto Ljg;
-		case cSqrt:
-			A = ByteCodePtr[-1];
-			if(IsNeverNegativeValueOpcode(A))
-			{
-				FP_TRACE_BYTECODE_OPTIMIZATION(173,
-					"A[IsNeverNegativeValueOpcode(A)] cSqrt cSqr",
-					"A",
-					"    with A = " << FP_TRACE_OPCODENAME(A) << "\n");
-				/* ByteCodePtr[-1] = A; */ // redundant, matches A @ 2
-				goto Lbf;
-			}
-			break;
-		}
-		goto Default0;
-	TailCall_cSqrt:
-	case cSqrt:
-		switch(ByteCodePtr[0])
-		{
-		case cSqr:
-			FP_TRACE_BYTECODE_OPTIMIZATION(15,"cSqr cSqrt", "cAbs", "");
-			goto Ljh;
-		case cImmed:
-			x = ImmedPtr[0];
-			if(x>=Value_t(0))
-			{
-				FP_TRACE_BYTECODE_OPTIMIZATION(60,
-					"x[x>=Value_t(0)] cSqrt",
-					"[fp_sqrt(x)]",
-					"    with x = " << x << "\n");
-				/* ByteCodePtr[0] = cImmed; */ // redundant, matches x @ 1
-				goto Lji;
-			}
-			break;
-		}
-		goto Default0;
-	TailCall_cSub:
-	case cSub:
-		switch(ByteCodePtr[0])
-		{
-		case cNeg:
-			FP_TRACE_BYTECODE_OPTIMIZATION(197,"cNeg cSub", "cAdd", "");
-			goto Ljj;
-		case cImmed:
-			x = ImmedPtr[0];
-			if(x==Value_t(0))
-			{
-				FP_TRACE_BYTECODE_OPTIMIZATION(77,
-					"x[x==Value_t(0)] cSub",
-					"",
-					"    with x = " << x << "\n");
-				goto Lai;
-			}
-			if(ByteCodePtr[-1] == cImmed)
-			{
-				y = ImmedPtr[-1];
-				FP_TRACE_BYTECODE_OPTIMIZATION(78,
-					"y x cSub",
-					"[y-x]",
-					"    with x = " << x
-					    << ", y = " << y
-					    << "\n");
-				/* ByteCodePtr[-1] = cImmed; */ // redundant, matches y @ 2
-				goto Ljk;
-			}
-			FP_TRACE_BYTECODE_OPTIMIZATION(160,
-				"x cSub",
-				"[-x] cAdd",
-				"    with x = " << x << "\n");
-			/* ByteCodePtr[0] = cImmed; */ // redundant, matches x @ 1
-			goto Ljl;
-		}
-		goto Default0;
-	TailCall_cTan:
-	case cTan:
-		switch(ByteCodePtr[0])
-		{
-		case cAtan2:
-			FP_TRACE_BYTECODE_OPTIMIZATION(188,"cAtan2 cTan", "cDiv", "");
-			goto Lfc;
-		case cNeg:
-			FP_TRACE_BYTECODE_OPTIMIZATION(287,"cNeg cTan", "cTan cNeg", "");
-			goto Ljm;
-		case cImmed:
-			x = ImmedPtr[0];
-			FP_TRACE_BYTECODE_OPTIMIZATION(62,
-				"x cTan",
-				"[fp_tan(x)]",
-				"    with x = " << x << "\n");
-			/* ByteCodePtr[0] = cImmed; */ // redundant, matches x @ 1
-			goto Ljn;
-		}
-		goto Default0;
-	TailCall_cTanh:
-	case cTanh:
-		switch(ByteCodePtr[0])
-		{
-		case cNeg:
-			FP_TRACE_BYTECODE_OPTIMIZATION(288,"cNeg cTanh", "cTanh cNeg", "");
-			goto Ljo;
-		case cImmed:
-			x = ImmedPtr[0];
-			FP_TRACE_BYTECODE_OPTIMIZATION(63,
-				"x cTanh",
-				"[fp_tanh(x)]",
-				"    with x = " << x << "\n");
-			/* ByteCodePtr[0] = cImmed; */ // redundant, matches x @ 1
-			goto Ljp;
-		}
-		goto Default0;
-	TailCall_cTrunc:
-	case cTrunc:
-		switch(ByteCodePtr[0])
-		{
-		case cImmed:
-			x = ImmedPtr[0];
-			FP_TRACE_BYTECODE_OPTIMIZATION(64,
-				"x cTrunc",
-				"[fp_trunc(x)]",
-				"    with x = " << x << "\n");
-			/* ByteCodePtr[0] = cImmed; */ // redundant, matches x @ 1
-			goto Lka;
-		default:
-			A = ByteCodePtr[0];
-			if(IsAlwaysIntegerOpcode(A))
-			{
-				FP_TRACE_BYTECODE_OPTIMIZATION(245,
-					"A[IsAlwaysIntegerOpcode(A)] cTrunc",
-					"A",
-					"    with A = " << FP_TRACE_OPCODENAME(A) << "\n");
-				/* ByteCodePtr[0] = A; */ // redundant, matches A @ 1
-				return;
-			}
-		}
-		goto Default0;
-	default: Default0:;
-		A = opcode;
-		if(IsComparisonOpcode(A))
-		{
-			if(ByteCodePtr[0] == cImmed)
-			{
-				x = ImmedPtr[0];
-				switch(ByteCodePtr[-1])
-				{
-				case cAdd:
-					if(ByteCodePtr[-2] == cImmed)
-					{
-						y = ImmedPtr[-1];
-						FP_TRACE_BYTECODE_OPTIMIZATION(213,
-							"y cAdd x A[IsComparisonOpcode(A)]",
-							"[x-y] A",
-							"    with A = " << FP_TRACE_OPCODENAME(A)
-							    << ", x = " << x
-							    << ", y = " << y
-							    << "\n");
-						/* ByteCodePtr[-2] = cImmed; */ // redundant, matches y @ 3
-						goto Lkb;
-					}
-					break;
-				case cAtan:
-					if(fp_abs(x)<const_pi<Value_t>()*Value_t(0.5))
-					{
-						FP_TRACE_BYTECODE_OPTIMIZATION(229,
-							"cAtan[fp_abs(x)<const_pi<Value_t>()*Value_t(0.5)] x A[IsComparisonOpcode(A)]",
-							"[fp_tan(x)] A",
-							"    with A = " << FP_TRACE_OPCODENAME(A)
-							    << ", x = " << x
-							    << "\n");
-						goto Lkc;
-					}
-					break;
-				case cExp:
-					if(x>Value_t(0))
-					{
-						FP_TRACE_BYTECODE_OPTIMIZATION(219,
-							"cExp[x>Value_t(0)] x A[IsComparisonOpcode(A)]",
-							"[fp_log(x)] A",
-							"    with A = " << FP_TRACE_OPCODENAME(A)
-							    << ", x = " << x
-							    << "\n");
-						goto Lkd;
-					}
-					break;
-				case cExp2:
-					if(x>Value_t(0))
-					{
-						FP_TRACE_BYTECODE_OPTIMIZATION(220,
-							"cExp2[x>Value_t(0)] x A[IsComparisonOpcode(A)]",
-							"[fp_log2(x)] A",
-							"    with A = " << FP_TRACE_OPCODENAME(A)
-							    << ", x = " << x
-							    << "\n");
-						goto Lke;
-					}
-					break;
-				case cLog:
-					B = ByteCodePtr[-2];
-					if(IsNeverNegativeValueOpcode(B))
-					{
-						FP_TRACE_BYTECODE_OPTIMIZATION(222,
-							"B[IsNeverNegativeValueOpcode(B)] cLog x A[IsComparisonOpcode(A)]",
-							"B [fp_exp(x)] A",
-							"    with A = " << FP_TRACE_OPCODENAME(A)
-							    << ", x = " << x
-							    << ", B = " << FP_TRACE_OPCODENAME(B)
-							    << "\n");
-						/* ByteCodePtr[-2] = B; */ // redundant, matches B @ 3
-						goto Lkf;
-					}
-					break;
-				case cLog10:
-					B = ByteCodePtr[-2];
-					if(IsNeverNegativeValueOpcode(B))
-					{
-						FP_TRACE_BYTECODE_OPTIMIZATION(224,
-							"B[IsNeverNegativeValueOpcode(B)] cLog10 x A[IsComparisonOpcode(A)]",
-							"B [fp_pow(Value_t(10),x)] A",
-							"    with A = " << FP_TRACE_OPCODENAME(A)
-							    << ", x = " << x
-							    << ", B = " << FP_TRACE_OPCODENAME(B)
-							    << "\n");
-						/* ByteCodePtr[-2] = B; */ // redundant, matches B @ 3
-						goto Lkg;
-					}
-					break;
-				case cLog2:
-					B = ByteCodePtr[-2];
-					if(IsNeverNegativeValueOpcode(B))
-					{
-						FP_TRACE_BYTECODE_OPTIMIZATION(223,
-							"B[IsNeverNegativeValueOpcode(B)] cLog2 x A[IsComparisonOpcode(A)]",
-							"B [fp_exp2(x)] A",
-							"    with A = " << FP_TRACE_OPCODENAME(A)
-							    << ", x = " << x
-							    << ", B = " << FP_TRACE_OPCODENAME(B)
-							    << "\n");
-						/* ByteCodePtr[-2] = B; */ // redundant, matches B @ 3
-						goto Lkh;
-					}
-					break;
-				case cMul:
-					if(ByteCodePtr[-2] == cImmed)
-					{
-						y = ImmedPtr[-1];
-						if(y>Value_t(0))
-						{
-							FP_TRACE_BYTECODE_OPTIMIZATION(215,
-								"y[y>Value_t(0)] cMul x A[IsComparisonOpcode(A)]",
-								"[x/y] A",
-								"    with A = " << FP_TRACE_OPCODENAME(A)
-								    << ", x = " << x
-								    << ", y = " << y
-								    << "\n");
-							/* ByteCodePtr[-2] = cImmed; */ // redundant, matches y @ 3
-							goto Lki;
-						}
-						if(y<Value_t(0))
-						{
-							FP_TRACE_BYTECODE_OPTIMIZATION(216,
-								"y[y<Value_t(0)] cMul x A[IsComparisonOpcode(A)]",
-								"[x/y] {OppositeComparisonOpcode(A)}",
-								"    with A = " << FP_TRACE_OPCODENAME(A)
-								    << ", x = " << x
-								    << ", y = " << y
-								    << "\n");
-							/* ByteCodePtr[-2] = cImmed; */ // redundant, matches y @ 3
-							goto Lkj;
-						}
-					}
-					break;
-				case cNeg:
-					FP_TRACE_BYTECODE_OPTIMIZATION(214,
-						"cNeg x A[IsComparisonOpcode(A)]",
-						"[-x] {OppositeComparisonOpcode(A)}",
-						"    with A = " << FP_TRACE_OPCODENAME(A)
-						    << ", x = " << x
-						    << "\n");
-					goto Lkk;
-				case cPow:
-					if(x>Value_t(0))
-					{
-						if(ByteCodePtr[-2] == cImmed)
-						{
-							y = ImmedPtr[-1];
-							if(y>Value_t(0))
-							{
-								FP_TRACE_BYTECODE_OPTIMIZATION(217,
-									"y[y>Value_t(0)] cPow[x>Value_t(0)] x A[IsComparisonOpcode(A)]",
-									"[fp_pow(x,1/y)] A",
-									"    with A = " << FP_TRACE_OPCODENAME(A)
-									    << ", x = " << x
-									    << ", y = " << y
-									    << "\n");
-								/* ByteCodePtr[-2] = cImmed; */ // redundant, matches y @ 3
-								goto Lkl;
-							}
-						}
-					}
-					break;
-				case cSinh:
-					FP_TRACE_BYTECODE_OPTIMIZATION(230,
-						"cSinh x A[IsComparisonOpcode(A)]",
-						"[fp_asinh(x)] A",
-						"    with A = " << FP_TRACE_OPCODENAME(A)
-						    << ", x = " << x
-						    << "\n");
-					goto Lkm;
-				case cSqr:
-					if(x>Value_t(0))
-					{
-						FP_TRACE_BYTECODE_OPTIMIZATION(218,
-							"cSqr[x>Value_t(0)] x A[IsComparisonOpcode(A)]",
-							"cAbs [fp_sqrt(x)] A",
-							"    with A = " << FP_TRACE_OPCODENAME(A)
-							    << ", x = " << x
-							    << "\n");
-						goto Lkn;
-					}
-					break;
-				case cTanh:
-					if(fp_abs(x)<Value_t(1))
-					{
-						FP_TRACE_BYTECODE_OPTIMIZATION(231,
-							"cTanh[fp_abs(x)<Value_t(1)] x A[IsComparisonOpcode(A)]",
-							"[fp_atanh(x)] A",
-							"    with A = " << FP_TRACE_OPCODENAME(A)
-							    << ", x = " << x
-							    << "\n");
-						goto Lko;
-					}
-					break;
-				}
-			}
-		}
-		if(A>=VarBegin)
-		{
-			B = ByteCodePtr[0];
-			if(B==A)
-			{
-				FP_TRACE_BYTECODE_OPTIMIZATION(335,
-					"B[B==A] A[A>=VarBegin]",
-					"B cDup",
-					"    with A = " << FP_TRACE_OPCODENAME(A)
-					    << ", B = " << FP_TRACE_OPCODENAME(B)
-					    << "\n");
-				/* ByteCodePtr[0] = B; */ // redundant, matches B @ 1
-				goto Lkp;
-			}
-		}
-		if(IsUnaryOpcode(A))
-		{
-			B = ByteCodePtr[0];
-			if(B>=VarBegin)
-			{
-				C = ByteCodePtr[-1];
-				if(C==A)
-				{
-					D = ByteCodePtr[-2];
-					if(D==B)
-					{
-						FP_TRACE_BYTECODE_OPTIMIZATION(336,
-							"D[D==B] C[C==A] B[B>=VarBegin] A[IsUnaryOpcode(A)]",
-							"D C cDup",
-							"    with A = " << FP_TRACE_OPCODENAME(A)
-							    << ", B = " << FP_TRACE_OPCODENAME(B)
-							    << ", C = " << FP_TRACE_OPCODENAME(C)
-							    << ", D = " << FP_TRACE_OPCODENAME(D)
-							    << "\n");
-						/* ByteCodePtr[-2] = D; */ // redundant, matches D @ 3
-						/* ByteCodePtr[-1] = C; */ // redundant, matches C @ 2
-						goto Lla;
-					}
-				}
-			}
-		}
-	}
-	goto Llb;
-Laa: ByteCodePtr -= 1;
-     data->ByteCode.pop_back();
-Llc: goto TailCall_cAbs;
-Lab: ImmedPtr[0] = fp_abs(x); return;
-Lac: ImmedPtr[0] = fp_acos(x); return;
-Lad: ImmedPtr[0] = fp_acosh(x); return;
-Lae: data->Immed.push_back(Value_t(4));
-     ByteCodePtr[-2] = cImmed;
-     ByteCodePtr -= 2;
-Lld: data->ByteCode.pop_back();
-     data->ByteCode.pop_back();
-Lle: opcode = cMul;
-Llf: FP_ReDefinePointers();
-Llg: goto TailCall_cMul;
-Laf: ByteCodePtr -= 1;
-     data->ByteCode.pop_back();
-     opcode = cSub;
-     goto TailCall_cSub;
-Lag: ImmedPtr[-1] = y+x;
-     data->Immed.pop_back();
-     data->ByteCode.pop_back();
-     data->ByteCode.pop_back();
-Llh: FP_ReDefinePointers();
-Lli: goto TailCall_cAdd;
-Lah: ImmedPtr[-1] = y+x;
-Lai: data->Immed.pop_back();
-Lbf: data->ByteCode.pop_back(); return;
-Laj: ImmedPtr[-1] = truthValue(x)&&truthValue(y); goto Lai;
-Lak: ImmedPtr[0] = fp_asin(x); return;
-Lal: ImmedPtr[0] = fp_asinh(x); return;
-Lam: ImmedPtr[0] = fp_atan(x); return;
-Lan: ImmedPtr[-1] = fp_atan2(y,x); goto Lai;
-Lao: ImmedPtr[0] = fp_atanh(x); return;
-Lap: ImmedPtr[0] = fp_cbrt(x); return;
-Lba: data->ByteCode.pop_back();
-     AddFunctionOpcode(cFloor);
-Llj: opcode = cNeg;
-     FP_ReDefinePointers();
-     goto TailCall_cNeg;
-Lbb: ImmedPtr[0] = fp_ceil(x); return;
-Lbc: ByteCodePtr -= 1;
-     data->ByteCode.pop_back();
-Llk: goto TailCall_cCos;
-Lbd: ImmedPtr[0] = fp_cos(x); return;
-Lbe: ByteCodePtr -= 1;
-     data->ByteCode.pop_back();
-     goto TailCall_cCosh;
-Lbg: data->ByteCode.pop_back();
-     AddFunctionOpcode(cSqr);
-     data->Immed.push_back(Value_t(1));
-Lll: data->ByteCode.push_back(cImmed);
-     AddFunctionOpcode(cAdd);
-Llm: opcode = cSqrt;
-     FP_ReDefinePointers();
-     goto TailCall_cSqrt;
-Lbh: ImmedPtr[0] = fp_cosh(x); return;
-Lbi: ImmedPtr[0] = RadiansToDegrees(x); return;
-Lbj: data->ByteCode.pop_back();
-     AddFunctionOpcode(cSec); goto Lle;
-Lbk: data->ByteCode.pop_back();
-     AddFunctionOpcode(cTan); goto Lle;
-Lbl: data->ByteCode.pop_back();
-     AddFunctionOpcode(cSin); goto Lle;
-Lbm: data->Immed.push_back(Value_t(0));
-     ByteCodePtr[0] = cImmed;
-Lln: AddFunctionOpcode(cMul);
-     data->Immed.push_back(Value_t(1));
-Llo: data->ByteCode.push_back(cImmed);
-Llp: opcode = cAdd; goto Llh;
-Lbn: data->ByteCode.pop_back();
-     AddFunctionOpcode(cNeg);
-     AddFunctionOpcode(cExp); goto Lle;
-Lbo: data->ByteCode.pop_back();
-     AddFunctionOpcode(cNeg);
-     AddFunctionOpcode(cExp2); goto Lle;
-Lbp: ByteCodePtr -= 1;
-     data->ByteCode.pop_back();
-Lma: opcode = cMul; goto Llg;
-Lca: data->ByteCode.pop_back();
-     AddFunctionOpcode(cNeg);
-     AddFunctionOpcode(cPow); goto Lle;
-Lcb: data->ByteCode.pop_back();
-     AddFunctionOpcode(cCos); goto Lle;
-Lcc: data->ByteCode.pop_back();
-     AddFunctionOpcode(cCsc); goto Lle;
-Lcd: data->ByteCode.pop_back();
-     AddFunctionOpcode(cCot); goto Lle;
-Lce: data->Immed.pop_back();
-     data->Immed.pop_back();
-     data->ByteCode.pop_back();
-     data->ByteCode.pop_back();
-Lmb: data->ByteCode.pop_back();
-     opcode = cDeg;
-     FP_ReDefinePointers();
-     goto TailCall_cDeg;
-Lcf: data->Immed.pop_back();
-     data->Immed.pop_back();
-     data->ByteCode.pop_back();
-     data->ByteCode.pop_back();
-Lmc: data->ByteCode.pop_back();
-     opcode = cRad;
-     FP_ReDefinePointers();
-     goto TailCall_cRad;
-Lcg: ImmedPtr[-1] = y/x;
-     data->Immed.pop_back(); goto Lld;
-Lch: ImmedPtr[0] = -x;
-     ByteCodePtr[-1] = cImmed;
-     ByteCodePtr -= 1;
-     data->ByteCode.pop_back();
-Lmd: goto TailCall_cDiv;
-Lci: ImmedPtr[-1] = y/x; goto Lai;
-Lcj: ImmedPtr[0] = Value_t(1)/x; goto Lma;
-Lck: ByteCodePtr[-1] = cImmed;
-     ByteCodePtr -= 1;
-     data->ByteCode.pop_back();
-Lme: goto TailCall_cEqual;
-Lcl: ImmedPtr[-1] = fp_equal(y,x); goto Lai;
-Lcm: data->Immed.pop_back();
-     data->ByteCode.pop_back();
-     data->ByteCode.pop_back();
-     AddFunctionOpcode(cExp);
-     data->Immed.push_back(fp_exp(x));
-Lmf: data->ByteCode.push_back(cImmed); goto Lle;
-Lcn: ImmedPtr[0] = fp_exp(x); return;
-Lco: data->Immed.pop_back();
-     data->ByteCode.pop_back();
-     data->ByteCode.pop_back();
-     AddFunctionOpcode(cExp2);
-     data->Immed.push_back(fp_exp2(x)); goto Lmf;
-Lcp: ImmedPtr[0] = fp_exp2(x); return;
-Lda: data->Immed.push_back(fp_log(Value_t(2)));
-     data->ByteCode.push_back(cImmed);
-Lmg: AddFunctionOpcode(cMul);
-     opcode = cExp;
-     FP_ReDefinePointers();
-     goto TailCall_cExp;
-Ldb: data->ByteCode.pop_back();
-     AddFunctionOpcode(cCeil); goto Llj;
-Ldc: ImmedPtr[0] = fp_floor(x); return;
-Ldd: ImmedPtr[-1] = fp_less(x,y); goto Lai;
-Lde: ImmedPtr[0] = Value_t(0.5)/x;
-     ByteCodePtr[-1] = cImmed;
-     data->ByteCode.pop_back();
-     AddFunctionOpcode(cMul);
-Lmh: AddFunctionOpcode(cNotNot); return;
-Ldf: ImmedPtr[-1] = fp_lessOrEq(x,y); goto Lai;
-Ldg: ImmedPtr[0] = fp_int(x); return;
-Ldh: data->ByteCode.pop_back();
-     AddFunctionOpcode(cSec); return;
-Ldi: ByteCodePtr -= 1;
-     data->ByteCode.pop_back();
-     opcode = cTan;
-Lmi: goto TailCall_cTan;
-Ldj: ByteCodePtr -= 1;
-     data->ByteCode.pop_back();
-     opcode = cSin;
-Lmj: goto TailCall_cSin;
-Ldk: data->ByteCode.pop_back();
-     AddFunctionOpcode(cNeg);
-     opcode = cPow;
-Lmk: FP_ReDefinePointers();
-Lml: goto TailCall_cPow;
-Ldl: ByteCodePtr -= 1;
-     data->ByteCode.pop_back();
-     opcode = cCos; goto Llk;
-Ldm: data->ByteCode.pop_back();
-     AddFunctionOpcode(cCsc); return;
-Ldn: data->ByteCode.pop_back();
-     AddFunctionOpcode(cRSqrt); return;
-Ldo: data->ByteCode.pop_back();
-     AddFunctionOpcode(cCot); return;
-Ldp: ImmedPtr[0] = Value_t(1)/x; return;
-Lea: ImmedPtr[0] = Value_t(0.5)/x;
-     ByteCodePtr[-1] = cImmed;
-     data->ByteCode.pop_back();
-     AddFunctionOpcode(cMul);
-     opcode = cNot;
-     FP_ReDefinePointers();
-Lmm: goto TailCall_cNot;
-Leb: ImmedPtr[-1] = fp_less(y,x); goto Lai;
-Lec: ImmedPtr[-1] = fp_lessOrEq(y,x); goto Lai;
-Led: data->Immed.pop_back();
-     data->ByteCode.pop_back();
-     data->ByteCode.pop_back();
-     AddFunctionOpcode(cLog);
-     data->Immed.push_back(fp_log(x)); goto Llo;
-Lee: data->ByteCode.pop_back();
-     AddFunctionOpcode(cAbs);
-     AddFunctionOpcode(cLog);
-Lmn: data->ByteCode.push_back(cDup); goto Llp;
-Lef: ImmedPtr[0] = fp_log(x); return;
-Leg: data->Immed.push_back(fp_log10(const_e<Value_t>()));
-Lmo: ByteCodePtr[0] = cImmed; goto Lle;
-Leh: data->Immed.pop_back();
-     data->ByteCode.pop_back();
-     data->ByteCode.pop_back();
-     AddFunctionOpcode(cLog10);
-     data->Immed.push_back(fp_log10(x)); goto Llo;
-Lei: data->ByteCode.pop_back();
-     AddFunctionOpcode(cAbs);
-     AddFunctionOpcode(cLog10); goto Lmn;
-Lej: ImmedPtr[0] = fp_log10(x); return;
-Lek: data->Immed.push_back(fp_log2(const_e<Value_t>())); goto Lmo;
-Lel: data->Immed.pop_back();
-     data->ByteCode.pop_back();
-     data->ByteCode.pop_back();
-     AddFunctionOpcode(cLog2);
-     data->Immed.push_back(fp_log2(x)); goto Llo;
-Lem: data->ByteCode.pop_back();
-     AddFunctionOpcode(cAbs);
-     AddFunctionOpcode(cLog2); goto Lmn;
-Len: ImmedPtr[0] = fp_log2(x); return;
-Leo: ImmedPtr[-1] = Max(x,y); goto Lai;
-Lep: ImmedPtr[-1] = Min(x,y); goto Lai;
-Lfa: ImmedPtr[-1] = fp_mod(y,x); goto Lai;
-Lfb: ByteCodePtr -= 1;
-     data->ByteCode.pop_back();
-     opcode = cSqr;
-Lmp: goto TailCall_cSqr;
-Lfc: ByteCodePtr -= 1;
-     data->ByteCode.pop_back();
-     opcode = cDiv; goto Lmd;
-Lfd: data->ByteCode.pop_back();
-     data->ByteCode.pop_back();
-     data->ByteCode.pop_back();
-     AddFunctionOpcode(cSqr);
-     AddFunctionOpcode(cMul); goto Llj;
-Lfe: data->ByteCode.pop_back();
-     data->ByteCode.pop_back();
-     AddFunctionOpcode(cSqr); goto Llj;
-Lff: ByteCodePtr[-2] = cImmed;
-     ByteCodePtr -= 2;
-     data->ByteCode.pop_back();
-Lna: data->ByteCode.pop_back(); goto Llg;
-Lfg: ImmedPtr[-1] = x;
-Lnb: data->Immed.pop_back();
-     data->ByteCode.pop_back();
-     data->ByteCode.pop_back(); goto Llf;
-Lfh: data->Immed.pop_back();
-Lfi: data->Immed.pop_back();
-     data->ByteCode.pop_back();
-Lnc: data->ByteCode.pop_back();
-     data->ByteCode.pop_back();
-     data->ByteCode.pop_back();
-Lnd: AddFunctionOpcode(A);
-     data->Immed.push_back(x);
-     data->ByteCode.push_back(cImmed); goto Llf;
-Lfj: data->Immed.pop_back();
-     data->ByteCode.pop_back();
-     data->ByteCode.pop_back();
-     data->ByteCode.pop_back();
-     data->ByteCode.pop_back();
-     AddFunctionOpcode(B); goto Lnd;
-Lfk: data->Immed.pop_back(); goto Lnc;
-Lfl: ByteCodePtr[-1] = cImmed; goto Lbf;
-Lfm: ByteCodePtr[-1] = cImmed;
-     ByteCodePtr -= 1; goto Lna;
-Lfn: data->Immed.pop_back();
-     data->ByteCode.pop_back();
-     data->ByteCode.pop_back(); goto Lbf;
-Lfo: ImmedPtr[0] = x+x; goto Lff;
-Lfp: ImmedPtr[0] = RadiansToDegrees(x); goto Lfm;
-Lga: data->Immed.pop_back(); goto Lfn;
-Lgb: ImmedPtr[-1] = y*x; goto Lnb;
-Lgc: ImmedPtr[0] = -x; goto Lfm;
-Lgd: ImmedPtr[0] = DegreesToRadians(x); goto Lfm;
-Lge: ImmedPtr[-1] = y*x; goto Lai;
-Lgf: ByteCodePtr[0] = cDup;
-     ImmedPtr -= 1;
-     data->Immed.pop_back();
-Lne: opcode = cAdd; goto Lli;
-Lgg: data->Immed.pop_back(); goto Lmb;
-Lgh: data->Immed.pop_back(); goto Lmc;
-Lgi: data->Immed.pop_back();
-     data->ByteCode.pop_back(); goto Llj;
-Lgj: data->ByteCode.pop_back();
-     data->ByteCode.pop_back();
-     AddFunctionOpcode(cSqr); goto Llf;
-Lgk: data->ByteCode.pop_back(); goto Lgj;
-Lgl: ByteCodePtr[-1] = cImmed;
-     ByteCodePtr -= 1;
-     data->ByteCode.pop_back();
-Lnf: goto TailCall_cNEqual;
-Lgm: ImmedPtr[-1] = fp_nequal(y,x); goto Lai;
-Lgn: ImmedPtr[0] = -x; goto Lbp;
-Lgo: ImmedPtr[0] = -x;
-     data->ByteCode.pop_back();
-     data->ByteCode.pop_back();
-     AddFunctionOpcode(cMul);
-     opcode = cSin;
-     FP_ReDefinePointers(); goto Lmj;
-Lgp: ImmedPtr[0] = -x;
-     data->ByteCode.pop_back();
-     data->ByteCode.pop_back();
-     AddFunctionOpcode(cMul);
-     opcode = cSinh;
-     FP_ReDefinePointers();
-     goto TailCall_cSinh;
-Lha: ImmedPtr[0] = -x;
-     data->ByteCode.pop_back();
-     data->ByteCode.pop_back();
-     AddFunctionOpcode(cMul);
-     opcode = cTan;
-     FP_ReDefinePointers(); goto Lmi;
-Lhb: ImmedPtr[0] = -x;
-     data->ByteCode.pop_back();
-     data->ByteCode.pop_back();
-     AddFunctionOpcode(cMul);
-     opcode = cTanh;
-     FP_ReDefinePointers();
-     goto TailCall_cTanh;
-Lhc: ImmedPtr[0] = -x; return;
-Lhd: ByteCodePtr -= 1;
-     data->ByteCode.pop_back(); goto Lmm;
-Lhe: data->ByteCode.pop_back();
-     AddFunctionOpcode(cAbsNotNot); return;
-Lhf: data->ByteCode.pop_back();
-Lho: AddFunctionOpcode(cAbsNot); return;
-Lhg: ByteCodePtr -= 1;
-     data->ByteCode.pop_back();
-     opcode = cNEqual; goto Lnf;
-Lhh: ByteCodePtr -= 1;
-     data->ByteCode.pop_back();
-     opcode = cLessOrEq;
-     goto TailCall_cLessOrEq;
-Lhi: ByteCodePtr -= 1;
-     data->ByteCode.pop_back();
-     opcode = cLess;
-     goto TailCall_cLess;
-Lhj: ByteCodePtr -= 1;
-     data->ByteCode.pop_back();
-     opcode = cGreaterOrEq;
-     goto TailCall_cGreaterOrEq;
-Lhk: ByteCodePtr -= 1;
-     data->ByteCode.pop_back();
-     opcode = cGreater;
-     goto TailCall_cGreater;
-Lhl: ByteCodePtr -= 1;
-     data->ByteCode.pop_back();
-     opcode = cEqual; goto Lme;
-Lhm: data->ByteCode.pop_back(); goto Lmh;
-Lhn: ImmedPtr[0] = !truthValue(x); return;
-Lhp: ImmedPtr[-1] = truthValue(x)||truthValue(y); goto Lai;
-Lia: data->Immed.pop_back();
-     data->ByteCode.pop_back();
-     data->ByteCode.pop_back();
-     AddFunctionOpcode(cAbs);
-     data->Immed.push_back(x+x);
-Lng: data->ByteCode.push_back(cImmed); goto Lmk;
-Lib: ByteCodePtr[-1] = cImmed;
-     data->ByteCode.pop_back(); goto Lmg;
-Lic: ByteCodePtr[-1] = cImmed;
-     data->ByteCode.pop_back();
-     AddFunctionOpcode(cMul);
-     opcode = cExp2;
-     FP_ReDefinePointers();
-     goto TailCall_cExp2;
-Lid: ImmedPtr[-1] = y*x;
-     data->Immed.pop_back();
-     data->ByteCode.pop_back();
-     data->ByteCode.pop_back(); goto Lmk;
-Lie: ByteCodePtr[-1] = cImmed;
-     data->ByteCode.pop_back();
-     AddFunctionOpcode(cMul); goto Lmk;
-Lif: ByteCodePtr[-1] = cImmed;
-     ByteCodePtr -= 1;
-     data->ByteCode.pop_back(); goto Lml;
-Lig: data->Immed.pop_back();
-     data->ByteCode.pop_back();
-     data->ByteCode.pop_back();
-     data->ByteCode.pop_back();
-     AddFunctionOpcode(cMul);
-     data->Immed.push_back(x); goto Lng;
-Lih: ImmedPtr[0] = Value_t(0); goto Lln;
-Lii: data->Immed.pop_back();
-     data->ByteCode.pop_back(); goto Llm;
-Lij: data->Immed.pop_back();
-     data->ByteCode.pop_back();
-     opcode = cCbrt;
-     FP_ReDefinePointers();
-     goto TailCall_cCbrt;
-Lik: data->Immed.pop_back();
-     data->ByteCode.pop_back();
-     AddFunctionOpcode(cCbrt);
-Lnh: opcode = cInv;
-     FP_ReDefinePointers();
-     goto TailCall_cInv;
-Lil: data->Immed.pop_back(); goto Ldn;
-Lim: data->Immed.pop_back();
-     data->ByteCode.pop_back(); goto Lnh;
-Lin: data->Immed.pop_back();
-     data->Immed.pop_back();
-     data->ByteCode.pop_back();
-     data->ByteCode.pop_back();
-     data->ByteCode.pop_back();
-     AddFunctionOpcode(cAbs);
-     data->Immed.push_back(y*x); goto Lng;
-Lio: ImmedPtr[0] = x+x; goto Lif;
-Lip: ImmedPtr[-1] = fp_pow(y,x); goto Lai;
-Lja: ImmedPtr[0] = DegreesToRadians(x); return;
-Ljb: data->ByteCode.pop_back();
-     AddFunctionOpcode(cSin); goto Llj;
-Ljc: ImmedPtr[0] = fp_sin(x); return;
-Ljd: data->ByteCode.pop_back();
-     AddFunctionOpcode(cSqr);
-     data->Immed.push_back(Value_t(-1)); goto Lll;
-Lje: data->ByteCode.pop_back();
-     AddFunctionOpcode(cSinh); goto Llj;
-Ljf: ImmedPtr[0] = fp_sinh(x); return;
-Ljg: ByteCodePtr -= 1;
-     data->ByteCode.pop_back(); goto Lmp;
-Ljh: ByteCodePtr -= 1;
-     data->ByteCode.pop_back();
-     opcode = cAbs; goto Llc;
-Lji: ImmedPtr[0] = fp_sqrt(x); return;
-Ljj: ByteCodePtr -= 1;
-     data->ByteCode.pop_back(); goto Lne;
-Ljk: ImmedPtr[-1] = y-x; goto Lai;
-Ljl: ImmedPtr[0] = -x; goto Lne;
-Ljm: data->ByteCode.pop_back();
-     AddFunctionOpcode(cTan); goto Llj;
-Ljn: ImmedPtr[0] = fp_tan(x); return;
-Ljo: data->ByteCode.pop_back();
-     AddFunctionOpcode(cTanh); goto Llj;
-Ljp: ImmedPtr[0] = fp_tanh(x); return;
-Lka: ImmedPtr[0] = fp_trunc(x); return;
-Lkb: ImmedPtr[-1] = x-y;
-Lni: data->Immed.pop_back();
-     data->ByteCode.pop_back();
-Lnj: data->ByteCode.pop_back();
-Lnk: AddFunctionOpcode(A); return;
-Lkc: ImmedPtr[0] = fp_tan(x);
-Lnl: ByteCodePtr[-1] = cImmed; goto Lnj;
-Lkd: ImmedPtr[0] = fp_log(x); goto Lnl;
-Lke: ImmedPtr[0] = fp_log2(x); goto Lnl;
-Lkf: ImmedPtr[0] = fp_exp(x); goto Lnl;
-Lkg: ImmedPtr[0] = fp_pow(Value_t(10),x); goto Lnl;
-Lkh: ImmedPtr[0] = fp_exp2(x); goto Lnl;
-Lki: ImmedPtr[-1] = x/y; goto Lni;
-Lkj: ImmedPtr[-1] = x/y;
-     data->Immed.pop_back();
-     data->ByteCode.pop_back();
-Lnm: data->ByteCode.pop_back();
-     AddFunctionOpcode(OppositeComparisonOpcode(A)); return;
-Lkk: ImmedPtr[0] = -x;
-     ByteCodePtr[-1] = cImmed; goto Lnm;
-Lkl: ImmedPtr[-1] = fp_pow(x,1/y); goto Lni;
-Lkm: ImmedPtr[0] = fp_asinh(x); goto Lnl;
-Lkn: data->Immed.pop_back();
-     data->ByteCode.pop_back();
-     data->ByteCode.pop_back();
-     AddFunctionOpcode(cAbs);
-     data->Immed.push_back(fp_sqrt(x));
-     data->ByteCode.push_back(cImmed); goto Lnk;
-Lko: ImmedPtr[0] = fp_atanh(x); goto Lnl;
-Lkp: data->ByteCode.push_back(cDup); return;
-Lla: ByteCodePtr[0] = cDup; return;
-Llb: data->ByteCode.push_back(opcode); return;
-return;
-// This list of dummy gotos is here to inhibit
-// compiler warnings on unused labels
-goto TailCall_cAcos;goto TailCall_cAcosh;goto TailCall_cAnd;
-goto TailCall_cAsin;goto TailCall_cAsinh;goto TailCall_cAtan;
-goto TailCall_cAtan2;goto TailCall_cAtanh;goto TailCall_cCeil;
-goto TailCall_cFloor;goto TailCall_cInt;goto TailCall_cLog;
-goto TailCall_cLog10;goto TailCall_cLog2;goto TailCall_cMax;
-goto TailCall_cMin;goto TailCall_cMod;goto TailCall_cOr;
-goto TailCall_cRad;goto TailCall_cSin;goto TailCall_cSinh;
-goto TailCall_cSqrt;goto TailCall_cSub;goto TailCall_cTan;
-goto TailCall_cTanh;goto TailCall_cTrunc;
-#endif
-
-#undef FP_ReDefinePointers
-#undef FP_TRACE_BYTECODE_OPTIMIZATION
-#undef FP_TRACE_OPCODENAME
diff --git a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/fparser.cpp b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/fparser.cpp
deleted file mode 100644
index 1c2df00a42..0000000000
--- a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/fparser.cpp
+++ /dev/null
@@ -1,3070 +0,0 @@
-/***************************************************************************\
-|* Function Parser for C++ v4.0.3                                          *|
-|*-------------------------------------------------------------------------*|
-|* Copyright: Juha Nieminen, Joel Yliluoma                                 *|
-\***************************************************************************/
-
-#pragma implementation
-
-#include "fpconfig.h"
-#include "fparser.h"
-
-#include <set>
-#include <cstdlib>
-#include <cstring>
-#include <cctype>
-#include <cmath>
-#include <cassert>
-using namespace std;
-
-#include "fptypes.h"
-using namespace FUNCTIONPARSERTYPES;
-
-#ifdef FP_USE_THREAD_SAFE_EVAL_WITH_ALLOCA
-#ifndef FP_USE_THREAD_SAFE_EVAL
-#define FP_USE_THREAD_SAFE_EVAL
-#endif
-#endif
-
-#ifdef __GNUC__
-# define likely(x)       __builtin_expect(!!(x), 1)
-# define unlikely(x)     __builtin_expect(!!(x), 0)
-#else
-# define likely(x)   (x)
-# define unlikely(x) (x)
-#endif
-
-//=========================================================================
-// Name handling functions
-//=========================================================================
-namespace
-{
-    template<typename Value_t>
-    inline Value_t const_pi()
-    {
-        return Value_t(3.1415926535897932384626433832795L);
-    }
-
-#ifdef FP_SUPPORT_MPFR_FLOAT_TYPE
-    template<>
-    inline MpfrFloat const_pi<MpfrFloat>() { return MpfrFloat::const_pi(); }
-#endif
-
-    template<typename Value_t>
-    inline Value_t const_e()
-    {
-        return Value_t(2.7182818284590452353602874713526624977572L);
-    }
-
-#ifdef FP_SUPPORT_MPFR_FLOAT_TYPE
-    template<>
-    inline MpfrFloat const_e<MpfrFloat>() { return MpfrFloat::const_e(); }
-#endif
-
-
-    template<typename Value_t>
-    bool addNewNameData(namePtrsType<Value_t>& namePtrs,
-                        std::pair<NamePtr, NameData<Value_t> >& newName,
-                        bool isVar)
-    {
-        typename namePtrsType<Value_t>::iterator nameIter =
-            namePtrs.lower_bound(newName.first);
-
-        if(nameIter != namePtrs.end() && newName.first == nameIter->first)
-        {
-            // redefining a var is not allowed.
-            if(isVar)
-                return false;
-
-            // redefining other tokens is allowed, if the type stays the same.
-            if(nameIter->second.type != newName.second.type)
-                return false;
-
-            // update the data
-            nameIter->second = newName.second;
-            return true;
-        }
-
-        if(!isVar)
-        {
-            // Allocate a copy of the name (pointer stored in the map key)
-            // However, for VARIABLEs, the pointer points to VariableString,
-            // which is managed separately. Thusly, only done when !IsVar.
-            char* namebuf = new char[newName.first.nameLength];
-            memcpy(namebuf, newName.first.name, newName.first.nameLength);
-            newName.first.name = namebuf;
-        }
-
-        namePtrs.insert(nameIter, newName);
-        return true;
-    }
-
-    template<typename Value_t>
-    std::string findName(const namePtrsType<Value_t>& nameMap,
-                         unsigned index,
-                         typename NameData<Value_t>::DataType type)
-    {
-        for(typename namePtrsType<Value_t>::const_iterator
-                iter = nameMap.begin();
-            iter != nameMap.end();
-            ++iter)
-        {
-            if(iter->second.type != type) continue;
-            if(iter->second.index == index)
-                return std::string(iter->first.name,
-                                   iter->first.name + iter->first.nameLength);
-        }
-        return "?";
-    }
-
-    unsigned readOpcodeForFloatType(const char* input)
-    {
-    /*
-     Return value if built-in function:
-              16 lowest bits = function name length
-              15 next bits   = function opcode
-              1 bit (&0x80000000U) = indicates function
-     Return value if not built-in function:
-              31 lowest bits = function name length
-              other bits zero
-    */
-#include "fp_identifier_parser.inc"
-        return 0;
-    }
-
-    inline unsigned readOpcodeForIntType(const char* input)
-    {
-        const unsigned value = readOpcodeForFloatType(input);
-        if((value & 0x80000000U) != 0 &&
-           !Functions[(value >> 16) & 0x7FFF].okForInt())
-            return value & 0xFFFF;
-        return value;
-    }
-
-    template<typename value_t>
-    struct IsIntType
-    {
-        enum { result = false };
-    };
-#ifdef FP_SUPPORT_LONG_INT_TYPE
-    template<>
-    struct IsIntType<long>
-    {
-        enum { result = true };
-    };
-#endif
-#ifdef FP_SUPPORT_GMP_INT_TYPE
-    template<>
-    struct IsIntType<GmpInt>
-    {
-        enum { result = true };
-    };
-#endif
-
-    template<typename Value_t>
-    inline unsigned readOpcode(const char* input)
-    {
-        return IsIntType<Value_t>::result
-                ? readOpcodeForIntType(input)
-                : readOpcodeForFloatType(input);
-    }
-
-    template<typename Value_t>
-    bool containsOnlyValidNameChars(const std::string& name)
-    {
-        if(name.empty()) return false;
-        return readOpcode<Value_t>(name.c_str()) == (unsigned) name.size();
-    }
-
-    template<typename Value_t>
-    inline bool truthValue(Value_t d)
-    {
-        return IsIntType<Value_t>::result
-                ? d != 0
-                : fp_abs(d) >= Value_t(0.5);
-    }
-
-    template<typename Value_t>
-    inline bool truthValue_abs(Value_t abs_d)
-    {
-        return IsIntType<Value_t>::result
-                ? abs_d > 0
-                : abs_d >= Value_t(0.5);
-    }
-
-    template<typename Value_t>
-    inline Value_t Min(Value_t d1, Value_t d2) { return d1<d2 ? d1 : d2; }
-
-    template<typename Value_t>
-    inline Value_t Max(Value_t d1, Value_t d2) { return d1>d2 ? d1 : d2; }
-
-    template<typename Value_t>
-    inline const Value_t& GetDegreesToRadiansFactor()
-    {
-        static const Value_t factor = const_pi<Value_t>() / Value_t(180);
-        return factor;
-    }
-
-    template<typename Value_t>
-    inline Value_t DegreesToRadians(Value_t degrees)
-    {
-        return degrees * GetDegreesToRadiansFactor<Value_t>();
-    }
-
-    template<typename Value_t>
-    inline const Value_t& GetRadiansToDegreesFactor()
-    {
-        static const Value_t factor = Value_t(180) / const_pi<Value_t>();
-        return factor;
-    }
-
-    template<typename Value_t>
-    inline Value_t RadiansToDegrees(Value_t radians)
-    {
-        return radians * GetRadiansToDegreesFactor<Value_t>();
-    }
-
-    template<typename Value_t>
-    inline bool isEvenInteger(Value_t value)
-    {
-        long longval = (long)value;
-        return fp_equal(value, Value_t(longval)) && (longval%2) == 0;
-    }
-
-#ifdef FP_SUPPORT_MPFR_FLOAT_TYPE
-    template<>
-    inline bool isEvenInteger(MpfrFloat value)
-    {
-        return value.isInteger() && value%2 == 0;
-    }
-#endif
-
-#ifdef FP_SUPPORT_GMP_INT_TYPE
-    template<>
-    inline bool isEvenInteger(GmpInt value)
-    {
-        return value%2 == 0;
-    }
-#endif
-
-    template<typename Value_t>
-    inline bool isOddInteger(Value_t value)
-    {
-        long longval = (long)value;
-        return fp_equal(value, Value_t(longval)) && (longval%2) != 0;
-    }
-
-#ifdef FP_SUPPORT_MPFR_FLOAT_TYPE
-    template<>
-    inline bool isOddInteger(MpfrFloat value)
-    {
-        return value.isInteger() && value%2 != 0;
-    }
-#endif
-
-#ifdef FP_SUPPORT_GMP_INT_TYPE
-    template<>
-    inline bool isOddInteger(GmpInt value)
-    {
-        return value%2 != 0;
-    }
-#endif
-
-    template<typename Value_t>
-    inline int valueToInt(Value_t value) { return int(value); }
-
-#ifdef FP_SUPPORT_MPFR_FLOAT_TYPE
-    template<>
-    inline int valueToInt(MpfrFloat value) { return int(value.toInt()); }
-#endif
-
-#ifdef FP_SUPPORT_GMP_INT_TYPE
-    template<>
-    inline int valueToInt(GmpInt value) { return int(value.toInt()); }
-#endif
-}
-
-
-//=========================================================================
-// Data struct implementation
-//=========================================================================
-template<typename Value_t>
-FunctionParserBase<Value_t>::Data::Data():
-    referenceCounter(1),
-    numVariables(0),
-    StackSize(0)
-{}
-
-template<typename Value_t>
-FunctionParserBase<Value_t>::Data::Data(const Data& rhs):
-    referenceCounter(0),
-    numVariables(rhs.numVariables),
-    variablesString(rhs.variablesString),
-    namePtrs(),
-    FuncPtrs(rhs.FuncPtrs),
-    FuncParsers(rhs.FuncParsers),
-    ByteCode(rhs.ByteCode),
-    Immed(rhs.Immed),
-#ifndef FP_USE_THREAD_SAFE_EVAL
-    Stack(rhs.StackSize),
-#endif
-    StackSize(rhs.StackSize)
-{
-    for(typename namePtrsType<Value_t>::const_iterator i =
-            rhs.namePtrs.begin();
-        i != rhs.namePtrs.end();
-        ++i)
-    {
-        if(i->second.type == NameData<Value_t>::VARIABLE)
-        {
-            const size_t variableStringOffset =
-                i->first.name - rhs.variablesString.c_str();
-            std::pair<NamePtr, NameData<Value_t> > tmp
-                (NamePtr(&variablesString[variableStringOffset],
-                         i->first.nameLength),
-                 i->second);
-            namePtrs.insert(namePtrs.end(), tmp);
-        }
-        else
-        {
-            std::pair<NamePtr, NameData<Value_t> > tmp
-                (NamePtr(new char[i->first.nameLength], i->first.nameLength),
-                 i->second );
-            memcpy(const_cast<char*>(tmp.first.name), i->first.name,
-                   tmp.first.nameLength);
-            namePtrs.insert(namePtrs.end(), tmp);
-        }
-    }
-}
-
-template<typename Value_t>
-FunctionParserBase<Value_t>::Data::~Data()
-{
-    for(typename namePtrsType<Value_t>::iterator i =
-            namePtrs.begin();
-        i != namePtrs.end();
-        ++i)
-    {
-        if(i->second.type != NameData<Value_t>::VARIABLE)
-            delete[] i->first.name;
-    }
-}
-
-
-//=========================================================================
-// FunctionParser constructors, destructor and assignment
-//=========================================================================
-template<typename Value_t>
-FunctionParserBase<Value_t>::FunctionParserBase():
-    delimiterChar(0),
-    parseErrorType(NO_FUNCTION_PARSED_YET), evalErrorType(0),
-    data(new Data),
-    useDegreeConversion(false),
-    evalRecursionLevel(0),
-    StackPtr(0), errorLocation(0)
-{
-}
-
-template<typename Value_t>
-FunctionParserBase<Value_t>::~FunctionParserBase()
-{
-    if(--(data->referenceCounter) == 0)
-        delete data;
-}
-
-template<typename Value_t>
-FunctionParserBase<Value_t>::FunctionParserBase(const FunctionParserBase& cpy):
-    delimiterChar(cpy.delimiterChar),
-    parseErrorType(cpy.parseErrorType),
-    evalErrorType(cpy.evalErrorType),
-    data(cpy.data),
-    useDegreeConversion(cpy.useDegreeConversion),
-    evalRecursionLevel(0),
-    StackPtr(0), errorLocation(0)
-{
-    ++(data->referenceCounter);
-}
-
-template<typename Value_t>
-FunctionParserBase<Value_t>&
-FunctionParserBase<Value_t>::operator=(const FunctionParserBase& cpy)
-{
-    if(data != cpy.data)
-    {
-        if(--(data->referenceCounter) == 0) delete data;
-
-        delimiterChar = cpy.delimiterChar;
-        parseErrorType = cpy.parseErrorType;
-        evalErrorType = cpy.evalErrorType;
-        data = cpy.data;
-        useDegreeConversion = cpy.useDegreeConversion;
-        evalRecursionLevel = cpy.evalRecursionLevel;
-
-        ++(data->referenceCounter);
-    }
-
-    return *this;
-}
-
-
-template<typename Value_t>
-void FunctionParserBase<Value_t>::setDelimiterChar(char c)
-{
-    delimiterChar = c;
-}
-
-
-//---------------------------------------------------------------------------
-// Copy-on-write method
-//---------------------------------------------------------------------------
-template<typename Value_t>
-void FunctionParserBase<Value_t>::CopyOnWrite()
-{
-    if(data->referenceCounter > 1)
-    {
-        Data* oldData = data;
-        data = new Data(*oldData);
-        --(oldData->referenceCounter);
-        data->referenceCounter = 1;
-    }
-}
-
-template<typename Value_t>
-void FunctionParserBase<Value_t>::ForceDeepCopy()
-{
-    CopyOnWrite();
-}
-
-
-//=========================================================================
-// User-defined constant and function addition
-//=========================================================================
-template<typename Value_t>
-bool FunctionParserBase<Value_t>::AddConstant(const std::string& name,
-                                              Value_t value)
-{
-    if(!containsOnlyValidNameChars<Value_t>(name)) return false;
-
-    CopyOnWrite();
-    std::pair<NamePtr, NameData<Value_t> > newName
-        (NamePtr(name.data(), unsigned(name.size())),
-         NameData<Value_t>(NameData<Value_t>::CONSTANT, value));
-
-    return addNewNameData(data->namePtrs, newName, false);
-}
-
-template<typename Value_t>
-bool FunctionParserBase<Value_t>::AddUnit(const std::string& name,
-                                          Value_t value)
-{
-    if(!containsOnlyValidNameChars<Value_t>(name)) return false;
-
-    CopyOnWrite();
-    std::pair<NamePtr, NameData<Value_t> > newName
-        (NamePtr(name.data(), unsigned(name.size())),
-         NameData<Value_t>(NameData<Value_t>::UNIT, value));
-    return addNewNameData(data->namePtrs, newName, false);
-}
-
-template<typename Value_t>
-bool FunctionParserBase<Value_t>::AddFunction
-(const std::string& name, FunctionPtr ptr, unsigned paramsAmount)
-{
-    if(!containsOnlyValidNameChars<Value_t>(name)) return false;
-
-    CopyOnWrite();
-    std::pair<NamePtr, NameData<Value_t> > newName
-        (NamePtr(name.data(), unsigned(name.size())),
-         NameData<Value_t>(NameData<Value_t>::FUNC_PTR,
-                           unsigned(data->FuncPtrs.size())));
-
-    const bool success = addNewNameData(data->namePtrs, newName, false);
-    if(success)
-    {
-        data->FuncPtrs.push_back(typename Data::FuncPtrData());
-        data->FuncPtrs.back().funcPtr = ptr;
-        data->FuncPtrs.back().params = paramsAmount;
-    }
-    return success;
-}
-
-template<typename Value_t>
-bool FunctionParserBase<Value_t>::CheckRecursiveLinking
-(const FunctionParserBase* fp) const
-{
-    if(fp == this) return true;
-    for(unsigned i = 0; i < fp->data->FuncParsers.size(); ++i)
-        if(CheckRecursiveLinking(fp->data->FuncParsers[i].parserPtr))
-            return true;
-    return false;
-}
-
-template<typename Value_t>
-bool FunctionParserBase<Value_t>::AddFunction(const std::string& name,
-                                              FunctionParserBase& fp)
-{
-    if(!containsOnlyValidNameChars<Value_t>(name) ||
-       CheckRecursiveLinking(&fp))
-        return false;
-
-    CopyOnWrite();
-    std::pair<NamePtr, NameData<Value_t> > newName
-        (NamePtr(name.data(), unsigned(name.size())),
-         NameData<Value_t>(NameData<Value_t>::PARSER_PTR,
-                           unsigned(data->FuncParsers.size())));
-
-    const bool success = addNewNameData(data->namePtrs, newName, false);
-    if(success)
-    {
-        data->FuncParsers.push_back(typename Data::FuncPtrData());
-        data->FuncParsers.back().parserPtr = &fp;
-        data->FuncParsers.back().params = fp.data->numVariables;
-    }
-    return success;
-}
-
-template<typename Value_t>
-bool FunctionParserBase<Value_t>::RemoveIdentifier(const std::string& name)
-{
-    CopyOnWrite();
-
-    NamePtr namePtr(name.data(), unsigned(name.size()));
-
-    typename namePtrsType<Value_t>::iterator
-        nameIter = data->namePtrs.find(namePtr);
-
-    if(nameIter != data->namePtrs.end())
-    {
-        if(nameIter->second.type == NameData<Value_t>::VARIABLE)
-        {
-            // Illegal attempt to delete variables
-            return false;
-        }
-        delete[] nameIter->first.name;
-        data->namePtrs.erase(nameIter);
-        return true;
-    }
-    return false;
-}
-
-
-//=========================================================================
-// Function parsing
-//=========================================================================
-namespace
-{
-    // Error messages returned by ErrorMsg():
-    const char* const ParseErrorMessage[]=
-    {
-        "Syntax error",                             // 0
-        "Mismatched parenthesis",                   // 1
-        "Missing ')'",                              // 2
-        "Empty parentheses",                        // 3
-        "Syntax error: Operator expected",          // 4
-        "Not enough memory",                        // 5
-        "An unexpected error occurred. Please make a full bug report "
-        "to the author",                            // 6
-        "Syntax error in parameter 'Vars' given to "
-        "FunctionParser::Parse()",                  // 7
-        "Illegal number of parameters to function", // 8
-        "Syntax error: Premature end of string",    // 9
-        "Syntax error: Expecting ( after function", // 10
-        "Syntax error: Unknown identifier",         // 11
-        "(No function has been parsed yet)",
-        ""
-    };
-
-    template<typename Value_t>
-    inline typename FunctionParserBase<Value_t>::ParseErrorType
-    noCommaError(char c)
-    {
-        return c == ')' ?
-            FunctionParserBase<Value_t>::ILL_PARAMS_AMOUNT :
-            FunctionParserBase<Value_t>::SYNTAX_ERROR;
-    }
-
-    template<typename Value_t>
-    inline typename FunctionParserBase<Value_t>::ParseErrorType
-    noParenthError(char c)
-    {
-        return c == ',' ?
-            FunctionParserBase<Value_t>::ILL_PARAMS_AMOUNT :
-            FunctionParserBase<Value_t>::MISSING_PARENTH;
-    }
-
-    template<unsigned offset>
-    struct IntLiteralMask
-    {
-        enum { mask =
-        //    (    1UL << ('-'-offset)) |
-            (0x3FFUL << ('0'-offset)) }; /* 0x3FF = 10 bits worth "1" */
-        // Note: If you change fparser to support negative numbers parsing
-        //       (as opposed to parsing them as cNeg followed by literal),
-        //       enable the '-' line above, and change the offset value
-        //       in BeginsLiteral() to '-' instead of '.'.
-    };
-
-    template<typename Value_t, unsigned offset>
-    struct LiteralMask
-    {
-        enum { mask =
-            (    1UL << ('.'-offset)) |
-            IntLiteralMask<offset>::mask };
-    };
-#ifdef FP_SUPPORT_LONG_INT_TYPE
-    template<unsigned offset>
-    struct LiteralMask<long, offset>: public IntLiteralMask<offset>
-    {
-    };
-#endif
-#ifdef FP_SUPPORT_GMP_INT_TYPE
-    template<unsigned offset>
-    struct LiteralMask<GmpInt, offset>: public IntLiteralMask<offset>
-    {
-    };
-#endif
-
-    template<unsigned offset>
-    struct SimpleSpaceMask
-    {
-        enum { mask =
-            (1UL << ('\r'-offset)) |
-            (1UL << ('\n'-offset)) |
-            (1UL << ('\v'-offset)) |
-            (1UL << ('\t'-offset)) |
-            (1UL << (' ' -offset)) };
-    };
-
-    template<typename Value_t>
-    inline bool BeginsLiteral(unsigned byte)
-    {
-        const unsigned n = sizeof(unsigned long)>=8 ? 0 : '.';
-        byte -= n;
-        if(byte > (unsigned char)('9'-n)) return false;
-        unsigned long shifted = 1UL << byte;
-        const unsigned long mask = LiteralMask<Value_t, n>::mask;
-        return (mask & shifted) != 0;
-    }
-
-    template<typename CharPtr>
-    inline void SkipSpace(CharPtr& function)
-    {
-/*
-        Space characters in unicode:
-U+0020  SPACE                      Depends on font, often adjusted (see below)
-U+00A0  NO-BREAK SPACE             As a space, but often not adjusted
-U+2000  EN QUAD                    1 en (= 1/2 em)
-U+2001  EM QUAD                    1 em (nominally, the height of the font)
-U+2002  EN SPACE                   1 en (= 1/2 em)
-U+2003  EM SPACE                   1 em
-U+2004  THREE-PER-EM SPACE         1/3 em
-U+2005  FOUR-PER-EM SPACE          1/4 em
-U+2006  SIX-PER-EM SPACE           1/6 em
-U+2007  FIGURE SPACE               Tabular width, the width of digits
-U+2008  PUNCTUATION SPACE          The width of a period .
-U+2009  THIN SPACE                 1/5 em (or sometimes 1/6 em)
-U+200A  HAIR SPACE                 Narrower than THIN SPACE
-U+200B  ZERO WIDTH SPACE           Nominally no width, but may expand
-U+202F  NARROW NO-BREAK SPACE      Narrower than NO-BREAK SPACE (or SPACE)
-U+205F  MEDIUM MATHEMATICAL SPACE  4/18 em
-U+3000  IDEOGRAPHIC SPACE          The width of ideographic (CJK) characters.
-        Also:
-U+000A  \n
-U+000D  \r
-U+0009  \t
-U+000B  \v
-        As UTF-8 sequences:
-            09
-            0A
-            0B
-            0D
-            20
-            C2 A0
-            E2 80 80-8B
-            E2 80 AF
-            E2 81 9F
-            E3 80 80
-*/
-        while(true)
-        {
-            const unsigned n = sizeof(unsigned long)>=8 ? 0 : '\t';
-            typedef signed char schar;
-            unsigned byte = (unsigned char)*function;
-            byte -= n;
-            // ^Note: values smaller than n intentionally become
-            //        big values here due to integer wrap. The
-            //        comparison below thus excludes them, making
-            //        the effective range 0x09..0x20 (32-bit)
-            //        or 0x00..0x20 (64-bit) within the if-clause.
-            if(byte <= (unsigned char)(' '-n))
-            {
-                unsigned long shifted = 1UL << byte;
-                const unsigned long mask = SimpleSpaceMask<n>::mask;
-                if(mask & shifted)
-                    { ++function; continue; } // \r, \n, \t, \v and space
-                break;
-            }
-            if(likely(byte < 0xC2-n)) break;
-
-            if(byte == 0xC2-n && function[1] == char(0xA0))
-                { function += 2; continue; } // U+00A0
-            if(byte == 0xE3-n &&
-               function[1] == char(0x80) && function[2] == char(0x80))
-                { function += 3; continue; } // U+3000
-            if(byte == 0xE2-n)
-            {
-                if(function[1] == char(0x81))
-                {
-                    if(function[2] != char(0x9F)) break;
-                    function += 3; // U+205F
-                    continue;
-                }
-                if(function[1] == char(0x80))
-                if(function[2] == char(0xAF) || // U+202F
-                   schar(function[2]) <= schar(0x8B) // U+2000..U+200B
-                  )
-                {
-                    function += 3;
-                    continue;
-                }
-            }
-            break;
-        } // while(true)
-    } // SkipSpace(CharPtr& function)
-}
-
-// Return parse error message
-// --------------------------
-template<typename Value_t>
-const char* FunctionParserBase<Value_t>::ErrorMsg() const
-{
-    return ParseErrorMessage[parseErrorType];
-}
-
-
-// Parse variables
-// ---------------
-template<typename Value_t>
-bool FunctionParserBase<Value_t>::ParseVariables
-(const std::string& inputVarString)
-{
-    if(data->variablesString == inputVarString) return true;
-
-    /* Delete existing variables from namePtrs */
-    for(typename namePtrsType<Value_t>::iterator i =
-            data->namePtrs.begin();
-        i != data->namePtrs.end(); )
-    {
-        if(i->second.type == NameData<Value_t>::VARIABLE)
-        {
-            typename namePtrsType<Value_t>::iterator j (i);
-            ++i;
-            data->namePtrs.erase(j);
-        }
-        else ++i;
-    }
-    data->variablesString = inputVarString;
-
-    const std::string& vars = data->variablesString;
-    const unsigned len = unsigned(vars.size());
-
-    unsigned varNumber = VarBegin;
-
-    const char* beginPtr = vars.c_str();
-    const char* finalPtr = beginPtr + len;
-    while(beginPtr < finalPtr)
-    {
-        SkipSpace(beginPtr);
-        unsigned nameLength = readOpcode<Value_t>(beginPtr);
-        if(nameLength == 0 || (nameLength & 0x80000000U)) return false;
-        const char* endPtr = beginPtr + nameLength;
-        SkipSpace(endPtr);
-        if(endPtr != finalPtr && *endPtr != ',') return false;
-
-        std::pair<NamePtr, NameData<Value_t> > newName
-            (NamePtr(beginPtr, nameLength),
-             NameData<Value_t>(NameData<Value_t>::VARIABLE, varNumber++));
-
-        if(!addNewNameData(data->namePtrs, newName, true))
-        {
-            return false;
-        }
-
-        beginPtr = endPtr + 1;
-    }
-
-    data->numVariables = varNumber - VarBegin;
-    return true;
-}
-
-// Parse interface functions
-// -------------------------
-template<typename Value_t>
-int FunctionParserBase<Value_t>::Parse(const char* Function,
-                                       const std::string& Vars,
-                                       bool useDegrees)
-{
-    CopyOnWrite();
-
-    if(!ParseVariables(Vars))
-    {
-        parseErrorType = INVALID_VARS;
-        return int(strlen(Function));
-    }
-
-    return ParseFunction(Function, useDegrees);
-}
-
-template<typename Value_t>
-int FunctionParserBase<Value_t>::Parse(const std::string& Function,
-                                       const std::string& Vars,
-                                       bool useDegrees)
-{
-    CopyOnWrite();
-
-    if(!ParseVariables(Vars))
-    {
-        parseErrorType = INVALID_VARS;
-        return int(Function.size());
-    }
-
-    return ParseFunction(Function.c_str(), useDegrees);
-}
-
-
-// Main parsing function
-// ---------------------
-template<typename Value_t>
-int FunctionParserBase<Value_t>::ParseFunction(const char* function,
-                                               bool useDegrees)
-{
-    useDegreeConversion = useDegrees;
-    parseErrorType = FP_NO_ERROR;
-
-    data->ByteCode.clear(); data->ByteCode.reserve(128);
-    data->Immed.clear(); data->Immed.reserve(128);
-    data->StackSize = StackPtr = 0;
-
-    const char* ptr = CompileExpression(function);
-    if(parseErrorType != FP_NO_ERROR) return int(errorLocation - function);
-
-    assert(ptr); // Should never be null at this point. It's a bug otherwise.
-    if(*ptr)
-    {
-        if(delimiterChar == 0 || *ptr != delimiterChar)
-            parseErrorType = EXPECT_OPERATOR;
-        return int(ptr - function);
-    }
-
-#ifndef FP_USE_THREAD_SAFE_EVAL
-    data->Stack.resize(data->StackSize);
-#endif
-
-    return -1;
-}
-
-
-//=========================================================================
-// Parsing and bytecode compiling functions
-//=========================================================================
-template<typename Value_t>
-inline const char* FunctionParserBase<Value_t>::SetErrorType(ParseErrorType t,
-                                                             const char* pos)
-{
-    parseErrorType = t;
-    errorLocation = pos;
-    return 0;
-}
-
-template<typename Value_t>
-inline void FunctionParserBase<Value_t>::incStackPtr()
-{
-    if(++StackPtr > data->StackSize) ++(data->StackSize);
-}
-
-namespace
-{
-    const unsigned char powi_factor_table[128] =
-    {
-        0,1,0,0,0,0,0,0, 0, 0,0,0,0,0,0,3,/*   0 -  15 */
-        0,0,0,0,0,0,0,0, 0, 5,0,3,0,0,3,0,/*  16 -  31 */
-        0,0,0,0,0,0,0,3, 0, 0,0,0,0,5,0,0,/*  32 -  47 */
-        0,0,5,3,0,0,3,5, 0, 3,0,0,3,0,0,3,/*  48 -  63 */
-        0,0,0,0,0,0,0,0, 0, 0,0,3,0,0,3,0,/*  64 -  79 */
-        0,9,0,0,0,5,0,3, 0, 0,5,7,0,0,0,5,/*  80 -  95 */
-        0,0,0,3,5,0,3,0, 0, 3,0,0,3,0,5,3,/*  96 - 111 */
-        0,0,3,5,0,9,0,7, 3,11,0,3,0,5,3,0,/* 112 - 127 */
-    };
-
-    inline int get_powi_factor(int abs_int_exponent)
-    {
-        if(abs_int_exponent >= int(sizeof(powi_factor_table))) return 0;
-        return powi_factor_table[abs_int_exponent];
-    }
-
-#if 0
-    int EstimatePowiComplexity(int abs_int_exponent)
-    {
-        int cost = 0;
-        while(abs_int_exponent > 1)
-        {
-            int factor = get_powi_factor(abs_int_exponent);
-            if(factor)
-            {
-                cost += EstimatePowiComplexity(factor);
-                abs_int_exponent /= factor;
-                continue;
-            }
-            if(!(abs_int_exponent & 1))
-            {
-                abs_int_exponent /= 2;
-                cost += 3; // sqr
-            }
-            else
-            {
-                cost += 4; // dup+mul
-                abs_int_exponent -= 1;
-            }
-        }
-        return cost;
-    }
-#endif
-
-    bool IsEligibleIntPowiExponent(int int_exponent)
-    {
-        if(int_exponent == 0) return false;
-        int abs_int_exponent = int_exponent;
-    #if 0
-        int cost = 0;
-
-        if(abs_int_exponent < 0)
-        {
-            cost += 11;
-            abs_int_exponent = -abs_int_exponent;
-        }
-
-        cost += EstimatePowiComplexity(abs_int_exponent);
-
-        return cost < (10*3 + 4*4);
-    #else
-        if(abs_int_exponent < 0) abs_int_exponent = -abs_int_exponent;
-
-        return (abs_int_exponent >= 1)
-            && (abs_int_exponent <= 46 ||
-              (abs_int_exponent <= 1024 &&
-              (abs_int_exponent & (abs_int_exponent - 1)) == 0));
-    #endif
-    }
-
-    bool IsLogicalOpcode(unsigned op)
-    {
-        switch(op)
-        {
-          case cAnd: case cAbsAnd:
-          case cOr:  case cAbsOr:
-          case cNot: case cAbsNot:
-          case cNotNot: case cAbsNotNot:
-          case cEqual: case cNEqual:
-          case cLess: case cLessOrEq:
-          case cGreater: case cGreaterOrEq:
-              return true;
-          default: break;
-        }
-        return false;
-    }
-
-    bool IsComparisonOpcode(unsigned op)
-    {
-        switch(op)
-        {
-          case cEqual: case cNEqual:
-          case cLess: case cLessOrEq:
-          case cGreater: case cGreaterOrEq:
-              return true;
-          default: break;
-        }
-        return false;
-    }
-
-    unsigned OppositeComparisonOpcode(unsigned op)
-    {
-        switch(op)
-        {
-            case cLess: return cGreater;
-            case cGreater: return cLess;
-            case cLessOrEq: return cGreaterOrEq;
-            case cGreaterOrEq: return cLessOrEq;
-        }
-        return op;
-    }
-
-    bool IsNeverNegativeValueOpcode(unsigned op)
-    {
-        switch(op)
-        {
-          case cAnd: case cAbsAnd:
-          case cOr:  case cAbsOr:
-          case cNot: case cAbsNot:
-          case cNotNot: case cAbsNotNot:
-          case cEqual: case cNEqual:
-          case cLess: case cLessOrEq:
-          case cGreater: case cGreaterOrEq:
-          case cSqrt: case cRSqrt: case cSqr:
-          case cAbs:
-          case cAcos: case cCosh:
-              return true;
-          default: break;
-        }
-        return false;
-    }
-
-    bool IsAlwaysIntegerOpcode(unsigned op)
-    {
-        switch(op)
-        {
-          case cAnd: case cAbsAnd:
-          case cOr:  case cAbsOr:
-          case cNot: case cAbsNot:
-          case cNotNot: case cAbsNotNot:
-          case cEqual: case cNEqual:
-          case cLess: case cLessOrEq:
-          case cGreater: case cGreaterOrEq:
-          case cInt: case cFloor: case cCeil: case cTrunc:
-              return true;
-          default: break;
-        }
-        return false;
-    }
-
-    bool IsUnaryOpcode(unsigned op)
-    {
-        switch(op)
-        {
-          case cInv: case cNeg:
-          case cNot: case cAbsNot:
-          case cNotNot: case cAbsNotNot:
-          case cSqr: case cRSqrt:
-          case cDeg: case cRad:
-            return true;
-        }
-        return (op < FUNC_AMOUNT && Functions[op].params == 1);
-    }
-
-    bool IsBinaryOpcode(unsigned op)
-    {
-        switch(op)
-        {
-          case cAdd: case cSub: case cRSub:
-          case cMul: case cDiv: case cRDiv:
-          case cMod:
-          case cEqual: case cNEqual: case cLess:
-          case cLessOrEq: case cGreater: case cGreaterOrEq:
-          case cAnd: case cAbsAnd:
-          case cOr: case cAbsOr:
-            return true;
-        }
-        return (op < FUNC_AMOUNT && Functions[op].params == 2);
-    }
-
-    bool HasInvalidRangesOpcode(unsigned op)
-    {
-#ifndef FP_NO_EVALUATION_CHECKS
-        // Returns true, if the given opcode has a range of
-        // input values that gives an error.
-        switch(op)
-        {
-            case cAcos: // allowed range: |x| <= 1
-            case cAsin: // allowed range: |x| <= 1
-            case cAcosh: // allowed range: x >= 1
-            case cAtanh: // allowed range: |x| < 1
-            //case cCot: // note: no range, just separate values
-            //case cCsc: // note: no range, just separate values
-            case cLog: // allowed range: x > 0
-            case cLog2: // allowed range: x > 0
-            case cLog10: // allowed range: x > 0
-        #ifdef FP_SUPPORT_OPTIMIZER
-            case cLog2by: // allowed range: x > 0
-        #endif
-            //case cPow: // note: no range, just separate values
-            //case cSec: // note: no range, just separate values
-            case cSqrt: // allowed range: x >= 0
-            case cRSqrt: // allowed range: x > 0
-            //case cDiv: // note: no range, just separate values
-            //case cRDiv: // note: no range, just separate values
-            //case cInv: // note: no range, just separate values
-                return true;
-        }
-#endif
-        return false;
-    }
-
-#ifdef FP_EPSILON
-    const double EpsilonOrZero = FP_EPSILON;
-#else
-    const double EpsilonOrZero = 0.0;
-#endif
-
-}
-
-template<typename Value_t>
-inline void FunctionParserBase<Value_t>::AddImmedOpcode(Value_t value)
-{
-    data->Immed.push_back(value);
-    data->ByteCode.push_back(cImmed);
-}
-
-template<typename Value_t>
-inline void FunctionParserBase<Value_t>::CompilePowi(int abs_int_exponent)
-{
-    int num_muls=0;
-    while(abs_int_exponent > 1)
-    {
-        int factor = get_powi_factor(abs_int_exponent);
-        if(factor)
-        {
-            CompilePowi(factor);
-            abs_int_exponent /= factor;
-            continue;
-        }
-        if(!(abs_int_exponent & 1))
-        {
-            abs_int_exponent /= 2;
-            data->ByteCode.push_back(cSqr);
-        }
-        else
-        {
-            data->ByteCode.push_back(cDup);
-            incStackPtr();
-            abs_int_exponent -= 1;
-            ++num_muls;
-        }
-    }
-    if(num_muls > 0)
-    {
-        data->ByteCode.resize(data->ByteCode.size()+num_muls, cMul);
-        StackPtr -= num_muls;
-    }
-}
-
-template<typename Value_t>
-inline bool FunctionParserBase<Value_t>::TryCompilePowi(Value_t original_immed)
-{
-    Value_t changed_immed = original_immed;
-    for(int sqrt_count=0; /**/; ++sqrt_count)
-    {
-        int int_exponent = valueToInt(changed_immed);
-        if(changed_immed == Value_t(int_exponent) &&
-           IsEligibleIntPowiExponent(int_exponent))
-        {
-            int abs_int_exponent = int_exponent;
-            if(abs_int_exponent < 0)
-                abs_int_exponent = -abs_int_exponent;
-
-            data->Immed.pop_back(); data->ByteCode.pop_back();
-            --StackPtr;
-            // ^Though the above is accounted for by the procedure
-            // that generates cPow, we need it for correct cFetch
-            // indexes in CompilePowi().
-
-            while(sqrt_count > 0)
-            {
-                int opcode = cSqrt;
-                if(sqrt_count == 1 && int_exponent < 0)
-                {
-                    opcode = cRSqrt;
-                    int_exponent = -int_exponent;
-                }
-                data->ByteCode.push_back(opcode);
-                --sqrt_count;
-            }
-            CompilePowi(abs_int_exponent);
-            if(int_exponent < 0) data->ByteCode.push_back(cInv);
-            ++StackPtr; // Needed because cPow adding will assume this.
-            return true;
-        }
-        if(sqrt_count >= 4) break;
-        changed_immed += changed_immed;
-    }
-
-    // When we don't know whether x >= 0, we still know that
-    // x^y can be safely converted into exp(y * log(x))
-    // when y is _not_ integer, because we know that x >= 0.
-    // Otherwise either expression will give a NaN.
-    if(/*!IsIntegerConst(original_immed) ||*/
-       IsNeverNegativeValueOpcode(data->ByteCode[data->ByteCode.size()-2]))
-    {
-        data->Immed.pop_back();
-        data->ByteCode.pop_back();
-        //--StackPtr; - accounted for by the procedure that generates cPow
-        AddFunctionOpcode(cLog);
-        AddImmedOpcode(original_immed);
-        //incStackPtr(); - this and the next are redundant because...
-        AddFunctionOpcode(cMul);
-        //--StackPtr;    - ...because the cImmed was popped earlier.
-        AddFunctionOpcode(cExp);
-        return true;
-    }
-    return false;
-}
-
-//#include "fpoptimizer/fpoptimizer_opcodename.hh"
-// ^ needed only if FP_TRACE_BYTECODE_OPTIMIZATION() is used
-
-template<typename Value_t>
-inline void FunctionParserBase<Value_t>::AddFunctionOpcode(unsigned opcode)
-{
-#define FP_FLOAT_VERSION 1
-#include "fp_opcode_add.inc"
-#undef FP_FLOAT_VERSION
-}
-
-#ifdef FP_SUPPORT_LONG_INT_TYPE
-template<>
-inline void FunctionParserBase<long>::AddFunctionOpcode(unsigned opcode)
-{
-    typedef long Value_t;
-#define FP_FLOAT_VERSION 0
-#include "fp_opcode_add.inc"
-#undef FP_FLOAT_VERSION
-}
-#endif
-
-#ifdef FP_SUPPORT_GMP_INT_TYPE
-template<>
-inline void FunctionParserBase<GmpInt>::AddFunctionOpcode(unsigned opcode)
-{
-  typedef GmpInt Value_t;
-#define FP_FLOAT_VERSION 0
-#include "fp_opcode_add.inc"
-#undef FP_FLOAT_VERSION
-}
-#endif
-
-template<typename Value_t>
-const char* FunctionParserBase<Value_t>::CompileIf(const char* function)
-{
-    if(*function != '(') return SetErrorType(EXPECT_PARENTH_FUNC, function);
-
-    function = CompileExpression(function+1);
-    if(!function) return 0;
-    if(*function != ',')
-        return SetErrorType(noCommaError<Value_t>(*function), function);
-
-    OPCODE opcode = cIf;
-    if(data->ByteCode.back() == cNotNot) data->ByteCode.pop_back();
-    if(IsNeverNegativeValueOpcode(data->ByteCode.back()))
-    {
-        // If we know that the condition to be tested is always
-        // a positive value (such as when produced by "x<y"),
-        // we can use the faster opcode to evaluate it.
-        // cIf tests whether fabs(cond) >= 0.5,
-        // cAbsIf simply tests whether cond >= 0.5.
-        opcode = cAbsIf;
-    }
-
-    data->ByteCode.push_back(opcode);
-    const unsigned curByteCodeSize = unsigned(data->ByteCode.size());
-    data->ByteCode.push_back(0); // Jump index; to be set later
-    data->ByteCode.push_back(0); // Immed jump index; to be set later
-
-    --StackPtr;
-
-    function = CompileExpression(function + 1);
-    if(!function) return 0;
-    if(*function != ',')
-        return SetErrorType(noCommaError<Value_t>(*function), function);
-
-    data->ByteCode.push_back(cJump);
-    const unsigned curByteCodeSize2 = unsigned(data->ByteCode.size());
-    const unsigned curImmedSize2 = unsigned(data->Immed.size());
-    data->ByteCode.push_back(0); // Jump index; to be set later
-    data->ByteCode.push_back(0); // Immed jump index; to be set later
-
-    --StackPtr;
-
-    function = CompileExpression(function + 1);
-    if(!function) return 0;
-    if(*function != ')')
-        return SetErrorType(noParenthError<Value_t>(*function), function);
-
-    /* A cNop is added as an easy fix for the problem which happens if cNeg
-       or other similar opcodes optimized by Parse() immediately follow an
-       else-branch which could be confused as optimizable with that opcode
-       (eg. cImmed). The optimizer removes the cNop safely.
-     */
-    data->ByteCode.push_back(cNop);
-
-    // Set jump indices
-    data->ByteCode[curByteCodeSize] = curByteCodeSize2+1;
-    data->ByteCode[curByteCodeSize+1] = curImmedSize2;
-    data->ByteCode[curByteCodeSize2] = unsigned(data->ByteCode.size())-1;
-    data->ByteCode[curByteCodeSize2+1] = unsigned(data->Immed.size());
-
-    ++function;
-    SkipSpace(function);
-    return function;
-}
-
-template<typename Value_t>
-const char* FunctionParserBase<Value_t>::CompileFunctionParams
-(const char* function, unsigned requiredParams)
-{
-    if(*function != '(') return SetErrorType(EXPECT_PARENTH_FUNC, function);
-
-    if(requiredParams > 0)
-    {
-        const char* function_end = CompileExpression(function+1);
-        if(!function_end)
-        {
-            // If an error occurred, verify whether it was caused by ()
-            ++function;
-            SkipSpace(function);
-            if(*function == ')') return SetErrorType(ILL_PARAMS_AMOUNT, function);
-            // Not caused by (), use the error message given by CompileExpression()
-            return 0;
-        }
-        function = function_end;
-
-        for(unsigned i = 1; i < requiredParams; ++i)
-        {
-            if(*function != ',')
-                return SetErrorType(noCommaError<Value_t>(*function), function);
-
-            function = CompileExpression(function+1);
-            if(!function) return 0;
-        }
-        // No need for incStackPtr() because each parse parameter calls it
-        StackPtr -= requiredParams-1;
-    }
-    else
-    {
-        incStackPtr(); // return value of function is pushed onto the stack
-        ++function;
-        SkipSpace(function);
-    }
-
-    if(*function != ')')
-        return SetErrorType(noParenthError<Value_t>(*function), function);
-    ++function;
-    SkipSpace(function);
-    return function;
-}
-
-template<typename Value_t>
-const char* FunctionParserBase<Value_t>::CompileElement(const char* function)
-{
-    if(BeginsLiteral<Value_t>( (unsigned char) *function))
-        return CompileLiteral(function);
-
-    unsigned nameLength = readOpcode<Value_t>(function);
-    if(nameLength == 0)
-    {
-        // No identifier found
-        if(*function == '(') return CompileParenthesis(function);
-        if(*function == ')') return SetErrorType(MISM_PARENTH, function);
-        return SetErrorType(SYNTAX_ERROR, function);
-    }
-
-    // Function, variable or constant
-    if(nameLength & 0x80000000U) // Function
-    {
-        OPCODE func_opcode = OPCODE( (nameLength >> 16) & 0x7FFF );
-        return CompileFunction(function + (nameLength & 0xFFFF), func_opcode);
-    }
-
-    NamePtr name(function, nameLength);
-    const char* endPtr = function + nameLength;
-    SkipSpace(endPtr);
-
-    typename namePtrsType<Value_t>::iterator nameIter =
-        data->namePtrs.find(name);
-    if(nameIter == data->namePtrs.end())
-    {
-        return SetErrorType(UNKNOWN_IDENTIFIER, function);
-    }
-
-    const NameData<Value_t>* nameData = &nameIter->second;
-    switch(nameData->type)
-    {
-      case NameData<Value_t>::VARIABLE: // is variable
-          if(unlikely(!data->ByteCode.empty() && data->ByteCode.back() == nameData->index))
-              data->ByteCode.push_back(cDup);
-          else
-              data->ByteCode.push_back(nameData->index);
-          incStackPtr();
-          return endPtr;
-
-      case NameData<Value_t>::CONSTANT:
-          AddImmedOpcode(nameData->value);
-          incStackPtr();
-          return endPtr;
-
-      case NameData<Value_t>::UNIT:
-          break;
-
-  /* The reason why a cNop is added after a cFCall and a cPCall opcode is
-     that the function index could otherwise be confused with an actual
-     opcode (most prominently cImmed), making parse-time optimizations bug
-     (eg. if cNeg immediately follows an index value equal to cImmed, in
-     which case the parser would "optimize" it to negating the (inexistent)
-     literal, causing mayhem). The optimizer gets rid of the cNop safely.
-     (Another option would be to add some offset to the function index
-     when storing it in the bytecode, and then subtract that offset when
-     interpreting the bytecode, but this causes more programming overhead
-     than the speed overhead caused by the cNop to be worth the trouble,
-     especially since the function call caused by the opcode is quite slow
-     anyways.)
-   */
-      case NameData<Value_t>::FUNC_PTR:
-          function = CompileFunctionParams
-              (endPtr, data->FuncPtrs[nameData->index].params);
-          //if(!function) return 0;
-          data->ByteCode.push_back(cFCall);
-          data->ByteCode.push_back(nameData->index);
-          data->ByteCode.push_back(cNop);
-          return function;
-
-      case NameData<Value_t>::PARSER_PTR:
-          function = CompileFunctionParams
-              (endPtr, data->FuncParsers[nameData->index].params);
-          //if(!function) return 0;
-          data->ByteCode.push_back(cPCall);
-          data->ByteCode.push_back(nameData->index);
-          data->ByteCode.push_back(cNop);
-          return function;
-    }
-
-    // When it's an unit (or unrecognized type):
-    return SetErrorType(SYNTAX_ERROR, function);
-}
-
-template<typename Value_t>
-inline const char* FunctionParserBase<Value_t>::CompileFunction
-(const char* function, unsigned func_opcode)
-{
-    SkipSpace(function);
-    const FuncDefinition& funcDef = Functions[func_opcode];
-
-    if(func_opcode == cIf) // "if" is a special case
-        return CompileIf(function);
-
-    unsigned requiredParams = funcDef.params;
-#ifndef FP_DISABLE_EVAL
-    if(func_opcode == cEval)
-        requiredParams = data->numVariables;
-#endif
-
-    function = CompileFunctionParams(function, requiredParams);
-    if(!function) return 0;
-
-    if(useDegreeConversion)
-    {
-        if(funcDef.flags & FuncDefinition::AngleIn)
-            AddFunctionOpcode(cRad);
-
-        AddFunctionOpcode(func_opcode);
-
-        if(funcDef.flags & FuncDefinition::AngleOut)
-            AddFunctionOpcode(cDeg);
-    }
-    else
-    {
-        AddFunctionOpcode(func_opcode);
-    }
-    return function;
-}
-
-template<typename Value_t>
-inline const char* FunctionParserBase<Value_t>::CompileParenthesis(const char* function)
-{
-    ++function; // Skip '('
-
-    SkipSpace(function);
-    if(*function == ')') return SetErrorType(EMPTY_PARENTH, function);
-    function = CompileExpression(function);
-    if(!function) return 0;
-
-    if(*function != ')') return SetErrorType(MISSING_PARENTH, function);
-    ++function; // Skip ')'
-
-    SkipSpace(function);
-    return function;
-}
-
-template<typename Value_t>
-inline const char* FunctionParserBase<Value_t>::CompileLiteral(const char* function)
-{
-    char* endPtr;
-    const double val = strtod(function, &endPtr);
-    if(endPtr == function) return SetErrorType(SYNTAX_ERROR, function);
-    AddImmedOpcode(val);
-    incStackPtr();
-    SkipSpace(endPtr);
-    return endPtr;
-}
-
-template<typename Value_t>
-const char*
-FunctionParserBase<Value_t>::CompilePossibleUnit(const char* function)
-{
-    unsigned nameLength = readOpcode<Value_t>(function);
-    if(nameLength & 0x80000000U) return function; // built-in function name
-    if(nameLength != 0)
-    {
-        NamePtr name(function, nameLength);
-
-        typename namePtrsType<Value_t>::iterator nameIter =
-            data->namePtrs.find(name);
-        if(nameIter != data->namePtrs.end())
-        {
-            const NameData<Value_t>* nameData = &nameIter->second;
-            if(nameData->type == NameData<Value_t>::UNIT)
-            {
-                AddImmedOpcode(nameData->value);
-                incStackPtr();
-                AddFunctionOpcode(cMul);
-                --StackPtr;
-
-                const char* endPtr = function + nameLength;
-                SkipSpace(endPtr);
-                return endPtr;
-            }
-        }
-    }
-
-    return function;
-}
-
-template<typename Value_t>
-inline const char*
-FunctionParserBase<Value_t>::CompilePow(const char* function)
-{
-    function = CompileElement(function);
-    if(!function) return 0;
-    function = CompilePossibleUnit(function);
-
-    if(*function == '^')
-    {
-        ++function;
-        SkipSpace(function);
-
-        unsigned op = cPow;
-        if(data->ByteCode.back() == cImmed)
-        {
-            if(data->Immed.back() == const_e<Value_t>())
-                { op = cExp;  data->ByteCode.pop_back();
-                    data->Immed.pop_back(); --StackPtr; }
-            else if(data->Immed.back() == Value_t(2))
-                { op = cExp2; data->ByteCode.pop_back();
-                    data->Immed.pop_back(); --StackPtr; }
-        }
-
-        function = CompileUnaryMinus(function);
-        if(!function) return 0;
-
-        // add opcode
-        AddFunctionOpcode(op);
-
-        if(op == cPow) --StackPtr;
-    }
-    return function;
-}
-
-#ifdef FP_SUPPORT_FLOAT_TYPE
-template<>
-inline const char* FunctionParserBase<float>::CompileLiteral(const char* function)
-{
-    char* endPtr;
-    const float val = strtof(function, &endPtr);
-    if(endPtr == function) return SetErrorType(SYNTAX_ERROR, function);
-    AddImmedOpcode(val);
-    incStackPtr();
-    SkipSpace(endPtr);
-    return endPtr;
-}
-#endif
-
-#ifdef FP_SUPPORT_LONG_DOUBLE_TYPE
-template<>
-inline const char* FunctionParserBase<long double>::CompileLiteral(const char* function)
-{
-    char* endPtr;
-    const long double val = strtold(function, &endPtr);
-    if(endPtr == function) return SetErrorType(SYNTAX_ERROR, function);
-    AddImmedOpcode(val);
-    incStackPtr();
-    SkipSpace(endPtr);
-    return endPtr;
-}
-#endif
-
-#ifdef FP_SUPPORT_LONG_INT_TYPE
-template<>
-inline const char* FunctionParserBase<long>::CompileLiteral(const char* function)
-{
-    char* endPtr;
-    const long val = strtol(function, &endPtr, 10);
-    if(endPtr == function) return SetErrorType(SYNTAX_ERROR, function);
-    AddImmedOpcode(val);
-    incStackPtr();
-    SkipSpace(endPtr);
-    return endPtr;
-}
-
-template<>
-inline const char*
-FunctionParserBase<long>::CompilePow(const char* function)
-{
-    function = CompileElement(function);
-    if(!function) return 0;
-    return CompilePossibleUnit(function);
-}
-#endif
-
-#ifdef FP_SUPPORT_MPFR_FLOAT_TYPE
-template<>
-inline const char* FunctionParserBase<MpfrFloat>::CompileLiteral(const char* function)
-{
-    char* endPtr;
-    const MpfrFloat val = MpfrFloat::parseString(function, &endPtr);
-    if(endPtr == function) return SetErrorType(SYNTAX_ERROR, function);
-    AddImmedOpcode(val);
-    incStackPtr();
-    SkipSpace(endPtr);
-    return endPtr;
-}
-#endif
-
-#ifdef FP_SUPPORT_GMP_INT_TYPE
-template<>
-inline const char* FunctionParserBase<GmpInt>::CompileLiteral(const char* function)
-{
-    char* endPtr;
-    const GmpInt val = GmpInt::parseString(function, &endPtr);
-    if(endPtr == function) return SetErrorType(SYNTAX_ERROR, function);
-    AddImmedOpcode(val);
-    incStackPtr();
-    SkipSpace(endPtr);
-    return endPtr;
-}
-
-template<>
-inline const char*
-FunctionParserBase<GmpInt>::CompilePow(const char* function)
-{
-    function = CompileElement(function);
-    if(!function) return 0;
-    return CompilePossibleUnit(function);
-}
-#endif
-
-
-
-
-template<typename Value_t>
-inline const char*
-FunctionParserBase<Value_t>::CompileUnaryMinus(const char* function)
-{
-    char op = *function;
-    switch(op)
-    {
-        case '-':
-        case '!':
-            ++function;
-            SkipSpace(function);
-
-            function = CompileUnaryMinus(function);
-            if(!function) return 0;
-
-            AddFunctionOpcode(op=='-' ? cNeg : cNot);
-
-            return function;
-        default: break;
-    }
-    return CompilePow(function);
-}
-
-template<typename Value_t>
-inline const char*
-FunctionParserBase<Value_t>::CompileMult(const char* function)
-{
-    unsigned op = 0;
-    while(true)
-    {
-        function = CompileUnaryMinus(function);
-        if(!function) return 0;
-
-        // add opcode
-        if(op)
-        {
-            AddFunctionOpcode(op);
-            if(op != cInv) --StackPtr;
-        }
-        switch(*function)
-        {
-            case '*': op = cMul; break;
-            case '/': op = cDiv; break;
-            case '%': op = cMod; break;
-            default: return function;
-        }
-
-        ++function;
-        SkipSpace(function);
-
-        if(op != cMod &&
-           data->ByteCode.back() == cImmed &&
-           data->Immed.back() == Value_t(1))
-        {
-            op = (op == cDiv ? cInv : 0);
-            data->Immed.pop_back();
-            data->ByteCode.pop_back();
-            --StackPtr;
-        }
-    }
-    return function;
-}
-
-template<typename Value_t>
-inline const char*
-FunctionParserBase<Value_t>::CompileAddition(const char* function)
-{
-    unsigned op=0;
-    while(true)
-    {
-        function = CompileMult(function);
-        if(!function) return 0;
-
-        // add opcode
-        if(op)
-        {
-            AddFunctionOpcode(op);
-            if(op != cNeg) --StackPtr;
-        }
-        switch(*function)
-        {
-            case '+': op = cAdd; break;
-            case '-': op = cSub; break;
-            default: return function;
-        }
-
-        ++function;
-        SkipSpace(function);
-
-        if(data->ByteCode.back() == cImmed &&
-           data->Immed.back() == Value_t(0))
-        {
-            op = (op == cSub ? cNeg : 0);
-            data->Immed.pop_back();
-            data->ByteCode.pop_back();
-            --StackPtr;
-        }
-    }
-    return function;
-}
-
-template<typename Value_t>
-inline const char*
-FunctionParserBase<Value_t>::CompileComparison(const char* function)
-{
-    unsigned op=0;
-    while(true)
-    {
-        function = CompileAddition(function);
-        if(!function) return 0;
-
-        if(op)
-        {
-            AddFunctionOpcode(op);
-            --StackPtr;
-        }
-        switch(*function)
-        {
-          case '=':
-              ++function; op = cEqual; break;
-          case '!':
-              if(function[1] == '=')
-              { function += 2; op = cNEqual; break; }
-              // If '=' does not follow '!', a syntax error will
-              // be generated at the outermost parsing level
-              return function;
-          case '<':
-              if(function[1] == '=')
-              { function += 2; op = cLessOrEq; break; }
-              ++function; op = cLess; break;
-          case '>':
-              if(function[1] == '=')
-              { function += 2; op = cGreaterOrEq; break; }
-              ++function; op = cGreater; break;
-          default: return function;
-        }
-        SkipSpace(function);
-    }
-    return function;
-}
-
-template<typename Value_t>
-inline const char*
-FunctionParserBase<Value_t>::CompileAnd(const char* function)
-{
-    size_t param0end=0;
-    while(true)
-    {
-        function = CompileComparison(function);
-        if(!function) return 0;
-
-        if(param0end)
-        {
-            if(data->ByteCode.back() == cNotNot) data->ByteCode.pop_back();
-
-            unsigned& param0last = data->ByteCode[param0end-1];
-            unsigned& param1last = data->ByteCode.back();
-            if(IsNeverNegativeValueOpcode(param1last) &&
-               IsNeverNegativeValueOpcode(param0last))
-            {
-                /* Change !x & !y into !(x | y). Because y might
-                 * contain an cIf, we replace the first cNot/cAbsNot
-                 * with cNop to avoid jump indices being broken.
-                 */
-                if((param0last == cNot || param0last == cAbsNot)
-                && (param1last == cNot || param1last == cAbsNot))
-                {
-                    param1last = (param0last==cAbsNot && param1last==cAbsNot)
-                                    ? cAbsOr : cOr;
-                    param0last = cNop;
-                    AddFunctionOpcode(cAbsNot);
-                }
-                else
-                    AddFunctionOpcode(cAbsAnd);
-            }
-            else
-                AddFunctionOpcode(cAnd);
-            --StackPtr;
-        }
-        if(*function != '&') break;
-        ++function;
-        SkipSpace(function);
-        param0end = data->ByteCode.size();
-    }
-    return function;
-}
-
-template<typename Value_t>
-const char*
-FunctionParserBase<Value_t>::CompileExpression(const char* function)
-{
-    size_t param0end=0;
-    while(true)
-    {
-        SkipSpace(function);
-        function = CompileAnd(function);
-        if(!function) return 0;
-
-        if(param0end)
-        {
-            if(data->ByteCode.back() == cNotNot) data->ByteCode.pop_back();
-
-            unsigned& param0last = data->ByteCode[param0end-1];
-            unsigned& param1last = data->ByteCode.back();
-            if(IsNeverNegativeValueOpcode(param1last)
-            && IsNeverNegativeValueOpcode(param0last))
-            {
-                /* Change !x | !y into !(x & y). Because y might
-                 * contain an cIf, we replace the first cNot/cAbsNot
-                 * with cNop to avoid jump indices being broken.
-                 */
-                if((param0last == cNot || param0last == cAbsNot)
-                && (param1last == cNot || param1last == cAbsNot))
-                {
-                    param1last = (param0last==cAbsNot && param1last==cAbsNot)
-                                    ? cAbsAnd : cAnd;
-                    param0last = cNop;
-                    AddFunctionOpcode(cAbsNot);
-                }
-                else
-                    AddFunctionOpcode(cAbsOr);
-            }
-            else
-                AddFunctionOpcode(cOr);
-            --StackPtr;
-        }
-        if(*function != '|') break;
-        ++function;
-        param0end = data->ByteCode.size();
-    }
-    return function;
-}
-
-//===========================================================================
-// Function evaluation
-//===========================================================================
-template<typename Value_t>
-Value_t FunctionParserBase<Value_t>::Eval(const Value_t* Vars)
-{
-    if(parseErrorType != FP_NO_ERROR) return Value_t(0);
-
-    const unsigned* const ByteCode = &(data->ByteCode[0]);
-    const Value_t* const Immed = data->Immed.empty() ? 0 : &(data->Immed[0]);
-    const unsigned ByteCodeSize = unsigned(data->ByteCode.size());
-    unsigned IP, DP=0;
-    int SP=-1;
-
-#ifdef FP_USE_THREAD_SAFE_EVAL
-    /* If Eval() may be called by multiple threads simultaneously,
-     * then Eval() must allocate its own stack.
-     */
-#ifdef FP_USE_THREAD_SAFE_EVAL_WITH_ALLOCA
-    /* alloca() allocates room from the hardware stack.
-     * It is automatically freed when the function returns.
-     */
-    Value_t* const Stack = (Value_t*)alloca(data->StackSize*sizeof(Value_t));
-#else
-    /* Allocate from the heap. Ensure that it is freed
-     * automatically no matter which exit path is taken.
-     */
-    struct AutoDealloc
-    {
-        Value_t* ptr;
-        ~AutoDealloc() { delete[] ptr; }
-    } AutoDeallocStack = { new Value_t[data->StackSize] };
-    Value_t*& Stack = AutoDeallocStack.ptr;
-#endif
-#else
-    /* No thread safety, so use a global stack. */
-    std::vector<Value_t>& Stack = data->Stack;
-#endif
-
-    for(IP=0; IP<ByteCodeSize; ++IP)
-    {
-        switch(ByteCode[IP])
-        {
-// Functions:
-          case   cAbs: Stack[SP] = fp_abs(Stack[SP]); break;
-
-          case  cAcos:
-#           ifndef FP_NO_EVALUATION_CHECKS
-              if(Stack[SP] < Value_t(-1) || Stack[SP] > Value_t(1))
-              { evalErrorType=4; return Value_t(0); }
-#           endif
-              Stack[SP] = fp_acos(Stack[SP]); break;
-
-          case cAcosh:
-#           ifndef FP_NO_EVALUATION_CHECKS
-              if(Stack[SP] < Value_t(1))
-              { evalErrorType=4; return Value_t(0); }
-#           endif
-              Stack[SP] = fp_acosh(Stack[SP]); break;
-
-          case  cAsin:
-#           ifndef FP_NO_EVALUATION_CHECKS
-              if(Stack[SP] < Value_t(-1) || Stack[SP] > Value_t(1))
-              { evalErrorType=4; return Value_t(0); }
-#           endif
-              Stack[SP] = fp_asin(Stack[SP]); break;
-
-          case cAsinh: Stack[SP] = fp_asinh(Stack[SP]); break;
-
-          case  cAtan: Stack[SP] = fp_atan(Stack[SP]); break;
-
-          case cAtan2: Stack[SP-1] = fp_atan2(Stack[SP-1], Stack[SP]);
-                       --SP; break;
-
-          case cAtanh:
-#           ifndef FP_NO_EVALUATION_CHECKS
-              if(Stack[SP] <= Value_t(-1) || Stack[SP] >= Value_t(1))
-              { evalErrorType=4; return Value_t(0); }
-#           endif
-              Stack[SP] = fp_atanh(Stack[SP]); break;
-
-          case  cCbrt: Stack[SP] = fp_cbrt(Stack[SP]); break;
-
-          case  cCeil: Stack[SP] = fp_ceil(Stack[SP]); break;
-
-          case   cCos: Stack[SP] = fp_cos(Stack[SP]); break;
-
-          case  cCosh: Stack[SP] = fp_cosh(Stack[SP]); break;
-
-          case   cCot:
-              {
-                  const Value_t t = fp_tan(Stack[SP]);
-#               ifndef FP_NO_EVALUATION_CHECKS
-                  if(t == Value_t(0)) { evalErrorType=1; return Value_t(0); }
-#               endif
-                  Stack[SP] = Value_t(1)/t; break;
-              }
-
-          case   cCsc:
-              {
-                  const Value_t s = fp_sin(Stack[SP]);
-#               ifndef FP_NO_EVALUATION_CHECKS
-                  if(s == 0) { evalErrorType=1; return Value_t(0); }
-#               endif
-                  Stack[SP] = Value_t(1)/s; break;
-              }
-
-
-#       ifndef FP_DISABLE_EVAL
-          case  cEval:
-              {
-                  const unsigned varAmount = data->numVariables;
-                  Value_t retVal = Value_t(0);
-                  if(evalRecursionLevel == FP_EVAL_MAX_REC_LEVEL)
-                  {
-                      evalErrorType = 5;
-                  }
-                  else
-                  {
-                      ++evalRecursionLevel;
-#                   ifndef FP_USE_THREAD_SAFE_EVAL
-                      /* Eval() will use data->Stack for its storage.
-                       * Swap the current stack with an empty one.
-                       * This is the not-thread-safe method.
-                       */
-                      std::vector<Value_t> tmpStack(Stack.size());
-                      data->Stack.swap(tmpStack);
-                      retVal = Eval(&tmpStack[SP - varAmount + 1]);
-                      data->Stack.swap(tmpStack);
-#                   else
-                      /* Thread safety mode. We don't need to
-                       * worry about stack reusing here, because
-                       * each instance of Eval() will allocate
-                       * their own stack.
-                       */
-                      retVal = Eval(&Stack[SP - varAmount + 1]);
-#                   endif
-                      --evalRecursionLevel;
-                  }
-                  SP -= varAmount-1;
-                  Stack[SP] = retVal;
-                  break;
-              }
-#       endif
-
-          case   cExp: Stack[SP] = fp_exp(Stack[SP]); break;
-
-          case   cExp2: Stack[SP] = fp_exp2(Stack[SP]); break;
-
-          case cFloor: Stack[SP] = fp_floor(Stack[SP]); break;
-
-          case    cIf:
-                  if(truthValue(Stack[SP--]))
-                      IP += 2;
-                  else
-                  {
-                      const unsigned* buf = &ByteCode[IP+1];
-                      IP = buf[0];
-                      DP = buf[1];
-                  }
-                  break;
-
-          case   cInt: Stack[SP] = fp_int(Stack[SP]); break;
-
-          case   cLog:
-#           ifndef FP_NO_EVALUATION_CHECKS
-              if(!(Stack[SP] > Value_t(0)))
-              { evalErrorType=3; return Value_t(0); }
-#           endif
-              Stack[SP] = fp_log(Stack[SP]); break;
-
-          case cLog10:
-#           ifndef FP_NO_EVALUATION_CHECKS
-              if(!(Stack[SP] > Value_t(0)))
-              { evalErrorType=3; return Value_t(0); }
-#           endif
-              Stack[SP] = fp_log10(Stack[SP]);
-              break;
-
-          case  cLog2:
-#           ifndef FP_NO_EVALUATION_CHECKS
-              if(!(Stack[SP] > Value_t(0)))
-              { evalErrorType=3; return Value_t(0); }
-#           endif
-              Stack[SP] = fp_log2(Stack[SP]);
-              break;
-
-          case   cMax: Stack[SP-1] = Max(Stack[SP-1], Stack[SP]);
-                       --SP; break;
-
-          case   cMin: Stack[SP-1] = Min(Stack[SP-1], Stack[SP]);
-                       --SP; break;
-
-          case   cPow:
-#           ifndef FP_NO_EVALUATION_CHECKS
-              // x:Negative ^ y:NonInteger is failure,
-              // except when the reciprocal of y forms an integer
-              /*if(Stack[SP-1] < Value_t(0) &&
-                 !IsIntegerConst(Stack[SP]) &&
-                 !IsIntegerConst(1.0 / Stack[SP]))
-              { evalErrorType=3; return Value_t(0); }*/
-              // x:0 ^ y:negative is failure
-              if(Stack[SP-1] == Value_t(0) &&
-                 Stack[SP] < Value_t(0))
-              { evalErrorType=3; return Value_t(0); }
-#           endif
-              Stack[SP-1] = fp_pow(Stack[SP-1], Stack[SP]);
-              --SP; break;
-
-          case  cTrunc: Stack[SP] = fp_trunc(Stack[SP]); break;
-
-          case   cSec:
-              {
-                  const Value_t c = fp_cos(Stack[SP]);
-#               ifndef FP_NO_EVALUATION_CHECKS
-                  if(c == Value_t(0)) { evalErrorType=1; return Value_t(0); }
-#               endif
-                  Stack[SP] = Value_t(1)/c; break;
-              }
-
-          case   cSin: Stack[SP] = fp_sin(Stack[SP]); break;
-
-          case  cSinh: Stack[SP] = fp_sinh(Stack[SP]); break;
-
-          case  cSqrt:
-#           ifndef FP_NO_EVALUATION_CHECKS
-              if(Stack[SP] < Value_t(0)) { evalErrorType=2; return Value_t(0); }
-#           endif
-              Stack[SP] = fp_sqrt(Stack[SP]); break;
-
-          case   cTan: Stack[SP] = fp_tan(Stack[SP]); break;
-
-          case  cTanh: Stack[SP] = fp_tanh(Stack[SP]); break;
-
-
-// Misc:
-          case cImmed: Stack[++SP] = Immed[DP++]; break;
-
-          case  cJump:
-              {
-                  const unsigned* buf = &ByteCode[IP+1];
-                  IP = buf[0];
-                  DP = buf[1];
-                  break;
-              }
-
-// Operators:
-          case   cNeg: Stack[SP] = -Stack[SP]; break;
-          case   cAdd: Stack[SP-1] += Stack[SP]; --SP; break;
-          case   cSub: Stack[SP-1] -= Stack[SP]; --SP; break;
-          case   cMul: Stack[SP-1] *= Stack[SP]; --SP; break;
-
-          case   cDiv:
-#           ifndef FP_NO_EVALUATION_CHECKS
-              if(Stack[SP] == Value_t(0))
-              { evalErrorType=1; return Value_t(0); }
-#           else
-              if(IsIntType<Value_t>::result && Stack[SP] == Value_t(0))
-              { evalErrorType=1; return Value_t(0); }
-#           endif
-              Stack[SP-1] /= Stack[SP]; --SP; break;
-
-          case   cMod:
-              if(Stack[SP] == Value_t(0))
-              { evalErrorType=1; return Value_t(0); }
-              Stack[SP-1] = fp_mod(Stack[SP-1], Stack[SP]);
-              --SP; break;
-
-          case cEqual:
-              Stack[SP-1] = fp_equal(Stack[SP-1], Stack[SP]);
-              --SP; break;
-
-          case cNEqual:
-              Stack[SP-1] = fp_nequal(Stack[SP-1], Stack[SP]);
-              --SP; break;
-
-          case  cLess:
-              Stack[SP-1] = fp_less(Stack[SP-1], Stack[SP]);
-              --SP; break;
-
-          case  cLessOrEq:
-              Stack[SP-1] = fp_lessOrEq(Stack[SP-1], Stack[SP]);
-              --SP; break;
-
-          case cGreater:
-              Stack[SP-1] = fp_less(Stack[SP], Stack[SP-1]);
-              --SP; break;
-
-          case cGreaterOrEq:
-              Stack[SP-1] = fp_lessOrEq(Stack[SP], Stack[SP-1]);
-              --SP; break;
-
-          case   cNot: Stack[SP] = Value_t(!truthValue(Stack[SP])); break;
-
-          case   cAnd:
-              Stack[SP-1] = Value_t
-                  (truthValue(Stack[SP-1]) && truthValue(Stack[SP]));
-              --SP; break;
-
-          case    cOr:
-              Stack[SP-1] = Value_t
-                  (truthValue(Stack[SP-1]) || truthValue(Stack[SP]));
-              --SP; break;
-
-          case cNotNot: Stack[SP] = Value_t(truthValue(Stack[SP])); break;
-
-// Degrees-radians conversion:
-          case   cDeg: Stack[SP] = RadiansToDegrees(Stack[SP]); break;
-          case   cRad: Stack[SP] = DegreesToRadians(Stack[SP]); break;
-
-// User-defined function calls:
-          case cFCall:
-              {
-                  unsigned index = ByteCode[++IP];
-                  unsigned params = data->FuncPtrs[index].params;
-                  Value_t retVal =
-                      data->FuncPtrs[index].funcPtr(&Stack[SP-params+1]);
-                  SP -= int(params)-1;
-                  Stack[SP] = retVal;
-                  break;
-              }
-
-          case cPCall:
-              {
-                  unsigned index = ByteCode[++IP];
-                  unsigned params = data->FuncParsers[index].params;
-                  Value_t retVal =
-                      data->FuncParsers[index].parserPtr->Eval
-                      (&Stack[SP-params+1]);
-                  SP -= int(params)-1;
-                  Stack[SP] = retVal;
-                  const int error =
-                      data->FuncParsers[index].parserPtr->EvalError();
-                  if(error)
-                  {
-                      evalErrorType = error;
-                      return 0;
-                  }
-                  break;
-              }
-
-
-#ifdef FP_SUPPORT_OPTIMIZER
-          case   cFetch:
-              {
-                  unsigned stackOffs = ByteCode[++IP];
-                  Stack[SP+1] = Stack[stackOffs]; ++SP;
-                  break;
-              }
-
-          case   cPopNMov:
-              {
-                  unsigned stackOffs_target = ByteCode[++IP];
-                  unsigned stackOffs_source = ByteCode[++IP];
-                  Stack[stackOffs_target] = Stack[stackOffs_source];
-                  SP = stackOffs_target;
-                  break;
-              }
-
-          case  cLog2by:
-#           ifndef FP_NO_EVALUATION_CHECKS
-              if(Stack[SP-1] <= Value_t(0))
-              { evalErrorType=3; return Value_t(0); }
-#           endif
-              Stack[SP-1] = fp_log2(Stack[SP-1]) * Stack[SP];
-              --SP;
-              break;
-#endif // FP_SUPPORT_OPTIMIZER
-          case cAbsNot:
-              Stack[SP] = Value_t(!truthValue_abs(Stack[SP])); break;
-          case cAbsNotNot:
-              Stack[SP] = Value_t(truthValue_abs(Stack[SP])); break;
-          case cAbsAnd:
-              Stack[SP-1] = Value_t(truthValue_abs(Stack[SP-1]) &&
-                                    truthValue_abs(Stack[SP]));
-              --SP; break;
-          case cAbsOr:
-              Stack[SP-1] = Value_t(truthValue_abs(Stack[SP-1]) ||
-                                    truthValue_abs(Stack[SP]));
-              --SP; break;
-          case cAbsIf:
-              if(truthValue_abs(Stack[SP--]))
-                  IP += 2;
-              else
-              {
-                  const unsigned* buf = &ByteCode[IP+1];
-                  IP = buf[0];
-                  DP = buf[1];
-              }
-              break;
-
-          case   cDup: Stack[SP+1] = Stack[SP]; ++SP; break;
-
-          case   cInv:
-#           ifndef FP_NO_EVALUATION_CHECKS
-              if(Stack[SP] == Value_t(0))
-              { evalErrorType=1; return Value_t(0); }
-#           else
-              if(IsIntType<Value_t>::result && Stack[SP] == Value_t(0))
-              { evalErrorType=1; return Value_t(0); }
-#           endif
-              Stack[SP] = Value_t(1)/Stack[SP];
-              break;
-
-          case   cSqr:
-              Stack[SP] = Stack[SP]*Stack[SP];
-              break;
-
-          case   cRDiv:
-#           ifndef FP_NO_EVALUATION_CHECKS
-              if(Stack[SP-1] == Value_t(0))
-              { evalErrorType=1; return Value_t(0); }
-#           else
-              if(IsIntType<Value_t>::result && Stack[SP-1] == Value_t(0))
-              { evalErrorType=1; return Value_t(0); }
-#           endif
-              Stack[SP-1] = Stack[SP] / Stack[SP-1]; --SP; break;
-
-          case   cRSub: Stack[SP-1] = Stack[SP] - Stack[SP-1]; --SP; break;
-
-          case   cRSqrt:
-#           ifndef FP_NO_EVALUATION_CHECKS
-              if(Stack[SP] == Value_t(0))
-              { evalErrorType=1; return Value_t(0); }
-#           endif
-              Stack[SP] = Value_t(1) / fp_sqrt(Stack[SP]); break;
-
-          case cNop: break;
-
-// Variables:
-          default:
-              Stack[++SP] = Vars[ByteCode[IP]-VarBegin];
-        }
-    }
-
-    evalErrorType=0;
-    return Stack[SP];
-}
-
-
-//===========================================================================
-// Variable deduction
-//===========================================================================
-namespace
-{
-    template<typename Value_t>
-    int deduceVariables(FunctionParserBase<Value_t>& fParser,
-                        const char* funcStr,
-                        std::string& destVarString,
-                        int* amountOfVariablesFound,
-                        std::vector<std::string>* destVarNames,
-                        bool useDegrees)
-    {
-        typedef std::set<std::string> StrSet;
-        StrSet varNames;
-
-        int oldIndex = -1;
-
-        while(true)
-        {
-            destVarString.clear();
-            for(StrSet::iterator iter = varNames.begin();
-                iter != varNames.end();
-                ++iter)
-            {
-                if(iter != varNames.begin()) destVarString += ",";
-                destVarString += *iter;
-            }
-
-            const int index =
-                fParser.Parse(funcStr, destVarString, useDegrees);
-            if(index < 0) break;
-            if(index == oldIndex) return index;
-
-            unsigned nameLength = readOpcode<Value_t>(funcStr + index);
-            if(nameLength & 0x80000000U) return index;
-            if(nameLength == 0) return index;
-
-            varNames.insert(std::string(funcStr + index, nameLength));
-            oldIndex = index;
-        }
-
-        if(amountOfVariablesFound)
-            *amountOfVariablesFound = int(varNames.size());
-
-        if(destVarNames)
-            destVarNames->assign(varNames.begin(), varNames.end());
-
-        return -1;
-    }
-}
-
-template<typename Value_t>
-int FunctionParserBase<Value_t>::ParseAndDeduceVariables
-(const std::string& function,
- int* amountOfVariablesFound,
- bool useDegrees)
-{
-    std::string varString;
-    return deduceVariables(*this, function.c_str(), varString,
-                           amountOfVariablesFound, 0, useDegrees);
-}
-
-template<typename Value_t>
-int FunctionParserBase<Value_t>::ParseAndDeduceVariables
-(const std::string& function,
- std::string& resultVarString,
- int* amountOfVariablesFound,
- bool useDegrees)
-{
-    std::string varString;
-    const int index =
-        deduceVariables(*this, function.c_str(), varString,
-                        amountOfVariablesFound, 0, useDegrees);
-    if(index < 0) resultVarString = varString;
-    return index;
-}
-
-template<typename Value_t>
-int FunctionParserBase<Value_t>::ParseAndDeduceVariables
-(const std::string& function,
- std::vector<std::string>& resultVars,
- bool useDegrees)
-{
-    std::string varString;
-    std::vector<std::string> vars;
-    const int index =
-        deduceVariables(*this, function.c_str(), varString,
-                        0, &vars, useDegrees);
-    if(index < 0) resultVars.swap(vars);
-    return index;
-}
-
-
-//===========================================================================
-// Debug output
-//===========================================================================
-#ifdef FUNCTIONPARSER_SUPPORT_DEBUG_OUTPUT
-#include <iomanip>
-#include <sstream>
-namespace
-{
-    inline void printHex(std::ostream& dest, unsigned n)
-    {
-        std::ios::fmtflags flags = dest.flags();
-        dest.width(4); dest.fill('0'); std::hex(dest); //uppercase(dest);
-        dest << n;
-        dest.flags(flags);
-    }
-
-    void padLine(std::ostringstream& dest, unsigned destLength)
-    {
-        for(size_t currentLength = dest.str().length();
-            currentLength < destLength;
-            ++currentLength)
-        {
-            dest << ' ';
-        }
-    }
-
-    const struct PowiMuliType
-    {
-        unsigned opcode_square;
-        unsigned opcode_cumulate;
-        unsigned opcode_invert;
-        unsigned opcode_half;
-        unsigned opcode_invhalf;
-    } iseq_powi = {cSqr,cMul,cInv,cSqrt,cRSqrt},
-      iseq_muli = {~unsigned(0), cAdd,cNeg, ~unsigned(0),~unsigned(0) };
-
-    template<typename Value_t>
-    Value_t ParsePowiMuli(
-        const PowiMuliType& opcodes,
-        const std::vector<unsigned>& ByteCode, unsigned& IP,
-        unsigned limit,
-        size_t factor_stack_base,
-        std::vector<Value_t>& stack,
-        bool IgnoreExcess)
-    {
-        Value_t result = Value_t(1);
-        while(IP < limit)
-        {
-            if(ByteCode[IP] == opcodes.opcode_square)
-            {
-                if(!IsIntegerConst(result)) break;
-                result *= Value_t(2);
-                ++IP;
-                continue;
-            }
-            if(ByteCode[IP] == opcodes.opcode_invert)
-            {
-                if(result < Value_t(0)) break;
-                result = -result;
-                ++IP;
-                continue;
-            }
-            if(ByteCode[IP] == opcodes.opcode_half)
-            {
-                if(IsIntegerConst(result) && result > Value_t(0) &&
-                   (valueToInt(result)) % 2 == 0)
-                    break;
-                if(IsIntegerConst(result * Value_t(0.5))) break;
-                result *= Value_t(0.5);
-                ++IP;
-                continue;
-            }
-            if(ByteCode[IP] == opcodes.opcode_invhalf)
-            {
-                if(IsIntegerConst(result) && result > Value_t(0) &&
-                   (valueToInt(result)) % 2 == 0)
-                    break;
-                if(IsIntegerConst(result * Value_t(-0.5))) break;
-                result *= Value_t(-0.5);
-                ++IP;
-                continue;
-            }
-
-            unsigned dup_fetch_pos = IP;
-            Value_t lhs = Value_t(1);
-
-    #ifdef FP_SUPPORT_OPTIMIZER
-            if(ByteCode[IP] == cFetch)
-            {
-                unsigned index = ByteCode[++IP];
-                if(index < factor_stack_base
-                || size_t(index-factor_stack_base) >= stack.size())
-                {
-                    // It wasn't a powi-fetch after all
-                    IP = dup_fetch_pos;
-                    break;
-                }
-                lhs = stack[index - factor_stack_base];
-                // Note: ^This assumes that cFetch of recentmost
-                //        is always converted into cDup.
-                goto dup_or_fetch;
-            }
-    #endif
-            if(ByteCode[IP] == cDup)
-            {
-                lhs = result;
-                goto dup_or_fetch;
-
-            dup_or_fetch:
-                stack.push_back(result);
-                ++IP;
-                Value_t subexponent = ParsePowiMuli
-                    (opcodes,
-                     ByteCode, IP, limit,
-                     factor_stack_base, stack,
-                     IgnoreExcess);
-                if(IP >= limit && IgnoreExcess)
-                    return lhs*subexponent;
-                if(IP >= limit || ByteCode[IP] != opcodes.opcode_cumulate)
-                {
-                    // It wasn't a powi-dup after all
-                    IP = dup_fetch_pos;
-                    break;
-                }
-                ++IP; // skip opcode_cumulate
-                stack.pop_back();
-                result += lhs*subexponent;
-                continue;
-            }
-            break;
-        }
-        return result;
-    }
-
-    template<typename Value_t>
-    Value_t ParsePowiSequence(const std::vector<unsigned>& ByteCode,
-                              unsigned& IP, unsigned limit,
-                              size_t factor_stack_base,
-                              bool IgnoreExcess = false)
-    {
-        std::vector<Value_t> stack;
-        stack.push_back(Value_t(1));
-        return ParsePowiMuli(iseq_powi, ByteCode, IP, limit,
-                             factor_stack_base, stack,
-                             IgnoreExcess);
-    }
-
-    template<typename Value_t>
-    Value_t ParseMuliSequence(const std::vector<unsigned>& ByteCode,
-                              unsigned& IP, unsigned limit,
-                              size_t factor_stack_base,
-                              bool IgnoreExcess = false)
-    {
-        std::vector<Value_t> stack;
-        stack.push_back(Value_t(1));
-        return ParsePowiMuli(iseq_muli, ByteCode, IP, limit,
-                             factor_stack_base, stack,
-                             IgnoreExcess);
-    }
-
-    struct IfInfo
-    {
-        std::pair<int,std::string> condition;
-        std::pair<int,std::string> thenbranch;
-        unsigned endif_location;
-
-        IfInfo() : condition(), thenbranch(), endif_location() { }
-    };
-}
-
-template<typename Value_t>
-void FunctionParserBase<Value_t>::PrintByteCode(std::ostream& dest,
-                                                bool showExpression) const
-{
-    dest << "Size of stack: " << data->StackSize << "\n";
-
-    std::ostringstream outputBuffer;
-    std::ostream& output = (showExpression ? outputBuffer : dest);
-
-    const std::vector<unsigned>& ByteCode = data->ByteCode;
-    const std::vector<Value_t>& Immed = data->Immed;
-
-    std::vector<std::pair<int,std::string> > stack;
-    std::vector<IfInfo> if_stack;
-
-    for(unsigned IP = 0, DP = 0; IP <= ByteCode.size(); ++IP)
-    {
-    after_powi_or_muli:;
-        std::string n;
-        bool out_params = false;
-        unsigned params = 2, produces = 1, opcode = 0;
-
-        if(showExpression && !if_stack.empty() &&
-          (   // Normal If termination rule:
-              if_stack.back().endif_location == IP
-              // This rule matches when cJumps are threaded:
-           || (IP < ByteCode.size() && ByteCode[IP] == cJump
-               && !if_stack.back().thenbranch.second.empty())
-          ))
-        {
-            printHex(output, IP);
-            if(if_stack.back().endif_location == IP)
-                output << ": (phi)";
-            else
-                output << ": (phi_threaded)";
-
-            stack.resize(stack.size()+2);
-            std::swap(stack[stack.size()-3], stack[stack.size()-1]);
-            std::swap(if_stack.back().condition,  stack[stack.size()-3]);
-            std::swap(if_stack.back().thenbranch, stack[stack.size()-2]);
-            opcode = cIf;
-            params = 3;
-            --IP;
-            if_stack.pop_back();
-        }
-        else
-        {
-            if(IP >= ByteCode.size()) break;
-            opcode = ByteCode[IP];
-
-            if(showExpression && (
-                opcode == cSqr || opcode == cDup
-             || opcode == cInv
-             || opcode == cSqrt || opcode == cRSqrt
-    #ifdef FP_SUPPORT_OPTIMIZER
-             || opcode == cFetch
-    #endif
-            ))
-            {
-                unsigned changed_ip = IP;
-                Value_t exponent =
-                    ParsePowiSequence<Value_t>
-                    (ByteCode, changed_ip,
-                     if_stack.empty()
-                     ? (unsigned)ByteCode.size()
-                     : if_stack.back().endif_location,
-                     stack.size()-1);
-                std::string        operation_prefix;
-                std::ostringstream operation_value;
-                int prio = 0;
-                if(exponent == 1.0)
-                {
-                    if(opcode != cDup) goto not_powi_or_muli;
-                    Value_t factor =
-                        ParseMuliSequence<Value_t>
-                        (ByteCode, changed_ip,
-                         if_stack.empty()
-                         ? (unsigned)ByteCode.size()
-                         : if_stack.back().endif_location,
-                         stack.size()-1);
-                    if(factor == Value_t(1) || factor == Value_t(-1))
-                        goto not_powi_or_muli;
-                    operation_prefix = "*";
-                    operation_value << factor;
-                    prio = 3;
-                }
-                else
-                {
-                    prio = 2;
-                    operation_prefix = "^";
-                    operation_value << exponent;
-                }
-
-                //unsigned explanation_before = changed_ip-2;
-                unsigned explanation_before = changed_ip-1;
-
-                const char* explanation_prefix = "_";
-                for(const unsigned first_ip = IP; IP < changed_ip; ++IP)
-                {
-                    printHex(output, IP);
-                    output << ": ";
-
-                    const char* sep = "|";
-                    if(first_ip+1 == changed_ip)
-                    { sep = "="; explanation_prefix = " "; }
-                    else if(IP   == first_ip) sep = "\\";
-                    else if(IP+1 == changed_ip) sep = "/";
-                    else explanation_prefix = "=";
-
-                    switch(ByteCode[IP])
-                    {
-                        case cInv: output << "inv"; break;
-                        case cNeg: output << "neg"; break;
-                        case cDup: output << "dup"; break;
-                        case cSqr: output << "sqr"; break;
-                        case cMul: output << "mul"; break;
-                        case cAdd: output << "add"; break;
-                        case cCbrt: output << "cbrt"; break;
-                        case cSqrt: output << "sqrt"; break;
-                        case cRSqrt: output << "rsqrt"; break;
-    #ifdef FP_SUPPORT_OPTIMIZER
-                        case cFetch:
-                        {
-                            unsigned index = ByteCode[++IP];
-                            output << "cFetch(" << index << ")";
-                            break;
-                        }
-    #endif
-                        default: break;
-                    }
-                    padLine(outputBuffer, 20);
-                    output << sep;
-                    if(IP >= explanation_before)
-                    {
-                        explanation_before = (unsigned)ByteCode.size();
-                        output << explanation_prefix
-                               << '[' << (stack.size()-1) << ']';
-                        std::string last = stack.back().second;
-                        if(stack.back().first >= prio)
-                            last = "(" + last + ")";
-                        output << last;
-                        output << operation_prefix;
-                        output << operation_value.str();
-                    }
-                    else
-                    {
-                        unsigned p = first_ip;
-                        Value_t exp = operation_prefix=="^" ?
-                            ParsePowiSequence<Value_t>
-                            (ByteCode, p, IP+1, stack.size()-1, true) :
-                            ParseMuliSequence<Value_t>
-                            (ByteCode, p, IP+1, stack.size()-1, true);
-                        std::string last = stack.back().second;
-                        if(stack.back().first >= prio)
-                            last = "(" + last + ")";
-                        output << " ..." << last;
-                        output << operation_prefix;
-                        output << exp;
-                    }
-                    dest << outputBuffer.str() << std::endl;
-                    outputBuffer.str("");
-                }
-
-                std::string& last = stack.back().second;
-                if(stack.back().first >= prio)
-                    last = "(" + last + ")";
-                last += operation_prefix;
-                last += operation_value.str();
-                stack.back().first = prio;
-
-                goto after_powi_or_muli;
-            }
-        not_powi_or_muli:;
-            printHex(output, IP);
-            output << ": ";
-
-            switch(opcode)
-            {
-              case cIf:
-              {
-                  unsigned label = ByteCode[IP+1]+1;
-                  output << "jz ";
-                  printHex(output, label);
-                  params = 1;
-                  produces = 0;
-                  IP += 2;
-
-                  if_stack.resize(if_stack.size() + 1);
-                  std::swap( if_stack.back().condition, stack.back() );
-                  if_stack.back().endif_location = (unsigned) ByteCode.size();
-                  stack.pop_back();
-                  break;
-              }
-              case cAbsIf:
-              {
-                  unsigned dp    = ByteCode[IP+2];
-                  unsigned label = ByteCode[IP+1]+1;
-                  output << "jz_abs " << dp << ",";
-                  printHex(output, label);
-                  params = 1;
-                  produces = 0;
-                  IP += 2;
-
-                  if_stack.resize(if_stack.size() + 1);
-                  std::swap( if_stack.back().condition, stack.back() );
-                  if_stack.back().endif_location = (unsigned) ByteCode.size();
-                  stack.pop_back();
-                  break;
-              }
-
-              case cJump:
-              {
-                  unsigned dp    = ByteCode[IP+2];
-                  unsigned label = ByteCode[IP+1]+1;
-
-                  if(!if_stack.empty() && !stack.empty())
-                  {
-                      std::swap(if_stack.back().thenbranch, stack.back());
-                      if_stack.back().endif_location = label;
-                      stack.pop_back();
-                  }
-
-                  output << "jump " << dp << ",";
-                  printHex(output, label);
-                  params = 0;
-                  produces = 0;
-                  IP += 2;
-                  break;
-              }
-              case cImmed:
-              {
-                  if(showExpression)
-                  {
-                      std::ostringstream buf;
-                      buf.precision(8);
-                      buf << Immed[DP];
-                      stack.push_back( std::make_pair(0, buf.str()) );
-                  }
-                  output.precision(8);
-                  output << "push " << Immed[DP];
-                  ++DP;
-                  produces = 0;
-                  break;
-              }
-
-              case cFCall:
-                  {
-                      const unsigned index = ByteCode[++IP];
-                      params = data->FuncPtrs[index].params;
-                      static std::string name;
-                      name = "f:" + findName(data->namePtrs, index,
-                                             NameData<Value_t>::FUNC_PTR);
-                      n = name.c_str();
-                      out_params = true;
-                      break;
-                  }
-
-              case cPCall:
-                  {
-                      const unsigned index = ByteCode[++IP];
-                      params = data->FuncParsers[index].params;
-                      static std::string name;
-                      name = "p:" + findName(data->namePtrs, index,
-                                             NameData<Value_t>::PARSER_PTR);
-                      n = name.c_str();
-                      out_params = true;
-                      break;
-                  }
-
-              default:
-                  if(OPCODE(opcode) < VarBegin)
-                  {
-                      switch(opcode)
-                      {
-                        case cNeg: n = "neg"; params = 1; break;
-                        case cAdd: n = "add"; break;
-                        case cSub: n = "sub"; break;
-                        case cMul: n = "mul"; break;
-                        case cDiv: n = "div"; break;
-                        case cMod: n = "mod"; break;
-                        case cPow: n = "pow"; break;
-                        case cEqual: n = "eq"; break;
-                        case cNEqual: n = "neq"; break;
-                        case cLess: n = "lt"; break;
-                        case cLessOrEq: n = "le"; break;
-                        case cGreater: n = "gt"; break;
-                        case cGreaterOrEq: n = "ge"; break;
-                        case cAnd: n = "and"; break;
-                        case cOr: n = "or"; break;
-                        case cNot: n = "not"; params = 1; break;
-                        case cNotNot: n = "notnot"; params = 1; break;
-                        case cDeg: n = "deg"; params = 1; break;
-                        case cRad: n = "rad"; params = 1; break;
-
-    #ifndef FP_DISABLE_EVAL
-                        case cEval: n = "eval"; params = data->numVariables;
-    #endif
-
-    #ifdef FP_SUPPORT_OPTIMIZER
-                        case cLog2by: n = "log2by"; params = 2; out_params = 1; break;
-                        case cFetch:
-                        {
-                            unsigned index = ByteCode[++IP];
-                            if(showExpression && index < stack.size())
-                                stack.push_back(stack[index]);
-                            output << "cFetch(" << index << ")";
-                            produces = 0;
-                            break;
-                        }
-                        case cPopNMov:
-                        {
-                            size_t a = ByteCode[++IP];
-                            size_t b = ByteCode[++IP];
-                            if(showExpression && b < stack.size())
-                            {
-                                std::pair<int, std::string> stacktop(0, "?");
-                                if(b < stack.size()) stacktop = stack[b];
-                                stack.resize(a);
-                                stack.push_back(stacktop);
-                            }
-                            output << "cPopNMov(" << a << ", " << b << ")";
-                            produces = 0;
-                            break;
-                        }
-    #endif
-                        case cAbsAnd: n = "abs_and"; break;
-                        case cAbsOr:  n = "abs_or"; break;
-                        case cAbsNot: n = "abs_not"; params = 1; break;
-                        case cAbsNotNot: n = "abs_notnot"; params = 1; break;
-                        case cDup:
-                        {
-                            if(showExpression)
-                                stack.push_back(stack.back());
-                            output << "dup";
-                            produces = 0;
-                            break;
-                        }
-                        case cInv: n = "inv"; params = 1; break;
-                        case cSqr: n = "sqr"; params = 1; break;
-                        case cRDiv: n = "rdiv"; break;
-                        case cRSub: n = "rsub"; break;
-                        case cRSqrt: n = "rsqrt"; params = 1; break;
-
-                        case cNop:
-                            output << "nop"; params = 0; produces = 0;
-                            break;
-
-                        default:
-                            n = Functions[opcode-cAbs].name;
-                            params = Functions[opcode-cAbs].params;
-                            out_params = params != 1;
-                      }
-                  }
-                  else
-                  {
-                      if(showExpression)
-                      {
-                          stack.push_back(std::make_pair(0,
-                              (findName(data->namePtrs, opcode,
-                                        NameData<Value_t>::VARIABLE))));
-                      }
-                      output << "push Var" << opcode-VarBegin;
-                      produces = 0;
-                  }
-            }
-        }
-        if(produces) output << n;
-        if(out_params) output << " (" << params << ")";
-        if(showExpression)
-        {
-            padLine(outputBuffer, 20);
-
-            if(produces > 0)
-            {
-                std::ostringstream buf;
-                const char *paramsep = ",", *suff = "";
-                int prio = 0; bool commutative = false;
-                switch(opcode)
-                {
-                  case cIf: buf << "if("; suff = ")";
-                      break;
-                  case cAbsIf: buf << "if("; suff = ")";
-                      break;
-                  case cOr:  prio = 6; paramsep = "|"; commutative = true;
-                      break;
-                  case cAnd: prio = 5; paramsep = "&"; commutative = true;
-                      break;
-                  case cAdd: prio = 4; paramsep = "+"; commutative = true;
-                      break;
-                  case cSub: prio = 4; paramsep = "-";
-                      break;
-                  case cMul: prio = 3; paramsep = "*"; commutative = true;
-                      break;
-                  case cDiv: prio = 3; paramsep = "/";
-                      break;
-                  case cPow: prio = 2; paramsep = "^";
-                      break;
-                  case cAbsOr:  prio = 6; paramsep = "|"; commutative = true;
-                      break;
-                  case cAbsAnd: prio = 5; paramsep = "&"; commutative = true;
-                      break;
-                  case cSqr: prio = 2; suff = "^2";
-                      break;
-                  case cNeg: buf << "(-("; suff = "))";
-                      break;
-                  case cNot: buf << "(!("; suff = "))";
-                      break;
-                  default: buf << n << '('; suff = ")";
-                }
-
-                const char* sep = "";
-                for(unsigned a=0; a<params; ++a)
-                {
-                    buf << sep;
-                    if(stack.size() + a < params)
-                        buf << "?";
-                    else
-                    {
-                        const std::pair<int,std::string>& prev =
-                            stack[stack.size() - params + a];
-                        if(prio > 0 && (prev.first > prio ||
-                                        (prev.first==prio && !commutative)))
-                            buf << '(' << prev.second << ')';
-                        else
-                            buf << prev.second;
-                    }
-                    sep = paramsep;
-                }
-                if(stack.size() >= params)
-                    stack.resize(stack.size() - params);
-                else
-                    stack.clear();
-                buf << suff;
-                stack.push_back(std::make_pair(prio, buf.str()));
-                //if(n.size() <= 4 && !out_params) padLine(outputBuffer, 20);
-            }
-            //padLine(outputBuffer, 20);
-            output << "= ";
-            if(((opcode == cIf || opcode == cAbsIf) && params != 3)
-              || opcode == cJump || opcode == cNop)
-                output << "(void)";
-            else if(stack.empty())
-                output << "[?] ?";
-            else
-                output << '[' << (stack.size()-1) << ']'
-                       << stack.back().second;
-        }
-
-        if(showExpression)
-        {
-            dest << outputBuffer.str() << std::endl;
-            outputBuffer.str("");
-        }
-        else
-            output << std::endl;
-    }
-}
-#endif
-
-
-#ifndef FP_SUPPORT_OPTIMIZER
-template<typename Value_t>
-void FunctionParserBase<Value_t>::Optimize()
-{
-    // Do nothing if no optimizations are supported.
-}
-#endif
-
-FUNCTIONPARSER_INSTANTIATE_TYPES
-
diff --git a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/fparser.h b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/fparser.h
deleted file mode 100644
index fa9695478a..0000000000
--- a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/fparser.h
+++ /dev/null
@@ -1,159 +0,0 @@
-/***************************************************************************\
-|* Function Parser for C++ v4.0.3                                          *|
-|*-------------------------------------------------------------------------*|
-|* Copyright: Juha Nieminen, Joel Yliluoma                                 *|
-\***************************************************************************/
-
-#ifndef ONCE_FPARSER_H_
-#define ONCE_FPARSER_H_
-
-#pragma interface
-
-#include <string>
-#include <vector>
-
-#ifdef FUNCTIONPARSER_SUPPORT_DEBUG_OUTPUT
-#include <iostream>
-#endif
-
-#ifdef _MSC_VER
-// Visual Studio's warning about missing definitions for the explicit
-// FunctionParserBase instantiations is irrelevant here.
-#pragma warning(disable : 4661)
-#endif
-
-namespace FPoptimizer_CodeTree { class CodeTree; }
-
-template<typename Value_t>
-class FunctionParserBase
-{
-public:
-    enum ParseErrorType
-    {
-        SYNTAX_ERROR=0, MISM_PARENTH, MISSING_PARENTH, EMPTY_PARENTH,
-        EXPECT_OPERATOR, OUT_OF_MEMORY, UNEXPECTED_ERROR, INVALID_VARS,
-        ILL_PARAMS_AMOUNT, PREMATURE_EOS, EXPECT_PARENTH_FUNC,
-        UNKNOWN_IDENTIFIER,
-        NO_FUNCTION_PARSED_YET,
-        FP_NO_ERROR
-    };
-
-    typedef Value_t value_type;
-
-
-    int Parse(const char* Function, const std::string& Vars,
-              bool useDegrees = false);
-    int Parse(const std::string& Function, const std::string& Vars,
-              bool useDegrees = false);
-
-    void setDelimiterChar(char);
-
-    const char* ErrorMsg() const;
-    inline ParseErrorType GetParseErrorType() const { return parseErrorType; }
-
-    Value_t Eval(const Value_t* Vars);
-    inline int EvalError() const { return evalErrorType; }
-
-    bool AddConstant(const std::string& name, Value_t value);
-    bool AddUnit(const std::string& name, Value_t value);
-
-    typedef Value_t (*FunctionPtr)(const Value_t*);
-
-    bool AddFunction(const std::string& name,
-                     FunctionPtr, unsigned paramsAmount);
-    bool AddFunction(const std::string& name, FunctionParserBase&);
-
-    bool RemoveIdentifier(const std::string& name);
-
-    void Optimize();
-
-
-    int ParseAndDeduceVariables(const std::string& function,
-                                int* amountOfVariablesFound = 0,
-                                bool useDegrees = false);
-    int ParseAndDeduceVariables(const std::string& function,
-                                std::string& resultVarString,
-                                int* amountOfVariablesFound = 0,
-                                bool useDegrees = false);
-    int ParseAndDeduceVariables(const std::string& function,
-                                std::vector<std::string>& resultVars,
-                                bool useDegrees = false);
-
-
-    FunctionParserBase();
-    ~FunctionParserBase();
-
-    // Copy constructor and assignment operator (implemented using the
-    // copy-on-write technique for efficiency):
-    FunctionParserBase(const FunctionParserBase&);
-    FunctionParserBase& operator=(const FunctionParserBase&);
-
-
-    void ForceDeepCopy();
-
-
-#ifdef FUNCTIONPARSER_SUPPORT_DEBUG_OUTPUT
-    // For debugging purposes only:
-    void PrintByteCode(std::ostream& dest, bool showExpression = true) const;
-#endif
-
-
-
-//========================================================================
-private:
-//========================================================================
-
-// Private data:
-// ------------
-    char delimiterChar;
-    ParseErrorType parseErrorType;
-    int evalErrorType;
-
-    friend class FPoptimizer_CodeTree::CodeTree;
-
-    struct Data;
-    Data* data;
-
-    bool useDegreeConversion;
-    unsigned evalRecursionLevel;
-    unsigned StackPtr;
-    const char* errorLocation;
-
-
-// Private methods:
-// ---------------
-    void CopyOnWrite();
-    bool CheckRecursiveLinking(const FunctionParserBase*) const;
-    bool NameExists(const char*, unsigned);
-    bool ParseVariables(const std::string&);
-    int ParseFunction(const char*, bool);
-    const char* SetErrorType(ParseErrorType, const char*);
-
-    void AddFunctionOpcode(unsigned);
-    void AddImmedOpcode(Value_t v);
-    void incStackPtr();
-    void CompilePowi(int);
-    bool TryCompilePowi(Value_t);
-
-    const char* CompileIf(const char*);
-    const char* CompileFunctionParams(const char*, unsigned);
-    const char* CompileElement(const char*);
-    const char* CompilePossibleUnit(const char*);
-    const char* CompilePow(const char*);
-    const char* CompileUnaryMinus(const char*);
-    const char* CompileMult(const char*);
-    const char* CompileAddition(const char*);
-    const char* CompileComparison(const char*);
-    const char* CompileAnd(const char*);
-    const char* CompileExpression(const char*);
-    inline const char* CompileFunction(const char*, unsigned);
-    inline const char* CompileParenthesis(const char*);
-    inline const char* CompileLiteral(const char*);
-};
-
-class FunctionParser: public FunctionParserBase<double> {};
-class FunctionParser_f: public FunctionParserBase<float> {};
-class FunctionParser_ld: public FunctionParserBase<long double> {};
-class FunctionParser_li: public FunctionParserBase<long> {};
-
-#endif
diff --git a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/fpaux.h b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/fpaux.h
deleted file mode 100644
index a6878bf357..0000000000
--- a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/fpaux.h
+++ /dev/null
@@ -1,599 +0,0 @@
-/***************************************************************************\
-|* Function Parser for C++ v4.0.3                                          *|
-|*-------------------------------------------------------------------------*|
-|* Copyright: Juha Nieminen, Joel Yliluoma                                 *|
-\***************************************************************************/
-
-// NOTE:
-// This file contains only internal types for the function parser library.
-// You don't need to include this file in your code. Include "fparser.hh"
-// only.
-
-#ifndef ONCE_FPARSER_AUX_H_
-#define ONCE_FPARSER_AUX_H_
-
-#include <cmath>
-#include <cstring>
-
-#ifdef FP_SUPPORT_MPFR_FLOAT_TYPE
-#include "mpfr/MpfrFloat.h"
-#endif
-
-#ifdef FP_SUPPORT_GMP_INT_TYPE
-#include "mpfr/GmpInt.h"
-#endif
-
-#ifdef ONCE_FPARSER_H_
-namespace FUNCTIONPARSERTYPES
-{
-//==========================================================================
-// Math funcs
-//==========================================================================
-    /* fp_pow() is a wrapper for std::pow()
-     * that produces an identical value for
-     * exp(1) ^ 2.0  (0x4000000000000000)
-     * as exp(2.0)   (0x4000000000000000)
-     * - std::pow() on x86_64
-     * produces 2.0  (0x3FFFFFFFFFFFFFFF) instead!
-     * See comments below for other special traits.
-     */
-    template<typename ValueT>
-    inline ValueT fp_pow_with_exp_log(const ValueT& x, const ValueT& y)
-    {
-        // Requirements: x > 0.
-        return fp_exp(fp_log(x) * y);
-    }
-
-    template<typename ValueT>
-    inline ValueT fp_powi(ValueT x, unsigned long y)
-    {
-        // Requirements: y is non-negative integer.
-        ValueT result(1);
-        while(y != 0)
-        {
-            if(y & 1) { result *= x; y -= 1; }
-            else      { x *= x;      y /= 2; }
-        }
-        return result;
-    }
-
-    template<typename ValueT>
-    ValueT fp_pow(const ValueT& x, const ValueT& y)
-    {
-        if(x == ValueT(1)) return ValueT(1);
-        // y is now zero or positive
-
-      if(IsIntegerConst(y))
-        {
-            // Use fast binary exponentiation algorithm
-            // See http://en.wikipedia.org/wiki/Exponentiation_by_squaring
-            if(y >= ValueT(0))
-                return fp_powi(x,              (long)y);
-            else
-                return ValueT(1) / fp_powi(x, -(long)y);
-        }
-
-      if(y >= ValueT(0))
-        {
-            // y is now positive. Calculate using exp(log(x)*y).
-            // See http://en.wikipedia.org/wiki/Exponentiation#Real_powers
-            if(x > ValueT(0)) return fp_pow_with_exp_log(x, y);
-            if(x == ValueT(0)) return ValueT(0);
-            // At this point, y > 0.0 and x is known to be < 0.0,
-            // because positive and zero cases are already handled.
-            //
-            if(!IsIntegerConst(y*ValueT(16)))
-                return -fp_pow_with_exp_log(-x, y);
-            // ^This is not technically correct, but it allows
-            // functions such as cbrt(x^5), that is, x^(5/3),
-            // to be evaluated when x is negative.
-            // It is too complicated (and slow) to test whether y
-            // is a formed from a ratio of an integer to an odd integer.
-            // (And due to floating point inaccuracy, pointless too.)
-            // For example, x^1.30769230769... is
-            // actually x^(17/13), i.e. (x^17) ^ (1/13).
-            // (-5)^(17/13) gives us now -8.204227562330453.
-            // To see whether the result is right, we can test the given
-            // root: (-8.204227562330453)^13 gives us the value of (-5)^17,
-            // which proves that the expression was correct.
-            //
-            // The y*16 check prevents e.g. (-4)^(3/2) from being calculated,
-            // as it would confuse functioninfo when pow() returns no error
-            // but sqrt() does when the formula is converted into sqrt(x)*x.
-            //
-            // The errors in this approach are:
-            //     (-2)^sqrt(2) should produce NaN
-            //                  or actually sqrt(2)I + 2^sqrt(2),
-            //                  produces -(2^sqrt(2)) instead.
-            //                  (Impact: Neglible)
-            // Thus, at worst, we're changing a NaN (or complex)
-            // result into a negative real number result.
-        }
-        else
-        {
-            // y is negative. Utilize the x^y = 1/(x^-y) identity.
-            if(x > ValueT(0)) return fp_pow_with_exp_log(ValueT(1) / x, -y);
-            if(x < ValueT(0))
-            {
-                if(!IsIntegerConst(y*ValueT(-16)))
-                    return -fp_pow_with_exp_log(ValueT(-1) / x, -y);
-                // ^ See comment above.
-            }
-            // Remaining case: 0.0 ^ negative number
-        }
-        // This is reached when:
-        //      x=0 and y<0
-        //      x<0 and y*16 is either positive or negative integer
-        // It is used for producing error values and as a safe fallback.
-        return fp_pow_base(x, y);
-    }
-
-// -------------------------------------------------------------------------
-// double
-// -------------------------------------------------------------------------
-    inline double fp_abs(double x) { return fabs(x); }
-    inline double fp_acos(double x) { return acos(x); }
-    inline double fp_asin(double x) { return asin(x); }
-    inline double fp_atan(double x) { return atan(x); }
-    inline double fp_atan2(double x, double y) { return atan2(x, y); }
-#ifdef FP_SUPPORT_CBRT
-    inline double fp_cbrt(double x) { return cbrt(x); }
-#else
-    inline double fp_cbrt(double x) { return x>0 ?  exp(log( x)/3.0)
-                                           : x<0 ? -exp(log(-x)/3.0)
-                                           : 0.0; }
-#endif
-    inline double fp_ceil(double x) { return ceil(x); }
-    inline double fp_cos(double x) { return cos(x); }
-    inline double fp_cosh(double x) { return cosh(x); }
-    inline double fp_exp(double x) { return exp(x); }
-    inline double fp_floor(double x) { return floor(x); }
-    inline double fp_int(double x) { return floor(x + .5); }
-    inline double fp_log(double x) { return log(x); }
-    inline double fp_log10(double x)
-    { return log(x) *
-            0.434294481903251827651128918916605082294397005803666566; }
-    inline double fp_mod(double x, double y) { return fmod(x, y); }
-    inline double fp_sin(double x) { return sin(x); }
-    inline double fp_sinh(double x) { return sinh(x); }
-    inline double fp_sqrt(double x) { return sqrt(x); }
-    inline double fp_tan(double x) { return tan(x); }
-    inline double fp_tanh(double x) { return tanh(x); }
-
-#ifndef FP_SUPPORT_ASINH
-    inline double fp_asinh(double x) { return log(x + sqrt(x*x + 1.0)); }
-    inline double fp_acosh(double x) { return log(x + sqrt(x*x - 1.0)); }
-    inline double fp_atanh(double x) { return log((1.0+x) / (1.0-x)) * 0.5; }
-#else
-    inline double fp_asinh(double x) { return asinh(x); }
-    inline double fp_acosh(double x) { return acosh(x); }
-    inline double fp_atanh(double x) { return atanh(x); }
-#endif // FP_SUPPORT_ASINH
-
-    inline double fp_trunc(double x) { return x<0.0 ? ceil(x) : floor(x); }
-
-    inline double fp_pow_base(double x, double y) { return pow(x, y); }
-
-#ifndef FP_SUPPORT_LOG2
-    inline double fp_log2(double x)
-    { return log(x) * 1.4426950408889634073599246810018921374266459541529859; }
-#else
-    inline double fp_log2(double x) { return log2(x); }
-#endif // FP_SUPPORT_LOG2
-
-    inline double fp_exp2(double x) { return fp_pow(2.0, x); }
-
-#ifdef FP_EPSILON
-    template<typename Value_t>
-    inline Value_t fp_epsilon() { return FP_EPSILON; }
-#else
-    template<typename Value_t>
-    inline Value_t fp_epsilon() { return 0.0; }
-#endif
-
-#ifdef FP_EPSILON
-    inline bool FloatEqual(double a, double b)
-    { return fabs(a - b) <= fp_epsilon<double>(); }
-#else
-    inline bool FloatEqual(double a, double b)
-    { return a == b; }
-#endif // FP_EPSILON
-
-    inline bool IsIntegerConst(double a)
-    { return FloatEqual(a, (double)(long)a); }
-
-
-// -------------------------------------------------------------------------
-// float
-// -------------------------------------------------------------------------
-#ifdef FP_SUPPORT_FLOAT_TYPE
-    inline float fp_abs(float x) { return fabsf(x); }
-    inline float fp_acos(float x) { return acosf(x); }
-    inline float fp_asin(float x) { return asinf(x); }
-    inline float fp_atan(float x) { return atanf(x); }
-    inline float fp_atan2(float x, float y) { return atan2f(x, y); }
-#ifdef FP_SUPPORT_CBRT
-    inline float fp_cbrt(float x) { return cbrtf(x); }
-#else
-    inline float fp_cbrt(float x) { return x>0 ?  expf(logf( x)/3.0f)
-                                         : x<0 ? -expf(logf(-x)/3.0f)
-                                         : 0.0f; }
-#endif
-    inline float fp_ceil(float x) { return ceilf(x); }
-    inline float fp_cos(float x) { return cosf(x); }
-    inline float fp_cosh(float x) { return coshf(x); }
-    inline float fp_exp(float x) { return expf(x); }
-    inline float fp_floor(float x) { return floorf(x); }
-    inline float fp_int(float x) { return floorf(x + .5F); }
-    inline float fp_log(float x) { return logf(x); }
-    inline float fp_log10(float x)
-    { return logf(x) *
-            0.434294481903251827651128918916605082294397005803666566F; }
-    inline float fp_mod(float x, float y) { return fmodf(x, y); }
-    inline float fp_sin(float x) { return sinf(x); }
-    inline float fp_sinh(float x) { return sinhf(x); }
-    inline float fp_sqrt(float x) { return sqrtf(x); }
-    inline float fp_tan(float x) { return tanf(x); }
-    inline float fp_tanh(float x) { return tanhf(x); }
-
-#ifndef FP_SUPPORT_ASINH
-    inline float fp_asinh(float x) { return logf(x + sqrt(x*x + 1.0F)); }
-    inline float fp_acosh(float x) { return logf(x + sqrt(x*x - 1.0F)); }
-    inline float fp_atanh(float x) { return logf((1.0F+x) / (1.0F-x)) * 0.5F; }
-#else
-    inline float fp_asinh(float x) { return asinhf(x); }
-    inline float fp_acosh(float x) { return acoshf(x); }
-    inline float fp_atanh(float x) { return atanhf(x); }
-#endif // FP_SUPPORT_ASINH
-
-    inline float fp_trunc(float x) { return x<0.0F ? ceilf(x) : floorf(x); }
-
-    inline float fp_pow_base(float x, float y) { return powf(x, y); }
-
-#ifndef FP_SUPPORT_LOG2
-    inline float fp_log2(float x)
-    { return logf(x) *
-            1.4426950408889634073599246810018921374266459541529859F; }
-#else
-    inline float fp_log2(float x) { return log2f(x); }
-#endif // FP_SUPPORT_LOG2
-
-    inline float fp_exp2(float x) { return fp_pow(2.0F, x); }
-
-#ifdef FP_EPSILON
-    template<>
-    inline float fp_epsilon<float>() { return 1e-6F; }
-#else
-    template<>
-    inline float fp_epsilon<float>() { return 0.0F; }
-#endif
-
-#ifdef FP_EPSILON
-    inline bool FloatEqual(float a, float b)
-    { return fabsf(a - b) <= fp_epsilon<float>(); }
-#else
-    inline bool FloatEqual(float a, float b)
-    { return a == b; }
-#endif // FP_EPSILON
-
-    inline bool IsIntegerConst(float a)
-    { return FloatEqual(a, (float)(long)a); }
-#endif // FP_SUPPORT_FLOAT_TYPE
-
-
-
-// -------------------------------------------------------------------------
-// long double
-// -------------------------------------------------------------------------
-#ifdef FP_SUPPORT_LONG_DOUBLE_TYPE
-    inline long double fp_abs(long double x) { return fabsl(x); }
-    inline long double fp_acos(long double x) { return acosl(x); }
-    inline long double fp_asin(long double x) { return asinl(x); }
-    inline long double fp_atan(long double x) { return atanl(x); }
-    inline long double fp_atan2(long double x, long double y)
-    { return atan2l(x, y); }
-#ifdef FP_SUPPORT_CBRT
-    inline long double fp_cbrt(long double x) { return cbrtl(x); }
-#else
-    inline long double fp_cbrt(long double x)
-        { return x>0 ?  expl(logl( x)/3.0l)
-               : x<0 ? -expl(logl(-x)/3.0l)
-               : 0.0l; }
-#endif
-    inline long double fp_ceil(long double x) { return ceill(x); }
-    inline long double fp_cos(long double x) { return cosl(x); }
-    inline long double fp_cosh(long double x) { return coshl(x); }
-    inline long double fp_exp(long double x) { return expl(x); }
-    inline long double fp_floor(long double x) { return floorl(x); }
-    inline long double fp_int(long double x) { return floorl(x + .5L); }
-    inline long double fp_log(long double x) { return logl(x); }
-    inline long double fp_log10(long double x)
-    { return logl(x) *
-            0.434294481903251827651128918916605082294397005803666566L; }
-    inline long double fp_mod(long double x, long double y)
-    { return fmodl(x, y); }
-    inline long double fp_sin(long double x) { return sinl(x); }
-    inline long double fp_sinh(long double x) { return sinhl(x); }
-    inline long double fp_sqrt(long double x) { return sqrtl(x); }
-    inline long double fp_tan(long double x) { return tanl(x); }
-    inline long double fp_tanh(long double x) { return tanhl(x); }
-
-#ifndef FP_SUPPORT_ASINH
-    inline long double fp_asinh(long double x)
-    { return logl(x + sqrtl(x*x + 1.0L)); }
-    inline long double fp_acosh(long double x)
-    { return logl(x + sqrtl(x*x - 1.0L)); }
-    inline long double fp_atanh(long double x)
-    { return logl((1.0L+x) / (1.0L-x)) * 0.5L; }
-#else
-    inline long double fp_asinh(long double x) { return asinhl(x); }
-    inline long double fp_acosh(long double x) { return acoshl(x); }
-    inline long double fp_atanh(long double x) { return atanhl(x); }
-#endif // FP_SUPPORT_ASINH
-
-    inline long double fp_trunc(long double x)
-    { return x<0.0L ? ceill(x) : floorl(x); }
-
-    inline long double fp_pow_base(long double x, long double y)
-    { return powl(x, y); }
-
-#ifndef FP_SUPPORT_LOG2
-    inline long double fp_log2(long double x)
-    { return log(x) * 1.4426950408889634073599246810018921374266459541529859L; }
-#else
-    inline long double fp_log2(long double x) { return log2l(x); }
-#endif // FP_SUPPORT_LOG2
-
-    inline long double fp_exp2(long double x) { return fp_pow(2.0L, x); }
-
-#ifdef FP_EPSILON
-    inline bool FloatEqual(long double a, long double b)
-    { return fabsl(a - b) <= fp_epsilon<double>(); }
-#else
-    inline bool FloatEqual(long double a, long double b)
-    { return a == b; }
-#endif // FP_EPSILON
-
-    inline bool IsIntegerConst(long double a)
-    { return FloatEqual(a, (long double)(long)a); }
-#endif // FP_SUPPORT_LONG_DOUBLE_TYPE
-
-
-// -------------------------------------------------------------------------
-// Long int
-// -------------------------------------------------------------------------
-    inline long fp_abs(long x) { return x < 0 ? -x : x; }
-    inline long fp_acos(long) { return 0; }
-    inline long fp_asin(long) { return 0; }
-    inline long fp_atan(long) { return 0; }
-    inline long fp_atan2(long, long) { return 0; }
-    inline long fp_cbrt(long) { return 0; }
-    inline long fp_ceil(long x) { return x; }
-    inline long fp_cos(long) { return 0; }
-    inline long fp_cosh(long) { return 0; }
-    inline long fp_exp(long) { return 0; }
-    inline long fp_floor(long x) { return x; }
-    inline long fp_int(long x) { return x; }
-    inline long fp_log(long) { return 0; }
-    inline long fp_log10(long) { return 0; }
-    inline long fp_mod(long x, long y) { return x % y; }
-    inline long fp_pow(long, long) { return 0; }
-    inline long fp_sin(long) { return 0; }
-    inline long fp_sinh(long) { return 0; }
-    inline long fp_sqrt(long) { return 1; }
-    inline long fp_tan(long) { return 0; }
-    inline long fp_tanh(long) { return 0; }
-    inline long fp_asinh(long) { return 0; }
-    inline long fp_acosh(long) { return 0; }
-    inline long fp_atanh(long) { return 0; }
-    inline long fp_trunc(long x) { return x; }
-    inline long fp_pow_base(long, long) { return 0; }
-    inline long fp_log2(long) { return 0; }
-    inline long fp_exp2(long) { return 0; }
-
-    template<>
-    inline long fp_epsilon<long>() { return 0; }
-
-    inline bool IsIntegerConst(long) { return true; }
-
-
-// -------------------------------------------------------------------------
-// MpfrFloat
-// -------------------------------------------------------------------------
-#ifdef FP_SUPPORT_MPFR_FLOAT_TYPE
-    inline MpfrFloat fp_abs(const MpfrFloat& x) { return MpfrFloat::abs(x); }
-    inline MpfrFloat fp_acos(const MpfrFloat& x) { return MpfrFloat::acos(x); }
-    inline MpfrFloat fp_asin(const MpfrFloat& x) { return MpfrFloat::asin(x); }
-    inline MpfrFloat fp_atan(const MpfrFloat& x) { return MpfrFloat::atan(x); }
-    inline MpfrFloat fp_atan2(const MpfrFloat& x, const MpfrFloat& y) { return MpfrFloat::atan2(x, y); }
-    inline MpfrFloat fp_cbrt(const MpfrFloat& x) { return MpfrFloat::cbrt(x); }
-    inline MpfrFloat fp_ceil(const MpfrFloat& x) { return MpfrFloat::ceil(x); }
-    inline MpfrFloat fp_cos(const MpfrFloat& x) { return MpfrFloat::cos(x); }
-    inline MpfrFloat fp_cosh(const MpfrFloat& x) { return MpfrFloat::cosh(x); }
-    inline MpfrFloat fp_exp(const MpfrFloat& x) { return MpfrFloat::exp(x); }
-    inline MpfrFloat fp_floor(const MpfrFloat& x) { return MpfrFloat::floor(x); }
-    inline MpfrFloat fp_int(const MpfrFloat& x) { return MpfrFloat::round(x); }
-    inline MpfrFloat fp_log(const MpfrFloat& x) { return MpfrFloat::log(x); }
-    inline MpfrFloat fp_log10(const MpfrFloat& x) { return MpfrFloat::log10(x); }
-    inline MpfrFloat fp_mod(const MpfrFloat& x, const MpfrFloat& y) { return x % y; }
-    inline MpfrFloat fp_sin(const MpfrFloat& x) { return MpfrFloat::sin(x); }
-    inline MpfrFloat fp_sinh(const MpfrFloat& x) { return MpfrFloat::sinh(x); }
-    inline MpfrFloat fp_sqrt(const MpfrFloat& x) { return MpfrFloat::sqrt(x); }
-    inline MpfrFloat fp_tan(const MpfrFloat& x) { return MpfrFloat::tan(x); }
-    inline MpfrFloat fp_tanh(const MpfrFloat& x) { return MpfrFloat::tanh(x); }
-    inline MpfrFloat fp_asinh(const MpfrFloat& x) { return MpfrFloat::asinh(x); }
-    inline MpfrFloat fp_acosh(const MpfrFloat& x) { return MpfrFloat::acosh(x); }
-    inline MpfrFloat fp_atanh(const MpfrFloat& x) { return MpfrFloat::atanh(x); }
-    inline MpfrFloat fp_trunc(const MpfrFloat& x) { return MpfrFloat::trunc(x); }
-
-    inline MpfrFloat fp_pow(const MpfrFloat& x, const MpfrFloat& y) { return MpfrFloat::pow(x, y); }
-    inline MpfrFloat fp_pow_base(const MpfrFloat& x, const MpfrFloat& y) { return MpfrFloat::pow(x, y); }
-
-    inline MpfrFloat fp_log2(const MpfrFloat& x) { return MpfrFloat::log2(x); }
-    inline MpfrFloat fp_exp2(const MpfrFloat& x) { return MpfrFloat::exp2(x); }
-
-    inline bool IsIntegerConst(const MpfrFloat& a) { return a.isInteger(); }
-
-    template<>
-    inline MpfrFloat fp_epsilon<MpfrFloat>() { return MpfrFloat::someEpsilon(); }
-#endif // FP_SUPPORT_MPFR_FLOAT_TYPE
-
-
-// -------------------------------------------------------------------------
-// GMP int
-// -------------------------------------------------------------------------
-#ifdef FP_SUPPORT_GMP_INT_TYPE
-    inline GmpInt fp_abs(GmpInt x) { return GmpInt::abs(x); }
-    inline GmpInt fp_acos(GmpInt) { return 0; }
-    inline GmpInt fp_asin(GmpInt) { return 0; }
-    inline GmpInt fp_atan(GmpInt) { return 0; }
-    inline GmpInt fp_atan2(GmpInt, GmpInt) { return 0; }
-    inline GmpInt fp_cbrt(GmpInt) { return 0; }
-    inline GmpInt fp_ceil(GmpInt x) { return x; }
-    inline GmpInt fp_cos(GmpInt) { return 0; }
-    inline GmpInt fp_cosh(GmpInt) { return 0; }
-    inline GmpInt fp_exp(GmpInt) { return 0; }
-    inline GmpInt fp_floor(GmpInt x) { return x; }
-    inline GmpInt fp_int(GmpInt x) { return x; }
-    inline GmpInt fp_log(GmpInt) { return 0; }
-    inline GmpInt fp_log10(GmpInt) { return 0; }
-    inline GmpInt fp_mod(GmpInt x, GmpInt y) { return x % y; }
-    inline GmpInt fp_pow(GmpInt, GmpInt) { return 0; }
-    inline GmpInt fp_sin(GmpInt) { return 0; }
-    inline GmpInt fp_sinh(GmpInt) { return 0; }
-    inline GmpInt fp_sqrt(GmpInt) { return 0; }
-    inline GmpInt fp_tan(GmpInt) { return 0; }
-    inline GmpInt fp_tanh(GmpInt) { return 0; }
-    inline GmpInt fp_asinh(GmpInt) { return 0; }
-    inline GmpInt fp_acosh(GmpInt) { return 0; }
-    inline GmpInt fp_atanh(GmpInt) { return 0; }
-    inline GmpInt fp_trunc(GmpInt x) { return x; }
-    inline GmpInt fp_pow_base(GmpInt, GmpInt) { return 0; }
-    inline GmpInt fp_log2(GmpInt) { return 0; }
-    inline GmpInt fp_exp2(GmpInt) { return 0; }
-
-    template<>
-    inline GmpInt fp_epsilon<GmpInt>() { return 0; }
-
-    inline bool IsIntegerConst(GmpInt) { return true; }
-#endif // FP_SUPPORT_GMP_INT_TYPE
-
-
-  
-// -------------------------------------------------------------------------
-// Comparison
-// -------------------------------------------------------------------------
-#ifdef FP_EPSILON
-    template<typename Value_t>
-    inline bool fp_equal(Value_t x, Value_t y)
-    { return fp_abs(x - y) <= fp_epsilon<Value_t>(); }
-
-    template<typename Value_t>
-    inline bool fp_nequal(Value_t x, Value_t y)
-    { return fp_abs(x - y) > fp_epsilon<Value_t>(); }
-
-    template<typename Value_t>
-    inline bool fp_less(Value_t x, Value_t y)
-    { return x < y - fp_epsilon<Value_t>(); }
-
-    template<typename Value_t>
-    inline bool fp_lessOrEq(Value_t x, Value_t y)
-    { return x <= y + fp_epsilon<Value_t>(); }
-#else // FP_EPSILON
-    template<typename Value_t>
-    inline bool fp_equal(Value_t x, Value_t y) { return x == y; }
-
-    template<typename Value_t>
-    inline bool fp_nequal(Value_t x, Value_t y) { return x != y; }
-
-    template<typename Value_t>
-    inline bool fp_less(Value_t x, Value_t y) { return x < y; }
-
-    template<typename Value_t>
-    inline bool fp_lessOrEq(Value_t x, Value_t y) { return x <= y; }
-#endif // FP_EPSILON
-
-    template<>
-    inline bool fp_equal<long>(long x, long y) { return x == y; }
-
-    template<>
-    inline bool fp_nequal<long>(long x, long y) { return x != y; }
-
-    template<>
-    inline bool fp_less<long>(long x, long y) { return x < y; }
-
-    template<>
-    inline bool fp_lessOrEq<long>(long x, long y) { return x <= y; }
-
-#ifdef FP_SUPPORT_GMP_INT_TYPE
-    template<>
-    inline bool fp_equal<GmpInt>(GmpInt x, GmpInt y) { return x == y; }
-
-    template<>
-    inline bool fp_nequal<GmpInt>(GmpInt x, GmpInt y) { return x != y; }
-
-    template<>
-    inline bool fp_less<GmpInt>(GmpInt x, GmpInt y) { return x < y; }
-
-    template<>
-    inline bool fp_lessOrEq<GmpInt>(GmpInt x, GmpInt y) { return x <= y; }
-#endif
-} // namespace FUNCTIONPARSERTYPES
-
-#endif // ONCE_FPARSER_H_
-
-
-#ifndef FP_DISABLE_DOUBLE_TYPE
-#define FUNCTIONPARSER_INSTANTIATE_DOUBLE \
-    template class FunctionParserBase<double>;
-#else
-#define FUNCTIONPARSER_INSTANTIATE_DOUBLE
-#endif
-
-#ifdef FP_SUPPORT_FLOAT_TYPE
-#define FUNCTIONPARSER_INSTANTIATE_FLOAT \
-    template class FunctionParserBase<float>;
-#else
-#define FUNCTIONPARSER_INSTANTIATE_FLOAT
-#endif
-
-#ifdef FP_SUPPORT_LONG_DOUBLE_TYPE
-#define FUNCTIONPARSER_INSTANTIATE_LONG_DOUBLE \
-    template class FunctionParserBase<long double>;
-#else
-#define FUNCTIONPARSER_INSTANTIATE_LONG_DOUBLE
-#endif
-
-#ifdef FP_SUPPORT_LONG_INT_TYPE
-#define FUNCTIONPARSER_INSTANTIATE_LONG_INT \
-    template class FunctionParserBase<long>;
-#else
-#define FUNCTIONPARSER_INSTANTIATE_LONG_INT
-#endif
-
-#ifdef FP_SUPPORT_MPFR_FLOAT_TYPE
-#define FUNCTIONPARSER_INSTANTIATE_MPFR_FLOAT \
-    template class FunctionParserBase<MpfrFloat>;
-#else
-#define FUNCTIONPARSER_INSTANTIATE_MPFR_FLOAT
-#endif
-
-#ifdef FP_SUPPORT_GMP_INT_TYPE
-#define FUNCTIONPARSER_INSTANTIATE_GMP_INT \
-    template class FunctionParserBase<GmpInt>;
-#else
-#define FUNCTIONPARSER_INSTANTIATE_GMP_INT
-#endif
-
-/* Add 'FUNCTIONPARSER_INSTANTIATE_TYPES' at the end of all .cc files
-   containing FunctionParserBase implementations.
- */
-#define FUNCTIONPARSER_INSTANTIATE_TYPES \
-    FUNCTIONPARSER_INSTANTIATE_DOUBLE \
-    FUNCTIONPARSER_INSTANTIATE_FLOAT \
-    FUNCTIONPARSER_INSTANTIATE_LONG_DOUBLE \
-    FUNCTIONPARSER_INSTANTIATE_LONG_INT \
-    FUNCTIONPARSER_INSTANTIATE_MPFR_FLOAT \
-    FUNCTIONPARSER_INSTANTIATE_GMP_INT
-
-#endif // ONCE_FPARSER_AUX_H_
diff --git a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/fpconfig.h b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/fpconfig.h
deleted file mode 100644
index 4c90de4dfc..0000000000
--- a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/fpconfig.h
+++ /dev/null
@@ -1,139 +0,0 @@
-/***************************************************************************\
-|* Function Parser for C++ v4.0.3                                          *|
-|*-------------------------------------------------------------------------*|
-|* Copyright: Juha Nieminen                                                *|
-\***************************************************************************/
-
-// Configuration file
-// ------------------
-
-/* NOTE:
-   This file is for the internal use of the function parser only.
-   You don't need to include this file in your source files, just
-   include "fparser.hh".
-*/
-
-
-/* Uncomment any of these lines or define them in your compiler settings
-   to enable the correspondent version of the parser. (These are disabled
-   by default because they rely on C99 functions, and non-standard libraries
-   in the case pf MPFR and GMP, and they make compiling needlessly slower
-   and the resulting binary needlessly larger if they are not used in the
-   program.)
-*/
-//#define FP_SUPPORT_FLOAT_TYPE
-#define FP_SUPPORT_LONG_DOUBLE_TYPE
-//#define FP_SUPPORT_LONG_INT_TYPE
-//#define FP_SUPPORT_MPFR_FLOAT_TYPE
-//#define FP_SUPPORT_GMP_INT_TYPE
-
-/* Uncomment this line of define it in your compiler settings if you want
-   to disable compiling the basic double version of the library, in case
-   one of the above types is used but not the double type. (If the double
-   type is not used, then disabling it makes compiling faster and the
-   resulting binary smaller.)
- */
-//#define FP_DISABLE_DOUBLE_TYPE
-
-/*
- Note that these do not change what FunctionParser supports, they only
- change how the function is evaluated, potentially making it faster when
- these functions are involved.
- These will make the source code use asinh(), acosh(), atanh(), exp2()
- and log2().
-*/
-//#define FP_SUPPORT_TR1_MATH_FUNCS
-
-#ifdef FP_SUPPORT_TR1_MATH_FUNCS
-#define FP_SUPPORT_ASINH
-#define FP_SUPPORT_EXP2
-#define FP_SUPPORT_LOG2
-#define FP_SUPPORT_CBRT
-#endif
-
-/*
- Comment out the following line to enable the eval() function, which can
- be used in the function string to recursively call the same function.
- Note that enabling this function may be dangerous even if the maximum
- recursion level is limited because it is still possible to write functions
- using it which take enormous  amounts of time to evaluate even though the
- maximum recursion is never reached. This may be undesirable in some
- applications.
- Alternatively you can define the FP_ENABLE_EVAL precompiler constant in
- your compiler settings.
-*/
-#ifndef FP_ENABLE_EVAL
-#define FP_DISABLE_EVAL
-#endif
-
-
-/*
- Maximum recursion level for eval() calls:
-*/
-#define FP_EVAL_MAX_REC_LEVEL 1000
-
-
-/*
- Whether to use shortcut evaluation for the & and | operators:
-*/
-#define FP_DISABLE_SHORTCUT_LOGICAL_EVALUATION
-#ifndef FP_DISABLE_SHORTCUT_LOGICAL_EVALUATION
-#define FP_ENABLE_SHORTCUT_LOGICAL_EVALUATION
-#endif
-
-/*
- Whether to enable optimizations that may ignore side effects
- of if() calls, such as changing if(x,!y,0) into x&!y.
- This is basically the polar opposite of "shortcut logical evaluation".
- Disabled by default, because it makes eval() rather unsafe.
-*/
-#ifdef FP_ENABLE_IGNORE_IF_SIDEEFFECTS
-#endif
-
-/*
- Comment out the following lines out if you are not going to use the
- optimizer and want a slightly smaller library. The Optimize() method
- can still be called, but it will not do anything.
- If you are unsure, just leave it. It won't slow down the other parts of
- the library.
-*/
-//#define FP_NO_SUPPORT_OPTIMIZER
-#ifndef FP_NO_SUPPORT_OPTIMIZER
-#define FP_SUPPORT_OPTIMIZER
-#endif
-
-
-/*
- Epsilon value used with the comparison operators (must be non-negative):
- (Comment it out if you don't want to use epsilon in comparisons. Might
- lead to marginally faster evaluation of the comparison operators, but
- can introduce inaccuracies in comparisons.)
-*/
-#define FP_EPSILON 1e-14
-
-
-/*
- No member function of FunctionParser is thread-safe. Most prominently,
- Eval() is not thread-safe. By uncommenting one of these lines the Eval()
- function can be made thread-safe at the cost of a possible small overhead.
- The second version requires that the compiler supports the alloca() function,
- which is not standard, but is faster.
- */
-//#define FP_USE_THREAD_SAFE_EVAL
-//#define FP_USE_THREAD_SAFE_EVAL_WITH_ALLOCA
-
-/*
- Uncomment (or define in your compiler options) to disable evaluation checks.
- (Consult the documentation for details.)
- */
-#define FP_NO_EVALUATION_CHECKS
-
-
-
-// Temporary settings while double is the only supported type by the optimizer
-#ifdef FP_DISABLE_DOUBLE_TYPE
-#ifndef FP_NO_SUPPORT_OPTIMIZER
-#define FP_NO_SUPPORT_OPTIMIZER
-#endif
-#undef FP_SUPPORT_OPTIMIZER
-#endif
diff --git a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/fpoptimizer.cpp b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/fpoptimizer.cpp
deleted file mode 100644
index 9fda0c12d9..0000000000
--- a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/fpoptimizer.cpp
+++ /dev/null
@@ -1,10948 +0,0 @@
-#line 1 "fpoptimizer/fpoptimizer_header.txt"
-/***************************************************************************\
-|* Function Parser for C++ v4.0.3                                          *|
-|*-------------------------------------------------------------------------*|
-|* Function optimizer                                                      *|
-|*-------------------------------------------------------------------------*|
-|* Copyright: Joel Yliluoma                                                *|
-\***************************************************************************/
-
-/* NOTE:
-   This is a concatenation of all the header and source files of the
-   original optimizer source code. All the code has been concatenated
-   into this single file for convenience of usage (in other words, to
-   simply use the optimizer, it's enough to add this file to the project
-   rather than a multitude of files which the original optimizer source
-   code is composed of).
-
-   Thus this file exists for the usage of the Function parser library
-   only, and is not suitable for developing it further. If you want to
-   develop the library further, you should download the development
-   version of the library, which has all the original source files.
- */
-
-#include "fpconfig.h"
-#ifdef FP_SUPPORT_OPTIMIZER
-
-#define FPOPTIMIZER_MERGED_FILE
-
-#line 1 "fpoptimizer/fpoptimizer_hash.h"
-#ifndef FPoptimizerHashH
-#define FPoptimizerHashH
-
-#ifdef _MSC_VER
-
-typedef unsigned long long fphash_value_t;
-#define FPHASH_CONST(x) x##ULL
-
-#else
-
-#include <stdint.h>
-typedef uint_fast64_t fphash_value_t;
-#define FPHASH_CONST(x) x##ULL
-
-#endif
-
-namespace FUNCTIONPARSERTYPES
-{
-    struct fphash_t
-    {
-        fphash_value_t hash1, hash2;
-
-        bool operator==(const fphash_t& rhs) const
-        { return hash1 == rhs.hash1 && hash2 == rhs.hash2; }
-
-        bool operator!=(const fphash_t& rhs) const
-        { return hash1 != rhs.hash1 || hash2 != rhs.hash2; }
-
-        bool operator<(const fphash_t& rhs) const
-        { return hash1 != rhs.hash1 ? hash1 < rhs.hash1 : hash2 < rhs.hash2; }
-    };
-}
-
-#endif
-
-#line 1 "fpoptimizer/fpoptimizer_autoptr.h"
-#ifndef FPOptimizerAutoPtrH
-#define FPOptimizerAutoPtrH
-
-template<typename Ref>
-class FPOPT_autoptr
-{
-public:
-    FPOPT_autoptr()                   : p(0)   { }
-    FPOPT_autoptr(Ref*        b) : p(b)   { Birth(); }
-    FPOPT_autoptr(const FPOPT_autoptr& b) : p(b.p) { Birth(); }
-
-    inline Ref& operator* () const { return *p; }
-    inline Ref* operator->() const { return p; }
-
-    FPOPT_autoptr& operator= (Ref*        b) { Set(b); return *this; }
-    FPOPT_autoptr& operator= (const FPOPT_autoptr& b) { Set(b.p); return *this; }
-#ifdef __GXX_EXPERIMENTAL_CXX0X__
-    FPOPT_autoptr(FPOPT_autoptr&& b)      : p(b.p) { b.p = 0; }
-    FPOPT_autoptr& operator= (FPOPT_autoptr&& b) { if(p != b.p) { Forget(); p=b.p; b.p=0; }
-                                                   return *this; }
-#endif
-
-    ~FPOPT_autoptr() { Forget(); }
-
-    void UnsafeSetP(Ref* newp) { p = newp; }
-    void swap(FPOPT_autoptr<Ref>& b) { Ref* tmp=p; p=b.p; b.p=tmp; }
-
-private:
-    inline static void Have(Ref* p2);
-    inline void Forget();
-    inline void Birth();
-    inline void Set(Ref* p2);
-private:
-    Ref* p;
-};
-
-//
-template<typename Ref>
-inline void FPOPT_autoptr<Ref>::Forget()
-{
-    if(!p) return;
-    p->RefCount -= 1;
-    if(!p->RefCount) delete p;
-    //assert(p->RefCount >= 0);
-}
-template<typename Ref>
-inline void FPOPT_autoptr<Ref>::Have(Ref* p2)
-{
-    if(p2) ++(p2->RefCount);
-}
-template<typename Ref>
-inline void FPOPT_autoptr<Ref>::Birth()
-{
-    Have(p);
-}
-template<typename Ref>
-inline void FPOPT_autoptr<Ref>::Set(Ref* p2)
-{
-    Have(p2);
-    Forget();
-    p = p2;
-}
-
-#endif
-
-#line 1 "fpoptimizer/fpoptimizer_codetree.h"
-#ifndef FPOptimizer_CodeTreeH
-#define FPOptimizer_CodeTreeH
-
-#include "fpconfig.h"
-#include "fparser.h"
-#include "fptypes.h"
-
-#ifdef FP_SUPPORT_OPTIMIZER
-
-#include <vector>
-#include <utility>
-
-// line removed for fpoptimizer.c: #include "fpoptimizer_hash.h"
-// line removed for fpoptimizer.c: #include "fpoptimizer_autoptr.h"
-
-#ifdef FP_EPSILON
- #define NEGATIVE_MAXIMUM (-FP_EPSILON)
-#else
- #define NEGATIVE_MAXIMUM (-1e-14)
-#endif
-
-namespace FPoptimizer_Grammar
-{
-    struct Grammar;
-}
-
-namespace FPoptimizer_ByteCode
-{
-    class ByteCodeSynth;
-}
-
-namespace FPoptimizer_CodeTree
-{
-    class CodeTree;
-
-    struct MinMaxTree
-    {
-        double min,max;
-        bool has_min, has_max;
-        MinMaxTree() : min(),max(),has_min(false),has_max(false) { }
-        MinMaxTree(double mi,double ma): min(mi),max(ma),has_min(true),has_max(true) { }
-        MinMaxTree(bool,double ma): min(),max(ma),has_min(false),has_max(true) { }
-        MinMaxTree(double mi,bool): min(mi),max(),has_min(true),has_max(false) { }
-    };
-
-    struct CodeTreeData;
-    class CodeTree
-    {
-        typedef FPOPT_autoptr<CodeTreeData> DataP;
-        DataP data;
-
-    public:
-    public:
-        CodeTree();
-        ~CodeTree();
-
-        explicit CodeTree(double v); // produce an immed
-        struct VarTag { };
-        explicit CodeTree(unsigned varno, VarTag); // produce a var reference
-        struct CloneTag { };
-        explicit CodeTree(const CodeTree& b, CloneTag);
-
-        /* Generates a CodeTree from the given bytecode */
-        void GenerateFrom(
-            const std::vector<unsigned>& byteCode,
-            const std::vector<double>& immed,
-            const FunctionParser::Data& data,
-            bool keep_powi = false);
-
-        void GenerateFrom(
-            const std::vector<unsigned>& byteCode,
-            const std::vector<double>& immed,
-            const FunctionParser::Data& data,
-            const std::vector<CodeTree>& var_trees,
-            bool keep_powi = false);
-
-        void SynthesizeByteCode(
-            std::vector<unsigned>& byteCode,
-            std::vector<double>&   immed,
-            size_t& stacktop_max);
-
-        void SynthesizeByteCode(
-            FPoptimizer_ByteCode::ByteCodeSynth& synth,
-            bool MustPopTemps=true) const;
-
-        size_t SynthCommonSubExpressions(
-            FPoptimizer_ByteCode::ByteCodeSynth& synth) const;
-
-        void SetParams(const std::vector<CodeTree>& RefParams);
-        void SetParamsMove(std::vector<CodeTree>& RefParams);
-
-        CodeTree GetUniqueRef();
-        // ^use this when CodeTree tmp=x; tmp.CopyOnWrite(); does not do exactly what you want
-
-#ifdef __GXX_EXPERIMENTAL_CXX0X__
-        void SetParams(std::vector<CodeTree>&& RefParams);
-#endif
-        void SetParam(size_t which, const CodeTree& b);
-        void SetParamMove(size_t which, CodeTree& b);
-        void AddParam(const CodeTree& param);
-        void AddParamMove(CodeTree& param);
-        void AddParams(const std::vector<CodeTree>& RefParams);
-        void AddParamsMove(std::vector<CodeTree>& RefParams);
-        void AddParamsMove(std::vector<CodeTree>& RefParams, size_t replacing_slot);
-        void DelParam(size_t index);
-        void DelParams();
-
-        void Become(const CodeTree& b);
-
-        inline size_t GetParamCount() const { return GetParams().size(); }
-        inline CodeTree& GetParam(size_t n) { return GetParams()[n]; }
-        inline const CodeTree& GetParam(size_t n) const { return GetParams()[n]; }
-        inline void SetOpcode(FUNCTIONPARSERTYPES::OPCODE o);
-        inline void SetFuncOpcode(FUNCTIONPARSERTYPES::OPCODE o, unsigned f);
-        inline void SetVar(unsigned v);
-        inline void SetImmed(double v);
-        inline FUNCTIONPARSERTYPES::OPCODE GetOpcode() const;
-        inline FUNCTIONPARSERTYPES::fphash_t GetHash() const;
-        inline const std::vector<CodeTree>& GetParams() const;
-        inline std::vector<CodeTree>& GetParams();
-        inline size_t GetDepth() const;
-        inline const double& GetImmed() const;
-        inline unsigned GetVar() const;
-        inline unsigned GetFuncNo() const;
-        inline bool IsDefined() const { return GetOpcode() != FUNCTIONPARSERTYPES::cNop; }
-
-        inline bool    IsImmed() const { return GetOpcode() == FUNCTIONPARSERTYPES::cImmed; }
-        inline bool      IsVar() const { return GetOpcode() == FUNCTIONPARSERTYPES::VarBegin; }
-        bool    IsLongIntegerImmed() const { return IsImmed() && GetImmed() == (double)GetLongIntegerImmed(); }
-        long   GetLongIntegerImmed() const { return (long)GetImmed(); }
-        bool    IsLogicalValue() const;
-        inline unsigned GetRefCount() const;
-        /* This function calculates the minimum and maximum values
-         * of the tree's result. If an estimate cannot be made,
-         * has_min/has_max are indicated as false.
-         */
-        MinMaxTree CalculateResultBoundaries_do() const;
-        MinMaxTree CalculateResultBoundaries() const;
-
-        enum TriTruthValue { IsAlways, IsNever, Unknown };
-        TriTruthValue GetEvennessInfo() const;
-
-        bool IsAlwaysSigned(bool positive) const;
-        bool IsAlwaysParity(bool odd) const
-            { return GetEvennessInfo() == (odd?IsNever:IsAlways); }
-        bool IsAlwaysInteger(bool integer) const;
-
-        void ConstantFolding();
-        bool ConstantFolding_AndLogic();
-        bool ConstantFolding_OrLogic();
-        bool ConstantFolding_MulLogicItems();
-        bool ConstantFolding_AddLogicItems();
-        bool ConstantFolding_IfOperations();
-        bool ConstantFolding_PowOperations();
-        bool ConstantFolding_ComparisonOperations();
-        template<typename CondType>
-        bool ConstantFolding_LogicCommon(CondType cond_type, bool is_logical);
-        bool ConstantFolding_MulGrouping();
-        bool ConstantFolding_AddGrouping();
-        bool ConstantFolding_Assimilate();
-
-        void Rehash(bool constantfolding = true);
-        inline void Mark_Incompletely_Hashed();
-        inline bool Is_Incompletely_Hashed() const;
-
-        inline const FPoptimizer_Grammar::Grammar* GetOptimizedUsing() const;
-        inline void SetOptimizedUsing(const FPoptimizer_Grammar::Grammar* g);
-
-        bool RecreateInversionsAndNegations(bool prefer_base2 = false);
-        void FixIncompleteHashes();
-
-        void swap(CodeTree& b) { data.swap(b.data); }
-        bool IsIdenticalTo(const CodeTree& b) const;
-        void CopyOnWrite();
-    };
-
-    struct CodeTreeData
-    {
-        int RefCount;
-
-        /* Describing the codetree node */
-        FUNCTIONPARSERTYPES::OPCODE Opcode;
-        union
-        {
-            double   Value;   // In case of cImmed:   value of the immed
-            unsigned Var;     // In case of VarBegin: variable number
-            unsigned Funcno;  // In case of cFCall or cPCall
-        };
-
-        // Parameters for the function
-        //  These use the sign:
-        //   For cAdd: operands to add together (0 to n)
-        //             sign indicates that the value is negated before adding (0-x)
-        //   For cMul: operands to multiply together (0 to n)
-        //             sign indicates that the value is inverted before multiplying (1/x)
-        //   For cAnd: operands to bitwise-and together (0 to n)
-        //             sign indicates that the value is inverted before anding (!x)
-        //   For cOr:  operands to bitwise-or together (0 to n)
-        //             sign indicates that the value is inverted before orring (!x)
-        //  These don't use the sign (sign is always false):
-        //   For cMin: operands to select the minimum of
-        //   For cMax: operands to select the maximum of
-        //   For cImmed, not used
-        //   For VarBegin, not used
-        //   For cIf:  operand 1 = condition, operand 2 = yes-branch, operand 3 = no-branch
-        //   For anything else: the parameters required by the operation/function
-        std::vector<CodeTree> Params;
-
-        /* Internal operation */
-        FUNCTIONPARSERTYPES::fphash_t      Hash;
-        size_t        Depth;
-        const FPoptimizer_Grammar::Grammar* OptimizedUsing;
-
-        CodeTreeData();
-        CodeTreeData(const CodeTreeData& b);
-        explicit CodeTreeData(double i);
-#ifdef __GXX_EXPERIMENTAL_CXX0X__
-        CodeTreeData(CodeTreeData&& b);
-#endif
-
-        bool IsIdenticalTo(const CodeTreeData& b) const;
-        void Sort();
-        void Recalculate_Hash_NoRecursion();
-    };
-
-    inline void CodeTree::SetOpcode(FUNCTIONPARSERTYPES::OPCODE o)
-        { data->Opcode = o; }
-    inline void CodeTree::SetFuncOpcode(FUNCTIONPARSERTYPES::OPCODE o, unsigned f)
-        { SetOpcode(o); data->Funcno = f; }
-    inline void CodeTree::SetVar(unsigned v)
-        { SetOpcode(FUNCTIONPARSERTYPES::VarBegin); data->Var = v; }
-    inline void CodeTree::SetImmed(double v)
-        { SetOpcode(FUNCTIONPARSERTYPES::cImmed); data->Value = v; }
-    inline FUNCTIONPARSERTYPES::OPCODE CodeTree::GetOpcode() const { return data->Opcode; }
-    inline FUNCTIONPARSERTYPES::fphash_t CodeTree::GetHash() const { return data->Hash; }
-    inline const std::vector<CodeTree>& CodeTree::GetParams() const { return data->Params; }
-    inline std::vector<CodeTree>& CodeTree::GetParams() { return data->Params; }
-    inline size_t CodeTree::GetDepth() const { return data->Depth; }
-    inline const double& CodeTree::GetImmed() const { return data->Value; }
-    inline unsigned CodeTree::GetVar() const { return data->Var; }
-    inline unsigned CodeTree::GetFuncNo() const { return data->Funcno; }
-
-    inline const FPoptimizer_Grammar::Grammar* CodeTree::GetOptimizedUsing() const
-        { return data->OptimizedUsing; }
-    inline void CodeTree::SetOptimizedUsing(const FPoptimizer_Grammar::Grammar* g)
-        { data->OptimizedUsing = g; }
-    inline unsigned CodeTree::GetRefCount() const { return data->RefCount; }
-
-    inline void CodeTree::Mark_Incompletely_Hashed() { data->Depth = 0; }
-    inline bool CodeTree::Is_Incompletely_Hashed() const { return data->Depth == 0; }
-
-#ifdef FUNCTIONPARSER_SUPPORT_DEBUG_OUTPUT
-    void DumpHashes(const FPoptimizer_CodeTree::CodeTree& tree, std::ostream& o = std::cout);
-    void DumpTree(const FPoptimizer_CodeTree::CodeTree& tree, std::ostream& o = std::cout);
-    void DumpTreeWithIndent(const FPoptimizer_CodeTree::CodeTree& tree, std::ostream& o = std::cout, const std::string& indent = "\\");
-#endif
-}
-
-#endif
-
-#endif
-
-#line 1 "fpoptimizer/fpoptimizer_grammar.h"
-#ifndef FPOPT_NAN_CONST
-
-#include <iostream>
-
-#include "fpconfig.h"
-#include "fparser.h"
-#include "fptypes.h"
-
-#define FPOPT_NAN_CONST (-1712345.25) /* Would use 0.0 / 0.0 here, but some compilers don't accept it. */
-
-namespace FPoptimizer_CodeTree
-{
-    class CodeTree;
-}
-
-namespace FPoptimizer_Grammar
-{
-    enum ImmedConstraint_Value
-    {
-        ValueMask = 0x07,
-        Value_AnyNum     = 0x0, // any value
-        Value_EvenInt    = 0x1, // any even integer (0,2,4, etc)
-        Value_OddInt     = 0x2, // any odd integer (1,3, etc)
-        Value_IsInteger  = 0x3, // any integer-value (excludes e.g. 0.2)
-        Value_NonInteger = 0x4, // any non-integer (excludes e.g. 1 or 5)
-        Value_Logical    = 0x5  // a result of cNot,cNotNot,cAnd,cOr or comparators
-    };
-    enum ImmedConstraint_Sign
-    {
-        SignMask  = 0x18,
-        Sign_AnySign     = 0x00, // - or +
-        Sign_Positive    = 0x08, // positive only
-        Sign_Negative    = 0x10, // negative only
-        Sign_NoIdea      = 0x18  // where sign cannot be guessed
-    };
-    enum ImmedConstraint_Oneness
-    {
-        OnenessMask   = 0x60,
-        Oneness_Any      = 0x00,
-        Oneness_One      = 0x20, // +1 or -1
-        Oneness_NotOne   = 0x40  // anything but +1 or -1
-    };
-    enum ImmedConstraint_Constness
-    {
-        ConstnessMask = 0x80,
-        Constness_Any    = 0x00,
-        Constness_Const  = 0x80
-    };
-
-    /* The param_opcode field of the ParamSpec has the following
-     * possible values (from enum SpecialOpcode):
-     *   NumConstant:
-     *      this describes a specific constant value (constvalue)
-     *      that must be matched / synthesized.
-     *   ParamHolder:
-     *      this describes any node
-     *      that must be matched / synthesized.
-     *      "index" is the ID of the NamedHolder:
-     *      In matching, all NamedHolders having the same ID
-     *      must match the identical node.
-     *      In synthesizing, the node matched by
-     *      a NamedHolder with this ID must be synthesized.
-     *    SubFunction:
-     *      this describes a subtree
-     *      that must be matched / synthesized.
-     *      The subtree is described in subfunc_opcode,param_begin..+param_count.
-     *      If the type is GroupFunction, the tree is expected
-     *      to yield a constant value which is tested.
-     */
-    enum SpecialOpcode
-    {
-        NumConstant,        // Holds a particular value (syntax-time constant)
-        ParamHolder,        // Holds a particular named param
-        SubFunction         // Holds an opcode and the params
-    };
-
-    enum ParamMatchingType
-    {
-        PositionalParams, // this set of params in this order
-        SelectedParams,   // this set of params in any order
-        AnyParams,        // these params are included
-        GroupFunction     // this function represents a constant value
-    };
-
-    enum RuleType
-    {
-        ProduceNewTree, // replace self with the first (and only) from replaced_param
-        ReplaceParams   // replace indicate params with replaced_params
-    };
-
-#ifdef __GNUC__
-# define PACKED_GRAMMAR_ATTRIBUTE __attribute__((packed))
-#else
-# define PACKED_GRAMMAR_ATTRIBUTE
-#endif
-
-    enum { PARAM_INDEX_BITS = 9 };
-
-    /* A ParamSpec object describes
-     * either a parameter (leaf, node) that must be matched,
-     * or a parameter (leaf, node) that must be synthesized.
-     */
-    typedef std::pair<SpecialOpcode, const void*> ParamSpec;
-    ParamSpec ParamSpec_Extract(unsigned paramlist, unsigned index);
-    bool ParamSpec_Compare(const void* a, const void* b, SpecialOpcode type);
-    unsigned ParamSpec_GetDepCode(const ParamSpec& b);
-
-    struct ParamSpec_ParamHolder
-    {
-        unsigned index       : 8; // holder ID
-        unsigned constraints : 8; // constraints
-        unsigned depcode     :16;
-    } PACKED_GRAMMAR_ATTRIBUTE;
-
-    struct ParamSpec_NumConstant
-    {
-        double constvalue;        // the value
-    } PACKED_GRAMMAR_ATTRIBUTE;
-
-    struct ParamSpec_SubFunctionData
-    {
-        /* Expected parameters (leaves) of the tree: */
-        unsigned param_count         : 2;
-        unsigned param_list          : 30;
-        /* The opcode that the tree must have when SubFunction */
-        FUNCTIONPARSERTYPES::OPCODE subfunc_opcode : 8;
-
-        /* When matching, type describes the method of matching.
-         *
-         *               Sample input tree:      (cOr 2 3)  (cOr 2 4) (cOr 3 2) (cOr 4 2 3) (cOr 2)
-         * Possible methods:
-         *    PositionalParams, e.g. (cOr [2 3]):  match     no match  no match  no match   no match
-         *      The nodes described here are
-         *      to be matched, in this order.
-         *    SelectedParams,   e.g. (cOr {2 3}):  match     no match   match    no match   no match
-         *      The nodes described here are
-         *      to be matched, in any order.
-         *    AnyParams,        e.g. (cOr 2 3  ):  match     no match   match     match     no match
-         *      At least the nodes described here
-         *      are to be matched, in any order.
-         * When synthesizing, the type is ignored.
-         */
-        ParamMatchingType match_type : 3; /* When SubFunction */
-        /* Note: match_type needs 2, but we specify 3 because
-         * otherwise Microsoft VC++ borks things up
-         * as it interprets the value as signed.
-         */
-        /* Optional restholder index for capturing the rest of parameters (0=not used)
-         * Only valid when match_type = AnyParams
-         */
-        unsigned restholder_index : 5;
-    } PACKED_GRAMMAR_ATTRIBUTE; // size: 2+30+6+2+8=48 bits=6 bytes
-
-    struct ParamSpec_SubFunction
-    {
-        ParamSpec_SubFunctionData data;
-        unsigned constraints : 8; // constraints
-        unsigned depcode     : 8;
-    } PACKED_GRAMMAR_ATTRIBUTE; // 8 bytes
-
-    /* Theoretical minimal sizes in each param_opcode cases:
-     * Assume param_opcode needs 3 bits.
-     *    NumConstant:   3 + 64              (or 3+4 if just use index to clist[])
-     *    ParamHolder:   3 + 7 + 2           (7 for constraints, 2 for immed index)
-     *    SubFunction:   3 + 7 + 2 + 2 + 3*9 = 41
-     */
-
-    /* A rule describes a pattern for matching
-     * and the method how to reconstruct the
-     * matched node(s) in the tree.
-     */
-    struct Rule
-    {
-        /* If the rule matched, this field describes how to perform
-         * the replacement.
-         *   When type==ProduceNewTree,
-         *       the source tree is replaced entirely with
-         *       the new tree described at repl_param_begin[0].
-         *   When type==ReplaceParams,
-         *       the matching leaves in the source tree are removed
-         *       and new leaves are constructedfrom the trees
-         *       described at repl_param_begin[0..repl_param_count].
-         *       Other leaves remain intact.
-         */
-        RuleType  ruletype         : 2;
-        bool      logical_context  : 1;
-
-        /* The replacement parameters (if NewTree, begin[0] represents the new tree) */
-        unsigned  repl_param_count : 2; /* Assumed to be 1 when type == ProduceNewTree */
-        unsigned  repl_param_list  : 27;
-
-        /* The function that we must match. Always a SubFunction. */
-        ParamSpec_SubFunctionData match_tree;
-    } PACKED_GRAMMAR_ATTRIBUTE; // size: 2+1+2+27 + 48 = 80 bits = 10 bytes
-
-    /* Grammar is a set of rules for tree substitutions. */
-    struct Grammar
-    {
-        /* The rules of this grammar */
-        unsigned rule_count;
-        unsigned char rule_list[999]; // maximum limit...
-        /* Note: Changing the limit has no effect to performance of
-         * fparser. The limit is only actually used within grammar_parser.
-         * A too low limit causes a memory corruption during the parse.
-         * A too high limit just may cause inconvenience.
-         * The actual grammar items linked to fparser are optimized for size,
-         * and the size of the Grammar object may be considerably smaller
-         * than what is indicated by this prototype.
-         */
-    };
-
-    extern "C" {
-        extern const Rule      grammar_rules[];
-    #ifndef FPOPTIMIZER_MERGED_FILE
-        extern const Grammar   grammar_optimize_round1;
-        extern const Grammar   grammar_optimize_round2;
-        extern const Grammar   grammar_optimize_round3;
-        extern const Grammar   grammar_optimize_round4;
-        extern const Grammar   grammar_optimize_shortcut_logical_evaluation;
-        extern const Grammar   grammar_optimize_nonshortcut_logical_evaluation;
-        extern const Grammar   grammar_optimize_ignore_if_sideeffects;
-        extern const Grammar   grammar_optimize_abslogical;
-        extern const Grammar   grammar_optimize_base2_expand;
-    #endif
-    }
-
-    void DumpParam(const ParamSpec& p, std::ostream& o = std::cout);
-    void DumpParams(unsigned paramlist, unsigned count, std::ostream& o = std::cout);
-}
-
-#endif
-
-#line 1 "fpoptimizer/fpoptimizer_consts.h"
-#ifndef M_PI
-#define M_PI 3.1415926535897932384626433832795
-#endif
-
-#define CONSTANT_E     2.71828182845904523536  // exp(1)
-#define CONSTANT_EI    0.3678794411714423215955 // exp(-1)
-#define CONSTANT_2E    7.3890560989306502272304 // exp(2)
-#define CONSTANT_2EI   0.135335283236612691894 // exp(-2)
-#define CONSTANT_PI    M_PI                    // atan2(0,-1)
-#define CONSTANT_L10   2.30258509299404590109  // log(10)
-#define CONSTANT_L2    0.69314718055994530943  // log(2)
-#define CONSTANT_L10I  0.43429448190325176116  // 1/log(10)
-#define CONSTANT_L2I   1.4426950408889634074   // 1/log(2)
-#define CONSTANT_L10E  CONSTANT_L10I           // log10(e)
-#define CONSTANT_L10EI CONSTANT_L10            // 1/log10(e)
-#define CONSTANT_L10B  0.3010299956639811952137 // log10(2)
-#define CONSTANT_L10BI 3.3219280948873623478703 // 1/log10(2)
-#define CONSTANT_LB10  CONSTANT_L10BI          // log2(10)
-#define CONSTANT_LB10I CONSTANT_L10B           // 1/log2(10)
-#define CONSTANT_L2E   CONSTANT_L2I            // log2(e)
-#define CONSTANT_L2EI  CONSTANT_L2             // 1/log2(e)
-#define CONSTANT_DR    (180.0 / M_PI)          // 180/pi
-#define CONSTANT_RD    (M_PI / 180.0)          // pi/180
-
-#define CONSTANT_POS_INF     HUGE_VAL  // positive infinity, from math.h
-#define CONSTANT_NEG_INF   (-HUGE_VAL) // negative infinity
-#define CONSTANT_PIHALF (M_PI / 2)
-
-#line 1 "fpoptimizer/fpoptimizer_optimize.h"
-// line removed for fpoptimizer.c: #include "fpoptimizer_codetree.h"
-// line removed for fpoptimizer.c: #include "fpoptimizer_grammar.h"
-
-#ifdef FP_SUPPORT_OPTIMIZER
-
-#include <vector>
-#include <utility>
-#include <iostream>
-
-//#define DEBUG_SUBSTITUTIONS
-
-namespace FPoptimizer_Optimize
-{
-    using namespace FPoptimizer_Grammar;
-    using namespace FPoptimizer_CodeTree;
-    using namespace FUNCTIONPARSERTYPES;
-
-    /* This struct collects information regarding the matching process so far */
-    class MatchInfo
-    {
-    public:
-        std::vector<std::pair<bool,std::vector<CodeTree>
-                             > > restholder_matches;
-        std::vector<CodeTree> paramholder_matches;
-        std::vector<unsigned> matched_params;
-    public:
-        /* These functions save data from matching */
-        bool SaveOrTestRestHolder(
-            unsigned restholder_index,
-            const std::vector<CodeTree>& treelist)
-        {
-            if(restholder_matches.size() <= restholder_index)
-            {
-                restholder_matches.resize(restholder_index+1);
-                restholder_matches[restholder_index].first  = true;
-                restholder_matches[restholder_index].second = treelist;
-                return true;
-            }
-            if(restholder_matches[restholder_index].first == false)
-            {
-                restholder_matches[restholder_index].first  = true;
-                restholder_matches[restholder_index].second = treelist;
-                return true;
-            }
-            const std::vector<CodeTree>& found =
-                restholder_matches[restholder_index].second;
-            if(treelist.size() != found.size())
-                return false;
-            for(size_t a=0; a<treelist.size(); ++a)
-                if(!treelist[a].IsIdenticalTo(found[a]))
-                    return false;
-            return true;
-        }
-
-        void SaveRestHolder(
-            unsigned restholder_index,
-            std::vector<CodeTree>& treelist)
-        {
-            if(restholder_matches.size() <= restholder_index)
-                restholder_matches.resize(restholder_index+1);
-            restholder_matches[restholder_index].first = true;
-            restholder_matches[restholder_index].second.swap(treelist);
-        }
-
-        bool SaveOrTestParamHolder(
-            unsigned paramholder_index,
-            const CodeTree& treeptr)
-        {
-            if(paramholder_matches.size() <= paramholder_index)
-            {
-                paramholder_matches.reserve(paramholder_index+1);
-                paramholder_matches.resize(paramholder_index);
-                paramholder_matches.push_back(treeptr);
-                return true;
-            }
-            if(!paramholder_matches[paramholder_index].IsDefined())
-            {
-                paramholder_matches[paramholder_index] = treeptr;
-                return true;
-            }
-            return treeptr.IsIdenticalTo(paramholder_matches[paramholder_index]);
-        }
-
-        void SaveMatchedParamIndex(unsigned index)
-        {
-            matched_params.push_back(index);
-        }
-
-        /* These functions retrieve the data from matching
-         * for use when synthesizing the resulting tree.
-         */
-        const CodeTree& GetParamHolderValueIfFound( unsigned paramholder_index ) const
-        {
-            static const CodeTree dummytree;
-            if(paramholder_matches.size() <= paramholder_index)
-                return dummytree;
-            return paramholder_matches[paramholder_index];
-        }
-
-        const CodeTree& GetParamHolderValue( unsigned paramholder_index ) const
-            { return paramholder_matches[paramholder_index]; }
-
-        bool HasRestHolder(unsigned restholder_index) const
-            { return restholder_matches.size() > restholder_index
-                  && restholder_matches[restholder_index].first == true; }
-
-        const std::vector<CodeTree>& GetRestHolderValues( unsigned restholder_index ) const
-        {
-            static const std::vector<CodeTree> empty_result;
-            if(restholder_matches.size() <= restholder_index)
-                return empty_result;
-            return restholder_matches[restholder_index].second;
-        }
-
-        const std::vector<unsigned>& GetMatchedParamIndexes() const
-            { return matched_params; }
-
-        /* */
-        void swap(MatchInfo& b)
-        {
-            restholder_matches.swap(b.restholder_matches);
-            paramholder_matches.swap(b.paramholder_matches);
-            matched_params.swap(b.matched_params);
-        }
-        MatchInfo& operator=(const MatchInfo& b)
-        {
-            restholder_matches = b.restholder_matches;
-            paramholder_matches = b.paramholder_matches;
-            matched_params = b.matched_params;
-            return *this;
-        }
-    };
-
-    class MatchPositionSpecBase;
-
-    // For iterating through match candidates
-    typedef FPOPT_autoptr<MatchPositionSpecBase> MatchPositionSpecBaseP;
-
-    class MatchPositionSpecBase
-    {
-    public:
-        int RefCount;
-    public:
-        MatchPositionSpecBase() : RefCount(0) { }
-        virtual ~MatchPositionSpecBase() { }
-    };
-    struct MatchResultType
-    {
-        bool found;
-        MatchPositionSpecBaseP specs;
-
-        MatchResultType(bool f) : found(f), specs() { }
-        MatchResultType(bool f,
-                        const MatchPositionSpecBaseP& s) : found(f), specs(s) { }
-    };
-
-    /* Synthesize the given grammatic rule's replacement into the codetree */
-    void SynthesizeRule(
-        const Rule& rule,
-        CodeTree& tree,
-        MatchInfo& info);
-
-    /* Test the given parameter to a given CodeTree */
-    MatchResultType TestParam(
-        const ParamSpec& parampair,
-        const CodeTree& tree,
-        const MatchPositionSpecBaseP& start_at,
-        MatchInfo& info);
-
-    /* Test the list of parameters to a given CodeTree */
-    MatchResultType TestParams(
-        const ParamSpec_SubFunctionData& model_tree,
-        const CodeTree& tree,
-        const MatchPositionSpecBaseP& start_at,
-        MatchInfo& info,
-        bool TopLevel);
-
-    bool ApplyGrammar(const Grammar& grammar,
-                      FPoptimizer_CodeTree::CodeTree& tree,
-                      bool from_logical_context = false);
-    void ApplyGrammars(FPoptimizer_CodeTree::CodeTree& tree);
-
-    bool IsLogisticallyPlausibleParamsMatch(
-        const ParamSpec_SubFunctionData& params,
-        const CodeTree& tree);
-}
-
-namespace FPoptimizer_Grammar
-{
-    void DumpMatch(const Rule& rule,
-                   const FPoptimizer_CodeTree::CodeTree& tree,
-                   const FPoptimizer_Optimize::MatchInfo& info,
-                   bool DidMatch,
-                   std::ostream& o = std::cout);
-    void DumpMatch(const Rule& rule,
-                   const FPoptimizer_CodeTree::CodeTree& tree,
-                   const FPoptimizer_Optimize::MatchInfo& info,
-                   const char* whydump,
-                   std::ostream& o = std::cout);
-}
-
-#endif
-
-#line 1 "fpoptimizer/crc32.h"
-/* crc32 */
-
-#ifdef _MSC_VER
-
- typedef unsigned int crc32_t;
-
-#else
-
- #include <stdint.h>
- typedef uint_least32_t crc32_t;
-
-#endif
-
-namespace crc32
-{
-    enum { startvalue = 0xFFFFFFFFUL, poly = 0xEDB88320UL };
-
-    /* This code constructs the CRC32 table at compile-time,
-     * avoiding the need for a huge explicitly written table of magical numbers. */
-    template<crc32_t crc> // One byte of a CRC32 (eight bits):
-    struct b8
-    {
-        enum { b1 = (crc & 1) ? (poly ^ (crc >> 1)) : (crc >> 1),
-               b2 = (b1  & 1) ? (poly ^ (b1  >> 1)) : (b1  >> 1),
-               b3 = (b2  & 1) ? (poly ^ (b2  >> 1)) : (b2  >> 1),
-               b4 = (b3  & 1) ? (poly ^ (b3  >> 1)) : (b3  >> 1),
-               b5 = (b4  & 1) ? (poly ^ (b4  >> 1)) : (b4  >> 1),
-               b6 = (b5  & 1) ? (poly ^ (b5  >> 1)) : (b5  >> 1),
-               b7 = (b6  & 1) ? (poly ^ (b6  >> 1)) : (b6  >> 1),
-               res= (b7  & 1) ? (poly ^ (b7  >> 1)) : (b7  >> 1) };
-    };
-    inline crc32_t update(crc32_t crc, unsigned/* char */b) // __attribute__((pure))
-    {
-        // Four values of the table
-        #define B4(n) b8<n>::res,b8<n+1>::res,b8<n+2>::res,b8<n+3>::res
-        // Sixteen values of the table
-        #define R(n) B4(n),B4(n+4),B4(n+8),B4(n+12)
-        // The whole table, index by steps of 16
-        static const crc32_t table[256] =
-        { R(0x00),R(0x10),R(0x20),R(0x30), R(0x40),R(0x50),R(0x60),R(0x70),
-          R(0x80),R(0x90),R(0xA0),R(0xB0), R(0xC0),R(0xD0),R(0xE0),R(0xF0) };
-        #undef R
-        #undef B4
-        return ((crc >> 8) /* & 0x00FFFFFF*/) ^ table[/*(unsigned char)*/(crc^b)&0xFF];
-    }
-    inline crc32_t calc_upd(crc32_t c, const unsigned char* buf, size_t size)
-    {
-        crc32_t value = c;
-        for(size_t p=0; p<size; ++p) value = update(value, buf[p]);
-        return value;
-    }
-    inline crc32_t calc(const unsigned char* buf, size_t size)
-    {
-        return calc_upd(startvalue, buf, size);
-    }
-}
-
-#line 1 "fpoptimizer/fpoptimizer_opcodename.h"
-// line removed for fpoptimizer.c: #include "fpoptimizer_grammar.h"
-#include <string>
-
-const std::string FP_GetOpcodeName(FPoptimizer_Grammar::SpecialOpcode opcode, bool pad=false);
-const std::string FP_GetOpcodeName(FUNCTIONPARSERTYPES::OPCODE opcode,        bool pad=false);
-
-#line 1 "fpoptimizer/fpoptimizer_opcodename.c"
-#include <string>
-#include <sstream>
-#include <assert.h>
-
-#include <iostream>
-
-#include "fpconfig.h"
-#include "fptypes.h"
-
-// line removed for fpoptimizer.c: #include "fpoptimizer_grammar.h"
-// line removed for fpoptimizer.c: #include "fpoptimizer_opcodename.h"
-
-using namespace FPoptimizer_Grammar;
-using namespace FUNCTIONPARSERTYPES;
-
-const std::string FP_GetOpcodeName(FPoptimizer_Grammar::SpecialOpcode opcode, bool pad)
-{
-#if 1
-    /* Symbolic meanings for the opcodes? */
-    const char* p = 0;
-    switch( opcode )
-    {
-        case NumConstant:   p = "NumConstant"; break;
-        case ParamHolder:   p = "ParamHolder"; break;
-        case SubFunction:   p = "SubFunction"; break;
-    }
-    std::ostringstream tmp;
-    //if(!p) std::cerr << "o=" << opcode << "\n";
-    assert(p);
-    tmp << p;
-    if(pad) while(tmp.str().size() < 12) tmp << ' ';
-    return tmp.str();
-#else
-    /* Just numeric meanings */
-    std::ostringstream tmp;
-    tmp << opcode;
-    if(pad) while(tmp.str().size() < 5) tmp << ' ';
-    return tmp.str();
-#endif
-}
-
-const std::string FP_GetOpcodeName(FUNCTIONPARSERTYPES::OPCODE opcode,        bool pad)
-{
-#if 1
-    /* Symbolic meanings for the opcodes? */
-    const char* p = 0;
-    switch(opcode)
-    {
-        case cAbs: p = "cAbs"; break;
-        case cAcos: p = "cAcos"; break;
-        case cAcosh: p = "cAcosh"; break;
-        case cAsin: p = "cAsin"; break;
-        case cAsinh: p = "cAsinh"; break;
-        case cAtan: p = "cAtan"; break;
-        case cAtan2: p = "cAtan2"; break;
-        case cAtanh: p = "cAtanh"; break;
-        case cCbrt: p = "cCbrt"; break;
-        case cCeil: p = "cCeil"; break;
-        case cCos: p = "cCos"; break;
-        case cCosh: p = "cCosh"; break;
-        case cCot: p = "cCot"; break;
-        case cCsc: p = "cCsc"; break;
-        case cEval: p = "cEval"; break;
-        case cExp: p = "cExp"; break;
-        case cExp2: p = "cExp2"; break;
-        case cFloor: p = "cFloor"; break;
-        case cIf: p = "cIf"; break;
-        case cInt: p = "cInt"; break;
-        case cLog: p = "cLog"; break;
-        case cLog2: p = "cLog2"; break;
-        case cLog10: p = "cLog10"; break;
-        case cMax: p = "cMax"; break;
-        case cMin: p = "cMin"; break;
-        case cPow: p = "cPow"; break;
-        case cSec: p = "cSec"; break;
-        case cSin: p = "cSin"; break;
-        case cSinh: p = "cSinh"; break;
-        case cSqrt: p = "cSqrt"; break;
-        case cTan: p = "cTan"; break;
-        case cTanh: p = "cTanh"; break;
-        case cTrunc: p = "cTrunc"; break;
-        case cImmed: p = "cImmed"; break;
-        case cJump: p = "cJump"; break;
-        case cNeg: p = "cNeg"; break;
-        case cAdd: p = "cAdd"; break;
-        case cSub: p = "cSub"; break;
-        case cMul: p = "cMul"; break;
-        case cDiv: p = "cDiv"; break;
-        case cMod: p = "cMod"; break;
-        case cEqual: p = "cEqual"; break;
-        case cNEqual: p = "cNEqual"; break;
-        case cLess: p = "cLess"; break;
-        case cLessOrEq: p = "cLessOrEq"; break;
-        case cGreater: p = "cGreater"; break;
-        case cGreaterOrEq: p = "cGreaterOrEq"; break;
-        case cNot: p = "cNot"; break;
-        case cAnd: p = "cAnd"; break;
-        case cOr: p = "cOr"; break;
-        case cDeg: p = "cDeg"; break;
-        case cRad: p = "cRad"; break;
-        case cFCall: p = "cFCall"; break;
-        case cPCall: p = "cPCall"; break;
-#ifdef FP_SUPPORT_OPTIMIZER
-        case cFetch: p = "cFetch"; break;
-        case cPopNMov: p = "cPopNMov"; break;
-        case cLog2by: p = "cLog2by"; break;
-#endif
-        case cAbsNot: p = "cAbsNot"; break;
-        case cAbsNotNot: p = "cAbsNotNot"; break;
-        case cAbsAnd: p = "cAbsAnd"; break;
-        case cAbsOr: p = "cAbsOr"; break;
-        case cAbsIf: p = "cAbsIf"; break;
-        case cDup: p = "cDup"; break;
-        case cInv: p = "cInv"; break;
-        case cSqr: p = "cSqr"; break;
-        case cRDiv: p = "cRDiv"; break;
-        case cRSub: p = "cRSub"; break;
-        case cNotNot: p = "cNotNot"; break;
-        case cRSqrt: p = "cRSqrt"; break;
-        case cNop: p = "cNop"; break;
-        case VarBegin: p = "VarBegin"; break;
-    }
-    std::ostringstream tmp;
-    //if(!p) std::cerr << "o=" << opcode << "\n";
-    assert(p);
-    tmp << p;
-    if(pad) while(tmp.str().size() < 12) tmp << ' ';
-    return tmp.str();
-#else
-    /* Just numeric meanings */
-    std::ostringstream tmp;
-    tmp << opcode;
-    if(pad) while(tmp.str().size() < 5) tmp << ' ';
-    return tmp.str();
-#endif
-}
-
-#line 1 "fpoptimizer/fpoptimizer_bytecodesynth.h"
-#include "fpconfig.h"
-#include "fparser.h"
-#include "fptypes.h"
-
-#ifdef FP_SUPPORT_OPTIMIZER
-
-#include <vector>
-#include <utility>
-
-// line removed for fpoptimizer.c: #include "fpoptimizer_codetree.h"
-
-#ifndef FP_GENERATING_POWI_TABLE
-enum { MAX_POWI_BYTECODE_LENGTH = 20 };
-#else
-enum { MAX_POWI_BYTECODE_LENGTH = 999 };
-#endif
-enum { MAX_MULI_BYTECODE_LENGTH = 3 };
-
-namespace FPoptimizer_ByteCode
-{
-    class ByteCodeSynth
-    {
-    public:
-        ByteCodeSynth()
-            : ByteCode(), Immed(), StackTop(0), StackMax(0)
-        {
-            /* estimate the initial requirements as such */
-            ByteCode.reserve(64);
-            Immed.reserve(8);
-            StackState.reserve(16);
-        }
-
-        void Pull(std::vector<unsigned>& bc,
-                  std::vector<double>&   imm,
-                  size_t& StackTop_max)
-        {
-            ByteCode.swap(bc);
-            Immed.swap(imm);
-            StackTop_max = StackMax;
-        }
-
-        size_t GetByteCodeSize() const { return ByteCode.size(); }
-        size_t GetStackTop()     const { return StackTop; }
-
-        void PushVar(unsigned varno)
-        {
-            ByteCode.push_back(varno);
-            SetStackTop(StackTop+1);
-        }
-
-        void PushImmed(double immed)
-        {
-            using namespace FUNCTIONPARSERTYPES;
-            ByteCode.push_back(cImmed);
-            Immed.push_back(immed);
-            SetStackTop(StackTop+1);
-        }
-
-        void StackTopIs(const FPoptimizer_CodeTree::CodeTree& tree)
-        {
-            if(StackTop > 0)
-            {
-                StackState[StackTop-1].first = true;
-                StackState[StackTop-1].second = tree;
-            }
-        }
-
-        void EatNParams(unsigned eat_count)
-        {
-            SetStackTop(StackTop - eat_count);
-        }
-
-        void ProducedNParams(unsigned produce_count)
-        {
-            SetStackTop(StackTop + produce_count);
-        }
-
-        void AddOperation(unsigned opcode, unsigned eat_count, unsigned produce_count = 1)
-        {
-            EatNParams(eat_count);
-
-            using namespace FUNCTIONPARSERTYPES;
-
-            if(!ByteCode.empty() && opcode == cMul && ByteCode.back() == cDup)
-                ByteCode.back() = cSqr;
-            else
-                ByteCode.push_back(opcode);
-
-            ProducedNParams(produce_count);
-        }
-
-        void DoPopNMov(size_t targetpos, size_t srcpos)
-        {
-            using namespace FUNCTIONPARSERTYPES;
-            ByteCode.push_back(cPopNMov);
-            ByteCode.push_back( (unsigned) targetpos);
-            ByteCode.push_back( (unsigned) srcpos);
-
-            SetStackTop(srcpos+1);
-            StackState[targetpos] = StackState[srcpos];
-            SetStackTop(targetpos+1);
-        }
-
-        void DoDup(size_t src_pos)
-        {
-            using namespace FUNCTIONPARSERTYPES;
-            if(src_pos == StackTop-1)
-            {
-                ByteCode.push_back(cDup);
-            }
-            else
-            {
-                ByteCode.push_back(cFetch);
-                ByteCode.push_back( (unsigned) src_pos);
-            }
-            SetStackTop(StackTop + 1);
-            StackState[StackTop-1] = StackState[src_pos];
-        }
-
-        size_t FindPos(const FPoptimizer_CodeTree::CodeTree& tree) const
-        {
-            /*std::cout << "Stack state now(" << StackTop << "):\n";
-            for(size_t a=0; a<StackTop; ++a)
-            {
-                std::cout << a << ": ";
-                if(StackState[a].first)
-                    DumpTree(StackState[a].second);
-                else
-                    std::cout << "?";
-                std::cout << "\n";
-            }*/
-            for(size_t a=StackTop; a-->0; )
-                if(StackState[a].first && StackState[a].second.IsIdenticalTo(tree))
-                    return a;
-            return ~size_t(0);
-        }
-
-        bool Find(const FPoptimizer_CodeTree::CodeTree& tree) const
-        {
-            return FindPos(tree) != ~size_t(0);
-        }
-
-        bool FindAndDup(const FPoptimizer_CodeTree::CodeTree& tree)
-        {
-            size_t pos = FindPos(tree);
-            if(pos != ~size_t(0))
-            {
-                DoDup(pos);
-                return true;
-            }
-            return false;
-        }
-
-        struct IfData
-        {
-            size_t ofs;
-        };
-
-        void SynthIfStep1(IfData& ifdata, FUNCTIONPARSERTYPES::OPCODE op)
-        {
-            using namespace FUNCTIONPARSERTYPES;
-            SetStackTop(StackTop-1); // the If condition was popped.
-
-            ifdata.ofs = ByteCode.size();
-            ByteCode.push_back(op);
-            ByteCode.push_back(0); // code index
-            ByteCode.push_back(0); // Immed index
-        }
-        void SynthIfStep2(IfData& ifdata)
-        {
-            using namespace FUNCTIONPARSERTYPES;
-            SetStackTop(StackTop-1); // ignore the pushed then-branch result.
-
-            ByteCode[ifdata.ofs+1] = unsigned( ByteCode.size()+2 );
-            ByteCode[ifdata.ofs+2] = unsigned( Immed.size()      );
-
-            ifdata.ofs = ByteCode.size();
-            ByteCode.push_back(cJump);
-            ByteCode.push_back(0); // code index
-            ByteCode.push_back(0); // Immed index
-        }
-        void SynthIfStep3(IfData& ifdata)
-        {
-            using namespace FUNCTIONPARSERTYPES;
-            SetStackTop(StackTop-1); // ignore the pushed else-branch result.
-
-            ByteCode[ifdata.ofs+1] = unsigned( ByteCode.size()-1 );
-            ByteCode[ifdata.ofs+2] = unsigned( Immed.size()      );
-
-            SetStackTop(StackTop+1); // one or the other was pushed.
-
-            /* Threading jumps:
-             * If there are any cJumps that point
-             * to the cJump instruction we just changed,
-             * change them to point to this target as well.
-             * This screws up PrintByteCode() majorly.
-             */
-            for(size_t a=0; a<ifdata.ofs; ++a)
-            {
-                if(ByteCode[a]   == cJump
-                && ByteCode[a+1] == ifdata.ofs-1)
-                {
-                    ByteCode[a+1] = unsigned( ByteCode.size()-1 );
-                    ByteCode[a+2] = unsigned( Immed.size()      );
-                }
-                switch(ByteCode[a])
-                {
-                    case cAbsIf:
-                    case cIf:
-                    case cJump:
-                    case cPopNMov: a += 2; break;
-                    case cFCall:
-                    case cPCall:
-                    case cFetch: a += 1; break;
-                    default: break;
-                }
-            }
-        }
-
-    protected:
-        void SetStackTop(size_t value)
-        {
-            StackTop = value;
-            if(StackTop > StackMax)
-            {
-                StackMax = StackTop;
-                StackState.resize(StackMax);
-            }
-        }
-
-    private:
-        std::vector<unsigned> ByteCode;
-        std::vector<double>   Immed;
-
-        std::vector<
-            std::pair<bool/*known*/, FPoptimizer_CodeTree::CodeTree/*tree*/>
-                   > StackState;
-        size_t StackTop;
-        size_t StackMax;
-    };
-
-    struct SequenceOpCode;
-    extern const SequenceOpCode AddSequence; /* Multiplication implemented with adds */
-    extern const SequenceOpCode MulSequence; /* Exponentiation implemented with muls */
-
-    /* Generate a sequence that multiplies or exponentifies the
-     * last operand in the stack by the given constant integer
-     * amount (positive or negative).
-     */
-    void AssembleSequence(
-        long count,
-        const SequenceOpCode& sequencing,
-        ByteCodeSynth& synth);
-}
-
-#endif
-
-#line 1 "fpoptimizer/fpoptimizer_bytecodesynth.c"
-// line removed for fpoptimizer.c: #include "fpoptimizer_bytecodesynth.h"
-
-#ifdef FP_SUPPORT_OPTIMIZER
-
-using namespace FUNCTIONPARSERTYPES;
-
-namespace FPoptimizer_ByteCode
-{
-    const struct SequenceOpCode
-    {
-        double basevalue;
-        unsigned op_flip;
-        unsigned op_normal, op_normal_flip;
-        unsigned op_inverse, op_inverse_flip;
-    } AddSequence = {0.0, cNeg, cAdd, cAdd, cSub, cRSub },
-      MulSequence = {1.0, cInv, cMul, cMul, cDiv, cRDiv };
-}
-
-using namespace FPoptimizer_ByteCode;
-
-#define POWI_TABLE_SIZE 256
-#define POWI_WINDOW_SIZE 3
-namespace FPoptimizer_ByteCode
-{
-    #ifndef FP_GENERATING_POWI_TABLE
-    extern const
-    unsigned char powi_table[POWI_TABLE_SIZE];
-    const
-    #endif
-    unsigned char powi_table[POWI_TABLE_SIZE] =
-    {
-          0,   1,   1,   1,   2,   1,   2,   1, /*   0 -   7 */
-          4,   1,   2,   1,   4,   1,   2, 131, /*   8 -  15 */
-          8,   1,   2,   1,   4,   1,   2,   1, /*  16 -  23 */
-          8, 133,   2, 131,   4,   1,  15,   1, /*  24 -  31 */
-         16,   1,   2,   1,   4,   1,   2, 131, /*  32 -  39 */
-          8,   1,   2,   1,   4, 133,   2,   1, /*  40 -  47 */
-         16,   1,  25, 131,   4,   1,  27,   5, /*  48 -  55 */
-          8,   3,   2,   1,  30,   1,  31,   3, /*  56 -  63 */
-         32,   1,   2,   1,   4,   1,   2,   1, /*  64 -  71 */
-          8,   1,   2, 131,   4,   1,  39,   1, /*  72 -  79 */
-         16, 137,   2,   1,   4, 133,   2, 131, /*  80 -  87 */
-          8,   1,  45, 135,   4,  31,   2,   5, /*  88 -  95 */
-         32,   1,   2, 131,  50,   1,  51,   1, /*  96 - 103 */
-          8,   3,   2,   1,  54,   1,  55,   3, /* 104 - 111 */
-         16,   1,  57, 133,   4, 137,   2, 135, /* 112 - 119 */
-         60,   1,  61,   3,  62, 133,  63,   1, /* 120 - 127 */
-        130,   1,   2,   1, 130,   1,   2, 131, /* 128 - 135 */
-        130,   1,   2,   1, 130,   1,   2, 139, /* 136 - 143 */
-        130,   1,   2, 131, 130,   1,  30,   1, /* 144 - 151 */
-        130, 137,   2,  31, 130,   1,   2, 131, /* 152 - 159 */
-        130,   1, 130,   1, 130, 133,   2,   1, /* 160 - 167 */
-        130,   1, 130,   1,   2,   1, 130, 133, /* 168 - 175 */
-        130,   1,   2,   1, 130,   1,   2,  61, /* 176 - 183 */
-        130, 133,  62, 139, 130, 137, 130,   1, /* 184 - 191 */
-        130,   1,   2, 131, 130,   1, 130,   1, /* 192 - 199 */
-        130,   1,   2,   1, 130,   1,   2, 131, /* 200 - 207 */
-        130,   1, 130,   1, 130, 131,   2, 133, /* 208 - 215 */
-        130,   1,   2, 131, 130, 141, 130,   1, /* 216 - 223 */
-        130, 133,   2,   1, 130,   1,   5, 135, /* 224 - 231 */
-        130,   1, 130,   1,   2, 131, 130,   1, /* 232 - 239 */
-        130,   1,   2, 131, 130, 133, 130, 141, /* 240 - 247 */
-        130, 131, 130,   1, 130,   1,   2, 131  /* 248 - 255 */
-    }; /* as in gcc, but custom-optimized for stack calculation */
-}
-static const int POWI_CACHE_SIZE = 256;
-
-#define FPO(x) /**/
-//#define FPO(x) x
-
-
-namespace
-{
-    class PowiCache
-    {
-    private:
-        int cache[POWI_CACHE_SIZE];
-        int cache_needed[POWI_CACHE_SIZE];
-
-    public:
-        PowiCache()
-            : cache(), cache_needed() /* Assume we have no factors in the cache */
-        {
-            /* Decide which factors we would need multiple times.
-             * Output:
-             *   cache[]        = these factors were generated
-             *   cache_needed[] = number of times these factors were desired
-             */
-            cache[1] = 1; // We have this value already.
-        }
-
-        bool Plan_Add(long value, int count)
-        {
-            if(value >= POWI_CACHE_SIZE) return false;
-            //FPO(fprintf(stderr, "%ld will be needed %d times more\n", count, need_count));
-            cache_needed[value] += count;
-            return cache[value] != 0;
-        }
-
-        void Plan_Has(long value)
-        {
-            if(value < POWI_CACHE_SIZE)
-                cache[value] = 1; // This value has been generated
-        }
-
-        void Start(size_t value1_pos)
-        {
-            for(int n=2; n<POWI_CACHE_SIZE; ++n)
-                cache[n] = -1; /* Stack location for each component */
-
-            Remember(1, value1_pos);
-
-            DumpContents();
-        }
-
-        int Find(long value) const
-        {
-            if(value < POWI_CACHE_SIZE)
-            {
-                if(cache[value] >= 0)
-                {
-                    // found from the cache
-                    FPO(fprintf(stderr, "* I found %ld from cache (%u,%d)\n",
-                        value, (unsigned)cache[value], cache_needed[value]));
-                    return cache[value];
-                }
-            }
-            return -1;
-        }
-
-        void Remember(long value, size_t stackpos)
-        {
-            if(value >= POWI_CACHE_SIZE) return;
-
-            FPO(fprintf(stderr, "* Remembering that %ld can be found at %u (%d uses remain)\n",
-                value, (unsigned)stackpos, cache_needed[value]));
-            cache[value] = (int) stackpos;
-        }
-
-        void DumpContents() const
-        {
-            FPO(for(int a=1; a<POWI_CACHE_SIZE; ++a)
-                if(cache[a] >= 0 || cache_needed[a] > 0)
-                {
-                    fprintf(stderr, "== cache: sp=%d, val=%d, needs=%d\n",
-                        cache[a], a, cache_needed[a]);
-                })
-        }
-
-        int UseGetNeeded(long value)
-        {
-            if(value >= 0 && value < POWI_CACHE_SIZE)
-                return --cache_needed[value];
-            return 0;
-        }
-    };
-
-
-    size_t AssembleSequence_Subdivide(
-        long count,
-        PowiCache& cache,
-        const SequenceOpCode& sequencing,
-        ByteCodeSynth& synth);
-
-    void Subdivide_Combine(
-        size_t apos, long aval,
-        size_t bpos, long bval,
-        PowiCache& cache,
-
-        unsigned cumulation_opcode,
-        unsigned cimulation_opcode_flip,
-
-        ByteCodeSynth& synth);
-
-    void PlanNtimesCache
-        (long value,
-         PowiCache& cache,
-         int need_count,
-         int recursioncount=0)
-    {
-        if(value < 1) return;
-
-    #ifdef FP_GENERATING_POWI_TABLE
-        if(recursioncount > 32) throw false;
-    #endif
-
-        if(cache.Plan_Add(value, need_count)) return;
-
-        long half = 1;
-        if(value < POWI_TABLE_SIZE)
-        {
-            half = powi_table[value];
-            if(half & 128)
-            {
-                half &= 127;
-                if(half & 64)
-                    half = -(half & 63) - 1;
-
-                FPO(fprintf(stderr, "value=%ld, half=%ld, otherhalf=%ld\n", value,half,value/half));
-
-                PlanNtimesCache(half,      cache, 1, recursioncount+1);
-                cache.Plan_Has(half);
-                return;
-            }
-            else if(half & 64)
-            {
-                half = -(half & 63) - 1;
-            }
-        }
-        else if(value & 1)
-            half = value & ((1 << POWI_WINDOW_SIZE) - 1); // that is, value & 7
-        else
-            half = value / 2;
-
-        long otherhalf = value-half;
-        if(half > otherhalf || half<0) std::swap(half,otherhalf);
-
-        FPO(fprintf(stderr, "value=%ld, half=%ld, otherhalf=%ld\n", value,half,otherhalf));
-
-        if(half == otherhalf)
-        {
-            PlanNtimesCache(half,      cache, 2, recursioncount+1);
-        }
-        else
-        {
-            PlanNtimesCache(half,      cache, 1, recursioncount+1);
-            PlanNtimesCache(otherhalf>0?otherhalf:-otherhalf,
-                                       cache, 1, recursioncount+1);
-        }
-        cache.Plan_Has(value);
-    }
-
-    size_t AssembleSequence_Subdivide(
-        long value,
-        PowiCache& cache,
-        const SequenceOpCode& sequencing,
-        ByteCodeSynth& synth)
-    {
-        int cachepos = cache.Find(value);
-        if(cachepos >= 0)
-        {
-            // found from the cache
-            return cachepos;
-        }
-
-        long half = 1;
-        if(value < POWI_TABLE_SIZE)
-        {
-            half = powi_table[value];
-            if(half & 128)
-            {
-                half &= 127;
-                if(half & 64)
-                    half = -(half & 63) - 1;
-
-                FPO(fprintf(stderr, "* I want %ld, my plan is %ld * %ld\n", value, half, value/half));
-                size_t half_pos = AssembleSequence_Subdivide(half, cache, sequencing, synth);
-                if(cache.UseGetNeeded(half) > 0
-                || half_pos != synth.GetStackTop()-1)
-                {
-                    synth.DoDup(half_pos);
-                    cache.Remember(half, synth.GetStackTop()-1);
-                }
-                AssembleSequence(value/half, sequencing, synth);
-                size_t stackpos = synth.GetStackTop()-1;
-                cache.Remember(value, stackpos);
-                cache.DumpContents();
-                return stackpos;
-            }
-            else if(half & 64)
-            {
-                half = -(half & 63) - 1;
-            }
-        }
-        else if(value & 1)
-            half = value & ((1 << POWI_WINDOW_SIZE) - 1); // that is, value & 7
-        else
-            half = value / 2;
-
-        long otherhalf = value-half;
-        if(half > otherhalf || half<0) std::swap(half,otherhalf);
-
-        FPO(fprintf(stderr, "* I want %ld, my plan is %ld + %ld\n", value, half, value-half));
-
-        if(half == otherhalf)
-        {
-            size_t half_pos = AssembleSequence_Subdivide(half, cache, sequencing, synth);
-
-            // self-cumulate the subdivide result
-            Subdivide_Combine(half_pos,half, half_pos,half, cache,
-                sequencing.op_normal, sequencing.op_normal_flip,
-                synth);
-        }
-        else
-        {
-            long part1 = half;
-            long part2 = otherhalf>0?otherhalf:-otherhalf;
-
-            size_t part1_pos = AssembleSequence_Subdivide(part1, cache, sequencing, synth);
-            size_t part2_pos = AssembleSequence_Subdivide(part2, cache, sequencing, synth);
-
-            FPO(fprintf(stderr, "Subdivide(%ld: %ld, %ld)\n", value, half, otherhalf));
-
-            Subdivide_Combine(part1_pos,part1, part2_pos,part2, cache,
-                otherhalf>0 ? sequencing.op_normal      : sequencing.op_inverse,
-                otherhalf>0 ? sequencing.op_normal_flip : sequencing.op_inverse_flip,
-                synth);
-        }
-
-        size_t stackpos = synth.GetStackTop()-1;
-        cache.Remember(value, stackpos);
-        cache.DumpContents();
-        return stackpos;
-    }
-
-    void Subdivide_Combine(
-        size_t apos, long aval,
-        size_t bpos, long bval,
-        PowiCache& cache,
-        unsigned cumulation_opcode,
-        unsigned cumulation_opcode_flip,
-        ByteCodeSynth& synth)
-    {
-        /*FPO(fprintf(stderr, "== making result for (sp=%u, val=%d, needs=%d) and (sp=%u, val=%d, needs=%d), stacktop=%u\n",
-            (unsigned)apos, aval, aval>=0 ? cache_needed[aval] : -1,
-            (unsigned)bpos, bval, bval>=0 ? cache_needed[bval] : -1,
-            (unsigned)synth.GetStackTop()));*/
-
-        // Figure out whether we can trample a and b
-        int a_needed = cache.UseGetNeeded(aval);
-        int b_needed = cache.UseGetNeeded(bval);
-
-        bool flipped = false;
-
-        #define DUP_BOTH() do { \
-            if(apos < bpos) { size_t tmp=apos; apos=bpos; bpos=tmp; flipped=!flipped; } \
-            FPO(fprintf(stderr, "-> dup(%u) dup(%u) op\n", (unsigned)apos, (unsigned)bpos)); \
-            synth.DoDup(apos); \
-            synth.DoDup(apos==bpos ? synth.GetStackTop()-1 : bpos); } while(0)
-        #define DUP_ONE(p) do { \
-            FPO(fprintf(stderr, "-> dup(%u) op\n", (unsigned)p)); \
-            synth.DoDup(p); \
-        } while(0)
-
-        if(a_needed > 0)
-        {
-            if(b_needed > 0)
-            {
-                // If they must both be preserved, make duplicates
-                // First push the one that is at the larger stack
-                // address. This increases the odds of possibly using cDup.
-                DUP_BOTH();
-
-                //SCENARIO 1:
-                // Input:  x B A x x
-                // Temp:   x B A x x A B
-                // Output: x B A x x R
-                //SCENARIO 2:
-                // Input:  x A B x x
-                // Temp:   x A B x x B A
-                // Output: x A B x x R
-            }
-            else
-            {
-                // A must be preserved, but B can be trampled over
-
-                // SCENARIO 1:
-                //  Input:  x B x x A
-                //   Temp:  x B x x A A B   (dup both, later first)
-                //  Output: x B x x A R
-                // SCENARIO 2:
-                //  Input:  x A x x B
-                //   Temp:  x A x x B A
-                //  Output: x A x x R       -- only commutative cases
-                // SCENARIO 3:
-                //  Input:  x x x B A
-                //   Temp:  x x x B A A B   (dup both, later first)
-                //  Output: x x x B A R
-                // SCENARIO 4:
-                //  Input:  x x x A B
-                //   Temp:  x x x A B A     -- only commutative cases
-                //  Output: x x x A R
-                // SCENARIO 5:
-                //  Input:  x A B x x
-                //   Temp:  x A B x x A B   (dup both, later first)
-                //  Output: x A B x x R
-
-                // if B is not at the top, dup both.
-                if(bpos != synth.GetStackTop()-1)
-                    DUP_BOTH();    // dup both
-                else
-                {
-                    DUP_ONE(apos); // just dup A
-                    flipped=!flipped;
-                }
-            }
-        }
-        else if(b_needed > 0)
-        {
-            // B must be preserved, but A can be trampled over
-            // This is a mirror image of the a_needed>0 case, so I'll cut the chase
-            if(apos != synth.GetStackTop()-1)
-                DUP_BOTH();
-            else
-                DUP_ONE(bpos);
-        }
-        else
-        {
-            // Both can be trampled over.
-            // SCENARIO 1:
-            //  Input:  x B x x A
-            //   Temp:  x B x x A B
-            //  Output: x B x x R
-            // SCENARIO 2:
-            //  Input:  x A x x B
-            //   Temp:  x A x x B A
-            //  Output: x A x x R       -- only commutative cases
-            // SCENARIO 3:
-            //  Input:  x x x B A
-            //  Output: x x x R         -- only commutative cases
-            // SCENARIO 4:
-            //  Input:  x x x A B
-            //  Output: x x x R
-            // SCENARIO 5:
-            //  Input:  x A B x x
-            //   Temp:  x A B x x A B   (dup both, later first)
-            //  Output: x A B x x R
-            // SCENARIO 6:
-            //  Input:  x x x C
-            //   Temp:  x x x C C   (c is both A and B)
-            //  Output: x x x R
-
-            if(apos == bpos && apos == synth.GetStackTop()-1)
-                DUP_ONE(apos); // scenario 6
-            else if(apos == synth.GetStackTop()-1 && bpos == synth.GetStackTop()-2)
-            {
-                FPO(fprintf(stderr, "-> op\n")); // scenario 3
-                flipped=!flipped;
-            }
-            else if(apos == synth.GetStackTop()-2 && bpos == synth.GetStackTop()-1)
-                FPO(fprintf(stderr, "-> op\n")); // scenario 4
-            else if(apos == synth.GetStackTop()-1)
-                DUP_ONE(bpos); // scenario 1
-            else if(bpos == synth.GetStackTop()-1)
-            {
-                DUP_ONE(apos); // scenario 2
-                flipped=!flipped;
-            }
-            else
-                DUP_BOTH(); // scenario 5
-        }
-        // Add them together.
-        synth.AddOperation(flipped ? cumulation_opcode_flip : cumulation_opcode, 2);
-    }
-
-    void LightWeight(
-        long count,
-        const SequenceOpCode& sequencing,
-        ByteCodeSynth& synth)
-    {
-        while(count < 256)
-        {
-            int half = FPoptimizer_ByteCode::powi_table[count];
-            if(half & 128)
-            {
-                half &= 127;
-                LightWeight(half,       sequencing, synth);
-                count /= half;
-            }
-            else break;
-        }
-        if(count == 1) return;
-        if(!(count & 1))
-        {
-            synth.AddOperation(cSqr, 1);
-            LightWeight(count/2, sequencing, synth);
-        }
-        else
-        {
-            synth.DoDup(synth.GetStackTop()-1);
-            LightWeight(count-1, sequencing, synth);
-            synth.AddOperation(cMul, 2);
-        }
-    }
-}
-
-namespace FPoptimizer_ByteCode
-{
-    void AssembleSequence(
-        long count,
-        const SequenceOpCode& sequencing,
-        ByteCodeSynth& synth)
-    {
-        if(count == 0)
-            synth.PushImmed(sequencing.basevalue);
-        else
-        {
-            bool needs_flip = false;
-            if(count < 0)
-            {
-                needs_flip = true;
-                count = -count;
-            }
-
-            if(false)
-                LightWeight(count,sequencing,synth);
-            else if(count > 1)
-            {
-                /* To prevent calculating the same factors over and over again,
-                 * we use a cache. */
-                PowiCache cache;
-                PlanNtimesCache(count, cache, 1);
-
-                size_t stacktop_desired = synth.GetStackTop();
-
-                cache.Start( synth.GetStackTop()-1 );
-
-                FPO(fprintf(stderr, "Calculating result for %ld...\n", count));
-                size_t res_stackpos = AssembleSequence_Subdivide(
-                    count, cache, sequencing,
-                    synth);
-
-                size_t n_excess = synth.GetStackTop() - stacktop_desired;
-                if(n_excess > 0 || res_stackpos != stacktop_desired-1)
-                {
-                    // Remove the cache values
-                    synth.DoPopNMov(stacktop_desired-1, res_stackpos);
-                }
-            }
-
-            if(needs_flip)
-                synth.AddOperation(sequencing.op_flip, 1);
-        }
-    }
-}
-
-#endif
-
-#line 1 "fpoptimizer/fpoptimizer_codetree.c"
-#include <list>
-#include <algorithm>
-
-// line removed for fpoptimizer.c: #include "fpoptimizer_codetree.h"
-#include "fptypes.h"
-// line removed for fpoptimizer.c: #include "fpoptimizer_consts.h"
-
-#ifdef FP_SUPPORT_OPTIMIZER
-
-using namespace FUNCTIONPARSERTYPES;
-//using namespace FPoptimizer_Grammar;
-
-namespace FPoptimizer_CodeTree
-{
-    CodeTree::CodeTree()
-        : data(new CodeTreeData)
-    {
-        data->Opcode = cNop;
-    }
-
-    CodeTree::CodeTree(double i)
-        : data(new CodeTreeData(i))
-    {
-        data->Recalculate_Hash_NoRecursion();
-    }
-
-    CodeTree::CodeTree(unsigned v, CodeTree::VarTag)
-        : data(new CodeTreeData)
-    {
-        data->Opcode = VarBegin;
-        data->Var    = v;
-        data->Recalculate_Hash_NoRecursion();
-    }
-
-    CodeTree::CodeTree(const CodeTree& b, CodeTree::CloneTag)
-        : data(new CodeTreeData(*b.data))
-    {
-    }
-
-    CodeTree::~CodeTree()
-    {
-    }
-
-    struct ParamComparer
-    {
-        bool operator() (const CodeTree& a, const CodeTree& b) const
-        {
-            if(a.GetDepth() != b.GetDepth())
-                return a.GetDepth() > b.GetDepth();
-            return a.GetHash() < b.GetHash();
-        }
-    };
-
-    void CodeTreeData::Sort()
-    {
-        /* If the tree is commutative, order the parameters
-         * in a set order in order to make equality tests
-         * efficient in the optimizer
-         */
-        switch(Opcode)
-        {
-            case cAdd:
-            case cMul:
-            case cMin:
-            case cMax:
-            case cAnd:
-            case cOr:
-            case cEqual:
-            case cNEqual:
-                std::sort(Params.begin(), Params.end(), ParamComparer());
-                break;
-            case cLess:
-                if(ParamComparer() (Params[1], Params[0]))
-                    { std::swap(Params[0], Params[1]); Opcode = cGreater; }
-                break;
-            case cLessOrEq:
-                if(ParamComparer() (Params[1], Params[0]))
-                    { std::swap(Params[0], Params[1]); Opcode = cGreaterOrEq; }
-                break;
-            case cGreater:
-                if(ParamComparer() (Params[1], Params[0]))
-                    { std::swap(Params[0], Params[1]); Opcode = cLess; }
-                break;
-            case cGreaterOrEq:
-                if(ParamComparer() (Params[1], Params[0]))
-                    { std::swap(Params[0], Params[1]); Opcode = cLessOrEq; }
-                break;
-            default:
-                break;
-        }
-    }
-
-    void CodeTree::AddParam(const CodeTree& param)
-    {
-        //std::cout << "AddParam called\n";
-        data->Params.push_back(param);
-    }
-    void CodeTree::AddParamMove(CodeTree& param)
-    {
-        data->Params.push_back(CodeTree());
-        data->Params.back().swap(param);
-    }
-    void CodeTree::SetParam(size_t which, const CodeTree& b)
-    {
-        DataP slot_holder ( data->Params[which].data );
-        data->Params[which] = b;
-    }
-    void CodeTree::SetParamMove(size_t which, CodeTree& b)
-    {
-        DataP slot_holder ( data->Params[which].data );
-        data->Params[which].swap(b);
-    }
-
-    void CodeTree::AddParams(const std::vector<CodeTree>& RefParams)
-    {
-        data->Params.insert(data->Params.end(), RefParams.begin(), RefParams.end());
-    }
-    void CodeTree::AddParamsMove(std::vector<CodeTree>& RefParams)
-    {
-        size_t endpos = data->Params.size(), added = RefParams.size();
-        data->Params.resize(endpos + added, CodeTree());
-        for(size_t p=0; p<added; ++p)
-            data->Params[endpos+p].swap( RefParams[p] );
-    }
-    void CodeTree::AddParamsMove(std::vector<CodeTree>& RefParams, size_t replacing_slot)
-    {
-        DataP slot_holder ( data->Params[replacing_slot].data );
-        DelParam(replacing_slot);
-        AddParamsMove(RefParams);
-    /*
-        const size_t n_added = RefParams.size();
-        const size_t oldsize = data->Params.size();
-        const size_t newsize = oldsize + n_added - 1;
-        if(RefParams.empty())
-            DelParam(replacing_slot);
-        else
-        {
-            //    0 1 2 3 4 5 6 7 8 9 10 11
-            //    a a a a X b b b b b
-            //    a a a a Y Y Y b b b b  b
-            //
-            //   replacing_slot = 4
-            //   n_added = 3
-            //   oldsize = 10
-            //   newsize = 12
-            //   tail_length = 5
-
-            data->Params.resize(newsize);
-            data->Params[replacing_slot].data = 0;
-            const size_t tail_length = oldsize - replacing_slot -1;
-            for(size_t tail=0; tail<tail_length; ++tail)
-                data->Params[newsize-1-tail].data.UnsafeSetP(
-                &*data->Params[newsize-1-tail-(n_added-1)].data);
-            for(size_t head=1; head<n_added; ++head)
-                data->Params[replacing_slot+head].data.UnsafeSetP( 0 );
-            for(size_t p=0; p<n_added; ++p)
-                data->Params[replacing_slot+p].swap( RefParams[p] );
-        }
-    */
-    }
-
-    void CodeTree::SetParams(const std::vector<CodeTree>& RefParams)
-    {
-        //std::cout << "SetParams called" << (do_clone ? ", clone" : ", no clone") << "\n";
-        std::vector<CodeTree> tmp(RefParams);
-        data->Params.swap(tmp);
-    }
-
-    void CodeTree::SetParamsMove(std::vector<CodeTree>& RefParams)
-    {
-        data->Params.swap(RefParams);
-        RefParams.clear();
-    }
-
-#ifdef __GXX_EXPERIMENTAL_CXX0X__
-    void CodeTree::SetParams(std::vector<CodeTree>&& RefParams)
-    {
-        //std::cout << "SetParams&& called\n";
-        SetParamsMove(RefParams);
-    }
-#endif
-
-    void CodeTree::DelParam(size_t index)
-    {
-        std::vector<CodeTree>& Params = data->Params;
-        //std::cout << "DelParam(" << index << ") called\n";
-    #ifdef __GXX_EXPERIMENTAL_CXX0X__
-        /* rvalue reference semantics makes this optimal */
-        Params.erase( Params.begin() + index );
-    #else
-        /* This labor evades the need for refcount +1/-1 shuffling */
-        Params[index].data = 0;
-        for(size_t p=index; p+1<Params.size(); ++p)
-            Params[p].data.UnsafeSetP( &*Params[p+1].data );
-        Params[Params.size()-1].data.UnsafeSetP( 0 );
-        Params.resize(Params.size()-1);
-    #endif
-    }
-
-    void CodeTree::DelParams()
-    {
-        data->Params.clear();
-    }
-
-    /* Is the value of this tree definitely odd(true) or even(false)? */
-    CodeTree::TriTruthValue CodeTree::GetEvennessInfo() const
-    {
-        if(!IsImmed()) return Unknown;
-        if(!IsLongIntegerImmed()) return Unknown;
-        return (GetLongIntegerImmed() & 1) ? IsNever : IsAlways;
-    }
-
-    bool CodeTree::IsLogicalValue() const
-    {
-        switch(data->Opcode)
-        {
-            case cImmed:
-                return FloatEqual(data->Value, 0.0)
-                    || FloatEqual(data->Value, 1.0);
-            case cAnd:
-            case cOr:
-            case cNot:
-            case cNotNot:
-            case cAbsAnd:
-            case cAbsOr:
-            case cAbsNot:
-            case cAbsNotNot:
-            case cEqual:
-            case cNEqual:
-            case cLess:
-            case cLessOrEq:
-            case cGreater:
-            case cGreaterOrEq:
-                /* These operations always produce truth values (0 or 1) */
-                return true;
-            case cMul:
-            {
-                std::vector<CodeTree>& Params = data->Params;
-                for(size_t a=0; a<Params.size(); ++a)
-                    if(!Params[a].IsLogicalValue())
-                        return false;
-                return true;
-            }
-            case cIf:
-            case cAbsIf:
-            {
-                std::vector<CodeTree>& Params = data->Params;
-                return Params[1].IsLogicalValue()
-                    && Params[2].IsLogicalValue();
-            }
-            default:
-                break;
-        }
-        return false; // Not a logical value.
-    }
-
-    bool CodeTree::IsAlwaysInteger(bool integer) const
-    {
-        switch(data->Opcode)
-        {
-            case cImmed:
-                return IsLongIntegerImmed() ? integer==true : integer==false;
-            case cFloor:
-            case cInt:
-                return integer==true;
-            case cAnd:
-            case cOr:
-            case cNot:
-            case cNotNot:
-            case cEqual:
-            case cNEqual:
-            case cLess:
-            case cLessOrEq:
-            case cGreater:
-            case cGreaterOrEq:
-                /* These operations always produce truth values (0 or 1) */
-                return integer==true; /* 0 and 1 are both integers */
-            case cIf:
-            {
-                std::vector<CodeTree>& Params = data->Params;
-                return Params[1].IsAlwaysInteger(integer)
-                    && Params[2].IsAlwaysInteger(integer);
-                return true; /* 0 and 1 are both integers */
-            }
-            case cAdd:
-            case cMul:
-            {
-                for(size_t a=GetParamCount(); a-- > 0; )
-                    if(!GetParam(a).IsAlwaysInteger(integer))
-                        return false;
-                return true;
-            }
-            default:
-                break;
-        }
-        return false; /* Don't know whether it's integer. */
-    }
-
-    bool CodeTree::IsAlwaysSigned(bool positive) const
-    {
-        MinMaxTree tmp = CalculateResultBoundaries();
-
-        if(positive)
-            return tmp.has_min && tmp.min >= 0.0
-              && (!tmp.has_max || tmp.max >= 0.0);
-        else
-            return tmp.has_max && tmp.max < 0.0
-              && (!tmp.has_min || tmp.min < 0.0);
-    }
-
-    bool CodeTree::IsIdenticalTo(const CodeTree& b) const
-    {
-        //if((!&*data) != (!&*b.data)) return false;
-        if(&*data == &*b.data) return true;
-        return data->IsIdenticalTo(*b.data);
-    }
-
-    bool CodeTreeData::IsIdenticalTo(const CodeTreeData& b) const
-    {
-        if(Hash   != b.Hash) return false; // a quick catch-all
-        if(Opcode != b.Opcode) return false;
-        switch(Opcode)
-        {
-            case cImmed:   return FloatEqual(Value, b.Value);
-            case VarBegin: return Var == b.Var;
-            case cFCall:
-            case cPCall:   if(Funcno != b.Funcno) return false; break;
-            default: break;
-        }
-        if(Params.size() != b.Params.size()) return false;
-        for(size_t a=0; a<Params.size(); ++a)
-        {
-            if(!Params[a].IsIdenticalTo(b.Params[a])) return false;
-        }
-        return true;
-    }
-
-    void CodeTree::Become(const CodeTree& b)
-    {
-        if(&b != this && &*data != &*b.data)
-        {
-            DataP tmp = b.data;
-            CopyOnWrite();
-            data.swap(tmp);
-        }
-    }
-
-    void CodeTree::CopyOnWrite()
-    {
-        if(data->RefCount > 1)
-            data = new CodeTreeData(*data);
-    }
-
-    CodeTree CodeTree::GetUniqueRef()
-    {
-        if(data->RefCount > 1)
-            return CodeTree(*this, CloneTag());
-        return *this;
-    }
-
-    CodeTreeData::CodeTreeData()
-        : RefCount(0),
-          Opcode(cNop), Params(), Hash(), Depth(1), OptimizedUsing(0)
-    {
-    }
-
-    CodeTreeData::CodeTreeData(const CodeTreeData& b)
-        : RefCount(0),
-          Opcode(b.Opcode),
-          Params(b.Params),
-          Hash(b.Hash),
-          Depth(b.Depth),
-          OptimizedUsing(b.OptimizedUsing)
-    {
-        switch(Opcode)
-        {
-            case VarBegin: Var   = b.Var; break;
-            case cImmed:   Value = b.Value; break;
-            case cPCall:
-            case cFCall:   Funcno = b.Funcno; break;
-            default: break;
-        }
-    }
-
-#ifdef __GXX_EXPERIMENTAL_CXX0X__
-    CodeTreeData::CodeTreeData(CodeTreeData&& b)
-        : RefCount(0),
-          Opcode(b.Opcode),
-          Params(b.Params),
-          Hash(b.Hash),
-          Depth(b.Depth),
-          OptimizedUsing(b.OptimizedUsing)
-    {
-        switch(Opcode)
-        {
-            case VarBegin: Var   = b.Var; break;
-            case cImmed:   Value = b.Value; break;
-            case cPCall:
-            case cFCall:   Funcno = b.Funcno; break;
-            default: break;
-        }
-    }
-#endif
-
-    CodeTreeData::CodeTreeData(double i)
-        : RefCount(0), Opcode(cImmed), Params(), Hash(), Depth(1), OptimizedUsing(0)
-    {
-        Value = i;
-    }
-}
-
-#endif
-
-#line 1 "fpoptimizer/fpoptimizer_debug.c"
-// line removed for fpoptimizer.c: #include "fpoptimizer_codetree.h"
-// line removed for fpoptimizer.c: #include "fpoptimizer_opcodename.h"
-
-#ifdef FP_SUPPORT_OPTIMIZER
-
-#include <sstream>
-#include <string>
-#include <map>
-#include <set>
-#include <iostream>
-
-using namespace FUNCTIONPARSERTYPES;
-
-#ifdef FUNCTIONPARSER_SUPPORT_DEBUG_OUTPUT
-namespace
-{
-    void DumpHashesFrom(
-        const FPoptimizer_CodeTree::CodeTree& tree,
-        std::map<fphash_t, std::set<std::string> >& done,
-        std::ostream& o)
-    {
-        for(size_t a=0; a<tree.GetParamCount(); ++a)
-            DumpHashesFrom(tree.GetParam(a), done, o);
-
-        std::ostringstream buf;
-        DumpTree(tree, buf);
-        done[tree.GetHash()].insert(buf.str());
-    }
-}
-#endif
-
-namespace FPoptimizer_CodeTree
-{
-#ifdef FUNCTIONPARSER_SUPPORT_DEBUG_OUTPUT
-    void DumpHashes(const CodeTree& tree, std::ostream& o)
-    {
-        std::map<fphash_t, std::set<std::string> > done;
-        DumpHashesFrom(tree, done, o);
-
-        for(std::map<fphash_t, std::set<std::string> >::const_iterator
-            i = done.begin();
-            i != done.end();
-            ++i)
-        {
-            const std::set<std::string>& flist = i->second;
-            if(flist.size() != 1) o << "ERROR - HASH COLLISION?\n";
-            for(std::set<std::string>::const_iterator
-                j = flist.begin();
-                j != flist.end();
-                ++j)
-            {
-                o << '[' << std::hex << i->first.hash1
-                              << ',' << i->first.hash2
-                              << ']' << std::dec;
-                o << ": " << *j << "\n";
-            }
-        }
-    }
-
-    void DumpTree(const CodeTree& tree, std::ostream& o)
-    {
-        //o << "/*" << tree.Depth << "*/";
-        const char* sep2 = " ";
-        /*
-        o << '[' << std::hex << tree.Hash.hash1
-                      << ',' << tree.Hash.hash2
-                      << ']' << std::dec;
-        */
-        switch(tree.GetOpcode())
-        {
-            case cImmed:
-                o << tree.GetImmed();
-                /*
-                o << "(" << std::hex
-                  << *(const uint_least64_t*)&tree.GetImmed()
-                  << std::dec << ")";
-                */
-                return;
-            case VarBegin: o << "Var" << (tree.GetVar() - VarBegin); return;
-            case cAdd: sep2 = " +"; break;
-            case cMul: sep2 = " *"; break;
-            case cAnd: sep2 = " &"; break;
-            case cOr: sep2 = " |"; break;
-            case cPow: sep2 = " ^"; break;
-            default:
-                sep2 = " ";
-                o << FP_GetOpcodeName(tree.GetOpcode());
-                if(tree.GetOpcode() == cFCall || tree.GetOpcode() == cPCall)
-                    o << ':' << tree.GetFuncNo();
-        }
-        o << '(';
-        if(tree.GetParamCount() <= 1 && sep2[1]) o << (sep2+1) << ' ';
-        for(size_t a=0; a<tree.GetParamCount(); ++a)
-        {
-            if(a > 0) o << ' ';
-
-            DumpTree(tree.GetParam(a), o);
-
-            if(a+1 < tree.GetParamCount()) o << sep2;
-        }
-        o << ')';
-    }
-
-    void DumpTreeWithIndent(const CodeTree& tree, std::ostream& o, const std::string& indent)
-    {
-        o << '[' << std::hex << (void*)(&tree.GetParams())
-                 << std::dec
-                 << ',' << tree.GetRefCount()
-                 << ']';
-        o << indent << '_';
-
-        switch(tree.GetOpcode())
-        {
-            case cImmed:   o << "cImmed " << tree.GetImmed(); o << '\n'; return;
-            case VarBegin: o << "VarBegin " << (tree.GetVar() - VarBegin); o << '\n'; return;
-            default:
-                o << FP_GetOpcodeName(tree.GetOpcode());
-                if(tree.GetOpcode() == cFCall || tree.GetOpcode() == cPCall)
-                    o << ':' << tree.GetFuncNo();
-                o << '\n';
-        }
-        for(size_t a=0; a<tree.GetParamCount(); ++a)
-        {
-            std::string ind = indent;
-            for(size_t p=0; p < ind.size(); p+=2)
-                if(ind[p] == '\\')
-                    ind[p] = ' ';
-            ind += (a+1 < tree.GetParamCount()) ? " |" : " \\";
-            DumpTreeWithIndent(tree.GetParam(a), o, ind);
-        }
-        o << std::flush;
-    }
-#endif
-}
-
-#endif
-
-#line 1 "fpoptimizer/fpoptimizer_grammar.c"
-#include "fparser.h"
-#include "fptypes.h"
-// line removed for fpoptimizer.c: #include "fpoptimizer_grammar.h"
-// line removed for fpoptimizer.c: #include "fpoptimizer_optimize.h"
-
-// line removed for fpoptimizer.c: #include "fpoptimizer_opcodename.h"
-using namespace FPoptimizer_Grammar;
-using namespace FUNCTIONPARSERTYPES;
-
-#include <cctype>
-
-namespace FPoptimizer_Grammar
-{
-    bool ParamSpec_Compare(const void* aa, const void* bb, SpecialOpcode type)
-    {
-        switch(type)
-        {
-            case ParamHolder:
-            {
-                ParamSpec_ParamHolder& a = *(ParamSpec_ParamHolder*) aa;
-                ParamSpec_ParamHolder& b = *(ParamSpec_ParamHolder*) bb;
-                return a.constraints == b.constraints
-                    && a.index       == b.index
-                    && a.depcode     == b.depcode;
-            }
-            case NumConstant:
-            {
-                ParamSpec_NumConstant& a = *(ParamSpec_NumConstant*) aa;
-                ParamSpec_NumConstant& b = *(ParamSpec_NumConstant*) bb;
-                return FloatEqual(a.constvalue, b.constvalue);
-            }
-            case SubFunction:
-            {
-                ParamSpec_SubFunction& a = *(ParamSpec_SubFunction*) aa;
-                ParamSpec_SubFunction& b = *(ParamSpec_SubFunction*) bb;
-                return a.constraints    == b.constraints
-                    && a.data.subfunc_opcode   == b.data.subfunc_opcode
-                    && a.data.match_type       == b.data.match_type
-                    && a.data.param_count      == b.data.param_count
-                    && a.data.param_list       == b.data.param_list
-                    && a.data.restholder_index == b.data.restholder_index
-                    && a.depcode               == b.depcode;
-            }
-        }
-        return true;
-    }
-
-    unsigned ParamSpec_GetDepCode(const ParamSpec& b)
-    {
-        switch(b.first)
-        {
-            case ParamHolder:
-            {
-                const ParamSpec_ParamHolder* s = (const ParamSpec_ParamHolder*) b.second;
-                return s->depcode;
-            }
-            case SubFunction:
-            {
-                const ParamSpec_SubFunction* s = (const ParamSpec_SubFunction*) b.second;
-                return s->depcode;
-            }
-            default: break;
-        }
-        return 0;
-    }
-
-    void DumpParam(const ParamSpec& parampair, std::ostream& o)
-    {
-        static const char ParamHolderNames[][2]  = {"%","&", "x","y","z","a","b","c"};
-
-        //o << "/*p" << (&p-pack.plist) << "*/";
-        unsigned constraints = 0;
-        switch(parampair.first)
-        {
-            case NumConstant:
-              { const ParamSpec_NumConstant& param = *(const ParamSpec_NumConstant*) parampair.second;
-                o.precision(12);
-                o << param.constvalue; break; }
-            case ParamHolder:
-              { const ParamSpec_ParamHolder& param = *(const ParamSpec_ParamHolder*) parampair.second;
-                o << ParamHolderNames[param.index];
-                constraints = param.constraints;
-                break; }
-            case SubFunction:
-              { const ParamSpec_SubFunction& param = *(const ParamSpec_SubFunction*) parampair.second;
-                constraints = param.constraints;
-                if(param.data.match_type == GroupFunction)
-                {
-                    if(param.data.subfunc_opcode == cNeg)
-                        { o << "-"; DumpParams(param.data.param_list, param.data.param_count, o); }
-                    else if(param.data.subfunc_opcode == cInv)
-                        { o << "/"; DumpParams(param.data.param_list, param.data.param_count, o); }
-                    else
-                    {
-                        std::string opcode = FP_GetOpcodeName(param.data.subfunc_opcode).substr(1);
-                        for(size_t a=0; a<opcode.size(); ++a) opcode[a] = (char) std::toupper(opcode[a]);
-                        o << opcode << "( ";
-                        DumpParams(param.data.param_list, param.data.param_count, o);
-                        o << " )";
-                    }
-                }
-                else
-                {
-                    o << '(' << FP_GetOpcodeName(param.data.subfunc_opcode) << ' ';
-                    if(param.data.match_type == PositionalParams) o << '[';
-                    if(param.data.match_type == SelectedParams) o << '{';
-                    DumpParams(param.data.param_list, param.data.param_count, o);
-                    if(param.data.restholder_index != 0)
-                        o << " <" << param.data.restholder_index << '>';
-                    if(param.data.match_type == PositionalParams) o << "]";
-                    if(param.data.match_type == SelectedParams) o << "}";
-                    o << ')';
-                }
-                break; }
-        }
-        switch( ImmedConstraint_Value(constraints & ValueMask) )
-        {
-            case ValueMask: break;
-            case Value_AnyNum: break;
-            case Value_EvenInt:   o << "@E"; break;
-            case Value_OddInt:    o << "@O"; break;
-            case Value_IsInteger: o << "@I"; break;
-            case Value_NonInteger:o << "@F"; break;
-            case Value_Logical:   o << "@L"; break;
-        }
-        switch( ImmedConstraint_Sign(constraints & SignMask) )
-        {
-            case SignMask: break;
-            case Sign_AnySign: break;
-            case Sign_Positive:   o << "@P"; break;
-            case Sign_Negative:   o << "@N"; break;
-        }
-        switch( ImmedConstraint_Oneness(constraints & OnenessMask) )
-        {
-            case OnenessMask: break;
-            case Oneness_Any: break;
-            case Oneness_One:     o << "@1"; break;
-            case Oneness_NotOne:  o << "@M"; break;
-        }
-    }
-
-    void DumpParams(unsigned paramlist, unsigned count, std::ostream& o)
-    {
-        for(unsigned a=0; a<count; ++a)
-        {
-            if(a > 0) o << ' ';
-            const ParamSpec& param = ParamSpec_Extract(paramlist,a);
-            DumpParam(param, o);
-            unsigned depcode = ParamSpec_GetDepCode(param);
-            if(depcode != 0)
-                o << "@D" << depcode;
-        }
-    }
-}
-
-#line 1 "fpoptimizer/fpoptimizer_grammar_data.c"
-/* This file is automatically generated. Do not edit... */
-// line removed for fpoptimizer.c: #include "fpoptimizer_consts.h"
-#include "fpconfig.h"
-#include "fptypes.h"
-#include <algorithm>
-
-#define P1(a) a
-#define P2(a,b) (P1(a) | (b << PARAM_INDEX_BITS))
-#define P3(a,b,c) (P2(a,b) | (c << (PARAM_INDEX_BITS*2)))
-
-#define grammar_optimize_abslogical grammar_optimize_abslogical_tweak
-#define grammar_optimize_ignore_if_sideeffects grammar_optimize_ignore_if_sideeffects_tweak
-#define grammar_optimize_nonshortcut_logical_evaluation grammar_optimize_nonshortcut_logical_evaluation_tweak
-#define grammar_optimize_round1 grammar_optimize_round1_tweak
-#define grammar_optimize_round2 grammar_optimize_round2_tweak
-#define grammar_optimize_round3 grammar_optimize_round3_tweak
-#define grammar_optimize_round4 grammar_optimize_round4_tweak
-#define grammar_optimize_shortcut_logical_evaluation grammar_optimize_shortcut_logical_evaluation_tweak
-// line removed for fpoptimizer.c: #include "fpoptimizer_grammar.h"
-#undef grammar_optimize_abslogical
-#undef grammar_optimize_ignore_if_sideeffects
-#undef grammar_optimize_nonshortcut_logical_evaluation
-#undef grammar_optimize_round1
-#undef grammar_optimize_round2
-#undef grammar_optimize_round3
-#undef grammar_optimize_round4
-#undef grammar_optimize_shortcut_logical_evaluation
-
-using namespace FPoptimizer_Grammar;
-using namespace FUNCTIONPARSERTYPES;
-
-namespace
-{
-    const struct ParamSpec_List
-    {
-        ParamSpec_ParamHolder plist_p[33];
-#define P(n) (n)
-        ParamSpec_NumConstant plist_n[17];
-#define N(n) (n+33)
-        ParamSpec_SubFunction plist_s[422];
-#define S(n) (n+33+17)
-    } /*PACKED_GRAMMAR_ATTRIBUTE*/ plist =
-    {
-        { /* plist_p - ParamSpec_ParamHolder[33] */
-        /* 0	*/ {0, Sign_Negative | Constness_Const, 0x0}, /* %@N */
-        /* 1	*/ {0, Constness_Const, 0x0}, /* % */
-        /* 2	*/ {0, Sign_Positive | Constness_Const, 0x0}, /* %@P */
-        /* 3	*/ {0, Constness_Const, 0x1}, /* % */
-        /* 4	*/ {0, Value_IsInteger | Sign_Positive | Constness_Const, 0x0}, /* %@I@P */
-        /* 5	*/ {0, Oneness_NotOne | Constness_Const, 0x1}, /* %@M */
-        /* 6	*/ {0, Oneness_NotOne | Constness_Const, 0x0}, /* %@M */
-        /* 7	*/ {0, Oneness_One | Constness_Const, 0x0}, /* %@1 */
-        /* 8	*/ {0, Value_Logical | Constness_Const, 0x0}, /* %@L */
-        /* 9	*/ {1, Constness_Const, 0x0}, /* & */
-        /* 10	*/ {1, Value_EvenInt | Constness_Const, 0x0}, /* &@E */
-        /* 11	*/ {1, Oneness_NotOne | Constness_Const, 0x0}, /* &@M */
-        /* 12	*/ {1, Value_IsInteger | Constness_Const, 0x0}, /* &@I */
-        /* 13	*/ {1, Sign_Positive | Constness_Const, 0x0}, /* &@P */
-        /* 14	*/ {2, 0, 0x0}, /* x */
-        /* 15	*/ {2, 0, 0x4}, /* x */
-        /* 16	*/ {2, Value_IsInteger, 0x0}, /* x@I */
-        /* 17	*/ {2, Sign_Positive, 0x0}, /* x@P */
-        /* 18	*/ {2, Sign_NoIdea, 0x0}, /* x */
-        /* 19	*/ {2, Value_Logical, 0x0}, /* x@L */
-        /* 20	*/ {3, Sign_NoIdea, 0x0}, /* y */
-        /* 21	*/ {3, 0, 0x0}, /* y */
-        /* 22	*/ {3, Value_Logical, 0x0}, /* y@L */
-        /* 23	*/ {3, 0, 0x8}, /* y */
-        /* 24	*/ {3, Value_OddInt, 0x0}, /* y@O */
-        /* 25	*/ {3, Value_NonInteger, 0x0}, /* y@F */
-        /* 26	*/ {3, Value_EvenInt, 0x0}, /* y@E */
-        /* 27	*/ {3, Sign_Positive, 0x0}, /* y@P */
-        /* 28	*/ {4, 0, 0x0}, /* z */
-        /* 29	*/ {4, 0, 0x16}, /* z */
-        /* 30	*/ {4, Value_IsInteger, 0x0}, /* z@I */
-        /* 31	*/ {5, 0, 0x0}, /* a */
-        /* 32	*/ {6, 0, 0x0}, /* b */
-        },
-
-        { /* plist_n - ParamSpec_NumConstant[17] */
-        /* 0	*/ {-2}, /* -2 */
-        /* 1	*/ {-CONSTANT_PIHALF}, /* -1.57079632679 */
-        /* 2	*/ {-1}, /* -1 */
-        /* 3	*/ {-0.5}, /* -0.5 */
-        /* 4	*/ {0}, /* 0 */
-        /* 5	*/ {CONSTANT_RD}, /* 0.0174532925199 */
-        /* 6	*/ {CONSTANT_EI}, /* 0.367879441171 */
-        /* 7	*/ {CONSTANT_L10I}, /* 0.434294481903 */
-        /* 8	*/ {0.5}, /* 0.5 */
-        /* 9	*/ {CONSTANT_L2}, /* 0.69314718056 */
-        /* 10	*/ {1}, /* 1 */
-        /* 11	*/ {CONSTANT_L2I}, /* 1.44269504089 */
-        /* 12	*/ {CONSTANT_PIHALF}, /* 1.57079632679 */
-        /* 13	*/ {2}, /* 2 */
-        /* 14	*/ {CONSTANT_L10}, /* 2.30258509299 */
-        /* 15	*/ {CONSTANT_E}, /* 2.71828182846 */
-        /* 16	*/ {CONSTANT_DR}, /* 57.2957795131 */
-        },
-
-        { /* plist_s - ParamSpec_SubFunction[422] */
-        /* 0	*/ {{1,P1(P(14))               , cAbs        ,PositionalParams,0}, 0, 0x0}, /* (cAbs [x]) */
-        /* 1	*/ {{1,P1(P(21))               , cAbs        ,PositionalParams,0}, 0, 0x0}, /* (cAbs [y]) */
-        /* 2	*/ {{1,P1(S(283))              , cAbs        ,PositionalParams,0}, 0, 0x0}, /* (cAbs [(cMul {x y})]) */
-        /* 3	*/ {{1,P1(P(14))               , cAcos       ,PositionalParams,0}, 0, 0x0}, /* (cAcos [x]) */
-        /* 4	*/ {{1,P1(P(14))               , cAcosh      ,PositionalParams,0}, 0, 0x0}, /* (cAcosh [x]) */
-        /* 5	*/ {{1,P1(P(14))               , cAsin       ,PositionalParams,0}, 0, 0x0}, /* (cAsin [x]) */
-        /* 6	*/ {{1,P1(P(14))               , cAsinh      ,PositionalParams,0}, 0, 0x0}, /* (cAsinh [x]) */
-        /* 7	*/ {{1,P1(S(242))              , cAsinh      ,PositionalParams,0}, 0, 0x0}, /* (cAsinh [(cAdd  <1>)]) */
-        /* 8	*/ {{1,P1(P(14))               , cAtan       ,PositionalParams,0}, 0, 0x0}, /* (cAtan [x]) */
-        /* 9	*/ {{2,P2(P(14),P(21))         , cAtan2      ,PositionalParams,0}, 0, 0x0}, /* (cAtan2 [x y]) */
-        /* 10	*/ {{2,P2(P(14),S(109))        , cAtan2      ,PositionalParams,0}, 0, 0x0}, /* (cAtan2 [x (cPow [y -%])]) */
-        /* 11	*/ {{1,P1(P(14))               , cAtanh      ,PositionalParams,0}, 0, 0x0}, /* (cAtanh [x]) */
-        /* 12	*/ {{1,P1(P(14))               , cCeil       ,PositionalParams,0}, 0, 0x4}, /* (cCeil [x]) */
-        /* 13	*/ {{1,P1(S(331))              , cCeil       ,PositionalParams,0}, 0, 0x0}, /* (cCeil [(cMul  <1>)]) */
-        /* 14	*/ {{1,P1(P(14))               , cCos        ,PositionalParams,0}, 0, 0x0}, /* (cCos [x]) */
-        /* 15	*/ {{1,P1(P(14))               , cCos        ,PositionalParams,0}, 0, 0x4}, /* (cCos [x]) */
-        /* 16	*/ {{1,P1(P(21))               , cCos        ,PositionalParams,0}, 0, 0x0}, /* (cCos [y]) */
-        /* 17	*/ {{1,P1(S(215))              , cCos        ,PositionalParams,0}, 0, 0x0}, /* (cCos [(cAdd {x y})]) */
-        /* 18	*/ {{1,P1(S(221))              , cCos        ,PositionalParams,0}, 0, 0x0}, /* (cCos [(cAdd {x (cMul {-1 y})})]) */
-        /* 19	*/ {{1,P1(S(242))              , cCos        ,PositionalParams,0}, 0, 0x0}, /* (cCos [(cAdd  <1>)]) */
-        /* 20	*/ {{1,P1(S(301))              , cCos        ,PositionalParams,0}, 0, 0x0}, /* (cCos [(cMul {-% x})]) */
-        /* 21	*/ {{1,P1(S(358))              , cCos        ,PositionalParams,0}, 0, 0x0}, /* (cCos [(cMul -% <1>)]) */
-        /* 22	*/ {{1,P1(P(14))               , cCosh       ,PositionalParams,0}, 0, 0x4}, /* (cCosh [x]) */
-        /* 23	*/ {{1,P1(P(14))               , cCosh       ,PositionalParams,0}, 0, 0x0}, /* (cCosh [x]) */
-        /* 24	*/ {{1,P1(S(50))               , cCosh       ,PositionalParams,0}, 0, 0x0}, /* (cCosh [(cLog [(cPow [& x])])]) */
-        /* 25	*/ {{1,P1(S(295))              , cCosh       ,PositionalParams,0}, 0, 0x0}, /* (cCosh [(cMul {x LOG( & )})]) */
-        /* 26	*/ {{1,P1(S(301))              , cCosh       ,PositionalParams,0}, 0, 0x0}, /* (cCosh [(cMul {-% x})]) */
-        /* 27	*/ {{1,P1(P(14))               , cCot        ,PositionalParams,0}, 0, 0x0}, /* (cCot [x]) */
-        /* 28	*/ {{1,P1(P(14))               , cCsc        ,PositionalParams,0}, 0, 0x0}, /* (cCsc [x]) */
-        /* 29	*/ {{1,P1(P(14))               , cFloor      ,PositionalParams,0}, 0, 0x4}, /* (cFloor [x]) */
-        /* 30	*/ {{1,P1(S(331))              , cFloor      ,PositionalParams,0}, 0, 0x0}, /* (cFloor [(cMul  <1>)]) */
-        /* 31	*/ {{3,P3(P(14),N(10),S(400))  , cIf         ,PositionalParams,0}, 0, 0x0}, /* (cIf [x 1 (cNotNot [y])]) */
-        /* 32	*/ {{3,P3(P(14),P(21),P(28))   , cIf         ,PositionalParams,0}, 0, 0x4}, /* (cIf [x y z]) */
-        /* 33	*/ {{3,P3(P(14),P(21),P(28))   , cIf         ,PositionalParams,0}, 0, 0x0}, /* (cIf [x y z]) */
-        /* 34	*/ {{3,P3(P(14),P(8),S(376))   , cIf         ,PositionalParams,0}, 0, 0x0}, /* (cIf [x %@L (cNot [y])]) */
-        /* 35	*/ {{3,P3(P(14),P(21),S(374))  , cIf         ,PositionalParams,0}, 0, 0x0}, /* (cIf [x y (cNot [%])]) */
-        /* 36	*/ {{3,P3(P(14),P(31),P(32))   , cIf         ,PositionalParams,0}, 0, 0x4}, /* (cIf [x a b]) */
-        /* 37	*/ {{3,P3(P(14),S(374),P(21))  , cIf         ,PositionalParams,0}, 0, 0x0}, /* (cIf [x (cNot [%]) y]) */
-        /* 38	*/ {{3,P3(P(14),S(376),P(8))   , cIf         ,PositionalParams,0}, 0, 0x0}, /* (cIf [x (cNot [y]) %@L]) */
-        /* 39	*/ {{3,P3(P(14),S(58),S(59))   , cIf         ,PositionalParams,0}, 0, 0x0}, /* (cIf [x (cMax [y a]) (cMax [z b])]) */
-        /* 40	*/ {{3,P3(P(14),S(61),S(62))   , cIf         ,PositionalParams,0}, 0, 0x0}, /* (cIf [x (cMin [y a]) (cMin [z b])]) */
-        /* 41	*/ {{3,P3(P(14),S(222),S(224)) , cIf         ,PositionalParams,0}, 0, 0x0}, /* (cIf [x (cAdd {y a}) (cAdd {z b})]) */
-        /* 42	*/ {{3,P3(P(14),S(288),S(289)) , cIf         ,PositionalParams,0}, 0, 0x0}, /* (cIf [x (cMul {y a}) (cMul {z b})]) */
-        /* 43	*/ {{3,P3(P(14),S(386),S(387)) , cIf         ,PositionalParams,0}, 0, 0x0}, /* (cIf [x (cAnd {y a}) (cAnd {z b})]) */
-        /* 44	*/ {{3,P3(P(14),S(393),S(394)) , cIf         ,PositionalParams,0}, 0, 0x0}, /* (cIf [x (cOr {y a}) (cOr {z b})]) */
-        /* 45	*/ {{3,P3(P(14),S(400),N(4))   , cIf         ,PositionalParams,0}, 0, 0x0}, /* (cIf [x (cNotNot [y]) 0]) */
-        /* 46	*/ {{1,P1(S(242))              , cInt        ,PositionalParams,0}, 0, 0x0}, /* (cInt [(cAdd  <1>)]) */
-        /* 47	*/ {{1,P1(P(14))               , cLog        ,PositionalParams,0}, 0, 0x0}, /* (cLog [x]) */
-        /* 48	*/ {{1,P1(P(21))               , cLog        ,PositionalParams,0}, 0, 0x0}, /* (cLog [y]) */
-        /* 49	*/ {{1,P1(P(28))               , cLog        ,PositionalParams,0}, 0, 0x0}, /* (cLog [z]) */
-        /* 50	*/ {{1,P1(S(83))               , cLog        ,PositionalParams,0}, 0, 0x0}, /* (cLog [(cPow [& x])]) */
-        /* 51	*/ {{1,P1(S(283))              , cLog        ,PositionalParams,0}, 0, 0x0}, /* (cLog [(cMul {x y})]) */
-        /* 52	*/ {{1,P1(S(331))              , cLog        ,PositionalParams,0}, 0, 0x0}, /* (cLog [(cMul  <1>)]) */
-        /* 53	*/ {{1,P1(P(1))                , cLog        ,GroupFunction   ,0}, Constness_Const, 0x0}, /* LOG( % ) */
-        /* 54	*/ {{1,P1(P(9))                , cLog        ,GroupFunction   ,0}, Constness_Const, 0x0}, /* LOG( & ) */
-        /* 55	*/ {{1,P1(P(14))               , cLog10      ,PositionalParams,0}, 0, 0x0}, /* (cLog10 [x]) */
-        /* 56	*/ {{1,P1(P(14))               , cLog2       ,PositionalParams,0}, 0, 0x0}, /* (cLog2 [x]) */
-        /* 57	*/ {{2,P2(P(14),P(21))         , cMax        ,PositionalParams,0}, 0, 0x0}, /* (cMax [x y]) */
-        /* 58	*/ {{2,P2(P(21),P(31))         , cMax        ,PositionalParams,0}, 0, 0x0}, /* (cMax [y a]) */
-        /* 59	*/ {{2,P2(P(28),P(32))         , cMax        ,PositionalParams,0}, 0, 0x0}, /* (cMax [z b]) */
-        /* 60	*/ {{2,P2(P(14),P(21))         , cMin        ,PositionalParams,0}, 0, 0x0}, /* (cMin [x y]) */
-        /* 61	*/ {{2,P2(P(21),P(31))         , cMin        ,PositionalParams,0}, 0, 0x0}, /* (cMin [y a]) */
-        /* 62	*/ {{2,P2(P(28),P(32))         , cMin        ,PositionalParams,0}, 0, 0x0}, /* (cMin [z b]) */
-        /* 63	*/ {{2,P2(P(1),N(10))          , cMin        ,GroupFunction   ,0}, Constness_Const, 0x0}, /* MIN( % 1 ) */
-        /* 64	*/ {{2,P2(P(1),P(9))           , cMin        ,GroupFunction   ,0}, Constness_Const, 0x0}, /* MIN( % & ) */
-        /* 65	*/ {{2,P2(N(6),P(14))          , cPow        ,PositionalParams,0}, 0, 0x0}, /* (cPow [0.367879441171 x]) */
-        /* 66	*/ {{2,P2(N(6),P(14))          , cPow        ,PositionalParams,0}, 0, 0x4}, /* (cPow [0.367879441171 x]) */
-        /* 67	*/ {{2,P2(N(15),P(14))         , cPow        ,PositionalParams,0}, 0, 0x0}, /* (cPow [2.71828182846 x]) */
-        /* 68	*/ {{2,P2(N(15),P(14))         , cPow        ,PositionalParams,0}, 0, 0x4}, /* (cPow [2.71828182846 x]) */
-        /* 69	*/ {{2,P2(N(6),S(6))           , cPow        ,PositionalParams,0}, 0, 0x0}, /* (cPow [0.367879441171 (cAsinh [x])]) */
-        /* 70	*/ {{2,P2(N(15),S(6))          , cPow        ,PositionalParams,0}, 0, 0x0}, /* (cPow [2.71828182846 (cAsinh [x])]) */
-        /* 71	*/ {{2,P2(N(6),S(7))           , cPow        ,PositionalParams,0}, 0, 0x0}, /* (cPow [0.367879441171 (cAsinh [(cAdd  <1>)])]) */
-        /* 72	*/ {{2,P2(N(15),S(7))          , cPow        ,PositionalParams,0}, 0, 0x0}, /* (cPow [2.71828182846 (cAsinh [(cAdd  <1>)])]) */
-        /* 73	*/ {{2,P2(N(15),S(332))        , cPow        ,PositionalParams,0}, 0, 0x0}, /* (cPow [2.71828182846 (cMul  <2>)]) */
-        /* 74	*/ {{2,P2(P(1),P(14))          , cPow        ,PositionalParams,0}, 0, 0x0}, /* (cPow [% x]) */
-        /* 75	*/ {{2,P2(P(1),P(14))          , cPow        ,PositionalParams,0}, 0, 0x1}, /* (cPow [% x]) */
-        /* 76	*/ {{2,P2(P(1),P(21))          , cPow        ,PositionalParams,0}, 0, 0x1}, /* (cPow [% y]) */
-        /* 77	*/ {{2,P2(P(14),P(1))          , cPow        ,PositionalParams,0}, 0, 0x0}, /* (cPow [x %]) */
-        /* 78	*/ {{2,P2(P(14),P(2))          , cPow        ,PositionalParams,0}, 0, 0x0}, /* (cPow [x %@P]) */
-        /* 79	*/ {{2,P2(P(21),P(13))         , cPow        ,PositionalParams,0}, 0, 0x0}, /* (cPow [y &@P]) */
-        /* 80	*/ {{2,P2(P(21),P(9))          , cPow        ,PositionalParams,0}, 0, 0x0}, /* (cPow [y &]) */
-        /* 81	*/ {{2,P2(P(2),P(14))          , cPow        ,PositionalParams,0}, 0, 0x0}, /* (cPow [%@P x]) */
-        /* 82	*/ {{2,P2(P(9),P(14))          , cPow        ,PositionalParams,0}, 0, 0x6}, /* (cPow [& x]) */
-        /* 83	*/ {{2,P2(P(9),P(14))          , cPow        ,PositionalParams,0}, 0, 0x0}, /* (cPow [& x]) */
-        /* 84	*/ {{2,P2(P(9),P(21))          , cPow        ,PositionalParams,0}, 0, 0x0}, /* (cPow [& y]) */
-        /* 85	*/ {{2,P2(P(9),S(223))         , cPow        ,PositionalParams,0}, 0, 0x0}, /* (cPow [& (cAdd {y (cMul {z (cLog [x]) /LOG( & )})})]) */
-        /* 86	*/ {{2,P2(P(14),P(4))          , cPow        ,PositionalParams,0}, 0, 0x0}, /* (cPow [x %@I@P]) */
-        /* 87	*/ {{2,P2(P(14),P(12))         , cPow        ,PositionalParams,0}, 0, 0x0}, /* (cPow [x &@I]) */
-        /* 88	*/ {{2,P2(P(1),P(21))          , cPow        ,PositionalParams,0}, 0, 0x0}, /* (cPow [% y]) */
-        /* 89	*/ {{2,P2(P(14),N(13))         , cPow        ,PositionalParams,0}, 0, 0x0}, /* (cPow [x 2]) */
-        /* 90	*/ {{2,P2(P(14),P(24))         , cPow        ,PositionalParams,0}, 0, 0x0}, /* (cPow [x y@O]) */
-        /* 91	*/ {{2,P2(P(14),P(25))         , cPow        ,PositionalParams,0}, 0, 0x0}, /* (cPow [x y@F]) */
-        /* 92	*/ {{2,P2(P(17),P(21))         , cPow        ,PositionalParams,0}, 0, 0x0}, /* (cPow [x@P y]) */
-        /* 93	*/ {{2,P2(P(18),P(21))         , cPow        ,PositionalParams,0}, Sign_Positive, 0x0}, /* (cPow [x y])@P */
-        /* 94	*/ {{2,P2(P(14),P(21))         , cPow        ,PositionalParams,0}, 0, 0x4}, /* (cPow [x y]) */
-        /* 95	*/ {{2,P2(P(14),P(28))         , cPow        ,PositionalParams,0}, 0, 0x0}, /* (cPow [x z]) */
-        /* 96	*/ {{2,P2(P(17),P(28))         , cPow        ,PositionalParams,0}, 0, 0x0}, /* (cPow [x@P z]) */
-        /* 97	*/ {{2,P2(P(14),S(63))         , cPow        ,PositionalParams,0}, 0, 0x0}, /* (cPow [x MIN( % 1 )]) */
-        /* 98	*/ {{2,P2(P(14),S(64))         , cPow        ,PositionalParams,0}, 0, 0x0}, /* (cPow [x MIN( % & )]) */
-        /* 99	*/ {{2,P2(P(14),S(208))        , cPow        ,PositionalParams,0}, 0, 0x0}, /* (cPow [x (cAdd {1 -MIN( % 1 )})]) */
-        /* 100	*/ {{2,P2(P(14),S(216))        , cPow        ,PositionalParams,0}, 0, 0x0}, /* (cPow [x (cAdd {y z})]) */
-        /* 101	*/ {{2,P2(P(14),S(218))        , cPow        ,PositionalParams,0}, 0, 0x0}, /* (cPow [x (cAdd {% -MIN( % 1 )})]) */
-        /* 102	*/ {{2,P2(P(14),S(219))        , cPow        ,PositionalParams,0}, 0, 0x0}, /* (cPow [x (cAdd {% -MIN( % & )})]) */
-        /* 103	*/ {{2,P2(P(14),S(220))        , cPow        ,PositionalParams,0}, 0, 0x0}, /* (cPow [x (cAdd {& -MIN( % & )})]) */
-        /* 104	*/ {{2,P2(P(21),N(2))          , cPow        ,PositionalParams,0}, 0, 0x0}, /* (cPow [y -1]) */
-        /* 105	*/ {{2,P2(P(14),P(21))         , cPow        ,PositionalParams,0}, 0, 0x0}, /* (cPow [x y]) */
-        /* 106	*/ {{2,P2(P(1),S(242))         , cPow        ,PositionalParams,0}, 0, 0x0}, /* (cPow [% (cAdd  <1>)]) */
-        /* 107	*/ {{2,P2(P(14),S(53))         , cPow        ,PositionalParams,0}, 0, 0x0}, /* (cPow [x LOG( % )]) */
-        /* 108	*/ {{2,P2(P(20),P(0))          , cPow        ,PositionalParams,0}, 0, 0x0}, /* (cPow [y %@N]) */
-        /* 109	*/ {{2,P2(P(21),S(194))        , cPow        ,PositionalParams,0}, 0, 0x0}, /* (cPow [y -%]) */
-        /* 110	*/ {{2,P2(P(28),S(242))        , cPow        ,PositionalParams,0}, 0, 0x0}, /* (cPow [z (cAdd  <1>)]) */
-        /* 111	*/ {{2,P2(S(14),N(2))          , cPow        ,PositionalParams,0}, 0, 0x4}, /* (cPow [(cCos [x]) -1]) */
-        /* 112	*/ {{2,P2(S(14),N(2))          , cPow        ,PositionalParams,0}, 0, 0x0}, /* (cPow [(cCos [x]) -1]) */
-        /* 113	*/ {{2,P2(S(20),N(2))          , cPow        ,PositionalParams,0}, 0, 0x5}, /* (cPow [(cCos [(cMul {-% x})]) -1]) */
-        /* 114	*/ {{2,P2(S(21),N(2))          , cPow        ,PositionalParams,0}, 0, 0x1}, /* (cPow [(cCos [(cMul -% <1>)]) -1]) */
-        /* 115	*/ {{2,P2(S(23),N(2))          , cPow        ,PositionalParams,0}, 0, 0x4}, /* (cPow [(cCosh [x]) -1]) */
-        /* 116	*/ {{2,P2(S(23),N(2))          , cPow        ,PositionalParams,0}, 0, 0x0}, /* (cPow [(cCosh [x]) -1]) */
-        /* 117	*/ {{2,P2(S(14),N(13))         , cPow        ,PositionalParams,0}, 0, 0x4}, /* (cPow [(cCos [x]) 2]) */
-        /* 118	*/ {{2,P2(S(14),N(13))         , cPow        ,PositionalParams,0}, 0, 0x0}, /* (cPow [(cCos [x]) 2]) */
-        /* 119	*/ {{2,P2(S(23),P(1))          , cPow        ,PositionalParams,0}, 0, 0x4}, /* (cPow [(cCosh [x]) %]) */
-        /* 120	*/ {{2,P2(S(23),S(259))        , cPow        ,PositionalParams,0}, 0, 0x0}, /* (cPow [(cCosh [x]) ADD( % 1 )]) */
-        /* 121	*/ {{2,P2(S(26),N(2))          , cPow        ,PositionalParams,0}, 0, 0x5}, /* (cPow [(cCosh [(cMul {-% x})]) -1]) */
-        /* 122	*/ {{2,P2(S(47),N(2))          , cPow        ,PositionalParams,0}, 0, 0x0}, /* (cPow [(cLog [x]) -1]) */
-        /* 123	*/ {{2,P2(S(49),N(2))          , cPow        ,PositionalParams,0}, 0, 0x0}, /* (cPow [(cLog [z]) -1]) */
-        /* 124	*/ {{2,P2(S(55),N(2))          , cPow        ,PositionalParams,0}, 0, 0x0}, /* (cPow [(cLog10 [x]) -1]) */
-        /* 125	*/ {{2,P2(S(56),N(2))          , cPow        ,PositionalParams,0}, 0, 0x0}, /* (cPow [(cLog2 [x]) -1]) */
-        /* 126	*/ {{2,P2(S(77),S(417))        , cPow        ,PositionalParams,0}, 0, 0x0}, /* (cPow [(cPow [x %]) /%]) */
-        /* 127	*/ {{2,P2(S(77),S(421))        , cPow        ,PositionalParams,0}, 0, 0x0}, /* (cPow [(cPow [x %]) /MIN( % & )]) */
-        /* 128	*/ {{2,P2(S(80),S(421))        , cPow        ,PositionalParams,0}, 0, 0x0}, /* (cPow [(cPow [y &]) /MIN( % & )]) */
-        /* 129	*/ {{2,P2(S(158),N(2))         , cPow        ,PositionalParams,0}, 0, 0x4}, /* (cPow [(cSin [x]) -1]) */
-        /* 130	*/ {{2,P2(S(170),N(2))         , cPow        ,PositionalParams,0}, 0, 0x4}, /* (cPow [(cSinh [x]) -1]) */
-        /* 131	*/ {{2,P2(S(177),N(2))         , cPow        ,PositionalParams,0}, 0, 0x4}, /* (cPow [(cTan [x]) -1]) */
-        /* 132	*/ {{2,P2(S(177),N(2))         , cPow        ,PositionalParams,0}, 0, 0x0}, /* (cPow [(cTan [x]) -1]) */
-        /* 133	*/ {{2,P2(S(186),N(2))         , cPow        ,PositionalParams,0}, 0, 0x0}, /* (cPow [(cTanh [x]) -1]) */
-        /* 134	*/ {{2,P2(S(186),N(2))         , cPow        ,PositionalParams,0}, 0, 0x4}, /* (cPow [(cTanh [x]) -1]) */
-        /* 135	*/ {{2,P2(S(189),N(2))         , cPow        ,PositionalParams,0}, 0, 0x0}, /* (cPow [(cTanh [(cMul {x LOG( % ) 0.5})]) -1]) */
-        /* 136	*/ {{2,P2(S(199),N(2))         , cPow        ,PositionalParams,0}, 0, 0x5}, /* (cPow [(cAdd {-1 (cPow [% x])}) -1]) */
-        /* 137	*/ {{2,P2(S(201),N(2))         , cPow        ,PositionalParams,0}, 0, 0x5}, /* (cPow [(cAdd {1 (cPow [% x])}) -1]) */
-        /* 138	*/ {{2,P2(S(332),N(2))         , cPow        ,PositionalParams,0}, 0, 0x0}, /* (cPow [(cMul  <2>) -1]) */
-        /* 139	*/ {{2,P2(S(346),N(2))         , cPow        ,PositionalParams,0}, 0, 0x4}, /* (cPow [(cMul x <2>) -1]) */
-        /* 140	*/ {{2,P2(S(158),N(13))        , cPow        ,PositionalParams,0}, 0, 0x4}, /* (cPow [(cSin [x]) 2]) */
-        /* 141	*/ {{2,P2(S(158),N(13))        , cPow        ,PositionalParams,0}, 0, 0x0}, /* (cPow [(cSin [x]) 2]) */
-        /* 142	*/ {{2,P2(S(205),N(3))         , cPow        ,PositionalParams,0}, 0, 0x4}, /* (cPow [(cAdd {1 (cPow [x 2])}) -0.5]) */
-        /* 143	*/ {{2,P2(S(205),N(8))         , cPow        ,PositionalParams,0}, 0, 0x4}, /* (cPow [(cAdd {1 (cPow [x 2])}) 0.5]) */
-        /* 144	*/ {{2,P2(S(207),N(3))         , cPow        ,PositionalParams,0}, 0, 0x0}, /* (cPow [(cAdd {1 (cPow [(cAdd  <1>) 2])}) -0.5]) */
-        /* 145	*/ {{2,P2(S(207),N(8))         , cPow        ,PositionalParams,0}, 0, 0x0}, /* (cPow [(cAdd {1 (cPow [(cAdd  <1>) 2])}) 0.5]) */
-        /* 146	*/ {{2,P2(S(209),N(2))         , cPow        ,PositionalParams,0}, 0, 0x4}, /* (cPow [(cAdd {1 (cMul {-1 x})}) -1]) */
-        /* 147	*/ {{2,P2(S(203),N(8))         , cPow        ,PositionalParams,0}, 0, 0x4}, /* (cPow [(cAdd {-1 (cPow [x 2])}) 0.5]) */
-        /* 148	*/ {{2,P2(S(226),N(8))         , cPow        ,PositionalParams,0}, 0, 0x0}, /* (cPow [(cAdd {(cPow [x 2]) -1}) 0.5]) */
-        /* 149	*/ {{2,P2(S(236),N(8))         , cPow        ,PositionalParams,0}, 0, 0x0}, /* (cPow [(cAdd {(cPow [x 2]) 1}) 0.5]) */
-        /* 150	*/ {{2,P2(S(237),N(8))         , cPow        ,PositionalParams,0}, 0, 0x4}, /* (cPow [(cAdd {(cMul {(cPow [x 2]) -1}) 1}) 0.5]) */
-        /* 151	*/ {{2,P2(S(242),N(13))        , cPow        ,PositionalParams,0}, 0, 0x0}, /* (cPow [(cAdd  <1>) 2]) */
-        /* 152	*/ {{2,P2(S(331),P(9))         , cPow        ,PositionalParams,0}, 0, 0x0}, /* (cPow [(cMul  <1>) &]) */
-        /* 153	*/ {{2,P2(S(418),P(14))        , cPow        ,PositionalParams,0}, 0, 0x0}, /* (cPow [/& x]) */
-        /* 154	*/ {{2,P2(S(418),P(14))        , cPow        ,PositionalParams,0}, 0, 0x6}, /* (cPow [/& x]) */
-        /* 155	*/ {{2,P2(P(1),P(9))           , cPow        ,GroupFunction   ,0}, Constness_Const, 0x0}, /* POW( % & ) */
-        /* 156	*/ {{2,P2(P(9),S(417))         , cPow        ,GroupFunction   ,0}, Constness_Const, 0x0}, /* POW( & /% ) */
-        /* 157	*/ {{1,P1(P(14))               , cSec        ,PositionalParams,0}, 0, 0x0}, /* (cSec [x]) */
-        /* 158	*/ {{1,P1(P(14))               , cSin        ,PositionalParams,0}, 0, 0x0}, /* (cSin [x]) */
-        /* 159	*/ {{1,P1(P(14))               , cSin        ,PositionalParams,0}, 0, 0x4}, /* (cSin [x]) */
-        /* 160	*/ {{1,P1(P(21))               , cSin        ,PositionalParams,0}, 0, 0x0}, /* (cSin [y]) */
-        /* 161	*/ {{1,P1(S(215))              , cSin        ,PositionalParams,0}, 0, 0x0}, /* (cSin [(cAdd {x y})]) */
-        /* 162	*/ {{1,P1(S(221))              , cSin        ,PositionalParams,0}, 0, 0x0}, /* (cSin [(cAdd {x (cMul {-1 y})})]) */
-        /* 163	*/ {{1,P1(S(242))              , cSin        ,PositionalParams,0}, 0, 0x0}, /* (cSin [(cAdd  <1>)]) */
-        /* 164	*/ {{1,P1(S(279))              , cSin        ,PositionalParams,0}, 0, 0x5}, /* (cSin [(cMul {% x})]) */
-        /* 165	*/ {{1,P1(S(331))              , cSin        ,PositionalParams,0}, 0, 0x0}, /* (cSin [(cMul  <1>)]) */
-        /* 166	*/ {{1,P1(S(335))              , cSin        ,PositionalParams,0}, 0, 0x0}, /* (cSin [(cMul %@N <1>)]) */
-        /* 167	*/ {{1,P1(S(339))              , cSin        ,PositionalParams,0}, 0, 0x1}, /* (cSin [(cMul % <1>)]) */
-        /* 168	*/ {{1,P1(S(358))              , cSin        ,PositionalParams,0}, 0, 0x0}, /* (cSin [(cMul -% <1>)]) */
-        /* 169	*/ {{1,P1(P(14))               , cSinh       ,PositionalParams,0}, 0, 0x4}, /* (cSinh [x]) */
-        /* 170	*/ {{1,P1(P(14))               , cSinh       ,PositionalParams,0}, 0, 0x0}, /* (cSinh [x]) */
-        /* 171	*/ {{1,P1(S(50))               , cSinh       ,PositionalParams,0}, 0, 0x0}, /* (cSinh [(cLog [(cPow [& x])])]) */
-        /* 172	*/ {{1,P1(S(279))              , cSinh       ,PositionalParams,0}, 0, 0x5}, /* (cSinh [(cMul {% x})]) */
-        /* 173	*/ {{1,P1(S(295))              , cSinh       ,PositionalParams,0}, 0, 0x0}, /* (cSinh [(cMul {x LOG( & )})]) */
-        /* 174	*/ {{1,P1(S(331))              , cSinh       ,PositionalParams,0}, 0, 0x0}, /* (cSinh [(cMul  <1>)]) */
-        /* 175	*/ {{1,P1(S(335))              , cSinh       ,PositionalParams,0}, 0, 0x0}, /* (cSinh [(cMul %@N <1>)]) */
-        /* 176	*/ {{1,P1(S(358))              , cSinh       ,PositionalParams,0}, 0, 0x0}, /* (cSinh [(cMul -% <1>)]) */
-        /* 177	*/ {{1,P1(P(14))               , cTan        ,PositionalParams,0}, 0, 0x0}, /* (cTan [x]) */
-        /* 178	*/ {{1,P1(P(14))               , cTan        ,PositionalParams,0}, 0, 0x4}, /* (cTan [x]) */
-        /* 179	*/ {{1,P1(S(210))              , cTan        ,PositionalParams,0}, 0, 0x4}, /* (cTan [(cAdd {1.57079632679 (cMul {-1 x})})]) */
-        /* 180	*/ {{1,P1(S(213))              , cTan        ,PositionalParams,0}, 0, 0x0}, /* (cTan [(cAdd {1.57079632679 (cMul -1 <1>)})]) */
-        /* 181	*/ {{1,P1(S(279))              , cTan        ,PositionalParams,0}, 0, 0x0}, /* (cTan [(cMul {% x})]) */
-        /* 182	*/ {{1,P1(S(331))              , cTan        ,PositionalParams,0}, 0, 0x0}, /* (cTan [(cMul  <1>)]) */
-        /* 183	*/ {{1,P1(S(339))              , cTan        ,PositionalParams,0}, 0, 0x0}, /* (cTan [(cMul % <1>)]) */
-        /* 184	*/ {{1,P1(S(335))              , cTan        ,PositionalParams,0}, 0, 0x0}, /* (cTan [(cMul %@N <1>)]) */
-        /* 185	*/ {{1,P1(S(358))              , cTan        ,PositionalParams,0}, 0, 0x0}, /* (cTan [(cMul -% <1>)]) */
-        /* 186	*/ {{1,P1(P(14))               , cTanh       ,PositionalParams,0}, 0, 0x0}, /* (cTanh [x]) */
-        /* 187	*/ {{1,P1(P(14))               , cTanh       ,PositionalParams,0}, 0, 0x4}, /* (cTanh [x]) */
-        /* 188	*/ {{1,P1(S(279))              , cTanh       ,PositionalParams,0}, 0, 0x0}, /* (cTanh [(cMul {% x})]) */
-        /* 189	*/ {{1,P1(S(286))              , cTanh       ,PositionalParams,0}, 0, 0x0}, /* (cTanh [(cMul {x LOG( % ) 0.5})]) */
-        /* 190	*/ {{1,P1(S(331))              , cTanh       ,PositionalParams,0}, 0, 0x0}, /* (cTanh [(cMul  <1>)]) */
-        /* 191	*/ {{1,P1(S(335))              , cTanh       ,PositionalParams,0}, 0, 0x0}, /* (cTanh [(cMul %@N <1>)]) */
-        /* 192	*/ {{1,P1(S(358))              , cTanh       ,PositionalParams,0}, 0, 0x0}, /* (cTanh [(cMul -% <1>)]) */
-        /* 193	*/ {{1,P1(P(14))               , cTrunc      ,PositionalParams,0}, 0, 0x0}, /* (cTrunc [x]) */
-        /* 194	*/ {{1,P1(P(1))                , cNeg        ,GroupFunction   ,0}, Constness_Const, 0x0}, /* -% */
-        /* 195	*/ {{1,P1(P(1))                , cNeg        ,GroupFunction   ,0}, Constness_Const, 0x1}, /* -% */
-        /* 196	*/ {{1,P1(S(63))               , cNeg        ,GroupFunction   ,0}, Constness_Const, 0x0}, /* -MIN( % 1 ) */
-        /* 197	*/ {{1,P1(S(64))               , cNeg        ,GroupFunction   ,0}, Constness_Const, 0x0}, /* -MIN( % & ) */
-        /* 198	*/ {{2,P2(N(2),S(74))          , cAdd        ,SelectedParams  ,0}, 0, 0x5}, /* (cAdd {-1 (cPow [% x])}) */
-        /* 199	*/ {{2,P2(N(2),S(74))          , cAdd        ,SelectedParams  ,0}, 0, 0x0}, /* (cAdd {-1 (cPow [% x])}) */
-        /* 200	*/ {{2,P2(N(10),P(14))         , cAdd        ,SelectedParams  ,0}, 0, 0x4}, /* (cAdd {1 x}) */
-        /* 201	*/ {{2,P2(N(10),S(74))         , cAdd        ,SelectedParams  ,0}, 0, 0x0}, /* (cAdd {1 (cPow [% x])}) */
-        /* 202	*/ {{2,P2(N(10),S(74))         , cAdd        ,SelectedParams  ,0}, 0, 0x5}, /* (cAdd {1 (cPow [% x])}) */
-        /* 203	*/ {{2,P2(N(2),S(89))          , cAdd        ,SelectedParams  ,0}, 0, 0x0}, /* (cAdd {-1 (cPow [x 2])}) */
-        /* 204	*/ {{2,P2(N(2),S(96))          , cAdd        ,SelectedParams  ,0}, 0, 0x0}, /* (cAdd {-1 (cPow [x@P z])}) */
-        /* 205	*/ {{2,P2(N(10),S(89))         , cAdd        ,SelectedParams  ,0}, 0, 0x0}, /* (cAdd {1 (cPow [x 2])}) */
-        /* 206	*/ {{2,P2(N(10),S(96))         , cAdd        ,SelectedParams  ,0}, 0, 0x0}, /* (cAdd {1 (cPow [x@P z])}) */
-        /* 207	*/ {{2,P2(N(10),S(151))        , cAdd        ,SelectedParams  ,0}, 0, 0x0}, /* (cAdd {1 (cPow [(cAdd  <1>) 2])}) */
-        /* 208	*/ {{2,P2(N(10),S(196))        , cAdd        ,SelectedParams  ,0}, 0, 0x0}, /* (cAdd {1 -MIN( % 1 )}) */
-        /* 209	*/ {{2,P2(N(10),S(261))        , cAdd        ,SelectedParams  ,0}, 0, 0x0}, /* (cAdd {1 (cMul {-1 x})}) */
-        /* 210	*/ {{2,P2(N(12),S(261))        , cAdd        ,SelectedParams  ,0}, 0, 0x0}, /* (cAdd {1.57079632679 (cMul {-1 x})}) */
-        /* 211	*/ {{2,P2(N(10),S(303))        , cAdd        ,SelectedParams  ,0}, 0, 0x1}, /* (cAdd {1 (cMul {(cLog [x]) /%})}) */
-        /* 212	*/ {{2,P2(N(10),S(334))        , cAdd        ,SelectedParams  ,0}, 0, 0x0}, /* (cAdd {1 (cMul -1 <2>)}) */
-        /* 213	*/ {{2,P2(N(12),S(333))        , cAdd        ,SelectedParams  ,0}, 0, 0x0}, /* (cAdd {1.57079632679 (cMul -1 <1>)}) */
-        /* 214	*/ {{2,P2(N(12),S(335))        , cAdd        ,SelectedParams  ,0}, 0, 0x0}, /* (cAdd {1.57079632679 (cMul %@N <1>)}) */
-        /* 215	*/ {{2,P2(P(14),P(21))         , cAdd        ,SelectedParams  ,0}, 0, 0x0}, /* (cAdd {x y}) */
-        /* 216	*/ {{2,P2(P(21),P(28))         , cAdd        ,SelectedParams  ,0}, 0, 0x0}, /* (cAdd {y z}) */
-        /* 217	*/ {{2,P2(P(7),S(95))          , cAdd        ,SelectedParams  ,0}, 0, 0x4}, /* (cAdd {%@1 (cPow [x z])}) */
-        /* 218	*/ {{2,P2(P(1),S(196))         , cAdd        ,SelectedParams  ,0}, 0, 0x0}, /* (cAdd {% -MIN( % 1 )}) */
-        /* 219	*/ {{2,P2(P(1),S(197))         , cAdd        ,SelectedParams  ,0}, 0, 0x0}, /* (cAdd {% -MIN( % & )}) */
-        /* 220	*/ {{2,P2(P(9),S(197))         , cAdd        ,SelectedParams  ,0}, 0, 0x0}, /* (cAdd {& -MIN( % & )}) */
-        /* 221	*/ {{2,P2(P(14),S(262))        , cAdd        ,SelectedParams  ,0}, 0, 0x0}, /* (cAdd {x (cMul {-1 y})}) */
-        /* 222	*/ {{2,P2(P(21),P(31))         , cAdd        ,SelectedParams  ,0}, 0, 0x0}, /* (cAdd {y a}) */
-        /* 223	*/ {{2,P2(P(21),S(290))        , cAdd        ,SelectedParams  ,0}, 0, 0x0}, /* (cAdd {y (cMul {z (cLog [x]) /LOG( & )})}) */
-        /* 224	*/ {{2,P2(P(28),P(32))         , cAdd        ,SelectedParams  ,0}, 0, 0x0}, /* (cAdd {z b}) */
-        /* 225	*/ {{2,P2(S(47),P(1))          , cAdd        ,SelectedParams  ,0}, 0, 0x0}, /* (cAdd {(cLog [x]) %}) */
-        /* 226	*/ {{2,P2(S(89),N(2))          , cAdd        ,SelectedParams  ,0}, 0, 0x0}, /* (cAdd {(cPow [x 2]) -1}) */
-        /* 227	*/ {{2,P2(S(280),P(3))         , cAdd        ,SelectedParams  ,0}, 0, 0x0}, /* (cAdd {(cMul {% (cPow [x@P z])})@D1 %@D1}) */
-        /* 228	*/ {{2,P2(S(47),P(9))          , cAdd        ,SelectedParams  ,0}, 0, 0x0}, /* (cAdd {(cLog [x]) &}) */
-        /* 229	*/ {{2,P2(S(84),S(85))         , cAdd        ,SelectedParams  ,0}, 0, 0x0}, /* (cAdd {(cPow [& y]) (cPow [& (cAdd {y (cMul {z (cLog [x]) /LOG( & )})})])}) */
-        /* 230	*/ {{2,P2(S(147),P(15))        , cAdd        ,SelectedParams  ,0}, 0, 0x0}, /* (cAdd {(cPow [(cAdd {-1 (cPow [x 2])}) 0.5])@D4 x@D4}) */
-        /* 231	*/ {{2,P2(S(280),S(195))       , cAdd        ,SelectedParams  ,0}, 0, 0x0}, /* (cAdd {(cMul {% (cPow [x@P z])})@D1 -%@D1}) */
-        /* 232	*/ {{2,P2(S(298),S(85))        , cAdd        ,SelectedParams  ,0}, 0, 0x0}, /* (cAdd {(cMul {(cPow [& y]) -1}) (cPow [& (cAdd {y (cMul {z (cLog [x]) /LOG( & )})})])}) */
-        /* 233	*/ {{2,P2(S(300),S(100))       , cAdd        ,SelectedParams  ,0}, 0, 0x0}, /* (cAdd {(cMul {(cPow [x y]) %}) (cPow [x (cAdd {y z})])}) */
-        /* 234	*/ {{2,P2(S(316),S(52))        , cAdd        ,SelectedParams  ,0}, 0, 0x0}, /* (cAdd {(cMul {LOG( % ) y}) (cLog [(cMul  <1>)])}) */
-        /* 235	*/ {{2,P2(S(52),S(53))         , cAdd        ,SelectedParams  ,0}, 0, 0x0}, /* (cAdd {(cLog [(cMul  <1>)]) LOG( % )}) */
-        /* 236	*/ {{2,P2(S(89),N(10))         , cAdd        ,SelectedParams  ,0}, 0, 0x0}, /* (cAdd {(cPow [x 2]) 1}) */
-        /* 237	*/ {{2,P2(S(317),N(10))        , cAdd        ,SelectedParams  ,0}, 0, 0x0}, /* (cAdd {(cMul {(cPow [x 2]) -1}) 1}) */
-        /* 238	*/ {{2,P2(S(341),S(293))       , cAdd        ,SelectedParams  ,0}, 0, 0x0}, /* (cAdd {(cMul % & <1>) (cMul {& (cAdd  <2>)})}) */
-        /* 239	*/ {{2,P2(S(362),S(294))       , cAdd        ,SelectedParams  ,0}, 0, 0x0}, /* (cAdd {MUL( % & ) (cMul {& (cAdd  <1>)})}) */
-        /* 240	*/ {{2,P2(S(354),S(353))       , cAdd        ,SelectedParams  ,0}, 0, 0x0}, /* (cAdd {(cMul (cPow [x (cAdd {% -MIN( % 1 )})]) <1>) (cMul (cPow [x (cAdd {1 -MIN( % 1 )})]) <2>)}) */
-        /* 241	*/ {{2,P2(S(355),S(356))       , cAdd        ,SelectedParams  ,0}, 0, 0x0}, /* (cAdd {(cMul (cPow [x (cAdd {% -MIN( % & )})]) <1>) (cMul (cPow [x (cAdd {& -MIN( % & )})]) <2>)}) */
-        /* 242	*/ {{0,0                       , cAdd        ,AnyParams       ,1}, 0, 0x0}, /* (cAdd  <1>) */
-        /* 243	*/ {{0,0                       , cAdd        ,AnyParams       ,2}, 0, 0x0}, /* (cAdd  <2>) */
-        /* 244	*/ {{0,0                       , cAdd        ,AnyParams       ,1}, Sign_Positive, 0x0}, /* (cAdd  <1>)@P */
-        /* 245	*/ {{1,P1(N(1))                , cAdd        ,AnyParams       ,1}, 0, 0x0}, /* (cAdd -1.57079632679 <1>) */
-        /* 246	*/ {{1,P1(N(8))                , cAdd        ,AnyParams       ,1}, 0, 0x0}, /* (cAdd 0.5 <1>) */
-        /* 247	*/ {{1,P1(P(6))                , cAdd        ,AnyParams       ,1}, 0, 0x0}, /* (cAdd %@M <1>) */
-        /* 248	*/ {{1,P1(P(1))                , cAdd        ,AnyParams       ,1}, 0, 0x0}, /* (cAdd % <1>) */
-        /* 249	*/ {{1,P1(P(11))               , cAdd        ,AnyParams       ,1}, 0, 0x0}, /* (cAdd &@M <1>) */
-        /* 250	*/ {{1,P1(P(9))                , cAdd        ,AnyParams       ,2}, 0, 0x0}, /* (cAdd & <2>) */
-        /* 251	*/ {{1,P1(P(14))               , cAdd        ,AnyParams       ,1}, 0, 0x4}, /* (cAdd x <1>) */
-        /* 252	*/ {{1,P1(P(14))               , cAdd        ,AnyParams       ,2}, 0, 0x4}, /* (cAdd x <2>) */
-        /* 253	*/ {{1,P1(P(14))               , cAdd        ,AnyParams       ,1}, 0, 0x0}, /* (cAdd x <1>) */
-        /* 254	*/ {{2,P2(P(9),S(194))         , cAdd        ,AnyParams       ,2}, 0, 0x0}, /* (cAdd & -% <2>) */
-        /* 255	*/ {{1,P1(S(123))              , cAdd        ,AnyParams       ,1}, 0, 0x16}, /* (cAdd (cPow [(cLog [z]) -1]) <1>) */
-        /* 256	*/ {{1,P1(S(334))              , cAdd        ,AnyParams       ,1}, 0, 0x0}, /* (cAdd (cMul -1 <2>) <1>) */
-        /* 257	*/ {{1,P1(S(338))              , cAdd        ,AnyParams       ,2}, 0, 0x0}, /* (cAdd (cMul %@M <1>) <2>) */
-        /* 258	*/ {{1,P1(S(357))              , cAdd        ,AnyParams       ,1}, 0, 0x16}, /* (cAdd (cMul (cPow [(cLog [z]) -1]) <2>) <1>) */
-        /* 259	*/ {{2,P2(P(1),N(10))          , cAdd        ,GroupFunction   ,0}, Constness_Const, 0x0}, /* ADD( % 1 ) */
-        /* 260	*/ {{2,P2(P(9),S(194))         , cAdd        ,GroupFunction   ,0}, Constness_Const, 0x0}, /* ADD( & -% ) */
-        /* 261	*/ {{2,P2(N(2),P(14))          , cMul        ,SelectedParams  ,0}, 0, 0x0}, /* (cMul {-1 x}) */
-        /* 262	*/ {{2,P2(N(2),P(21))          , cMul        ,SelectedParams  ,0}, 0, 0x0}, /* (cMul {-1 y}) */
-        /* 263	*/ {{2,P2(N(2),S(13))          , cMul        ,SelectedParams  ,0}, 0, 0x0}, /* (cMul {-1 (cCeil [(cMul  <1>)])}) */
-        /* 264	*/ {{2,P2(N(2),S(18))          , cMul        ,SelectedParams  ,0}, 0, 0x0}, /* (cMul {-1 (cCos [(cAdd {x (cMul {-1 y})})])}) */
-        /* 265	*/ {{2,P2(N(2),S(19))          , cMul        ,SelectedParams  ,0}, 0, 0x0}, /* (cMul {-1 (cCos [(cAdd  <1>)])}) */
-        /* 266	*/ {{2,P2(N(2),S(23))          , cMul        ,SelectedParams  ,0}, 0, 0x0}, /* (cMul {-1 (cCosh [x])}) */
-        /* 267	*/ {{2,P2(N(2),S(30))          , cMul        ,SelectedParams  ,0}, 0, 0x0}, /* (cMul {-1 (cFloor [(cMul  <1>)])}) */
-        /* 268	*/ {{2,P2(N(2),S(83))          , cMul        ,SelectedParams  ,0}, 0, 0x6}, /* (cMul {-1 (cPow [& x])}) */
-        /* 269	*/ {{2,P2(N(2),S(118))         , cMul        ,SelectedParams  ,0}, 0, 0x0}, /* (cMul {-1 (cPow [(cCos [x]) 2])}) */
-        /* 270	*/ {{2,P2(N(2),S(141))         , cMul        ,SelectedParams  ,0}, 0, 0x0}, /* (cMul {-1 (cPow [(cSin [x]) 2])}) */
-        /* 271	*/ {{2,P2(N(2),S(153))         , cMul        ,SelectedParams  ,0}, 0, 0x6}, /* (cMul {-1 (cPow [/& x])}) */
-        /* 272	*/ {{2,P2(N(2),S(165))         , cMul        ,SelectedParams  ,0}, 0, 0x0}, /* (cMul {-1 (cSin [(cMul  <1>)])}) */
-        /* 273	*/ {{2,P2(N(2),S(170))         , cMul        ,SelectedParams  ,0}, 0, 0x0}, /* (cMul {-1 (cSinh [x])}) */
-        /* 274	*/ {{2,P2(N(2),S(174))         , cMul        ,SelectedParams  ,0}, 0, 0x0}, /* (cMul {-1 (cSinh [(cMul  <1>)])}) */
-        /* 275	*/ {{2,P2(N(2),S(182))         , cMul        ,SelectedParams  ,0}, 0, 0x0}, /* (cMul {-1 (cTan [(cMul  <1>)])}) */
-        /* 276	*/ {{2,P2(N(2),S(190))         , cMul        ,SelectedParams  ,0}, 0, 0x0}, /* (cMul {-1 (cTanh [(cMul  <1>)])}) */
-        /* 277	*/ {{2,P2(N(15),S(110))        , cMul        ,SelectedParams  ,0}, 0, 0x0}, /* (cMul {2.71828182846 (cPow [z (cAdd  <1>)])}) */
-        /* 278	*/ {{3,P3(P(14),N(8),S(417))   , cMul        ,SelectedParams  ,0}, 0, 0x0}, /* (cMul {x 0.5 /%}) */
-        /* 279	*/ {{2,P2(P(1),P(14))          , cMul        ,SelectedParams  ,0}, 0, 0x0}, /* (cMul {% x}) */
-        /* 280	*/ {{2,P2(P(1),S(96))          , cMul        ,SelectedParams  ,0}, 0, 0x1}, /* (cMul {% (cPow [x@P z])}) */
-        /* 281	*/ {{2,P2(P(1),S(212))         , cMul        ,SelectedParams  ,0}, 0, 0x0}, /* (cMul {% (cAdd {1 (cMul -1 <2>)})}) */
-        /* 282	*/ {{2,P2(P(1),S(256))         , cMul        ,SelectedParams  ,0}, 0, 0x0}, /* (cMul {% (cAdd (cMul -1 <2>) <1>)}) */
-        /* 283	*/ {{2,P2(P(14),P(21))         , cMul        ,SelectedParams  ,0}, 0, 0x0}, /* (cMul {x y}) */
-        /* 284	*/ {{2,P2(P(14),S(104))        , cMul        ,SelectedParams  ,0}, 0, 0x0}, /* (cMul {x (cPow [y -1])}) */
-        /* 285	*/ {{2,P2(P(14),S(391))        , cMul        ,SelectedParams  ,0}, 0, 0x0}, /* (cMul {x (cAnd  <1>)}) */
-        /* 286	*/ {{3,P3(P(14),S(53),N(8))    , cMul        ,SelectedParams  ,0}, 0, 0x0}, /* (cMul {x LOG( % ) 0.5}) */
-        /* 287	*/ {{2,P2(P(21),P(28))         , cMul        ,SelectedParams  ,0}, 0, 0x0}, /* (cMul {y z}) */
-        /* 288	*/ {{2,P2(P(21),P(31))         , cMul        ,SelectedParams  ,0}, 0, 0x0}, /* (cMul {y a}) */
-        /* 289	*/ {{2,P2(P(28),P(32))         , cMul        ,SelectedParams  ,0}, 0, 0x0}, /* (cMul {z b}) */
-        /* 290	*/ {{3,P3(P(28),S(47),S(420))  , cMul        ,SelectedParams  ,0}, 0, 0x0}, /* (cMul {z (cLog [x]) /LOG( & )}) */
-        /* 291	*/ {{2,P2(P(1),S(83))          , cMul        ,SelectedParams  ,0}, 0, 0x7}, /* (cMul {% (cPow [& x])}) */
-        /* 292	*/ {{2,P2(P(1),S(153))         , cMul        ,SelectedParams  ,0}, 0, 0x7}, /* (cMul {% (cPow [/& x])}) */
-        /* 293	*/ {{2,P2(P(9),S(243))         , cMul        ,SelectedParams  ,0}, 0, 0x0}, /* (cMul {& (cAdd  <2>)}) */
-        /* 294	*/ {{2,P2(P(9),S(242))         , cMul        ,SelectedParams  ,0}, 0, 0x0}, /* (cMul {& (cAdd  <1>)}) */
-        /* 295	*/ {{2,P2(P(14),S(54))         , cMul        ,SelectedParams  ,0}, 0, 0x0}, /* (cMul {x LOG( & )}) */
-        /* 296	*/ {{2,P2(P(14),S(108))        , cMul        ,SelectedParams  ,0}, 0, 0x0}, /* (cMul {x (cPow [y %@N])}) */
-        /* 297	*/ {{2,P2(S(23),N(2))          , cMul        ,SelectedParams  ,0}, 0, 0x4}, /* (cMul {(cCosh [x]) -1}) */
-        /* 298	*/ {{2,P2(S(84),N(2))          , cMul        ,SelectedParams  ,0}, 0, 0x0}, /* (cMul {(cPow [& y]) -1}) */
-        /* 299	*/ {{2,P2(S(11),N(13))         , cMul        ,SelectedParams  ,0}, 0, 0x0}, /* (cMul {(cAtanh [x]) 2}) */
-        /* 300	*/ {{2,P2(S(105),P(1))         , cMul        ,SelectedParams  ,0}, 0, 0x0}, /* (cMul {(cPow [x y]) %}) */
-        /* 301	*/ {{2,P2(S(194),P(14))        , cMul        ,SelectedParams  ,0}, 0, 0x0}, /* (cMul {-% x}) */
-        /* 302	*/ {{2,P2(S(14),S(16))         , cMul        ,SelectedParams  ,0}, 0, 0x12}, /* (cMul {(cCos [x]) (cCos [y])}) */
-        /* 303	*/ {{2,P2(S(47),S(417))        , cMul        ,SelectedParams  ,0}, 0, 0x0}, /* (cMul {(cLog [x]) /%}) */
-        /* 304	*/ {{2,P2(S(65),N(2))          , cMul        ,SelectedParams  ,0}, 0, 0x0}, /* (cMul {(cPow [0.367879441171 x]) -1}) */
-        /* 305	*/ {{2,P2(S(65),N(2))          , cMul        ,SelectedParams  ,0}, 0, 0x4}, /* (cMul {(cPow [0.367879441171 x]) -1}) */
-        /* 306	*/ {{2,P2(S(67),N(2))          , cMul        ,SelectedParams  ,0}, 0, 0x4}, /* (cMul {(cPow [2.71828182846 x]) -1}) */
-        /* 307	*/ {{2,P2(S(170),N(2))         , cMul        ,SelectedParams  ,0}, 0, 0x4}, /* (cMul {(cSinh [x]) -1}) */
-        /* 308	*/ {{3,P3(S(25),N(13),P(1))    , cMul        ,SelectedParams  ,0}, 0, 0x0}, /* (cMul {(cCosh [(cMul {x LOG( & )})]) 2 %}) */
-        /* 309	*/ {{2,P2(S(173),N(0))         , cMul        ,SelectedParams  ,0}, 0, 0x0}, /* (cMul {(cSinh [(cMul {x LOG( & )})]) -2}) */
-        /* 310	*/ {{2,P2(S(24),N(13))         , cMul        ,SelectedParams  ,0}, 0, 0x0}, /* (cMul {(cCosh [(cLog [(cPow [& x])])]) 2}) */
-        /* 311	*/ {{2,P2(S(171),N(13))        , cMul        ,SelectedParams  ,0}, 0, 0x0}, /* (cMul {(cSinh [(cLog [(cPow [& x])])]) 2}) */
-        /* 312	*/ {{3,P3(S(173),N(13),P(1))   , cMul        ,SelectedParams  ,0}, 0, 0x0}, /* (cMul {(cSinh [(cMul {x LOG( & )})]) 2 %}) */
-        /* 313	*/ {{2,P2(S(194),S(153))       , cMul        ,SelectedParams  ,0}, 0, 0x7}, /* (cMul {-% (cPow [/& x])}) */
-        /* 314	*/ {{3,P3(S(14),S(16),N(2))    , cMul        ,SelectedParams  ,0}, 0, 0x12}, /* (cMul {(cCos [x]) (cCos [y]) -1}) */
-        /* 315	*/ {{2,P2(S(14),S(160))        , cMul        ,SelectedParams  ,0}, 0, 0x12}, /* (cMul {(cCos [x]) (cSin [y])}) */
-        /* 316	*/ {{2,P2(S(53),P(21))         , cMul        ,SelectedParams  ,0}, 0, 0x0}, /* (cMul {LOG( % ) y}) */
-        /* 317	*/ {{2,P2(S(89),N(2))          , cMul        ,SelectedParams  ,0}, 0, 0x0}, /* (cMul {(cPow [x 2]) -1}) */
-        /* 318	*/ {{2,P2(S(158),S(16))        , cMul        ,SelectedParams  ,0}, 0, 0x12}, /* (cMul {(cSin [x]) (cCos [y])}) */
-        /* 319	*/ {{2,P2(S(110),S(73))        , cMul        ,SelectedParams  ,0}, 0, 0x0}, /* (cMul {(cPow [z (cAdd  <1>)]) (cPow [2.71828182846 (cMul  <2>)])}) */
-        /* 320	*/ {{2,P2(S(155),S(106))       , cMul        ,SelectedParams  ,0}, 0, 0x0}, /* (cMul {POW( % & ) (cPow [% (cAdd  <1>)])}) */
-        /* 321	*/ {{2,P2(S(155),S(107))       , cMul        ,SelectedParams  ,0}, 0, 0x0}, /* (cMul {POW( % & ) (cPow [x LOG( % )])}) */
-        /* 322	*/ {{2,P2(S(155),S(152))       , cMul        ,SelectedParams  ,0}, 0, 0x0}, /* (cMul {POW( % & ) (cPow [(cMul  <1>) &])}) */
-        /* 323	*/ {{2,P2(S(158),S(160))       , cMul        ,SelectedParams  ,0}, 0, 0x12}, /* (cMul {(cSin [x]) (cSin [y])}) */
-        /* 324	*/ {{3,P3(S(14),S(160),N(2))   , cMul        ,SelectedParams  ,0}, 0, 0x12}, /* (cMul {(cCos [x]) (cSin [y]) -1}) */
-        /* 325	*/ {{3,P3(S(158),S(160),N(2))  , cMul        ,SelectedParams  ,0}, 0, 0x12}, /* (cMul {(cSin [x]) (cSin [y]) -1}) */
-        /* 326	*/ {{2,P2(S(97),S(240))        , cMul        ,SelectedParams  ,0}, 0, 0x0}, /* (cMul {(cPow [x MIN( % 1 )]) (cAdd {(cMul (cPow [x (cAdd {% -MIN( % 1 )})]) <1>) (cMul (cPow [x (cAdd {1 -MIN( % 1 )})]) <2>)})}) */
-        /* 327	*/ {{2,P2(S(98),S(241))        , cMul        ,SelectedParams  ,0}, 0, 0x0}, /* (cMul {(cPow [x MIN( % & )]) (cAdd {(cMul (cPow [x (cAdd {% -MIN( % & )})]) <1>) (cMul (cPow [x (cAdd {& -MIN( % & )})]) <2>)})}) */
-        /* 328	*/ {{2,P2(S(200),S(146))       , cMul        ,SelectedParams  ,0}, 0, 0x0}, /* (cMul {(cAdd {1 x})@D4 (cPow [(cAdd {1 (cMul {-1 x})}) -1])@D4}) */
-        /* 329	*/ {{2,P2(S(375),P(21))        , cMul        ,SelectedParams  ,0}, 0, 0x0}, /* (cMul {(cNot [x]) y}) */
-        /* 330	*/ {{2,P2(S(399),P(21))        , cMul        ,SelectedParams  ,0}, 0, 0x0}, /* (cMul {(cNotNot [x]) y}) */
-        /* 331	*/ {{0,0                       , cMul        ,AnyParams       ,1}, 0, 0x0}, /* (cMul  <1>) */
-        /* 332	*/ {{0,0                       , cMul        ,AnyParams       ,2}, 0, 0x0}, /* (cMul  <2>) */
-        /* 333	*/ {{1,P1(N(2))                , cMul        ,AnyParams       ,1}, 0, 0x0}, /* (cMul -1 <1>) */
-        /* 334	*/ {{1,P1(N(2))                , cMul        ,AnyParams       ,2}, 0, 0x0}, /* (cMul -1 <2>) */
-        /* 335	*/ {{1,P1(P(0))                , cMul        ,AnyParams       ,1}, 0, 0x0}, /* (cMul %@N <1>) */
-        /* 336	*/ {{1,P1(P(2))                , cMul        ,AnyParams       ,1}, 0, 0x0}, /* (cMul %@P <1>) */
-        /* 337	*/ {{1,P1(P(2))                , cMul        ,AnyParams       ,1}, 0, 0x1}, /* (cMul %@P <1>) */
-        /* 338	*/ {{1,P1(P(6))                , cMul        ,AnyParams       ,1}, 0, 0x0}, /* (cMul %@M <1>) */
-        /* 339	*/ {{1,P1(P(1))                , cMul        ,AnyParams       ,1}, 0, 0x0}, /* (cMul % <1>) */
-        /* 340	*/ {{1,P1(P(9))                , cMul        ,AnyParams       ,2}, 0, 0x0}, /* (cMul & <2>) */
-        /* 341	*/ {{2,P2(P(1),P(9))           , cMul        ,AnyParams       ,1}, 0, 0x0}, /* (cMul % & <1>) */
-        /* 342	*/ {{2,P2(P(9),S(417))         , cMul        ,AnyParams       ,2}, 0, 0x0}, /* (cMul & /% <2>) */
-        /* 343	*/ {{1,P1(P(14))               , cMul        ,AnyParams       ,1}, 0, 0x4}, /* (cMul x <1>) */
-        /* 344	*/ {{1,P1(P(14))               , cMul        ,AnyParams       ,2}, 0, 0x4}, /* (cMul x <2>) */
-        /* 345	*/ {{1,P1(P(14))               , cMul        ,AnyParams       ,1}, 0, 0x0}, /* (cMul x <1>) */
-        /* 346	*/ {{1,P1(P(14))               , cMul        ,AnyParams       ,2}, 0, 0x0}, /* (cMul x <2>) */
-        /* 347	*/ {{1,P1(S(0))                , cMul        ,AnyParams       ,1}, 0, 0x0}, /* (cMul (cAbs [x]) <1>) */
-        /* 348	*/ {{1,P1(S(47))               , cMul        ,AnyParams       ,1}, 0, 0x0}, /* (cMul (cLog [x]) <1>) */
-        /* 349	*/ {{1,P1(S(53))               , cMul        ,AnyParams       ,1}, 0, 0x0}, /* (cMul LOG( % ) <1>) */
-        /* 350	*/ {{1,P1(S(86))               , cMul        ,AnyParams       ,1}, 0, 0x4}, /* (cMul (cPow [x %@I@P]) <1>) */
-        /* 351	*/ {{1,P1(S(87))               , cMul        ,AnyParams       ,2}, 0, 0x4}, /* (cMul (cPow [x &@I]) <2>) */
-        /* 352	*/ {{1,P1(S(88))               , cMul        ,AnyParams       ,1}, 0, 0x0}, /* (cMul (cPow [% y]) <1>) */
-        /* 353	*/ {{1,P1(S(99))               , cMul        ,AnyParams       ,2}, 0, 0x0}, /* (cMul (cPow [x (cAdd {1 -MIN( % 1 )})]) <2>) */
-        /* 354	*/ {{1,P1(S(101))              , cMul        ,AnyParams       ,1}, 0, 0x0}, /* (cMul (cPow [x (cAdd {% -MIN( % 1 )})]) <1>) */
-        /* 355	*/ {{1,P1(S(102))              , cMul        ,AnyParams       ,1}, 0, 0x0}, /* (cMul (cPow [x (cAdd {% -MIN( % & )})]) <1>) */
-        /* 356	*/ {{1,P1(S(103))              , cMul        ,AnyParams       ,2}, 0, 0x0}, /* (cMul (cPow [x (cAdd {& -MIN( % & )})]) <2>) */
-        /* 357	*/ {{1,P1(S(123))              , cMul        ,AnyParams       ,2}, 0, 0x0}, /* (cMul (cPow [(cLog [z]) -1]) <2>) */
-        /* 358	*/ {{1,P1(S(194))              , cMul        ,AnyParams       ,1}, 0, 0x0}, /* (cMul -% <1>) */
-        /* 359	*/ {{1,P1(S(194))              , cMul        ,AnyParams       ,2}, 0, 0x1}, /* (cMul -% <2>) */
-        /* 360	*/ {{2,P2(S(123),S(47))        , cMul        ,AnyParams       ,1}, 0, 0x16}, /* (cMul (cPow [(cLog [z]) -1]) (cLog [x]) <1>) */
-        /* 361	*/ {{2,P2(S(419),S(47))        , cMul        ,AnyParams       ,1}, 0, 0x1}, /* (cMul /LOG( % ) (cLog [x]) <1>) */
-        /* 362	*/ {{2,P2(P(1),P(9))           , cMul        ,GroupFunction   ,0}, Constness_Const, 0x0}, /* MUL( % & ) */
-        /* 363	*/ {{2,P2(P(9),S(417))         , cMul        ,GroupFunction   ,0}, Constness_Const, 0x0}, /* MUL( & /% ) */
-        /* 364	*/ {{2,P2(S(54),S(419))        , cMul        ,GroupFunction   ,0}, Constness_Const, 0x0}, /* MUL( LOG( & ) /LOG( % ) ) */
-        /* 365	*/ {{2,P2(P(14),P(21))         , cEqual      ,PositionalParams,0}, 0, 0x12}, /* (cEqual [x y]) */
-        /* 366	*/ {{2,P2(P(14),P(21))         , cEqual      ,PositionalParams,0}, 0, 0x0}, /* (cEqual [x y]) */
-        /* 367	*/ {{2,P2(P(14),P(28))         , cEqual      ,PositionalParams,0}, 0, 0x20}, /* (cEqual [x z]) */
-        /* 368	*/ {{2,P2(P(21),P(28))         , cEqual      ,PositionalParams,0}, 0, 0x24}, /* (cEqual [y z]) */
-        /* 369	*/ {{2,P2(P(21),P(28))         , cEqual      ,PositionalParams,0}, 0, 0x0}, /* (cEqual [y z]) */
-        /* 370	*/ {{2,P2(N(4),P(14))          , cLess       ,PositionalParams,0}, 0, 0x4}, /* (cLess [0 x]) */
-        /* 371	*/ {{2,P2(P(21),P(14))         , cLess       ,PositionalParams,0}, 0, 0x0}, /* (cLess [y x]) */
-        /* 372	*/ {{2,P2(P(14),P(21))         , cLess       ,PositionalParams,0}, 0, 0x12}, /* (cLess [x y]) */
-        /* 373	*/ {{2,P2(P(14),P(21))         , cLessOrEq   ,PositionalParams,0}, 0, 0x0}, /* (cLessOrEq [x y]) */
-        /* 374	*/ {{1,P1(P(1))                , cNot        ,PositionalParams,0}, 0, 0x0}, /* (cNot [%]) */
-        /* 375	*/ {{1,P1(P(14))               , cNot        ,PositionalParams,0}, 0, 0x0}, /* (cNot [x]) */
-        /* 376	*/ {{1,P1(P(21))               , cNot        ,PositionalParams,0}, 0, 0x0}, /* (cNot [y]) */
-        /* 377	*/ {{1,P1(P(28))               , cNot        ,PositionalParams,0}, 0, 0x0}, /* (cNot [z]) */
-        /* 378	*/ {{1,P1(S(278))              , cNot        ,PositionalParams,0}, 0, 0x0}, /* (cNot [(cMul {x 0.5 /%})]) */
-        /* 379	*/ {{1,P1(S(385))              , cNot        ,PositionalParams,0}, 0, 0x0}, /* (cNot [(cAnd {x y})]) */
-        /* 380	*/ {{1,P1(S(388))              , cNot        ,PositionalParams,0}, 0, 0x0}, /* (cNot [(cAnd {z (cIf [x y (cNot [%])])})]) */
-        /* 381	*/ {{1,P1(S(389))              , cNot        ,PositionalParams,0}, 0, 0x0}, /* (cNot [(cAnd {z (cIf [x (cNot [%]) y])})]) */
-        /* 382	*/ {{1,P1(S(392))              , cNot        ,PositionalParams,0}, 0, 0x0}, /* (cNot [(cOr {x y})]) */
-        /* 383	*/ {{1,P1(S(395))              , cNot        ,PositionalParams,0}, 0, 0x0}, /* (cNot [(cOr {z (cIf [x y (cNot [%])])})]) */
-        /* 384	*/ {{1,P1(S(396))              , cNot        ,PositionalParams,0}, 0, 0x0}, /* (cNot [(cOr {z (cIf [x (cNot [%]) y])})]) */
-        /* 385	*/ {{2,P2(P(14),P(21))         , cAnd        ,SelectedParams  ,0}, 0, 0x0}, /* (cAnd {x y}) */
-        /* 386	*/ {{2,P2(P(21),P(31))         , cAnd        ,SelectedParams  ,0}, 0, 0x0}, /* (cAnd {y a}) */
-        /* 387	*/ {{2,P2(P(28),P(32))         , cAnd        ,SelectedParams  ,0}, 0, 0x0}, /* (cAnd {z b}) */
-        /* 388	*/ {{2,P2(P(28),S(35))         , cAnd        ,SelectedParams  ,0}, 0, 0x0}, /* (cAnd {z (cIf [x y (cNot [%])])}) */
-        /* 389	*/ {{2,P2(P(28),S(37))         , cAnd        ,SelectedParams  ,0}, 0, 0x0}, /* (cAnd {z (cIf [x (cNot [%]) y])}) */
-        /* 390	*/ {{2,P2(S(375),P(21))        , cAnd        ,SelectedParams  ,0}, 0, 0x0}, /* (cAnd {(cNot [x]) y}) */
-        /* 391	*/ {{0,0                       , cAnd        ,AnyParams       ,1}, 0, 0x0}, /* (cAnd  <1>) */
-        /* 392	*/ {{2,P2(P(14),P(21))         , cOr         ,SelectedParams  ,0}, 0, 0x0}, /* (cOr {x y}) */
-        /* 393	*/ {{2,P2(P(21),P(31))         , cOr         ,SelectedParams  ,0}, 0, 0x0}, /* (cOr {y a}) */
-        /* 394	*/ {{2,P2(P(28),P(32))         , cOr         ,SelectedParams  ,0}, 0, 0x0}, /* (cOr {z b}) */
-        /* 395	*/ {{2,P2(P(28),S(35))         , cOr         ,SelectedParams  ,0}, 0, 0x0}, /* (cOr {z (cIf [x y (cNot [%])])}) */
-        /* 396	*/ {{2,P2(P(28),S(37))         , cOr         ,SelectedParams  ,0}, 0, 0x0}, /* (cOr {z (cIf [x (cNot [%]) y])}) */
-        /* 397	*/ {{2,P2(S(375),P(21))        , cOr         ,SelectedParams  ,0}, 0, 0x0}, /* (cOr {(cNot [x]) y}) */
-        /* 398	*/ {{0,0                       , cOr         ,AnyParams       ,1}, 0, 0x0}, /* (cOr  <1>) */
-        /* 399	*/ {{1,P1(P(14))               , cNotNot     ,PositionalParams,0}, 0, 0x0}, /* (cNotNot [x]) */
-        /* 400	*/ {{1,P1(P(21))               , cNotNot     ,PositionalParams,0}, 0, 0x0}, /* (cNotNot [y]) */
-        /* 401	*/ {{1,P1(S(215))              , cNotNot     ,PositionalParams,0}, 0, 0x0}, /* (cNotNot [(cAdd {x y})]) */
-        /* 402	*/ {{1,P1(S(253))              , cNotNot     ,PositionalParams,0}, 0, 0x0}, /* (cNotNot [(cAdd x <1>)]) */
-        /* 403	*/ {{1,P1(S(278))              , cNotNot     ,PositionalParams,0}, 0, 0x0}, /* (cNotNot [(cMul {x 0.5 /%})]) */
-        /* 404	*/ {{1,P1(S(285))              , cNotNot     ,PositionalParams,0}, 0, 0x0}, /* (cNotNot [(cMul {x (cAnd  <1>)})]) */
-        /* 405	*/ {{1,P1(S(331))              , cDeg        ,PositionalParams,0}, 0, 0x0}, /* (cDeg [(cMul  <1>)]) */
-        /* 406	*/ {{1,P1(S(331))              , cRad        ,PositionalParams,0}, 0, 0x0}, /* (cRad [(cMul  <1>)]) */
-        /* 407	*/ {{3,P3(P(14),P(21),S(391))  , cAbsAnd     ,SelectedParams  ,0}, 0, 0x0}, /* (cAbsAnd {x y (cAnd  <1>)}) */
-        /* 408	*/ {{3,P3(P(14),P(21),S(398))  , cAbsOr      ,SelectedParams  ,0}, 0, 0x0}, /* (cAbsOr {x y (cOr  <1>)}) */
-        /* 409	*/ {{1,P1(P(14))               , cAbsNot     ,PositionalParams,0}, 0, 0x0}, /* (cAbsNot [x]) */
-        /* 410	*/ {{1,P1(P(14))               , cAbsNotNot  ,PositionalParams,0}, 0, 0x0}, /* (cAbsNotNot [x]) */
-        /* 411	*/ {{1,P1(P(21))               , cAbsNotNot  ,PositionalParams,0}, 0, 0x0}, /* (cAbsNotNot [y]) */
-        /* 412	*/ {{1,P1(P(28))               , cAbsNotNot  ,PositionalParams,0}, 0, 0x0}, /* (cAbsNotNot [z]) */
-        /* 413	*/ {{3,P3(P(14),N(10),S(411))  , cAbsIf      ,PositionalParams,0}, 0, 0x0}, /* (cAbsIf [x 1 (cAbsNotNot [y])]) */
-        /* 414	*/ {{3,P3(P(14),P(21),P(28))   , cAbsIf      ,PositionalParams,0}, 0, 0x0}, /* (cAbsIf [x y z]) */
-        /* 415	*/ {{3,P3(P(14),S(331),N(4))   , cAbsIf      ,PositionalParams,0}, 0, 0x0}, /* (cAbsIf [x (cMul  <1>) 0]) */
-        /* 416	*/ {{3,P3(P(14),S(411),N(4))   , cAbsIf      ,PositionalParams,0}, 0, 0x0}, /* (cAbsIf [x (cAbsNotNot [y]) 0]) */
-        /* 417	*/ {{1,P1(P(1))                , cInv        ,GroupFunction   ,0}, Constness_Const, 0x0}, /* /% */
-        /* 418	*/ {{1,P1(P(9))                , cInv        ,GroupFunction   ,0}, Constness_Const, 0x0}, /* /& */
-        /* 419	*/ {{1,P1(S(53))               , cInv        ,GroupFunction   ,0}, Constness_Const, 0x0}, /* /LOG( % ) */
-        /* 420	*/ {{1,P1(S(54))               , cInv        ,GroupFunction   ,0}, Constness_Const, 0x0}, /* /LOG( & ) */
-        /* 421	*/ {{1,P1(S(64))               , cInv        ,GroupFunction   ,0}, Constness_Const, 0x0}, /* /MIN( % & ) */
-        },
-
-    };
-}
-namespace FPoptimizer_Grammar
-{
-    const Rule grammar_rules[241] =
-    {
-        /* 0:	@L (cAbs [x])
-         *	->	x
-         */		 {ProduceNewTree, true , 1,P1(P(14))               , {1,P1(P(14))               , cAbs        ,PositionalParams,0}},
-        /* 1:	(cAtan [(cMul {x (cPow [y %@N])})])
-         *	->	(cAtan2 [x (cPow [y -%])])
-         */		 {ProduceNewTree, false, 1,P1(S(10))               , {1,P1(S(296))              , cAtan       ,PositionalParams,0}},
-        /* 2:	(cAtan2 [(cPow [(cAdd {(cMul {(cPow [x 2]) -1}) 1}) 0.5])@D4 x@D4])
-         *	->	(cAcos [x])
-         */		 {ProduceNewTree, false, 1,P1(S(3))                , {2,P2(S(150),P(15))        , cAtan2      ,PositionalParams,0}},
-        /* 3:	(cAtan2 [x@D4 (cPow [(cAdd {(cMul {(cPow [x 2]) -1}) 1}) 0.5])@D4])
-         *	->	(cAsin [x])
-         */		 {ProduceNewTree, false, 1,P1(S(5))                , {2,P2(P(15),S(150))        , cAtan2      ,PositionalParams,0}},
-        /* 4:	(cAtan2 [(cMul x <1>)@D4 (cMul x <2>)@D4])
-         *	:	(cMul  <1>) (cMul  <2>)
-         */		 {ReplaceParams , false, 2,P2(S(331),S(332))       , {2,P2(S(343),S(344))       , cAtan2      ,PositionalParams,0}},
-        /* 5:	(cCeil [x@I])
-         *	->	x
-         */		 {ProduceNewTree, false, 1,P1(P(14))               , {1,P1(P(16))               , cCeil       ,PositionalParams,0}},
-        /* 6:	(cCeil [(cMul -1 <1>)])
-         *	->	(cMul {-1 (cFloor [(cMul  <1>)])})
-         */		 {ProduceNewTree, false, 1,P1(S(267))              , {1,P1(S(333))              , cCeil       ,PositionalParams,0}},
-        /* 7:	(cCos [(cAdd {1.57079632679 (cMul %@N <1>)})])
-         *	->	(cSin [(cMul -% <1>)])
-         */		 {ProduceNewTree, false, 1,P1(S(168))              , {1,P1(S(214))              , cCos        ,PositionalParams,0}},
-        /* 8:	(cCos [(cAdd -1.57079632679 <1>)])
-         *	->	(cSin [(cAdd  <1>)])
-         */		 {ProduceNewTree, false, 1,P1(S(163))              , {1,P1(S(245))              , cCos        ,PositionalParams,0}},
-        /* 9:	(cCos [(cAcos [x])])
-         *	->	x
-         */		 {ProduceNewTree, false, 1,P1(P(14))               , {1,P1(S(3))                , cCos        ,PositionalParams,0}},
-        /* 10:	(cCos [(cAbs [x])])
-         *	:	x
-         */		 {ReplaceParams , false, 1,P1(P(14))               , {1,P1(S(0))                , cCos        ,PositionalParams,0}},
-        /* 11:	(cCos [(cMul -1 <1>)])
-         *	:	(cMul  <1>)
-         */		 {ReplaceParams , false, 1,P1(S(331))              , {1,P1(S(333))              , cCos        ,PositionalParams,0}},
-        /* 12:	(cCosh [(cAsinh [x])])
-         *	->	(cPow [(cAdd {(cPow [x 2]) 1}) 0.5])
-         */		 {ProduceNewTree, false, 1,P1(S(149))              , {1,P1(S(6))                , cCosh       ,PositionalParams,0}},
-        /* 13:	(cCosh [(cAbs [x])])
-         *	:	x
-         */		 {ReplaceParams , false, 1,P1(P(14))               , {1,P1(S(0))                , cCosh       ,PositionalParams,0}},
-        /* 14:	(cCosh [(cMul -1 <1>)])
-         *	:	(cMul  <1>)
-         */		 {ReplaceParams , false, 1,P1(S(331))              , {1,P1(S(333))              , cCosh       ,PositionalParams,0}},
-        /* 15:	(cFloor [x@I])
-         *	->	x
-         */		 {ProduceNewTree, false, 1,P1(P(14))               , {1,P1(P(16))               , cFloor      ,PositionalParams,0}},
-        /* 16:	(cFloor [(cMul -1 <1>)])
-         *	->	(cMul {-1 (cCeil [(cMul  <1>)])})
-         */		 {ProduceNewTree, false, 1,P1(S(263))              , {1,P1(S(333))              , cFloor      ,PositionalParams,0}},
-        /* 17:	(cFloor [(cAdd 0.5 <1>)])
-         *	->	(cInt [(cAdd  <1>)])
-         */		 {ProduceNewTree, false, 1,P1(S(46))               , {1,P1(S(246))              , cFloor      ,PositionalParams,0}},
-        /* 18:	(cIf [x 0 y])
-         *	->	(cMul {(cNot [x]) y})
-         */		 {ProduceNewTree, false, 1,P1(S(329))              , {3,P3(P(14),N(4),P(21))    , cIf         ,PositionalParams,0}},
-        /* 19:	(cIf [x@P y z])
-         *	->	(cAbsIf [x y z])
-         */		 {ProduceNewTree, false, 1,P1(S(414))              , {3,P3(P(17),P(21),P(28))   , cIf         ,PositionalParams,0}},
-        /* 20:	(cIf [x 0 y@L])
-         *	->	(cAnd {(cNot [x]) y})
-         */		 {ProduceNewTree, false, 1,P1(S(390))              , {3,P3(P(14),N(4),P(22))    , cIf         ,PositionalParams,0}},
-        /* 21:	(cIf [x 1 y@L])
-         *	->	(cOr {x y})
-         */		 {ProduceNewTree, false, 1,P1(S(392))              , {3,P3(P(14),N(10),P(22))   , cIf         ,PositionalParams,0}},
-        /* 22:	(cIf [x y 0])
-         *	->	(cMul {(cNotNot [x]) y})
-         */		 {ProduceNewTree, false, 1,P1(S(330))              , {3,P3(P(14),P(21),N(4))    , cIf         ,PositionalParams,0}},
-        /* 23:	(cIf [x y@L 0])
-         *	->	(cAnd {x y})
-         */		 {ProduceNewTree, false, 1,P1(S(385))              , {3,P3(P(14),P(22),N(4))    , cIf         ,PositionalParams,0}},
-        /* 24:	(cIf [x y@L 1])
-         *	->	(cOr {(cNot [x]) y})
-         */		 {ProduceNewTree, false, 1,P1(S(397))              , {3,P3(P(14),P(22),N(10))   , cIf         ,PositionalParams,0}},
-        /* 25:	(cIf [(cLess [x y])@D12 y@D8 x@D4])
-         *	->	(cMax [x y])
-         */		 {ProduceNewTree, false, 1,P1(S(57))               , {3,P3(S(372),P(23),P(15))  , cIf         ,PositionalParams,0}},
-        /* 26:	(cIf [(cLess [x y])@D12 x@D4 y@D8])
-         *	->	(cMin [x y])
-         */		 {ProduceNewTree, false, 1,P1(S(60))               , {3,P3(S(372),P(15),P(23))  , cIf         ,PositionalParams,0}},
-        /* 27:	(cIf [(cLess [0 x])@D4 (cFloor [x])@D4 (cCeil [x])@D4])
-         *	->	(cTrunc [x])
-         */		 {ProduceNewTree, false, 1,P1(S(193))              , {3,P3(S(370),S(29),S(12))  , cIf         ,PositionalParams,0}},
-        /* 28:	(cIf [(cLessOrEq [x y]) z a])
-         *	:	(cLess [y x]) a z
-         */		 {ReplaceParams , false, 3,P3(S(371),P(31),P(28))  , {3,P3(S(373),P(28),P(31))  , cIf         ,PositionalParams,0}},
-        /* 29:	@L (cIf [x (cAbsNotNot [y]) z])
-         *	:	x y z
-         */		 {ReplaceParams , true , 3,P3(P(14),P(21),P(28))   , {3,P3(P(14),S(411),P(28))  , cIf         ,PositionalParams,0}},
-        /* 30:	@L (cIf [x y (cAbsNotNot [z])])
-         *	:	x y z
-         */		 {ReplaceParams , true , 3,P3(P(14),P(21),P(28))   , {3,P3(P(14),P(21),S(412))  , cIf         ,PositionalParams,0}},
-        /* 31:	(cInt [x@I])
-         *	->	x
-         */		 {ProduceNewTree, false, 1,P1(P(14))               , {1,P1(P(16))               , cInt        ,PositionalParams,0}},
-        /* 32:	(cLog [(cMul %@P <1>)])
-         *	->	(cAdd {(cLog [(cMul  <1>)]) LOG( % )})
-         */		 {ProduceNewTree, false, 1,P1(S(235))              , {1,P1(S(336))              , cLog        ,PositionalParams,0}},
-        /* 33:	(cLog [(cMul (cPow [% y]) <1>)])
-         *	->	(cAdd {(cMul {LOG( % ) y}) (cLog [(cMul  <1>)])})
-         */		 {ProduceNewTree, false, 1,P1(S(234))              , {1,P1(S(352))              , cLog        ,PositionalParams,0}},
-        /* 34:	(cLog [(cAdd {(cPow [(cAdd {-1 (cPow [x 2])}) 0.5])@D4 x@D4})])
-         *	->	(cAcosh [x])
-         */		 {ProduceNewTree, false, 1,P1(S(4))                , {1,P1(S(230))              , cLog        ,PositionalParams,0}},
-        /* 35:	(cLog [(cMul {(cAdd {1 x})@D4 (cPow [(cAdd {1 (cMul {-1 x})}) -1])@D4})])
-         *	->	(cMul {(cAtanh [x]) 2})
-         */		 {ProduceNewTree, false, 1,P1(S(299))              , {1,P1(S(328))              , cLog        ,PositionalParams,0}},
-        /* 36:	(cMax x@D4 x@D4)
-         *	:	x
-         */		 {ReplaceParams , false, 1,P1(P(14))               , {2,P2(P(15),P(15))         , cMax        ,AnyParams       ,0}},
-        /* 37:	(cMax (cIf [x y z])@D4 (cIf [x a b])@D4)
-         *	:	(cIf [x (cMax [y a]) (cMax [z b])])
-         */		 {ReplaceParams , false, 1,P1(S(39))               , {2,P2(S(32),S(36))         , cMax        ,AnyParams       ,0}},
-        /* 38:	(cMin x@D4 x@D4)
-         *	:	x
-         */		 {ReplaceParams , false, 1,P1(P(14))               , {2,P2(P(15),P(15))         , cMin        ,AnyParams       ,0}},
-        /* 39:	(cMin (cIf [x y z])@D4 (cIf [x a b])@D4)
-         *	:	(cIf [x (cMin [y a]) (cMin [z b])])
-         */		 {ReplaceParams , false, 1,P1(S(40))               , {2,P2(S(32),S(36))         , cMin        ,AnyParams       ,0}},
-        /* 40:	(cPow [(cMul %@P <1>) &])
-         *	->	(cMul {POW( % & ) (cPow [(cMul  <1>) &])})
-         */		 {ProduceNewTree, false, 1,P1(S(322))              , {2,P2(S(336),P(9))         , cPow        ,PositionalParams,0}},
-        /* 41:	(cPow [% (cAdd {(cLog [x]) &})])
-         *	->	(cMul {POW( % & ) (cPow [x LOG( % )])})
-         */		 {ProduceNewTree, false, 1,P1(S(321))              , {2,P2(P(1),S(228))         , cPow        ,PositionalParams,0}},
-        /* 42:	(cPow [(cMul %@N <1>) &@E])
-         *	->	(cMul {POW( % & ) (cPow [(cMul  <1>) &])})
-         */		 {ProduceNewTree, false, 1,P1(S(322))              , {2,P2(S(335),P(10))        , cPow        ,PositionalParams,0}},
-        /* 43:	(cPow [z@D16 (cAdd (cMul (cPow [(cLog [z]) -1]) <2>) <1>)@D16])
-         *	->	(cMul {(cPow [z (cAdd  <1>)]) (cPow [2.71828182846 (cMul  <2>)])})
-         */		 {ProduceNewTree, false, 1,P1(S(319))              , {2,P2(P(29),S(258))        , cPow        ,PositionalParams,0}},
-        /* 44:	(cPow [z@D16 (cAdd (cPow [(cLog [z]) -1]) <1>)@D16])
-         *	->	(cMul {2.71828182846 (cPow [z (cAdd  <1>)])})
-         */		 {ProduceNewTree, false, 1,P1(S(277))              , {2,P2(P(29),S(255))        , cPow        ,PositionalParams,0}},
-        /* 45:	(cPow [% (cAdd &@M <1>)])
-         *	->	(cMul {POW( % & ) (cPow [% (cAdd  <1>)])})
-         */		 {ProduceNewTree, false, 1,P1(S(320))              , {2,P2(P(1),S(249))         , cPow        ,PositionalParams,0}},
-        /* 46:	(cPow [(cPow [x y@O]) z])
-         *	:	x (cMul {y z})
-         */		 {ReplaceParams , false, 2,P2(P(14),S(287))        , {2,P2(S(90),P(28))         , cPow        ,PositionalParams,0}},
-        /* 47:	(cPow [(cPow [x y@F]) z])
-         *	:	x (cMul {y z})
-         */		 {ReplaceParams , false, 2,P2(P(14),S(287))        , {2,P2(S(91),P(28))         , cPow        ,PositionalParams,0}},
-        /* 48:	(cPow [(cPow [x@P y]) z])
-         *	:	x (cMul {y z})
-         */		 {ReplaceParams , false, 2,P2(P(14),S(287))        , {2,P2(S(92),P(28))         , cPow        ,PositionalParams,0}},
-        /* 49:	(cPow [(cPow [x y])@P z])
-         *	:	(cAbs [x]) (cMul {y z})
-         */		 {ReplaceParams , false, 2,P2(S(0),S(287))         , {2,P2(S(93),P(28))         , cPow        ,PositionalParams,0}},
-        /* 50:	(cPow [(cSin [x]) %@N])
-         *	:	(cCsc [x]) -%
-         */		 {ReplaceParams , false, 2,P2(S(28),S(194))        , {2,P2(S(158),P(0))         , cPow        ,PositionalParams,0}},
-        /* 51:	(cPow [(cCos [x]) %@N])
-         *	:	(cSec [x]) -%
-         */		 {ReplaceParams , false, 2,P2(S(157),S(194))       , {2,P2(S(14),P(0))          , cPow        ,PositionalParams,0}},
-        /* 52:	(cPow [(cTan [x]) %@N])
-         *	:	(cCot [x]) -%
-         */		 {ReplaceParams , false, 2,P2(S(27),S(194))        , {2,P2(S(177),P(0))         , cPow        ,PositionalParams,0}},
-        /* 53:	(cPow [% (cLog [x])])
-         *	:	x LOG( % )
-         */		 {ReplaceParams , false, 2,P2(P(14),S(53))         , {2,P2(P(1),S(47))          , cPow        ,PositionalParams,0}},
-        /* 54:	(cPow [% (cMul (cLog [x]) <1>)])
-         *	:	x (cMul LOG( % ) <1>)
-         */		 {ReplaceParams , false, 2,P2(P(14),S(349))        , {2,P2(P(1),S(348))         , cPow        ,PositionalParams,0}},
-        /* 55:	(cPow [z@D16 (cMul (cPow [(cLog [z]) -1]) (cLog [x]) <1>)@D16])
-         *	:	x (cMul  <1>)
-         */		 {ReplaceParams , false, 2,P2(P(14),S(331))        , {2,P2(P(29),S(360))        , cPow        ,PositionalParams,0}},
-        /* 56:	(cPow [%@D1 (cMul /LOG( % ) (cLog [x]) <1>)@D1])
-         *	:	x (cMul  <1>)
-         */		 {ReplaceParams , false, 2,P2(P(14),S(331))        , {2,P2(P(3),S(361))         , cPow        ,PositionalParams,0}},
-        /* 57:	(cPow [(cPow [x y]) z@I])
-         *	:	x (cMul {y z})
-         */		 {ReplaceParams , false, 2,P2(P(14),S(287))        , {2,P2(S(105),P(30))        , cPow        ,PositionalParams,0}},
-        /* 58:	(cPow [(cAbs [x]) y@E])
-         *	:	x y
-         */		 {ReplaceParams , false, 2,P2(P(14),P(21))         , {2,P2(S(0),P(26))          , cPow        ,PositionalParams,0}},
-        /* 59:	(cPow [(cMul (cAbs [x]) <1>) y@E])
-         *	:	(cMul x <1>) y
-         */		 {ReplaceParams , false, 2,P2(S(345),P(21))        , {2,P2(S(347),P(26))        , cPow        ,PositionalParams,0}},
-        /* 60:	(cSin [(cMul -1 <1>)])
-         *	->	(cMul {-1 (cSin [(cMul  <1>)])})
-         */		 {ProduceNewTree, false, 1,P1(S(272))              , {1,P1(S(333))              , cSin        ,PositionalParams,0}},
-        /* 61:	(cSin [(cAdd {1.57079632679 (cMul %@N <1>)})])
-         *	->	(cCos [(cMul -% <1>)])
-         */		 {ProduceNewTree, false, 1,P1(S(21))               , {1,P1(S(214))              , cSin        ,PositionalParams,0}},
-        /* 62:	(cSin [(cAdd -1.57079632679 <1>)])
-         *	->	(cMul {-1 (cCos [(cAdd  <1>)])})
-         */		 {ProduceNewTree, false, 1,P1(S(265))              , {1,P1(S(245))              , cSin        ,PositionalParams,0}},
-        /* 63:	(cSin [(cAsin [x])])
-         *	->	x
-         */		 {ProduceNewTree, false, 1,P1(P(14))               , {1,P1(S(5))                , cSin        ,PositionalParams,0}},
-        /* 64:	(cSinh [(cMul -1 <1>)])
-         *	->	(cMul {-1 (cSinh [(cMul  <1>)])})
-         */		 {ProduceNewTree, false, 1,P1(S(274))              , {1,P1(S(333))              , cSinh       ,PositionalParams,0}},
-        /* 65:	(cSinh [(cAcosh [x])])
-         *	->	(cPow [(cAdd {(cPow [x 2]) -1}) 0.5])
-         */		 {ProduceNewTree, false, 1,P1(S(148))              , {1,P1(S(4))                , cSinh       ,PositionalParams,0}},
-        /* 66:	(cTan [(cMul -1 <1>)])
-         *	->	(cMul {-1 (cTan [(cMul  <1>)])})
-         */		 {ProduceNewTree, false, 1,P1(S(275))              , {1,P1(S(333))              , cTan        ,PositionalParams,0}},
-        /* 67:	(cTan [(cAtan [x])])
-         *	->	x
-         */		 {ProduceNewTree, false, 1,P1(P(14))               , {1,P1(S(8))                , cTan        ,PositionalParams,0}},
-        /* 68:	(cTan [(cAtan2 [x y])])
-         *	->	(cMul {x (cPow [y -1])})
-         */		 {ProduceNewTree, false, 1,P1(S(284))              , {1,P1(S(9))                , cTan        ,PositionalParams,0}},
-        /* 69:	(cTanh [(cMul -1 <1>)])
-         *	->	(cMul {-1 (cTanh [(cMul  <1>)])})
-         */		 {ProduceNewTree, false, 1,P1(S(276))              , {1,P1(S(333))              , cTanh       ,PositionalParams,0}},
-        /* 70:	(cTrunc [x@I])
-         *	->	x
-         */		 {ProduceNewTree, false, 1,P1(P(14))               , {1,P1(P(16))               , cTrunc      ,PositionalParams,0}},
-        /* 71:	(cAdd (cPow [(cAdd {1 (cPow [(cAdd  <1>) 2])}) 0.5]) <1>)
-         *	->	(cPow [2.71828182846 (cAsinh [(cAdd  <1>)])])
-         */		 {ProduceNewTree, false, 1,P1(S(72))               , {1,P1(S(145))              , cAdd        ,AnyParams       ,1}},
-        /* 72:	(cAdd (cPow [(cAdd {1 (cPow [(cAdd  <1>) 2])}) -0.5]) <1>)
-         *	->	(cPow [0.367879441171 (cAsinh [(cAdd  <1>)])])
-         */		 {ProduceNewTree, false, 1,P1(S(71))               , {1,P1(S(144))              , cAdd        ,AnyParams       ,1}},
-        /* 73:	(cAdd (cPow [(cAdd {1 (cPow [x 2])}) 0.5])@D4 x@D4)
-         *	:	(cPow [2.71828182846 (cAsinh [x])])
-         */		 {ReplaceParams , false, 1,P1(S(70))               , {2,P2(S(143),P(15))        , cAdd        ,AnyParams       ,0}},
-        /* 74:	(cAdd (cPow [(cAdd {1 (cPow [x 2])}) -0.5])@D4 x@D4)
-         *	:	(cPow [0.367879441171 (cAsinh [x])])
-         */		 {ReplaceParams , false, 1,P1(S(69))               , {2,P2(S(142),P(15))        , cAdd        ,AnyParams       ,0}},
-        /* 75:	(cAdd (cIf [x y z])@D4 (cIf [x a b])@D4)
-         *	:	(cIf [x (cAdd {y a}) (cAdd {z b})])
-         */		 {ReplaceParams , false, 1,P1(S(41))               , {2,P2(S(32),S(36))         , cAdd        ,AnyParams       ,0}},
-        /* 76:	(cAdd (cLog [x]) (cLog [y]))
-         *	:	(cLog [(cMul {x y})])
-         */		 {ReplaceParams , false, 1,P1(S(51))               , {2,P2(S(47),S(48))         , cAdd        ,AnyParams       ,0}},
-        /* 77:	(cAdd (cMul (cPow [x %@I@P]) <1>)@D4 (cMul (cPow [x &@I]) <2>)@D4)
-         *	:	(cMul {(cPow [x MIN( % & )]) (cAdd {(cMul (cPow [x (cAdd {% -MIN( % & )})]) <1>) (cMul (cPow [x (cAdd {& -MIN( % & )})]) <2>)})})
-         */		 {ReplaceParams , false, 1,P1(S(327))              , {2,P2(S(350),S(351))       , cAdd        ,AnyParams       ,0}},
-        /* 78:	(cAdd (cMul (cPow [x %@I@P]) <1>)@D4 (cMul x <2>)@D4)
-         *	:	(cMul {(cPow [x MIN( % 1 )]) (cAdd {(cMul (cPow [x (cAdd {% -MIN( % 1 )})]) <1>) (cMul (cPow [x (cAdd {1 -MIN( % 1 )})]) <2>)})})
-         */		 {ReplaceParams , false, 1,P1(S(326))              , {2,P2(S(350),S(344))       , cAdd        ,AnyParams       ,0}},
-        /* 79:	(cAdd (cMul %@P <1>)@D1 (cMul -% <2>)@D1)
-         *	:	(cMul {% (cAdd (cMul -1 <2>) <1>)})
-         */		 {ReplaceParams , false, 1,P1(S(282))              , {2,P2(S(337),S(359))       , cAdd        ,AnyParams       ,0}},
-        /* 80:	(cAdd %@M@D1 (cMul -% <2>)@D1)
-         *	:	(cMul {% (cAdd {1 (cMul -1 <2>)})})
-         */		 {ReplaceParams , false, 1,P1(S(281))              , {2,P2(P(5),S(359))         , cAdd        ,AnyParams       ,0}},
-        /* 81:	(cAdd (cPow [(cSin [x]) 2])@D4 (cPow [(cCos [x]) 2])@D4)
-         *	:	1
-         */		 {ReplaceParams , false, 1,P1(N(10))               , {2,P2(S(140),S(117))       , cAdd        ,AnyParams       ,0}},
-        /* 82:	(cAdd 1 (cMul {-1 (cPow [(cSin [x]) 2])}))
-         *	:	(cPow [(cCos [x]) 2])
-         */		 {ReplaceParams , false, 1,P1(S(118))              , {2,P2(N(10),S(270))        , cAdd        ,AnyParams       ,0}},
-        /* 83:	(cAdd 1 (cMul {-1 (cPow [(cCos [x]) 2])}))
-         *	:	(cPow [(cSin [x]) 2])
-         */		 {ReplaceParams , false, 1,P1(S(141))              , {2,P2(N(10),S(269))        , cAdd        ,AnyParams       ,0}},
-        /* 84:	(cAdd (cMul {(cSin [x]) (cCos [y])})@D12 (cMul {(cCos [x]) (cSin [y])})@D12)
-         *	:	(cSin [(cAdd {x y})])
-         */		 {ReplaceParams , false, 1,P1(S(161))              , {2,P2(S(318),S(315))       , cAdd        ,AnyParams       ,0}},
-        /* 85:	(cAdd (cMul {(cSin [x]) (cCos [y])})@D12 (cMul {(cCos [x]) (cSin [y]) -1})@D12)
-         *	:	(cSin [(cAdd {x (cMul {-1 y})})])
-         */		 {ReplaceParams , false, 1,P1(S(162))              , {2,P2(S(318),S(324))       , cAdd        ,AnyParams       ,0}},
-        /* 86:	(cAdd (cMul {(cCos [x]) (cCos [y])})@D12 (cMul {(cSin [x]) (cSin [y])})@D12)
-         *	:	(cCos [(cAdd {x y})])
-         */		 {ReplaceParams , false, 1,P1(S(17))               , {2,P2(S(302),S(323))       , cAdd        ,AnyParams       ,0}},
-        /* 87:	(cAdd (cMul {(cCos [x]) (cCos [y]) -1})@D12 (cMul {(cSin [x]) (cSin [y])})@D12)
-         *	:	(cMul {-1 (cCos [(cAdd {x (cMul {-1 y})})])})
-         */		 {ReplaceParams , false, 1,P1(S(264))              , {2,P2(S(314),S(323))       , cAdd        ,AnyParams       ,0}},
-        /* 88:	(cAdd (cMul {(cCos [x]) (cCos [y])})@D12 (cMul {(cSin [x]) (cSin [y]) -1})@D12)
-         *	:	(cCos [(cAdd {x (cMul {-1 y})})])
-         */		 {ReplaceParams , false, 1,P1(S(18))               , {2,P2(S(302),S(325))       , cAdd        ,AnyParams       ,0}},
-        /* 89:	(cAdd (cPow [& x])@D6 (cMul {-1 (cPow [/& x])})@D6)
-         *	:	(cMul {(cSinh [(cLog [(cPow [& x])])]) 2})
-         */		 {ReplaceParams , false, 1,P1(S(311))              , {2,P2(S(82),S(271))        , cAdd        ,AnyParams       ,0}},
-        /* 90:	(cAdd (cPow [& x])@D6 (cPow [/& x])@D6)
-         *	:	(cMul {(cCosh [(cLog [(cPow [& x])])]) 2})
-         */		 {ReplaceParams , false, 1,P1(S(310))              , {2,P2(S(82),S(154))        , cAdd        ,AnyParams       ,0}},
-        /* 91:	(cAdd (cMul {-1 (cPow [& x])})@D6 (cPow [/& x])@D6)
-         *	:	(cMul {(cSinh [(cMul {x LOG( & )})]) -2})
-         */		 {ReplaceParams , false, 1,P1(S(309))              , {2,P2(S(268),S(154))       , cAdd        ,AnyParams       ,0}},
-        /* 92:	(cAdd (cMul {% (cPow [& x])})@D7 (cMul {-% (cPow [/& x])})@D7)
-         *	:	(cMul {(cSinh [(cMul {x LOG( & )})]) 2 %})
-         */		 {ReplaceParams , false, 1,P1(S(312))              , {2,P2(S(291),S(313))       , cAdd        ,AnyParams       ,0}},
-        /* 93:	(cAdd (cMul {% (cPow [& x])})@D7 (cMul {% (cPow [/& x])})@D7)
-         *	:	(cMul {(cCosh [(cMul {x LOG( & )})]) 2 %})
-         */		 {ReplaceParams , false, 1,P1(S(308))              , {2,P2(S(291),S(292))       , cAdd        ,AnyParams       ,0}},
-        /* 94:	(cAdd (cCosh [x])@D4 (cSinh [x])@D4)
-         *	:	(cPow [2.71828182846 x])
-         */		 {ReplaceParams , false, 1,P1(S(67))               , {2,P2(S(22),S(169))        , cAdd        ,AnyParams       ,0}},
-        /* 95:	(cAdd (cMul {(cCosh [x]) -1})@D4 (cSinh [x])@D4)
-         *	:	(cMul {(cPow [0.367879441171 x]) -1})
-         */		 {ReplaceParams , false, 1,P1(S(304))              , {2,P2(S(297),S(169))       , cAdd        ,AnyParams       ,0}},
-        /* 96:	(cAdd (cCosh [x])@D4 (cMul {(cPow [2.71828182846 x]) -1})@D4)
-         *	:	(cMul {-1 (cSinh [x])})
-         */		 {ReplaceParams , false, 1,P1(S(273))              , {2,P2(S(22),S(306))        , cAdd        ,AnyParams       ,0}},
-        /* 97:	(cAdd (cSinh [x])@D4 (cMul {(cPow [2.71828182846 x]) -1})@D4)
-         *	:	(cMul {-1 (cCosh [x])})
-         */		 {ReplaceParams , false, 1,P1(S(266))              , {2,P2(S(169),S(306))       , cAdd        ,AnyParams       ,0}},
-        /* 98:	(cAdd (cCosh [x])@D4 (cMul {(cSinh [x]) -1})@D4)
-         *	:	(cPow [0.367879441171 x])
-         */		 {ReplaceParams , false, 1,P1(S(65))               , {2,P2(S(22),S(307))        , cAdd        ,AnyParams       ,0}},
-        /* 99:	(cAdd (cMul {(cSinh [x]) -1})@D4 (cPow [2.71828182846 x])@D4)
-         *	:	(cCosh [x])
-         */		 {ReplaceParams , false, 1,P1(S(23))               , {2,P2(S(307),S(68))        , cAdd        ,AnyParams       ,0}},
-        /* 100:	(cAdd (cMul {(cCosh [x]) -1})@D4 (cPow [2.71828182846 x])@D4)
-         *	:	(cSinh [x])
-         */		 {ReplaceParams , false, 1,P1(S(170))              , {2,P2(S(297),S(68))        , cAdd        ,AnyParams       ,0}},
-        /* 101:	(cAdd (cCosh [x])@D4 (cMul {(cPow [0.367879441171 x]) -1})@D4)
-         *	:	(cSinh [x])
-         */		 {ReplaceParams , false, 1,P1(S(170))              , {2,P2(S(22),S(305))        , cAdd        ,AnyParams       ,0}},
-        /* 102:	(cAdd (cSinh [x])@D4 (cPow [0.367879441171 x])@D4)
-         *	:	(cCosh [x])
-         */		 {ReplaceParams , false, 1,P1(S(23))               , {2,P2(S(169),S(66))        , cAdd        ,AnyParams       ,0}},
-        /* 103:	(cAdd (cMul {(cCosh [x]) -1})@D4 (cPow [0.367879441171 x])@D4)
-         *	:	(cMul {-1 (cSinh [x])})
-         */		 {ReplaceParams , false, 1,P1(S(273))              , {2,P2(S(297),S(66))        , cAdd        ,AnyParams       ,0}},
-        /* 104:	(cMul {%@D1 (cAdd {1 (cMul {(cLog [x]) /%})})@D1})
-         *	->	(cAdd {(cLog [x]) %})
-         */		 {ProduceNewTree, false, 1,P1(S(225))              , {2,P2(P(3),S(211))         , cMul        ,SelectedParams  ,0}},
-        /* 105:	(cMul x@L <1>)
-         *	->	(cAbsIf [x (cMul  <1>) 0])
-         */		 {ProduceNewTree, false, 1,P1(S(415))              , {1,P1(P(19))               , cMul        ,AnyParams       ,1}},
-        /* 106:	(cMul 57.2957795131 <1>)
-         *	->	(cDeg [(cMul  <1>)])
-         */		 {ProduceNewTree, false, 1,P1(S(405))              , {1,P1(N(16))               , cMul        ,AnyParams       ,1}},
-        /* 107:	(cMul 0.0174532925199 <1>)
-         *	->	(cRad [(cMul  <1>)])
-         */		 {ProduceNewTree, false, 1,P1(S(406))              , {1,P1(N(5))                , cMul        ,AnyParams       ,1}},
-        /* 108:	(cMul (cPow [(cMul x <2>) -1])@D4 x@D4)
-         *	:	(cPow [(cMul  <2>) -1])
-         */		 {ReplaceParams , false, 1,P1(S(138))              , {2,P2(S(139),P(15))        , cMul        ,AnyParams       ,0}},
-        /* 109:	(cMul (cIf [x y z])@D4 (cIf [x a b])@D4)
-         *	:	(cIf [x (cMul {y a}) (cMul {z b})])
-         */		 {ReplaceParams , false, 1,P1(S(42))               , {2,P2(S(32),S(36))         , cMul        ,AnyParams       ,0}},
-        /* 110:	(cMul (cNot [x]) (cNot [y]))
-         *	:	(cNot [(cOr {x y})])
-         */		 {ReplaceParams , false, 1,P1(S(382))              , {2,P2(S(375),S(376))       , cMul        ,AnyParams       ,0}},
-        /* 111:	(cMul (cNotNot [x]) (cNotNot [y]))
-         *	:	(cAnd {x y})
-         */		 {ReplaceParams , false, 1,P1(S(385))              , {2,P2(S(399),S(400))       , cMul        ,AnyParams       ,0}},
-        /* 112:	(cMul (cNot [x]) (cNotNot [y]))
-         *	:	(cAnd {(cNot [x]) y})
-         */		 {ReplaceParams , false, 1,P1(S(390))              , {2,P2(S(375),S(400))       , cMul        ,AnyParams       ,0}},
-        /* 113:	(cMul (cAbs [x]) (cAbs [y]))
-         *	:	(cAbs [(cMul {x y})])
-         */		 {ReplaceParams , false, 1,P1(S(2))                , {2,P2(S(0),S(1))           , cMul        ,AnyParams       ,0}},
-        /* 114:	(cMul (cAdd (cMul %@M <1>) <2>) &)
-         *	:	(cAdd {(cMul % & <1>) (cMul {& (cAdd  <2>)})})
-         */		 {ReplaceParams , false, 1,P1(S(238))              , {2,P2(S(257),P(9))         , cMul        ,AnyParams       ,0}},
-        /* 115:	(cMul (cAdd %@M <1>) &)
-         *	:	(cAdd {MUL( % & ) (cMul {& (cAdd  <1>)})})
-         */		 {ReplaceParams , false, 1,P1(S(239))              , {2,P2(S(247),P(9))         , cMul        ,AnyParams       ,0}},
-        /* 116:	(cMul (cPow [x y])@D4 (cAdd {%@1 (cPow [x z])})@D4)
-         *	:	(cAdd {(cMul {(cPow [x y]) %}) (cPow [x (cAdd {y z})])})
-         */		 {ReplaceParams , false, 1,P1(S(233))              , {2,P2(S(94),S(217))        , cMul        ,AnyParams       ,0}},
-        /* 117:	(cMul (cPow [& y]) (cAdd {1 (cPow [x@P z])}))
-         *	:	(cAdd {(cPow [& y]) (cPow [& (cAdd {y (cMul {z (cLog [x]) /LOG( & )})})])})
-         */		 {ReplaceParams , false, 1,P1(S(229))              , {2,P2(S(84),S(206))        , cMul        ,AnyParams       ,0}},
-        /* 118:	(cMul (cPow [& y]) (cAdd {-1 (cPow [x@P z])}))
-         *	:	(cAdd {(cMul {(cPow [& y]) -1}) (cPow [& (cAdd {y (cMul {z (cLog [x]) /LOG( & )})})])})
-         */		 {ReplaceParams , false, 1,P1(S(232))              , {2,P2(S(84),S(204))        , cMul        ,AnyParams       ,0}},
-        /* 119:	(cMul -1 (cSin [(cMul %@N <1>)]))
-         *	:	(cSin [(cMul -% <1>)])
-         */		 {ReplaceParams , false, 1,P1(S(168))              , {2,P2(N(2),S(166))         , cMul        ,AnyParams       ,0}},
-        /* 120:	(cMul -1 (cSinh [(cMul %@N <1>)]))
-         *	:	(cSinh [(cMul -% <1>)])
-         */		 {ReplaceParams , false, 1,P1(S(176))              , {2,P2(N(2),S(175))         , cMul        ,AnyParams       ,0}},
-        /* 121:	(cMul (cPow [(cSinh [x]) -1])@D4 (cCosh [x])@D4)
-         *	:	(cPow [(cTanh [x]) -1])
-         */		 {ReplaceParams , false, 1,P1(S(133))              , {2,P2(S(130),S(22))        , cMul        ,AnyParams       ,0}},
-        /* 122:	(cMul (cTanh [x])@D4 (cCosh [x])@D4)
-         *	:	(cSinh [x])
-         */		 {ReplaceParams , false, 1,P1(S(170))              , {2,P2(S(187),S(22))        , cMul        ,AnyParams       ,0}},
-        /* 123:	(cMul (cPow [(cTanh [x]) -1])@D4 (cSinh [x])@D4)
-         *	:	(cCosh [x])
-         */		 {ReplaceParams , false, 1,P1(S(23))               , {2,P2(S(134),S(169))       , cMul        ,AnyParams       ,0}},
-        /* 124:	(cMul (cPow [(cTan [x]) -1])@D4 (cSin [x])@D4)
-         *	:	(cCos [x])
-         */		 {ReplaceParams , false, 1,P1(S(14))               , {2,P2(S(131),S(159))       , cMul        ,AnyParams       ,0}},
-        /* 125:	(cMul (cSin [x])@D4 (cPow [(cCos [x]) -1])@D4)
-         *	:	(cTan [x])
-         */		 {ReplaceParams , false, 1,P1(S(177))              , {2,P2(S(159),S(111))       , cMul        ,AnyParams       ,0}},
-        /* 126:	(cMul (cTan [x])@D4 (cPow [(cSin [x]) -1])@D4)
-         *	:	(cPow [(cCos [x]) -1])
-         */		 {ReplaceParams , false, 1,P1(S(112))              , {2,P2(S(178),S(129))       , cMul        ,AnyParams       ,0}},
-        /* 127:	(cMul (cPow [(cSin [x]) -1])@D4 (cCos [x])@D4)
-         *	:	(cPow [(cTan [x]) -1])
-         */		 {ReplaceParams , false, 1,P1(S(132))              , {2,P2(S(129),S(15))        , cMul        ,AnyParams       ,0}},
-        /* 128:	(cMul (cTan [x])@D4 (cCos [x])@D4)
-         *	:	(cSin [x])
-         */		 {ReplaceParams , false, 1,P1(S(158))              , {2,P2(S(178),S(15))        , cMul        ,AnyParams       ,0}},
-        /* 129:	(cMul (cTan [(cAdd {1.57079632679 (cMul {-1 x})})])@D4 (cTan [x])@D4)
-         *	:	1
-         */		 {ReplaceParams , false, 1,P1(N(10))               , {2,P2(S(179),S(178))       , cMul        ,AnyParams       ,0}},
-        /* 130:	(cMul (cSin [(cMul % <1>)])@D1 (cPow [(cCos [(cMul -% <1>)]) -1])@D1)
-         *	:	(cTan [(cMul % <1>)])
-         */		 {ReplaceParams , false, 1,P1(S(183))              , {2,P2(S(167),S(114))       , cMul        ,AnyParams       ,0}},
-        /* 131:	(cMul (cTan [(cAdd {1.57079632679 (cMul -1 <1>)})]) (cTan [(cMul  <1>)]))
-         *	:	1
-         */		 {ReplaceParams , false, 1,P1(N(10))               , {2,P2(S(180),S(182))       , cMul        ,AnyParams       ,0}},
-        /* 132:	(cMul -1 (cTan [(cMul %@N <1>)]))
-         *	:	(cTan [(cMul -% <1>)])
-         */		 {ReplaceParams , false, 1,P1(S(185))              , {2,P2(N(2),S(184))         , cMul        ,AnyParams       ,0}},
-        /* 133:	(cMul (cSinh [x])@D4 (cPow [(cCosh [x]) -1])@D4)
-         *	:	(cTanh [x])
-         */		 {ReplaceParams , false, 1,P1(S(186))              , {2,P2(S(169),S(115))       , cMul        ,AnyParams       ,0}},
-        /* 134:	(cMul (cTanh [x])@D4 (cPow [(cSinh [x]) -1])@D4)
-         *	:	(cPow [(cCosh [x]) -1])
-         */		 {ReplaceParams , false, 1,P1(S(116))              , {2,P2(S(187),S(130))       , cMul        ,AnyParams       ,0}},
-        /* 135:	(cMul (cSinh [(cMul {% x})])@D5 (cPow [(cCosh [(cMul {-% x})]) -1])@D5)
-         *	:	(cTanh [(cMul {% x})])
-         */		 {ReplaceParams , false, 1,P1(S(188))              , {2,P2(S(172),S(121))       , cMul        ,AnyParams       ,0}},
-        /* 136:	(cMul (cSin [(cMul {% x})])@D5 (cPow [(cCos [(cMul {-% x})]) -1])@D5)
-         *	:	(cTan [(cMul {% x})])
-         */		 {ReplaceParams , false, 1,P1(S(181))              , {2,P2(S(164),S(113))       , cMul        ,AnyParams       ,0}},
-        /* 137:	(cMul -1 (cTanh [(cMul %@N <1>)]))
-         *	:	(cTanh [(cMul -% <1>)])
-         */		 {ReplaceParams , false, 1,P1(S(192))              , {2,P2(N(2),S(191))         , cMul        ,AnyParams       ,0}},
-        /* 138:	(cMul (cAdd {-1 (cPow [% x])})@D5 (cPow [(cAdd {1 (cPow [% x])}) -1])@D5)
-         *	:	(cTanh [(cMul {x LOG( % ) 0.5})])
-         */		 {ReplaceParams , false, 1,P1(S(189))              , {2,P2(S(198),S(137))       , cMul        ,AnyParams       ,0}},
-        /* 139:	(cMul (cAdd {1 (cPow [% x])})@D5 (cPow [(cAdd {-1 (cPow [% x])}) -1])@D5)
-         *	:	(cPow [(cTanh [(cMul {x LOG( % ) 0.5})]) -1])
-         */		 {ReplaceParams , false, 1,P1(S(135))              , {2,P2(S(202),S(136))       , cMul        ,AnyParams       ,0}},
-        /* 140:	(cMul (cLog [x]) 0.434294481903)
-         *	:	(cLog10 [x])
-         */		 {ReplaceParams , false, 1,P1(S(55))               , {2,P2(S(47),N(7))          , cMul        ,AnyParams       ,0}},
-        /* 141:	(cMul (cPow [(cLog [x]) -1]) 2.30258509299)
-         *	:	(cPow [(cLog10 [x]) -1])
-         */		 {ReplaceParams , false, 1,P1(S(124))              , {2,P2(S(122),N(14))        , cMul        ,AnyParams       ,0}},
-        /* 142:	(cMul (cLog [x]) 1.44269504089)
-         *	:	(cLog2 [x])
-         */		 {ReplaceParams , false, 1,P1(S(56))               , {2,P2(S(47),N(11))         , cMul        ,AnyParams       ,0}},
-        /* 143:	(cMul (cPow [(cLog [x]) -1]) 0.69314718056)
-         *	:	(cPow [(cLog2 [x]) -1])
-         */		 {ReplaceParams , false, 1,P1(S(125))              , {2,P2(S(122),N(9))         , cMul        ,AnyParams       ,0}},
-        /* 144:	(cMul (cPow [& y]) (cAdd {(cMul {% (cPow [x@P z])})@D1 %@D1}))
-         *	:	% (cAdd {(cPow [& y]) (cPow [& (cAdd {y (cMul {z (cLog [x]) /LOG( & )})})])})
-         */		 {ReplaceParams , false, 2,P2(P(1),S(229))         , {2,P2(S(84),S(227))        , cMul        ,AnyParams       ,0}},
-        /* 145:	(cMul (cPow [& y]) (cAdd {(cMul {% (cPow [x@P z])})@D1 -%@D1}))
-         *	:	% (cAdd {(cMul {(cPow [& y]) -1}) (cPow [& (cAdd {y (cMul {z (cLog [x]) /LOG( & )})})])})
-         */		 {ReplaceParams , false, 2,P2(P(1),S(232))         , {2,P2(S(84),S(231))        , cMul        ,AnyParams       ,0}},
-        /* 146:	(cMul (cSinh [x])@D4 (cPow [(cCosh [x]) %])@D4)
-         *	:	(cTanh [x]) (cPow [(cCosh [x]) ADD( % 1 )])
-         */		 {ReplaceParams , false, 2,P2(S(186),S(120))       , {2,P2(S(169),S(119))       , cMul        ,AnyParams       ,0}},
-        /* 147:	@L (cMul (cAbs [x]))
-         *	:	x
-         */		 {ReplaceParams , true , 1,P1(P(14))               , {1,P1(S(0))                , cMul        ,AnyParams       ,0}},
-        /* 148:	@L (cMul %@N)
-         *	:	-%
-         */		 {ReplaceParams , true , 1,P1(S(194))              , {1,P1(P(0))                , cMul        ,AnyParams       ,0}},
-        /* 149:	(cEqual [(cAbs [x]) 0])
-         *	:	x 0
-         */		 {ReplaceParams , false, 2,P2(P(14),N(4))          , {2,P2(S(0),N(4))           , cEqual      ,PositionalParams,0}},
-        /* 150:	(cEqual [(cAdd % <1>) &])
-         *	:	(cAdd  <1>) ADD( & -% )
-         */		 {ReplaceParams , false, 2,P2(S(242),S(260))       , {2,P2(S(248),P(9))         , cEqual      ,PositionalParams,0}},
-        /* 151:	(cEqual [(cMul % <1>) &])
-         *	:	(cMul  <1>) MUL( & /% )
-         */		 {ReplaceParams , false, 2,P2(S(331),S(363))       , {2,P2(S(339),P(9))         , cEqual      ,PositionalParams,0}},
-        /* 152:	(cEqual [(cPow [x %]) &])
-         *	:	(cPow [(cPow [x %]) /%]) POW( & /% )
-         */		 {ReplaceParams , false, 2,P2(S(126),S(156))       , {2,P2(S(77),P(9))          , cEqual      ,PositionalParams,0}},
-        /* 153:	(cEqual [(cAdd % <1>) (cAdd & <2>)])
-         *	:	(cAdd  <1>) (cAdd & -% <2>)
-         */		 {ReplaceParams , false, 2,P2(S(242),S(254))       , {2,P2(S(248),S(250))       , cEqual      ,PositionalParams,0}},
-        /* 154:	(cEqual [(cAdd x <1>)@D4 (cAdd x <2>)@D4])
-         *	:	(cAdd  <1>) (cAdd  <2>)
-         */		 {ReplaceParams , false, 2,P2(S(242),S(243))       , {2,P2(S(251),S(252))       , cEqual      ,PositionalParams,0}},
-        /* 155:	(cEqual [(cMul % <1>) (cMul & <2>)])
-         *	:	(cMul  <1>) (cMul & /% <2>)
-         */		 {ReplaceParams , false, 2,P2(S(331),S(342))       , {2,P2(S(339),S(340))       , cEqual      ,PositionalParams,0}},
-        /* 156:	(cEqual [(cPow [%@P x]) &@P])
-         *	:	x MUL( LOG( & ) /LOG( % ) )
-         */		 {ReplaceParams , false, 2,P2(P(14),S(364))        , {2,P2(S(81),P(13))         , cEqual      ,PositionalParams,0}},
-        /* 157:	(cEqual [(cPow [x %@P]) (cPow [y &@P])])
-         *	:	(cPow [(cPow [x %]) /MIN( % & )]) (cPow [(cPow [y &]) /MIN( % & )])
-         */		 {ReplaceParams , false, 2,P2(S(127),S(128))       , {2,P2(S(78),S(79))         , cEqual      ,PositionalParams,0}},
-        /* 158:	(cEqual [(cPow [% x])@D1 (cPow [% y])@D1])
-         *	:	x y
-         */		 {ReplaceParams , false, 2,P2(P(14),P(21))         , {2,P2(S(75),S(76))         , cEqual      ,PositionalParams,0}},
-        /* 159:	(cNEqual [(cAbs [x]) 0])
-         *	:	x 0
-         */		 {ReplaceParams , false, 2,P2(P(14),N(4))          , {2,P2(S(0),N(4))           , cNEqual     ,PositionalParams,0}},
-        /* 160:	(cNEqual [(cAdd % <1>) &])
-         *	:	(cAdd  <1>) ADD( & -% )
-         */		 {ReplaceParams , false, 2,P2(S(242),S(260))       , {2,P2(S(248),P(9))         , cNEqual     ,PositionalParams,0}},
-        /* 161:	(cNEqual [(cMul % <1>) &])
-         *	:	(cMul  <1>) MUL( & /% )
-         */		 {ReplaceParams , false, 2,P2(S(331),S(363))       , {2,P2(S(339),P(9))         , cNEqual     ,PositionalParams,0}},
-        /* 162:	(cNEqual [(cPow [x %]) &])
-         *	:	(cPow [(cPow [x %]) /%]) POW( & /% )
-         */		 {ReplaceParams , false, 2,P2(S(126),S(156))       , {2,P2(S(77),P(9))          , cNEqual     ,PositionalParams,0}},
-        /* 163:	(cNEqual [(cAdd % <1>) (cAdd & <2>)])
-         *	:	(cAdd  <1>) (cAdd & -% <2>)
-         */		 {ReplaceParams , false, 2,P2(S(242),S(254))       , {2,P2(S(248),S(250))       , cNEqual     ,PositionalParams,0}},
-        /* 164:	(cNEqual [(cAdd x <1>)@D4 (cAdd x <2>)@D4])
-         *	:	(cAdd  <1>) (cAdd  <2>)
-         */		 {ReplaceParams , false, 2,P2(S(242),S(243))       , {2,P2(S(251),S(252))       , cNEqual     ,PositionalParams,0}},
-        /* 165:	(cNEqual [(cMul % <1>) (cMul & <2>)])
-         *	:	(cMul  <1>) (cMul & /% <2>)
-         */		 {ReplaceParams , false, 2,P2(S(331),S(342))       , {2,P2(S(339),S(340))       , cNEqual     ,PositionalParams,0}},
-        /* 166:	(cNEqual [(cPow [%@P x]) &@P])
-         *	:	x MUL( LOG( & ) /LOG( % ) )
-         */		 {ReplaceParams , false, 2,P2(P(14),S(364))        , {2,P2(S(81),P(13))         , cNEqual     ,PositionalParams,0}},
-        /* 167:	(cNEqual [(cPow [x %@P]) (cPow [y &@P])])
-         *	:	(cPow [(cPow [x %]) /MIN( % & )]) (cPow [(cPow [y &]) /MIN( % & )])
-         */		 {ReplaceParams , false, 2,P2(S(127),S(128))       , {2,P2(S(78),S(79))         , cNEqual     ,PositionalParams,0}},
-        /* 168:	(cNEqual [(cPow [% x])@D1 (cPow [% y])@D1])
-         *	:	x y
-         */		 {ReplaceParams , false, 2,P2(P(14),P(21))         , {2,P2(S(75),S(76))         , cNEqual     ,PositionalParams,0}},
-        /* 169:	(cLess [x 0.5])
-         *	->	(cAbsNot [x])
-         */		 {ProduceNewTree, false, 1,P1(S(409))              , {2,P2(P(14),N(8))          , cLess       ,PositionalParams,0}},
-        /* 170:	(cLess [(cAbs [x]) %])
-         *	->	(cNot [(cMul {x 0.5 /%})])
-         */		 {ProduceNewTree, false, 1,P1(S(378))              , {2,P2(S(0),P(1))           , cLess       ,PositionalParams,0}},
-        /* 171:	(cLess [(cMul %@P <1>) &])
-         *	:	(cMul  <1>) MUL( & /% )
-         */		 {ReplaceParams , false, 2,P2(S(331),S(363))       , {2,P2(S(336),P(9))         , cLess       ,PositionalParams,0}},
-        /* 172:	(cLess [(cMul %@N <1>) &])
-         *	:	MUL( & /% ) (cMul  <1>)
-         */		 {ReplaceParams , false, 2,P2(S(363),S(331))       , {2,P2(S(335),P(9))         , cLess       ,PositionalParams,0}},
-        /* 173:	(cLess [(cAdd % <1>) &])
-         *	:	(cAdd  <1>) ADD( & -% )
-         */		 {ReplaceParams , false, 2,P2(S(242),S(260))       , {2,P2(S(248),P(9))         , cLess       ,PositionalParams,0}},
-        /* 174:	(cLess [(cPow [x %]) &])
-         *	:	(cPow [(cPow [x %]) /%]) POW( & /% )
-         */		 {ReplaceParams , false, 2,P2(S(126),S(156))       , {2,P2(S(77),P(9))          , cLess       ,PositionalParams,0}},
-        /* 175:	(cLess [(cAdd % <1>) (cAdd & <2>)])
-         *	:	(cAdd  <1>) (cAdd & -% <2>)
-         */		 {ReplaceParams , false, 2,P2(S(242),S(254))       , {2,P2(S(248),S(250))       , cLess       ,PositionalParams,0}},
-        /* 176:	(cLess [(cAdd x <1>)@D4 (cAdd x <2>)@D4])
-         *	:	(cAdd  <1>) (cAdd  <2>)
-         */		 {ReplaceParams , false, 2,P2(S(242),S(243))       , {2,P2(S(251),S(252))       , cLess       ,PositionalParams,0}},
-        /* 177:	(cLess [(cMul %@P <1>) (cMul & <2>)])
-         *	:	(cMul  <1>) (cMul & /% <2>)
-         */		 {ReplaceParams , false, 2,P2(S(331),S(342))       , {2,P2(S(336),S(340))       , cLess       ,PositionalParams,0}},
-        /* 178:	(cLess [(cMul %@N <1>) (cMul & <2>)])
-         *	:	(cMul & /% <2>) (cMul  <1>)
-         */		 {ReplaceParams , false, 2,P2(S(342),S(331))       , {2,P2(S(335),S(340))       , cLess       ,PositionalParams,0}},
-        /* 179:	(cLess [(cPow [%@P x]) &@P])
-         *	:	x MUL( LOG( & ) /LOG( % ) )
-         */		 {ReplaceParams , false, 2,P2(P(14),S(364))        , {2,P2(S(81),P(13))         , cLess       ,PositionalParams,0}},
-        /* 180:	(cLess [(cPow [x %@P]) (cPow [y &@P])])
-         *	:	(cPow [(cPow [x %]) /MIN( % & )]) (cPow [(cPow [y &]) /MIN( % & )])
-         */		 {ReplaceParams , false, 2,P2(S(127),S(128))       , {2,P2(S(78),S(79))         , cLess       ,PositionalParams,0}},
-        /* 181:	(cLess [(cPow [% x])@D1 (cPow [% y])@D1])
-         *	:	x y
-         */		 {ReplaceParams , false, 2,P2(P(14),P(21))         , {2,P2(S(75),S(76))         , cLess       ,PositionalParams,0}},
-        /* 182:	(cLessOrEq [% (cAbs [x])])
-         *	->	(cNotNot [(cMul {x 0.5 /%})])
-         */		 {ProduceNewTree, false, 1,P1(S(403))              , {2,P2(P(1),S(0))           , cLessOrEq   ,PositionalParams,0}},
-        /* 183:	(cLessOrEq [(cMul %@P <1>) &])
-         *	:	(cMul  <1>) MUL( & /% )
-         */		 {ReplaceParams , false, 2,P2(S(331),S(363))       , {2,P2(S(336),P(9))         , cLessOrEq   ,PositionalParams,0}},
-        /* 184:	(cLessOrEq [(cMul %@N <1>) &])
-         *	:	MUL( & /% ) (cMul  <1>)
-         */		 {ReplaceParams , false, 2,P2(S(363),S(331))       , {2,P2(S(335),P(9))         , cLessOrEq   ,PositionalParams,0}},
-        /* 185:	(cLessOrEq [(cAdd % <1>) &])
-         *	:	(cAdd  <1>) ADD( & -% )
-         */		 {ReplaceParams , false, 2,P2(S(242),S(260))       , {2,P2(S(248),P(9))         , cLessOrEq   ,PositionalParams,0}},
-        /* 186:	(cLessOrEq [(cPow [x %]) &])
-         *	:	(cPow [(cPow [x %]) /%]) POW( & /% )
-         */		 {ReplaceParams , false, 2,P2(S(126),S(156))       , {2,P2(S(77),P(9))          , cLessOrEq   ,PositionalParams,0}},
-        /* 187:	(cLessOrEq [(cAdd % <1>) (cAdd & <2>)])
-         *	:	(cAdd  <1>) (cAdd & -% <2>)
-         */		 {ReplaceParams , false, 2,P2(S(242),S(254))       , {2,P2(S(248),S(250))       , cLessOrEq   ,PositionalParams,0}},
-        /* 188:	(cLessOrEq [(cAdd x <1>)@D4 (cAdd x <2>)@D4])
-         *	:	(cAdd  <1>) (cAdd  <2>)
-         */		 {ReplaceParams , false, 2,P2(S(242),S(243))       , {2,P2(S(251),S(252))       , cLessOrEq   ,PositionalParams,0}},
-        /* 189:	(cLessOrEq [(cMul %@P <1>) (cMul & <2>)])
-         *	:	(cMul  <1>) (cMul & /% <2>)
-         */		 {ReplaceParams , false, 2,P2(S(331),S(342))       , {2,P2(S(336),S(340))       , cLessOrEq   ,PositionalParams,0}},
-        /* 190:	(cLessOrEq [(cMul %@N <1>) (cMul & <2>)])
-         *	:	(cMul & /% <2>) (cMul  <1>)
-         */		 {ReplaceParams , false, 2,P2(S(342),S(331))       , {2,P2(S(335),S(340))       , cLessOrEq   ,PositionalParams,0}},
-        /* 191:	(cLessOrEq [(cPow [%@P x]) &@P])
-         *	:	x MUL( LOG( & ) /LOG( % ) )
-         */		 {ReplaceParams , false, 2,P2(P(14),S(364))        , {2,P2(S(81),P(13))         , cLessOrEq   ,PositionalParams,0}},
-        /* 192:	(cLessOrEq [(cPow [x %@P]) (cPow [y &@P])])
-         *	:	(cPow [(cPow [x %]) /MIN( % & )]) (cPow [(cPow [y &]) /MIN( % & )])
-         */		 {ReplaceParams , false, 2,P2(S(127),S(128))       , {2,P2(S(78),S(79))         , cLessOrEq   ,PositionalParams,0}},
-        /* 193:	(cLessOrEq [(cPow [% x])@D1 (cPow [% y])@D1])
-         *	:	x y
-         */		 {ReplaceParams , false, 2,P2(P(14),P(21))         , {2,P2(S(75),S(76))         , cLessOrEq   ,PositionalParams,0}},
-        /* 194:	(cGreater [(cMul %@P <1>) &])
-         *	:	(cMul  <1>) MUL( & /% )
-         */		 {ReplaceParams , false, 2,P2(S(331),S(363))       , {2,P2(S(336),P(9))         , cGreater    ,PositionalParams,0}},
-        /* 195:	(cGreater [(cMul %@N <1>) &])
-         *	:	MUL( & /% ) (cMul  <1>)
-         */		 {ReplaceParams , false, 2,P2(S(363),S(331))       , {2,P2(S(335),P(9))         , cGreater    ,PositionalParams,0}},
-        /* 196:	(cGreater [(cAdd % <1>) &])
-         *	:	(cAdd  <1>) ADD( & -% )
-         */		 {ReplaceParams , false, 2,P2(S(242),S(260))       , {2,P2(S(248),P(9))         , cGreater    ,PositionalParams,0}},
-        /* 197:	(cGreater [(cPow [x %]) &])
-         *	:	(cPow [(cPow [x %]) /%]) POW( & /% )
-         */		 {ReplaceParams , false, 2,P2(S(126),S(156))       , {2,P2(S(77),P(9))          , cGreater    ,PositionalParams,0}},
-        /* 198:	(cGreater [(cAdd % <1>) (cAdd & <2>)])
-         *	:	(cAdd  <1>) (cAdd & -% <2>)
-         */		 {ReplaceParams , false, 2,P2(S(242),S(254))       , {2,P2(S(248),S(250))       , cGreater    ,PositionalParams,0}},
-        /* 199:	(cGreater [(cAdd x <1>)@D4 (cAdd x <2>)@D4])
-         *	:	(cAdd  <1>) (cAdd  <2>)
-         */		 {ReplaceParams , false, 2,P2(S(242),S(243))       , {2,P2(S(251),S(252))       , cGreater    ,PositionalParams,0}},
-        /* 200:	(cGreater [(cMul %@P <1>) (cMul & <2>)])
-         *	:	(cMul  <1>) (cMul & /% <2>)
-         */		 {ReplaceParams , false, 2,P2(S(331),S(342))       , {2,P2(S(336),S(340))       , cGreater    ,PositionalParams,0}},
-        /* 201:	(cGreater [(cMul %@N <1>) (cMul & <2>)])
-         *	:	(cMul & /% <2>) (cMul  <1>)
-         */		 {ReplaceParams , false, 2,P2(S(342),S(331))       , {2,P2(S(335),S(340))       , cGreater    ,PositionalParams,0}},
-        /* 202:	(cGreater [(cPow [%@P x]) &@P])
-         *	:	x MUL( LOG( & ) /LOG( % ) )
-         */		 {ReplaceParams , false, 2,P2(P(14),S(364))        , {2,P2(S(81),P(13))         , cGreater    ,PositionalParams,0}},
-        /* 203:	(cGreater [(cPow [x %@P]) (cPow [y &@P])])
-         *	:	(cPow [(cPow [x %]) /MIN( % & )]) (cPow [(cPow [y &]) /MIN( % & )])
-         */		 {ReplaceParams , false, 2,P2(S(127),S(128))       , {2,P2(S(78),S(79))         , cGreater    ,PositionalParams,0}},
-        /* 204:	(cGreater [(cPow [% x])@D1 (cPow [% y])@D1])
-         *	:	x y
-         */		 {ReplaceParams , false, 2,P2(P(14),P(21))         , {2,P2(S(75),S(76))         , cGreater    ,PositionalParams,0}},
-        /* 205:	(cGreaterOrEq [x 0.5])
-         *	->	(cAbsNotNot [x])
-         */		 {ProduceNewTree, false, 1,P1(S(410))              , {2,P2(P(14),N(8))          , cGreaterOrEq,PositionalParams,0}},
-        /* 206:	(cGreaterOrEq [(cMul %@P <1>) &])
-         *	:	(cMul  <1>) MUL( & /% )
-         */		 {ReplaceParams , false, 2,P2(S(331),S(363))       , {2,P2(S(336),P(9))         , cGreaterOrEq,PositionalParams,0}},
-        /* 207:	(cGreaterOrEq [(cMul %@N <1>) &])
-         *	:	MUL( & /% ) (cMul  <1>)
-         */		 {ReplaceParams , false, 2,P2(S(363),S(331))       , {2,P2(S(335),P(9))         , cGreaterOrEq,PositionalParams,0}},
-        /* 208:	(cGreaterOrEq [(cAdd % <1>) &])
-         *	:	(cAdd  <1>) ADD( & -% )
-         */		 {ReplaceParams , false, 2,P2(S(242),S(260))       , {2,P2(S(248),P(9))         , cGreaterOrEq,PositionalParams,0}},
-        /* 209:	(cGreaterOrEq [(cPow [x %]) &])
-         *	:	(cPow [(cPow [x %]) /%]) POW( & /% )
-         */		 {ReplaceParams , false, 2,P2(S(126),S(156))       , {2,P2(S(77),P(9))          , cGreaterOrEq,PositionalParams,0}},
-        /* 210:	(cGreaterOrEq [(cAdd % <1>) (cAdd & <2>)])
-         *	:	(cAdd  <1>) (cAdd & -% <2>)
-         */		 {ReplaceParams , false, 2,P2(S(242),S(254))       , {2,P2(S(248),S(250))       , cGreaterOrEq,PositionalParams,0}},
-        /* 211:	(cGreaterOrEq [(cAdd x <1>)@D4 (cAdd x <2>)@D4])
-         *	:	(cAdd  <1>) (cAdd  <2>)
-         */		 {ReplaceParams , false, 2,P2(S(242),S(243))       , {2,P2(S(251),S(252))       , cGreaterOrEq,PositionalParams,0}},
-        /* 212:	(cGreaterOrEq [(cMul %@P <1>) (cMul & <2>)])
-         *	:	(cMul  <1>) (cMul & /% <2>)
-         */		 {ReplaceParams , false, 2,P2(S(331),S(342))       , {2,P2(S(336),S(340))       , cGreaterOrEq,PositionalParams,0}},
-        /* 213:	(cGreaterOrEq [(cMul %@N <1>) (cMul & <2>)])
-         *	:	(cMul & /% <2>) (cMul  <1>)
-         */		 {ReplaceParams , false, 2,P2(S(342),S(331))       , {2,P2(S(335),S(340))       , cGreaterOrEq,PositionalParams,0}},
-        /* 214:	(cGreaterOrEq [(cPow [%@P x]) &@P])
-         *	:	x MUL( LOG( & ) /LOG( % ) )
-         */		 {ReplaceParams , false, 2,P2(P(14),S(364))        , {2,P2(S(81),P(13))         , cGreaterOrEq,PositionalParams,0}},
-        /* 215:	(cGreaterOrEq [(cPow [x %@P]) (cPow [y &@P])])
-         *	:	(cPow [(cPow [x %]) /MIN( % & )]) (cPow [(cPow [y &]) /MIN( % & )])
-         */		 {ReplaceParams , false, 2,P2(S(127),S(128))       , {2,P2(S(78),S(79))         , cGreaterOrEq,PositionalParams,0}},
-        /* 216:	(cGreaterOrEq [(cPow [% x])@D1 (cPow [% y])@D1])
-         *	:	x y
-         */		 {ReplaceParams , false, 2,P2(P(14),P(21))         , {2,P2(S(75),S(76))         , cGreaterOrEq,PositionalParams,0}},
-        /* 217:	(cNot [x@P])
-         *	->	(cAbsNot [x])
-         */		 {ProduceNewTree, false, 1,P1(S(409))              , {1,P1(P(17))               , cNot        ,PositionalParams,0}},
-        /* 218:	(cAnd x@L <1>)
-         *	->	(cNotNot [(cMul {x (cAnd  <1>)})])
-         */		 {ProduceNewTree, false, 1,P1(S(404))              , {1,P1(P(19))               , cAnd        ,AnyParams       ,1}},
-        /* 219:	(cAnd x@P y@P <1>)
-         *	->	(cAbsAnd {x y (cAnd  <1>)})
-         */		 {ProduceNewTree, false, 1,P1(S(407))              , {2,P2(P(17),P(27))         , cAnd        ,AnyParams       ,1}},
-        /* 220:	(cAnd x y)
-         *	->	(cIf [x (cNotNot [y]) 0])
-         */		 {ProduceNewTree, false, 1,P1(S(45))               , {2,P2(P(14),P(21))         , cAnd        ,AnyParams       ,0}},
-        /* 221:	(cAnd (cIf [x y z])@D4 (cIf [x a b])@D4)
-         *	:	(cIf [x (cAnd {y a}) (cAnd {z b})])
-         */		 {ReplaceParams , false, 1,P1(S(43))               , {2,P2(S(32),S(36))         , cAnd        ,AnyParams       ,0}},
-        /* 222:	(cAnd (cNot [x]) (cNot [y]))
-         *	:	(cNot [(cOr {x y})])
-         */		 {ReplaceParams , false, 1,P1(S(382))              , {2,P2(S(375),S(376))       , cAnd        ,AnyParams       ,0}},
-        /* 223:	(cAnd (cNot [z]) (cIf [x (cNot [y]) %@L]))
-         *	:	(cNot [(cOr {z (cIf [x y (cNot [%])])})])
-         */		 {ReplaceParams , false, 1,P1(S(383))              , {2,P2(S(377),S(38))        , cAnd        ,AnyParams       ,0}},
-        /* 224:	(cAnd (cNot [z]) (cIf [x %@L (cNot [y])]))
-         *	:	(cNot [(cOr {z (cIf [x (cNot [%]) y])})])
-         */		 {ReplaceParams , false, 1,P1(S(384))              , {2,P2(S(377),S(34))        , cAnd        ,AnyParams       ,0}},
-        /* 225:	(cAnd (cEqual [x y])@D12 (cEqual [y z])@D24 (cEqual [x z])@D20)
-         *	:	(cEqual [x y]) (cEqual [y z])
-         */		 {ReplaceParams , false, 2,P2(S(366),S(369))       , {3,P3(S(365),S(368),S(367)), cAnd        ,AnyParams       ,0}},
-        /* 226:	(cOr x@P y@P <1>)
-         *	->	(cAbsOr {x y (cOr  <1>)})
-         */		 {ProduceNewTree, false, 1,P1(S(408))              , {2,P2(P(17),P(27))         , cOr         ,AnyParams       ,1}},
-        /* 227:	(cOr x y)
-         *	->	(cIf [x 1 (cNotNot [y])])
-         */		 {ProduceNewTree, false, 1,P1(S(31))               , {2,P2(P(14),P(21))         , cOr         ,AnyParams       ,0}},
-        /* 228:	(cOr x@L y@L)
-         *	:	(cNotNot [(cAdd {x y})])
-         */		 {ReplaceParams , false, 1,P1(S(401))              , {2,P2(P(19),P(22))         , cOr         ,AnyParams       ,0}},
-        /* 229:	(cOr (cIf [x y z])@D4 (cIf [x a b])@D4)
-         *	:	(cIf [x (cOr {y a}) (cOr {z b})])
-         */		 {ReplaceParams , false, 1,P1(S(44))               , {2,P2(S(32),S(36))         , cOr         ,AnyParams       ,0}},
-        /* 230:	(cOr (cNot [x]) (cNot [y]))
-         *	:	(cNot [(cAnd {x y})])
-         */		 {ReplaceParams , false, 1,P1(S(379))              , {2,P2(S(375),S(376))       , cOr         ,AnyParams       ,0}},
-        /* 231:	(cOr (cNot [z]) (cIf [x (cNot [y]) %@L]))
-         *	:	(cNot [(cAnd {z (cIf [x y (cNot [%])])})])
-         */		 {ReplaceParams , false, 1,P1(S(380))              , {2,P2(S(377),S(38))        , cOr         ,AnyParams       ,0}},
-        /* 232:	(cOr (cNot [z]) (cIf [x %@L (cNot [y])]))
-         *	:	(cNot [(cAnd {z (cIf [x (cNot [%]) y])})])
-         */		 {ReplaceParams , false, 1,P1(S(381))              , {2,P2(S(377),S(34))        , cOr         ,AnyParams       ,0}},
-        /* 233:	(cOr x@L (cAdd  <1>)@P)
-         *	:	(cNotNot [(cAdd x <1>)])
-         */		 {ReplaceParams , false, 1,P1(S(402))              , {2,P2(P(19),S(244))        , cOr         ,AnyParams       ,0}},
-        /* 234:	(cNotNot [x@P])
-         *	->	(cAbsNotNot [x])
-         */		 {ProduceNewTree, false, 1,P1(S(410))              , {1,P1(P(17))               , cNotNot     ,PositionalParams,0}},
-        /* 235:	@L (cNotNot [x])
-         *	->	x
-         */		 {ProduceNewTree, true , 1,P1(P(14))               , {1,P1(P(14))               , cNotNot     ,PositionalParams,0}},
-        /* 236:	(cAbsAnd x y)
-         *	->	(cAbsIf [x (cAbsNotNot [y]) 0])
-         */		 {ProduceNewTree, false, 1,P1(S(416))              , {2,P2(P(14),P(21))         , cAbsAnd     ,AnyParams       ,0}},
-        /* 237:	(cAbsOr x y)
-         *	->	(cAbsIf [x 1 (cAbsNotNot [y])])
-         */		 {ProduceNewTree, false, 1,P1(S(413))              , {2,P2(P(14),P(21))         , cAbsOr      ,AnyParams       ,0}},
-        /* 238:	@L (cAbsNotNot [x])
-         *	->	x
-         */		 {ProduceNewTree, true , 1,P1(P(14))               , {1,P1(P(14))               , cAbsNotNot  ,PositionalParams,0}},
-        /* 239:	(cAbsIf [(cNotNot [x]) y z])
-         *	->	(cIf [x y z])
-         */		 {ProduceNewTree, false, 1,P1(S(33))               , {3,P3(S(399),P(21),P(28))  , cAbsIf      ,PositionalParams,0}},
-        /* 240:	(cAbsIf [(cLessOrEq [x y]) z a])
-         *	:	(cLess [y x]) a z
-         */		 {ReplaceParams , false, 3,P3(S(371),P(31),P(28))  , {3,P3(S(373),P(28),P(31))  , cAbsIf      ,PositionalParams,0}},
-    };
-#undef P
-#undef N
-#undef S
-
-    struct grammar_optimize_abslogical_type
-    {
-        unsigned c;
-        unsigned char l[12];
-    };
-    extern "C"
-    {
-        grammar_optimize_abslogical_type grammar_optimize_abslogical =
-        {
-            12,
-            { 19,29,30,169,205,217,219,226,234,238,
-              239,240
-    }   };  }
-    struct grammar_optimize_ignore_if_sideeffects_type
-    {
-        unsigned c;
-        unsigned char l[34];
-    };
-    extern "C"
-    {
-        grammar_optimize_ignore_if_sideeffects_type grammar_optimize_ignore_if_sideeffects =
-        {
-            34,
-            { 0,18,20,21,22,23,24,25,26,27,
-              28,37,39,75,109,110,111,112,147,148,
-              149,159,170,182,221,222,223,224,225,229,
-              230,231,232,235
-    }   };  }
-    struct grammar_optimize_nonshortcut_logical_evaluation_type
-    {
-        unsigned c;
-        unsigned char l[31];
-    };
-    extern "C"
-    {
-        grammar_optimize_nonshortcut_logical_evaluation_type grammar_optimize_nonshortcut_logical_evaluation =
-        {
-            31,
-            { 0,25,26,27,28,37,39,75,109,110,
-              111,112,147,148,149,159,170,182,218,221,
-              222,223,224,225,228,229,230,231,232,233,
-              235
-    }   };  }
-    struct grammar_optimize_round1_type
-    {
-        unsigned c;
-        unsigned char l[92];
-    };
-    extern "C"
-    {
-        grammar_optimize_round1_type grammar_optimize_round1 =
-        {
-            92,
-            { 0,1,2,3,4,5,6,7,8,9,
-              10,11,15,16,25,26,27,28,31,32,
-              33,36,37,38,39,40,41,42,43,44,
-              45,46,47,48,49,53,54,55,56,57,
-              58,59,60,61,62,63,70,75,76,77,
-              78,79,80,81,82,83,84,85,86,87,
-              88,104,108,109,110,111,112,113,114,115,
-              116,117,118,119,144,145,147,148,149,159,
-              170,182,221,222,223,224,225,229,230,231,
-              232,235
-    }   };  }
-    struct grammar_optimize_round2_type
-    {
-        unsigned c;
-        unsigned char l[81];
-    };
-    extern "C"
-    {
-        grammar_optimize_round2_type grammar_optimize_round2 =
-        {
-            81,
-            { 0,5,12,13,14,15,25,26,27,28,
-              31,34,35,36,37,38,39,40,42,43,
-              44,45,46,47,48,49,57,58,59,64,
-              65,70,71,72,73,74,75,89,90,91,
-              92,93,94,95,96,97,98,99,100,101,
-              102,103,108,109,110,111,112,113,116,117,
-              118,120,144,145,146,147,148,149,159,170,
-              182,221,222,223,224,225,229,230,231,232,
-              235
-    }   };  }
-    struct grammar_optimize_round3_type
-    {
-        unsigned c;
-        unsigned char l[85];
-    };
-    extern "C"
-    {
-        grammar_optimize_round3_type grammar_optimize_round3 =
-        {
-            85,
-            { 66,67,68,69,121,122,123,124,125,126,
-              127,128,129,130,131,132,133,134,135,136,
-              137,138,139,150,151,152,153,154,155,156,
-              157,158,160,161,162,163,164,165,166,167,
-              168,171,172,173,174,175,176,177,178,179,
-              180,181,183,184,185,186,187,188,189,190,
-              191,192,193,194,195,196,197,198,199,200,
-              201,202,203,204,206,207,208,209,210,211,
-              212,213,214,215,216
-    }   };  }
-    struct grammar_optimize_round4_type
-    {
-        unsigned c;
-        unsigned char l[10];
-    };
-    extern "C"
-    {
-        grammar_optimize_round4_type grammar_optimize_round4 =
-        {
-            10,
-            { 17,50,51,52,106,107,140,141,142,143
-    }   };  }
-    struct grammar_optimize_shortcut_logical_evaluation_type
-    {
-        unsigned c;
-        unsigned char l[33];
-    };
-    extern "C"
-    {
-        grammar_optimize_shortcut_logical_evaluation_type grammar_optimize_shortcut_logical_evaluation =
-        {
-            33,
-            { 0,25,26,27,28,37,39,75,105,109,
-              110,111,112,147,148,149,159,170,182,220,
-              221,222,223,224,225,227,229,230,231,232,
-              235,236,237
-    }   };  }
-}
-#undef P1
-#undef P2
-#undef P3
-
-namespace FPoptimizer_Grammar
-{
-    ParamSpec ParamSpec_Extract(unsigned paramlist, unsigned index)
-    {
-        index = (paramlist >> (index * PARAM_INDEX_BITS)) % (1 << PARAM_INDEX_BITS);
-        const unsigned p_begin = 0;
-        const unsigned n_begin = p_begin + sizeof(plist.plist_p)/sizeof(*plist.plist_p);
-        const unsigned s_begin = n_begin + sizeof(plist.plist_n)/sizeof(*plist.plist_n);
-      /*const unsigned     end = s_begin + sizeof(plist.plist_s)/sizeof(*plist.plist_s);*/
-        if(index < s_begin)
-        {
-            if(index < n_begin)
-                return ParamSpec(ParamHolder,(const void*)&plist.plist_p[index-p_begin]);
-            else
-                return ParamSpec(NumConstant,(const void*)&plist.plist_n[index-n_begin]);
-        }
-        else
-            return ParamSpec(SubFunction,(const void*)&plist.plist_s[index-s_begin]);
-    }
-}
-
-#line 1 "fpoptimizer/fpoptimizer_optimize.c"
-#include "fpconfig.h"
-#include "fparser.h"
-#include "fptypes.h"
-
-#ifdef FP_SUPPORT_OPTIMIZER
-
-// line removed for fpoptimizer.c: #include "fpoptimizer_grammar.h"
-// line removed for fpoptimizer.c: #include "fpoptimizer_consts.h"
-// line removed for fpoptimizer.c: #include "fpoptimizer_opcodename.h"
-// line removed for fpoptimizer.c: #include "fpoptimizer_optimize.h"
-
-#include <stdio.h>
-
-#include <algorithm>
-#include <map>
-#include <sstream>
-
-using namespace FUNCTIONPARSERTYPES;
-using namespace FPoptimizer_Grammar;
-using namespace FPoptimizer_CodeTree;
-using namespace FPoptimizer_Optimize;
-
-namespace
-{
-    /* I have heard that std::equal_range() is practically worthless
-     * due to the insane limitation that the two parameters for Comp() must
-     * be of the same type. Hence we must reinvent the wheel and implement
-     * our own here. This is practically identical to the one from
-     * GNU libstdc++, except rewritten. -Bisqwit
-     */
-    template<typename It, typename T, typename Comp>
-    std::pair<It, It>
-    MyEqualRange(It first, It last, const T& val, Comp comp)
-    {
-        size_t len = last-first;
-        while(len > 0)
-        {
-            size_t half = len/2;
-            It middle(first); middle += half;
-            if(comp(*middle, val))
-            {
-                first = middle;
-                ++first;
-                len = len - half - 1;
-            }
-            else if(comp(val, *middle))
-            {
-                len = half;
-            }
-            else
-            {
-                // The following implements this:
-                // // left = lower_bound(first, middle, val, comp);
-                It left(first);
-              {///
-                It& first2 = left;
-                It last2(middle);
-                size_t len2 = last2-first2;
-                while(len2 > 0)
-                {
-                    size_t half2 = len2 / 2;
-                    It middle2(first2); middle2 += half2;
-                    if(comp(*middle2, val))
-                    {
-                        first2 = middle2;
-                        ++first2;
-                        len2 = len2 - half2 - 1;
-                    }
-                    else
-                        len2 = half2;
-                }
-                // left = first2;  - not needed, already happens due to reference
-              }///
-                first += len;
-                // The following implements this:
-                // // right = upper_bound(++middle, first, val, comp);
-                It right(++middle);
-              {///
-                It& first2 = right;
-                It& last2 = first;
-                size_t len2 = last2-first2;
-                while(len2 > 0)
-                {
-                    size_t half2 = len2 / 2;
-                    It middle2(first2); middle2 += half2;
-                    if(comp(val, *middle2))
-                        len2 = half2;
-                    else
-                    {
-                        first2 = middle2;
-                        ++first2;
-                        len2 = len2 - half2 - 1;
-                    }
-                }
-                // right = first2;  - not needed, already happens due to reference
-              }///
-                return std::pair<It,It> (left,right);
-            }
-        }
-        return std::pair<It,It> (first,first);
-    }
-
-    /* A helper for std::equal_range */
-    struct OpcodeRuleCompare
-    {
-        bool operator() (const CodeTree& tree,
-                         unsigned rulenumber) const
-        {
-            /* If this function returns true, len=half.
-             */
-            const Rule& rule = grammar_rules[rulenumber];
-            return tree.GetOpcode() < rule.match_tree.subfunc_opcode;
-        }
-        bool operator() (unsigned rulenumber,
-                         const CodeTree& tree) const
-        {
-            /* If this function returns true, rule will be excluded from the equal_range
-             */
-            const Rule& rule = grammar_rules[rulenumber];
-            return rule.match_tree.subfunc_opcode < tree.GetOpcode();
-        }
-    };
-
-    /* Test and apply a rule to a given CodeTree */
-    bool TestRuleAndApplyIfMatch(
-        const Rule& rule,
-        CodeTree& tree,
-        bool from_logical_context)
-    {
-        MatchInfo info;
-
-        MatchResultType found(false, MatchPositionSpecBaseP());
-
-        if(rule.logical_context && !from_logical_context)
-        {
-            /* If the rule only applies in logical contexts,
-             * but we do not have a logical context, fail the rule
-             */
-            goto fail;
-        }
-
-        /*std::cout << "TESTING: ";
-        DumpMatch(rule, *tree, info, false);*/
-
-        for(;;)
-        {
-        #ifdef DEBUG_SUBSTITUTIONS
-            //DumpMatch(rule, tree, info, "Testing");
-        #endif
-            found = TestParams(rule.match_tree, tree, found.specs, info, true);
-            if(found.found) break;
-            if(!&*found.specs)
-            {
-            fail:;
-                // Did not match
-        #ifdef DEBUG_SUBSTITUTIONS
-                DumpMatch(rule, tree, info, false);
-        #endif
-                return false;
-            }
-        }
-        // Matched
-    #ifdef DEBUG_SUBSTITUTIONS
-        DumpMatch(rule, tree, info, true);
-    #endif
-        SynthesizeRule(rule, tree, info);
-        return true;
-    }
-}
-
-namespace FPoptimizer_Optimize
-{
-    /* Apply the grammar to a given CodeTree */
-    bool ApplyGrammar(
-        const Grammar& grammar,
-        CodeTree& tree,
-        bool from_logical_context)
-    {
-        if(tree.GetOptimizedUsing() == &grammar)
-        {
-#ifdef DEBUG_SUBSTITUTIONS
-            std::cout << "Already optimized:  ";
-            DumpTree(tree);
-            std::cout << "\n" << std::flush;
-#endif
-            return false;
-        }
-
-        /* First optimize all children */
-        if(true)
-        {
-            bool changed = false;
-
-            switch(tree.GetOpcode())
-            {
-                case cNot:
-                case cNotNot:
-                case cAnd:
-                case cOr:
-                    for(size_t a=0; a<tree.GetParamCount(); ++a)
-                        if(ApplyGrammar( grammar, tree.GetParam(a), true))
-                            changed = true;
-                    break;
-                case cIf:
-                case cAbsIf:
-                    if(ApplyGrammar( grammar, tree.GetParam(0), tree.GetOpcode() == cIf))
-                        changed = true;
-                    for(size_t a=1; a<tree.GetParamCount(); ++a)
-                        if(ApplyGrammar( grammar, tree.GetParam(a), from_logical_context))
-                            changed = true;
-                    break;
-                default:
-                    for(size_t a=0; a<tree.GetParamCount(); ++a)
-                        if(ApplyGrammar( grammar, tree.GetParam(a), false))
-                            changed = true;
-            }
-
-            if(changed)
-            {
-                // Give the parent node a rerun at optimization
-                tree.Mark_Incompletely_Hashed();
-                return true;
-            }
-        }
-
-        /* Figure out which rules _may_ match this tree */
-        typedef const unsigned char* rulenumit;
-
-        std::pair<rulenumit, rulenumit> range =
-            MyEqualRange(grammar.rule_list,
-                         grammar.rule_list + grammar.rule_count,
-                         tree,
-                         OpcodeRuleCompare());
-
-        if(range.first != range.second)
-        {
-#ifdef DEBUG_SUBSTITUTIONS
-            std::vector<unsigned char> rules;
-            rules.reserve(range.second - range.first);
-            for(rulenumit r = range.first; r != range.second; ++r)
-            {
-                //if(grammar_rules[*r].match_tree.subfunc_opcode != tree.GetOpcode()) continue;
-                if(IsLogisticallyPlausibleParamsMatch(grammar_rules[*r].match_tree, tree))
-                    rules.push_back(*r);
-            }
-            range.first = &rules[0];
-            range.second = &rules[rules.size()-1]+1;
-
-            if(range.first != range.second)
-            {
-                std::cout << "Input (" << FP_GetOpcodeName(tree.GetOpcode())
-                          << ")[" << tree.GetParamCount()
-                          << "]";
-                if(from_logical_context)
-                    std::cout << "(Logical)";
-
-                unsigned first=~unsigned(0), prev=~unsigned(0);
-                const char* sep = ", rules ";
-                for(rulenumit r = range.first; r != range.second; ++r)
-                {
-                    if(first==~unsigned(0)) first=prev=*r;
-                    else if(*r == prev+1) prev=*r;
-                    else
-                    {
-                        std::cout << sep << first; sep=",";
-                        if(prev != first) std::cout << '-' << prev;
-                        first = prev = *r;
-                    }
-                }
-                if(first != ~unsigned(0))
-                {
-                    std::cout << sep << first;
-                    if(prev != first) std::cout << '-' << prev;
-                }
-                std::cout << ": ";
-                DumpTree(tree);
-                std::cout << "\n" << std::flush;
-            }
-#endif
-
-            bool changed = false;
-
-            for(rulenumit r = range.first; r != range.second; ++r)
-            {
-            #ifndef DEBUG_SUBSTITUTIONS
-                if(!IsLogisticallyPlausibleParamsMatch(grammar_rules[*r].match_tree, tree))
-                    continue;
-            #endif
-                if(TestRuleAndApplyIfMatch(grammar_rules[*r], tree, from_logical_context))
-                {
-                    changed = true;
-                    break;
-                }
-            }
-
-            if(changed)
-            {
-    #ifdef DEBUG_SUBSTITUTIONS
-                std::cout << "Changed." << std::endl;
-                std::cout << "Output: ";
-                DumpTree(tree);
-                std::cout << "\n" << std::flush;
-    #endif
-                // Give the parent node a rerun at optimization
-                tree.Mark_Incompletely_Hashed();
-                return true;
-            }
-        }
-
-        // No changes, consider the tree properly optimized.
-        tree.SetOptimizedUsing(&grammar);
-        return false;
-    }
-
-    void ApplyGrammars(FPoptimizer_CodeTree::CodeTree& tree)
-    {
-    #ifdef FPOPTIMIZER_MERGED_FILE
-        #define C *(const Grammar*)&
-    #else
-        #define C
-    #endif
-        #ifdef DEBUG_SUBSTITUTIONS
-        std::cout << "Applying grammar_optimize_round1\n";
-        #endif
-        while(ApplyGrammar(C grammar_optimize_round1, tree))
-            { //std::cout << "Rerunning 1\n";
-                tree.FixIncompleteHashes();
-            }
-
-        #ifdef DEBUG_SUBSTITUTIONS
-        std::cout << "Applying grammar_optimize_round2\n";
-        #endif
-        while(ApplyGrammar(C grammar_optimize_round2, tree))
-            { //std::cout << "Rerunning 2\n";
-                tree.FixIncompleteHashes();
-            }
-
-        #ifdef DEBUG_SUBSTITUTIONS
-        std::cout << "Applying grammar_optimize_round3\n";
-        #endif
-        while(ApplyGrammar(C grammar_optimize_round3, tree))
-            { //std::cout << "Rerunning 3\n";
-                tree.FixIncompleteHashes();
-            }
-
-        #ifndef FP_ENABLE_SHORTCUT_LOGICAL_EVALUATION
-        #ifdef DEBUG_SUBSTITUTIONS
-        std::cout << "Applying grammar_optimize_nonshortcut_logical_evaluation\n";
-        #endif
-        while(ApplyGrammar(C grammar_optimize_nonshortcut_logical_evaluation, tree))
-            { //std::cout << "Rerunning 3\n";
-                tree.FixIncompleteHashes();
-            }
-        #endif
-
-        #ifdef DEBUG_SUBSTITUTIONS
-        std::cout << "Applying grammar_optimize_round4\n";
-        #endif
-        while(ApplyGrammar(C grammar_optimize_round4, tree))
-            { //std::cout << "Rerunning 4\n";
-                tree.FixIncompleteHashes();
-            }
-
-        #ifdef FP_ENABLE_SHORTCUT_LOGICAL_EVALUATION
-        #ifdef DEBUG_SUBSTITUTIONS
-        std::cout << "Applying grammar_optimize_shortcut_logical_evaluation\n";
-        #endif
-        while(ApplyGrammar(C grammar_optimize_shortcut_logical_evaluation, tree))
-            { //std::cout << "Rerunning 3\n";
-                tree.FixIncompleteHashes();
-            }
-        #endif
-
-        #ifdef FP_ENABLE_IGNORE_IF_SIDEEFFECTS
-        #ifdef DEBUG_SUBSTITUTIONS
-        std::cout << "Applying grammar_optimize_ignore_if_sideeffects\n";
-        #endif
-        while(ApplyGrammar(C grammar_optimize_ignore_if_sideeffects, tree))
-            { //std::cout << "Rerunning 3\n";
-                tree.FixIncompleteHashes();
-            }
-        #endif
-
-        #ifdef DEBUG_SUBSTITUTIONS
-        std::cout << "Applying grammar_optimize_abslogical\n";
-        #endif
-        while(ApplyGrammar(C grammar_optimize_abslogical, tree))
-            { //std::cout << "Rerunning 3\n";
-                tree.FixIncompleteHashes();
-            }
-
-        #undef C
-    }
-}
-
-#endif
-
-#line 1 "fpoptimizer/fpoptimizer_optimize_match.c"
-#include "fpconfig.h"
-#include "fparser.h"
-#include "fptypes.h"
-
-#ifdef FP_SUPPORT_OPTIMIZER
-
-#include <algorithm>
-#include <assert.h>
-#include <cstring>
-#include <cmath>
-
-#include <memory> /* for auto_ptr */
-
-// line removed for fpoptimizer.c: #include "fpoptimizer_grammar.h"
-// line removed for fpoptimizer.c: #include "fpoptimizer_optimize.h"
-
-using namespace FUNCTIONPARSERTYPES;
-using namespace FPoptimizer_Grammar;
-using namespace FPoptimizer_CodeTree;
-using namespace FPoptimizer_Optimize;
-
-namespace
-{
-    /* Test the given constraints to a given CodeTree */
-    bool TestImmedConstraints(unsigned bitmask, const CodeTree& tree)
-    {
-        switch(bitmask & ValueMask)
-        {
-            case Value_AnyNum: case ValueMask: break;
-            case Value_EvenInt:
-                if(tree.GetEvennessInfo() != CodeTree::IsAlways)
-                    return false;
-                break;
-            case Value_OddInt:
-                if(tree.GetEvennessInfo() != CodeTree::IsNever)
-                    return false;
-                break;
-            case Value_IsInteger:
-                if(!tree.IsAlwaysInteger(true)) return false;
-                break;
-            case Value_NonInteger:
-                if(!tree.IsAlwaysInteger(false)) return false;
-                break;
-            case Value_Logical:
-                if(!tree.IsLogicalValue()) return false;
-                break;
-        }
-        switch(bitmask & SignMask)
-        {
-            case Sign_AnySign: /*case SignMask:*/ break;
-            case Sign_Positive:
-                if(!tree.IsAlwaysSigned(true)) return false;
-                break;
-            case Sign_Negative:
-                if(!tree.IsAlwaysSigned(false)) return false;
-                break;
-            case Sign_NoIdea:
-                if(tree.IsAlwaysSigned(true)) return false;
-                if(tree.IsAlwaysSigned(false)) return false;
-                break;
-        }
-        switch(bitmask & OnenessMask)
-        {
-            case Oneness_Any: case OnenessMask: break;
-            case Oneness_One:
-                if(!tree.IsImmed()) return false;
-                if(!FloatEqual(fabs(tree.GetImmed()), 1.0)) return false;
-                break;
-            case Oneness_NotOne:
-                if(!tree.IsImmed()) return false;
-                if(FloatEqual(fabs(tree.GetImmed()), 1.0)) return false;
-                break;
-        }
-        switch(bitmask & ConstnessMask)
-        {
-            case Constness_Any: /*case ConstnessMask:*/ break;
-            case Constness_Const:
-                if(!tree.IsImmed()) return false;
-                break;
-        }
-        return true;
-    }
-
-    template<unsigned extent, unsigned nbits, typename item_type=unsigned int>
-    struct nbitmap
-    {
-    private:
-        static const unsigned bits_in_char = 8;
-        static const unsigned per_item = (sizeof(item_type)*bits_in_char)/nbits;
-        item_type data[(extent+per_item-1) / per_item];
-    public:
-        void inc(unsigned index, int by=1)
-        {
-            data[pos(index)] += by * item_type(1 << shift(index));
-        }
-        inline void dec(unsigned index) { inc(index, -1); }
-        int get(unsigned index) const { return (data[pos(index)] >> shift(index)) & mask(); }
-
-        static inline unsigned pos(unsigned index) { return index/per_item; }
-        static inline unsigned shift(unsigned index) { return nbits * (index%per_item); }
-        static inline unsigned mask() { return (1 << nbits)-1; }
-        static inline unsigned mask(unsigned index) { return mask() << shift(index); }
-    };
-
-    struct Needs
-    {
-        int SubTrees     : 8; // This many subtrees
-        int Others       : 8; // This many others (namedholder)
-        int minimum_need : 8; // At least this many leaves (restholder may require more)
-        int Immeds       : 8; // This many immeds
-
-        nbitmap<VarBegin,2> SubTreesDetail; // This many subtrees of each opcode type
-
-        Needs()
-        {
-            std::memset(this, 0, sizeof(*this));
-        }
-        Needs(const Needs& b)
-        {
-            std::memcpy(this, &b, sizeof(b));
-        }
-        Needs& operator= (const Needs& b)
-        {
-            std::memcpy(this, &b, sizeof(b));
-            return *this;
-        }
-    };
-
-    Needs CreateNeedList_uncached(const ParamSpec_SubFunctionData& params)
-    {
-        Needs NeedList;
-
-        // Figure out what we need
-        for(unsigned a = 0; a < params.param_count; ++a)
-        {
-            const ParamSpec& parampair = ParamSpec_Extract(params.param_list, a);
-            switch(parampair.first)
-            {
-                case SubFunction:
-                {
-                    const ParamSpec_SubFunction& param = *(const ParamSpec_SubFunction*) parampair.second;
-                    if(param.data.match_type == GroupFunction)
-                        ++NeedList.Immeds;
-                    else
-                    {
-                        ++NeedList.SubTrees;
-                        assert( param.data.subfunc_opcode < VarBegin );
-                        NeedList.SubTreesDetail.inc(param.data.subfunc_opcode);
-                    }
-                    ++NeedList.minimum_need;
-                    break;
-                }
-                case NumConstant:
-                case ParamHolder:
-                    ++NeedList.Others;
-                    ++NeedList.minimum_need;
-                    break;
-            }
-        }
-
-        return NeedList;
-    }
-
-    Needs& CreateNeedList(const ParamSpec_SubFunctionData& params)
-    {
-        typedef std::map<const ParamSpec_SubFunctionData*, Needs> needlist_cached_t;
-        static needlist_cached_t needlist_cached;
-
-        needlist_cached_t::iterator i = needlist_cached.lower_bound(&params);
-        if(i != needlist_cached.end() && i->first == &params)
-            return i->second;
-
-        return
-            needlist_cached.insert(i,
-                 std::make_pair(&params, CreateNeedList_uncached(params))
-            )->second;
-    }
-    /* Construct CodeTree from a GroupFunction, hopefully evaluating to a constant value */
-    CodeTree CalculateGroupFunction(
-        const ParamSpec& parampair,
-        const MatchInfo& info)
-    {
-        switch( parampair.first )
-        {
-            case NumConstant:
-            {
-                const ParamSpec_NumConstant& param = *(const ParamSpec_NumConstant*) parampair.second;
-                return CodeTree( param.constvalue ); // Note: calculates hash too.
-            }
-            case ParamHolder:
-            {
-                const ParamSpec_ParamHolder& param = *(const ParamSpec_ParamHolder*) parampair.second;
-                return info.GetParamHolderValueIfFound( param.index );
-                // If the ParamHolder is not defined, it will simply
-                // return an Undefined tree. This is ok.
-            }
-            case SubFunction:
-            {
-                const ParamSpec_SubFunction& param = *(const ParamSpec_SubFunction*) parampair.second;
-                /* Synthesize a CodeTree which will take care of
-                 * constant-folding our expression. It will also
-                 * indicate whether the result is, in fact,
-                 * a constant at all. */
-                CodeTree result;
-                result.SetOpcode( param.data.subfunc_opcode );
-                result.GetParams().reserve(param.data.param_count);
-                for(unsigned a=0; a<param.data.param_count; ++a)
-                {
-                    CodeTree tmp(
-                        CalculateGroupFunction
-                        (ParamSpec_Extract(param.data.param_list, a), info)
-                                );
-                    result.AddParamMove(tmp);
-                }
-                result.Rehash(); // This will also call ConstantFolding().
-                return result;
-            }
-        }
-        // Issue an un-calculatable tree. (This should be unreachable)
-        return CodeTree(); // cNop
-    }
-}
-
-namespace FPoptimizer_Optimize
-{
-    /* Test the list of parameters to a given CodeTree */
-    /* A helper function which simply checks whether the
-     * basic shape of the tree matches what we are expecting
-     * i.e. given number of numeric constants, etc.
-     */
-    bool IsLogisticallyPlausibleParamsMatch(
-        const ParamSpec_SubFunctionData& params,
-        const CodeTree& tree)
-    {
-        /* First, check if the tree has any chances of matching... */
-        /* Figure out what we need. */
-        Needs NeedList ( CreateNeedList(params) );
-
-        size_t nparams = tree.GetParamCount();
-
-        if(nparams < size_t(NeedList.minimum_need))
-        {
-            // Impossible to satisfy
-            return false;
-        }
-
-        // Figure out what we have (note: we already assume that the opcode of the tree matches!)
-        for(size_t a=0; a<nparams; ++a)
-        {
-            unsigned opcode = tree.GetParam(a).GetOpcode();
-            switch(opcode)
-            {
-                case cImmed:
-                    if(NeedList.Immeds > 0) --NeedList.Immeds;
-                    else --NeedList.Others;
-                    break;
-                case VarBegin:
-                case cFCall:
-                case cPCall:
-                    --NeedList.Others;
-                    break;
-                default:
-                    assert( opcode < VarBegin );
-                    if(NeedList.SubTrees > 0
-                    && NeedList.SubTreesDetail.get(opcode) > 0)
-                    {
-                        --NeedList.SubTrees;
-                        NeedList.SubTreesDetail.dec(opcode);
-                    }
-                    else --NeedList.Others;
-            }
-        }
-
-        // Check whether all needs were satisfied
-        if(NeedList.Immeds > 0
-        || NeedList.SubTrees > 0
-        || NeedList.Others > 0)
-        {
-            // Something came short, impossible to satisfy.
-            return false;
-        }
-
-        if(params.match_type != AnyParams)
-        {
-            if(0
-            //|| NeedList.Immeds < 0 - already checked
-            || NeedList.SubTrees < 0
-            || NeedList.Others < 0
-            //|| params.count != nparams - already checked
-              )
-            {
-                // Something was too much.
-                return false;
-            }
-        }
-        return true;
-    }
-
-    /* Test the given parameter to a given CodeTree */
-    MatchResultType TestParam(
-        const ParamSpec& parampair,
-        const CodeTree& tree,
-        const MatchPositionSpecBaseP& start_at,
-        MatchInfo& info)
-    {
-        /*std::cout << "TestParam(";
-        DumpParam(parampair);
-        std::cout << ", ";
-        DumpTree(tree);
-        std::cout << ")\n";*/
-
-        /* What kind of param are we expecting */
-        switch( parampair.first )
-        {
-            case NumConstant: /* A particular numeric value */
-            {
-                const ParamSpec_NumConstant& param = *(const ParamSpec_NumConstant*) parampair.second;
-                if(!tree.IsImmed()) return false;
-                return FloatEqual(tree.GetImmed(), param.constvalue);
-            }
-            case ParamHolder: /* Any arbitrary node */
-            {
-                const ParamSpec_ParamHolder& param = *(const ParamSpec_ParamHolder*) parampair.second;
-                if(!TestImmedConstraints(param.constraints, tree)) return false;
-                return info.SaveOrTestParamHolder(param.index, tree);
-            }
-            case SubFunction:
-            {
-                const ParamSpec_SubFunction& param = *(const ParamSpec_SubFunction*) parampair.second;
-                if(param.data.match_type == GroupFunction)
-                { /* A constant value acquired from this formula */
-                    if(!TestImmedConstraints(param.constraints, tree)) return false;
-                    /* Construct the formula */
-                    CodeTree  grammar_func = CalculateGroupFunction(parampair, info);
-        #ifdef DEBUG_SUBSTITUTIONS
-                    DumpHashes(grammar_func);
-                    std::cout << *(const void**)&grammar_func.GetImmed();
-                    std::cout << "\n";
-                    std::cout << *(const void**)&tree.GetImmed();
-                    std::cout << "\n";
-                    DumpHashes(tree);
-                    std::cout << "Comparing ";
-                    DumpTree(grammar_func);
-                    std::cout << " and ";
-                    DumpTree(tree);
-                    std::cout << ": ";
-                    std::cout << (grammar_func.IsIdenticalTo(tree) ? "true" : "false");
-                    std::cout << "\n";
-        #endif
-                    /* Evaluate it and compare */
-                    return grammar_func.IsIdenticalTo(tree);
-                }
-                else /* A subtree conforming these specs */
-                {
-                    if(!&*start_at)
-                    {
-                        if(!TestImmedConstraints(param.constraints, tree)) return false;
-                        if(tree.GetOpcode() != param.data.subfunc_opcode) return false;
-                    }
-                    return TestParams(param.data, tree, start_at, info, false);
-                }
-            }
-        }
-        return false;
-    }
-
-    struct PositionalParams_Rec
-    {
-        MatchPositionSpecBaseP start_at; /* child's start_at */
-        MatchInfo              info;     /* backup of "info" at start */
-
-        PositionalParams_Rec(): start_at(), info() { }
-    };
-    class MatchPositionSpec_PositionalParams
-        : public MatchPositionSpecBase,
-          public std::vector<PositionalParams_Rec>
-    {
-    public:
-        explicit MatchPositionSpec_PositionalParams(size_t n)
-            : MatchPositionSpecBase(),
-              std::vector<PositionalParams_Rec> (n)
-              { }
-    };
-
-    struct AnyWhere_Rec
-    {
-        MatchPositionSpecBaseP start_at; /* child's start_at */
-        AnyWhere_Rec() : start_at() { }
-    };
-    class MatchPositionSpec_AnyWhere
-        : public MatchPositionSpecBase,
-          public std::vector<AnyWhere_Rec>
-    {
-    public:
-        unsigned trypos;   /* which param index to try next */
-
-        explicit MatchPositionSpec_AnyWhere(size_t n)
-            : MatchPositionSpecBase(),
-              std::vector<AnyWhere_Rec> (n),
-              trypos(0)
-              { }
-    };
-
-    MatchResultType TestParam_AnyWhere(
-        const ParamSpec& parampair,
-        const CodeTree& tree,
-        const MatchPositionSpecBaseP& start_at,
-        MatchInfo&         info,
-        std::vector<bool>& used,
-        bool TopLevel)
-    {
-        FPOPT_autoptr<MatchPositionSpec_AnyWhere> position;
-        unsigned a;
-        if(&*start_at)
-        {
-            position = (MatchPositionSpec_AnyWhere*) &*start_at;
-            a = position->trypos;
-            goto retry_anywhere_2;
-        }
-        else
-        {
-            position = new MatchPositionSpec_AnyWhere(tree.GetParamCount());
-            a = 0;
-        }
-        for(; a < tree.GetParamCount(); ++a)
-        {
-            if(used[a]) continue;
-
-        retry_anywhere:
-          { MatchResultType r = TestParam(
-                parampair,
-                tree.GetParam(a),
-                (*position)[a].start_at,
-                info);
-
-            (*position)[a].start_at = r.specs;
-            if(r.found)
-            {
-                used[a]               = true; // matched
-                if(TopLevel) info.SaveMatchedParamIndex(a);
-
-                position->trypos = a; // in case of backtrack, try a again
-                return MatchResultType(true, &*position);
-            } }
-        retry_anywhere_2:
-            if(&*(*position)[a].start_at) // is there another try?
-            {
-                goto retry_anywhere;
-            }
-            // no, move on
-        }
-        return false;
-    }
-
-    struct AnyParams_Rec
-    {
-        MatchPositionSpecBaseP start_at; /* child's start_at */
-        MatchInfo              info;     /* backup of "info" at start */
-        std::vector<bool>      used;     /* which params are remaining */
-
-        explicit AnyParams_Rec(size_t nparams)
-            : start_at(), info(), used(nparams) { }
-    };
-    class MatchPositionSpec_AnyParams
-        : public MatchPositionSpecBase,
-          public std::vector<AnyParams_Rec>
-    {
-    public:
-        explicit MatchPositionSpec_AnyParams(size_t n, size_t m)
-            : MatchPositionSpecBase(),
-              std::vector<AnyParams_Rec> (n, AnyParams_Rec(m))
-              { }
-    };
-
-    /* Test the list of parameters to a given CodeTree */
-    MatchResultType TestParams(
-        const ParamSpec_SubFunctionData& model_tree,
-        const CodeTree& tree,
-        const MatchPositionSpecBaseP& start_at,
-        MatchInfo& info,
-        bool TopLevel)
-    {
-        /* When PositionalParams or SelectedParams, verify that
-         * the number of parameters is exactly as expected.
-         */
-        if(model_tree.match_type != AnyParams)
-        {
-            if(model_tree.param_count != tree.GetParamCount())
-                return false;
-        }
-
-        /* Verify that the tree basically conforms the shape we are expecting */
-        /* This test is not necessary; it may just save us some work. */
-        if(!IsLogisticallyPlausibleParamsMatch(model_tree, tree))
-        {
-            return false;
-        }
-
-        /* Verify each parameter that they are found in the tree as expected. */
-        switch(model_tree.match_type)
-        {
-            case PositionalParams:
-            {
-                /* Simple: Test all given parameters in succession. */
-                FPOPT_autoptr<MatchPositionSpec_PositionalParams> position;
-                unsigned a;
-                if(&*start_at)
-                {
-                    position = (MatchPositionSpec_PositionalParams*) &*start_at;
-                    a = model_tree.param_count - 1;
-                    goto retry_positionalparams_2;
-                }
-                else
-                {
-                    position = new MatchPositionSpec_PositionalParams(model_tree.param_count);
-                    a = 0;
-                }
-
-                for(; a < model_tree.param_count; ++a)
-                {
-                    (*position)[a].info = info;
-                retry_positionalparams:
-                  { MatchResultType r = TestParam(
-                        ParamSpec_Extract(model_tree.param_list, a),
-                        tree.GetParam(a),
-                        (*position)[a].start_at,
-                        info);
-
-                    (*position)[a].start_at = r.specs;
-                    if(r.found)
-                    {
-                        continue;
-                  } }
-                retry_positionalparams_2:
-                    // doesn't match
-                    if(&*(*position)[a].start_at) // is there another try?
-                    {
-                        info = (*position)[a].info;
-                        goto retry_positionalparams;
-                    }
-                    // no, backtrack
-                    if(a > 0)
-                    {
-                        --a;
-                        goto retry_positionalparams_2;
-                    }
-                    // cannot backtrack
-                    info = (*position)[0].info;
-                    return false;
-                }
-                if(TopLevel)
-                    for(unsigned a = 0; a < model_tree.param_count; ++a)
-                        info.SaveMatchedParamIndex(a);
-                return MatchResultType(true, &*position);
-            }
-            case SelectedParams:
-                // same as AnyParams, except that model_tree.count==tree.GetParamCount()
-                //                       and that there are no RestHolders
-            case AnyParams:
-            {
-                /* Ensure that all given parameters are found somewhere, in any order */
-
-                FPOPT_autoptr<MatchPositionSpec_AnyParams> position;
-                std::vector<bool> used( tree.GetParamCount() );
-                std::vector<unsigned> depcodes( model_tree.param_count );
-                std::vector<unsigned> test_order( model_tree.param_count );
-                for(unsigned a=0; a<model_tree.param_count; ++a)
-                {
-                    const ParamSpec parampair = ParamSpec_Extract(model_tree.param_list, a);
-                    depcodes[a] = ParamSpec_GetDepCode(parampair);
-                }
-                { unsigned b=0;
-                for(unsigned a=0; a<model_tree.param_count; ++a)
-                    if(depcodes[a] != 0)
-                        test_order[b++] = a;
-                for(unsigned a=0; a<model_tree.param_count; ++a)
-                    if(depcodes[a] == 0)
-                        test_order[b++] = a;
-                }
-
-                unsigned a;
-                if(&*start_at)
-                {
-                    position = (MatchPositionSpec_AnyParams*) &*start_at;
-                    if(model_tree.param_count == 0)
-                    {
-                        a = 0;
-                        goto retry_anyparams_4;
-                    }
-                    a = model_tree.param_count - 1;
-                    goto retry_anyparams_2;
-                }
-                else
-                {
-                    position = new MatchPositionSpec_AnyParams(model_tree.param_count,
-                                                               tree.GetParamCount());
-                    a = 0;
-                    if(model_tree.param_count != 0)
-                    {
-                        (*position)[0].info   = info;
-                        (*position)[0].used   = used;
-                    }
-                }
-                // Match all but restholders
-                for(; a < model_tree.param_count; ++a)
-                {
-                    if(a > 0) // this test is not necessary, but it saves from doing
-                    {         // duplicate work, because [0] was already saved above.
-                        (*position)[a].info   = info;
-                        (*position)[a].used   = used;
-                    }
-                retry_anyparams:
-                  { MatchResultType r = TestParam_AnyWhere(
-                        ParamSpec_Extract(model_tree.param_list, test_order[a]),
-                        tree,
-                        (*position)[a].start_at,
-                        info,
-                        used,
-                        TopLevel);
-                    (*position)[a].start_at = r.specs;
-                    if(r.found)
-                    {
-                        continue;
-                  } }
-                retry_anyparams_2:
-                    // doesn't match
-                    if(&*(*position)[a].start_at) // is there another try?
-                    {
-                        info = (*position)[a].info;
-                        used = (*position)[a].used;
-                        goto retry_anyparams;
-                    }
-                    // no, backtrack
-                retry_anyparams_3:
-                    if(a > 0)
-                    {
-                        --a;
-                        goto retry_anyparams_2;
-                    }
-                    // cannot backtrack
-                    info = (*position)[0].info;
-                    return false;
-                }
-            retry_anyparams_4:
-                // Capture anything remaining in the restholder
-                if(model_tree.restholder_index != 0)
-                {
-                    //std::vector<bool> used_backup(used);
-                    //MatchInfo         info_backup(info);
-
-                    if(!TopLevel
-                    || !info.HasRestHolder(model_tree.restholder_index))
-                    {
-                        std::vector<CodeTree> matches;
-                        matches.reserve(tree.GetParamCount());
-                        for(unsigned b = 0; b < tree.GetParamCount(); ++b)
-                        {
-                            if(used[b]) continue; // Ignore subtrees that were already used
-                            // Save this tree to this restholder
-
-                            matches.push_back(tree.GetParam(b));
-                            used[b] = true;
-                            if(TopLevel) info.SaveMatchedParamIndex(b);
-                        }
-                        if(!info.SaveOrTestRestHolder(model_tree.restholder_index, matches))
-                        {
-                            // Failure at restholder matching. Backtrack if possible.
-                            //used.swap(used_backup);
-                            //info.swap(info_backup);
-                            goto retry_anyparams_3;
-                        }
-                        //std::cout << "Saved restholder " << model_tree.restholder_index << "\n";
-                    }
-                    else
-                    {
-                        const std::vector<CodeTree>& matches
-                            = info.GetRestHolderValues(model_tree.restholder_index);
-                        //std::cout << "Testing restholder " << model_tree.restholder_index << std::flush;
-                        for(size_t a=0; a<matches.size(); ++a)
-                        {
-                            bool found = false;
-                            for(unsigned b = 0; b < tree.GetParamCount(); ++b)
-                            {
-                                if(used[b]) continue;
-                                if(matches[a].IsIdenticalTo(tree.GetParam(b)))
-                                {
-                                    used[b] = true;
-                                    if(TopLevel) info.SaveMatchedParamIndex(b);
-                                    found = true;
-                                    break;
-                                }
-                            }
-                            if(!found)
-                            {
-                                //std::cout << " ... failed\n";
-                                // Failure at restholder matching. Backtrack if possible.
-                                //used.swap(used_backup);
-                                //info.swap(info_backup);
-                                goto retry_anyparams_3;
-                            }
-                        }
-                        //std::cout << " ... ok\n";
-                    }
-                }
-                return MatchResultType(true, model_tree.param_count ? &*position : 0);
-            }
-            case GroupFunction: // never occurs
-                break;
-        }
-        return false; // doesn't match
-    }
-}
-
-#endif
-
-#line 1 "fpoptimizer/fpoptimizer_optimize_synth.c"
-#include "fpconfig.h"
-#include "fparser.h"
-#include "fptypes.h"
-
-#ifdef FP_SUPPORT_OPTIMIZER
-
-#include <algorithm>
-#include <assert.h>
-
-// line removed for fpoptimizer.c: #include "fpoptimizer_optimize.h"
-
-namespace FPoptimizer_Optimize
-{
-    /* Synthesize the given grammatic parameter into the codetree */
-    void SynthesizeParam(
-        const ParamSpec& parampair,
-        CodeTree& tree,
-        MatchInfo& info,
-        bool inner = true)
-    {
-        switch( parampair.first )
-        {
-            case NumConstant:
-              { const ParamSpec_NumConstant& param = *(const ParamSpec_NumConstant*) parampair.second;
-                tree.SetImmed( param.constvalue );
-                if(inner) tree.Rehash(false);
-                break; }
-            case ParamHolder:
-              { const ParamSpec_ParamHolder& param = *(const ParamSpec_ParamHolder*) parampair.second;
-                tree.Become( info.GetParamHolderValue( param.index ) );
-                break; }
-            case SubFunction:
-              { const ParamSpec_SubFunction& param = *(const ParamSpec_SubFunction*) parampair.second;
-                tree.SetOpcode( param.data.subfunc_opcode );
-                for(unsigned a=0; a < param.data.param_count; ++a)
-                {
-                    CodeTree nparam;
-                    SynthesizeParam( ParamSpec_Extract(param.data.param_list, a), nparam, info, true );
-                    tree.AddParamMove(nparam);
-                }
-                if(param.data.restholder_index != 0)
-                {
-                    std::vector<CodeTree> trees
-                        ( info.GetRestHolderValues( param.data.restholder_index ) );
-                    tree.AddParamsMove(trees);
-                    // ^note: this fails if the same restholder is synth'd twice
-                    if(tree.GetParamCount() == 1)
-                    {
-                        /* Convert cMul <1> into <1> when <1> only contains one operand.
-                         * This is redundant code; it is also done in ConstantFolding(),
-                         * but it might be better for performance to do it here, too.
-                         */
-                        assert(tree.GetOpcode() == cAdd || tree.GetOpcode() == cMul
-                            || tree.GetOpcode() == cMin || tree.GetOpcode() == cMax
-                            || tree.GetOpcode() == cAnd || tree.GetOpcode() == cOr);
-                        tree.Become(tree.GetParam(0));
-                    }
-                }
-                if(inner)
-                    tree.Rehash();
-                break; }
-        }
-    }
-
-    void SynthesizeRule(
-        const Rule& rule,
-        CodeTree& tree,
-        MatchInfo& info)
-    {
-        switch(rule.ruletype)
-        {
-            case ProduceNewTree:
-            {
-                tree.DelParams();
-                SynthesizeParam( ParamSpec_Extract(rule.repl_param_list, 0), tree, info, false );
-                break;
-            }
-            case ReplaceParams:
-            default:
-            {
-                /* Delete the matched parameters from the source tree */
-                std::vector<unsigned> list = info.GetMatchedParamIndexes();
-                std::sort(list.begin(), list.end());
-                for(size_t a=list.size(); a-->0; )
-                    tree.DelParam( list[a] );
-
-                /* Synthesize the replacement params */
-                for(unsigned a=0; a < rule.repl_param_count; ++a)
-                {
-                    CodeTree nparam;
-                    SynthesizeParam( ParamSpec_Extract(rule.repl_param_list, a), nparam, info, true );
-                    tree.AddParamMove(nparam);
-                }
-                break;
-            }
-        }
-    }
-}
-
-#endif
-
-#line 1 "fpoptimizer/fpoptimizer_optimize_debug.c"
-// line removed for fpoptimizer.c: #include "fpoptimizer_grammar.h"
-// line removed for fpoptimizer.c: #include "fpoptimizer_opcodename.h"
-// line removed for fpoptimizer.c: #include "fpoptimizer_optimize.h"
-
-#ifdef DEBUG_SUBSTITUTIONS
-
-#include <sstream>
-#include <cstring>
-
-using namespace FUNCTIONPARSERTYPES;
-using namespace FPoptimizer_Grammar;
-using namespace FPoptimizer_CodeTree;
-using namespace FPoptimizer_Optimize;
-
-namespace FPoptimizer_Grammar
-{
-    void DumpMatch(const Rule& rule,
-                   const CodeTree& tree,
-                   const MatchInfo& info,
-                   bool DidMatch,
-                   std::ostream& o)
-    {
-        DumpMatch(rule,tree,info,DidMatch?"Found match":"Found mismatch",o);
-    }
-
-    void DumpMatch(const Rule& rule,
-                   const CodeTree& tree,
-                   const MatchInfo& info,
-                   const char* whydump,
-                   std::ostream& o)
-    {
-        static const char ParamHolderNames[][2] = {"%","&","x","y","z","a","b","c"};
-
-        o << whydump
-          << " (rule " << (&rule - grammar_rules) << ")"
-          << ":\n"
-            "  Pattern    : ";
-        { ParamSpec tmp;
-          tmp.first = SubFunction;
-          ParamSpec_SubFunction tmp2;
-          tmp2.data = rule.match_tree;
-          tmp.second = (const void*) &tmp2;
-          DumpParam(tmp, o);
-        }
-        o << "\n"
-            "  Replacement: ";
-        DumpParams(rule.repl_param_list, rule.repl_param_count, o);
-        o << "\n";
-
-        o <<
-            "  Tree       : ";
-        DumpTree(tree, o);
-        o << "\n";
-        if(!std::strcmp(whydump,"Found match")) DumpHashes(tree, o);
-
-        for(size_t a=0; a<info.paramholder_matches.size(); ++a)
-        {
-            if(!info.paramholder_matches[a].IsDefined()) continue;
-            o << "           " << ParamHolderNames[a] << " = ";
-            DumpTree(info.paramholder_matches[a], o);
-            o << "\n";
-        }
-
-        for(size_t b=0; b<info.restholder_matches.size(); ++b)
-        {
-            if(!info.restholder_matches[b].first) continue;
-            for(size_t a=0; a<info.restholder_matches[b].second.size(); ++a)
-            {
-                o << "         <" << b << "> = ";
-                DumpTree(info.restholder_matches[b].second[a], o);
-                o << std::endl;
-            }
-        }
-        o << std::flush;
-    }
-
-}
-
-#endif
-
-#line 1 "fpoptimizer/fpoptimizer_hash.c"
-#include <list>
-#include <algorithm>
-
-// line removed for fpoptimizer.c: #include "fpoptimizer_codetree.h"
-#include "fptypes.h"
-// line removed for fpoptimizer.c: #include "crc32.h"
-
-#ifdef FP_SUPPORT_OPTIMIZER
-
-using namespace FUNCTIONPARSERTYPES;
-//using namespace FPoptimizer_Grammar;
-
-namespace
-{
-    bool MarkIncompletes(FPoptimizer_CodeTree::CodeTree& tree)
-    {
-        if(tree.Is_Incompletely_Hashed())
-            return true;
-
-        bool needs_rehash = false;
-        for(size_t a=0; a<tree.GetParamCount(); ++a)
-            needs_rehash |= MarkIncompletes(tree.GetParam(a));
-        if(needs_rehash)
-            tree.Mark_Incompletely_Hashed();
-        return needs_rehash;
-    }
-
-    void FixIncompletes(FPoptimizer_CodeTree::CodeTree& tree)
-    {
-        if(tree.Is_Incompletely_Hashed())
-        {
-            for(size_t a=0; a<tree.GetParamCount(); ++a)
-                FixIncompletes(tree.GetParam(a));
-            tree.Rehash();
-        }
-    }
-}
-
-namespace FPoptimizer_CodeTree
-{
-    void CodeTree::Rehash(bool constantfolding)
-    {
-        if(constantfolding)
-            ConstantFolding();
-        data->Sort();
-        data->Recalculate_Hash_NoRecursion();
-    }
-
-    void CodeTreeData::Recalculate_Hash_NoRecursion()
-    {
-        fphash_t NewHash = { Opcode * FPHASH_CONST(0x3A83A83A83A83A0),
-                             Opcode * FPHASH_CONST(0x1131462E270012B)};
-        Depth = 1;
-        switch(Opcode)
-        {
-            case cImmed:
-                if(Value != 0.0)
-                {
-                    crc32_t crc = crc32::calc( (const unsigned char*) &Value,
-                                                sizeof(Value) );
-                    NewHash.hash1 ^= crc | (fphash_value_t(crc) << FPHASH_CONST(32));
-                    NewHash.hash2 += ((~fphash_value_t(crc)) * 3) ^ 1234567;
-                }
-                break; // no params
-            case VarBegin:
-                NewHash.hash1 ^= (Var<<24) | (Var>>24);
-                NewHash.hash2 += (fphash_value_t(Var)*5) ^ 2345678;
-                break; // no params
-            case cFCall: case cPCall:
-            {
-                crc32_t crc = crc32::calc( (const unsigned char*) &Funcno, sizeof(Funcno) );
-                NewHash.hash1 ^= (crc<<24) | (crc>>24);
-                NewHash.hash2 += ((~fphash_value_t(crc)) * 7) ^ 3456789;
-                /* passthru */
-            }
-            default:
-            {
-                size_t MaxChildDepth = 0;
-                for(size_t a=0; a<Params.size(); ++a)
-                {
-                    if(Params[a].GetDepth() > MaxChildDepth)
-                        MaxChildDepth = Params[a].GetDepth();
-
-                    NewHash.hash1 += (1)*FPHASH_CONST(0x2492492492492492);
-                    NewHash.hash1 *= FPHASH_CONST(1099511628211);
-                    //assert(&*Params[a] != this);
-                    NewHash.hash1 += Params[a].GetHash().hash1;
-
-                    NewHash.hash2 += (3)*FPHASH_CONST(0x9ABCD801357);
-                    NewHash.hash2 *= FPHASH_CONST(0xECADB912345);
-                    NewHash.hash2 += (~Params[a].GetHash().hash1) ^ 4567890;
-                }
-                Depth += MaxChildDepth;
-            }
-        }
-        if(Hash != NewHash)
-        {
-            Hash = NewHash;
-            OptimizedUsing = 0;
-        }
-    }
-
-    void CodeTree::FixIncompleteHashes()
-    {
-        MarkIncompletes(*this);
-        FixIncompletes(*this);
-    }
-}
-
-#endif
-
-#line 1 "fpoptimizer/fpoptimizer_makebytecode.c"
-#include <cmath>
-#include <list>
-#include <cassert>
-
-// line removed for fpoptimizer.c: #include "fpoptimizer_codetree.h"
-#include "fptypes.h"
-// line removed for fpoptimizer.c: #include "fpoptimizer_consts.h"
-// line removed for fpoptimizer.c: #include "fpoptimizer_bytecodesynth.h"
-// line removed for fpoptimizer.c: #include "fpoptimizer_optimize.h"
-
-#ifdef FP_SUPPORT_OPTIMIZER
-
-using namespace FUNCTIONPARSERTYPES;
-//using namespace FPoptimizer_Grammar;
-
-namespace
-{
-    using namespace FPoptimizer_CodeTree;
-
-    bool AssembleSequence(
-                  const CodeTree& tree, long count,
-                  const FPoptimizer_ByteCode::SequenceOpCode& sequencing,
-                  FPoptimizer_ByteCode::ByteCodeSynth& synth,
-                  size_t max_bytecode_grow_length);
-}
-
-namespace FPoptimizer_CodeTree
-{
-    void CodeTree::SynthesizeByteCode(
-        std::vector<unsigned>& ByteCode,
-        std::vector<double>&   Immed,
-        size_t& stacktop_max)
-    {
-    #ifdef DEBUG_SUBSTITUTIONS
-        std::cout << "Making bytecode for:\n";
-        DumpTreeWithIndent(*this);
-    #endif
-        while(RecreateInversionsAndNegations())
-        {
-        #ifdef DEBUG_SUBSTITUTIONS
-            std::cout << "One change issued, produced:\n";
-            DumpTreeWithIndent(*this);
-        #endif
-            FixIncompleteHashes();
-        }
-    #ifdef DEBUG_SUBSTITUTIONS
-        std::cout << "Actually synthesizing, after recreating inv/neg:\n";
-        DumpTreeWithIndent(*this);
-    #endif
-
-        FPoptimizer_ByteCode::ByteCodeSynth synth;
-
-        /* Then synthesize the actual expression */
-        SynthesizeByteCode(synth, false);
-        /* The "false" parameters tells SynthesizeByteCode
-         * that at the outermost synthesizing level, it does
-         * not matter if leftover temps are left in the stack.
-         */
-        synth.Pull(ByteCode, Immed, stacktop_max);
-    }
-
-    void CodeTree::SynthesizeByteCode(
-        FPoptimizer_ByteCode::ByteCodeSynth& synth,
-        bool MustPopTemps) const
-    {
-        // If the synth can already locate our operand in the stack,
-        // never mind synthesizing it again, just dup it.
-        if(synth.FindAndDup(*this))
-        {
-            return;
-        }
-
-        size_t n_subexpressions_synthesized = SynthCommonSubExpressions(synth);
-
-        switch(GetOpcode())
-        {
-            case VarBegin:
-                synth.PushVar(GetVar());
-                break;
-            case cImmed:
-                synth.PushImmed(GetImmed());
-                break;
-            case cAdd:
-            case cMul:
-            case cMin:
-            case cMax:
-            case cAnd:
-            case cOr:
-            case cAbsAnd:
-            case cAbsOr:
-            {
-                if(GetOpcode() == cMul) // Special treatment for cMul sequences
-                {
-                    // If the paramlist contains an Immed, and that Immed
-                    // fits in a long-integer, try to synthesize it
-                    // as add-sequences instead.
-                    bool did_muli = false;
-                    for(size_t a=0; a<GetParamCount(); ++a)
-                    {
-                        if(GetParam(a).IsLongIntegerImmed())
-                        {
-                            long value = GetParam(a).GetLongIntegerImmed();
-
-                            CodeTree tmp(*this, CodeTree::CloneTag());
-                            tmp.DelParam(a);
-                            tmp.Rehash();
-                            if(AssembleSequence(
-                                tmp, value, FPoptimizer_ByteCode::AddSequence,
-                                synth,
-                                MAX_MULI_BYTECODE_LENGTH))
-                            {
-                                did_muli = true;
-                                break;
-                            }
-                        }
-                    }
-                    if(did_muli)
-                        break; // done
-                }
-
-                int n_stacked = 0;
-                for(size_t a=0; a<GetParamCount(); ++a)
-                {
-                    GetParam(a).SynthesizeByteCode(synth);
-                    ++n_stacked;
-
-                    if(n_stacked > 1)
-                    {
-                        // Cumulate at the earliest opportunity.
-                        synth.AddOperation(GetOpcode(), 2); // stack state: -2+1 = -1
-                        n_stacked = n_stacked - 2 + 1;
-                    }
-                }
-                if(n_stacked == 0)
-                {
-                    // Uh, we got an empty cAdd/cMul/whatever...
-                    // Synthesize a default value.
-                    // This should never happen.
-                    switch(GetOpcode())
-                    {
-                        case cAdd:
-                        case cOr:
-                        case cAbsOr:
-                            synth.PushImmed(0);
-                            break;
-                        case cMul:
-                        case cAnd:
-                        case cAbsAnd:
-                            synth.PushImmed(1);
-                            break;
-                        case cMin:
-                        case cMax:
-                            //synth.PushImmed(NaN);
-                            synth.PushImmed(0);
-                            break;
-                        default:
-                            break;
-                    }
-                    ++n_stacked;
-                }
-                assert(n_stacked == 1);
-                break;
-            }
-            case cPow:
-            {
-                const CodeTree& p0 = GetParam(0);
-                const CodeTree& p1 = GetParam(1);
-
-                if(!p1.IsLongIntegerImmed()
-                || !AssembleSequence( /* Optimize integer exponents */
-                        p0, p1.GetLongIntegerImmed(),
-                        FPoptimizer_ByteCode::MulSequence,
-                        synth,
-                        MAX_POWI_BYTECODE_LENGTH)
-                  )
-                {
-                    p0.SynthesizeByteCode(synth);
-                    p1.SynthesizeByteCode(synth);
-                    synth.AddOperation(GetOpcode(), 2); // Create a vanilla cPow.
-                }
-                break;
-            }
-            case cIf:
-            case cAbsIf:
-            {
-                // Assume that the parameter count is 3 as it should.
-                FPoptimizer_ByteCode::ByteCodeSynth::IfData ifdata;
-
-                GetParam(0).SynthesizeByteCode(synth); // expression
-
-                synth.SynthIfStep1(ifdata, GetOpcode());
-
-                GetParam(1).SynthesizeByteCode(synth); // true branch
-
-                synth.SynthIfStep2(ifdata);
-
-                GetParam(2).SynthesizeByteCode(synth); // false branch
-
-                synth.SynthIfStep3(ifdata);
-                break;
-            }
-            case cFCall:
-            case cPCall:
-            {
-                // Assume that the parameter count is as it should.
-                for(size_t a=0; a<GetParamCount(); ++a)
-                    GetParam(a).SynthesizeByteCode(synth);
-                synth.AddOperation(GetOpcode(), (unsigned) GetParamCount());
-                synth.AddOperation(GetFuncNo(), 0, 0);
-                break;
-            }
-            default:
-            {
-                // Assume that the parameter count is as it should.
-                for(size_t a=0; a<GetParamCount(); ++a)
-                    GetParam(a).SynthesizeByteCode(synth);
-                synth.AddOperation(GetOpcode(), (unsigned) GetParamCount());
-                break;
-            }
-        }
-
-        // Tell the synthesizer which tree was just produced in the stack
-        synth.StackTopIs(*this);
-
-        // If we added subexpressions, peel them off the stack now
-        if(MustPopTemps && n_subexpressions_synthesized > 0)
-        {
-            size_t top = synth.GetStackTop();
-            synth.DoPopNMov(top-1-n_subexpressions_synthesized, top-1);
-        }
-    }
-}
-
-namespace
-{
-    bool AssembleSequence(
-        const CodeTree& tree, long count,
-        const FPoptimizer_ByteCode::SequenceOpCode& sequencing,
-        FPoptimizer_ByteCode::ByteCodeSynth& synth,
-        size_t max_bytecode_grow_length)
-    {
-        if(count != 0)
-        {
-            FPoptimizer_ByteCode::ByteCodeSynth backup = synth;
-
-            tree.SynthesizeByteCode(synth);
-
-            // Ignore the size generated by subtree
-            size_t bytecodesize_backup = synth.GetByteCodeSize();
-
-            FPoptimizer_ByteCode::AssembleSequence(count, sequencing, synth);
-
-            size_t bytecode_grow_amount = synth.GetByteCodeSize() - bytecodesize_backup;
-            if(bytecode_grow_amount > max_bytecode_grow_length)
-            {
-                synth = backup;
-                return false;
-            }
-            return true;
-        }
-        else
-        {
-            FPoptimizer_ByteCode::AssembleSequence(count, sequencing, synth);
-            return true;
-        }
-    }
-}
-
-#endif
-
-#line 1 "fpoptimizer/fpoptimizer_readbytecode.c"
-#include <cmath>
-#include <cassert>
-
-// line removed for fpoptimizer.c: #include "fpoptimizer_codetree.h"
-// line removed for fpoptimizer.c: #include "fpoptimizer_optimize.h"
-// line removed for fpoptimizer.c: #include "fpoptimizer_opcodename.h"
-// line removed for fpoptimizer.c: #include "fpoptimizer_grammar.h"
-#include "fptypes.h"
-
-// line removed for fpoptimizer.c: #include "fpoptimizer_consts.h"
-#include "fparser.h"
-
-#ifdef FP_SUPPORT_OPTIMIZER
-
-using namespace FUNCTIONPARSERTYPES;
-//using namespace FPoptimizer_Grammar;
-
-namespace
-{
-    using namespace FPoptimizer_CodeTree;
-
-    typedef std::vector<double> FactorStack;
-
-    const struct PowiMuliType
-    {
-        unsigned opcode_square;
-        unsigned opcode_cumulate;
-        unsigned opcode_invert;
-        unsigned opcode_half;
-        unsigned opcode_invhalf;
-    } iseq_powi = {cSqr,cMul,cInv,cSqrt,cRSqrt},
-      iseq_muli = {~unsigned(0), cAdd,cNeg, ~unsigned(0),~unsigned(0) };
-
-    double ParsePowiMuli(
-        const PowiMuliType& opcodes,
-        const std::vector<unsigned>& ByteCode, size_t& IP,
-        size_t limit,
-        size_t factor_stack_base,
-        FactorStack& stack)
-    {
-        double result = 1;
-        while(IP < limit)
-        {
-            if(ByteCode[IP] == opcodes.opcode_square)
-            {
-                if(!IsIntegerConst(result)) break;
-                result *= 2;
-                ++IP;
-                continue;
-            }
-            if(ByteCode[IP] == opcodes.opcode_invert)
-            {
-                result = -result;
-                ++IP;
-                continue;
-            }
-            if(ByteCode[IP] == opcodes.opcode_half)
-            {
-                if(IsIntegerConst(result) && result > 0 && ((long)result) % 2 == 0)
-                    break;
-                result *= 0.5;
-                ++IP;
-                continue;
-            }
-            if(ByteCode[IP] == opcodes.opcode_invhalf)
-            {
-                if(IsIntegerConst(result) && result > 0 && ((long)result) % 2 == 0)
-                    break;
-                result *= -0.5;
-                ++IP;
-                continue;
-            }
-
-            size_t dup_fetch_pos = IP;
-            double lhs = 1.0;
-
-            if(ByteCode[IP] == cFetch)
-            {
-                unsigned index = ByteCode[++IP];
-                if(index < factor_stack_base
-                || size_t(index-factor_stack_base) >= stack.size())
-                {
-                    // It wasn't a powi-fetch after all
-                    IP = dup_fetch_pos;
-                    break;
-                }
-                lhs = stack[index - factor_stack_base];
-                // Note: ^This assumes that cFetch of recentmost
-                //        is always converted into cDup.
-                goto dup_or_fetch;
-            }
-            if(ByteCode[IP] == cDup)
-            {
-                lhs = result;
-                goto dup_or_fetch;
-
-            dup_or_fetch:
-                stack.push_back(result);
-                ++IP;
-                double subexponent = ParsePowiMuli
-                    (opcodes,
-                     ByteCode, IP, limit,
-                     factor_stack_base, stack);
-                if(IP >= limit || ByteCode[IP] != opcodes.opcode_cumulate)
-                {
-                    // It wasn't a powi-dup after all
-                    IP = dup_fetch_pos;
-                    break;
-                }
-                ++IP; // skip opcode_cumulate
-                stack.pop_back();
-                result += lhs*subexponent;
-                continue;
-            }
-            break;
-        }
-        return result;
-    }
-
-    double ParsePowiSequence(const std::vector<unsigned>& ByteCode, size_t& IP,
-                           size_t limit,
-                           size_t factor_stack_base)
-    {
-        FactorStack stack;
-        stack.push_back(1.0);
-        return ParsePowiMuli(iseq_powi, ByteCode, IP, limit, factor_stack_base, stack);
-    }
-
-    double ParseMuliSequence(const std::vector<unsigned>& ByteCode, size_t& IP,
-                           size_t limit,
-                           size_t factor_stack_base)
-    {
-        FactorStack stack;
-        stack.push_back(1.0);
-        return ParsePowiMuli(iseq_muli, ByteCode, IP, limit, factor_stack_base, stack);
-    }
-
-    class CodeTreeParserData
-    {
-    public:
-        explicit CodeTreeParserData(bool k_powi)
-            : stack(), keep_powi(k_powi) { }
-
-        void Eat(size_t nparams, OPCODE opcode)
-        {
-            CodeTree newnode;
-            newnode.SetOpcode(opcode);
-
-            std::vector<CodeTree> params = Pop(nparams);
-            newnode.SetParamsMove(params);
-
-            if(!keep_powi)
-            switch(opcode)
-            {
-                //        asinh: log(x + sqrt(x*x + 1))
-                //cAsinh [x] -> cLog (cAdd x (cPow (cAdd (cPow x 2) 1) 0.5))
-                // Note: ^ Replacement function refers to x twice
-
-                //        acosh: log(x + sqrt(x*x - 1))
-                //cAcosh [x] -> cLog (cAdd x (cPow (cAdd (cPow x 2) -1) 0.5))
-
-                //        atanh: log( (1+x) / (1-x)) / 2
-                //cAtanh [x] -> cMul (cLog (cMul (cAdd 1 x) (cPow (cAdd 1 (cMul -1 x)) -1))) 0.5
-
-                //        asin: atan2(x, sqrt(1-x*x))
-                //cAsin[x] -> cAtan2 [x (cPow [(cAdd 1 (cMul (cPow [x 2] -1)) 0.5])]
-
-                //        acos: atan2(sqrt(1-x*x), x)
-                //cAcos[x] -> cAtan2 [(cPow [(cAdd 1 (cMul (cPow [x 2] -1)) 0.5]) x]
-
-                //     The hyperbolic functions themselves are:
-                //        sinh: (exp(x)-exp(-x)) / 2  = exp(-x) * (exp(2*x)-1) / 2
-                //cSinh [x] -> cMul 0.5 (cPow [CONSTANT_EI x]) (cAdd [-1 (cPow [CONSTANT_2E x])])
-
-                //        cosh: (exp(x)+exp(-x)) / 2  = exp(-x) * (exp(2*x)+1) / 2
-                //        cosh(-x) = cosh(x)
-                //cCosh [x] -> cMul 0.5 (cPow [CONSTANT_EI x]) (cAdd [ 1 (cPow [CONSTANT_2E x])])
-
-                //        tanh: sinh/cosh = (exp(2*x)-1) / (exp(2*x)+1)
-                //cTanh [x] -> (cMul (cAdd {(cPow [CONSTANT_2E x]) -1}) (cPow [(cAdd {(cPow [CONSTANT_2E x]) 1}) -1]))
-                case cTanh:
-                {
-                    CodeTree sinh, cosh;
-                    sinh.SetOpcode(cSinh); sinh.AddParam(newnode.GetParam(0)); sinh.Rehash();
-                    cosh.SetOpcode(cCosh); cosh.AddParamMove(newnode.GetParam(0)); cosh.Rehash();
-                    CodeTree pow;
-                    pow.SetOpcode(cPow);
-                    pow.AddParamMove(cosh);
-                    pow.AddParam(CodeTree(-1.0));
-                    pow.Rehash();
-                    newnode.SetOpcode(cMul);
-                    newnode.SetParamMove(0, sinh);
-                    newnode.AddParamMove(pow);
-                    break;
-                }
-
-                //        tan: sin/cos
-                //cTan [x] -> (cMul (cSin [x]) (cPow [(cCos [x]) -1]))
-                case cTan:
-                {
-                    CodeTree sin, cos;
-                    sin.SetOpcode(cSin); sin.AddParam(newnode.GetParam(0)); sin.Rehash();
-                    cos.SetOpcode(cCos); cos.AddParamMove(newnode.GetParam(0)); cos.Rehash();
-                    CodeTree pow;
-                    pow.SetOpcode(cPow);
-                    pow.AddParamMove(cos);
-                    pow.AddParam(CodeTree(-1.0));
-                    pow.Rehash();
-                    newnode.SetOpcode(cMul);
-                    newnode.SetParamMove(0, sin);
-                    newnode.AddParamMove(pow);
-                    break;
-                }
-
-                case cPow:
-                {
-                    const CodeTree& p0 = newnode.GetParam(0);
-                    const CodeTree& p1 = newnode.GetParam(1);
-                    if(p1.GetOpcode() == cAdd)
-                    {
-                        // convert x^(a + b) into x^a * x^b just so that
-                        // some optimizations can be run on it.
-                        // For instance, exp(log(x)*-61.1 + log(z)*-59.1)
-                        // won't be changed into exp(log(x*z)*-61.1)*z^2
-                        // unless we do this.
-                        std::vector<CodeTree> mulgroup(p1.GetParamCount());
-                        for(size_t a=0; a<p1.GetParamCount(); ++a)
-                        {
-                            CodeTree pow;
-                            pow.SetOpcode(cPow);
-                            pow.AddParam(p0);
-                            pow.AddParam(p1.GetParam(a));
-                            pow.Rehash();
-                            mulgroup[a].swap(pow);
-                        }
-                        newnode.SetOpcode(cMul);
-                        newnode.SetParamsMove(mulgroup);
-                    }
-                    break;
-                }
-
-                // Should we change sin(x) into cos(pi/2-x)
-                //               or cos(x) into sin(pi/2-x)?
-                //                        note: cos(x-pi/2) = cos(pi/2-x) = sin(x)
-                //                        note: sin(x-pi/2) = -sin(pi/2-x) = -cos(x)
-                default: break;
-            }
-
-            newnode.Rehash(!keep_powi);
-        /*
-            using namespace FPoptimizer_Grammar;
-            bool recurse = false;
-            while(ApplyGrammar(pack.glist[0], newnode, recurse)) // intermediate
-            { //std::cout << "Rerunning 1\n";
-                newnode.FixIncompleteHashes();
-                recurse = true;
-            }
-        */
-            FindClone(newnode, false);
-        #ifdef DEBUG_SUBSTITUTIONS
-            std::cout << "POP " << nparams << ", " << FP_GetOpcodeName(opcode)
-                      << "->" << FP_GetOpcodeName(newnode.GetOpcode())
-                      << ": PUSH ";
-            DumpTree(newnode);
-            std::cout <<std::endl;
-        #endif
-            stack.push_back(newnode);
-        }
-
-        void EatFunc(size_t nparams, OPCODE opcode, unsigned funcno)
-        {
-            CodeTree newnode;
-            newnode.SetFuncOpcode(opcode, funcno);
-            std::vector<CodeTree> params = Pop(nparams);
-            newnode.SetParamsMove(params);
-            newnode.Rehash(false);
-        #ifdef DEBUG_SUBSTITUTIONS
-            std::cout << "POP " << nparams << ", PUSH ";
-            DumpTree(newnode);
-            std::cout << std::endl;
-        #endif
-            FindClone(newnode);
-            stack.push_back(newnode);
-        }
-
-        void AddConst(double value)
-        {
-            CodeTree newnode(value);
-            FindClone(newnode);
-            Push(newnode);
-        }
-
-        void AddVar(unsigned varno)
-        {
-            CodeTree newnode(varno, CodeTree::VarTag());
-            FindClone(newnode);
-            Push(newnode);
-        }
-
-        void SwapLastTwoInStack()
-        {
-            stack[stack.size()-1].swap( stack[stack.size()-2] );
-        }
-
-        void Dup()
-        {
-            Fetch(stack.size()-1);
-        }
-
-        void Fetch(size_t which)
-        {
-            Push(stack[which]);
-        }
-
-        template<typename T>
-        void Push(T tree)
-        {
-        #ifdef DEBUG_SUBSTITUTIONS
-            std::cout << "PUSH ";
-            DumpTree(tree);
-            std::cout << std::endl;
-        #endif
-            stack.push_back(tree);
-        }
-
-        void PopNMov(size_t target, size_t source)
-        {
-            stack[target] = stack[source];
-            stack.resize(target+1);
-        }
-
-        CodeTree PullResult()
-        {
-            clones.clear();
-            CodeTree result(stack.back());
-            stack.resize(stack.size()-1);
-            return result;
-        }
-        std::vector<CodeTree> Pop(unsigned n_pop)
-        {
-            std::vector<CodeTree> result(n_pop);
-            for(unsigned n=0; n<n_pop; ++n)
-                result[n].swap(stack[stack.size()-n_pop+n]);
-            stack.resize(stack.size()-n_pop);
-            return result;
-        }
-
-        size_t GetStackTop() const { return stack.size(); }
-    private:
-        void FindClone(CodeTree& /*tree*/, bool /*recurse*/ = true)
-        {
-            // Disabled: Causes problems in optimization when
-            // the same subtree is included in logical and non-logical
-            // contexts: optimizations applied to the logical one will
-            // mess up the non-logical one.
-            return;
-            /*
-            std::multimap<fphash_t, CodeTree>::const_iterator
-                i = clones.lower_bound(tree.GetHash());
-            for(; i != clones.end() && i->first == tree.GetHash(); ++i)
-            {
-                if(i->second.IsIdenticalTo(tree))
-                    tree.Become(i->second);
-            }
-            if(recurse)
-                for(size_t a=0; a<tree.GetParamCount(); ++a)
-                    FindClone(tree.GetParam(a));
-            clones.insert(std::make_pair(tree.GetHash(), tree));
-            */
-        }
-    private:
-        std::vector<CodeTree> stack;
-        std::multimap<fphash_t, CodeTree> clones;
-
-        bool keep_powi;
-
-    private:
-        CodeTreeParserData(const CodeTreeParserData&);
-        CodeTreeParserData& operator=(const CodeTreeParserData&);
-    };
-
-    struct IfInfo
-    {
-        CodeTree condition;
-        CodeTree thenbranch;
-        size_t endif_location;
-    };
-}
-
-namespace FPoptimizer_CodeTree
-{
-    void CodeTree::GenerateFrom(
-        const std::vector<unsigned>& ByteCode,
-        const std::vector<double>& Immed,
-        const FunctionParser::Data& fpdata,
-        bool keep_powi)
-    {
-        std::vector<CodeTree> var_trees;
-        var_trees.reserve(fpdata.numVariables);
-        for(unsigned n=0; n<fpdata.numVariables; ++n)
-        {
-            var_trees.push_back( CodeTree(n+VarBegin, CodeTree::VarTag()) );
-        }
-        GenerateFrom(ByteCode,Immed,fpdata,var_trees,keep_powi);
-    }
-
-    void CodeTree::GenerateFrom(
-        const std::vector<unsigned>& ByteCode,
-        const std::vector<double>& Immed,
-        const FunctionParser::Data& fpdata,
-        const std::vector<CodeTree>& var_trees,
-        bool keep_powi)
-    {
-        CodeTreeParserData sim(keep_powi);
-        std::vector<IfInfo> if_stack;
-
-        for(size_t IP=0, DP=0; ; ++IP)
-        {
-        after_powi:
-            while(!if_stack.empty() &&
-              (   // Normal If termination rule:
-                  if_stack.back().endif_location == IP
-                  // This rule matches when cJumps are threaded:
-               || (IP < ByteCode.size() && ByteCode[IP] == cJump
-                   && if_stack.back().thenbranch.IsDefined())
-              ))
-            {
-                // The "else" of an "if" ends here
-                CodeTree elsebranch = sim.PullResult();
-                sim.Push(if_stack.back().condition);
-                sim.Push(if_stack.back().thenbranch);
-                sim.Push(elsebranch);
-                sim.Eat(3, cIf);
-                if_stack.pop_back();
-            }
-            if(IP >= ByteCode.size()) break;
-
-            unsigned opcode = ByteCode[IP];
-            if((opcode == cSqr || opcode == cDup
-             || opcode == cInv || opcode == cNeg
-             || opcode == cSqrt || opcode == cRSqrt
-             || opcode == cFetch))
-            {
-                // Parse a powi sequence
-                size_t was_ip = IP;
-                double exponent = ParsePowiSequence(
-                    ByteCode, IP, if_stack.empty() ? ByteCode.size() : if_stack.back().endif_location,
-                    sim.GetStackTop()-1);
-                if(exponent != 1.0)
-                {
-                    //std::cout << "Found exponent at " << was_ip << ": " << exponent << "\n";
-                    sim.AddConst(exponent);
-                    sim.Eat(2, cPow);
-                    goto after_powi;
-                }
-                if(opcode == cDup
-                || opcode == cFetch
-                || opcode == cNeg)
-                {
-                    double factor = ParseMuliSequence(
-                        ByteCode, IP, if_stack.empty() ? ByteCode.size() : if_stack.back().endif_location,
-                        sim.GetStackTop()-1);
-                    if(factor != 1.0)
-                    {
-                        //std::cout << "Found factor at " << was_ip << ": " << factor << "\n";
-                        sim.AddConst(factor);
-                        sim.Eat(2, cMul);
-                        goto after_powi;
-                    }
-                }
-                IP = was_ip;
-            }
-            if(OPCODE(opcode) >= VarBegin)
-            {
-                sim.Push(var_trees[opcode-VarBegin]);
-            }
-            else
-            {
-                switch( OPCODE(opcode) )
-                {
-                    // Specials
-                    case cIf:
-                    case cAbsIf:
-                    {
-                        if_stack.resize(if_stack.size() + 1);
-                        CodeTree res( sim.PullResult() );
-                        if_stack.back().condition.swap( res );
-                        if_stack.back().endif_location = ByteCode.size();
-                        IP += 2; // dp,sp for elsebranch are irrelevant.
-                        continue;
-                    }
-                    case cJump:
-                    {
-                        CodeTree res( sim.PullResult() );
-                        if_stack.back().thenbranch.swap( res );
-                        if_stack.back().endif_location = ByteCode[IP+1]+1;
-                        IP += 2;
-                        continue;
-                    }
-                    case cImmed:
-                        sim.AddConst(Immed[DP++]);
-                        break;
-                    case cDup:
-                        sim.Dup();
-                        break;
-                    case cNop:
-                        break;
-                    case cFCall:
-                    {
-                        unsigned funcno = ByteCode[++IP];
-                        assert(funcno < fpdata.FuncPtrs.size());
-                        unsigned params = fpdata.FuncPtrs[funcno].params;
-                        sim.EatFunc(params, OPCODE(opcode), funcno);
-                        break;
-                    }
-                    case cPCall:
-                    {
-                        unsigned funcno = ByteCode[++IP];
-                        assert(funcno < fpdata.FuncParsers.size());
-                        const FunctionParserBase<double>& p =
-                            *fpdata.FuncParsers[funcno].parserPtr;
-                        unsigned params = fpdata.FuncParsers[funcno].params;
-
-                        /* Inline the procedure call */
-                        /* Works because cPCalls can never recurse */
-                        std::vector<CodeTree> paramlist = sim.Pop(params);
-                        CodeTree pcall_tree;
-                        pcall_tree.GenerateFrom(p.data->ByteCode, p.data->Immed, *p.data,
-                                                paramlist);
-                        sim.Push(pcall_tree);
-                        break;
-                    }
-                    // Unary operators requiring special attention
-                    case cInv:  // already handled by powi_opt
-                        //sim.Eat(1, cInv);
-                        //break;
-                        sim.AddConst(1);
-                        sim.SwapLastTwoInStack();
-                        sim.Eat(2, cDiv);
-                        break;
-                    case cNeg: // already handled by powi_opt
-                        sim.Eat(1, cNeg);
-                        break;
-                        sim.AddConst(0);
-                        sim.SwapLastTwoInStack();
-                        sim.Eat(2, cSub);
-                        break;
-                    case cSqr: // already handled by powi_opt
-                        //sim.Eat(1, cSqr);
-                        //break;
-                        sim.AddConst(2);
-                        sim.Eat(2, cPow);
-                        break;
-                    // Unary functions requiring special attention
-                    case cSqrt: // already handled by powi_opt
-                        sim.AddConst(0.5);
-                        sim.Eat(2, cPow);
-                        break;
-                    case cRSqrt: // already handled by powi_opt
-                        sim.AddConst(-0.5);
-                        sim.Eat(2, cPow);
-                        break;
-                    case cCbrt:
-                        sim.AddConst(1.0 / 3.0);
-                        sim.Eat(2, cPow);
-                        break;
-                    case cDeg:
-                        sim.AddConst(CONSTANT_DR);
-                        sim.Eat(2, cMul);
-                        break;
-                    case cRad:
-                        sim.AddConst(CONSTANT_RD);
-                        sim.Eat(2, cMul);
-                        break;
-                    case cExp:
-                        if(keep_powi) goto default_function_handling;
-                        sim.AddConst(CONSTANT_E);
-                        sim.SwapLastTwoInStack();
-                        sim.Eat(2, cPow);
-                        break;
-                    case cExp2: // from fpoptimizer
-                        if(keep_powi) goto default_function_handling;
-                        sim.AddConst(2.0);
-                        sim.SwapLastTwoInStack();
-                        sim.Eat(2, cPow);
-                        break;
-                    case cCot:
-                        sim.Eat(1, cTan);
-                        if(keep_powi) { sim.Eat(1, cInv); break; }
-                        sim.AddConst(-1);
-                        sim.Eat(2, cPow);
-                        break;
-                    case cCsc:
-                        sim.Eat(1, cSin);
-                        if(keep_powi) { sim.Eat(1, cInv); break; }
-                        sim.AddConst(-1);
-                        sim.Eat(2, cPow);
-                        break;
-                    case cSec:
-                        sim.Eat(1, cCos);
-                        if(keep_powi) { sim.Eat(1, cInv); break; }
-                        sim.AddConst(-1);
-                        sim.Eat(2, cPow);
-                        break;
-                    case cInt: // int(x) = floor(x + 0.5)
-                    #ifndef __x86_64
-                        if(keep_powi) { sim.Eat(1, cInt); break; }
-                    #endif
-                        sim.AddConst(0.5);
-                        sim.Eat(2, cAdd);
-                        sim.Eat(1, cFloor);
-                        break;
-                    case cLog10:
-                        sim.Eat(1, cLog);
-                        sim.AddConst(CONSTANT_L10I);
-                        sim.Eat(2, cMul);
-                        break;
-                    case cLog2:
-                        sim.Eat(1, cLog);
-                        sim.AddConst(CONSTANT_L2I);
-                        sim.Eat(2, cMul);
-                        break;
-                    case cLog2by: // x y     -> log(x)*CONSTANT_L2I*y
-                        sim.SwapLastTwoInStack();   // y x
-                        sim.Eat(1, cLog);           // y log(x)
-                        sim.AddConst(CONSTANT_L2I); // y log(x) CONSTANT_L2I
-                        sim.Eat(3, cMul);           // y*log(x)*CONSTANT_L2I
-                        break;
-                    //case cLog:
-                    //    sim.Eat(1, cLog2);
-                    //    sim.AddConst(CONSTANT_L2);
-                    //    sim.Eat(2, cMul);
-                    //    break;
-                    // Binary operators requiring special attention
-                    case cSub:
-                        if(keep_powi) { sim.Eat(2, cSub); break; }
-                        sim.AddConst(-1);
-                        sim.Eat(2, cMul); // -x is x*-1
-                        sim.Eat(2, cAdd); // Minus is negative adding
-                        break;
-                    case cRSub: // from fpoptimizer
-                        sim.SwapLastTwoInStack();
-                        if(keep_powi) { sim.Eat(2, cSub); break; }
-                        sim.AddConst(-1);
-                        sim.Eat(2, cMul); // -x is x*-1
-                        sim.Eat(2, cAdd);
-                        break;
-                    case cDiv:
-                        if(keep_powi) { sim.Eat(2, cDiv); break; }
-                        sim.AddConst(-1);
-                        sim.Eat(2, cPow); // 1/x is x^-1
-                        sim.Eat(2, cMul); // Divide is inverse multiply
-                        break;
-                    case cRDiv: // from fpoptimizer
-                        sim.SwapLastTwoInStack();
-                        if(keep_powi) { sim.Eat(2, cDiv); break; }
-                        sim.AddConst(-1);
-                        sim.Eat(2, cPow); // 1/x is x^-1
-                        sim.Eat(2, cMul); // Divide is inverse multiply
-                        break;
-                    // Binary operators not requiring special attention
-                    case cAdd: case cMul:
-                    case cMod: case cPow:
-                    case cEqual: case cLess: case cGreater:
-                    case cNEqual: case cLessOrEq: case cGreaterOrEq:
-                    case cAnd: case cOr:
-                    case cAbsAnd: case cAbsOr:
-                        sim.Eat(2, OPCODE(opcode));
-                        break;
-                    // Unary operators not requiring special attention
-                    case cNot:
-                    case cNotNot: // from fpoptimizer
-                    case cAbsNot:
-                    case cAbsNotNot:
-                        sim.Eat(1, OPCODE(opcode));
-                        break;
-                    // Special opcodes generated by fpoptimizer itself
-                    case cFetch:
-                        sim.Fetch(ByteCode[++IP]);
-                        break;
-                    case cPopNMov:
-                    {
-                        unsigned stackOffs_target = ByteCode[++IP];
-                        unsigned stackOffs_source = ByteCode[++IP];
-                        sim.PopNMov(stackOffs_target, stackOffs_source);
-                        break;
-                    }
-                    // Other functions
-#ifndef FP_DISABLE_EVAL
-                    case cEval:
-                    {
-                        size_t paramcount = fpdata.numVariables;
-                        sim.Eat(paramcount, OPCODE(opcode));
-                        break;
-                    }
-#endif
-
-                    default:
-                    default_function_handling:;
-                        unsigned funcno = opcode-cAbs;
-                        assert(funcno < FUNC_AMOUNT);
-                        const FuncDefinition& func = Functions[funcno];
-                        sim.Eat(func.params, OPCODE(opcode));
-                        break;
-                }
-            }
-        }
-        Become(sim.PullResult());
-    #ifdef DEBUG_SUBSTITUTIONS
-        std::cout << "Produced tree:\n";
-        DumpTreeWithIndent(*this);
-    #endif
-    }
-}
-
-#endif
-
-#line 1 "fpoptimizer/fpoptimizer_constantfolding.c"
-// line removed for fpoptimizer.c: #include "fpoptimizer_codetree.h"
-// line removed for fpoptimizer.c: #include "fpoptimizer_optimize.h"
-// line removed for fpoptimizer.c: #include "fpoptimizer_consts.h"
-
-#include <cmath> /* for CalculateResultBoundaries() */
-#include <algorithm>
-
-#include "fpconfig.h"
-#include "fparser.h"
-#include "fptypes.h"
-
-#ifdef FP_SUPPORT_OPTIMIZER
-
-using namespace FUNCTIONPARSERTYPES;
-using namespace FPoptimizer_CodeTree;
-
-#define FP_MUL_COMBINE_EXPONENTS
-
-#ifdef _MSC_VER
-#include <float.h>
-#define isinf(x) (!_finite(x))
-#endif
-
-namespace
-{
-    bool IsLogicalTrueValue(const MinMaxTree& p, bool abs)
-    {
-        if(p.has_min && p.min >= 0.5) return true;
-        if(!abs && p.has_max && p.max <= -0.5) return true;
-        return false;
-    }
-    bool IsLogicalFalseValue(const MinMaxTree& p, bool abs)
-    {
-        if(abs)
-            return p.has_max && p.max < 0.5;
-        else
-            return p.has_min && p.has_max
-               && p.min > -0.5 && p.max < 0.5;
-    }
-    int GetLogicalValue(const MinMaxTree& p, bool abs)
-    {
-        if(IsLogicalTrueValue(p, abs)) return 1;
-        if(IsLogicalFalseValue(p, abs)) return 0;
-        return -1;
-    }
-
-    struct ComparisonSet /* For optimizing And, Or */
-    {
-        static const int Lt_Mask = 0x1; // 1=less
-        static const int Eq_Mask = 0x2; // 2=equal
-        static const int Le_Mask = 0x3; // 1+2 = Less or Equal
-        static const int Gt_Mask = 0x4; // 4=greater
-        static const int Ne_Mask = 0x5; // 4+1 = Greater or Less, i.e. Not equal
-        static const int Ge_Mask = 0x6; // 4+2 = Greater or Equal
-        static int Swap_Mask(int m) { return (m&Eq_Mask)
-                                  | ((m&Lt_Mask) ? Gt_Mask : 0)
-                                  | ((m&Gt_Mask) ? Lt_Mask : 0); }
-        struct Comparison
-        {
-            CodeTree a;
-            CodeTree b;
-            int relationship;
-        };
-        std::vector<Comparison> relationships;
-        struct Item
-        {
-            CodeTree value;
-            bool negated;
-        };
-        std::vector<Item> plain_set;
-        int const_offset;
-
-        enum RelationshipResult
-        {
-            Ok,
-            BecomeZero,
-            BecomeOne,
-            Suboptimal
-        };
-        enum ConditionType
-        {
-            cond_or,
-            cond_and,
-            cond_mul,
-            cond_add
-        };
-
-        ComparisonSet():
-            relationships(),
-            plain_set(),
-            const_offset(0)
-        {
-        }
-
-        RelationshipResult AddItem(const CodeTree& a, bool negated, ConditionType type)
-        {
-            for(size_t c=0; c<plain_set.size(); ++c)
-                if(plain_set[c].value.IsIdenticalTo(a))
-                {
-                    if(negated != plain_set[c].negated)
-                    {
-                        switch(type)
-                        {
-                            case cond_or:
-                                return BecomeOne;
-                            case cond_add:
-                                plain_set.erase(plain_set.begin() + c);
-                                const_offset += 1;
-                                return Suboptimal;
-                            case cond_and:
-                            case cond_mul:
-                                return BecomeZero;
-                        }
-                    }
-                    return Suboptimal;
-                }
-            Item pole;
-            pole.value   = a;
-            pole.negated = negated;
-            plain_set.push_back(pole);
-            return Ok;
-        }
-
-        RelationshipResult AddRelationship(CodeTree a, CodeTree b, int reltype, ConditionType type)
-        {
-            switch(type)
-            {
-                case cond_or:
-                    if(reltype == 7) return BecomeOne;
-                    break;
-                case cond_add:
-                    if(reltype == 7) { const_offset += 1; return Suboptimal; }
-                    break;
-                case cond_and:
-                case cond_mul:
-                    if(reltype == 0) return BecomeZero;
-                    break;
-            }
-
-            if(!(a.GetHash() < b.GetHash()))
-            {
-                a.swap(b);
-                reltype = Swap_Mask(reltype);
-            }
-
-            for(size_t c=0; c<relationships.size(); ++c)
-            {
-                if(relationships[c].a.IsIdenticalTo(a)
-                && relationships[c].b.IsIdenticalTo(b))
-                {
-                    switch(type)
-                    {
-                        case cond_or:
-                        {
-                            int newrel = relationships[c].relationship | reltype;
-                            if(newrel == 7) return BecomeOne;
-                            relationships[c].relationship = newrel;
-                            break;
-                        }
-                        case cond_and:
-                        case cond_mul:
-                        {
-                            int newrel = relationships[c].relationship & reltype;
-                            if(newrel == 0) return BecomeZero;
-                            relationships[c].relationship = newrel;
-                            break;
-                        }
-                        case cond_add:
-                        {
-                            int newrel_or  = relationships[c].relationship | reltype;
-                            int newrel_and = relationships[c].relationship & reltype;
-                            if(newrel_or  == 5 // < + >
-                            && newrel_and == 0)
-                            {
-                                // (x<y) + (x>y) = x!=y
-                                relationships[c].relationship = Ne_Mask;
-                                return Suboptimal;
-                            }
-                            if(newrel_or  == 7
-                            && newrel_and == 0)
-                            {
-                                // (x<y) + (x>=y) = 1
-                                // (x<=y) + (x>y) = 1
-                                // (x=y) + (x!=y) = 1
-                                const_offset += 1;
-                                relationships.erase(relationships.begin()+c);
-                                return Suboptimal;
-                            }
-                            if(newrel_or  == 7
-                            && newrel_and == Eq_Mask)
-                            {
-                                // (x<=y) + (x>=y) = 1 + (x=y)
-                                relationships[c].relationship = Eq_Mask;
-                                const_offset += 1;
-                                return Suboptimal;
-                            }
-                            continue;
-                        }
-                    }
-                    return Suboptimal;
-                }
-            }
-            Comparison comp;
-            comp.a = a;
-            comp.b = b;
-            comp.relationship = reltype;
-            relationships.push_back(comp);
-            return Ok;
-        }
-    };
-
-    struct CollectionSet /* For optimizing Add,  Mul */
-    {
-        struct Collection
-        {
-            CodeTree value;
-            CodeTree factor;
-            bool factor_needs_rehashing;
-
-            Collection() : value(),factor(), factor_needs_rehashing(false) { }
-            Collection(const CodeTree& v, const CodeTree& f)
-                : value(v), factor(f), factor_needs_rehashing(false) { }
-        };
-        std::multimap<fphash_t, Collection> collections;
-
-        enum CollectionResult
-        {
-            Ok,
-            Suboptimal
-        };
-
-        typedef std::multimap<fphash_t, Collection>::iterator PositionType;
-
-        PositionType FindIdenticalValueTo(const CodeTree& value)
-        {
-            fphash_t hash = value.GetHash();
-            for(PositionType
-                i = collections.lower_bound(hash);
-                i != collections.end() && i->first == hash;
-                ++i)
-            {
-                if(value.IsIdenticalTo(i->second.value))
-                    return i;
-            }
-            return collections.end();
-        }
-        bool Found(const PositionType& b) { return b != collections.end(); }
-
-        CollectionResult AddCollectionTo(const CodeTree& factor,
-                                         const PositionType& into_which)
-        {
-            Collection& c = into_which->second;
-            if(c.factor_needs_rehashing)
-                c.factor.AddParam(factor);
-            else
-            {
-                CodeTree add;
-                add.SetOpcode(cAdd);
-                add.AddParamMove(c.factor);
-                add.AddParam(factor);
-                c.factor.swap(add);
-                c.factor_needs_rehashing = true;
-            }
-            return Suboptimal;
-        }
-
-        CollectionResult AddCollection(const CodeTree& value, const CodeTree& factor)
-        {
-            const fphash_t hash = value.GetHash();
-            PositionType i = collections.lower_bound(hash);
-            for(; i != collections.end() && i->first == hash; ++i)
-            {
-                if(i->second.value.IsIdenticalTo(value))
-                    return AddCollectionTo(factor, i);
-            }
-            collections.insert(
-                i,
-                std::make_pair( hash, Collection(value, factor) ) );
-            return Ok;
-        }
-
-        CollectionResult AddCollection(const CodeTree& a)
-        {
-            return AddCollection(a, CodeTree(1.0) );
-        }
-    };
-
-    struct Select2ndRev
-    {
-        template<typename T>
-        inline bool operator() (const T& a, const T& b) const
-        {
-            return a.second > b.second;
-        }
-    };
-    struct Select1st
-    {
-        template<typename T1, typename T2>
-        inline bool operator() (const std::pair<T1,T2>& a,
-                                const std::pair<T1,T2>& b) const
-        {
-            return a.first < b.first;
-        }
-
-        template<typename T1, typename T2>
-        inline bool operator() (const std::pair<T1,T2>& a, T1 b) const
-        {
-            return a.first < b;
-        }
-
-        template<typename T1, typename T2>
-        inline bool operator() (T1 a, const std::pair<T1,T2>& b) const
-        {
-            return a < b.first;
-        }
-    };
-
-    bool IsEvenIntegerConst(double v)
-    {
-        return IsIntegerConst(v) && ((long)v % 2) == 0;
-    }
-
-    struct ConstantExponentCollection
-    {
-        typedef std::pair<double, std::vector<CodeTree> > ExponentInfo;
-        std::vector<ExponentInfo> data;
-
-        void MoveToSet_Unique(double exponent, std::vector<CodeTree>& source_set)
-        {
-            data.push_back( std::pair<double, std::vector<CodeTree> >
-                            (exponent, std::vector<CodeTree>() ) );
-            data.back().second.swap(source_set);
-        }
-        void MoveToSet_NonUnique(double exponent, std::vector<CodeTree>& source_set)
-        {
-            std::vector<ExponentInfo>::iterator i
-                = std::lower_bound(data.begin(), data.end(), exponent, Select1st());
-            if(i != data.end() && i->first == exponent)
-            {
-                i->second.insert(i->second.end(), source_set.begin(), source_set.end());
-            }
-            else
-            {
-                //MoveToSet_Unique(exponent, source_set);
-                data.insert(i,  std::pair<double, std::vector<CodeTree> >
-                                (exponent, source_set) );
-            }
-        }
-
-        bool Optimize()
-        {
-            /* TODO: Group them such that:
-             *
-             *      x^3 *         z^2 becomes (x*z)^2 * x^1
-             *      x^3 * y^2.5 * z^2 becomes (x*z*y)^2 * y^0.5 * x^1
-             *                    rather than (x*y*z)^2 * (x*y)^0.5 * x^0.5
-             *
-             *      x^4.5 * z^2.5     becomes (z * x)^2.5 * x^2
-             *                        becomes (x*z*x)^2 * (z*x)^0.5
-             *                        becomes (z*x*x*z*x)^0.5 * (z*x*x)^1.5 -- buzz, bad.
-             *
-             */
-            bool changed = false;
-            std::sort( data.begin(), data.end(), Select1st() );
-        redo:
-            /* Supposed algorithm:
-             * For the smallest pair of data[] where the difference
-             * between the two is a "neat value" (x*16 is positive integer),
-             * do the combining as indicated above.
-             */
-            /*
-             * NOTE: Hanged in Testbed test P44, looping the following
-             *       (Var0 ^ 0.75) * ((1.5 * Var0) ^ 1.0)
-             *     = (Var0 ^ 1.75) *  (1.5         ^ 1.0)
-             *       Fixed by limiting to cases where (exp_a != 1.0).
-             *
-             * NOTE: Converting (x*z)^0.5 * x^16.5
-             *              into x^17 * z^0.5
-             *       is handled by code within CollectMulGroup().
-             *       However, bacause it is prone for infinite looping,
-             *       the use of "IsIdenticalTo(before)" is added at the
-             *       end of ConstantFolding_MulGrouping().
-             *
-             *       This algorithm could make it into (x*z*x)^0.5 * x^16,
-             *       but this is wrong, for it falsely includes x^evenint.. twice.
-             */
-            for(size_t a=0; a<data.size(); ++a)
-            {
-                double exp_a = data[a].first;
-                if(FloatEqual(exp_a, 1.0)) continue;
-                for(size_t b=a+1; b<data.size(); ++b)
-                {
-                    double exp_b = data[b].first;
-                    double exp_diff = exp_b - exp_a;
-                    if(exp_diff >= fabs(exp_a)) break;
-                    double exp_diff_still_probable_integer = exp_diff * 16.0;
-                    if(IsIntegerConst(exp_diff_still_probable_integer)
-                    && !(IsIntegerConst(exp_b) && !IsIntegerConst(exp_diff))
-                      )
-                    {
-                        /* When input is x^3 * z^2,
-                         * exp_a = 2
-                         * a_set = z
-                         * exp_b = 3
-                         * b_set = x
-                         * exp_diff = 3-2 = 1
-                         */
-                        std::vector<CodeTree>& a_set = data[a].second;
-                        std::vector<CodeTree>& b_set = data[b].second;
-          #ifdef DEBUG_SUBSTITUTIONS
-                        std::cout << "Before ConstantExponentCollection iteration:\n";
-                        Dump(std::cout);
-          #endif
-                        if(IsIntegerConst(exp_b)
-                        && IsEvenIntegerConst(exp_b)
-                        //&& !IsEvenIntegerConst(exp_diff)
-                        && !IsEvenIntegerConst(exp_diff+exp_a))
-                        {
-                            CodeTree tmp2;
-                            tmp2.SetOpcode(cMul);
-                            tmp2.SetParamsMove(b_set);
-                            tmp2.Rehash();
-                            CodeTree tmp;
-                            tmp.SetOpcode(cAbs);
-                            tmp.AddParamMove(tmp2);
-                            tmp.Rehash();
-                            b_set.resize(1);
-                            b_set[0].swap(tmp);
-                        }
-
-                        a_set.insert(a_set.end(), b_set.begin(), b_set.end());
-
-                        std::vector<CodeTree> b_copy = b_set;
-                        data.erase(data.begin() + b);
-                        MoveToSet_NonUnique(exp_diff, b_copy);
-                        changed = true;
-
-          #ifdef DEBUG_SUBSTITUTIONS
-                        std::cout << "After ConstantExponentCollection iteration:\n";
-                        Dump(std::cout);
-          #endif
-                        goto redo;
-                    }
-                }
-            }
-            return changed;
-        }
-
-    #ifdef DEBUG_SUBSTITUTIONS
-        void Dump(std::ostream& out)
-        {
-            for(size_t a=0; a<data.size(); ++a)
-            {
-                out.precision(12);
-                out << data[a].first << ": ";
-                for(size_t b=0; b<data[a].second.size(); ++b)
-                {
-                    if(b > 0) out << '*';
-                    DumpTree(data[a].second[b], out);
-                }
-                out << std::endl;
-            }
-        }
-    #endif
-
-    };
-
-    struct RangeComparisonData
-    {
-        enum Decision
-        {
-            MakeFalse=0,
-            MakeTrue=1,
-            MakeNEqual=2,
-            MakeEqual=3,
-            MakeNotNotP0=4,
-            MakeNotNotP1=5,
-            MakeNotP0=6,
-            MakeNotP1=7,
-            Unchanged=8
-        };
-        enum WhatDoWhenCase
-        {
-            Never =0,
-            Eq0   =1, // val==0
-            Eq1   =2, // val==1
-            Gt0Le1=3, // val>0 && val<=1
-            Ge0Lt1=4  // val>=0 && val<1
-        };
-        Decision if_identical; // What to do when operands are identical
-        Decision if_always[4]; // What to do if Always <, <=, >, >=
-        struct { Decision what : 4; WhatDoWhenCase when : 4; }
-            p0_logical_a, p1_logical_a,
-            p0_logical_b, p1_logical_b;
-
-        Decision Analyze(const CodeTree& a, const CodeTree& b) const
-        {
-            if(a.IsIdenticalTo(b))
-                return if_identical;
-
-            MinMaxTree p0 = a.CalculateResultBoundaries();
-            MinMaxTree p1 = b.CalculateResultBoundaries();
-            if(p0.has_max && p1.has_min)
-            {
-                if(p0.max <  p1.min && if_always[0] != Unchanged)
-                    return if_always[0]; // p0 < p1
-                if(p0.max <= p1.min && if_always[1] != Unchanged)
-                    return if_always[1]; // p0 <= p1
-            }
-            if(p0.has_min && p1.has_max)
-            {
-                if(p0.min >  p1.max && if_always[2] != Unchanged)
-                    return if_always[2]; // p0 > p1
-                if(p0.min >= p1.max && if_always[3] != Unchanged)
-                    return if_always[3]; // p0 >= p1
-            }
-
-            if(a.IsLogicalValue())
-            {
-                if(p0_logical_a.what != Unchanged)
-                    if(TestCase(p0_logical_a.when, p1)) return p0_logical_a.what;
-                if(p0_logical_b.what != Unchanged)
-                    if(TestCase(p0_logical_b.when, p1)) return p0_logical_b.what;
-            }
-            if(b.IsLogicalValue())
-            {
-                if(p1_logical_a.what != Unchanged)
-                    if(TestCase(p1_logical_a.when, p0)) return p1_logical_a.what;
-                if(p1_logical_b.what != Unchanged)
-                    if(TestCase(p1_logical_b.when, p0)) return p1_logical_b.what;
-            }
-            return Unchanged;
-        }
-        static bool TestCase(WhatDoWhenCase when, const MinMaxTree& p)
-        {
-            if(!p.has_min || !p.has_max) return false;
-            switch(when)
-            {
-                case Eq0: return p.min==0.0 && p.max==p.min;
-                case Eq1: return p.min==1.0 && p.max==p.max;
-                case Gt0Le1: return p.min>0 && p.max<=1;
-                case Ge0Lt1: return p.min>=0 && p.max<1;
-                default:;
-            }
-            return false;
-        }
-    };
-
-}
-
-namespace FPoptimizer_CodeTree
-{
-    template<typename CondType> /* ComparisonSet::ConditionType */
-    bool CodeTree::ConstantFolding_LogicCommon(CondType cond_type, bool is_logical)
-    {
-        bool should_regenerate = false;
-        ComparisonSet comp;
-        for(size_t a=0; a<GetParamCount(); ++a)
-        {
-            ComparisonSet::RelationshipResult change = ComparisonSet::Ok;
-            const CodeTree& atree = GetParam(a);
-            switch(atree.GetOpcode())
-            {
-                case cEqual:
-                    change = comp.AddRelationship(atree.GetParam(0), atree.GetParam(1), ComparisonSet::Eq_Mask, cond_type);
-                    break;
-                case cNEqual:
-                    change = comp.AddRelationship(atree.GetParam(0), atree.GetParam(1), ComparisonSet::Ne_Mask, cond_type);
-                    break;
-                case cLess:
-                    change = comp.AddRelationship(atree.GetParam(0), atree.GetParam(1), ComparisonSet::Lt_Mask, cond_type);
-                    break;
-                case cLessOrEq:
-                    change = comp.AddRelationship(atree.GetParam(0), atree.GetParam(1), ComparisonSet::Le_Mask, cond_type);
-                    break;
-                case cGreater:
-                    change = comp.AddRelationship(atree.GetParam(0), atree.GetParam(1), ComparisonSet::Gt_Mask, cond_type);
-                    break;
-                case cGreaterOrEq:
-                    change = comp.AddRelationship(atree.GetParam(0), atree.GetParam(1), ComparisonSet::Ge_Mask, cond_type);
-                    break;
-                case cNot:
-                    change = comp.AddItem(atree.GetParam(0), true, cond_type);
-                    break;
-                case cNotNot:
-                    change = comp.AddItem(atree.GetParam(0), false, cond_type);
-                    break;
-                default:
-                    if(is_logical || atree.IsLogicalValue())
-                        change = comp.AddItem(atree, false, cond_type);
-            }
-            switch(change)
-            {
-            ReplaceTreeWithZero:
-                    data = new CodeTreeData(0.0);
-                    return true;
-            ReplaceTreeWithOne:
-                    data = new CodeTreeData(1.0);
-                    return true;
-                case ComparisonSet::Ok: // ok
-                    break;
-                case ComparisonSet::BecomeZero: // whole set was invalidated
-                    goto ReplaceTreeWithZero;
-                case ComparisonSet::BecomeOne: // whole set was validated
-                    goto ReplaceTreeWithOne;
-                case ComparisonSet::Suboptimal: // something was changed
-                    should_regenerate = true;
-                    break;
-            }
-        }
-        if(should_regenerate)
-        {
-          #ifdef DEBUG_SUBSTITUTIONS
-            std::cout << "Before ConstantFolding_LogicCommon: "; DumpTree(*this);
-            std::cout << "\n";
-          #endif
-
-            if(is_logical)
-            {
-                DelParams(); // delete all params
-            }
-            else
-            {
-                // Delete only logical params
-                for(size_t a=GetParamCount(); a-- > 0; )
-                {
-                    const CodeTree& atree = GetParam(a);
-                    if(atree.IsLogicalValue())
-                        DelParam(a);
-                }
-            }
-
-            for(size_t a=0; a<comp.plain_set.size(); ++a)
-            {
-                if(comp.plain_set[a].negated)
-                {
-                    CodeTree r;
-                    r.SetOpcode(cNot);
-                    r.AddParamMove(comp.plain_set[a].value);
-                    r.Rehash();
-                    AddParamMove(r);
-                }
-                else if(!is_logical)
-                {
-                    CodeTree r;
-                    r.SetOpcode(cNotNot);
-                    r.AddParamMove(comp.plain_set[a].value);
-                    r.Rehash();
-                    AddParamMove(r);
-                }
-                else
-                    AddParamMove(comp.plain_set[a].value);
-            }
-            for(size_t a=0; a<comp.relationships.size(); ++a)
-            {
-                CodeTree r;
-                r.SetOpcode(cNop); // dummy
-                switch(comp.relationships[a].relationship)
-                {
-                    case ComparisonSet::Lt_Mask: r.SetOpcode( cLess ); break;
-                    case ComparisonSet::Eq_Mask: r.SetOpcode( cEqual ); break;
-                    case ComparisonSet::Gt_Mask: r.SetOpcode( cGreater ); break;
-                    case ComparisonSet::Le_Mask: r.SetOpcode( cLessOrEq ); break;
-                    case ComparisonSet::Ne_Mask: r.SetOpcode( cNEqual ); break;
-                    case ComparisonSet::Ge_Mask: r.SetOpcode( cGreaterOrEq ); break;
-                }
-                r.AddParamMove(comp.relationships[a].a);
-                r.AddParamMove(comp.relationships[a].b);
-                r.Rehash();
-                AddParamMove(r);
-            }
-            if(comp.const_offset != 0)
-                AddParam( CodeTree( double(comp.const_offset) ) );
-          #ifdef DEBUG_SUBSTITUTIONS
-            std::cout << "After ConstantFolding_LogicCommon: "; DumpTree(*this);
-            std::cout << "\n";
-          #endif
-            return true;
-        }
-        /*
-        Note: One thing this does not yet do, is to detect chains
-              such as x=y & y=z & x=z, which could be optimized
-              to x=y & x=z.
-        */
-        return false;
-    }
-
-    bool CodeTree::ConstantFolding_AndLogic()
-    {
-        return ConstantFolding_LogicCommon( ComparisonSet::cond_and, true );
-    }
-    bool CodeTree::ConstantFolding_OrLogic()
-    {
-        return ConstantFolding_LogicCommon( ComparisonSet::cond_or, true );
-    }
-    bool CodeTree::ConstantFolding_AddLogicItems()
-    {
-        return ConstantFolding_LogicCommon( ComparisonSet::cond_add, false );
-    }
-    bool CodeTree::ConstantFolding_MulLogicItems()
-    {
-        return ConstantFolding_LogicCommon( ComparisonSet::cond_mul, false );
-    }
-
-    static CodeTree CollectMulGroup_Item(
-        CodeTree& value,
-        bool& has_highlevel_opcodes)
-    {
-        switch(value.GetOpcode())
-        {
-            case cPow:
-            {
-                CodeTree exponent = value.GetParam(1);
-                value.Become( value.GetParam(0) );
-                return exponent;
-            }
-            /* - disabled to avoid clashes with powi
-            case cCbrt:
-                value.Become( value.GetParam(0) );
-                has_highlevel_opcodes = true;
-                return CodeTree(1.0 / 3.0);
-            case cSqrt:
-                value.Become( value.GetParam(0) );
-                has_highlevel_opcodes = true;
-                return CodeTree(0.5);
-            */
-            case cRSqrt:
-                value.Become( value.GetParam(0) );
-                has_highlevel_opcodes = true;
-                return CodeTree(-0.5);
-            case cInv:
-                value.Become( value.GetParam(0) );
-                has_highlevel_opcodes = true;
-                return CodeTree(-1.0);
-            default: break;
-        }
-        return CodeTree(1.0);
-    }
-
-    static void CollectMulGroup(
-        CollectionSet& mul, const CodeTree& tree, const CodeTree& factor,
-        bool& should_regenerate,
-        bool& has_highlevel_opcodes
-    )
-    {
-        for(size_t a=0; a<tree.GetParamCount(); ++a)
-        {
-            CodeTree value(tree.GetParam(a));
-
-            CodeTree exponent ( CollectMulGroup_Item(value, has_highlevel_opcodes) );
-
-            if(!factor.IsImmed() || factor.GetImmed() != 1.0)
-            {
-                CodeTree new_exp;
-                new_exp.SetOpcode(cMul);
-                new_exp.AddParam( exponent );
-                new_exp.AddParam( factor );
-                new_exp.Rehash();
-                exponent.swap( new_exp );
-            }
-        #if 0 /* FIXME: This does not work */
-            if(value.GetOpcode() == cMul)
-            {
-                if(1)
-                {
-                    // Avoid erroneously converting
-                    //          (x*z)^0.5 * z^2
-                    // into     x^0.5 * z^2.5
-                    // It should be x^0.5 * abs(z)^2.5, but this is not a good conversion.
-                    bool exponent_is_even = exponent.IsImmed() && IsEvenIntegerConst(exponent.GetImmed());
-
-                    for(size_t b=0; b<value.GetParamCount(); ++b)
-                    {
-                        bool tmp=false;
-                        CodeTree val(value.GetParam(b));
-                        CodeTree exp(CollectMulGroup_Item(val, tmp));
-                        if(exponent_is_even
-                        || (exp.IsImmed() && IsEvenIntegerConst(exp.GetImmed())))
-                        {
-                            CodeTree new_exp;
-                            new_exp.SetOpcode(cMul);
-                            new_exp.AddParam(exponent);
-                            new_exp.AddParamMove(exp);
-                            new_exp.ConstantFolding();
-                            if(!new_exp.IsImmed() || !IsEvenIntegerConst(new_exp.GetImmed()))
-                            {
-                                goto cannot_adopt_mul;
-                            }
-                        }
-                    }
-                }
-                CollectMulGroup(mul, value, exponent,
-                                should_regenerate,
-                                has_highlevel_opcodes);
-            }
-            else cannot_adopt_mul:
-        #endif
-            {
-                if(mul.AddCollection(value, exponent) == CollectionSet::Suboptimal)
-                    should_regenerate = true;
-            }
-        }
-    }
-
-    bool CodeTree::ConstantFolding_MulGrouping()
-    {
-        bool has_highlevel_opcodes = false;
-        bool should_regenerate = false;
-        CollectionSet mul;
-
-        CollectMulGroup(mul, *this, CodeTree(1.0),
-                        should_regenerate,
-                        has_highlevel_opcodes);
-
-        typedef std::pair<CodeTree/*exponent*/,
-                          std::vector<CodeTree>/*base value (mul group)*/
-                         > exponent_list;
-        typedef std::multimap<fphash_t,/*exponent hash*/
-                              exponent_list> exponent_map;
-        exponent_map by_exponent;
-
-        for(CollectionSet::PositionType
-            j = mul.collections.begin();
-            j != mul.collections.end();
-            ++j)
-        {
-            CodeTree& value = j->second.value;
-            CodeTree& exponent = j->second.factor;
-            if(j->second.factor_needs_rehashing) exponent.Rehash();
-            const fphash_t exponent_hash = exponent.GetHash();
-
-            exponent_map::iterator i = by_exponent.lower_bound(exponent_hash);
-            for(; i != by_exponent.end() && i->first == exponent_hash; ++i)
-                if(i->second.first.IsIdenticalTo(exponent))
-                {
-                    if(!exponent.IsImmed() || !FloatEqual(exponent.GetImmed(), 1.0))
-                        should_regenerate = true;
-                    i->second.second.push_back(value);
-                    goto skip_b;
-                }
-            by_exponent.insert(i, std::make_pair(exponent_hash,
-                std::make_pair(exponent,
-                               std::vector<CodeTree> (size_t(1), value)
-                              )));
-        skip_b:;
-        }
-
-    #ifdef FP_MUL_COMBINE_EXPONENTS
-        ConstantExponentCollection by_float_exponent;
-        for(exponent_map::iterator
-            j,i = by_exponent.begin();
-            i != by_exponent.end();
-            i=j)
-        {
-            j=i; ++j;
-            exponent_list& list = i->second;
-            if(list.first.IsImmed())
-            {
-                double exponent = list.first.GetImmed();
-                if(!(exponent == 0.0))
-                    by_float_exponent.MoveToSet_Unique(exponent, list.second);
-                by_exponent.erase(i);
-            }
-        }
-        if(by_float_exponent.Optimize())
-            should_regenerate = true;
-    #endif
-
-        if(should_regenerate)
-        {
-            CodeTree before = *this;
-            before.CopyOnWrite();
-
-          #ifdef DEBUG_SUBSTITUTIONS
-            std::cout << "Before ConstantFolding_MulGrouping: "; DumpTree(before);
-            std::cout << "\n";
-          #endif
-            DelParams();
-
-            /* Group by exponents */
-            /* First handle non-constant exponents */
-            for(exponent_map::iterator
-                i = by_exponent.begin();
-                i != by_exponent.end();
-                ++i)
-            {
-                exponent_list& list = i->second;
-        #ifndef FP_MUL_COMBINE_EXPONENTS
-                if(list.first.IsImmed())
-                {
-                    double exponent = list.first.GetImmed();
-                    if(exponent == 0.0) continue;
-                    if(FloatEqual(exponent, 1.0))
-                    {
-                        AddParamsMove(list.second);
-                        continue;
-                    }
-                }
-        #endif
-                CodeTree mul;
-                mul.SetOpcode(cMul);
-                mul.SetParamsMove( list.second);
-                mul.Rehash();
-
-                if(has_highlevel_opcodes && list.first.IsImmed())
-                {
-                    if(list.first.GetImmed() == 1.0 / 3.0)
-                    {
-                        CodeTree cbrt;
-                        cbrt.SetOpcode(cCbrt);
-                        cbrt.AddParamMove(mul);
-                        cbrt.Rehash();
-                        AddParamMove(cbrt);
-                        continue;
-                    }
-                    if(list.first.GetImmed() == 0.5)
-                    {
-                        CodeTree sqrt;
-                        sqrt.SetOpcode(cSqrt);
-                        sqrt.AddParamMove(mul);
-                        sqrt.Rehash();
-                        AddParamMove(sqrt);
-                        continue;
-                    }
-                    if(list.first.GetImmed() == -0.5)
-                    {
-                        CodeTree rsqrt;
-                        rsqrt.SetOpcode(cRSqrt);
-                        rsqrt.AddParamMove(mul);
-                        rsqrt.Rehash();
-                        AddParamMove(rsqrt);
-                        continue;
-                    }
-                    if(list.first.GetImmed() == -1.0)
-                    {
-                        CodeTree inv;
-                        inv.SetOpcode(cInv);
-                        inv.AddParamMove(mul);
-                        inv.Rehash();
-                        AddParamMove(inv);
-                        continue;
-                    }
-                }
-                CodeTree pow;
-                pow.SetOpcode(cPow);
-                pow.AddParamMove(mul);
-                pow.AddParamMove( list.first );
-                pow.Rehash();
-                AddParamMove(pow);
-            }
-        #ifdef FP_MUL_COMBINE_EXPONENTS
-            by_exponent.clear();
-            /* Then handle constant exponents */
-            for(size_t a=0; a<by_float_exponent.data.size(); ++a)
-            {
-                double exponent = by_float_exponent.data[a].first;
-                if(FloatEqual(exponent, 1.0))
-                {
-                    AddParamsMove(by_float_exponent.data[a].second);
-                    continue;
-                }
-                CodeTree mul;
-                mul.SetOpcode(cMul);
-                mul.SetParamsMove( by_float_exponent.data[a].second );
-                mul.Rehash();
-                CodeTree pow;
-                pow.SetOpcode(cPow);
-                pow.AddParamMove(mul);
-                pow.AddParam( CodeTree( exponent ) );
-                pow.Rehash();
-                AddParamMove(pow);
-            }
-        #endif
-          #ifdef DEBUG_SUBSTITUTIONS
-            std::cout << "After ConstantFolding_MulGrouping: "; DumpTree(*this);
-            std::cout << "\n";
-          #endif
-            // return true;
-            return !IsIdenticalTo(before); // avoids infinite looping
-        }
-        return false;
-    }
-
-    bool CodeTree::ConstantFolding_AddGrouping()
-    {
-        bool should_regenerate = false;
-        CollectionSet add;
-        for(size_t a=0; a<GetParamCount(); ++a)
-        {
-            if(GetParam(a).GetOpcode() == cMul) continue;
-            if(add.AddCollection(GetParam(a)) == CollectionSet::Suboptimal)
-                should_regenerate = true;
-            // This catches x + x and x - x
-        }
-        std::vector<bool> remaining ( GetParamCount() );
-        size_t has_mulgroups_remaining = 0;
-        for(size_t a=0; a<GetParamCount(); ++a)
-        {
-            const CodeTree& mulgroup = GetParam(a);
-            if(mulgroup.GetOpcode() == cMul)
-            {
-                // This catches x + y*x*z, producing x*(1 + y*z)
-                //
-                // However we avoid changing 7 + 7*x into 7*(x+1),
-                // because it may lead us into producing code such
-                // as 20*x + 50*(x+1) + 10, which would be much
-                // better expressed as 70*x + 60, and converting
-                // back to that format would be needlessly hairy.
-                for(size_t b=0; b<mulgroup.GetParamCount(); ++b)
-                {
-                    if(mulgroup.GetParam(b).IsImmed()) continue;
-                    CollectionSet::PositionType c
-                        = add.FindIdenticalValueTo(mulgroup.GetParam(b));
-                    if(add.Found(c))
-                    {
-                        CodeTree tmp(mulgroup, CodeTree::CloneTag());
-                        tmp.DelParam(b);
-                        tmp.Rehash();
-                        add.AddCollectionTo(tmp, c);
-                        should_regenerate = true;
-                        goto done_a;
-                    }
-                }
-                remaining[a]  = true;
-                has_mulgroups_remaining += 1;
-            done_a:;
-            }
-        }
-
-        if(has_mulgroups_remaining > 0)
-        {
-            if(has_mulgroups_remaining > 1) // is it possible to find a duplicate?
-            {
-                std::vector< std::pair<CodeTree, size_t> > occurance_counts;
-                std::multimap<fphash_t, size_t> occurance_pos;
-                bool found_dup = false;
-                for(size_t a=0; a<GetParamCount(); ++a)
-                    if(remaining[a])
-                    {
-                        // This catches x*a + x*b, producing x*(a+b)
-                        for(size_t b=0; b<GetParam(a).GetParamCount(); ++b)
-                        {
-                            const CodeTree& p = GetParam(a).GetParam(b);
-                            const fphash_t   p_hash = p.GetHash();
-                            for(std::multimap<fphash_t, size_t>::const_iterator
-                                i = occurance_pos.lower_bound(p_hash);
-                                i != occurance_pos.end() && i->first == p_hash;
-                                ++i)
-                            {
-                                if(occurance_counts[i->second].first.IsIdenticalTo(p))
-                                {
-                                    occurance_counts[i->second].second += 1;
-                                    found_dup = true;
-                                    goto found_mulgroup_item_dup;
-                                }
-                            }
-                            occurance_counts.push_back(std::make_pair(p, size_t(1)));
-                            occurance_pos.insert(std::make_pair(p_hash, occurance_counts.size()-1));
-                        found_mulgroup_item_dup:;
-                        }
-                    }
-                if(found_dup)
-                {
-                    // Find the "x" to group by
-                    CodeTree group_by; { size_t max = 0;
-                    for(size_t p=0; p<occurance_counts.size(); ++p)
-                        if(occurance_counts[p].second <= 1)
-                            occurance_counts[p].second = 0;
-                        else
-                        {
-                            occurance_counts[p].second *= occurance_counts[p].first.GetDepth();
-                            if(occurance_counts[p].second > max)
-                                { group_by = occurance_counts[p].first; max = occurance_counts[p].second; }
-                        } }
-                    // Collect the items for adding in the group (a+b)
-                    CodeTree group_add;
-                    group_add.SetOpcode(cAdd);
-
-        #ifdef DEBUG_SUBSTITUTIONS
-                    std::cout << "Duplicate across some trees: ";
-                    DumpTree(group_by);
-                    std::cout << " in ";
-                    DumpTree(*this);
-                    std::cout << "\n";
-        #endif
-                    for(size_t a=0; a<GetParamCount(); ++a)
-                        if(remaining[a])
-                            for(size_t b=0; b<GetParam(a).GetParamCount(); ++b)
-                                if(group_by.IsIdenticalTo(GetParam(a).GetParam(b)))
-                                {
-                                    CodeTree tmp(GetParam(a), CodeTree::CloneTag());
-                                    tmp.DelParam(b);
-                                    tmp.Rehash();
-                                    group_add.AddParamMove(tmp);
-                                    remaining[a] = false;
-                                    break;
-                                }
-                    group_add.Rehash();
-                    CodeTree group;
-                    group.SetOpcode(cMul);
-                    group.AddParamMove(group_by);
-                    group.AddParamMove(group_add);
-                    group.Rehash();
-                    add.AddCollection(group);
-                    should_regenerate = true;
-                }
-            }
-
-            // all remaining mul-groups.
-            for(size_t a=0; a<GetParamCount(); ++a)
-                if(remaining[a])
-                {
-                    if(add.AddCollection(GetParam(a)) == CollectionSet::Suboptimal)
-                        should_regenerate = true;
-                }
-        }
-
-        if(should_regenerate)
-        {
-          #ifdef DEBUG_SUBSTITUTIONS
-            std::cout << "Before ConstantFolding_AddGrouping: "; DumpTree(*this);
-            std::cout << "\n";
-          #endif
-            DelParams();
-
-            for(CollectionSet::PositionType
-                j = add.collections.begin();
-                j != add.collections.end();
-                ++j)
-            {
-                CodeTree& value = j->second.value;
-                CodeTree& coeff = j->second.factor;
-                if(j->second.factor_needs_rehashing) coeff.Rehash();
-
-                if(coeff.IsImmed())
-                {
-                    if(coeff.GetImmed() == 0.0)
-                        continue;
-                    if(FloatEqual(coeff.GetImmed(), 1.0))
-                    {
-                        AddParamMove(value);
-                        continue;
-                    }
-                }
-                CodeTree mul;
-                mul.SetOpcode(cMul);
-                mul.AddParamMove(value);
-                mul.AddParamMove(coeff);
-                mul.Rehash();
-                AddParamMove(mul);
-            }
-          #ifdef DEBUG_SUBSTITUTIONS
-            std::cout << "After ConstantFolding_AddGrouping: "; DumpTree(*this);
-            std::cout << "\n";
-          #endif
-            return true;
-        }
-        return false;
-    }
-
-    bool CodeTree::ConstantFolding_IfOperations()
-    {
-        // If the If() condition begins with a cNot,
-        // remove the cNot and swap the branches.
-        for(;;)
-        {
-            if(GetParam(0).GetOpcode() == cNot)
-            {
-                SetOpcode(cIf);
-                GetParam(0).Become( GetParam(0).GetParam(0) );
-                GetParam(1).swap(GetParam(2));
-            }
-            else if(GetParam(0).GetOpcode() == cAbsNot)
-            {
-                SetOpcode(cAbsIf);
-                GetParam(0).Become( GetParam(0).GetParam(0) );
-                GetParam(1).swap(GetParam(2));
-            }
-            else break;
-        }
-        if(GetParam(0).GetOpcode() == cIf
-        || GetParam(0).GetOpcode() == cAbsIf)
-        {
-            //     if(if(x, a,b), c,d)
-            //  -> if(x, if(a, c,d), if(b, c,d))
-            // when either a or b is constantly true/false
-            CodeTree cond = GetParam(0);
-            CodeTree truth_a;
-            truth_a.SetOpcode(cond.GetOpcode() == cIf ? cNotNot : cAbsNotNot);
-            truth_a.AddParam(cond.GetParam(1));
-            truth_a.ConstantFolding();
-            CodeTree truth_b;
-            truth_b.SetOpcode(cond.GetOpcode() == cIf ? cNotNot : cAbsNotNot);
-            truth_b.AddParam(cond.GetParam(2));
-            truth_b.ConstantFolding();
-            if(truth_a.IsImmed() || truth_b.IsImmed())
-            {
-                CodeTree then_tree;
-                then_tree.SetOpcode(cond.GetOpcode());
-                then_tree.AddParam(cond.GetParam(1));
-                then_tree.AddParam(GetParam(1));
-                then_tree.AddParam(GetParam(2));
-                then_tree.Rehash();
-                CodeTree else_tree;
-                else_tree.SetOpcode(cond.GetOpcode());
-                else_tree.AddParam(cond.GetParam(2));
-                else_tree.AddParam(GetParam(1));
-                else_tree.AddParam(GetParam(2));
-                else_tree.Rehash();
-                SetOpcode(cond.GetOpcode());
-                SetParam(0, cond.GetParam(0));
-                SetParamMove(1, then_tree);
-                SetParamMove(2, else_tree);
-                return true; // rerun cIf optimization
-            }
-        }
-        if(GetParam(1).GetOpcode() == GetParam(2).GetOpcode()
-        && (GetParam(1).GetOpcode() == cIf
-         || GetParam(1).GetOpcode() == cAbsIf))
-        {
-            CodeTree& leaf1 = GetParam(1);
-            CodeTree& leaf2 = GetParam(2);
-            if(leaf1.GetParam(0).IsIdenticalTo(leaf2.GetParam(0))
-            && (leaf1.GetParam(1).IsIdenticalTo(leaf2.GetParam(1))
-             || leaf1.GetParam(2).IsIdenticalTo(leaf2.GetParam(2))))
-            {
-            //     if(x, if(y,a,b), if(y,c,d))
-            // ->  if(y, if(x,a,c), if(x,b,d))
-            // when either a,c are identical or b,d are identical
-                CodeTree then_tree;
-                then_tree.SetOpcode(GetOpcode());
-                then_tree.AddParam(GetParam(0));
-                then_tree.AddParam(leaf1.GetParam(1));
-                then_tree.AddParam(leaf2.GetParam(1));
-                then_tree.Rehash();
-                CodeTree else_tree;
-                else_tree.SetOpcode(GetOpcode());
-                else_tree.AddParam(GetParam(0));
-                else_tree.AddParam(leaf1.GetParam(2));
-                else_tree.AddParam(leaf2.GetParam(2));
-                else_tree.Rehash();
-                SetOpcode(leaf1.GetOpcode());
-                SetParam(0, leaf1.GetParam(0));
-                SetParamMove(1, then_tree);
-                SetParamMove(2, else_tree);
-                return true; // rerun cIf optimization
-            // cIf [x (cIf [y a z]) (cIf [y z b])] : (cXor x y) z (cIf[x a b])
-            // ^ if only we had cXor opcode.
-            }
-            if(leaf1.GetParam(1).IsIdenticalTo(leaf2.GetParam(1))
-            && leaf1.GetParam(2).IsIdenticalTo(leaf2.GetParam(2)))
-            {
-                //    if(x, if(y,a,b), if(z,a,b))
-                // -> if( if(x, y,z), a,b)
-                CodeTree cond_tree;
-                cond_tree.SetOpcode(GetOpcode());
-                cond_tree.AddParamMove(GetParam(0));
-                cond_tree.AddParam(leaf1.GetParam(0));
-                cond_tree.AddParam(leaf2.GetParam(0));
-                cond_tree.Rehash();
-                SetOpcode(leaf1.GetOpcode());
-                SetParamMove(0, cond_tree);
-                SetParam(2, leaf1.GetParam(2));
-                SetParam(1, leaf1.GetParam(1));
-                return true; // rerun cIf optimization
-            }
-            if(leaf1.GetParam(1).IsIdenticalTo(leaf2.GetParam(2))
-            && leaf1.GetParam(2).IsIdenticalTo(leaf2.GetParam(1)))
-            {
-                //    if(x, if(y,a,b), if(z,b,a))
-                // -> if( if(x, y,!z), a,b)
-                CodeTree not_tree;
-                not_tree.SetOpcode(leaf2.GetOpcode() == cIf ? cNot : cAbsNot);
-                not_tree.AddParam(leaf2.GetParam(0));
-                not_tree.Rehash();
-                CodeTree cond_tree;
-                cond_tree.SetOpcode(GetOpcode());
-                cond_tree.AddParamMove(GetParam(0));
-                cond_tree.AddParam(leaf1.GetParam(0));
-                cond_tree.AddParamMove(not_tree);
-                cond_tree.Rehash();
-                SetOpcode(leaf1.GetOpcode());
-                SetParamMove(0, cond_tree);
-                SetParam(2, leaf1.GetParam(2));
-                SetParam(1, leaf1.GetParam(1));
-                return true; // rerun cIf optimization
-            }
-        }
-
-        // If the sub-expression evaluates to approx. zero, yield param3.
-        // If the sub-expression evaluates to approx. nonzero, yield param2.
-        MinMaxTree p = GetParam(0).CalculateResultBoundaries();
-        switch(GetLogicalValue(p, GetOpcode()==cAbsIf))
-        {
-            case 1: // true
-                Become(GetParam(1));
-                return true; // rerun optimization (opcode changed)
-            case 0: // false
-                Become(GetParam(2));
-                return true; // rerun optimization (opcode changed)
-            default: ;
-        }
-
-        CodeTree& branch1 = GetParam(1);
-        CodeTree& branch2 = GetParam(2);
-
-        if(branch1.IsIdenticalTo(branch2))
-        {
-            // If both branches of an If() are identical, the test becomes unnecessary
-            Become(GetParam(1));
-            return true; // rerun optimization (opcode changed)
-        }
-
-        const OPCODE op1 = branch1.GetOpcode();
-        const OPCODE op2 = branch2.GetOpcode();
-        if(op1 == op2)
-        {
-            // If both branches apply the same unary function to different values,
-            // extract the function. E.g. if(x,sin(a),sin(b)) -> sin(if(x,a,b))
-            if(branch1.GetParamCount() == 1)
-            {
-                CodeTree changed_if;
-                changed_if.SetOpcode(GetOpcode());
-                changed_if.AddParamMove(GetParam(0));
-                changed_if.AddParam(branch1.GetParam(0));
-                changed_if.AddParam(branch2.GetParam(0));
-                changed_if.Rehash();
-                SetOpcode(op1);
-                DelParams();
-                AddParamMove(changed_if);
-                return true; // rerun optimization (opcode changed)
-            }
-            if(op1 == cAdd    || op1 == cMul
-            || op1 == cAnd    || op1 == cOr
-            || op1 == cAbsAnd || op1 == cAbsOr
-            || op1 == cMin    || op1 == cMax)
-            {
-                // If the two groups contain one or more
-                // identical values, extract them.
-                std::vector<CodeTree> overlap;
-                for(size_t a=branch1.GetParamCount(); a-- > 0; )
-                {
-                    for(size_t b=branch2.GetParamCount(); b-- > 0; )
-                    {
-                        if(branch1.GetParam(a).IsIdenticalTo(branch2.GetParam(b)))
-                        {
-                            if(overlap.empty()) { branch1.CopyOnWrite(); branch2.CopyOnWrite(); }
-                            overlap.push_back(branch1.GetParam(a));
-                            branch2.DelParam(b);
-                            branch1.DelParam(a);
-                            break;
-                        }
-                    }
-                }
-                if(!overlap.empty())
-                {
-                    branch1.Rehash();
-                    branch2.Rehash();
-                    CodeTree changed_if;
-                    changed_if.SetOpcode(GetOpcode());
-                    changed_if.SetParamsMove(GetParams());
-                    changed_if.Rehash();
-                    SetOpcode(op1);
-                    SetParamsMove(overlap);
-                    AddParamMove(changed_if);
-                    return true; // rerun optimization (opcode changed)
-                }
-            }
-        }
-        // if(x, y+z, y) -> if(x, z,0)+y
-        if(op1 == cAdd
-        || op1 == cMul
-        || (op1 == cAnd && branch2.IsLogicalValue())
-        || (op1 == cOr  && branch2.IsLogicalValue())
-          )
-        {
-            for(size_t a=branch1.GetParamCount(); a-- > 0; )
-                if(branch1.GetParam(a).IsIdenticalTo(branch2))
-                {
-                    branch1.CopyOnWrite();
-                    branch1.DelParam(a);
-                    branch1.Rehash();
-                    CodeTree branch2_backup = branch2;
-                    branch2 = CodeTree( (op1==cAdd||op1==cOr) ? 0.0 : 1.0 );
-                    CodeTree changed_if;
-                    changed_if.SetOpcode(GetOpcode());
-                    changed_if.SetParamsMove(GetParams());
-                    changed_if.Rehash();
-                    SetOpcode(op1);
-                    AddParamMove(branch2_backup);
-                    AddParamMove(changed_if);
-                    return true; // rerun optimization (opcode changed)
-                }
-        }
-        // if(x, y&z, !!y) -> if(x, z, 1) & y
-        if((op1 == cAnd || op1 == cOr) && op2 == cNotNot)
-        {
-            CodeTree& branch2op = branch2.GetParam(0);
-            for(size_t a=branch1.GetParamCount(); a-- > 0; )
-                if(branch1.GetParam(a).IsIdenticalTo(branch2op))
-                {
-                    branch1.CopyOnWrite();
-                    branch1.DelParam(a);
-                    branch1.Rehash();
-                    CodeTree branch2_backup = branch2op;
-                    branch2 = CodeTree( (op1==cOr) ? 0.0 : 1.0 );
-                    CodeTree changed_if;
-                    changed_if.SetOpcode(GetOpcode());
-                    changed_if.SetParamsMove(GetParams());
-                    changed_if.Rehash();
-                    SetOpcode(op1);
-                    AddParamMove(branch2_backup);
-                    AddParamMove(changed_if);
-                    return true; // rerun optimization (opcode changed)
-                }
-        }
-        // if(x, y, y+z) -> if(x, 0,z)+y
-        if(op2 == cAdd
-        || op2 == cMul
-        || (op2 == cAnd && branch1.IsLogicalValue())
-        || (op2 == cOr  && branch1.IsLogicalValue())
-          )
-        {
-            for(size_t a=branch2.GetParamCount(); a-- > 0; )
-                if(branch2.GetParam(a).IsIdenticalTo(branch1))
-                {
-                    branch2.CopyOnWrite();
-                    branch2.DelParam(a);
-                    branch2.Rehash();
-                    CodeTree branch1_backup = branch1;
-                    branch1 = CodeTree( (op2==cAdd||op2==cOr) ? 0.0 : 1.0 );
-                    CodeTree changed_if;
-                    changed_if.SetOpcode(GetOpcode());
-                    changed_if.SetParamsMove(GetParams());
-                    changed_if.Rehash();
-                    SetOpcode(op2);
-                    AddParamMove(branch1_backup);
-                    AddParamMove(changed_if);
-                    return true; // rerun optimization (opcode changed)
-                }
-        }
-        // if(x, !!y, y&z) -> if(x, 1, z) & y
-        if((op2 == cAnd || op2 == cOr) && op1 == cNotNot)
-        {
-            CodeTree& branch1op = branch1.GetParam(0);
-            for(size_t a=branch2.GetParamCount(); a-- > 0; )
-                if(branch2.GetParam(a).IsIdenticalTo(branch1op))
-                {
-                    branch2.CopyOnWrite();
-                    branch2.DelParam(a);
-                    branch2.Rehash();
-                    CodeTree branch1_backup = branch1op;
-                    branch1 = CodeTree( (op2==cOr) ? 0.0 : 1.0 );
-                    CodeTree changed_if;
-                    changed_if.SetOpcode(GetOpcode());
-                    changed_if.SetParamsMove(GetParams());
-                    changed_if.Rehash();
-                    SetOpcode(op2);
-                    AddParamMove(branch1_backup);
-                    AddParamMove(changed_if);
-                    return true; // rerun optimization (opcode changed)
-                }
-        }
-        return false; // No changes
-    }
-
-    bool CodeTree::ConstantFolding_PowOperations()
-    {
-        if(GetParam(0).IsImmed()
-        && GetParam(1).IsImmed())
-        {
-            double const_value = fp_pow(GetParam(0).GetImmed(),
-                                        GetParam(1).GetImmed());
-            data = new CodeTreeData(const_value);
-            return false;
-        }
-        if(GetParam(1).IsImmed()
-        && (float)GetParam(1).GetImmed() == 1.0)
-        {
-            // Conversion through a float type value gets rid of
-            // awkward abs(x)^1 generated from exp(log(x^6)/6),
-            // without sacrificing as much precision as FloatEqual() does.
-            // x^1 = x
-            Become(GetParam(0));
-            return true; // rerun optimization (opcode changed)
-        }
-        if(GetParam(0).IsImmed()
-        && (float)GetParam(0).GetImmed() == 1.0)
-        {
-            // 1^x = 1
-            data = new CodeTreeData(1.0);
-            return false;
-        }
-
-        // 5^(20*x) = (5^20)^x
-        if(GetParam(0).IsImmed()
-        && GetParam(1).GetOpcode() == cMul)
-        {
-            bool changes = false;
-            double base_immed = GetParam(0).GetImmed();
-            CodeTree mulgroup = GetParam(1);
-            for(size_t a=mulgroup.GetParamCount(); a-->0; )
-                if(mulgroup.GetParam(a).IsImmed())
-                {
-                    double imm = mulgroup.GetParam(a).GetImmed();
-                    //if(imm >= 0.0)
-                    {
-                        double new_base_immed = fp_pow(base_immed, imm);
-                      if(std::isinf(new_base_immed) || new_base_immed == 0.0)
-                        {
-                            // It produced an infinity. Do not change.
-                            break;
-                        }
-
-                        if(!changes)
-                        {
-                            changes = true;
-                            mulgroup.CopyOnWrite();
-                        }
-                        base_immed = new_base_immed;
-                        mulgroup.DelParam(a);
-                        break; //
-                    }
-                }
-            if(changes)
-            {
-                mulgroup.Rehash();
-            #ifdef DEBUG_SUBSTITUTIONS
-                std::cout << "Before pow-mul change: "; DumpTree(*this);
-                std::cout << "\n";
-            #endif
-                GetParam(0).Become(CodeTree(base_immed));
-                GetParam(1).Become(mulgroup);
-            #ifdef DEBUG_SUBSTITUTIONS
-                std::cout << "After pow-mul change: "; DumpTree(*this);
-                std::cout << "\n";
-            #endif
-            }
-        }
-        // (x*20)^2 = x^2 * 20^2
-        if(GetParam(1).IsImmed()
-        && GetParam(0).GetOpcode() == cMul)
-        {
-            double exponent_immed = GetParam(1).GetImmed();
-            double factor_immed   = 1.0;
-            bool changes = false;
-            CodeTree& mulgroup = GetParam(0);
-            for(size_t a=mulgroup.GetParamCount(); a-->0; )
-                if(mulgroup.GetParam(a).IsImmed())
-                {
-                    double imm = mulgroup.GetParam(a).GetImmed();
-                    //if(imm >= 0.0)
-                    {
-                        double new_factor_immed = fp_pow(imm, exponent_immed);
-                        if(std::isinf(new_factor_immed) || new_factor_immed == 0.0)
-                        {
-                            // It produced an infinity. Do not change.
-                            break;
-                        }
-                        if(!changes)
-                        {
-                            changes = true;
-                            mulgroup.CopyOnWrite();
-                        }
-                        factor_immed *= new_factor_immed;
-                        mulgroup.DelParam(a);
-                        break; //
-                    }
-                }
-            if(changes)
-            {
-                mulgroup.Rehash();
-                CodeTree newpow;
-                newpow.SetOpcode(cPow);
-                newpow.SetParamsMove(GetParams());
-                SetOpcode(cMul);
-                AddParamMove(newpow);
-                AddParam( CodeTree(factor_immed) );
-                return true; // rerun optimization (opcode changed)
-            }
-        }
-
-        // (x^3)^2 = x^6
-        // NOTE: If 3 is even and 3*2 is not, x must be changed to abs(x).
-        if(GetParam(0).GetOpcode() == cPow
-        && GetParam(1).IsImmed()
-        && GetParam(0).GetParam(1).IsImmed())
-        {
-            double a = GetParam(0).GetParam(1).GetImmed();
-            double b = GetParam(1).GetImmed();
-            double c = a * b; // new exponent
-            if(IsEvenIntegerConst(a) // a is an even int?
-            && !IsEvenIntegerConst(c)) // c is not?
-            {
-                CodeTree newbase;
-                newbase.SetOpcode(cAbs);
-                newbase.AddParam(GetParam(0).GetParam(0));
-                newbase.Rehash();
-                SetParamMove(0, newbase);
-            }
-            else
-                SetParam(0, GetParam(0).GetParam(0));
-            SetParam(1, CodeTree(c));
-        }
-        return false; // No changes that require a rerun
-    }
-
-    bool CodeTree::ConstantFolding_ComparisonOperations()
-    {
-        static const RangeComparisonData Data[6] =
-        {
-            // cEqual:
-            // Case:      p0 == p1  Antonym: p0 != p1
-            // Synonym:   p1 == p0  Antonym: p1 != p0
-            { RangeComparisonData::MakeTrue,  // If identical: always true
-              {RangeComparisonData::MakeFalse,  // If Always p0 < p1: always false
-               RangeComparisonData::Unchanged,
-               RangeComparisonData::MakeFalse,  // If Always p0 > p1: always false
-               RangeComparisonData::Unchanged},
-             // NotNot(p0) if p1==1    NotNot(p1) if p0==1
-             //    Not(p0) if p1==0       Not(p1) if p0==0
-              {RangeComparisonData::MakeNotNotP0, RangeComparisonData::Eq1},
-              {RangeComparisonData::MakeNotNotP1, RangeComparisonData::Eq1},
-              {RangeComparisonData::MakeNotP0, RangeComparisonData::Eq0},
-              {RangeComparisonData::MakeNotP1, RangeComparisonData::Eq0}
-            },
-            // cNEqual:
-            // Case:      p0 != p1  Antonym: p0 == p1
-            // Synonym:   p1 != p0  Antonym: p1 == p0
-            { RangeComparisonData::MakeFalse,  // If identical: always false
-              {RangeComparisonData::MakeTrue,  // If Always p0 < p1: always true
-               RangeComparisonData::Unchanged,
-               RangeComparisonData::MakeTrue,  // If Always p0 > p1: always true
-               RangeComparisonData::Unchanged},
-             // NotNot(p0) if p1==0    NotNot(p1) if p0==0
-             //    Not(p0) if p1==1       Not(p1) if p0==1
-              {RangeComparisonData::MakeNotNotP0, RangeComparisonData::Eq0},
-              {RangeComparisonData::MakeNotNotP1, RangeComparisonData::Eq0},
-              {RangeComparisonData::MakeNotP0, RangeComparisonData::Eq1},
-              {RangeComparisonData::MakeNotP1, RangeComparisonData::Eq1}
-            },
-            // cLess:
-            // Case:      p0 < p1   Antonym: p0 >= p1
-            // Synonym:   p1 > p0   Antonym: p1 <= p0
-            { RangeComparisonData::MakeFalse,  // If identical: always false
-              {RangeComparisonData::MakeTrue,  // If Always p0  < p1: always true
-               RangeComparisonData::MakeNEqual,
-               RangeComparisonData::MakeFalse, // If Always p0 > p1: always false
-               RangeComparisonData::MakeFalse},// If Always p0 >= p1: always false
-             // Not(p0)   if p1>0 & p1<=1    --   NotNot(p1) if p0>=0 & p0<1
-              {RangeComparisonData::MakeNotP0,    RangeComparisonData::Gt0Le1},
-              {RangeComparisonData::MakeNotNotP1, RangeComparisonData::Ge0Lt1},
-              {RangeComparisonData::Unchanged, RangeComparisonData::Never},
-              {RangeComparisonData::Unchanged, RangeComparisonData::Never}
-            },
-            // cLessOrEq:
-            // Case:      p0 <= p1  Antonym: p0 > p1
-            // Synonym:   p1 >= p0  Antonym: p1 < p0
-            { RangeComparisonData::MakeTrue,   // If identical: always true
-              {RangeComparisonData::Unchanged, // If Always p0  < p1: ?
-               RangeComparisonData::MakeTrue,  // If Always p0 <= p1: always true
-               RangeComparisonData::MakeFalse, // If Always p0  > p1: always false
-               RangeComparisonData::MakeEqual},// If Never  p0  < p1:  use cEqual
-             // Not(p0)    if p1>=0 & p1<1   --   NotNot(p1) if p0>0 & p0<=1
-              {RangeComparisonData::MakeNotP0,    RangeComparisonData::Ge0Lt1},
-              {RangeComparisonData::MakeNotNotP1, RangeComparisonData::Gt0Le1},
-              {RangeComparisonData::Unchanged, RangeComparisonData::Never},
-              {RangeComparisonData::Unchanged, RangeComparisonData::Never}
-            },
-            // cGreater:
-            // Case:      p0 >  p1  Antonym: p0 <= p1
-            // Synonym:   p1 <  p0  Antonym: p1 >= p0
-            { RangeComparisonData::MakeFalse,  // If identical: always false
-              {RangeComparisonData::MakeFalse, // If Always p0  < p1: always false
-               RangeComparisonData::MakeFalse, // If Always p0 <= p1: always false
-               RangeComparisonData::MakeTrue,  // If Always p0  > p1: always true
-               RangeComparisonData::MakeNEqual},
-             // NotNot(p0) if p1>=0 & p1<1   --   Not(p1)   if p0>0 & p0<=1
-              {RangeComparisonData::MakeNotNotP0, RangeComparisonData::Ge0Lt1},
-              {RangeComparisonData::MakeNotP1,    RangeComparisonData::Gt0Le1},
-              {RangeComparisonData::Unchanged, RangeComparisonData::Never},
-              {RangeComparisonData::Unchanged, RangeComparisonData::Never}
-            },
-            // cGreaterOrEq:
-            // Case:      p0 >= p1  Antonym: p0 < p1
-            // Synonym:   p1 <= p0  Antonym: p1 > p0
-            { RangeComparisonData::MakeTrue,   // If identical: always true
-              {RangeComparisonData::MakeFalse, // If Always p0  < p1: always false
-               RangeComparisonData::MakeEqual, // If Always p0 >= p1: always true
-               RangeComparisonData::Unchanged, // If always p0  > p1: ?
-               RangeComparisonData::MakeTrue}, // If Never  p0  > p1:  use cEqual
-             // NotNot(p0) if p1>0 & p1<=1   --   Not(p1)    if p0>=0 & p0<1
-              {RangeComparisonData::MakeNotNotP0, RangeComparisonData::Gt0Le1},
-              {RangeComparisonData::MakeNotP1,    RangeComparisonData::Ge0Lt1},
-              {RangeComparisonData::Unchanged, RangeComparisonData::Never},
-              {RangeComparisonData::Unchanged, RangeComparisonData::Never}
-            }
-        };
-        switch(Data[GetOpcode()-cEqual].Analyze(GetParam(0), GetParam(1)))
-        {
-            case RangeComparisonData::MakeFalse:
-                data = new CodeTreeData(0.0); return true;
-            case RangeComparisonData::MakeTrue:
-                data = new CodeTreeData(1.0); return true;
-            case RangeComparisonData::MakeEqual:  SetOpcode(cEqual); return true;
-            case RangeComparisonData::MakeNEqual: SetOpcode(cNEqual); return true;
-            case RangeComparisonData::MakeNotNotP0: SetOpcode(cNotNot); DelParam(1); return true;
-            case RangeComparisonData::MakeNotNotP1: SetOpcode(cNotNot); DelParam(0); return true;
-            case RangeComparisonData::MakeNotP0: SetOpcode(cNot); DelParam(1); return true;
-            case RangeComparisonData::MakeNotP1: SetOpcode(cNot); DelParam(0); return true;
-            case RangeComparisonData::Unchanged:;
-        }
-        return false;
-    }
-
-    bool CodeTree::ConstantFolding_Assimilate()
-    {
-        /* If the list contains another list of the same kind, assimilate it */
-        bool assimilated = false;
-        for(size_t a=GetParamCount(); a-- > 0; )
-            if(GetParam(a).GetOpcode() == GetOpcode())
-            {
-              #ifdef DEBUG_SUBSTITUTIONS
-                if(!assimilated)
-                {
-                    std::cout << "Before assimilation: "; DumpTree(*this);
-                    std::cout << "\n";
-                    assimilated = true;
-                }
-              #endif
-                // Assimilate its children and remove it
-                AddParamsMove(GetParam(a).GetUniqueRef().GetParams(), a);
-            }
-      #ifdef DEBUG_SUBSTITUTIONS
-        if(assimilated)
-        {
-            std::cout << "After assimilation:   "; DumpTree(*this);
-            std::cout << "\n";
-        }
-      #endif
-        return assimilated;
-    }
-
-    void CodeTree::ConstantFolding()
-    {
-    #ifdef DEBUG_SUBSTITUTIONS
-        std::cout << "Runs ConstantFolding for: "; DumpTree(*this);
-        std::cout << "\n";
-    #endif
-        using namespace std;
-    redo:;
-
-        // Insert here any hardcoded constant-folding optimizations
-        // that you want to be done whenever a new subtree is generated.
-        /* Not recursive. */
-
-        double const_value = 1.0;
-        if(GetOpcode() != cImmed)
-        {
-            MinMaxTree p = CalculateResultBoundaries();
-            if(p.has_min && p.has_max && p.min == p.max)
-            {
-                // Replace us with this immed
-                const_value = p.min;
-                goto ReplaceTreeWithConstValue;
-            }
-        }
-
-        if(false)
-        {
-            ReplaceTreeWithOne:
-                const_value = 1.0;
-                goto ReplaceTreeWithConstValue;
-            ReplaceTreeWithZero:
-                const_value = 0.0;
-            ReplaceTreeWithConstValue:
-              #ifdef DEBUG_SUBSTITUTIONS
-                std::cout << "Replacing "; DumpTree(*this);
-                if(IsImmed())
-                    std::cout << "(" << std::hex
-                              << *(const uint_least64_t*)&GetImmed()
-                              << std::dec << ")";
-                std::cout << " with const value " << const_value;
-                std::cout << "(" << std::hex
-                          << *(const uint_least64_t*)&const_value
-                          << std::dec << ")";
-                std::cout << "\n";
-              #endif
-                data = new CodeTreeData(const_value);
-                return;
-            ReplaceTreeWithParam0:
-              #ifdef DEBUG_SUBSTITUTIONS
-                std::cout << "Before replace: "; DumpTree(*this);
-                std::cout << "\n";
-              #endif
-                Become(GetParam(0));
-              #ifdef DEBUG_SUBSTITUTIONS
-                std::cout << "After replace: "; DumpTree(*this);
-                std::cout << "\n";
-              #endif
-                goto redo;
-        }
-
-        /* Constant folding */
-        switch(GetOpcode())
-        {
-            case cImmed:
-                break; // nothing to do
-            case VarBegin:
-                break; // nothing to do
-
-            case cAnd:
-            case cAbsAnd:
-            {
-                ConstantFolding_Assimilate();
-                for(size_t a=GetParamCount(); a-- > 0; )
-                    switch(GetLogicalValue(GetParam(a).CalculateResultBoundaries(),
-                                           GetOpcode()==cAbsAnd))
-                    {
-                        case 0: goto ReplaceTreeWithZero;
-                        case 1: DelParam(a); break; // x & y & 1 = x & y;  x & 1 = !!x
-                        default: ;
-                    }
-                switch(GetParamCount())
-                {
-                    case 0: goto ReplaceTreeWithOne;
-                    case 1: SetOpcode(GetOpcode()==cAnd ? cNotNot : cAbsNotNot); goto redo; // Replace self with the single operand
-                    default: if(GetOpcode()==cAnd) if(ConstantFolding_AndLogic()) goto redo;
-                }
-                break;
-            }
-            case cOr:
-            case cAbsOr:
-            {
-                ConstantFolding_Assimilate();
-                for(size_t a=GetParamCount(); a-- > 0; )
-                    switch(GetLogicalValue(GetParam(a).CalculateResultBoundaries(),
-                                           GetOpcode()==cAbsOr))
-                    {
-                        case 1: goto ReplaceTreeWithOne;
-                        case 0: DelParam(a); break;
-                        default: ;
-                    }
-                switch(GetParamCount())
-                {
-                    case 0: goto ReplaceTreeWithZero;
-                    case 1: SetOpcode(GetOpcode()==cOr ? cNotNot : cAbsNotNot); goto redo; // Replace self with the single operand
-                    default: if(GetOpcode()==cOr) if(ConstantFolding_OrLogic()) goto redo;
-                }
-                break;
-            }
-            case cNot:
-            case cAbsNot:
-            {
-                unsigned opposite = 0;
-                switch(GetParam(0).GetOpcode())
-                {
-                    case cEqual:       opposite = cNEqual; break;
-                    case cNEqual:      opposite = cEqual; break;
-                    case cLess:        opposite = cGreaterOrEq; break;
-                    case cGreater:     opposite = cLessOrEq; break;
-                    case cLessOrEq:    opposite = cGreater; break;
-                    case cGreaterOrEq: opposite = cLess; break;
-                    //cNotNot already handled by grammar: @L cNotNot
-                    case cNot:         opposite = cNotNot; break;
-                    case cAbsNot:      opposite = cAbsNotNot; break;
-                    case cAbsNotNot:   opposite = cAbsNot; break;
-                    default: break;
-                }
-                if(opposite)
-                {
-                    SetOpcode(OPCODE(opposite));
-                    SetParamsMove(GetParam(0).GetUniqueRef().GetParams());
-                    goto redo;
-                }
-
-                // If the sub-expression evaluates to approx. zero, yield one.
-                // If the sub-expression evaluates to approx. nonzero, yield zero.
-                switch(GetLogicalValue(GetParam(0).CalculateResultBoundaries(),
-                                       GetOpcode()==cAbsNot))
-                {
-                    case 1: goto ReplaceTreeWithZero;
-                    case 0: goto ReplaceTreeWithOne;
-                    default: ;
-                }
-                if(GetOpcode() == cNot && GetParam(0).IsAlwaysSigned(true))
-                    SetOpcode(cAbsNot);
-
-                if(GetParam(0).GetOpcode() == cIf
-                || GetParam(0).GetOpcode() == cAbsIf)
-                {
-                    CodeTree iftree = GetParam(0);
-                    const CodeTree& ifp1 = iftree.GetParam(1);
-                    const CodeTree& ifp2 = iftree.GetParam(2);
-                    if(ifp1.GetOpcode() == cNot
-                    || ifp1.GetOpcode() == cAbsNot)
-                    {
-                        // cNot [(cIf [x (cNot[y]) z])] -> cIf [x (cNotNot[y]) (cNot[z])]
-                        SetParam(0, iftree.GetParam(0)); // condition
-                        CodeTree p1;
-                        p1.SetOpcode(ifp1.GetOpcode()==cNot ? cNotNot : cAbsNotNot);
-                        p1.AddParam(ifp1.GetParam(0));
-                        p1.Rehash();
-                        AddParamMove(p1);
-                        CodeTree p2;
-                        p2.SetOpcode(GetOpcode());
-                        p2.AddParam(ifp2);
-                        p2.Rehash();
-                        AddParamMove(p2);
-                        SetOpcode(iftree.GetOpcode());
-                        goto redo;
-                    }
-                    if(ifp2.GetOpcode() == cNot
-                    || ifp2.GetOpcode() == cAbsNot)
-                    {
-                        // cNot [(cIf [x y (cNot[z])])] -> cIf [x (cNot[y]) (cNotNot[z])]
-                        SetParam(0, iftree.GetParam(0)); // condition
-                        CodeTree p1;
-                        p1.SetOpcode(GetOpcode());
-                        p1.AddParam(ifp1);
-                        p1.Rehash();
-                        AddParamMove(p1);
-                        CodeTree p2;
-                        p2.SetOpcode(ifp2.GetOpcode()==cNot ? cNotNot : cAbsNotNot);
-                        p2.AddParam(ifp2.GetParam(0));
-                        p2.Rehash();
-                        AddParamMove(p2);
-                        SetOpcode(iftree.GetOpcode());
-                        goto redo;
-                    }
-                }
-                break;
-            }
-            case cNotNot:
-            case cAbsNotNot:
-            {
-                // The function of cNotNot is to protect a logical value from
-                // changing. If the parameter is already a logical value,
-                // then the cNotNot opcode is redundant.
-                if(GetParam(0).IsLogicalValue())
-                    goto ReplaceTreeWithParam0;
-
-                // If the sub-expression evaluates to approx. zero, yield zero.
-                // If the sub-expression evaluates to approx. nonzero, yield one.
-                switch(GetLogicalValue(GetParam(0).CalculateResultBoundaries(),
-                                       GetOpcode()==cAbsNotNot))
-                {
-                    case 0: goto ReplaceTreeWithZero;
-                    case 1: goto ReplaceTreeWithOne;
-                    default: ;
-                }
-                if(GetOpcode() == cNotNot && GetParam(0).IsAlwaysSigned(true))
-                    SetOpcode(cAbsNotNot);
-
-                if(GetParam(0).GetOpcode() == cIf
-                || GetParam(0).GetOpcode() == cAbsIf)
-                {
-                    CodeTree iftree = GetParam(0);
-                    const CodeTree& ifp1 = iftree.GetParam(1);
-                    const CodeTree& ifp2 = iftree.GetParam(2);
-                    if(ifp1.GetOpcode() == cNot
-                    || ifp1.GetOpcode() == cAbsNot)
-                    {
-                        // cNotNot [(cIf [x (cNot[y]) z])] -> cIf [x (cNot[y]) (cNotNot[z])]
-                        SetParam(0, iftree.GetParam(0)); // condition
-                        AddParam(ifp1);
-                        CodeTree p2;
-                        p2.SetOpcode(GetOpcode());
-                        p2.AddParam(ifp2);
-                        p2.Rehash();
-                        AddParamMove(p2);
-                        SetOpcode(iftree.GetOpcode());
-                        goto redo;
-                    }
-                    if(ifp2.GetOpcode() == cNot
-                    || ifp2.GetOpcode() == cAbsNot)
-                    {
-                        // cNotNot [(cIf [x y (cNot[z])])] -> cIf [x (cNotNot[y]) (cNot[z])]
-                        SetParam(0, iftree.GetParam(0)); // condition
-                        CodeTree p1;
-                        p1.SetOpcode(GetOpcode());
-                        p1.AddParam(ifp1);
-                        p1.Rehash();
-                        AddParamMove(p1);
-                        AddParam(ifp2);
-                        SetOpcode(iftree.GetOpcode());
-                        goto redo;
-                    }
-                }
-                break;
-            }
-            case cIf:
-            case cAbsIf:
-            {
-                if(ConstantFolding_IfOperations())
-                    goto redo;
-                break;
-            }
-            case cMul:
-            {
-            NowWeAreMulGroup: ;
-                ConstantFolding_Assimilate();
-                // If one sub-expression evalutes to exact zero, yield zero.
-                double immed_product = 1.0;
-                size_t n_immeds = 0; bool needs_resynth=false;
-                for(size_t a=0; a<GetParamCount(); ++a)
-                {
-                    if(!GetParam(a).IsImmed()) continue;
-                    // ^ Only check constant values
-                    double immed = GetParam(a).GetImmed();
-                    if(immed == 0.0) goto ReplaceTreeWithZero;
-                    immed_product *= immed; ++n_immeds;
-                }
-                // Merge immeds.
-                if(n_immeds > 1 || (n_immeds == 1 && FloatEqual(immed_product, 1.0)))
-                    needs_resynth = true;
-                if(needs_resynth)
-                {
-                    // delete immeds and add new ones
-                #ifdef DEBUG_SUBSTITUTIONS
-                    std::cout << "cMul: Will add new immed " << immed_product << "\n";
-                #endif
-                    for(size_t a=GetParamCount(); a-->0; )
-                        if(GetParam(a).IsImmed())
-                        {
-                        #ifdef DEBUG_SUBSTITUTIONS
-                            std::cout << " - For that, deleting immed " << GetParam(a).GetImmed();
-                            std::cout << "\n";
-                        #endif
-                            DelParam(a);
-                        }
-                    if(!FloatEqual(immed_product, 1.0))
-                        AddParam( CodeTree(immed_product) );
-                }
-                switch(GetParamCount())
-                {
-                    case 0: goto ReplaceTreeWithOne;
-                    case 1: goto ReplaceTreeWithParam0; // Replace self with the single operand
-                    default:
-                        if(ConstantFolding_MulGrouping()) goto redo;
-                        if(ConstantFolding_MulLogicItems()) goto redo;
-                }
-                break;
-            }
-            case cAdd:
-            {
-                ConstantFolding_Assimilate();
-                double immed_sum = 0.0;
-                size_t n_immeds = 0; bool needs_resynth=false;
-                for(size_t a=0; a<GetParamCount(); ++a)
-                {
-                    if(!GetParam(a).IsImmed()) continue;
-                    // ^ Only check constant values
-                    double immed = GetParam(a).GetImmed();
-                    immed_sum += immed; ++n_immeds;
-                }
-                // Merge immeds.
-                if(n_immeds > 1 || (n_immeds == 1 && immed_sum == 0.0))
-                    needs_resynth = true;
-                if(needs_resynth)
-                {
-                    // delete immeds and add new ones
-                #ifdef DEBUG_SUBSTITUTIONS
-                    std::cout << "cAdd: Will add new immed " << immed_sum << "\n";
-                    std::cout << "In: "; DumpTree(*this);
-                    std::cout << "\n";
-                #endif
-                    for(size_t a=GetParamCount(); a-->0; )
-                        if(GetParam(a).IsImmed())
-                        {
-                        #ifdef DEBUG_SUBSTITUTIONS
-                            std::cout << " - For that, deleting immed " << GetParam(a).GetImmed();
-                            std::cout << "\n";
-                        #endif
-                            DelParam(a);
-                        }
-                    if(!(immed_sum == 0.0))
-                        AddParam( CodeTree(immed_sum) );
-                }
-                switch(GetParamCount())
-                {
-                    case 0: goto ReplaceTreeWithZero;
-                    case 1: goto ReplaceTreeWithParam0; // Replace self with the single operand
-                    default:
-                        if(ConstantFolding_AddGrouping()) goto redo;
-                        if(ConstantFolding_AddLogicItems()) goto redo;
-                }
-                break;
-            }
-            case cMin:
-            {
-                ConstantFolding_Assimilate();
-                /* Goal: If there is any pair of two operands, where
-                 * their ranges form a disconnected set, i.e. as below:
-                 *     xxxxx
-                 *            yyyyyy
-                 * Then remove the larger one.
-                 *
-                 * Algorithm: 1. figure out the smallest maximum of all operands.
-                 *            2. eliminate all operands where their minimum is
-                 *               larger than the selected maximum.
-                 */
-                size_t preserve=0;
-                MinMaxTree smallest_maximum;
-                for(size_t a=0; a<GetParamCount(); ++a)
-                {
-                    MinMaxTree p = GetParam(a).CalculateResultBoundaries();
-                    if(p.has_max && (!smallest_maximum.has_max || p.max < smallest_maximum.max))
-                    {
-                        smallest_maximum.max = p.max;
-                        smallest_maximum.has_max = true;
-                        preserve=a;
-                }   }
-                if(smallest_maximum.has_max)
-                    for(size_t a=GetParamCount(); a-- > 0; )
-                    {
-                        MinMaxTree p = GetParam(a).CalculateResultBoundaries();
-                        if(p.has_min && a != preserve && p.min >= smallest_maximum.max)
-                            DelParam(a);
-                    }
-                //fprintf(stderr, "Remains: %u\n", (unsigned)GetParamCount());
-                if(GetParamCount() == 1)
-                {
-                    // Replace self with the single operand
-                    goto ReplaceTreeWithParam0;
-                }
-                break;
-            }
-            case cMax:
-            {
-                ConstantFolding_Assimilate();
-                /* Goal: If there is any pair of two operands, where
-                 * their ranges form a disconnected set, i.e. as below:
-                 *     xxxxx
-                 *            yyyyyy
-                 * Then remove the smaller one.
-                 *
-                 * Algorithm: 1. figure out the biggest minimum of all operands.
-                 *            2. eliminate all operands where their maximum is
-                 *               smaller than the selected minimum.
-                 */
-                size_t preserve=0;
-                MinMaxTree biggest_minimum;
-                for(size_t a=0; a<GetParamCount(); ++a)
-                {
-                    MinMaxTree p = GetParam(a).CalculateResultBoundaries();
-                    if(p.has_min && (!biggest_minimum.has_min || p.min > biggest_minimum.min))
-                    {
-                        biggest_minimum.min = p.min;
-                        biggest_minimum.has_min = true;
-                        preserve=a;
-                }   }
-                if(biggest_minimum.has_min)
-                {
-                    //fprintf(stderr, "Removing all where max < %g\n", biggest_minimum.min);
-                    for(size_t a=GetParamCount(); a-- > 0; )
-                    {
-                        MinMaxTree p = GetParam(a).CalculateResultBoundaries();
-                        if(p.has_max && a != preserve && p.max < biggest_minimum.min)
-                        {
-                            //fprintf(stderr, "Removing %g\n", p.max);
-                            DelParam(a);
-                        }
-                    }
-                }
-                //fprintf(stderr, "Remains: %u\n", (unsigned)GetParamCount());
-                if(GetParamCount() == 1)
-                {
-                    // Replace self with the single operand
-                    goto ReplaceTreeWithParam0;
-                }
-                break;
-            }
-
-            case cEqual:
-            case cNEqual:
-            case cLess:
-            case cGreater:
-            case cLessOrEq:
-            case cGreaterOrEq:
-                if(ConstantFolding_ComparisonOperations()) goto redo;
-                // Any reversible functions:
-                //   sin(x)  -> ASIN: Not doable, x can be cyclic
-                //   asin(x) -> SIN: doable.
-                //                   Invalid combinations are caught by
-                //                   range-estimation. Threshold is at |pi/2|.
-                //   acos(x) -> COS: doable.
-                //                   Invalid combinations are caught by
-                //                   range-estimation. Note that though
-                //                   the range is contiguous, it is direction-flipped.
-                //    log(x) -> EXP: no problem
-                //   exp2, exp10: Converted to cPow, done by grammar.
-                //   atan(x) -> TAN: doable.
-                //                   Invalid combinations are caught by
-                //                   range-estimation. Threshold is at |pi/2|.
-                //   sinh(x) -> ASINH: no problem
-                //   tanh(x) -> ATANH: no problem, but atanh is limited to -1..1
-                //                     Invalid combinations are caught by
-                //                     range-estimation, but the exact value
-                //                     of 1.0 still needs checking, because
-                //                     it involves infinity.
-                if(GetParam(1).IsImmed())
-                    switch(GetParam(0).GetOpcode())
-                    {
-                        case cAsin:
-                            SetParam(0, GetParam(0).GetParam(0));
-                            SetParam(1, CodeTree(fp_sin(GetParam(1).GetImmed())));
-                            goto redo;
-                        case cAcos:
-                            // -1..+1 --> pi..0 (polarity-flipping)
-                            SetParam(0, GetParam(0).GetParam(0));
-                            SetParam(1, CodeTree(fp_cos(GetParam(1).GetImmed())));
-                            SetOpcode( GetOpcode()==cLess ? cGreater
-                                     : GetOpcode()==cLessOrEq ? cGreaterOrEq
-                                     : GetOpcode()==cGreater ? cLess
-                                     : GetOpcode()==cGreaterOrEq ? cLessOrEq
-                                     : GetOpcode() );
-                            goto redo;
-                        case cAtan:
-                            SetParam(0, GetParam(0).GetParam(0));
-                            SetParam(1, CodeTree(fp_tan(GetParam(1).GetImmed())));
-                            goto redo;
-                        case cLog:
-                            // Different logarithms have a constant-multiplication,
-                            // which is no problem.
-                            SetParam(0, GetParam(0).GetParam(0));
-                            SetParam(1, CodeTree(fp_exp(GetParam(1).GetImmed())));
-                            goto redo;
-                        case cSinh:
-                            SetParam(0, GetParam(0).GetParam(0));
-                            SetParam(1, CodeTree(fp_asinh(GetParam(1).GetImmed())));
-                            goto redo;
-                        case cTanh:
-                            if(fabs(GetParam(1).GetImmed()) < 1.0)
-                            {
-                                SetParam(0, GetParam(0).GetParam(0));
-                                SetParam(1, CodeTree(fp_atanh(GetParam(1).GetImmed())));
-                                goto redo;
-                            }
-                            break;
-                        default: break;
-                    }
-                break;
-
-            case cAbs:
-            {
-                /* If we know the operand is always positive, cAbs is redundant.
-                 * If we know the operand is always negative, use actual negation.
-                 */
-                MinMaxTree p0 = GetParam(0).CalculateResultBoundaries();
-                if(p0.has_min && p0.min >= 0.0)
-                    goto ReplaceTreeWithParam0;
-                if(p0.has_max && p0.max <= NEGATIVE_MAXIMUM)
-                {
-                    /* abs(negative) = negative*-1 */
-                    SetOpcode(cMul);
-                    AddParam( CodeTree(-1.0) );
-                    /* The caller of ConstantFolding() will do Sort() and Rehash() next.
-                     * Thus, no need to do it here. */
-                    /* We were changed into a cMul group. Do cMul folding. */
-                    goto NowWeAreMulGroup;
-                }
-                /* If the operand is a cMul group, find elements
-                 * that are always positive and always negative,
-                 * and move them out, e.g. abs(p*n*x*y) = p*(-n)*abs(x*y)
-                 */
-                if(GetParam(0).GetOpcode() == cMul)
-                {
-                    const CodeTree& p = GetParam(0);
-                    std::vector<CodeTree> pos_set;
-                    std::vector<CodeTree> neg_set;
-                    for(size_t a=0; a<p.GetParamCount(); ++a)
-                    {
-                        p0 = p.GetParam(a).CalculateResultBoundaries();
-                        if(p0.has_min && p0.min >= 0.0)
-                            { pos_set.push_back(p.GetParam(a)); }
-                        if(p0.has_max && p0.max <= NEGATIVE_MAXIMUM)
-                            { neg_set.push_back(p.GetParam(a)); }
-                    }
-                #ifdef DEBUG_SUBSTITUTIONS
-                    std::cout << "Abs: mul group has " << pos_set.size()
-                              << " pos, " << neg_set.size() << "neg\n";
-                #endif
-                    if(!pos_set.empty() || !neg_set.empty())
-                    {
-                #ifdef DEBUG_SUBSTITUTIONS
-                        std::cout << "AbsReplace-Before: ";
-                        DumpTree(*this);
-                        std::cout << "\n" << std::flush;
-                        DumpHashes(*this, std::cout);
-                #endif
-                        CodeTree pclone;
-                        pclone.SetOpcode(cMul);
-                        for(size_t a=0; a<p.GetParamCount(); ++a)
-                        {
-                            p0 = p.GetParam(a).CalculateResultBoundaries();
-                            if((p0.has_min && p0.min >= 0.0)
-                            || (p0.has_max && p0.max <= NEGATIVE_MAXIMUM))
-                                {/*pclone.DelParam(a);*/}
-                            else
-                                pclone.AddParam( p.GetParam(a) );
-                            /* Here, p*n*x*y -> x*y.
-                             * p is saved in pos_set[]
-                             * n is saved in neg_set[]
-                             */
-                        }
-                        pclone.Rehash();
-                        CodeTree abs_mul;
-                        abs_mul.SetOpcode(cAbs);
-                        abs_mul.AddParamMove(pclone);
-                        abs_mul.Rehash();
-                        CodeTree mulgroup;
-                        mulgroup.SetOpcode(cMul);
-                        mulgroup.AddParamMove(abs_mul); // cAbs[whatever remains in p]
-                        mulgroup.AddParamsMove(pos_set);
-                        /* Now:
-                         * mulgroup  = p * Abs(x*y)
-                         */
-                        if(!neg_set.empty())
-                        {
-                            if(neg_set.size() % 2)
-                                mulgroup.AddParam( CodeTree(-1.0) );
-                            mulgroup.AddParamsMove(neg_set);
-                            /* Now:
-                             * mulgroup = p * n * -1 * Abs(x*y)
-                             */
-                        }
-                        Become(mulgroup);
-                #ifdef DEBUG_SUBSTITUTIONS
-                        std::cout << "AbsReplace-After: ";
-                        DumpTree(*this, std::cout);
-                        std::cout << "\n" << std::flush;
-                        DumpHashes(*this, std::cout);
-                #endif
-                        /* We were changed into a cMul group. Do cMul folding. */
-                        goto NowWeAreMulGroup;
-                    }
-                }
-                break;
-            }
-
-            #define HANDLE_UNARY_CONST_FUNC(funcname) \
-                if(GetParam(0).IsImmed()) \
-                    { const_value = funcname(GetParam(0).GetImmed()); \
-                      goto ReplaceTreeWithConstValue; }
-
-            case cLog:
-                HANDLE_UNARY_CONST_FUNC(log);
-                if(GetParam(0).GetOpcode() == cPow)
-                {
-                    CodeTree pow = GetParam(0);
-                    if(pow.GetParam(0).IsAlwaysSigned(true))  // log(posi ^ y) = y*log(posi)
-                    {
-                        pow.CopyOnWrite();
-                        pow.SetOpcode(cLog);
-                        SetOpcode(cMul);
-                        AddParamMove(pow.GetParam(1));
-                        pow.DelParam(1);
-                        pow.Rehash();
-                        SetParamMove(0, pow);
-                        goto NowWeAreMulGroup;
-                    }
-                    if(pow.GetParam(1).IsAlwaysParity(false)) // log(x ^ even) = even*log(abs(x))
-                    {
-                        pow.CopyOnWrite();
-                        CodeTree abs;
-                        abs.SetOpcode(cAbs);
-                        abs.AddParamMove(pow.GetParam(0));
-                        abs.Rehash();
-                        pow.SetOpcode(cLog);
-                        SetOpcode(cMul);
-                        pow.SetParamMove(0, abs);
-                        AddParamMove(pow.GetParam(1));
-                        pow.DelParam(1);
-                        pow.Rehash();
-                        SetParamMove(0, pow);
-                        goto NowWeAreMulGroup;
-                    }
-                }
-                else if(GetParam(0).GetOpcode() == cAbs)
-                {
-                    // log(abs(x^y)) = y*log(abs(x))
-                    CodeTree pow = GetParam(0).GetParam(0);
-                    if(pow.GetOpcode() == cPow)
-                    {
-                        pow.CopyOnWrite();
-                        CodeTree abs;
-                        abs.SetOpcode(cAbs);
-                        abs.AddParamMove(pow.GetParam(0));
-                        abs.Rehash();
-                        pow.SetOpcode(cLog);
-                        SetOpcode(cMul);
-                        pow.SetParamMove(0, abs);
-                        AddParamMove(pow.GetParam(1));
-                        pow.DelParam(1);
-                        pow.Rehash();
-                        SetParamMove(0, pow);
-                        goto NowWeAreMulGroup;
-                    }
-                }
-                break;
-            case cAcosh: HANDLE_UNARY_CONST_FUNC(fp_acosh); break;
-            case cAsinh: HANDLE_UNARY_CONST_FUNC(fp_asinh); break;
-            case cAtanh: HANDLE_UNARY_CONST_FUNC(fp_atanh); break;
-            case cAcos: HANDLE_UNARY_CONST_FUNC(fp_acos); break;
-            case cAsin: HANDLE_UNARY_CONST_FUNC(fp_asin); break;
-            case cAtan: HANDLE_UNARY_CONST_FUNC(fp_atan); break;
-            case cCosh: HANDLE_UNARY_CONST_FUNC(fp_cosh); break;
-            case cSinh: HANDLE_UNARY_CONST_FUNC(fp_sinh); break;
-            case cTanh: HANDLE_UNARY_CONST_FUNC(fp_tanh); break;
-            case cSin: HANDLE_UNARY_CONST_FUNC(fp_sin); break;
-            case cCos: HANDLE_UNARY_CONST_FUNC(fp_cos); break;
-            case cTan: HANDLE_UNARY_CONST_FUNC(fp_tan); break;
-            case cCeil: HANDLE_UNARY_CONST_FUNC(fp_ceil); break;
-            case cTrunc: HANDLE_UNARY_CONST_FUNC(fp_trunc); break;
-            case cFloor: HANDLE_UNARY_CONST_FUNC(fp_floor); break;
-            case cCbrt: HANDLE_UNARY_CONST_FUNC(fp_cbrt); break; // converted into cPow x 0.33333
-            case cSqrt: HANDLE_UNARY_CONST_FUNC(fp_sqrt); break; // converted into cPow x 0.5
-            case cExp: HANDLE_UNARY_CONST_FUNC(fp_exp); break; // convered into cPow CONSTANT_E x
-            case cInt: HANDLE_UNARY_CONST_FUNC(fp_int); break;
-            case cLog2: HANDLE_UNARY_CONST_FUNC(fp_log2); break;
-            case cLog10: HANDLE_UNARY_CONST_FUNC(fp_log10); break;
-
-            case cLog2by:
-                if(GetParam(0).IsImmed()
-                && GetParam(1).IsImmed())
-                    { const_value = fp_log2(GetParam(0).GetImmed()) * GetParam(1).GetImmed();
-                      goto ReplaceTreeWithConstValue; }
-                break;
-
-            case cMod: /* Can more be done than this? */
-                if(GetParam(0).IsImmed()
-                && GetParam(1).IsImmed())
-                    { const_value = fmod(GetParam(0).GetImmed(), GetParam(1).GetImmed());
-                      goto ReplaceTreeWithConstValue; }
-                break;
-
-            case cAtan2:
-            {
-                /* Range based optimizations for (y,x):
-                 * If y is +0 and x <= -0, +pi is returned
-                 * If y is -0 and x <= -0, -pi is returned (assumed never happening)
-                 * If y is +0 and x >= +0, +0 is returned
-                 * If y is -0 and x >= +0, -0 is returned  (assumed never happening)
-                 * If x is +-0 and y < 0, -pi/2 is returned
-                 * If x is +-0 and y > 0, +pi/2 is returned
-                 * Otherwise, perform constant folding when available
-                 * If we know x <> 0, convert into atan(y / x)
-                 *   TODO: Figure out whether the above step is wise
-                 *         It allows e.g. atan2(6*x, 3*y) -> atan(2*x/y)
-                 *         when we know y != 0
-                 */
-                MinMaxTree p0 = GetParam(0).CalculateResultBoundaries();
-                MinMaxTree p1 = GetParam(1).CalculateResultBoundaries();
-                if(GetParam(0).IsImmed()
-                && FloatEqual(GetParam(0).GetImmed(), 0.0))   // y == 0
-                {
-                    if(p1.has_max && p1.max < 0)              // y == 0 && x < 0
-                        { const_value = CONSTANT_PI; goto ReplaceTreeWithConstValue; }
-                    if(p1.has_min && p1.min >= 0.0)           // y == 0 && x >= 0.0
-                        { const_value = 0.0; goto ReplaceTreeWithConstValue; }
-                }
-                if(GetParam(1).IsImmed()
-                && FloatEqual(GetParam(1).GetImmed(), 0.0))   // x == 0
-                {
-                    if(p0.has_max && p0.max < 0)              // y < 0 && x == 0
-                        { const_value = -CONSTANT_PIHALF; goto ReplaceTreeWithConstValue; }
-                    if(p0.has_min && p0.min > 0)              // y > 0 && x == 0
-                        { const_value =  CONSTANT_PIHALF; goto ReplaceTreeWithConstValue; }
-                }
-                if(GetParam(0).IsImmed()
-                && GetParam(1).IsImmed())
-                    { const_value = atan2(GetParam(0).GetImmed(),
-                                          GetParam(1).GetImmed());
-                      goto ReplaceTreeWithConstValue; }
-                if((p1.has_min && p1.min > 0.0)               // p1 != 0.0
-                || (p1.has_max && p1.max < NEGATIVE_MAXIMUM)) // become atan(p0 / p1)
-                {
-                    CodeTree pow_tree;
-                    pow_tree.SetOpcode(cPow);
-                    pow_tree.AddParamMove(GetParam(1));
-                    pow_tree.AddParam(CodeTree(-1.0));
-                    pow_tree.Rehash();
-                    CodeTree div_tree;
-                    div_tree.SetOpcode(cMul);
-                    div_tree.AddParamMove(GetParam(0));
-                    div_tree.AddParamMove(pow_tree);
-                    div_tree.Rehash();
-                    SetOpcode(cAtan);
-                    SetParamMove(0, div_tree);
-                    DelParam(1);
-                }
-                break;
-            }
-
-            case cPow:
-            {
-                if(ConstantFolding_PowOperations()) goto redo;
-                break;
-            }
-
-            /* The following opcodes are processed by GenerateFrom()
-             * within fpoptimizer_bytecode_to_codetree.c and thus
-             * they will never occur in the calling context for the
-             * most of the parsing context. They may however occur
-             * at the late phase, so we deal with them.
-             */
-            case cDiv: // converted into cPow y -1
-                if(GetParam(0).IsImmed()
-                && GetParam(1).IsImmed()
-                && GetParam(1).GetImmed() != 0.0)
-                    { const_value = GetParam(0).GetImmed() / GetParam(1).GetImmed();
-                      goto ReplaceTreeWithConstValue; }
-                break;
-            case cInv: // converted into cPow y -1
-                if(GetParam(0).IsImmed()
-                && GetParam(0).GetImmed() != 0.0)
-                    { const_value = 1.0 / GetParam(0).GetImmed();
-                      goto ReplaceTreeWithConstValue; }
-                // Note: Could use (mulgroup)^immed optimization from cPow
-                break;
-            case cSub: // converted into cMul y -1
-                if(GetParam(0).IsImmed()
-                && GetParam(1).IsImmed())
-                    { const_value = GetParam(0).GetImmed() - GetParam(1).GetImmed();
-                      goto ReplaceTreeWithConstValue; }
-                break;
-            case cNeg: // converted into cMul x -1
-                if(GetParam(0).IsImmed())
-                    { const_value = -GetParam(0).GetImmed();
-                      goto ReplaceTreeWithConstValue; }
-                break;
-            case cRad: // converted into cMul x CONSTANT_RD
-                if(GetParam(0).IsImmed())
-                    { const_value = GetParam(0).GetImmed() * CONSTANT_RD;
-                      goto ReplaceTreeWithConstValue; }
-                break;
-            case cDeg: // converted into cMul x CONSTANT_DR
-                if(GetParam(0).IsImmed())
-                    { const_value = GetParam(0).GetImmed() * CONSTANT_DR;
-                      goto ReplaceTreeWithConstValue; }
-                break;
-            case cSqr: // converted into cMul x x
-                if(GetParam(0).IsImmed())
-                    { const_value = GetParam(0).GetImmed() * GetParam(0).GetImmed();
-                      goto ReplaceTreeWithConstValue; }
-                break;
-            case cExp2: // converted into cPow 2.0 x
-                HANDLE_UNARY_CONST_FUNC(fp_exp2); break;
-            case cRSqrt: // converted into cPow x -0.5
-                if(GetParam(0).IsImmed())
-                    { const_value = 1.0 / sqrt(GetParam(0).GetImmed());
-                      goto ReplaceTreeWithConstValue; }
-                break;
-            case cCot: // converted into cMul (cPow (cTan x) -1)
-                if(GetParam(0).IsImmed())
-                    { double tmp = tan(GetParam(0).GetImmed());
-                      if(tmp != 0.0)
-                      { const_value = 1.0 / tmp;
-                        goto ReplaceTreeWithConstValue; } }
-                break;
-            case cSec: // converted into cMul (cPow (cCos x) -1)
-                if(GetParam(0).IsImmed())
-                    { double tmp = cos(GetParam(0).GetImmed());
-                      if(tmp != 0.0)
-                      { const_value = 1.0 / tmp;
-                        goto ReplaceTreeWithConstValue; } }
-                break;
-            case cCsc: // converted into cMul (cPow (cSin x) -1)
-                if(GetParam(0).IsImmed())
-                    { double tmp = sin(GetParam(0).GetImmed());
-                      if(tmp != 0.0)
-                      { const_value = 1.0 / tmp;
-                        goto ReplaceTreeWithConstValue; } }
-                break;
-
-            /* Opcodes that do not occur in the tree for other reasons */
-            case cRDiv: // version of cDiv
-            case cRSub: // version of cSub
-            case cDup:
-            case cFetch:
-            case cPopNMov:
-            case cNop:
-            case cJump:
-                break; /* Should never occur */
-
-            /* Opcodes that we can't do anything about */
-            case cPCall:
-            case cFCall:
-            case cEval:
-                break;
-        }
-    }
-}
-
-#endif
-
-#line 1 "fpoptimizer/fpoptimizer_rangeestimation.c"
-// line removed for fpoptimizer.c: #include "fpoptimizer_codetree.h"
-// line removed for fpoptimizer.c: #include "fpoptimizer_consts.h"
-
-#include <cmath> /* for CalculateResultBoundaries() */
-
-#ifdef FP_SUPPORT_OPTIMIZER
-
-using namespace FUNCTIONPARSERTYPES;
-using namespace FPoptimizer_CodeTree;
-
-//#define DEBUG_SUBSTITUTIONS_extra_verbose
-
-namespace FPoptimizer_CodeTree
-{
-    MinMaxTree CodeTree::CalculateResultBoundaries() const
-#ifdef DEBUG_SUBSTITUTIONS_extra_verbose
-    {
-        MinMaxTree tmp = CalculateResultBoundaries_do();
-        std::cout << "Estimated boundaries: ";
-        if(tmp.has_min) std::cout << tmp.min; else std::cout << "-inf";
-        std::cout << " .. ";
-        if(tmp.has_max) std::cout << tmp.max; else std::cout << "+inf";
-        std::cout << ": ";
-        FPoptimizer_CodeTree::DumpTree(*this);
-        std::cout << std::endl;
-        return tmp;
-    }
-    MinMaxTree CodeTree::CalculateResultBoundaries_do() const
-#endif
-    {
-        using namespace std;
-        switch( GetOpcode() )
-        {
-            case cImmed:
-                return MinMaxTree(GetImmed(), GetImmed()); // a definite value.
-            case cAnd:
-            case cAbsAnd:
-            case cOr:
-            case cAbsOr:
-            case cNot:
-            case cAbsNot:
-            case cNotNot:
-            case cAbsNotNot:
-            case cEqual:
-            case cNEqual:
-            case cLess:
-            case cLessOrEq:
-            case cGreater:
-            case cGreaterOrEq:
-            {
-                /* These operations always produce truth values (0 or 1) */
-                /* Narrowing them down is a matter of performing Constant optimization */
-                return MinMaxTree( 0.0, 1.0 );
-            }
-            case cAbs:
-            {
-                /* cAbs always produces a positive value */
-                MinMaxTree m = GetParam(0).CalculateResultBoundaries();
-                if(m.has_min && m.has_max)
-                {
-                    if(m.min < 0.0 && m.max >= 0.0) // ex. -10..+6 or -6..+10
-                    {
-                        /* -x..+y: spans across zero. min=0, max=greater of |x| and |y|. */
-                        double tmp = -m.min; if(tmp > m.max) m.max = tmp;
-                        m.min = 0.0; m.has_min = true;
-                    }
-                    else if(m.min < 0.0) // ex. -10..-4
-                        { double tmp = m.max; m.max = -m.min; m.min = -tmp; }
-                }
-                else if(!m.has_min && m.has_max && m.max < 0.0) // ex. -inf..-10
-                {
-                    m.min = fabs(m.max); m.has_min = true; m.has_max = false;
-                }
-                else if(!m.has_max && m.has_min && m.min > 0.0) // ex. +10..+inf
-                {
-                    m.min = fabs(m.min); m.has_min = true; m.has_max = false;
-                }
-                else // ex. -inf..+inf, -inf..+10, -10..+inf
-                {
-                    // all of these cover -inf..0, 0..+inf, or both
-                    m.min = 0.0; m.has_min = true; m.has_max = false;
-                }
-                return m;
-            }
-
-            case cLog: /* Defined for 0.0 < x <= inf */
-            {
-                MinMaxTree m = GetParam(0).CalculateResultBoundaries();
-                if(m.has_min) { if(m.min < 0.0) m.has_min = false; else m.min = log(m.min); } // No boundaries
-                if(m.has_max) { if(m.max < 0.0) m.has_max = false; else m.max = log(m.max); }
-                return m;
-            }
-
-            case cLog2: /* Defined for 0.0 < x <= inf */
-            {
-                MinMaxTree m = GetParam(0).CalculateResultBoundaries();
-                if(m.has_min) { if(m.min < 0.0) m.has_min = false; else m.min = fp_log2(m.min); } // No boundaries
-                if(m.has_max) { if(m.max < 0.0) m.has_max = false; else m.max = fp_log2(m.max); }
-                return m;
-            }
-
-            case cLog10: /* Defined for 0.0 < x <= inf */
-            {
-                MinMaxTree m = GetParam(0).CalculateResultBoundaries();
-                if(m.has_min) { if(m.min < 0.0) m.has_min = false; else m.min = fp_log10(m.min); }
-                if(m.has_max) { if(m.max < 0.0) m.has_max = false; else m.max = fp_log10(m.max); }
-                return m;
-            }
-
-            case cAcosh: /* defined for             1.0 <  x <= inf */
-            {
-                MinMaxTree m = GetParam(0).CalculateResultBoundaries();
-                if(m.has_min) { if(m.min <= 1.0) m.has_min = false; else m.min = fp_acosh(m.min); } // No boundaries
-                if(m.has_max) { if(m.max <= 1.0) m.has_max = false; else m.max = fp_acosh(m.max); }
-                return m;
-            }
-            case cAsinh: /* defined for all values -inf <= x <= inf */
-            {
-                MinMaxTree m = GetParam(0).CalculateResultBoundaries();
-                if(m.has_min) m.min = fp_asinh(m.min); // No boundaries
-                if(m.has_max) m.max = fp_asinh(m.max);
-                return m;
-            }
-            case cAtanh: /* defined for all values -inf <= x <= inf */
-            {
-                MinMaxTree m = GetParam(0).CalculateResultBoundaries();
-                if(m.has_min) m.min = fp_atanh(m.min); // No boundaries
-                if(m.has_max) m.max = fp_atanh(m.max);
-                return m;
-            }
-            case cAcos: /* defined for -1.0 <= x < 1, results within CONSTANT_PI..0 */
-            {
-                /* Somewhat complicated to narrow down from this */
-                /* TODO: A resourceful programmer may add it later. */
-                return MinMaxTree( 0.0, CONSTANT_PI );
-            }
-            case cAsin: /* defined for -1.0 <= x < 1, results within -CONSTANT_PIHALF..CONSTANT_PIHALF */
-            {
-                /* Somewhat complicated to narrow down from this */
-                /* TODO: A resourceful programmer may add it later. */
-                return MinMaxTree( -CONSTANT_PIHALF, CONSTANT_PIHALF );
-            }
-            case cAtan: /* defined for all values -inf <= x <= inf */
-            {
-                MinMaxTree m = GetParam(0).CalculateResultBoundaries();
-                if(m.has_min) m.min = atan(m.min); else { m.min = -CONSTANT_PIHALF; m.has_min = true; }
-                if(m.has_max) m.max = atan(m.max); else { m.max =  CONSTANT_PIHALF; m.has_max = true; }
-                return m;
-            }
-            case cAtan2: /* too complicated to estimate */
-            {
-                MinMaxTree p0 = GetParam(0).CalculateResultBoundaries();
-                MinMaxTree p1 = GetParam(1).CalculateResultBoundaries();
-                if(GetParam(0).IsImmed()
-                && FloatEqual(GetParam(0).GetImmed(), 0.0))   // y == 0
-                {
-                    // Either 0.0 or CONSTANT_PI
-                    return MinMaxTree(0.0, CONSTANT_PI);
-                }
-                if(GetParam(1).IsImmed()
-                && FloatEqual(GetParam(1).GetImmed(), 0.0))   // x == 0
-                {
-                    // EIther -CONSTANT_PIHALF or +CONSTANT_PIHALF
-                    return MinMaxTree(-CONSTANT_PIHALF, CONSTANT_PIHALF);
-                }
-                // Anything else
-                /* Somewhat complicated to narrow down from this */
-                /* TODO: A resourceful programmer may add it later. */
-                return MinMaxTree(-CONSTANT_PI, CONSTANT_PI);
-            }
-
-            case cSin:
-            case cCos:
-            {
-                /* Could be narrowed down from here,
-                 * but it's too complicated due to
-                 * the cyclic nature of the function. */
-                /* TODO: A resourceful programmer may add it later. */
-                return MinMaxTree(-1.0, 1.0);
-            }
-            case cTan:
-            {
-                /* Could be narrowed down from here,
-                 * but it's too complicated due to
-                 * the cyclic nature of the function */
-                /* TODO: A resourceful programmer may add it later. */
-                return MinMaxTree(); // (CONSTANT_NEG_INF, CONSTANT_POS_INF);
-            }
-
-            case cCeil:
-            {
-                MinMaxTree m = GetParam(0).CalculateResultBoundaries();
-                m.max = std::ceil(m.max); // ceil() may increase the value, may not decrease
-                return m;
-            }
-            case cFloor:
-            {
-                MinMaxTree m = GetParam(0).CalculateResultBoundaries();
-                m.min = std::floor(m.min); // floor() may decrease the value, may not increase
-                return m;
-            }
-            case cTrunc:
-            {
-                MinMaxTree m = GetParam(0).CalculateResultBoundaries();
-                m.min = std::floor(m.min); // trunc() may either increase or decrease the value
-                m.max = std::ceil(m.max); // for safety, we assume both
-                return m;
-            }
-            case cInt:
-            {
-                MinMaxTree m = GetParam(0).CalculateResultBoundaries();
-                m.min = std::floor(m.min); // int() may either increase or decrease the value
-                m.max = std::ceil(m.max); // for safety, we assume both
-                return m;
-            }
-            case cSinh: /* defined for all values -inf <= x <= inf */
-            {
-                MinMaxTree m = GetParam(0).CalculateResultBoundaries();
-                if(m.has_min) m.min = sinh(m.min); // No boundaries
-                if(m.has_max) m.max = sinh(m.max);
-                return m;
-            }
-            case cTanh: /* defined for all values -inf <= x <= inf, results within -1..1 */
-            {
-                MinMaxTree m = GetParam(0).CalculateResultBoundaries();
-                if(m.has_min) m.min = tanh(m.min); else { m.has_min = true; m.min =-1.0; }
-                if(m.has_max) m.max = tanh(m.max); else { m.has_max = true; m.max = 1.0; }
-                return m;
-            }
-            case cCosh: /* defined for all values -inf <= x <= inf, results within 1..inf */
-            {
-                MinMaxTree m = GetParam(0).CalculateResultBoundaries();
-                if(m.has_min)
-                {
-                    if(m.has_max) // max, min
-                    {
-                        if(m.min >= 0.0 && m.max >= 0.0) // +x .. +y
-                            { m.min = cosh(m.min); m.max = cosh(m.max); }
-                        else if(m.min < 0.0 && m.max >= 0.0) // -x .. +y
-                            { double tmp = cosh(m.min); m.max = cosh(m.max);
-                              if(tmp > m.max) m.max = tmp;
-                              m.min = 1.0; }
-                        else // -x .. -y
-                            { m.min = cosh(m.min); m.max = cosh(m.max);
-                              std::swap(m.min, m.max); }
-                    }
-                    else // min, no max
-                    {
-                        if(m.min >= 0.0) // 0..inf -> 1..inf
-                            { m.has_max = false; m.min = cosh(m.min); }
-                        else
-                            { m.has_max = false; m.min = 1.0; } // Anything between 1..inf
-                    }
-                }
-                else // no min
-                {
-                    m.has_min = true; m.min = 1.0; // always a lower boundary
-                    if(m.has_max) // max, no min
-                    {
-                        m.min = cosh(m.max); // n..inf
-                        m.has_max = false; // No upper boundary
-                    }
-                    else // no max, no min
-                        m.has_max = false; // No upper boundary
-                }
-                return m;
-            }
-
-            case cIf:
-            case cAbsIf:
-            {
-                // No guess which branch is chosen. Produce a spanning min & max.
-                MinMaxTree res1 = GetParam(1).CalculateResultBoundaries();
-                MinMaxTree res2 = GetParam(2).CalculateResultBoundaries();
-                if(!res2.has_min) res1.has_min = false; else if(res1.has_min && res2.min < res1.min) res1.min = res2.min;
-                if(!res2.has_max) res1.has_max = false; else if(res1.has_max && res2.max > res1.max) res1.max = res2.max;
-                return res1;
-            }
-
-            case cMin:
-            {
-                bool has_unknown_min = false;
-                bool has_unknown_max = false;
-
-                MinMaxTree result;
-                for(size_t a=0; a<GetParamCount(); ++a)
-                {
-                    MinMaxTree m = GetParam(a).CalculateResultBoundaries();
-                    if(!m.has_min)
-                        has_unknown_min = true;
-                    else if(!result.has_min || m.min < result.min)
-                        result.min = m.min;
-
-                    if(!m.has_max)
-                        has_unknown_max = true;
-                    else if(!result.has_max || m.max < result.max)
-                        result.max = m.max;
-                }
-                if(has_unknown_min) result.has_min = false;
-                if(has_unknown_max) result.has_max = false;
-                return result;
-            }
-            case cMax:
-            {
-                bool has_unknown_min = false;
-                bool has_unknown_max = false;
-
-                MinMaxTree result;
-                for(size_t a=0; a<GetParamCount(); ++a)
-                {
-                    MinMaxTree m = GetParam(a).CalculateResultBoundaries();
-                    if(!m.has_min)
-                        has_unknown_min = true;
-                    else if(!result.has_min || m.min > result.min)
-                        result.min = m.min;
-
-                    if(!m.has_max)
-                        has_unknown_max = true;
-                    else if(!result.has_max || m.max > result.max)
-                        result.max = m.max;
-                }
-                if(has_unknown_min) result.has_min = false;
-                if(has_unknown_max) result.has_max = false;
-                return result;
-            }
-            case cAdd:
-            {
-                /* It's complicated. Follow the logic below. */
-                /* Note: This also deals with the following opcodes:
-                 *       cNeg, cSub, cRSub
-                 */
-                MinMaxTree result(0.0, 0.0);
-                for(size_t a=0; a<GetParamCount(); ++a)
-                {
-                    MinMaxTree item = GetParam(a).CalculateResultBoundaries();
-
-                    if(item.has_min) result.min += item.min;
-                    else             result.has_min = false;
-                    if(item.has_max) result.max += item.max;
-                    else             result.has_max = false;
-
-                    if(!result.has_min && !result.has_max) break; // hopeless
-                }
-                if(result.has_min && result.has_max
-                && result.min > result.max) std::swap(result.min, result.max);
-                return result;
-            }
-            case cMul:
-            {
-                /* It's very complicated. Follow the logic below. */
-                struct Value
-                {
-                    enum ValueType { Finite, MinusInf, PlusInf };
-                    ValueType valueType;
-                    double value;
-
-                    Value(ValueType t): valueType(t), value(0) {}
-                    Value(double v): valueType(Finite), value(v) {}
-
-                    bool isNegative() const
-                    {
-                        return valueType == MinusInf ||
-                            (valueType == Finite && value < 0.0);
-                    }
-
-                    void operator*=(const Value& rhs)
-                    {
-                        if(valueType == Finite && rhs.valueType == Finite)
-                            value *= rhs.value;
-                        else
-                            valueType = (isNegative() != rhs.isNegative() ?
-                                         MinusInf : PlusInf);
-                    }
-
-                    bool operator<(const Value& rhs) const
-                    {
-                        return
-                            (valueType == MinusInf && rhs.valueType != MinusInf) ||
-                            (valueType == Finite &&
-                             (rhs.valueType == PlusInf ||
-                              (rhs.valueType == Finite && value < rhs.value)));
-                    }
-                };
-
-                struct MultiplicationRange
-                {
-                    Value minValue, maxValue;
-
-                    MultiplicationRange():
-                        minValue(Value::PlusInf),
-                        maxValue(Value::MinusInf) {}
-
-                    void multiply(Value value1, const Value& value2)
-                    {
-                        value1 *= value2;
-                        if(value1 < minValue) minValue = value1;
-                        if(maxValue < value1) maxValue = value1;
-                    }
-                };
-
-                MinMaxTree result(1.0, 1.0);
-                for(size_t a=0; a<GetParamCount(); ++a)
-                {
-                    MinMaxTree item = GetParam(a).CalculateResultBoundaries();
-                    if(!item.has_min && !item.has_max) return MinMaxTree(); // hopeless
-
-                    Value minValue0 = result.has_min ? Value(result.min) : Value(Value::MinusInf);
-                    Value maxValue0 = result.has_max ? Value(result.max) : Value(Value::PlusInf);
-                    Value minValue1 = item.has_min ? Value(item.min) : Value(Value::MinusInf);
-                    Value maxValue1 = item.has_max ? Value(item.max) : Value(Value::PlusInf);
-
-                    MultiplicationRange range;
-                    range.multiply(minValue0, minValue1);
-                    range.multiply(minValue0, maxValue1);
-                    range.multiply(maxValue0, minValue1);
-                    range.multiply(maxValue0, maxValue1);
-
-                    if(range.minValue.valueType == Value::Finite)
-                        result.min = range.minValue.value;
-                    else result.has_min = false;
-
-                    if(range.maxValue.valueType == Value::Finite)
-                        result.max = range.maxValue.value;
-                    else result.has_max = false;
-
-                    if(!result.has_min && !result.has_max) break; // hopeless
-                }
-                if(result.has_min && result.has_max
-                && result.min > result.max) std::swap(result.min, result.max);
-                return result;
-            }
-            case cMod:
-            {
-                /* TODO: The boundaries of modulo operator could be estimated better. */
-
-                MinMaxTree x = GetParam(0).CalculateResultBoundaries();
-                MinMaxTree y = GetParam(1).CalculateResultBoundaries();
-
-                if(y.has_max)
-                {
-                    if(y.max >= 0.0)
-                    {
-                        if(!x.has_min || x.min < 0)
-                            return MinMaxTree(-y.max, y.max);
-                        else
-                            return MinMaxTree(0.0, y.max);
-                    }
-                    else
-                    {
-                        if(!x.has_max || x.max >= 0)
-                            return MinMaxTree(y.max, -y.max);
-                        else
-                            return MinMaxTree(y.max, NEGATIVE_MAXIMUM);
-                    }
-                }
-                else
-                    return MinMaxTree();
-            }
-            case cPow:
-            {
-                if(GetParam(1).IsImmed() && GetParam(1).GetImmed() == 0.0)
-                {
-                    // Note: This makes 0^0 evaluate into 1.
-                    return MinMaxTree(1.0, 1.0); // x^0 = 1
-                }
-                if(GetParam(0).IsImmed() && GetParam(0).GetImmed() == 0.0)
-                {
-                    // Note: This makes 0^0 evaluate into 0.
-                    return MinMaxTree(0.0, 0.0); // 0^x = 0
-                }
-                if(GetParam(0).IsImmed() && FloatEqual(GetParam(0).GetImmed(), 1.0))
-                {
-                    return MinMaxTree(1.0, 1.0); // 1^x = 1
-                }
-                if(GetParam(1).IsImmed()
-                && GetParam(1).GetImmed() > 0
-                && GetParam(1).IsAlwaysParity(false))
-                {
-                    // x ^ even_int_const always produces a non-negative value.
-                    double exponent = GetParam(1).GetImmed();
-                    MinMaxTree tmp = GetParam(0).CalculateResultBoundaries();
-                    MinMaxTree result;
-                    result.has_min = true;
-                    result.min = 0;
-                    if(tmp.has_min && tmp.min >= 0)
-                        result.min = fp_pow(tmp.min, exponent);
-                    else if(tmp.has_max && tmp.max <= 0)
-                        result.min = fp_pow(tmp.max, exponent);
-
-                    result.has_max = false;
-                    if(tmp.has_min && tmp.has_max)
-                    {
-                        result.has_max = true;
-                        result.max     = std::max(fabs(tmp.min), fabs(tmp.max));
-                        result.max     = fp_pow(result.max, exponent);
-                    }
-                    return result;
-                }
-
-                MinMaxTree p0 = GetParam(0).CalculateResultBoundaries();
-                MinMaxTree p1 = GetParam(1).CalculateResultBoundaries();
-                TriTruthValue p0_positivity =
-                    (p0.has_min && p0.min >= 0.0) ? IsAlways
-                  : (p0.has_max && p0.max < 0.0 ? IsNever
-                    : Unknown);
-                TriTruthValue p1_evenness = GetParam(1).GetEvennessInfo();
-
-                /* If param0 IsAlways, the return value is also IsAlways */
-                /* If param1 is even, the return value is IsAlways */
-                /* If param1 is odd, the return value is same as param0's */
-                /* If param0 is negative and param1 is not integer,
-                 * the return value is imaginary (assumed Unknown)
-                 *
-                 * Illustrated in this truth table:
-                 *  P=positive, N=negative
-                 *  E=even, O=odd, U=not integer
-                 *  *=unknown, X=invalid (unknown), x=maybe invalid (unknown)
-                 *
-                 *   param1: PE PO P* NE NO N* PU NU *
-                 * param0:
-                 *   PE      P  P  P  P  P  P  P  P  P
-                 *   PO      P  P  P  P  P  P  P  P  P
-                 *   PU      P  P  P  P  P  P  P  P  P
-                 *   P*      P  P  P  P  P  P  P  P  P
-                 *   NE      P  N  *  P  N  *  X  X  x
-                 *   NO      P  N  *  P  N  *  X  X  x
-                 *   NU      P  N  *  P  N  *  X  X  x
-                 *   N*      P  N  *  P  N  *  X  X  x
-                 *   *       P  *  *  P  *  *  x  x  *
-                 *
-                 * Note: This also deals with the following opcodes:
-                 *       cSqrt  (param0, PU) (x^0.5)
-                 *       cRSqrt (param0, NU) (x^-0.5)
-                 *       cExp   (PU, param1) (CONSTANT_E^x)
-                 */
-                TriTruthValue result_positivity = Unknown;
-                switch(p0_positivity)
-                {
-                    case IsAlways:
-                        // e.g.   5^x = positive.
-                        result_positivity = IsAlways;
-                        break;
-                    case IsNever:
-                    {
-                        result_positivity = p1_evenness;
-                        break;
-                    }
-                    default:
-                        switch(p1_evenness)
-                        {
-                            case IsAlways:
-                                // e.g. x^( 4) = positive
-                                // e.g. x^(-4) = positive
-                                result_positivity = IsAlways;
-                                break;
-                            case IsNever:
-                                break;
-                            case Unknown:
-                            {
-                                /* If p1 is const non-integer,
-                                 * assume the result is positive
-                                 * though it may be NaN instead.
-                                 */
-                                if(GetParam(1).IsImmed()
-                                && GetParam(1).IsAlwaysInteger(false)
-                                && GetParam(1).GetImmed() >= 0.0)
-                                {
-                                    result_positivity = IsAlways;
-                                }
-                                break;
-                            }
-                        }
-                }
-                switch(result_positivity)
-                {
-                    case IsAlways:
-                    {
-                        /* The result is always positive.
-                         * Figure out whether we know the minimum value. */
-                        double min = 0.0;
-                        if(p0.has_min && p1.has_min)
-                        {
-                            min = pow(p0.min, p1.min);
-                            if(p0.min < 0.0 && (!p1.has_max || p1.max >= 0.0) && min >= 0.0)
-                                min = 0.0;
-                        }
-                        if(p0.has_min && p0.min >= 0.0 && p0.has_max && p1.has_max)
-                        {
-                            double max = pow(p0.max, p1.max);
-                            if(min > max) std::swap(min, max);
-                            return MinMaxTree(min, max);
-                        }
-                        return MinMaxTree(min, false);
-                    }
-                    case IsNever:
-                    {
-                        /* The result is always negative.
-                         * TODO: Figure out whether we know the maximum value.
-                         */
-                        return MinMaxTree(false, NEGATIVE_MAXIMUM);
-                    }
-                    default:
-                    {
-                        /* It can be negative or positive.
-                         * We know nothing about the boundaries. */
-                        break;
-                    }
-                }
-                break;
-            }
-
-            /* The following opcodes are processed by GenerateFrom()
-             * within fpoptimizer_bytecode_to_codetree.c and thus
-             * they will never occur in the calling context for the
-             * most of the parsing context. They may however occur
-             * at the late phase, so we deal with them.
-             */
-            case cNeg:
-            {
-                CodeTree tmp;
-                tmp.SetOpcode(cMul);
-                tmp.AddParam(CodeTree(-1.0));
-                tmp.AddParam(GetParam(0));
-                return tmp.CalculateResultBoundaries();
-            }
-            case cSub: // converted into cMul y -1
-            {
-                CodeTree tmp, tmp2;
-                tmp2.SetOpcode(cNeg);
-                tmp2.AddParam(GetParam(1));
-                tmp.SetOpcode(cAdd);
-                tmp.AddParam(GetParam(0));
-                tmp.AddParamMove(tmp2);
-                return tmp.CalculateResultBoundaries();
-            }
-            case cInv: // converted into cPow x -1
-            {
-                CodeTree tmp;
-                tmp.SetOpcode(cPow);
-                tmp.AddParam(GetParam(0));
-                tmp.AddParam(CodeTree(-1.0));
-                return tmp.CalculateResultBoundaries();
-            }
-            case cDiv: // converted into cPow y -1
-            {
-                CodeTree tmp, tmp2;
-                tmp2.SetOpcode(cInv);
-                tmp2.AddParam(GetParam(1));
-                tmp.SetOpcode(cMul);
-                tmp.AddParam(GetParam(0));
-                tmp.AddParamMove(tmp2);
-                return tmp.CalculateResultBoundaries();
-            }
-            case cRad: // converted into cMul x CONSTANT_RD
-            {
-                CodeTree tmp;
-                tmp.SetOpcode(cMul);
-                tmp.AddParam(GetParam(0));
-                tmp.AddParam(CodeTree(CONSTANT_RD));
-                return tmp.CalculateResultBoundaries();
-            }
-            case cDeg: // converted into cMul x CONSTANT_DR
-            {
-                CodeTree tmp;
-                tmp.SetOpcode(cMul);
-                tmp.AddParam(GetParam(0));
-                tmp.AddParam(CodeTree(CONSTANT_DR));
-                return tmp.CalculateResultBoundaries();
-            }
-            case cSqr: // converted into cMul x x    or cPow x 2
-            {
-                CodeTree tmp;
-                tmp.SetOpcode(cPow);
-                tmp.AddParam(GetParam(0));
-                tmp.AddParam(CodeTree(2.0));
-                return tmp.CalculateResultBoundaries();
-            }
-            case cExp: // converted into cPow CONSTANT_E x
-            {
-                CodeTree tmp;
-                tmp.SetOpcode(cPow);
-                tmp.AddParam(CodeTree(CONSTANT_E));
-                tmp.AddParam(GetParam(0));
-                return tmp.CalculateResultBoundaries();
-            }
-            case cExp2: // converted into cPow 2 x
-            {
-                CodeTree tmp;
-                tmp.SetOpcode(cPow);
-                tmp.AddParam(CodeTree(2.0));
-                tmp.AddParam(GetParam(0));
-                return tmp.CalculateResultBoundaries();
-            }
-            case cCbrt: // converted into cPow x 0.33333333
-            {
-                // However, contrary to x^(1/3), this allows
-                // negative values for x, and produces those
-                // as well.
-                MinMaxTree result = GetParam(0).CalculateResultBoundaries();
-                if(result.has_min) result.min = fp_cbrt(result.min);
-                if(result.has_max) result.max = fp_cbrt(result.max);
-                return result;
-            }
-            case cSqrt: // converted into cPow x 0.5
-            {
-                MinMaxTree result = GetParam(0).CalculateResultBoundaries();
-                if(result.has_min) result.min = result.min < 0 ? 0 : fp_sqrt(result.min);
-                if(result.has_max) result.max = result.max < 0 ? 0 : fp_sqrt(result.max);
-                return result;
-            }
-            case cRSqrt: // converted into cPow x -0.5
-            {
-                CodeTree tmp;
-                tmp.SetOpcode(cPow);
-                tmp.AddParam(GetParam(0));
-                tmp.AddParam(CodeTree(-0.5));
-                return tmp.CalculateResultBoundaries();
-            }
-            case cLog2by: // converted into cMul y CONSTANT_L2I (cLog x)
-            {
-                CodeTree tmp, tmp2;
-                tmp2.SetOpcode(cLog2);
-                tmp2.AddParam(GetParam(0));
-                tmp.SetOpcode(cMul);
-                tmp.AddParamMove(tmp2);
-                tmp.AddParam(GetParam(1));
-                return tmp.CalculateResultBoundaries();
-            }
-            case cCot: // converted into 1 / cTan
-            {
-                CodeTree tmp, tmp2;
-                tmp2.SetOpcode(cTan);
-                tmp2.AddParam(GetParam(0));
-                tmp.SetOpcode(cInv);
-                tmp.AddParamMove(tmp2);
-                return tmp.CalculateResultBoundaries();
-            }
-            case cSec: // converted into 1 / cCos
-            {
-                CodeTree tmp, tmp2;
-                tmp2.SetOpcode(cCos);
-                tmp2.AddParam(GetParam(0));
-                tmp.SetOpcode(cInv);
-                tmp.AddParamMove(tmp2);
-                return tmp.CalculateResultBoundaries();
-            }
-            case cCsc: // converted into 1 / cSin
-            {
-                CodeTree tmp, tmp2;
-                tmp2.SetOpcode(cSin);
-                tmp2.AddParam(GetParam(0));
-                tmp.SetOpcode(cInv);
-                tmp.AddParamMove(tmp2);
-                return tmp.CalculateResultBoundaries();
-            }
-            /* The following opcodes are processed by GenerateFrom()
-             * within fpoptimizer_bytecode_to_codetree.c and thus
-             * they will never occur in the calling context:
-             */
-                break; /* Should never occur */
-
-            /* Opcodes that do not occur in the tree for other reasons */
-            case cRDiv: // version of cDiv
-            case cRSub: // version of cSub
-            case cDup:
-            case cFetch:
-            case cPopNMov:
-            case cNop:
-            case cJump:
-            case VarBegin:
-                break; /* Should never occur */
-
-            /* Opcodes that are completely unpredictable */
-            case cPCall:
-                break;
-            case cFCall:
-                break; // Cannot deduce
-            case cEval:
-                break; // Cannot deduce
-        }
-        return MinMaxTree(); /* Cannot deduce */
-    }
-}
-
-#endif
-
-#line 1 "fpoptimizer/fpoptimizer_transformations.c"
-// line removed for fpoptimizer.c: #include "fpoptimizer_bytecodesynth.h"
-// line removed for fpoptimizer.c: #include "fpoptimizer_codetree.h"
-// line removed for fpoptimizer.c: #include "fpoptimizer_consts.h"
-
-#ifdef FP_SUPPORT_OPTIMIZER
-
-using namespace FUNCTIONPARSERTYPES;
-//using namespace FPoptimizer_Grammar;
-
-//#define DEBUG_POWI
-//#define DEBUG_SUBSTITUTIONS_CSE
-
-#if defined(__x86_64) || !defined(FP_SUPPORT_CBRT)
-# define CBRT_IS_SLOW
-#endif
-
-namespace FPoptimizer_ByteCode
-{
-    extern const unsigned char powi_table[256];
-}
-namespace
-{
-    using namespace FPoptimizer_CodeTree;
-
-    typedef
-        std::multimap<fphash_t,  std::pair<size_t, CodeTree> >
-        TreeCountType;
-
-    void FindTreeCounts(TreeCountType& TreeCounts, const CodeTree& tree)
-    {
-        TreeCountType::iterator i = TreeCounts.lower_bound(tree.GetHash());
-        bool found = false;
-        for(; i != TreeCounts.end() && i->first == tree.GetHash(); ++i)
-        {
-            if(tree.IsIdenticalTo( i->second.second ) )
-            {
-                i->second.first += 1;
-                found = true;
-                break;
-            }
-        }
-        if(!found)
-        {
-            TreeCounts.insert(i, std::make_pair(tree.GetHash(), std::make_pair(size_t(1), tree)));
-        }
-
-        for(size_t a=0; a<tree.GetParamCount(); ++a)
-            FindTreeCounts(TreeCounts, tree.GetParam(a));
-    }
-
-    struct BalanceResultType
-    {
-        bool BalanceGood;
-        bool FoundChild;
-    };
-    BalanceResultType IfBalanceGood(const CodeTree& root, const CodeTree& child)
-    {
-        if(root.IsIdenticalTo(child))
-        {
-            BalanceResultType result = {true,true};
-            return result;
-        }
-
-        BalanceResultType result = {true,false};
-
-        if(root.GetOpcode() == cIf
-        || root.GetOpcode() == cAbsIf)
-        {
-            BalanceResultType cond    = IfBalanceGood(root.GetParam(0), child);
-            BalanceResultType branch1 = IfBalanceGood(root.GetParam(1), child);
-            BalanceResultType branch2 = IfBalanceGood(root.GetParam(2), child);
-
-            if(cond.FoundChild || branch1.FoundChild || branch2.FoundChild)
-                { result.FoundChild = true; }
-
-            // balance is good if:
-            //      branch1.found = branch2.found OR (cond.found AND cond.goodbalance)
-            // AND  cond.goodbalance OR (branch1.found AND branch2.found)
-            // AND  branch1.goodbalance OR (cond.found AND cond.goodbalance)
-            // AND  branch2.goodbalance OR (cond.found AND cond.goodbalance)
-
-            result.BalanceGood =
-                (   (branch1.FoundChild == branch2.FoundChild)
-                 || (cond.FoundChild && cond.BalanceGood) )
-             && (cond.BalanceGood || (branch1.FoundChild && branch2.FoundChild))
-             && (branch1.BalanceGood || (cond.FoundChild && cond.BalanceGood))
-             && (branch2.BalanceGood || (cond.FoundChild && cond.BalanceGood));
-        }
-        else
-        {
-            bool has_bad_balance        = false;
-            bool has_good_balance_found = false;
-
-            // Balance is bad if one of the children has bad balance
-            // Unless one of the children has good balance & found
-
-            for(size_t b=root.GetParamCount(), a=0; a<b; ++a)
-            {
-                BalanceResultType tmp = IfBalanceGood(root.GetParam(a), child);
-                if(tmp.FoundChild)
-                    result.FoundChild = true;
-
-                if(tmp.BalanceGood == false)
-                    has_bad_balance = true;
-                else if(tmp.FoundChild)
-                    has_good_balance_found = true;
-
-                // if the expression is
-                //   if(x, sin(x), 0) + sin(x)
-                // then sin(x) is a good subexpression
-                // even though it occurs in unbalance.
-            }
-            if(has_bad_balance && !has_good_balance_found)
-                result.BalanceGood = false;
-        }
-        return result;
-    }
-
-    bool IsOptimizableUsingPowi(long immed, long penalty = 0)
-    {
-        FPoptimizer_ByteCode::ByteCodeSynth synth;
-        synth.PushVar(0);
-        // Ignore the size generated by subtree
-        size_t bytecodesize_backup = synth.GetByteCodeSize();
-        FPoptimizer_ByteCode::AssembleSequence(immed, FPoptimizer_ByteCode::MulSequence, synth);
-
-        size_t bytecode_grow_amount = synth.GetByteCodeSize() - bytecodesize_backup;
-
-        return bytecode_grow_amount < size_t(MAX_POWI_BYTECODE_LENGTH - penalty);
-    }
-
-    void ChangeIntoRootChain(
-        CodeTree& tree,
-        bool inverted,
-        long sqrt_count,
-        long cbrt_count)
-    {
-        while(cbrt_count > 0)
-        {
-            CodeTree tmp;
-            tmp.SetOpcode(cCbrt);
-            tmp.AddParamMove(tree);
-            tmp.Rehash();
-            tree.swap(tmp);
-            --cbrt_count;
-        }
-        while(sqrt_count > 0)
-        {
-            CodeTree tmp;
-            tmp.SetOpcode(cSqrt);
-            if(inverted)
-            {
-                tmp.SetOpcode(cRSqrt);
-                inverted = false;
-            }
-            tmp.AddParamMove(tree);
-            tmp.Rehash();
-            tree.swap(tmp);
-            --sqrt_count;
-        }
-        if(inverted)
-        {
-            CodeTree tmp;
-            tmp.SetOpcode(cInv);
-            tmp.AddParamMove(tree);
-            tree.swap(tmp);
-        }
-    }
-
-    double CalculatePowiFactorCost(long abs_int_exponent)
-    {
-        static std::map<long, double> cache;
-        std::map<long,double>::iterator i = cache.lower_bound(abs_int_exponent);
-        if(i != cache.end() && i->first == abs_int_exponent)
-            return i->second;
-        std::pair<long, double> result(abs_int_exponent, 0.0);
-        double& cost = result.second;
-
-        while(abs_int_exponent > 1)
-        {
-            int factor = 0;
-            if(abs_int_exponent < 256)
-            {
-                factor = FPoptimizer_ByteCode::powi_table[abs_int_exponent];
-                if(factor & 128) factor &= 127; else factor = 0;
-                if(factor & 64) factor = -(factor&63) - 1;
-            }
-            if(factor)
-            {
-                cost += CalculatePowiFactorCost(factor);
-                abs_int_exponent /= factor;
-                continue;
-            }
-            if(!(abs_int_exponent & 1))
-            {
-                abs_int_exponent /= 2;
-                cost += 3; // sqr
-            }
-            else
-            {
-                cost += 3.5; // dup+mul
-                abs_int_exponent -= 1;
-            }
-        }
-
-        cache.insert(i, result);
-        return cost;
-    }
-
-    struct PowiResolver
-    {
-        /* Any exponentiation can be turned into one of these:
-         *
-         *   x^y  -> sqrt(x)^(y*2)         = x Sqrt       y*2  Pow
-         *   x^y  -> cbrt(x)^(y*3)         = x Cbrt       y*3  Pow
-         *   x^y  -> rsqrt(x)^(y*-2)       = x RSqrt     y*-2  Pow
-         *   x^y  -> x^(y-1/2) * sqrt(x)   = x Sqrt   x y-0.5  Pow Mul
-         *   x^y  -> x^(y-1/3) * cbrt(x)   = x Cbrt   x y-0.33 Pow Mul
-         *   x^y  -> x^(y+1/2) * rsqrt(x)  = x Sqrt   x y+0.5  Pow Mul
-         *   x^y  -> inv(x)^(-y)           = x Inv      -y     Pow
-         *
-         * These rules can be applied recursively.
-         * The goal is to find the optimal chain of operations
-         * that results in the least number of sqrt,cbrt operations;
-         * an integer value of y, and that the integer is as close
-         * to zero as possible.
-         */
-        static const unsigned MaxSep = 4;
-
-        struct PowiResult
-        {
-            PowiResult() :
-                n_int_sqrt(0),
-                n_int_cbrt(0),
-                resulting_exponent(0),
-                sep_list() { }
-
-            int n_int_sqrt;
-            int n_int_cbrt;
-            long resulting_exponent;
-            int sep_list[MaxSep];
-        };
-
-        PowiResult CreatePowiResult(double exponent) const
-        {
-            static const double RootPowers[(1+4)*(1+3)] =
-            {
-                // (sqrt^n(x))
-                1.0,
-                1.0 / (2),
-                1.0 / (2*2),
-                1.0 / (2*2*2),
-                1.0 / (2*2*2*2),
-                // cbrt^1(sqrt^n(x))
-                1.0 / (3),
-                1.0 / (3*2),
-                1.0 / (3*2*2),
-                1.0 / (3*2*2*2),
-                1.0 / (3*2*2*2*2),
-                // cbrt^2(sqrt^n(x))
-                1.0 / (3*3),
-                1.0 / (3*3*2),
-                1.0 / (3*3*2*2),
-                1.0 / (3*3*2*2*2),
-                1.0 / (3*3*2*2*2*2),
-                // cbrt^3(sqrt^n(x))
-                1.0 / (3*3*3),
-                1.0 / (3*3*3*2),
-                1.0 / (3*3*3*2*2),
-                1.0 / (3*3*3*2*2*2),
-                1.0 / (3*3*3*2*2*2*2)
-            };
-
-            PowiResult result;
-
-            int best_factor = FindIntegerFactor(exponent);
-            if(best_factor == 0)
-            {
-        #ifdef DEBUG_POWI
-            printf("no factor found for %g\n", exponent);
-        #endif
-                return result; // Unoptimizable
-            }
-
-            double best_cost = EvaluateFactorCost(best_factor, 0, 0, 0)
-                             + CalculatePowiFactorCost(long(exponent*best_factor));
-            int s_count = 0;
-            int c_count = 0;
-            int mul_count = 0;
-
-        #ifdef DEBUG_POWI
-            printf("orig = %g\n", exponent);
-            printf("plain factor = %d, cost %g\n", best_factor, best_cost);
-        #endif
-
-            for(unsigned n_s=0; n_s<MaxSep; ++n_s)
-            {
-                int best_selected_sep = 0;
-                double best_sep_cost     = best_cost;
-                int best_sep_factor   = best_factor;
-                for(int s=1; s<5*4; ++s)
-                {
-#ifdef CBRT_IS_SLOW
-                    if(s >= 5) break;
-                    // When cbrt is implemented through exp and log,
-                    // there is no advantage over exp(log()), so don't support it.
-#endif
-                    int n_sqrt = s%5;
-                    int n_cbrt = s/5;
-                    if(n_sqrt + n_cbrt > 4) continue;
-
-                    double changed_exponent = exponent;
-                    changed_exponent -= RootPowers[s];
-
-                    int factor = FindIntegerFactor(changed_exponent);
-                    if(factor != 0)
-                    {
-                        double cost = EvaluateFactorCost
-                            (factor, s_count + n_sqrt, c_count + n_cbrt, mul_count + 1)
-                          + CalculatePowiFactorCost(long(changed_exponent*factor));
-
-        #ifdef DEBUG_POWI
-                        printf("%d sqrt %d cbrt factor = %d, cost %g\n",
-                            n_sqrt, n_cbrt, factor, cost);
-        #endif
-                        if(cost < best_sep_cost)
-                        {
-                            best_selected_sep = s;
-                            best_sep_factor   = factor;
-                            best_sep_cost     = cost;
-                        }
-                    }
-                }
-                if(!best_selected_sep) break;
-
-                result.sep_list[n_s] = best_selected_sep;
-                exponent -= RootPowers[best_selected_sep];
-                s_count += best_selected_sep % 5;
-                c_count += best_selected_sep / 5;
-                best_cost   = best_sep_cost;
-                best_factor = best_sep_factor;
-                mul_count += 1;
-            }
-
-            result.resulting_exponent = (long) (exponent * best_factor + 0.5);
-            while(best_factor % 2 == 0)
-            {
-                ++result.n_int_sqrt;
-                best_factor /= 2;
-            }
-            while(best_factor % 3 == 0)
-            {
-                ++result.n_int_cbrt;
-                best_factor /= 3;
-            }
-            return result;
-        }
-
-    private:
-        // Find the integer that "value" must be multiplied
-        // with to produce an integer...
-        // Consisting of factors 2 and 3 only.
-        bool MakesInteger(double value, int factor) const
-        {
-            double v = value * double(factor);
-            double diff = fabs(v - (double)(long)(v+0.5));
-            //printf("factor %d: v=%.20f, diff=%.20f\n", factor,v, diff);
-            return diff < 1e-9;
-        }
-        int FindIntegerFactor(double value) const
-        {
-            int factor = (2*2*2*2);
-#ifdef CBRT_IS_SLOW
-            // When cbrt is implemented through exp and log,
-            // there is no advantage over exp(log()), so don't support it.
-#else
-            factor *= (3*3*3);
-#endif
-            int result = 0;
-            if(MakesInteger(value, factor))
-            {
-                result = factor;
-                while((factor % 2) == 0 && MakesInteger(value, factor/2))
-                    result = factor /= 2;
-                while((factor % 3) == 0 && MakesInteger(value, factor/3))
-                    result = factor /= 3;
-            }
-#ifdef CBRT_IS_SLOW
-            if(result == 0)
-            {
-                /* Note: Even if we allow one cbrt,
-                 *        cbrt(cbrt(x)) still gets turned into
-                 *        exp(log(x)*0.111111)
-                 *        which gives an error when x < 0...
-                 *        should we use a special system here?
-                 *        i.e. exp(log(-5)*y)
-                 *      =      -exp(log(5)*y)
-                 *        except when y is an even integer,
-                 *      when  = exp(log(5)*y)
-                 * We use a custom fp_pow() function
-                 * in order to handle these situations.
-                 */
-                if(MakesInteger(value, 3)) return 3; // single cbrt opcode
-            }
-#endif
-            return result;
-        }
-
-        int EvaluateFactorCost(int factor, int s, int c, int nmuls) const
-        {
-            const int sqrt_cost = 6;
-#ifdef CBRT_IS_SLOW
-            const int cbrt_cost = 25;
-#else
-            const int cbrt_cost = 8;
-#endif
-            int result = s * sqrt_cost + c * cbrt_cost;
-            while(factor % 2 == 0) { factor /= 2; result += sqrt_cost; }
-            while(factor % 3 == 0) { factor /= 3; result += cbrt_cost; }
-            result += nmuls;
-            return result;
-        }
-    };
-}
-
-namespace FPoptimizer_CodeTree
-{
-    bool CodeTree::RecreateInversionsAndNegations(bool prefer_base2)
-    {
-        bool changed = false;
-
-        for(size_t a=0; a<GetParamCount(); ++a)
-            if(GetParam(a).RecreateInversionsAndNegations(prefer_base2))
-                changed = true;
-
-        if(changed)
-        {
-        exit_changed:
-            Mark_Incompletely_Hashed();
-            return true;
-        }
-
-        switch(GetOpcode()) // Recreate inversions and negations
-        {
-            case cMul:
-            {
-                std::vector<CodeTree> div_params;
-                CodeTree found_log2, found_log2by;
-
-                if(true)
-                {
-                    /* This lengthy bit of code
-                     * changes log2(x)^3 * 5
-                     * to      log2by(x, 5^(1/3)) ^ 3
-                     * which is better for runtime
-                     * than    log2by(x,1)^3 * 5
-                     */
-                    bool found_log2_on_exponent = false;
-                    double log2_exponent = 0;
-                    for(size_t a = GetParamCount(); a-- > 0; )
-                    {
-                        const CodeTree& powgroup = GetParam(a);
-                        if(powgroup.GetOpcode() == cPow
-                        && powgroup.GetParam(0).GetOpcode() == cLog2
-                        && powgroup.GetParam(1).IsImmed())
-                        {
-                            // Found log2 on exponent
-                            found_log2_on_exponent = true;
-                            log2_exponent = powgroup.GetParam(1).GetImmed();
-                            break;
-                        }
-                    }
-                    if(found_log2_on_exponent)
-                    {
-                        double immeds = 1.0;
-                        for(size_t a = GetParamCount(); a-- > 0; )
-                        {
-                            const CodeTree& powgroup = GetParam(a);
-                            if(powgroup.IsImmed())
-                            {
-                                immeds *= powgroup.GetImmed();
-                                DelParam(a);
-                            }
-                        }
-                        for(size_t a = GetParamCount(); a-- > 0; )
-                        {
-                            CodeTree& powgroup = GetParam(a);
-                            if(powgroup.GetOpcode() == cPow
-                            && powgroup.GetParam(0).GetOpcode() == cLog2
-                            && powgroup.GetParam(1).IsImmed())
-                            {
-                                CodeTree& log2 = powgroup.GetParam(0);
-                                log2.CopyOnWrite();
-                                log2.SetOpcode(cLog2by);
-                                log2.AddParam( CodeTree( fp_pow(immeds, 1.0 / log2_exponent) ) );
-                                log2.Rehash();
-                                break;
-                            }
-                        }
-                    }
-                }
-
-                for(size_t a = GetParamCount(); a-- > 0; )
-                {
-                    const CodeTree& powgroup = GetParam(a);
-                    if(powgroup.GetOpcode() == cPow
-                    && powgroup.GetParam(1).IsImmed())
-                    {
-                        const CodeTree& exp_param = powgroup.GetParam(1);
-                        double exponent = exp_param.GetImmed();
-                        if(FloatEqual(exponent, -1.0))
-                        {
-                            CopyOnWrite();
-                            div_params.push_back(GetParam(a).GetParam(0));
-                            DelParam(a); // delete the pow group
-                        }
-                        else if(exponent < 0 && IsIntegerConst(exponent))
-                        {
-                            CodeTree edited_powgroup;
-                            edited_powgroup.SetOpcode(cPow);
-                            edited_powgroup.AddParam(powgroup.GetParam(0));
-                            edited_powgroup.AddParam(CodeTree(-exponent));
-                            edited_powgroup.Rehash();
-                            div_params.push_back(edited_powgroup);
-                            CopyOnWrite();
-                            DelParam(a); // delete the pow group
-                        }
-                    }
-                    else if(powgroup.GetOpcode() == cLog2 && !found_log2.IsDefined())
-                    {
-                        found_log2 = powgroup.GetParam(0);
-                        CopyOnWrite();
-                        DelParam(a);
-                    }
-                    else if(powgroup.GetOpcode() == cLog2by && !found_log2by.IsDefined())
-                    {
-                        found_log2by = powgroup;
-                        CopyOnWrite();
-                        DelParam(a);
-                    }
-                }
-                if(!div_params.empty())
-                {
-                    changed = true;
-
-                    CodeTree divgroup;
-                    divgroup.SetOpcode(cMul);
-                    divgroup.SetParamsMove(div_params);
-                    divgroup.Rehash(); // will reduce to div_params[0] if only one item
-                    CodeTree mulgroup;
-                    mulgroup.SetOpcode(cMul);
-                    mulgroup.SetParamsMove(GetParams());
-                    mulgroup.Rehash(); // will reduce to 1.0 if none remained in this cMul
-                    if(mulgroup.IsImmed() && FloatEqual(mulgroup.GetImmed(), 1.0))
-                    {
-                        SetOpcode(cInv);
-                        AddParamMove(divgroup);
-                    }
-                    /*else if(mulgroup.IsImmed() && FloatEqual(mulgroup.GetImmed(), -1.0))
-                    {
-                        CodeTree invgroup;
-                        invgroup.SetOpcode(cInv);
-                        invgroup.AddParamMove(divgroup);
-                        invgroup.Rehash();
-                        SetOpcode(cNeg);
-                        AddParamMove(invgroup);
-                    }*/
-                    else
-                    {
-                        if(mulgroup.GetDepth() >= divgroup.GetDepth())
-                        {
-                            SetOpcode(cDiv);
-                            AddParamMove(mulgroup);
-                            AddParamMove(divgroup);
-                        }
-                        else
-                        {
-                            SetOpcode(cRDiv);
-                            AddParamMove(divgroup);
-                            AddParamMove(mulgroup);
-                        }
-                    }
-                }
-                if(found_log2.IsDefined())
-                {
-                    CodeTree mulgroup;
-                    mulgroup.SetOpcode(GetOpcode());
-                    mulgroup.SetParamsMove(GetParams());
-                    mulgroup.Rehash();
-                    while(mulgroup.RecreateInversionsAndNegations(prefer_base2))
-                        mulgroup.FixIncompleteHashes();
-                    SetOpcode(cLog2by);
-                    AddParamMove(found_log2);
-                    AddParamMove(mulgroup);
-                    changed = true;
-                }
-                if(found_log2by.IsDefined())
-                {
-                    CodeTree mulgroup;
-                    mulgroup.SetOpcode(cMul);
-                    mulgroup.AddParamMove(found_log2by.GetParam(1));
-                    mulgroup.AddParamsMove(GetParams());
-                    mulgroup.Rehash();
-                    while(mulgroup.RecreateInversionsAndNegations(prefer_base2))
-                        mulgroup.FixIncompleteHashes();
-                    DelParams();
-                    SetOpcode(cLog2by);
-                    AddParamMove(found_log2by.GetParam(0));
-                    AddParamMove(mulgroup);
-                    changed = true;
-                }
-                break;
-            }
-            case cAdd:
-            {
-                std::vector<CodeTree> sub_params;
-
-                for(size_t a = GetParamCount(); a-- > 0; )
-                    if(GetParam(a).GetOpcode() == cMul)
-                    {
-                        bool is_signed = false; // if the mul group has a -1 constant...
-
-                        CodeTree& mulgroup = GetParam(a);
-
-                        for(size_t b=mulgroup.GetParamCount(); b-- > 0; )
-                        {
-                            if(mulgroup.GetParam(b).IsImmed())
-                            {
-                                double factor = mulgroup.GetParam(b).GetImmed();
-                                if(FloatEqual(factor, -1.0))
-                                {
-                                    mulgroup.CopyOnWrite();
-                                    mulgroup.DelParam(b);
-                                    is_signed = !is_signed;
-                                }
-                                else if(FloatEqual(factor, -2.0))
-                                {
-                                    mulgroup.CopyOnWrite();
-                                    mulgroup.DelParam(b);
-                                    mulgroup.AddParam( CodeTree(2.0) );
-                                    is_signed = !is_signed;
-                                }
-                            }
-                        }
-                        if(is_signed)
-                        {
-                            mulgroup.Rehash();
-                            sub_params.push_back(mulgroup);
-                            CopyOnWrite();
-                            DelParam(a);
-                        }
-                    }
-                    else if(GetParam(a).GetOpcode() == cDiv)
-                    {
-                        bool is_signed = false;
-                        CodeTree& divgroup = GetParam(a);
-                        if(divgroup.GetParam(0).IsImmed())
-                        {
-                            if(FloatEqual(divgroup.GetParam(0).GetImmed(), -1.0))
-                            {
-                                divgroup.CopyOnWrite();
-                                divgroup.DelParam(0);
-                                divgroup.SetOpcode(cInv);
-                                is_signed = !is_signed;
-                            }
-                        }
-                        if(is_signed)
-                        {
-                            divgroup.Rehash();
-                            sub_params.push_back(divgroup);
-                            CopyOnWrite();
-                            DelParam(a);
-                        }
-                    }
-                    else if(GetParam(a).GetOpcode() == cRDiv)
-                    {
-                        bool is_signed = false;
-                        CodeTree& divgroup = GetParam(a);
-                        if(divgroup.GetParam(1).IsImmed())
-                        {
-                            if(FloatEqual(divgroup.GetParam(1).GetImmed(), -1.0))
-                            {
-                                divgroup.CopyOnWrite();
-                                divgroup.DelParam(1);
-                                divgroup.SetOpcode(cInv);
-                                is_signed = !is_signed;
-                            }
-                        }
-                        if(is_signed)
-                        {
-                            divgroup.Rehash();
-                            sub_params.push_back(divgroup);
-                            CopyOnWrite();
-                            DelParam(a);
-                        }
-                    }
-                if(!sub_params.empty())
-                {
-                    CodeTree subgroup;
-                    subgroup.SetOpcode(cAdd);
-                    subgroup.SetParamsMove(sub_params);
-                    subgroup.Rehash(); // will reduce to sub_params[0] if only one item
-                    CodeTree addgroup;
-                    addgroup.SetOpcode(cAdd);
-                    addgroup.SetParamsMove(GetParams());
-                    addgroup.Rehash(); // will reduce to 0.0 if none remained in this cAdd
-                    if(addgroup.IsImmed() && FloatEqual(addgroup.GetImmed(), 0.0))
-                    {
-                        SetOpcode(cNeg);
-                        AddParamMove(subgroup);
-                    }
-                    else
-                    {
-                        if(addgroup.GetDepth() == 1)
-                        {
-                            /* 5 - (x+y+z) is best expressed as rsub(x+y+z, 5);
-                             * this has lowest stack usage.
-                             * This is identified by addgroup having just one member.
-                             */
-                            SetOpcode(cRSub);
-                            AddParamMove(subgroup);
-                            AddParamMove(addgroup);
-                        }
-                        else if(subgroup.GetOpcode() == cAdd)
-                        {
-                            /* a+b-(x+y+z) is expressed as a+b-x-y-z.
-                             * Making a long chain of cSubs is okay, because the
-                             * cost of cSub is the same as the cost of cAdd.
-                             * Thus we get the lowest stack usage.
-                             * This approach cannot be used for cDiv.
-                             */
-                            SetOpcode(cSub);
-                            AddParamMove(addgroup);
-                            AddParamMove(subgroup.GetParam(0));
-                            for(size_t a=1; a<subgroup.GetParamCount(); ++a)
-                            {
-                                CodeTree innersub;
-                                innersub.SetOpcode(cSub);
-                                innersub.SetParamsMove(GetParams());
-                                innersub.Rehash(false);
-                                //DelParams();
-                                AddParamMove(innersub);
-                                AddParamMove(subgroup.GetParam(a));
-                            }
-                        }
-                        else
-                        {
-                            SetOpcode(cSub);
-                            AddParamMove(addgroup);
-                            AddParamMove(subgroup);
-                        }
-                    }
-                }
-                break;
-            }
-            case cPow:
-            {
-                const CodeTree& p0 = GetParam(0);
-                const CodeTree& p1 = GetParam(1);
-                if(p1.IsImmed())
-                {
-                    if(p1.GetImmed() != 0.0 && !p1.IsLongIntegerImmed())
-                    {
-                        PowiResolver::PowiResult
-                            r = PowiResolver().CreatePowiResult(fabs(p1.GetImmed()));
-
-                        if(r.resulting_exponent != 0)
-                        {
-                            bool signed_chain = false;
-
-                            if(p1.GetImmed() < 0
-                            && r.sep_list[0] == 0
-                            && r.n_int_sqrt > 0)
-                            {
-                                // If one of the internal sqrts can be changed into rsqrt
-                                signed_chain = true;
-                            }
-
-                        #ifdef DEBUG_POWI
-                            printf("Will resolve powi %g as powi(chain(%d,%d),%ld)",
-                                fabs(p1.GetImmed()),
-                                r.n_int_sqrt,
-                                r.n_int_cbrt,
-                                r.resulting_exponent);
-                            for(unsigned n=0; n<PowiResolver::MaxSep; ++n)
-                            {
-                                if(r.sep_list[n] == 0) break;
-                                int n_sqrt = r.sep_list[n] % 5;
-                                int n_cbrt = r.sep_list[n] / 5;
-                                printf("*chain(%d,%d)", n_sqrt,n_cbrt);
-                            }
-                            printf("\n");
-                        #endif
-
-                            CodeTree source_tree = GetParam(0);
-
-                            CodeTree pow_item = source_tree;
-                            pow_item.CopyOnWrite();
-                            ChangeIntoRootChain(pow_item,
-                                signed_chain,
-                                r.n_int_sqrt,
-                                r.n_int_cbrt);
-                            pow_item.Rehash();
-
-                            CodeTree pow;
-                            if(r.resulting_exponent != 1)
-                            {
-                                pow.SetOpcode(cPow);
-                                pow.AddParamMove(pow_item);
-                                pow.AddParam(CodeTree( double(r.resulting_exponent) ));
-                            }
-                            else
-                                pow.swap(pow_item);
-
-                            CodeTree mul;
-                            mul.SetOpcode(cMul);
-                            mul.AddParamMove(pow);
-
-                            for(unsigned n=0; n<PowiResolver::MaxSep; ++n)
-                            {
-                                if(r.sep_list[n] == 0) break;
-                                int n_sqrt = r.sep_list[n] % 5;
-                                int n_cbrt = r.sep_list[n] / 5;
-
-                                CodeTree mul_item = source_tree;
-                                mul_item.CopyOnWrite();
-                                ChangeIntoRootChain(mul_item, false, n_sqrt, n_cbrt);
-                                mul_item.Rehash();
-                                mul.AddParamMove(mul_item);
-                            }
-
-                            if(p1.GetImmed() < 0 && !signed_chain)
-                            {
-                                mul.Rehash();
-                                SetOpcode(cInv);
-                                SetParamMove(0, mul);
-                                DelParam(1);
-                            }
-                            else
-                            {
-                                SetOpcode(cMul);
-                                SetParamsMove(mul.GetParams());
-                            }
-                        #ifdef DEBUG_POWI
-                            DumpTreeWithIndent(*this);
-                        #endif
-                            changed = true;
-                            break;
-                        }
-                    }
-                }
-                if(GetOpcode() == cPow
-                && (!p1.IsLongIntegerImmed()
-                 || !IsOptimizableUsingPowi(p1.GetLongIntegerImmed())))
-                {
-                    if(p0.IsImmed() && p0.GetImmed() > 0.0)
-                    {
-                        // Convert into cExp or Exp2.
-                        //    x^y = exp(log(x) * y) =
-                        //    Can only be done when x is positive, though.
-                        if(prefer_base2)
-                        {
-                            double mulvalue = fp_log2( p0.GetImmed() );
-                            if(mulvalue == 1.0)
-                            {
-                                // exp2(1)^x becomes exp2(x)
-                                DelParam(0);
-                            }
-                            else
-                            {
-                                // exp2(4)^x becomes exp2(4*x)
-                                CodeTree exponent;
-                                exponent.SetOpcode(cMul);
-                                exponent.AddParam( CodeTree( mulvalue ) );
-                                exponent.AddParam(p1);
-                                exponent.Rehash();
-                                SetParamMove(0, exponent);
-                                DelParam(1);
-                            }
-                            SetOpcode(cExp2);
-                            changed = true;
-                        }
-                        else
-                        {
-                            double mulvalue = std::log( p0.GetImmed() );
-                            if(mulvalue == 1.0)
-                            {
-                                // exp(1)^x becomes exp(x)
-                                DelParam(0);
-                            }
-                            else
-                            {
-                                // exp(4)^x becomes exp(4*x)
-                                CodeTree exponent;
-                                exponent.SetOpcode(cMul);
-                                exponent.AddParam( CodeTree( mulvalue ) );
-                                exponent.AddParam(p1);
-                                exponent.Rehash();
-                                SetParamMove(0, exponent);
-                                DelParam(1);
-                            }
-                            SetOpcode(cExp);
-                            changed = true;
-                        }
-                    }
-                    else if(p0.IsAlwaysSigned(true))
-                    {
-                        if(prefer_base2)
-                        {
-                            CodeTree log;
-                            log.SetOpcode(cLog2);
-                            log.AddParam(p0);
-                            log.Rehash();
-                            CodeTree exponent;
-                            exponent.SetOpcode(cMul);
-                            exponent.AddParam(p1);
-                            exponent.AddParamMove(log);
-                            exponent.Rehash();
-                            SetOpcode(cExp2);
-                            SetParamMove(0, exponent);
-                            DelParam(1);
-                            changed = true;
-                        }
-                        else
-                        {
-                            CodeTree log;
-                            log.SetOpcode(cLog);
-                            log.AddParam(p0);
-                            log.Rehash();
-                            CodeTree exponent;
-                            exponent.SetOpcode(cMul);
-                            exponent.AddParam(p1);
-                            exponent.AddParamMove(log);
-                            exponent.Rehash();
-                            SetOpcode(cExp);
-                            SetParamMove(0, exponent);
-                            DelParam(1);
-                            changed = true;
-                        }
-                    }
-                }
-                break;
-            }
-
-            default: break;
-        }
-
-        if(changed)
-            goto exit_changed;
-
-        return changed;
-    }
-
-    bool ContainsOtherCandidates(
-        const CodeTree& within,
-        const CodeTree& tree,
-        const FPoptimizer_ByteCode::ByteCodeSynth& synth,
-        const TreeCountType& TreeCounts)
-    {
-        for(size_t b=tree.GetParamCount(), a=0; a<b; ++a)
-        {
-            const CodeTree& leaf = tree.GetParam(a);
-
-            TreeCountType::iterator synth_it;
-            for(TreeCountType::const_iterator
-                i = TreeCounts.begin();
-                i != TreeCounts.end();
-                ++i)
-            {
-                if(i->first != leaf.GetHash())
-                    continue;
-
-                size_t          score     = i->second.first;
-                const CodeTree& candidate = i->second.second;
-
-                // It must not yet have been synthesized
-                if(synth.Find(candidate))
-                    continue;
-
-                // And it must not be a simple expression
-                // Because cImmed, VarBegin are faster than cFetch
-                if(leaf.GetDepth() <= 1)
-                    continue;
-
-                // It must always occur at least twice
-                if(score < 2)
-                    continue;
-
-                // And it must either appear on both sides
-                // of a cIf, or neither
-                if(IfBalanceGood(within, leaf).BalanceGood == false)
-                    continue;
-
-                return true;
-            }
-            if(ContainsOtherCandidates(within, leaf, synth, TreeCounts))
-                return true;
-        }
-        return false;
-    }
-
-    size_t CodeTree::SynthCommonSubExpressions(
-        FPoptimizer_ByteCode::ByteCodeSynth& synth) const
-    {
-        size_t stacktop_before = synth.GetStackTop();
-
-        /* Find common subtrees */
-        TreeCountType TreeCounts;
-        FindTreeCounts(TreeCounts, *this);
-
-    #ifdef DEBUG_SUBSTITUTIONS_CSE
-        DumpHashes(*this);
-    #endif
-
-        /* Synthesize some of the most common ones */
-        for(;;)
-        {
-            size_t best_score = 0;
-            TreeCountType::iterator synth_it;
-            for(TreeCountType::iterator
-                j,i = TreeCounts.begin();
-                i != TreeCounts.end();
-                i=j)
-            {
-                j=i; ++j;
-
-                size_t         score = i->second.first;
-                const CodeTree& tree = i->second.second;
-
-    #ifdef DEBUG_SUBSTITUTIONS_CSE
-                std::cout << "Score " << score << ":\n";
-                DumpTreeWithIndent(tree);
-    #endif
-
-                // It must not yet have been synthesized
-                if(synth.Find(tree))
-                {
-                    TreeCounts.erase(i);
-                    continue;
-                }
-
-                // And it must not be a simple expression
-                // Because cImmed, VarBegin are faster than cFetch
-                if(tree.GetDepth() <= 1)
-                {
-                    TreeCounts.erase(i);
-                    continue;
-                }
-
-                // It must always occur at least twice
-                if(score < 2)
-                {
-                    TreeCounts.erase(i);
-                    continue;
-                }
-
-                // And it must either appear on both sides
-                // of a cIf, or neither
-                if(IfBalanceGood(*this, tree).BalanceGood == false)
-                {
-                    TreeCounts.erase(i);
-                    continue;
-                }
-
-                // It must not contain other candidates
-                if(ContainsOtherCandidates(*this, tree, synth, TreeCounts))
-                {
-                    // Don't erase it; it may be a proper candidate later
-                    continue;
-                }
-
-                // Is a candidate.
-                score *= tree.GetDepth();
-                if(score > best_score)
-                    { best_score = score; synth_it = i; }
-            }
-
-            if(best_score <= 0) break; // Didn't find anything.
-
-            const CodeTree& tree = synth_it->second.second;
-    #ifdef DEBUG_SUBSTITUTIONS_CSE
-            std::cout << "Found Common Subexpression:"; DumpTree(tree); std::cout << "\n";
-    #endif
-            /* Synthesize the selected tree */
-            tree.SynthesizeByteCode(synth, false);
-            TreeCounts.erase(synth_it);
-    #ifdef DEBUG_SUBSTITUTIONS_CSE
-            std::cout << "Done with Common Subexpression:"; DumpTree(tree); std::cout << "\n";
-    #endif
-        }
-
-        return synth.GetStackTop() - stacktop_before;
-    }
-}
-
-#endif
-
-#line 1 "fpoptimizer/fpoptimizer_main.c"
-#include "fpconfig.h"
-#include "fparser.h"
-#include "fptypes.h"
-
-// line removed for fpoptimizer.c: #include "fpoptimizer_codetree.h"
-// line removed for fpoptimizer.c: #include "fpoptimizer_optimize.h"
-
-using namespace FUNCTIONPARSERTYPES;
-
-#ifdef FP_SUPPORT_OPTIMIZER
-using namespace FPoptimizer_CodeTree;
-
-template<>
-void FunctionParserBase<double>::Optimize()
-{
-    typedef double Value_t;
-
-    CopyOnWrite();
-
-    //PrintByteCode(std::cout);
-
-    CodeTree tree;
-    tree.GenerateFrom(data->ByteCode, data->Immed, *data);
-
-    FPoptimizer_Optimize::ApplyGrammars(tree);
-
-    std::vector<unsigned> byteCode;
-    std::vector<Value_t> immed;
-    size_t stacktop_max = 0;
-    tree.SynthesizeByteCode(byteCode, immed, stacktop_max);
-
-    /*std::cout << std::flush;
-    std::cerr << std::flush;
-    fprintf(stderr, "Estimated stacktop %u\n", (unsigned)stacktop_max);
-    fflush(stderr);*/
-
-    if(data->StackSize != stacktop_max)
-    {
-        data->StackSize = stacktop_max; // note: gcc warning is meaningful
-#ifndef FP_USE_THREAD_SAFE_EVAL
-        data->Stack.resize(stacktop_max);
-#endif
-    }
-
-    data->ByteCode.swap(byteCode);
-    data->Immed.swap(immed);
-
-    //PrintByteCode(std::cout);
-}
-
-template<>
-void FunctionParserBase<float>::Optimize()
-{}
-
-template<>
-void FunctionParserBase<long double>::Optimize()
-{}
-
-template<>
-void FunctionParserBase<long>::Optimize()
-{}
-
-#ifdef FP_SUPPORT_MPFR_FLOAT_TYPE
-template<>
-void FunctionParserBase<MpfrFloat>::Optimize()
-{}
-#endif
-
-#ifdef FP_SUPPORT_GMP_INT_TYPE
-template<>
-void FunctionParserBase<GmpInt>::Optimize()
-{}
-#endif
-
-
-FUNCTIONPARSER_INSTANTIATE_TYPES
-
-#endif
-
-#line 1 "fpoptimizer/fpoptimizer_footer.txt"
-
-#endif
-
diff --git a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/fptypes.h b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/fptypes.h
deleted file mode 100644
index a38cc4c26b..0000000000
--- a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/fptypes.h
+++ /dev/null
@@ -1,267 +0,0 @@
-/***************************************************************************\
-|* Function Parser for C++ v4.0.3                                          *|
-|*-------------------------------------------------------------------------*|
-|* Copyright: Juha Nieminen, Joel Yliluoma                                 *|
-\***************************************************************************/
-
-// NOTE:
-// This file contains only internal types for the function parser library.
-// You don't need to include this file in your code. Include "fparser.hh"
-// only.
-
-#ifndef ONCE_FPARSER_TYPES_H_
-#define ONCE_FPARSER_TYPES_H_
-
-#include "fpconfig.h"
-#include <cstring>
-
-#ifdef ONCE_FPARSER_H_
-# include <map>
-#endif
-
-namespace FUNCTIONPARSERTYPES
-{
-    enum OPCODE
-    {
-// The order of opcodes in the function list must
-// match that which is in the Functions[] array.
-        cAbs,
-        cAcos, cAcosh,
-        cAsin, cAsinh,
-        cAtan, cAtan2, cAtanh,
-        cCbrt, cCeil,
-        cCos, cCosh, cCot, cCsc,
-        cEval,
-        cExp, cExp2, cFloor, cIf, cInt, cLog, cLog10, cLog2, cMax, cMin,
-        cPow, cSec, cSin, cSinh, cSqrt, cTan, cTanh,
-        cTrunc,
-
-// These do not need any ordering:
-// Except that if you change the order of {eq,neq,lt,le,gt,ge}, you
-// must also change the order in ConstantFolding_ComparisonOperations().
-        cImmed, cJump,
-        cNeg, cAdd, cSub, cMul, cDiv, cMod,
-        cEqual, cNEqual, cLess, cLessOrEq, cGreater, cGreaterOrEq,
-        cNot, cAnd, cOr,
-        cNotNot, /* Protects the double-not sequence from optimizations */
-
-        cDeg, cRad, /* Multiplication and division by 180 / pi */
-
-        cFCall, cPCall,
-
-#ifdef FP_SUPPORT_OPTIMIZER
-        cFetch, /* Same as Dup, except with absolute index
-                 * (next value is index) */
-        cPopNMov, /* cPopNMov(x,y) moves [y] to [x] and deletes anything
-                   * above [x]. Used for disposing of temporaries.
-                   */
-        cLog2by, /* log2by(x,y) = log2(x) * y */
-#endif
-        cAbsAnd,    /* As cAnd,       but assume both operands are absolute values */
-        cAbsOr,     /* As cOr,        but assume both operands are absolute values */
-        cAbsNot,    /* As cAbsNot,    but assume the operand is an absolute value */
-        cAbsNotNot, /* As cAbsNotNot, but assume the operand is an absolute value */
-        cAbsIf,     /* As cAbsIf,     but assume the 1st operand is an absolute value */
-
-        cDup,   /* Duplicates the last value in the stack: Push [Stacktop] */
-        cInv,   /* Inverts the last value in the stack (x = 1/x) */
-        cSqr,   /* squares the last operand in the stack, no push/pop */
-        cRDiv,  /* reverse division (not x/y, but y/x) */
-        cRSub,  /* reverse subtraction (not x-y, but y-x) */
-        cRSqrt, /* inverse square-root (1/sqrt(x)) */
-
-        cNop,
-        VarBegin
-    };
-
-#ifdef ONCE_FPARSER_H_
-    struct FuncDefinition
-    {
-        enum FunctionFlags
-        {
-            Enabled  = 0x01,
-            AngleIn  = 0x02,
-            AngleOut = 0x04,
-            OkForInt = 0x08
-        };
-
-#ifdef FUNCTIONPARSER_SUPPORT_DEBUG_OUTPUT
-        const char name[8];
-#else
-        struct name { } name;
-#endif
-        unsigned params : 8;
-        unsigned flags  : 8;
-
-        inline bool enabled() const { return flags != 0; }
-        inline bool okForInt() const { return (flags & OkForInt) != 0; }
-    };
-
-#ifndef FP_DISABLE_EVAL
-# define FP_EVAL_FUNCTION_ENABLED \
-    FuncDefinition::Enabled | FuncDefinition::OkForInt
-#else
-# define FP_EVAL_FUNCTION_ENABLED 0
-#endif
-#ifdef FUNCTIONPARSER_SUPPORT_DEBUG_OUTPUT
-# define FP_FNAME(n) n
-#else
-# define FP_FNAME(n) {}
-#endif
-// This list must be in the same order as that in OPCODE enum,
-// because the opcode value is used to index this array, and
-// the pointer to array element is used for generating the opcode.
-    const FuncDefinition Functions[]=
-    {
-        /*cAbs  */ { FP_FNAME("abs"),   1,
-                     FuncDefinition::Enabled | FuncDefinition::OkForInt },
-        /*cAcos */ { FP_FNAME("acos"),  1,
-                     FuncDefinition::Enabled | FuncDefinition::AngleOut },
-        /*cAcosh*/ { FP_FNAME("acosh"), 1,
-                     FuncDefinition::Enabled | FuncDefinition::AngleOut },
-        /*cAsin */ { FP_FNAME("asin"),  1,
-                     FuncDefinition::Enabled | FuncDefinition::AngleOut },
-        /*cAsinh*/ { FP_FNAME("asinh"), 1,
-                     FuncDefinition::Enabled | FuncDefinition::AngleOut },
-        /*cAtan */ { FP_FNAME("atan"),  1,
-                     FuncDefinition::Enabled | FuncDefinition::AngleOut },
-        /*cAtan2*/ { FP_FNAME("atan2"), 2,
-                     FuncDefinition::Enabled | FuncDefinition::AngleOut },
-        /*cAtanh*/ { FP_FNAME("atanh"), 1, FuncDefinition::Enabled },
-        /*cCbrt */ { FP_FNAME("cbrt"),  1, FuncDefinition::Enabled },
-        /*cCeil */ { FP_FNAME("ceil"),  1, FuncDefinition::Enabled },
-        /*cCos  */ { FP_FNAME("cos"),   1,
-                     FuncDefinition::Enabled | FuncDefinition::AngleIn },
-        /*cCosh */ { FP_FNAME("cosh"),  1,
-                     FuncDefinition::Enabled | FuncDefinition::AngleIn },
-        /*cCot  */ { FP_FNAME("cot"),   1,
-                     FuncDefinition::Enabled | FuncDefinition::AngleIn },
-        /*cCsc  */ { FP_FNAME("csc"),   1,
-                     FuncDefinition::Enabled | FuncDefinition::AngleIn },
-        /*cEval */ { FP_FNAME("eval"),  0, FP_EVAL_FUNCTION_ENABLED },
-        /*cExp  */ { FP_FNAME("exp"),   1, FuncDefinition::Enabled },
-        /*cExp2 */ { FP_FNAME("exp2"),  1, FuncDefinition::Enabled },
-        /*cFloor*/ { FP_FNAME("floor"), 1, FuncDefinition::Enabled },
-        /*cIf   */ { FP_FNAME("if"),    0,
-                     FuncDefinition::Enabled | FuncDefinition::OkForInt },
-        /*cInt  */ { FP_FNAME("int"),   1, FuncDefinition::Enabled },
-        /*cLog  */ { FP_FNAME("log"),   1, FuncDefinition::Enabled },
-        /*cLog10*/ { FP_FNAME("log10"), 1, FuncDefinition::Enabled },
-        /*cLog2 */ { FP_FNAME("log2"),  1, FuncDefinition::Enabled },
-        /*cMax  */ { FP_FNAME("max"),   2,
-                     FuncDefinition::Enabled | FuncDefinition::OkForInt },
-        /*cMin  */ { FP_FNAME("min"),   2,
-                     FuncDefinition::Enabled | FuncDefinition::OkForInt },
-        /*cPow  */ { FP_FNAME("pow"),   2, FuncDefinition::Enabled },
-        /*cSec  */ { FP_FNAME("sec"),   1,
-                     FuncDefinition::Enabled | FuncDefinition::AngleIn },
-        /*cSin  */ { FP_FNAME("sin"),   1,
-                     FuncDefinition::Enabled | FuncDefinition::AngleIn },
-        /*cSinh */ { FP_FNAME("sinh"),  1,
-                     FuncDefinition::Enabled | FuncDefinition::AngleIn },
-        /*cSqrt */ { FP_FNAME("sqrt"),  1,
-                     FuncDefinition::Enabled },
-        /*cTan  */ { FP_FNAME("tan"),   1,
-                     FuncDefinition::Enabled | FuncDefinition::AngleIn },
-        /*cTanh */ { FP_FNAME("tanh"),  1,
-                     FuncDefinition::Enabled | FuncDefinition::AngleIn },
-        /*cTrunc*/ { FP_FNAME("trunc"), 1,
-                     FuncDefinition::Enabled }
-    };
-#undef FP_FNAME
-
-    struct NamePtr
-    {
-        const char* name;
-        unsigned nameLength;
-
-        NamePtr(const char* n, unsigned l): name(n), nameLength(l) {}
-
-        inline bool operator==(const NamePtr& rhs) const
-        {
-            return nameLength == rhs.nameLength
-                && std::memcmp(name, rhs.name, nameLength) == 0;
-        }
-        inline bool operator<(const NamePtr& rhs) const
-        {
-            for(unsigned i = 0; i < nameLength; ++i)
-            {
-                if(i == rhs.nameLength) return false;
-                const char c1 = name[i], c2 = rhs.name[i];
-                if(c1 < c2) return true;
-                if(c2 < c1) return false;
-            }
-            return nameLength < rhs.nameLength;
-        }
-    };
-
-    template<typename Value_t>
-    struct NameData
-    {
-        enum DataType { CONSTANT, UNIT, FUNC_PTR, PARSER_PTR, VARIABLE };
-        DataType type;
-        unsigned index;
-        Value_t value;
-
-        NameData(DataType t, unsigned v) : type(t), index(v), value() { }
-        NameData(DataType t, Value_t v) : type(t), index(), value(v) { }
-        NameData() { }
-    };
-
-    template<typename Value_t>
-    class namePtrsType: public
-    std::map<
-        FUNCTIONPARSERTYPES::NamePtr,
-        FUNCTIONPARSERTYPES::NameData<Value_t>
-    >
-    {
-    };
-
-    const unsigned FUNC_AMOUNT = sizeof(Functions)/sizeof(Functions[0]);
-#endif // ONCE_FPARSER_H_
-}
-
-#ifdef ONCE_FPARSER_H_
-#include <vector>
-
-template<typename Value_t>
-struct FunctionParserBase<Value_t>::Data
-{
-    unsigned referenceCounter;
-
-    unsigned numVariables;
-    std::string variablesString;
-    FUNCTIONPARSERTYPES::namePtrsType<Value_t> namePtrs;
-
-    struct FuncPtrData
-    {
-        union
-        {
-            FunctionPtr funcPtr;
-            FunctionParserBase<Value_t>* parserPtr;
-        };
-        unsigned params;
-    };
-
-    std::vector<FuncPtrData> FuncPtrs;
-    std::vector<FuncPtrData> FuncParsers;
-
-    std::vector<unsigned> ByteCode;
-    std::vector<Value_t> Immed;
-#ifndef FP_USE_THREAD_SAFE_EVAL
-    std::vector<Value_t> Stack;
-    // Note: When Stack exists,
-    //       Stack.size() and StackSize are mutually redundant.
-#endif
-    unsigned StackSize;
-
-    Data();
-    Data(const Data&);
-    Data& operator=(const Data&); // not implemented on purpose
-    ~Data();
-};
-#endif
-
-#include "fpaux.h"
-
-#endif
diff --git a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/hash.h b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/hash.h
deleted file mode 100644
index d02659184f..0000000000
--- a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/hash.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/**
- * @file    hash.h
- * @author  Thomas Lewiner 
- * @version 
- * @date    
- *
- * @brief
- *
- */
-//________________________________________________
-
-
-#ifndef _HASH_H_
-#define _HASH_H_
-
-// may be overridden by the preprocessor
-#ifndef USE_HASH_PTR
-# define USE_HASH_PTR 1
-#endif // USE_HASH_PTR
-
-// may be overridden by the preprocessor
-#ifndef HASH_BITS
-# define HASH_BITS 22
-#endif // HASH_BITS
-
-#ifndef NON_HASH_BITS
-# define NON_HASH_BITS 22
-#endif // HASH_BITS
-
-
-
-
-#if USE_HASH_PTR
-
-// #define HASH_HAS_ERASE 1
-# include "hash_ptr.h"
-
-#else  // USE_HASH_PTR
-
-# undef HASH_HAS_ERASE
-# include "hash_noptr.h"
-
-#endif // USE_HASH_PTR
-
-
-#endif // _HASH_H_
diff --git a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/hash_noptr.h b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/hash_noptr.h
deleted file mode 100644
index dc021cccce..0000000000
--- a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/hash_noptr.h
+++ /dev/null
@@ -1,251 +0,0 @@
-/**
- * @file    hash_noptr.h
- * @author  Thomas Lewiner 
- * @version 
- * @date    
- *
- * @brief Hash table without pointers
- *
- */
-//________________________________________________
-
-
-#ifndef _HASH_H_
-# error This header should not be included directly! include hash.h instead
-#endif // _HASH_H_
-
-#pragma once
-
-
-#include <stdlib.h> // memset
-
-#include "morton.h"
-
-//_____________________________________________________________________________
-// Class hash
-template < typename Data > class Hash
-//-----------------------------------------------------------------------------
-{
-public:
-  typedef uint cntr ;
-//  static const cntr HASH_BITS = 16 ;
-//  static const cntr NON_HASH_BITS = 64-HASH_BITS ;
-  static const cntr HASH_SIZE = ((cntr)1<<HASH_BITS) ;
-  static const cntr HASH_MASK = HASH_SIZE-1 ;
-  static const cntr SKIP_MINI = 11 ;
-  static const cntr SKIP_BITS = 3 ;
-  static const cntr SKIP_MASK = ((cntr)1<<SKIP_BITS)-1 ;
-
-  typedef struct { Key key ; Data data ; } KeyData ;
-  static KeyData KD_INV ;
-
-protected:
-//  KeyData _hash[HASH_SIZE] ;
-  KeyData *_hash ; // allocate dynamically since stack memory is limited
-  
-public:
-	// Constructor & Desctructor  
-  Hash   () { _hash = new KeyData[HASH_SIZE] ; reset() ; } 
-  ~Hash  () { delete [] _hash ; }
-
-  void reset() { memset( _hash, KEY_INV, HASH_SIZE*sizeof(KeyData) ) ; KD_INV.key = KEY_INV ; }
-  
-  inline cntr hash( Key k ) const ; 
-  
-  cntr size() const
-  {
-    cntr s = 0 ;
-    cntr n = HASH_SIZE ;
-    KeyData *ptr = _hash ;
-    for( ; n > 0 ; --n, ++ptr )
-      s += ( ptr->key != KEY_INV ) ;
-    return s ;
-  }
-  
-  bool insert( KeyData d )
-  {
-    cntr h = hash( d.key ) ;
-    KeyData *p = _hash + h ;
-    const cntr skip = ((d.key>>HASH_BITS) & SKIP_MASK) + SKIP_MINI ;
-    cntr overflow   = skip ;
-    while( p->key != KEY_INV && p->key != d.key )
-    { // collision
-      h += skip ;
-      if( h < HASH_SIZE )
-        p += skip ;
-      else
-      {
-        h &= HASH_MASK ;
-        p = _hash + h ;
-        if( !(overflow--) )
-          return false ;
-      }
-    }
-    *p = d ;
-    return true ;
-  }
-
-  const KeyData operator[] ( Key k ) const
-  {
-    cntr h = hash( k ) ;
-    const KeyData *p = _hash + h ;
-    const cntr skip = ((k>>HASH_BITS) & SKIP_MASK) + SKIP_MINI ;
-    cntr overflow   = skip ;
-    while( p->key != k && p->key != KEY_INV )
-    { // collision
-      h += skip ;
-      if( h < HASH_SIZE )
-        p += skip ;
-      else
-      {
-        h &= HASH_MASK ;
-        p = _hash + h ;
-        if( !(overflow--) )
-          return KD_INV ;
-      }
-    }
-    return *p ;
-  }
-  
-  KeyData &operator[] ( Key k )
-  {
-    cntr h = hash( k ) ;
-    KeyData *p = _hash + h ;
-    const cntr skip = ((k>>HASH_BITS) & SKIP_MASK) + SKIP_MINI ;
-    cntr overflow   = skip ;
-    while( p->key != k && p->key != KEY_INV )
-    { // collision
-      h += skip ;
-      if( h < HASH_SIZE )
-        p += skip ;
-      else
-      {
-        h &= HASH_MASK ;
-        p = _hash + h ;
-        if( !(overflow--) )
-          return KD_INV ;
-      }
-    }
-    return *p ;
-  }
-  
-
-  bool contains( Key k ) const { return (*this)[k].key == k ; }
-  
-  
-  
-  //------------------------------------------------
-  // iterator
-  public :
-  /// iterator
-  class iterator
-  {
-    public :
-    // constructors
-    /// default constructors
-    iterator( Hash<Data> &hash_, cntr id_ = 0 ) : _ptr(hash_._hash+id_), _last(hash_._hash+HASH_SIZE) { while( _ptr != _last && _ptr->key == KEY_INV ) ++_ptr ; }
-    
-    /// destructor
-    ~iterator() {}
-    
-    /// copy constructor
-    iterator( const iterator &it ) : _ptr(it._ptr), _last(it._last) {}
-    
-    /// assignment operator
-    iterator &operator = ( const iterator &it )
-    { _ptr = it._ptr; _last = it._last;  return *this; }
-    
-    //-----------------------------------------------------------------------------
-    // Operations
-    public  :
-    /// equality operator
-    inline bool        operator ==( const iterator &it ) const { return _ptr == it._ptr ; }
-    /// inequality operator
-    inline bool        operator !=( const iterator &it ) const { return _ptr != it._ptr ; }
-    
-    /// validation operator
-    inline bool        operator ()() const { return _ptr != _last ; }
-    
-    /// key accessor
-    inline const Key  &key() const { return _ptr->key ; }
-    
-    /// value accessor
-    inline const Data &operator * () const { return _ptr->data ; }
-    
-    /// value accessor
-    inline Data       &operator * ()       { return _ptr->data ; }
-    
-    /// accesses the next position
-    inline iterator   &operator ++()       { while( (++_ptr != _last) && _ptr->key == KEY_INV ) ;  return *this ; }
-    
-    //-----------------------------------------------------------------------------
-    // Elements
-    private :
-    KeyData       *_ptr  ; ///< position pointer
-    const KeyData *_last ; ///< last position pointer
-  };
-  
-  //------------------------------------------------
-  // const_iterator
-  public :
-  /// const_iterator
-  class const_iterator
-  {
-    public :
-    // constructors
-    /// default constructors
-    const_iterator( const Hash<Data> &hash_, cntr id_ = 0 ) : _ptr(hash_._hash+id_), _last(hash_._hash+HASH_SIZE) { while( _ptr != _last && _ptr->key == KEY_INV ) ++_ptr ; }
-    
-    /// destructor
-    ~const_iterator() {}
-    
-    /// copy constructor
-    const_iterator( const const_iterator &it ) : _ptr(it._ptr), _last(it._last) {}
-    
-    /// assignment operator
-    const_iterator &operator = ( const const_iterator &it )
-    { _ptr = it._ptr; _last = it._last;  return *this; }
-    
-    //-----------------------------------------------------------------------------
-    // Operations
-    public  :
-    /// equality operator
-    inline bool        operator ==( const const_iterator &it ) const { return _ptr == it._ptr ; }
-    /// inequality operator
-    inline bool        operator !=( const const_iterator &it ) const { return _ptr != it._ptr ; }
-    
-    /// validation operator
-    inline bool        operator ()() const { return _ptr != _last ; }
-    
-    /// key accessor
-    inline const Key  &key() const { return _ptr->key ; }
-    
-    /// value accessor
-    inline const Data &operator * () const { return _ptr->data ; }
-    
-    /// accesses the next position
-    inline const_iterator   &operator ++() { while( (++_ptr != _last) && _ptr->key == KEY_INV ) ;  return *this ; }
-    
-    //-----------------------------------------------------------------------------
-    // Elements
-    private :
-    const KeyData * _ptr  ; ///< position pointer
-    const KeyData * const _last ; ///< last position pointer
-  };
-  
-  public :
-  /// Node iterator creation
-  iterator begin( cntr id = 0 ) { return iterator( *this, id ) ; }
-  /// Node const iterator creation
-  const_iterator cbegin( cntr id = 0 ) { return const_iterator( *this, id ) ; }
-  
-};
-//_____________________________________________________________________________
-
-
-
-/// hash function specification: no inversion
-template <> inline Hash<real >::cntr Hash<real >::hash( Key k ) const { return k & HASH_MASK ; }
-
-/// hash function specification: inversion
-template <> inline Hash<Level>::cntr Hash<Level>::hash( Key k ) const { return (k>>NON_HASH_BITS) & HASH_MASK ; }
diff --git a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/hash_octree.cpp b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/hash_octree.cpp
deleted file mode 100644
index 2c17aa0101..0000000000
--- a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/hash_octree.cpp
+++ /dev/null
@@ -1,1356 +0,0 @@
-/**
- * \file    hash_octree.cpp
- * \author  Thomas Lewiner   <tomlew@puc-rio.br>
- * \author  Matmidia Lab, Math Dept, PUC-Rio
- * \date    10/01/2010
- *
- *  Octree structure with hashtable and hierarchical operations
- */
-//_____________________________________________________________________________
-
-
-#ifndef WIN32
-#pragma implementation
-#endif // WIN32
-
-
-#include <stack>
-#include "hash_octree.h"
-
-/// invalid key
-template<> Hash<real>::KeyData Hash<real>::KD_INV = { KEY_INV, R_INV } ;
-
-
-
-//_____________________________________________________________________________
-// Create the root
-void HashOctree::init()
-//-----------------------------------------------------------------------------
-{
-  _max_level = 0 ;
-  _max_field = R_INV ;
-  HashField::KeyData kd ;
-  kd.key  =  1  ;
-  kd.data = 0.0 ;
-  _hash.insert( kd ) ;
-}
-//_____________________________________________________________________________
-
-
-
-
-//_____________________________________________________________________________
-// Check that each point scan or scribble is in the right node
-bool HashOctree::check ()
-//-----------------------------------------------------------------------------
-{
-  bool result = true ;
-
-  for( cell_iterator it = cells_begin() ; it() ; ++it )
-  {
-    Key k = it.key() << 3 ;
-    bool has_son = false ;
-    bool all_sons = true  ;
-    for( int i = 0 ; i < 8 ; ++i )
-    {
-      if( _hash[ k | i ].key != KEY_INV )
-        has_son = true ;
-      else
-        all_sons = false ;
-    }
-    
-    if( it.is_leaf() && has_son )
-    {
-      printf("(hash) Invalid leaf %d: value %f\n", (int)k, _hash[k].data ) ;
-      result = false ;
-    }
-
-    if( has_son && !all_sons )
-    {
-      printf("(hash) Invalid subdivision %d: value %f\n", (int)k, _hash[k].data ) ;
-      result = false ;
-    }
-  }
-
-  return result ;
-}
-//_____________________________________________________________________________
-
-
-
-
-
-
-//_____________________________________________________________________________
-// Deletes the content of the octree
-void HashOctree::clear_octree()
-//-----------------------------------------------------------------------------
-{
-  _hash.reset() ;
-  _max_level = 0 ;
-  _max_field = R_INV ;
-}
-//_____________________________________________________________________________
-
-
-
-
-
-//_____________________________________________________________________________
-// set the values of each leaf from the implicit function
-bool HashOctree::set_impl( data_access *ref )
-//-----------------------------------------------------------------------------
-{
-  if( !ref ) return false ;
-  
-  _max_field = -FLT_MAX ;
-  for( cell_iterator it = cells_begin() ; it() ; ++it )
-  {
-    if( it.is_leaf() )
-    {
-      real v = (*ref).value_at( it.top() ) ;
-      *it = v ;
-      v = fabs(v) ;
-      if( _max_field < v ) _max_field = v ;
-    }
-//    else
-//      *it = R_INV ;
-  }
-  
-//  printf( "max field: %f\n", max_field() ) ;
-  return true ;
-}
-//_____________________________________________________________________________
-
-
-
-
-
-//_____________________________________________________________________________
-// Refine the octree according to the data access
-bool HashOctree::refine( data_access *ref /*= NULL*/ )
-//-----------------------------------------------------------------------------
-{
-  if( !ref ) return false ;
-
-    clear() ;  init() ;
-  
-  // traversal stack: iterator has a pre-ordered stack, and cannot be recursed on
-  geom_cell it = geom_root() ;
-  std::stack< geom_cell > s ;
-  s.push( it ) ;
-  
-  // although it may refine only the leaves
-  // the leaf iterator may change during the refinement
-  bool refined = false ;
-  while( !s.empty() )
-  {
-    it = s.top() ;  s.pop() ;
-
-    // test for subdivision
-    if( !(*ref).need_refine( it ) ) continue ;
-    refined = true ;
-    
-    //_____________________________________________________________________________
-    // subdivides the cell in the tree
-    _hash[it.key()].data = it._field = R_INV ;
-    HashField::KeyData kd ;
-    kd.data = 0.0 ;
-
-    // recurse on the traversal
-    Key sk = it.key() << 3 ;
-    for( int i = 0 ; i < 8 ; ++i )
-    {
-      kd.key = sk | i ;
-      if( !_hash.insert( kd ) )
-      {
-        printf( "hash table saturated!\n" ) ;
-        exit(1) ;
-        return false ;
-      }
-      
-      s.push( geom_cell( kd.key, kd.data ) ) ;
-    }
-    
-    Level lv = it.lv()+1 ;
-    if( _max_level < lv ) _max_level = lv ;
-  }
-  
-  return refined ;
-}
-//_____________________________________________________________________________
-
-
-
-//_____________________________________________________________________________
-// Refine the octree according to the data access
-bool HashOctree::adapt( data_access *ref /*= NULL*/ )
-//-----------------------------------------------------------------------------
-{
-  if( !ref ) return false ;
-
-#ifdef HASH_HAS_ERASE
-    _max_level = 0 ;
-  
-  // traversal stack: iterator has a pre-ordered stack, and cannot be recursed on
-  geom_cell it = geom_root() ;
-  std::stack< geom_cell > s ;
-  s.push( it ) ;
-  
-  // although it may refine only the leaves
-  // the leaf iterator may change during the refinement
-  geom_cell sons[8] ;
-  bool refined = false ;
-  while( !s.empty() )
-  {
-    it = s.top() ;  s.pop() ;
-    
-    // look for the leaves
-    if( !it.is_leaf() )
-    {
-      if( !(*ref).need_refine( it ) )
-      {
-        // delete branch
-        std::stack<Key> del_s ;
-        del_s.push( it.key() ) ;
-        while( !del_s.empty() )
-        {
-          Key n = del_s.top() << 3 ;
-          del_s.pop() ;
-          
-          for( int i = 0 ; i < 8 ; ++i )
-          {
-            HashField::KeyData kd = _hash.erase( n|i ) ;
-            if( kd == HashField::KD_INV ) continue ; // is_leaf(n)
-            del_s.push( n|i ) ;
-          }
-        }
-        
-        refined = true ;
-        _hash[it.key()].data = 0.0 ; // leaf now!
-        if( _max_level < it.lv() ) _max_level = it.lv() ;
-        continue ;
-      }
-      
-      it.sons( sons, _hash ) ;
-      for( int i = 0 ; i < 8 ; ++i )
-        s.push( sons[i] ) ;
-      
-      if( _max_level < sons[0].lv() ) _max_level = sons[0].lv() ;
-      continue ;
-    }
-    
-    // test for subdivision
-    if( !(*ref).need_refine( it ) ) continue ;
-    refined = true ;
-    
-    //_____________________________________________________________________________
-    // subdivides the cell in the tree
-    _hash[it.key()].data = it._field = R_INV ;
-    HashField::KeyData kd ;
-    kd.data = 0.0 ;
-    
-    // recurse on the traversal
-    Key sk = it.key() << 3 ;
-    for( int i = 0 ; i < 8 ; ++i )
-    {
-      kd.key = sk | i ;
-      if( !_hash.insert( kd ) )
-      {
-        printf( "hash table saturated!\n" ) ;
-        exit(1) ;
-        return false ;
-      }
-      
-      s.push( geom_cell( kd.key, kd.data ) ) ;
-    }
-    
-    Level lv = it.lv()+1 ;
-    if( _max_level < lv ) _max_level = lv ;
-  }
-  
-  return refined ;  
-
-#else  // HASH_HAS_ERASE
-  // no remotion in the hash table!
-  return refine( ref ) ;
-#endif // HASH_HAS_ERASE
-}
-//_____________________________________________________________________________
-
-
-
-
-//_____________________________________________________________________________
-// Draw the octree with wireframe
-bool HashOctree::draw_wire()
-//-----------------------------------------------------------------------------
-{
-  for( leaf_iterator it = leaves_begin() ; it() ; ++it )
-    it.draw_wire() ;
-  
-  return true ;
-}
-//_____________________________________________________________________________
-
-
-
-
-
-//_____________________________________________________________________________
-// Draw the octree with dots
-bool HashOctree::draw_centers()
-//-----------------------------------------------------------------------------
-{
-  for( cell_iterator it = cells_begin() ; it() ; ++it )
-  {
-    ::glTexCoord1f( (GLfloat)fabs(*it / max_field()) ) ;
-    it.top().draw() ;
-  }
-  
-  return true ;
-}
-//_____________________________________________________________________________
-
-
-
-//_____________________________________________________________________________
-// Recursion structure
-typedef struct
-//-----------------------------------------------------------------------------
-{
-  enum { DUAL_VERTEX=0, DUAL_EDGE=1, DUAL_FACE=2, DUAL_CUBE=3 } type ;
-  Key cells[8]  ;
-  int direction ;
-} hash_dual_iterator_struct ;
-//-----------------------------------------------------------------------------
-// edge pattern for cubes
-// direction : x -> 0, y -> 1, z -> 2, other -> -1
-static const int dir_edges[19][3] = {
-  {0,1,0}, {0,2,1}, {0,4,2}, {1,3,1}, {1,5,2}, {2,3,0}, {2,6,2}, {3,7,2}, {4,5,0}, {4,6,1}, {5,7,1}, {6,7,0},
-  {0,5,-1}, {0,6,-1}, {1,7,-1}, {2,7,-1}, {0,3,-1}, {4,7,-1}, {0,7,-1} } ;
-//_____________________________________________________________________________
-
-
-
-#define PRINT_DUAL_DEBUG 0
-
-//_____________________________________________________________________________
-// Debug print
-void print_final_cube( Key *cells )
-{
-#if PRINT_DUAL_DEBUG
-  printf( "cube %d %d %d %d %d %d %d %d \n",
-         (int)(cells[0]),
-         (int)(cells[1]),
-         (int)(cells[2]),
-         (int)(cells[3]),
-         (int)(cells[4]),
-         (int)(cells[5]),
-         (int)(cells[6]),
-         (int)(cells[7]) ) ;
-#endif  // PRINT_DUAL_DEBUG
-}
-//-----------------------------------------------------------------------------
-void print_dual_cube( const char*ori, Key *cells )
-{
-#if PRINT_DUAL_DEBUG
-  printf( "%s->cube %d %d %d %d %d %d %d %d \n", ori,
-         (int)(cells[0]),
-         (int)(cells[1]),
-         (int)(cells[2]),
-         (int)(cells[3]),
-         (int)(cells[4]),
-         (int)(cells[5]),
-         (int)(cells[6]),
-         (int)(cells[7]) ) ;
-#endif  // PRINT_DUAL_DEBUG
-}
-//-----------------------------------------------------------------------------
-void print_dual_face( const char*ori, Key *cells )
-{
-#if PRINT_DUAL_DEBUG
-  printf( "%s->face %d %d %d %d\n", ori,
-         (int)(cells[0]),
-         (int)(cells[1]),
-         (int)(cells[2]),
-         (int)(cells[3]) ) ;
-#endif  // PRINT_DUAL_DEBUG
-}
-//-----------------------------------------------------------------------------
-void print_dual_edge( const char*ori, Key *cells )
-{
-#if PRINT_DUAL_DEBUG
-  printf( "%s->edge %d %d\n", ori,
-         (int)(cells[0]),
-         (int)(cells[1]) ) ;
-#endif  // PRINT_DUAL_DEBUG
-}
-//-----------------------------------------------------------------------------
-void print_dual_vertex( const char*ori, Key *cells )
-{
-#if PRINT_DUAL_DEBUG
-  printf( "%s->vertex %d\n", ori,
-         (int)(cells[0]) ) ;
-#endif  // PRINT_DUAL_DEBUG
-}
-//_____________________________________________________________________________
-
-
-//_____________________________________________________________________________
-// Rebuild the octree dual
-bool HashOctree::dual_cubes_walk( hash_dual_walker &walker )
-//-----------------------------------------------------------------------------
-{
-  bool result = true ;
-  
-  
-  // face pattern for a cube
-  // direction : yz -> 0, zx -> 1, xy -> 2
-  static const int faces[6][5] = {
-    {0,1,2,3, 2}, {4,5,6,7, 2}, {0,1,4,5, 1}, {2,3,6,7, 1}, {0,2,4,6, 0}, {1,3,5,7, 0} } ;
-  
-  // traversal stack: iterator has a pre-ordered stack, and cannot be recursed on
-  hash_dual_iterator_struct dual_it ;
-  dual_it.type     = hash_dual_iterator_struct::DUAL_VERTEX ;
-  dual_it.cells[0] = (Key)1 ;
-  std::stack< hash_dual_iterator_struct > s ;
-  s.push( dual_it ) ;
-  
-  _dual_temp_memory = s.size() ;
-  while( !s.empty() )
-  {
-    int s_size = s.size() ;
-    if( s_size > _dual_temp_memory ) _dual_temp_memory = s_size ;
-    
-    dual_it = s.top() ;
-    s.pop() ;
-    
-    //_____________________________________________________________________________
-    //_____________________________________________________________________________
-    // vertex case
-    if( dual_it.type == hash_dual_iterator_struct::DUAL_VERTEX )
-    {
-      print_dual_vertex( "!", dual_it.cells ) ;
-
-      Key v = dual_it.cells[0] ;
-      if( is_leaf(v) ) continue ;
-      v <<= 3 ;
-      
-      //_____________________________________________________________________________
-      // vertex
-      dual_it.type = hash_dual_iterator_struct::DUAL_VERTEX ;
-      for( int i = 0 ; i < 8 ; ++i )
-      {
-        dual_it.cells[0] = v | i ;
-        s.push( dual_it ) ;
-        print_dual_vertex( "vertex", dual_it.cells ) ;
-      }
-      
-      //_____________________________________________________________________________
-      // edge
-      dual_it.type = hash_dual_iterator_struct::DUAL_EDGE ;
-      for( int i = 0 ; i < 12 ; ++i )
-      {
-        dual_it.cells[0] = v | dir_edges[i][0] ;
-        dual_it.cells[1] = v | dir_edges[i][1] ;
-        dual_it.direction = dir_edges[i][2] ;
-        s.push( dual_it ) ;
-        print_dual_edge( "vertex", dual_it.cells ) ;
-      }
-      
-      //_____________________________________________________________________________
-      // face
-      dual_it.type = hash_dual_iterator_struct::DUAL_FACE ;
-      for( int i = 0 ; i < 6 ; ++i )
-      {
-        dual_it.cells[0] = v | faces[i][0] ;
-        dual_it.cells[1] = v | faces[i][1] ;
-        dual_it.cells[2] = v | faces[i][2] ;
-        dual_it.cells[3] = v | faces[i][3] ;
-        dual_it.direction = faces[i][4] ;
-        s.push( dual_it ) ;
-        print_dual_face( "vertex", dual_it.cells ) ;
-      }
-      
-      //_____________________________________________________________________________
-      // cube
-      dual_it.type = hash_dual_iterator_struct::DUAL_CUBE ;
-      for( int i = 0 ; i < 8 ; ++i ) dual_it.cells[i] = v | i ;
-      s.push( dual_it ) ;
-      print_dual_cube( "vertex", dual_it.cells ) ;
-      
-      continue ;
-    }
-    
-    
-    //_____________________________________________________________________________
-    //_____________________________________________________________________________
-    // edge case
-    else if( dual_it.type == hash_dual_iterator_struct::DUAL_EDGE )
-    {
-      print_dual_edge( "!", dual_it.cells ) ;
-
-      Key all_sons[2][8] ;
-      Key v0 = dual_it.cells[0] << 3 ;
-      Key v1 = dual_it.cells[1] << 3 ;
-      if( is_leaf( dual_it.cells[0] ) )
-      {
-        if( is_leaf( dual_it.cells[1] ) )
-          continue ;
-        
-        // repeat father
-        for( int i = 0 ; i < 8 ; ++i )
-        {
-          all_sons[0][i] = dual_it.cells[0] ;
-          all_sons[1][i] = v1 | i ;
-        }
-      }
-      else
-      {
-        if( is_leaf( dual_it.cells[1] ) )
-        {
-          // repeat father
-          for( int i = 0 ; i < 8 ; ++i )
-          {
-            all_sons[0][i] = v0 | i ;
-            all_sons[1][i] = dual_it.cells[1] ;
-          }
-        }
-        else
-        {
-          for( int i = 0 ; i < 8 ; ++i )
-          {
-            all_sons[0][i] = v0 | i ;
-            all_sons[1][i] = v1 | i ;
-          }
-        }
-      }
-      
-      
-      //_____________________________________________________________________________
-      // local cube
-      Key sons[8] ;
-      int dir = dual_it.direction ;
-      switch( dir )
-      {
-          // x-aligned edge
-        case 0 :
-          sons[0] = all_sons[0][1] ;
-          sons[1] = all_sons[1][0] ;
-          sons[2] = all_sons[0][3] ;
-          sons[3] = all_sons[1][2] ;
-          sons[4] = all_sons[0][5] ;
-          sons[5] = all_sons[1][4] ;
-          sons[6] = all_sons[0][7] ;
-          sons[7] = all_sons[1][6] ;
-          break ;
-          
-          // y-aligned edge
-        case 1 :
-          sons[0] = all_sons[0][2] ;
-          sons[1] = all_sons[0][3] ;
-          sons[2] = all_sons[1][0] ;
-          sons[3] = all_sons[1][1] ;
-          sons[4] = all_sons[0][6] ;
-          sons[5] = all_sons[0][7] ;
-          sons[6] = all_sons[1][4] ;
-          sons[7] = all_sons[1][5] ;
-          break ;
-          
-          // z-aligned edge
-        case 2 :
-          sons[0] = all_sons[0][4] ;
-          sons[1] = all_sons[0][5] ;
-          sons[2] = all_sons[0][6] ;
-          sons[3] = all_sons[0][7] ;
-          sons[4] = all_sons[1][0] ;
-          sons[5] = all_sons[1][1] ;
-          sons[6] = all_sons[1][2] ;
-          sons[7] = all_sons[1][3] ;
-          break ;
-      }
-      
-      //_____________________________________________________________________________
-      // edge
-      dual_it.direction = dir ; // same direction
-      dual_it.type = hash_dual_iterator_struct::DUAL_EDGE ;
-      for( int i = 0 ; i < 12 ; ++i )
-      {
-        if( dir_edges[i][2] != dir ) continue ;
-        dual_it.cells[0] = sons[ dir_edges[i][0] ] ;
-        dual_it.cells[1] = sons[ dir_edges[i][1] ] ;
-        s.push( dual_it ) ;
-        print_dual_edge( "edge", dual_it.cells ) ;
-      }
-      
-      //_____________________________________________________________________________
-      // face
-      dual_it.type = hash_dual_iterator_struct::DUAL_FACE ;
-      for( int i = 0 ; i < 6 ; ++i )
-      {
-        if( faces[i][4] == dir ) continue ;
-        dual_it.cells[0] = sons[ faces[i][0] ] ;
-        dual_it.cells[1] = sons[ faces[i][1] ] ;
-        dual_it.cells[2] = sons[ faces[i][2] ] ;
-        dual_it.cells[3] = sons[ faces[i][3] ] ;
-        dual_it.direction = faces[i][4] ;
-        s.push( dual_it ) ;
-        print_dual_face( "edge", dual_it.cells ) ;
-      }
-      
-      //_____________________________________________________________________________
-      // cube
-      dual_it.type = hash_dual_iterator_struct::DUAL_CUBE ;
-      for( int i = 0 ; i < 8 ; ++i ) dual_it.cells[i] = sons[i] ;
-      s.push( dual_it ) ;
-      print_dual_cube( "edge", dual_it.cells ) ;
-      
-      continue ;
-    }
-    
-    
-    //_____________________________________________________________________________
-    //_____________________________________________________________________________
-    // face case
-    else if( dual_it.type == hash_dual_iterator_struct::DUAL_FACE )
-    {
-      print_dual_face( "!", dual_it.cells ) ;
-
-      Key all_sons[4][8] ;
-      bool leaf = true ;
-      for( int i = 0 ; i < 4 ; ++i )
-      {
-        if( is_leaf( dual_it.cells[i] ) )
-        {
-          // repeat father
-          for( int j = 0 ; j < 8 ; ++j )
-            all_sons[i][j] = dual_it.cells[i] ;
-        }
-        else
-        {
-          leaf = false ;
-          Key f = dual_it.cells[i] << 3 ;
-          for( int j = 0 ; j < 8 ; ++j )
-            all_sons[i][j] = f | j ;
-        }
-      }
-      if( leaf ) continue ;
-      
-      
-      //_____________________________________________________________________________
-      // local cube
-      Key sons[8] ;
-      int dir = dual_it.direction ;
-      switch( dir )
-      {
-          // yz-aligned face
-        case 0 :
-          sons[0] = all_sons[0][6] ;
-          sons[1] = all_sons[0][7] ;
-          sons[2] = all_sons[1][4] ;
-          sons[3] = all_sons[1][5] ;
-          sons[4] = all_sons[2][2] ;
-          sons[5] = all_sons[2][3] ;
-          sons[6] = all_sons[3][0] ;
-          sons[7] = all_sons[3][1] ;
-          break ;
-          
-          // zx-aligned edge
-        case 1 :
-          sons[0] = all_sons[0][5] ;
-          sons[1] = all_sons[1][4] ;
-          sons[2] = all_sons[0][7] ;
-          sons[3] = all_sons[1][6] ;
-          sons[4] = all_sons[2][1] ;
-          sons[5] = all_sons[3][0] ;
-          sons[6] = all_sons[2][3] ;
-          sons[7] = all_sons[3][2] ;
-          break ;
-          
-          // xy-aligned edge
-        case 2 :
-          sons[0] = all_sons[0][3] ;
-          sons[1] = all_sons[1][2] ;
-          sons[2] = all_sons[2][1] ;
-          sons[3] = all_sons[3][0] ;
-          sons[4] = all_sons[0][7] ;
-          sons[5] = all_sons[1][6] ;
-          sons[6] = all_sons[2][5] ;
-          sons[7] = all_sons[3][4] ;
-          break ;
-      }
-      
-      //_____________________________________________________________________________
-      // face
-      // same direction
-      dual_it.direction = dir ;
-      dual_it.type = hash_dual_iterator_struct::DUAL_FACE ;
-      for( int i = 0 ; i < 6 ; ++i )
-      {
-        if( faces[i][4] != dir ) continue ;
-        dual_it.cells[0] = sons[ faces[i][0] ] ;
-        dual_it.cells[1] = sons[ faces[i][1] ] ;
-        dual_it.cells[2] = sons[ faces[i][2] ] ;
-        dual_it.cells[3] = sons[ faces[i][3] ] ;
-        //        dual_it.direction = faces[i][4] ;
-        s.push( dual_it ) ;
-        print_dual_face( "face", dual_it.cells ) ;
-      }
-      
-      //_____________________________________________________________________________
-      // cube
-      dual_it.type = hash_dual_iterator_struct::DUAL_CUBE ;
-      for( int i = 0 ; i < 8 ; ++i ) dual_it.cells[i] = sons[i] ;
-      s.push( dual_it ) ;
-      print_dual_cube( "face", dual_it.cells ) ;
-      
-      continue ;
-    }
-    
-    
-    //_____________________________________________________________________________
-    //_____________________________________________________________________________
-    // cube case
-    else if( dual_it.type == hash_dual_iterator_struct::DUAL_CUBE )
-    {
-      print_dual_cube( "!", dual_it.cells ) ;
-
-      bool leaf = true ;
-      
-      //_____________________________________________________________________________
-      // cube
-      for( int i = 0 ; i < 8 ; ++i )
-      {
-        // copy father
-        if( is_leaf( dual_it.cells[i] ) )
-          continue ;
-        
-        // else
-        leaf = false ;
-        dual_it.cells[i] = ( dual_it.cells[i]<<3 ) | 7-i ;
-      }
-      
-      // finally add dual cube
-      if( leaf )
-      {
-        result &= walker( *this, dual_it.cells ) ;
-        print_final_cube( dual_it.cells ) ;
-      }
-      else
-      {
-        s.push( dual_it ) ;
-        print_dual_cube( "cube", dual_it.cells ) ;
-      }
-      
-      continue ;
-    }
-    
-  }
-  
-  return result ;
-}
-//_____________________________________________________________________________
-
-
-
-
-//_____________________________________________________________________________
-// Isosurface walker
-bool hash_isosurface_walker( HashOctree &fo, Key *keys )
-//-----------------------------------------------------------------------------
-{
-  MarchingCubes &mc = fo.mc() ;
-  
-  /** isovalues at the cube vertices */
-  real            *cube    = mc.cube() ;
-  /** geometry of the cube */
-  Point           *space   = mc.space() ;
-  /** indexes of the cube */
-  Key             *indexes = mc.indexes() ;
-  
-  for( int j = 0 ; j < 8 ; ++j )
-  {
-    int i = (j==2)?3:(j==3)?2:(j==7)?6:(j==6)?7:j ;
-    const Key k = keys[j] ;
-    HashOctree::geom_cell c = fo.geom_key(k) ;
-    cube[i] = *c ;
-    
-    space[i] = (Point)c ;
-    indexes[i] = k ;
-  }
-  
-  mc.tesselate_cube( 0.0 ) ;
-  
-  return true ;
-}
-//_____________________________________________________________________________
-
-
-
-//_____________________________________________________________________________
-// Build the isosurface using dual marching cubes
-bool HashOctree::build_isosurface( data_access *ref )
-//-----------------------------------------------------------------------------
-{
-  if( !ref ) return false ;
-  _mc.dat_access() = ref ;
-
-    printf( "Build isosurface... " ) ;
-  bool result = false ;
-  
-  //_________________________________________________________________________
-  // Dual Marching Cubes
-  
-  _mc.init_all() ; 
-  
-  result = dual_cubes_walk( hash_isosurface_walker ) ;
-  
-  _mc.clean_temps() ;
-  
-  printf( "generated %d vertices and %d faces!\n", _mc.nverts(), _mc.ntrigs() ) ;
-  
-  return result ;
-}
-//_____________________________________________________________________________
-
-
-
-
-//_____________________________________________________________________________
-// Isosurface drawing walker
-bool hash_direct_isosurface_walker( HashOctree &fo, Key *keys )
-//-----------------------------------------------------------------------------
-{
-  MC_Draw &mc = fo.mc_draw() ;
-  
-  /** isovalues at the cube vertices */
-  real            *cube    = mc.cube() ;
-  /** geometry of the cube */
-  Point           *space   = mc.space() ;
-  
-  for( int j = 0 ; j < 8 ; ++j )
-  {
-    int i = (j==2)?3:(j==3)?2:(j==7)?6:(j==6)?7:j ;
-    const HashOctree::geom_cell c = fo.geom_key( keys[j] ) ;
-    cube[i] = *c ;
-    space[i] = (Point)c ;
-  }
-  
-  mc.tesselate_cube( 0.0 ) ;
-  
-  return true ;
-}
-//_____________________________________________________________________________
-
-
-
-//_____________________________________________________________________________
-// Build the isosurface using dual marching cubes
-bool HashOctree::direct_draw_isosurface( data_access *ref )
-//-----------------------------------------------------------------------------
-{
-  if( !ref ) return false ;
-  _mc_draw.dat_access() = ref ;
-  
-    bool result = false ;
-  
-  // Dual Marching Cubes
-  ::glBegin( GL_TRIANGLES ) ;
-  {
-    result = dual_cubes_walk( hash_direct_isosurface_walker ) ;
-  }
-  ::glEnd() ; // GL_TRIANGLES
-  
-  return result ;
-}
-//_____________________________________________________________________________
-
-
-
-
-
-
-//_____________________________________________________________________________
-// Draw walker
-bool hash_draw_walker( HashOctree &fo, Key *keys )
-//-----------------------------------------------------------------------------
-{
-  Cube cells[8] ;
-  for( int i = 0 ; i < 8 ; ++i )
-    cells[i] = key2cube( keys[i] ) ;
-    
-  ((Point)cells[0]).draw() ;
-  ((Point)cells[1]).draw() ;
-  
-  ((Point)cells[1]).draw() ;
-  ((Point)cells[3]).draw() ;
-  
-  ((Point)cells[3]).draw() ;
-  ((Point)cells[2]).draw() ;
-  
-  ((Point)cells[2]).draw() ;
-  ((Point)cells[0]).draw() ;
-  
-  ((Point)cells[4]).draw() ;
-  ((Point)cells[5]).draw() ;
-  
-  ((Point)cells[5]).draw() ;
-  ((Point)cells[7]).draw() ;
-  
-  ((Point)cells[7]).draw() ;
-  ((Point)cells[6]).draw() ;
-  
-  ((Point)cells[6]).draw() ;
-  ((Point)cells[4]).draw() ;
-  
-  ((Point)cells[0]).draw() ;
-  ((Point)cells[4]).draw() ;
-  
-  ((Point)cells[1]).draw() ;
-  ((Point)cells[5]).draw() ;
-  
-  ((Point)cells[2]).draw() ;
-  ((Point)cells[6]).draw() ;
-  
-  ((Point)cells[3]).draw() ;
-  ((Point)cells[7]).draw() ;
-  
-  return true ;
-}
-//_____________________________________________________________________________
-
-
-
-
-//_____________________________________________________________________________
-// Draw the dual octree with wireframe
-bool HashOctree::draw_dual()
-//-----------------------------------------------------------------------------
-{
-  ::glBegin( GL_LINES ) ;
-  bool result = dual_cubes_walk( hash_draw_walker ) ;
-  ::glEnd() ;  // GL_LINES
-  
-  return result ;
-}
-//_____________________________________________________________________________
-
-
-
-
-
-//_____________________________________________________________________________
-// Do nothing walker, just for dual generation timing
-bool hash_timing_walker( HashOctree &fo, Key *keys )
-//-----------------------------------------------------------------------------
-{
-  return true ;
-}
-//_____________________________________________________________________________
-
-
-//_____________________________________________________________________________
-// Do nothing, just for dual generation timing
-bool HashOctree::dual_timing()
-//-----------------------------------------------------------------------------
-{
-    return dual_cubes_walk( hash_timing_walker ) ;
-}
-//_____________________________________________________________________________
-
-
-
-
-
-//_____________________________________________________________________________
-// Prints statistics about the octree
-void HashOctree::stats()
-//-----------------------------------------------------------------------------
-{
-  uint level_dist[MAX_LEVEL+1] ;
-  memset( level_dist, 0, (MAX_LEVEL+1)*sizeof(uint) ) ;
-  
-  int s = 0 ;
-  for( cell_iterator it = cells_begin() ; it() ; ++it )
-  {
-    ++s ;
-    if( it.is_leaf() ) level_dist[ it.lv() ] ++ ;
-  }
-  
-  printf( " number of nodes:\t%d\n", s ) ;
-#if USE_HASH_PTR
-  printf( " total memory:\t%d\n", (int) ( s * sizeof(HashField::KeyBucket) ) ) ;
-  _hash.stats() ;
-#else  // USE_HASH_PTR 
-  printf( " total memory:\t%d\n", (int) ( s * sizeof(HashField::KeyData  ) ) ) ;
-#endif // USE_HASH_PTR
-  
-  printf( " leaves' levels:\t" ) ;
-  for( Level l = 0 ; l <= MAX_LEVEL; ++l )
-    printf( "\t%d", level_dist[l] ) ;
-  printf( "\n" ) ;
-
-  printf( " max size of the stack:\t%d\n", _dual_temp_memory ) ;
-  printf( " total memory of stack:\t%d\n", (int) ( _dual_temp_memory * sizeof(hash_dual_iterator_struct) ) ) ;
-}
-//_____________________________________________________________________________
-
-
-
-
-
-//_____________________________________________________________________________
-//_____________________________________________________________________________
-// search operations
-
-
-//_____________________________________________________________________________
-// Find cells of the octree at a given position
-bool HashOctree::find_leaf( real x, real y, real z, geom_cell &n ) const
-//-----------------------------------------------------------------------------
-{
-    
-  n = geom_root() ;
-  
-  while( !n.is_leaf() )
-  {
-    ++n.lv() ;
-    real sz = n.sz() ;
-    
-    // side test :
-    //  0->back  lower left, 1->back  lower right, 2->back  upper left, 3->back  upper right
-    //  4->front lower left, 5->front lower right, 6->front upper left, 7->front upper right
-    int i = ( (n.cz() < z) << 2 ) | ( (n.cy() < y) << 1 ) | (n.cx() < x) ;
-    n.cx() += (i&1) ? +sz : -sz ;
-    n.cy() += (i&2) ? +sz : -sz ;
-    n.cz() += (i&4) ? +sz : -sz ;
-    
-    geom_cell s ;
-    n.son(i,s,_hash) ;
-    n = s ;
-  }
-  
-  return true ;
-}
-//_____________________________________________________________________________
-
-
-
-//_____________________________________________________________________________
-// Find cells of the octree inside a given box of center x,y and half side r
-bool HashOctree::find_radius( real x, real y, real z, real r, List<geom_cell> &cells ) const
-//-----------------------------------------------------------------------------
-{
-    
-  cells.clear() ;
-  
-  geom_cell n = geom_root() ;
-  
-  std::stack< geom_cell > s ;
-  s.push( n ) ;
-  
-  while( !s.empty() )
-  {
-    n = s.top() ;  s.pop() ;
-//    printf( "%d\t%.4f\t%.4f\t%.4f\n", (int)n.lv(), n.x(), n.y(), n.z() ) ;
-    if( n.is_leaf() )
-    {
-      cells.insert( n ) ;
-      continue ;
-    }
-    
-    geom_cell sons[8] ;
-    n.sons( sons, _hash ) ;
-    real sz_ = sons[0].sz() + r ;
-    for( int i = 0 ; i < 8 ; ++i )
-    {
-      if( (fabs( sons[i].cx() - x ) < sz_ ) &&
-          (fabs( sons[i].cy() - y ) < sz_ ) &&
-          (fabs( sons[i].cz() - z ) < sz_ ) )
-        s.push( sons[i] ) ;
-    }
-  }
-//  printf( "\n" ) ;
-  
-  return true ;
-}
-//_____________________________________________________________________________
-
-
-
-//_____________________________________________________________________________
-// Find neighbor cells of the octree to a given cell
-bool HashOctree::adjacent( const geom_cell &cell, List<geom_cell> &cells ) const
-//-----------------------------------------------------------------------------
-{
-  return find_radius( cell.cx(), cell.cy(), cell.cz(), cell.sz() + (real) 0.5 / (1 << max_level() ) , cells ) ;
-}
-//_____________________________________________________________________________
-
-
-
-//_____________________________________________________________________________
-//_____________________________________________________________________________
-// I/O
-
-//_____________________________________________________________________________
-// Draws the intersecting cells of a plane with the octree with color
-void HashOctree::draw_plane ( real nx, real ny, real nz, real d )
-//-----------------------------------------------------------------------------
-{
-  geom_cell n = geom_root() ;
-  
-  std::stack< geom_cell > s ;
-  s.push( n ) ;
-  
-  //_____________________________________________________________________________
-  // retrieve the index of the most positive cube corner
-  bool fx = nx >= 0 ;
-  bool fy = ny >= 0 ;
-  bool fz = nz >= 0 ;
-  
-  //_____________________________________________________________________________
-  
-  ::glLineWidth( 1.0f ) ;
-  ::glDisable( GL_LIGHTING ) ;
-  
-  real px,py,pz, mx,my,mz ;
-  while( !s.empty() )
-  {
-    n = s.top() ;  s.pop() ;
-    
-    if( n.is_leaf() )
-    {		
-      
-      ::glTexCoord1f( (GLfloat)fabs(*n/max_field()) ) ;
-      ::glBegin( GL_LINES ) ;
-      n.draw_wire() ;
-      ::glEnd() ;  // GL_LINES		
-      
-      continue ;
-    }
-    
-    //___________________________________________________________________________
-    // recursion
-    geom_cell sons[8] ;
-    n.sons( sons, _hash ) ;
-    real sz_ = sons[0].sz() ;
-    for( int i = 0 ; i < 8 ; ++i )
-    {
-      // get the coordinates of the extremum vertices
-      if( fx ) { px = sons[i].cx() + sz_ ;  mx = sons[i].cx() - sz_ ; }
-      else     { px = sons[i].cx() - sz_ ;  mx = sons[i].cx() + sz_ ; }
-      if( fy ) { py = sons[i].cy() + sz_ ;  my = sons[i].cy() - sz_ ; }
-      else     { py = sons[i].cy() - sz_ ;  my = sons[i].cy() + sz_ ; }
-      if( fz ) { pz = sons[i].cz() + sz_ ;  mz = sons[i].cz() - sz_ ; }
-      else     { pz = sons[i].cz() - sz_ ;  mz = sons[i].cz() + sz_ ; }
-      
-      // plane/cube intersection test
-      if( (nx * px + ny * py + nz * pz + d >= 0.0) && (nx * mx + ny * my + nz * mz + d <= 0.0)  )
-        s.push( sons[i] ) ;
-    }
-  }
-}
-//_____________________________________________________________________________
-
-
-
-
-
-//_____________________________________________________________________________
-// Draws the intersection of a plane with the octree with color
-void HashOctree::draw_slice ( real nx, real ny, real nz, real d, float alpha )
-//-----------------------------------------------------------------------------
-{
-  geom_cell n = geom_root() ;
-  
-  std::stack< geom_cell > s ;
-  s.push( n ) ;
-  
-  // retrieve the index of the most positive cube corner
-  bool fx = nx >= 0 ;
-  bool fy = ny >= 0 ;
-  bool fz = nz >= 0 ;
-  
-  
-  
-  //_____________________________________________________________________________
-  
-  ::glDisable( GL_LIGHTING ) ;
-  
-  real px,py,pz, mx,my,mz ;
-  while( !s.empty() )
-  {
-    n = s.top() ;  s.pop() ;
-    if( n.is_leaf() )
-    {
-      // retrieves the signs of each cube corner
-      real val[8] ;
-      real v   = nx * n.cx() + ny * n.cy() + nz * n.cz() + d ;
-      real sz_ = n.sz() ;
-      int zeros = 0 ;
-      for( int i = 0 ; i < 8 ; ++i )
-      {
-        val[i] = v + nx * ((i&1)?sz_:-sz_) + ny * ((i&2)?sz_:-sz_) + nz * ((i&4)?sz_:-sz_) ;
-        if( fabs(val[i]) < R_EPSILON ) { val[i] = R_EPSILON ;  ++zeros ; }
-      }
-      
-      //_________________________________________________________________________
-      // degenerated intersection
-      if( zeros > 0 )
-      {
-        int npos = 0, nneg = 0 ;
-        for( int i = 0 ; i < 8 ; ++i )
-        {
-          if( fabs(val[i]) < R_EPSILON ) continue ;
-          if( val[i] < 0 )
-            ++nneg ;
-          else
-            ++npos ;
-        }
-        float def = (nneg>npos) ? (float)R_EPSILON : -(float)R_EPSILON ;
-        
-        for( int i = 0 ; i < 8 ; ++i )
-        {
-          if( fabs(val[i]) < R_EPSILON ) val[i] = def ;
-        }
-        //        continue ;
-      }
-      
-      //_________________________________________________________________________
-      // Continuation method
-      int v0=-1, v1=-1 ;  // current edge vertices
-      
-      // get the first intersection
-      static int edges[12][2] = { {0,1}, {0,2}, {0,4}, {1,3}, {1,5}, {2,3}, {2,6}, {3,7}, {4,5}, {4,6}, {5,7}, {6,7} } ;
-      for( int e = 0 ; e < 12 ; ++e )
-      {
-        if( val[ edges[e][0] ] * val[ edges[e][1] ] < 0 )
-        {
-          v0 = edges[e][0] ;
-          v1 = edges[e][1] ;
-          break ;
-        }
-      }
-      int  ov0 = v0, ov1 = v1 ;
-      
-      
-      // equation of previous face adjacent to v0v1: v>>c & 1 == s (c-th coordinate equal to +/- 1)
-      int pf = -1 ;  bool ps ;
-      if       ( (v0 & 1) == (v1 & 1) )   { pf = 0 ; ps = ((v0 & 1) /*>> 0*/) == 1 ; }
-      else   if( (v0 & 2) == (v1 & 2) )   { pf = 1 ; ps = ((v0 & 2)   >> 1  ) == 1 ; }
-      else /*if( (v0 & 4) == (v1 & 4) )*/ { pf = 2 ; ps = ((v0 & 4)   >> 2  ) == 1 ; }
-      
-      //      printf( "cube %d %d %d %d %d %d %d %d, march : (%d,%d) ", val[0]>0, val[1]>0, val[2]>0, val[3]>0, val[4]>0, val[5]>0, val[6]>0, val[7]>0, v0, v1 ) ;
-      
-      //_________________________________________________________________________
-      // marching
-      
-      GLfloat color = (GLfloat)fabs(*n / max_field()) ;
-		  //cmap.gl_color( at(*n) ) ;	
-      ::glBegin( GL_POLYGON ) ;
-      {
-        do
-        {
-          // equation of next face adjacent to v0v1
-          int nf = -1 ;  bool ns ;
-          if       ( pf != 0 && ((v0 & 1) == (v1 & 1)) )   { nf = 0 ; ns = ((v0 & 1) /*>> 0*/) == 1 ; }
-          else   if( pf != 1 && ((v0 & 2) == (v1 & 2)) )   { nf = 1 ; ns = ((v0 & 2)   >> 1  ) == 1 ; }
-          else /*if( pf != 2 && ((v0 & 4) == (v1 & 4)) )*/ { nf = 2 ; ns = ((v0 & 4)   >> 2  ) == 1 ; }
-          
-          /* equivalent construction
-           // get the direction perpendicular to v0v1
-           int of = (v0 ^ v1) & 7 ; // only bit of difference
-           of = of==1 ? 0 : (of==2 ? 1 : 2) ;
-           
-           // compute the equation of the next face adjacent to v0v1
-           int  nf = 3 - (pf+of) ;    // third option: {pf,nf,of}={0,1,2}
-           bool ns = (v0 >> nf) & 1 ; // value of the edge on that direction
-           */
-          
-          // compute the two next vertices (invert the pf-th bit
-          int v2 = ps ? ( v0 & (~(1<<pf)) ) : ( v0 | (1<<pf) ) ;
-          int v3 = ps ? ( v1 & (~(1<<pf)) ) : ( v1 | (1<<pf) ) ;
-          
-          // get the characteristic of the square
-          int  c = (val[v3] > 0) | ((val[v2] > 0) << 1) | ((val[v1] > 0) << 2) | ((val[v0] > 0) << 3) ;
-          if( c > 7 ) c = (~c)&7 ; // consider v0 as negative, and thus v1 as positive
-          /*
-           if( c < 4 )
-           { // degenerated intesection
-           printf( "degenerated intersection %d!\n", c ) ;
-           }
-           */
-          
-          //_______________________________________________________________________
-          // method of continuity on the cube surface
-          switch( c )
-          {
-            case  4 : v0 = v3 ;  break ;
-            case  5 : v0 = v2 ;  v1 = v3 ;  break ;
-            case  6 : /* impossible case */ break ;
-            case  7 : v1 = v2 ;  break ;
-          }
-          
-          
-          
-          
-          real cx =  n.cx();
-          real cy =  n.cy(); 
-          real cz =  n.cz();
-          real sz =  sz_;   
-          real a0 = val[v0];  
-          int i0 = v0; 
-          real a1 = val[v1];  
-          int i1  = v1;
-          
-          real w0 = a1 / (a1-a0) ;
-          real w1 = a0 / (a0-a1) ;
-          
-          real x = cx + w0 * ((i0&1)?sz:-sz) + w1 * ((i1&1)?sz:-sz);
-          real y = cy + w0 * ((i0&2)?sz:-sz) + w1 * ((i1&2)?sz:-sz);
-          real z = cz + w0 * ((i0&4)?sz:-sz) + w1 * ((i1&4)?sz:-sz);
-          
-          ::glTexCoord1d( color ) ;
-          ::glVertex3d(x, y, z) ;
-          
-          // next face
-          pf = nf ;  ps = ns ;
-          
-          //          printf( "(%d,%d) ", v0, v1 ) ;
-        } while( v0 != ov0 || v1 != ov1 ) ;
-        //        printf( "\n" ) ;
-      }
-      ::glEnd() ; // GL_POLYGON
-      
-      continue ;
-    }
-    
-    //___________________________________________________________________________
-    // recursion
-    geom_cell sons[8] ;
-    n.sons( sons, _hash ) ;
-    real sz_ = sons[0].sz() ;
-    for( int i = 0 ; i < 8 ; ++i )
-    {
-      // get the coordinates of the extremum vertices
-      if( fx ) { px = sons[i].cx() + sz_ ;  mx = sons[i].cx() - sz_ ; }
-      else     { px = sons[i].cx() - sz_ ;  mx = sons[i].cx() + sz_ ; }
-      if( fy ) { py = sons[i].cy() + sz_ ;  my = sons[i].cy() - sz_ ; }
-      else     { py = sons[i].cy() - sz_ ;  my = sons[i].cy() + sz_ ; }
-      if( fz ) { pz = sons[i].cz() + sz_ ;  mz = sons[i].cz() - sz_ ; }
-      else     { pz = sons[i].cz() - sz_ ;  mz = sons[i].cz() + sz_ ; }
-      
-      // plane/cube intersection test
-      if( (nx * px + ny * py + nz * pz + d >= 0.0) && (nx * mx + ny * my + nz * mz + d <= 0.0)  )
-        s.push( sons[i] ) ;
-    }
-  }
-}
-//_____________________________________________________________________________
-
-
-
-
-
diff --git a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/hash_octree.h b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/hash_octree.h
deleted file mode 100644
index 89a111297f..0000000000
--- a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/hash_octree.h
+++ /dev/null
@@ -1,352 +0,0 @@
-/**
- * \file    hash_octree.h
- * \author  Thomas Lewiner   <tomlew@puc-rio.br>
- * \author  Matmidia Lab, Math Dept, PUC-Rio
- * \date    10/01/2010
- *
- *  Octree structure with hashtable and hierarchical operations
- */
-//_____________________________________________________________________________
-
-
-#pragma once
-
-#ifndef WIN32
-#pragma interface
-#endif // WIN32
-
-
-#include "mlist.h"
-#include "cube.h"
-#include "hash.h"
-#include "MarchingCubes.h"
-#include "mc_draw.h"
-#include "data_access.h"
-
-
-
-//_____________________________________________________________________________
-// HashOctree
-/// \class HashOctree HashOctree.h
-class HashOctree
-//-----------------------------------------------------------------------------
-{
-// forward declaration
-public:
-  class geom_cell  ;
-  class cell_iterator  ;
-  class leaf_iterator  ;
-
-// Elements
-protected:
-  /// Octree cell data structure
-  typedef Hash<real> HashField ;
-
-  /// Hashtable of the octree nodes
-  HashField _hash ;
-
-  /// Maximal level of the octree (for find_adjacent)
-  Level _max_level ;
-  
-  /// Maximal field of the octree
-  real _max_field ;
-  
-  /// Isosurface
-  MarchingCubes _mc ;
-
-  /// Isosurface Draw
-  MC_Draw _mc_draw ;
-  
-  /// Dual run memory consumption
-  uint _dual_temp_memory ;
-  
-//-----------------------------------------------------------------------------
-// Constructors
-public:
-  /// Default constructor: Constructs a octree with and empty root
-  HashOctree() { init() ; }
-
-  /// Destructor: Free memory
-  ~HashOctree() { clear() ; }
-
-
-  /// Create the root
-  void init() ;
-
-  /// Memory cleaning
-  void clear() { clear_octree() ;  _mc.clean_all() ; }
-
-  /// Delete the content of the octree
-  void clear_octree() ;
-
-  /// Check that only the leaves have data
-  bool check () ;
-
-  /// Prints statistics about the octree
-  void stats() ;
-  
-  
-  /// Return the maximal level of the octree
-  Level  max_level() const { return _max_level ; }
-  
-  /// Return the maximal field of the octree
-  real max_field() const { return _max_field ; }
-   
-  /// Return the isosurface
-  MarchingCubes &mc() { return _mc ; }
-
-  /// Return the isosurface draw
-  MC_Draw &mc_draw() { return _mc_draw ; }
-  
-  /// set the values of each leaf from the implicit function
-  bool set_impl( data_access *ref = NULL ) ;
-  
-  /// Refine the octree according to the data access
-  bool refine( data_access *ref = NULL ) ;
-
-  /// Adapt the octree according to the data access
-  bool adapt( data_access *ref = NULL ) ;
-  
-  /// Draw the octree with wireframe
-  bool draw_wire() ;
-  
-  /// Draw the octree with dots
-  bool draw_centers() ;
-  
-  /// Dual function type
-  typedef bool hash_dual_walker( HashOctree &fo, Key *keys ) ;
-
-  /// Walk on the dual cubes
-  bool dual_cubes_walk( hash_dual_walker &walker ) ;
-
-  /// Build the isosurface using dual marching cubes
-  bool build_isosurface( data_access *ref = NULL ) ;
-  
-  /// Draw the isosurface on-the-fly using dual marching cubes
-  bool direct_draw_isosurface( data_access *ref = NULL ) ;
-  
-  /// Draw the dual octree with wireframe
-  bool draw_dual() ;
-
-  /// Do nothing, just for dual generation timing
-  bool dual_timing() ;
-    
-//-----------------------------------------------------------------------------
-// iterators
-public:
-  /// Create an iterator traversing the tree from the root
-  inline cell_iterator cells_begin() { return cell_iterator( *this ) ; }
-
-  /// Create an iterator traversing the leaves of the tree from the root
-  inline leaf_iterator leaves_begin() { return leaf_iterator( *this ) ; }
-
-//-----------------------------------------------------------------------------
-// search operations
-public:
-  /// Find cells of the octree at a given position
-  bool find_leaf( real x, real y, real z, geom_cell &cell ) const ;
-
-  /// Find cells of the octree inside a given box of center x,y,z and half side r
-  bool find_radius( real x, real y, real z, real r, List<geom_cell> &cells ) const ;
-
-  /// Find adjacent cells of the octree to a given cell
-  bool adjacent( const geom_cell &cell, List<geom_cell> &cells ) const ;
-
-  /// Leaf test based on the field value
-  bool is_leaf( Key k ) const { return !is_inv( _hash[k].data ) ; }
-
-//-----------------------------------------------------------------------------
-// I/O
-public:
-
-  /// Draws the intersecting cells of a plane with the octree with color
-  void draw_plane ( real nx, real ny, real nz, real d	  ) ;
-
-  /// Draws the intersection of a plane with the octree with color
-  void draw_slice ( real nx, real ny, real nz, real d, float alpha ) ;
-
-  /// Draws the isosurface of level l inside the dual graph
-  void draw_iso   () { _mc.draw_surf() ; }
-
-//_____________________________________________________________________________
-// Iterator Cell
-public :
-  /// Auxiliary structure to traverse the octree
-  class geom_cell : public Cube
-  //---------------------------------------------------------------------------
-  {
-    friend class HashOctree ;
-
-  protected:
-    Key   _key   ;  ///< octree cell
-    real  _field ;  ///< field associated to the cell
-
-  //---------------------------------------------------------------------------
-  // Constructors
-  public:
-    /// Default constructor: Constructs an iterator from a cell
-    geom_cell( Key key_ = KEY_INV, real field_ = R_INV ) : Cube(key2cube(key_)), _key(key_), _field(field_) {}
-
-    /// Destructor
-    ~geom_cell() {}
-
-    /// Copy constructor
-    geom_cell( const geom_cell &i ) : Cube(i), _key(i._key), _field(i._field) {}
-
-    /// Assignment operator
-    geom_cell &operator = ( const geom_cell &i )
-    {  Cube::operator=(i) ;  _key = i._key ;  _field = i._field ;  return *this; }
-    
-
-  //---------------------------------------------------------------------------
-  // Public constant accessors
-  public  :
-    /// key const accessor
-    inline Key  key() const { return _key ; }
-    /// key accessor
-    inline Key &key() { return _key ; }
-
-    /// id const accessor
-    inline real  operator*() const { return _field ; }
-    
-    //---------------------------------------------------------------------------
-  // Tests
-  public :
-    /// equality operator
-    inline bool operator ==( const geom_cell &i ) const { return key() == i.key() ; }
-
-    /// inequality operator
-    inline bool operator !=( const geom_cell &i ) const { return key() != i.key() ; }
-
-    /// leaf test
-    inline bool is_leaf() const { return !is_inv(*(*this)) ; }
-
-    /// validation operator
-    inline bool      operator ()() const { return key() != KEY_INV ; }
-
-  //---------------------------------------------------------------------------
-  // Operations
-  public  :
-    /// sons
-    inline bool sons( geom_cell *s /*[8]*/, const HashField &hash )
-    {
-      if( is_leaf() ) return false ;
-
-      Key k = _key << 3 ;
-      for( int i = 0 ; i < 8 ; ++i )
-      {
-        s[i]._key   = k | i ;
-        s[i]._field = hash[k|i].data ;
-        (Cube&)s[i] = key2cube(s[i]._key) ;
-      }
-      return true ;
-    }
-
-    /// get son from side i
-    inline bool son( int i , geom_cell &s, const HashField &hash )
-    {
-      if( is_leaf() ) return false ;
-      s._key   = (key() << 3) | i ;
-      s._field = hash[s._key].data ;
-      (Cube&)s = key2cube(s._key) ;
-      return true ;
-    }
-  };
-
-  const geom_cell geom_root() const { const Key root_key = 1 ; return geom_cell( root_key, _hash[root_key].data ) ; }
-  const geom_cell geom_key ( Key k ) const { return geom_cell( k, _hash[k].data ) ; }
-
-
-
-//_____________________________________________________________________________
-// Cell Iterator
-public :
-  /// Octree cell iterator : Traverse the octree returning basic information on the cells
-  class cell_iterator
-  //---------------------------------------------------------------------------
-  {
-    friend class HashOctree ;
-
-  protected:
-    /// Octree traversal iterator
-    HashField::iterator _it ;
-
-  //---------------------------------------------------------------------------
-  // Constructors
-  public:
-    /// Default constructor : Constructs an iterator from a cell
-    cell_iterator( HashOctree &o ) : _it( o._hash.begin() ) {}
-
-    /// Destructor
-    ~cell_iterator() {}
-
-    /// Copy constructor
-    cell_iterator( const cell_iterator &i ) : _it(i._it) {}
-
-    /// Assignment operator
-    cell_iterator &operator = ( const cell_iterator &i )
-    { _it = i._it; return *this; }
-
-  //---------------------------------------------------------------------------
-  // Operations
-  public  :
-    /// equality operator
-    inline bool operator ==( const cell_iterator &i ) const { return _it == i._it ; }
-
-    /// inequality operator
-    inline bool operator !=( const cell_iterator &i ) const { return _it != i._it ; }
-
-    /// validation operator
-    inline bool      operator ()() const { return _it() ; }
-
-    /// next position
-    inline cell_iterator &operator ++() { ++_it ; return *this ; }
-
-  //---------------------------------------------------------------------------
-  // Accessors
-  public  :
-    // cell accessor
-    inline geom_cell top() const { return geom_cell( key(), *_it ) ; }
-
-    /// id accessor
-    inline real &operator*() { return *_it ; }
-
-    /// level accessor
-    inline Level lv() { return key_level(_it.key()) ; }
-
-    /// size accessor
-    inline real  sz() { return Cube(0,0,0,lv()).sz() ; }
-    
-    /// key accessor
-    inline Key   key() const { return _it.key() ; }
-    
-    /// points accessor
-    inline bool is_leaf() const { return !is_inv(*_it) ; }
-
-    /// Draws the cell wire with opengl
-    void draw_wire  () const { top().draw_wire  () ; }
-
-  };
-
-
-  /// Octree leaf iterator : Traverse the octree returning basic information on the leaves
-  class leaf_iterator : public cell_iterator
-  //---------------------------------------------------------------------------
-  {
-    public :
-    leaf_iterator( HashOctree &o ) : cell_iterator( o )
-    { if( (*this)() && !this->is_leaf() ) ++(*this) ; }
-
-    
-    /// next position
-    inline leaf_iterator &operator ++()
-    {
-      cell_iterator &it = *this ;
-      do ++it ; while ( it() && !it.is_leaf() ) ;
-      return *this ;
-    }
-  } ;
-} ;
-//_____________________________________________________________________________
-
-
diff --git a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/hash_ptr.h b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/hash_ptr.h
deleted file mode 100644
index 79b0c9ff99..0000000000
--- a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/hash_ptr.h
+++ /dev/null
@@ -1,292 +0,0 @@
-/**
- * @file    hash_ptr.h
- * @author  Thomas Lewiner 
- * @version 
- * @date    
- *
- * @brief
- *
- */
-//________________________________________________
-
-
-#ifndef _HASH_H_
-# error This header should not be included directly! include hash.h instead
-#endif // _HASH_H_
-
-#pragma once
-
-#define HASH_HAS_ERASE 1
-
-#include <stdlib.h> // memset
-#include <string.h>
-#include <stdio.h> //printf
-#include "mlist.h" // memset
-
-#include "morton.h"
-
-//_____________________________________________________________________________
-// Class hash
-template < typename Data > class Hash
-//-----------------------------------------------------------------------------
-{
-public:
-  typedef uint cntr ;
-//  static const cntr HASH_BITS = 16 ;
-//  static const cntr NON_HASH_BITS = 64-HASH_BITS ;
-  static const cntr HASH_SIZE = ((cntr)1<<HASH_BITS) ;
-  static const cntr HASH_MASK = HASH_SIZE-1 ;
-
-  // Bucket associative data
-  typedef struct KeyData
-  {
-    Key key ;
-    Data data ;
-
-    /// comparison based on the key only
-    bool operator==( const struct KeyData& rhs) const { return key == rhs.key ; }
-
-    /// comparison based on the key only
-    bool operator!=( const struct KeyData& rhs) const { return key != rhs.key ; }
-    
-  } KeyData ;
-  static KeyData KD_INV ;
-  
-  class iterator ;
-
-public:
-  typedef List<KeyData>                      KeyBucket ;
-  typedef typename KeyBucket::iterator       keybucket_iterator ;
-  typedef typename KeyBucket::const_iterator keybucket_const_iterator ;
-
-protected:
-//  KeyBucket _hash[HASH_SIZE] ;
-  KeyBucket *_hash ; // allocate dynamically since stack memory is limited
-  
-public:
-	// Constructor & Desctructor  
-  Hash   () { _hash = new KeyBucket[HASH_SIZE] ; } 
-  ~Hash  () { delete [] _hash ; }
-
-  void reset()
-  {
-    cntr n = HASH_SIZE ;
-    KeyBucket *ptr = _hash ;
-    for( ; n > 0 ; --n, ++ptr )
-    {
-      (*ptr).clear() ;
-    }
-    KD_INV.key = KEY_INV ;
-  }
-  
-  cntr size() const
-  {
-    cntr s = 0 ;
-    cntr n = HASH_SIZE ;
-    KeyBucket *ptr = _hash ;
-    for( ; n > 0 ; --n, ++ptr )
-      s += ptr->size() ;
-    return s ;
-  }
-  
-  void stats() const
-  {
-    static const cntr MAX_COLLISION = 32 ;
-    cntr colls[MAX_COLLISION] ;
-    memset( colls, 0, MAX_COLLISION*sizeof(cntr) ) ;
-    KeyBucket *ptr = _hash ;
-    for( cntr n = HASH_SIZE ; n > 0 ; --n, ++ptr )
-    {
-      cntr s = ptr->size() ;
-      if( s >= MAX_COLLISION ) s = MAX_COLLISION-1 ;
-      ++colls[s] ;
-    }
-
-    printf( "Hashtable collisions: [\t") ;
-    for( cntr n = 0 ; n < MAX_COLLISION ; ++n )
-      printf( "%d\t", colls[n] ) ;
-    printf( "\t]\n") ;
-  }
-  
-  inline cntr hash( Key k ) const ; 
-
-  bool insert( KeyData d )
-  {
-    cntr h = hash( d.key ) ;
-    KeyBucket &l = _hash[h] ;
-    return l.insert_unique( d ) ;
-  }
-
-  const KeyData operator[] ( Key k ) const
-  {
-    cntr h = hash( k ) ;
-    KeyData kd ; kd.key = k ;
-    keybucket_const_iterator it = _hash[h].cfind( kd ) ;
-    if( !it() ) return KD_INV ;
-    return *it ;
-  }
-  
-  KeyData &operator[] ( Key k )
-  {
-    cntr h = hash( k ) ;
-    KeyData kd ; kd.key = k ;
-    keybucket_iterator it = _hash[h].find( kd ) ;
-    if( !it() ) return KD_INV ;
-    return *it ;
-  }
-  
-  KeyData erase( Key k )
-  {
-    cntr h = hash( k ) ;
-    KeyData kd ; kd.key = k ;
-    if( _hash[h].remove( kd ) )
-      return kd ;
-    return KD_INV ;
-  }
-  
-  bool contains( Key k ) const { return (*this)[k].key == k ; }
-  
-  
-  //------------------------------------------------
-  // iterators
-  public :
-  /// iterator
-  class iterator
-  {
-    public :
-    // constructors
-    /// default constructors
-    iterator( Hash<Data> &hash_, Key id_ = 0 ) : _ptr(hash_._hash+id_), _last(hash_._hash+HASH_SIZE)
-    {
-      while( _ptr != _last && _ptr->empty() )
-        ++_ptr ;
-      if( _ptr != _last )
-        _l_it = _ptr->begin() ;
-    }
-    
-    /// destructor
-    ~iterator() {}
-    
-    /// copy constructor
-    iterator( const iterator &it ) : _ptr(it._ptr), _last(it._last), _l_it(it._l_it) {}
-    
-    /// assignment operator
-    iterator &operator = ( const iterator &it )
-    { _ptr = it._ptr; _last = it._last;  _l_it = it._l_it ;  return *this; }
-    
-    //-----------------------------------------------------------------------------
-    // Operations
-    public  :
-    /// equality operator
-    inline bool        operator ==( const iterator &it ) const { return _ptr == it._ptr && _l_it == it._l_it ; }
-    /// inequality operator
-    inline bool        operator !=( const iterator &it ) const { return _ptr != it._ptr || _l_it != it._l_it ; }
-    
-    /// validation operator
-    inline bool        operator ()() const { return _ptr != _last ; }
-    
-    /// key accessor
-    inline const Key  &key() const { return (*_l_it).key ; }
-    
-    /// value accessor
-    inline const Data &operator * () const { return (*_l_it).data ; }
-    
-    /// value accessor
-    inline Data       &operator * ()       { return (*_l_it).data ; }
-    
-    /// accesses the next position
-    inline iterator   &operator ++()       {
-      if( !(++_l_it)() )
-      {
-        while( _ptr != _last && (*(++_ptr)).empty() ) ;
-        if( _ptr != _last )
-          _l_it = _ptr->begin() ;
-      }
-      return *this ;
-    }
-    
-    //-----------------------------------------------------------------------------
-    // Elements
-    private :
-    KeyBucket           *_ptr  ; ///< position pointer
-    const KeyBucket     *_last ; ///< last position pointer
-    keybucket_iterator   _l_it ; ///< list iterator inside a bucket
-  };
-  
-  //------------------------------------------------
-  // const_iterator
-  public :
-  /// const_iterator
-  class const_iterator
-  {
-    public :
-    // constructors
-    /// default constructors
-    const_iterator( Hash<Data> &hash_, Key id_ = 0 ) : _ptr(hash_._hash+id_), _last(hash_._hash+HASH_SIZE)
-    {
-      while( _ptr != _last && _ptr->empty() )
-        ++_ptr ;
-      if( _ptr != _last )
-        _l_it = _ptr->cbegin() ;
-    }
-    
-    /// destructor
-    ~const_iterator() {}
-    
-    /// copy constructor
-    const_iterator( const const_iterator &it ) : _ptr(it._ptr), _last(it._last), _l_it(it._l_it) {}
-    
-    /// assignment operator
-    const_iterator &operator = ( const const_iterator &it )
-    { _ptr = it._ptr; _last = it._last;  _l_it = it._l_it ;  return *this; }
-    
-    //-----------------------------------------------------------------------------
-    // Operations
-    public  :
-    /// equality operator
-    inline bool        operator ==( const const_iterator &it ) const { return _ptr == it._ptr && _l_it == it._l_it ; ; }
-    /// inequality operator
-    inline bool        operator !=( const const_iterator &it ) const { return _ptr != it._ptr || _l_it != it._l_it ; ; }
-    
-    /// validation operator
-    inline bool        operator ()() const { return _ptr != _last ; }
-    
-    /// key accessor
-    inline const Key  &key() const { return (*_l_it).key ; }
-    
-    /// value accessor
-    inline const Data &operator * () const { return (*_l_it).data ; }
-    
-    /// accesses the next position
-    inline const_iterator   &operator ++()       {
-      if( !(++_l_it)() )
-      {
-        while( _ptr != _last && (*(++_ptr)).empty() ) ;
-        if( _ptr != _last )
-          _l_it = _ptr->cbegin() ;
-      }
-      return *this ;
-    }
-    
-    //-----------------------------------------------------------------------------
-    // Elements
-    private :
-    const KeyBucket  *         _ptr  ; ///< position pointer
-    const KeyBucket  * const   _last ; ///< last position pointer
-    keybucket_const_iterator   _l_it ; ///< list iterator inside a bucket
-  };
-  
-  public :
-  /// Node iterator creation
-  iterator begin( cntr id = 0 ) { return iterator( *this, id ) ; }
-  /// Node const iterator creation
-  const_iterator cbegin( cntr id = 0 ) { return const_iterator( *this, id ) ; }  
-};
-//_____________________________________________________________________________
-
-
-/// hash function specification: no inversion
-template <> inline Hash<real >::cntr Hash<real >::hash( Key k ) const { return k & HASH_MASK ; }
-
-/// hash function specification: inversion
-template <> inline Hash<Level>::cntr Hash<Level>::hash( Key k ) const { return (k>>NON_HASH_BITS) & HASH_MASK ; }
diff --git a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/implfuns.h b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/implfuns.h
deleted file mode 100644
index 76e61cc4ed..0000000000
--- a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/implfuns.h
+++ /dev/null
@@ -1,101 +0,0 @@
-/**
- * @file    implfuns.h
- * @author  Thomas Lewiner 
- * @version 
- * @date    
- *
- * @brief
- *
- */
-//________________________________________________
-
-
-#pragma once
-
-#define NFUNS 38
-
-// implicit functions
-const char *fun_list[NFUNS] =
-{
-  "Type Formula"    ,
-  "Sphere"          ,
-  "Ellipsoid"       ,
-  "Hyperboloid"     ,
-  "Plane"           ,
-  "Cubic"           ,
-  "Cushin"          ,
-  "Cassini"         ,
-  "Tangle cube"     ,
-  "Chair"           ,
-  "Cyclide"         ,
-  "2 Spheres"       ,
-  "2 Torii"         ,
-  "Heart"           ,
-  "Smile"           ,
-  "Spheres in"      ,
-  "Spheres dif"     ,
-	"Cross cap"       ,
-  "Weird cube"      ,
-  "Klein bottle"    ,
-  "Steiner's roman" ,
-	"Hunt's surface"  ,
-  "Cayley cubic"    ,
-  "Clebsch cubic"   ,
-  "Barth sextic"    ,
-	"Barth decic"     ,
-  "Steiner relative",
-  "Mitre"           ,
-  "Glob tear"       ,
-	"Piri tear"       ,
-  "Gumdrop torus"   ,
-  "Bretzel"         ,
-  "Blob"            ,
-  "Bifolia"         ,
-  "Lemniscate"      ,
-	"Planes"          ,
-  "Cylinders"       ,
-  "Torus"           ,
-} ;
-
-// implicit functions
-const char *fun_def [NFUNS] =
-{
-  /* Type Formula     */  "f(x,y,z)",
-  /* Sphere           */  "4*x^2-4*x+2.51+4*y^2-4*y+4*z^2-4*z",
-  /* Ellipsoid        */  "8*x^2-8*x+3.51+4*y^2-4*y+4*z^2-4*z",
-  /* Hyperboloid      */  "8*x^2-8*x-.1-4*y^2+4*y-4*z^2+4*z",
-  /* Plane            */  "x+y+z",
-  /* Cubic            */  "16*y^2-16*y+10-64*x^3+96*x^2-44*x",
-  /* Cushin           */  "112.5*z+81*y*z^2+51.75*x+119.25*y-135*y*z-38.8125+162*x^3-81*x^4+162*y^3+216*z^3-81*y^4-81*z^4-162*x*y-132.75*x^2-200.25*y^2-220.5*z^2+162*x*y^2+81*x*z-81*x*z^2-81*x^2*z-162*x^2*y^2-81*y^2*z^2+162*x^2*y+135*y^2*z+81*z^2*x^2",
-  /* Cassini          */  "-167.6778*z-267.2672*y*z^2-167.6778*x-205.1322*y+267.2672*y*z+59.74405625-267.2672*x^3+133.6336*x^4-267.2672*y^3-267.2672*z^3+133.6336*y^4+133.6336*z^4+267.2672*x*y+301.3114*x^2+338.7658*y^2+301.3114*z^2-267.2672*x*y^2+267.2672*x*z-267.2672*x*z^2-267.2672*x^2*z+267.2672*x^2*y^2+267.2672*y^2*z^2-267.2672*x^2*y-267.2672*y^2*z+267.2672*z^2*x^2",
-  /* Tangle cube      */  "-468*z-468*x-468*y+1296*y^4+1764*x^2+1764*y^2+1764*z^2+1296*z^4-2592*x^3+119.8-2592*y^3+1296*x^4-2592*z^3",
-  /* Chair            */  "-18250*z-36000*y*z^2-2250*x-18250*y+52000*y*z+4626.5625-20000*x^3+10000*x^4-20000*y^3-4000*z^3+10000*y^4+2000*z^4-12000*x*y+12250*x^2+28250*y^2+20250*z^2+12000*x*y^2+20000*x*z-36000*x*z^2-20000*x^2*z-12000*x^2*y^2+36000*y^2*z^2+12000*x^2*y-52000*y^2*z+36000*z^2*x^2",
-  /* Cyclide          */  "-11.23227514*x^2-6.0015984*x^4-6.0015984*y^4-6.0015984*z^4-13.56959251*z^2+12.0031968*y*z^2+12.0031968*z^3+6.027648307*x+7.256824512*y-13.25842291*y^2+12.0031968*y^3+12.0031968*x^2*z-9.79449408*x*y+9.79449408*x*y^2-9.79449408*x*z+9.79449408*x*z^2-12.0031968*x^2*y^2-12.0031968*y^2*z^2-12.0031968*z^2*x^2+7.567994112*z+12.0031968*y^2*z+12.0031968*x^2*y-12.0031968*y*z-2.289346823+9.79449408*x^3",
-  /* 2 Spheres        */  "(40000*x^2-52400*x+48853+40000*y^2-52400*y+40000*z^2-52400*z)*(4000*x^2-2800*x+1207+4000*y^2-2800*y+4000*z^2-2800*z)",
-  /* 2 Torii          */  "-6.929911075*x -6.559601218*z -40.61779736*z^3 +56.91300912*z^4 -17.17986918*y^7 +4.294967296*y^8 -55.95084095*z^5 +38.69346103*z^6 +38.69346103*x^6 +4.294967296*z^8 -17.17986918*x^7 +37.0828483*y^6 +4.294967296*x^8 -17.17986918*z^7 +20.40667127*z^2 -51.53960755*y^3*z^4 -89.2368375*x^4*y -41.69153918*x^3 +51.53960755*x*z^5 -51.11900275*y^5 -51.53960755*x^2*z^5 -51.53960755*y^5*z^2 +92.57432908*x^3*y +87.74249087*y^3*z -5.938337301*y +17.84876088*y^2 -35.13389168*y^3 +1.174097113 -51.53960755*y^2*z^5 +51.53960755*x^5*y -62.4313134*x*y^2 +50.14452444*y^4 +51.53960755*y^5*z -67.27041824*x^2*z -62.06100354*y*z^2 +114.4697704*y^2*z^4 +17.17986918*y^2*z^6 +88.81623269*y^3*x +112.8591576*y^4*z^2 +114.4697704*x^4*y^2 -87.08935385*y^4*z +25.76980378*y^4*z^4 +103.0792151*x^3*z^3 +103.0792151*y^3*z^3 -87.08935385*y^4*x +112.8591576*y^4*x^2 +90.42684543*y*z^3 +51.53960755*y*z^5 +116.0803831*x^2*z^4 +17.17986918*x^2*z^6 -146.2614203*x^3*z^2 +94.72181273*x^3*z +25.76980378*x^4*z^4 -51.53960755*x^4*z^3 -88.16309567*y*z^4 +25.43751542*y*z -90.31057932*x*z^4 -90.31057932*x^4*z +116.0803831*x^4*z^2 -139.2820984*y^3*z^2 -17.17986918*y^6*z -140.3558402*y^3*x^2 +17.17986918*x^6*z^2 +94.72181273*x*z^3 +17.17986918*y^6*z^2 -143.0401948*x^3*y^2 -17.17986918*x^6*z -17.17986918*x*z^6 -51.53960755*x^3*z^4 +51.53960755*x^5*z -51.53960755*x^5*z^2 +103.0792151*x^3*y^3 +17.17986918*x^6*y^2 -17.17986918*x^6*y +51.53960755*y^5*x -17.17986918*y*z^6 -51.53960755*y^5*x^2 -17.17986918*y^6*x +17.17986918*y^6*x^2 +25.76980378*x^4*y^4 -143.0401948*y^2*z^3 -146.2614203*x^2*z^3 +26.71500605*x*y +28.49944647*x*z -67.27041824*x*z^2 +125.3614762*x^2*y^2 +123.7508635*y^2*z^2 -60.82070066*y^2*z +131.8111938*z^2*x^2 +21.31385204*x^2 +51.53960755*y^4*z*x +103.0792151*y^2*z^3*x +51.53960755*y^2*z^2*x^4 -51.53960755*y^4*z^2*x +103.0792151*y^3*z^2*x -103.0792151*y^2*z^2*x^3 -51.53960755*x^4*y^2*z +103.0792151*x^2*z^3*y -51.53960755*x^2*z^4*y +103.0792151*x^3*y^2*z -51.53960755*y^2*z^4*x +51.53960755*y^4*z^2*x^2 -103.0792151*y^3*z^2*x^2 +51.53960755*y^2*z^4*x^2 -103.0792151*y^2*z^3*x^2 +51.53960755*x*z^4*y +51.53960755*x^4*y*z -51.53960755*y^4*z*x^2 -103.0792151*x^3*y*z -51.53960755*x^4*y*z^2 +103.0792151*x^3*y*z^2 -103.0792151*x*z^3*y -103.0792151*y^3*z*x +103.0792151*y^3*z*x^2 +125.8603256*y*z^2*x -177.3999332*x^2*y*z^2 -177.3999332*x^2*z*y^2 +125.8603256*y^2*z*x -177.3999332*x*y^2*z^2 +228.9395407*y^2*z^2*x^2 -74.32071807*y*z*x +125.8603256*y*z*x^2 -64.41223599*x^2*y -51.53960755*x^5*y^2 +57.44988003*x^4 -55.95084095*x^5 -51.53960755*x^4*y^3 -51.53960755*x^3*y^4 -51.53960755*y^4*z^3",
-  /* Heart            */  "-697.347066*z-2684.277024*y*z^2-1347.168628*x-687.693448*y+926.747328*y^2*z^4+3706.989312*y^3*x+926.747328*y^4*z^2+3706.989312*x^4*y^2-926.747328*y^4*z-1853.494656*y^4*x+1853.494656*y^4*x^2+1972.308416*y*z^3+1853.494656*x^2*z^4-7413.978624*x^3*z^2+7413.978624*x^3*z-926.747328*y*z^4+1668.419376*y*z-1853.494656*x*z^4+7413.978624*x^3*y-3706.989312*x^4*z+3706.989312*x^4*z^2+1853.494656*y^3*z-1853.494656*y^3*z^2-3706.989312*y^3*x^2+3718.870688*x*z^3-7413.978624*x^3*y^2-3706.989312*x^4*y-1972.308416*y^2*z^3-3718.870688*x^2*z^3+195.187199+3706.989312*y*z^2*x-3706.989312*x^2*y*z^2-3706.989312*x^2*z*y^2+3706.989312*y^2*z*x-3706.989312*x*y^2*z^2+3706.989312*y^2*z^2*x^2-8788.562432*x^3+10572.59674*x^4-1888.224832*y^3-1920.898616*z^3+1716.401856*y^4+1716.401856*z^4-926.747328*z^5+308.915776*z^6-7413.978624*x^5+2471.326208*x^6-926.747328*y^5+308.915776*y^6+3158.618112*x*y+4505.78674*x^2+1477.347976*y^2+1511.506932*z^2-3706.989312*y*z*x-5012.112768*x*y^2+3706.989312*y*z*x^2+3167.529144*x*z-5029.934832*x*z^2-6874.518456*x^2*z+8719.10208*x^2*y^2+3611.024352*y^2*z^2-6865.607424*x^2*y-2595.166704*y^2*z+8736.924144*z^2*x^2",
-  /* Smile            */  "-12348*z-435632*y^3-27216*y*z^2-17834.8125*x-35974.25*y-327680*y^7+733184*y^6-891648*y^4*x+11664*y*z^3+972*x^3*z+21168*y*z+2304*y^3*z+8748*x*z^3+46656*x^6*y^2-58320*x^6*y+5162.816406-1100160*y^3*x^2+11664*y*z^2*x+5184*y^2*z*x-72987.75*x^3+95610.375*x^4-20412*z^3+6561*z^4+65536*y^8-89667*x^5+60507*x^6-26244*x^7+6561*x^8+41910.1875*x^2+23814*z^2+712044*x^2*y^2-257499*x^2*y-18144*y*z*x+3888*y*z*x^2-311040*x^4*y^3+174960*x^5*y-139968*x^5*y^2+622080*x^3*y^3+552960*y^5*x-552960*y^5*x^2-147456*y^6*x+1016064*y^4*x^2+789888*y^3*x+340632*x^3*y-957440*y^5-315900*x^4*y-408060*x*y^2-248832*x^3*y^4+147456*y^6*x^2+124416*x^4*y^4-660960*x^3*y^2+155243*y^2+797792*y^4+447120*x^4*y^2+120591*x*y+15876*x*z-20412*x*z^2-6804*x^2*z+7776*y^2*z^2-12096*y^2*z+4374*z^2*x^2",
-  /* Spheres in       */  "-(8*(4*x^2-4*x+3+4*y^2-4*y+4*z^2-4*z))*(-1+sqrt(4*x^2-4*x+3+4*y^2-4*y+4*z^2-4*z))",
-  /* Spheres dif      */  "-496*z-4416*y*z^2-560*x-560*y+6912*y^2*z^4+1024*y^2*z^6+9728*y^3*x+7296*y^4*z^2+13056*x^4*y^2-7680*y^4*z-6144*x^4*y^3+1536*y^4*z^4+6144*x^3*z^3+6144*y^3*z^3-9984*y^4*x+13056*y^4*x^2+5760*y*z^3+3072*y*z^5-3072*x^2*z^5+6912*x^2*z^4+1024*x^2*z^6-9472*x^3*z^2+6144*x^5*y-6144*x^5*y^2+7680*x^3*z+1536*x^4*z^4-3072*x^4*z^3-5376*y*z^4-3072*y^3*z^4+4608*y^4*z*x+6144*y^2*z^3*x+3072*y^2*z^2*x^4-3072*y^4*z^2*x+6144*y^3*z^2*x-6144*y^2*z^2*x^3-4608*x^4*y^2*z+6144*x^2*z^3*y-3072*x^2*z^4*y+9216*x^3*y^2*z-3072*y^2*z^4*x+3072*y^4*z^2*x^2-6144*y^3*z^2*x^2+3072*y^2*z^4*x^2-6144*y^2*z^3*x^2+3072*x*z^4*y+4608*x^4*y*z-4608*y^4*z*x^2-9216*x^3*y*z-3072*x^4*y*z^2+6144*x^3*y*z^2-6144*x*z^3*y-9216*y^3*z*x+9216*y^3*z*x^2+2112*y*z-5376*x*z^4+9728*x^3*y-7680*x^4*z+7296*x^4*z^2+7680*y^3*z-9472*y^3*z^2-1536*y^6*z-15872*y^3*x^2+1024*x^6*z^2+5760*x*z^3+1024*y^6*z^2-3072*y^4*z^3-15872*x^3*y^2-1536*x^6*z+3072*x*z^5-1024*x*z^6-3072*x^3*z^4+4608*x^5*z-3072*x^5*z^2+12288*x^3*y^3+2048*x^6*y^2-2048*x^6*y+6144*y^5*x-1024*y*z^6-6144*y^5*x^2+4608*y^5*z-3072*y^5*z^2-9984*x^4*y-2048*y^6*x-6144*x^3*y^4+2048*y^6*x^2+3072*x^4*y^4-8832*y^2*z^3-8832*x^2*z^3-3072*y^2*z^5+96+8448*y*z^2*x-11520*x^2*y*z^2-15360*x^2*z*y^2+10752*y^2*z*x-11520*x*y^2*z^2+14592*y^2*z^2*x^2-3776*x^3+5600*x^4-3776*y^3-2560*z^3+5600*y^4+3440*z^4-2048*y^7+512*y^8-3328*z^5+2304*z^6-5888*x^5+4352*x^6-5888*y^5+256*z^8-2048*x^7+4352*y^6+512*x^8-1024*z^7+2496*x*y+1808*x^2+1808*y^2+1392*z^2-6144*y*z*x-6336*x*y^2+10752*y*z*x^2+2112*x*z-4416*x*z^2-5184*x^2*z+13248*x^2*y^2+8640*y^2*z^2-6336*x^2*y-5184*y^2*z+8640*z^2*x^2",
-  /* Cross cap        */  ".4*sqrt(100*x-10)*x^2-0.08*sqrt(100*x-10)*x+0.008*sqrt(100*x-10)+.4*sqrt(100*x-10)*y^2-0.08*sqrt(100*x-10)*y+1.6*sqrt(100*x-10)*z^2-.8*sqrt(100*x-10)*z+.1*sqrt(100*y-10)*y^2-0.02*sqrt(100*y-10)*y+0.001*sqrt(100*y-10)+.4*sqrt(100*y-10)*z^2-.4*sqrt(100*y-10)*z",
-  /* Weird cube       */  "59136*z-10240*y^3-10240*x^3+59136*x+59136*y+204800*z^2*x^2+204800*y^2*z^2-23232+204800*x^2*y^2-102400*x^2*y-102400*x^2*z-297216*x*z+128000*z^2-512000*y*z*x^2+128000*x^2+1566720*y*z*x-102400*x*z^2-512000*y*z^2*x-512000*y^2*z*x-102400*z^3-297216*y*z+102400*y^3*x-102400*y*z^2+102400*x^3*z+102400*x^3*y-102400*x*y^2+128000*y^2+102400*y*z^3-297216*x*y+102400*y^3*z-102400*y^2*z+102400*x*z^3",
-  /* Klein bottle     */  "-244615.68*y^3-304335.36*x^3-96138.60864*y-786432*z^5-453427.2*y^3*z^2+1139015.68*z^4-139968*y^4*x-255052.8*y^3*x^2+248832*x^4*z^2-248832*x^4*z+33252.70426+46656*x^6+46656*y^6+1051729.92*y^2*z^2+493102.08*x^2*y^2+442368*x^2*z^4-497664*x^3*z^2-403046.4*y*z^4-442368*x*z^4-344176.128*x^2*y-705392.64*x^2*z+497664*y^2*z^2*x^2+480030.72*x*z-484761.6*y*z*x+555332.4032*z^2+453427.2*y*z*x^2+243162.3168*x^2-931184.64*x*z^2+453427.2*y*z^2*x+525312*y^2*z*x-991887.36*z^3+392220.672*y*z+255052.8*y^3*x-779599.872*y*z^2+525312*x^3*z+255052.8*x^3*y-127526.4*y^5-127526.4*x^4*y-366958.08*x*y^2-497664*x*y^2*z^2+262144*z^6-497664*x^2*z*y^2-453427.2*x^2*y*z^2+1106288.64*z^2*x^2-139968*x^5-279936*x^3*y^2-884736*x^2*z^3-120681.6768*x+196337.664*y^2-191443.7632*z+231206.4*y^4+261895.68*x^4-884736*y^2*z^3+806092.8*y*z^3+442368*y^2*z^4+248832*y^4*z^2+139968*x^4*y^2-248832*y^4*z+139968*y^4*x^2+232316.928*x*y+453427.2*y^3*z-623185.92*y^2*z+933888*x*z^3",
-  /* Steiner's roman  */  "0.03125*y^2+.125*y*z*x-0.00390625-0.0625*y^2*z-0.0625*y*z^2+0.03125*z^2-0.0625*x^2*z+0.03125*x^2+0.0625*x^2*y^2+0.0625*z^2*x^2+0.0625*y^2*z^2-0.0625*x^2*y-0.0625*x*y^2-0.0625*x*z^2",
-  /* Hunt's surface   */  "-321408*y-559872*z^5+1446336*z^4+933120*z^2*x^2-1990656*y^2*z^3+559872*x^4*z^2+1990656*y*z^2*x-559872*x^4*z-1990656*x^3*y^2-3538944*y^3*x^2+1119744*x*z^3-3538944*y^3*z^2-1959552*z^3-1469664*x^3+37719-1119744*x^3*z^2+1119744*x^3*z-1658880*y*z^2-1769472*y^4*z+1990656*y*z^3+1990656*x^3*y+3538944*y^3*z+3428352*y^2*z^2+1534464*x*y+186624*x^6+559872*x^2*z^4-995328*y*z^4-559872*x*z^4-373248*x^2*z-186624*x*z-3334144*y^3+4288512*y^4+1201392*x^4+1990656*y^2*z*x-1990656*x*y^2*z^2+3538944*y^3*x+1769472*y^4*z^2+1769472*y^4*x^2-1769472*y^4*x+1990656*y*z*x^2+802872*x^2-1990656*y*z*x-3303936*x*y^2-2433024*y^2*z-373248*x*z^2+663552*y*z-995328*x^4*y+4299264*x^2*y^2+1990656*y^2*z^2*x^2+186624*z^6-559872*x^5-3145728*y^5+1048576*y^6-2529792*x^2*y-161352*x-229392*z-1990656*x^2*y*z^2-1990656*x^2*z*y^2+1115856*z^2+995328*y^2*z^4+995328*x^4*y^2-1119744*x^2*z^3+1464192*y^2",
-  /* Cayley cubic     */  "264-512*z-512*x-512*y+320*y^2-320*x^2*y-320*x^2*z-320*x*y^2+672*x*y-320*x*z^2+672*x*z-320*y^2*z-320*y*z^2+672*y*z+320*z^2+320*x^2",
-  /* Clebsch cubic    */  "8154-15300*z-15300*x-15300*y+4176*y^2+4176*z^2+24480*x*y+24480*y*z+5184*x^3-12096*x*y^2-12096*y^2*z-12096*x*z^2-12096*y*z^2+24480*x*z-12096*x^2*y-12096*x^2*z+4176*x^2+3456*y*z*x+5184*z^3+5184*y^3",
-  /* Barth sextic     */  "-2846.637681*z-75426.87093*y*z^2-2846.637681*x-2846.637681*y+224595.2132*y^3*z^2+42893.86887*y^2*z^4+85787.73774*y^3*x-42893.86887*y^4*x+42893.86887*y^4*x^2+85787.73774*y*z^3-85787.73774*x^3*z^2+85787.73774*x^3*z-42893.86887*y*z^4+32533.00206*y*z-42893.86887*x^4*z+42893.86887*x^4*z^2-85787.73774*y^3*x^2-85787.73774*y^2*z^3+571.8691769+36870.73567*x^3-18435.36784*x^4+36870.73567*y^3+36870.73567*z^3-18435.36784*y^4-18435.36784*z^4+32533.00206*x*y-15588.73016*x^2-15588.73016*y^2-15588.73016*z^2-112297.6066*x^2*z^4+112297.6066*x*z^4+277614.9509*y^2*z^2*x^2-75426.87093*x*y^2-277614.9509*y*z*x+277614.9509*y*z*x^2+277614.9509*y*z^2*x+277614.9509*y^2*z*x-224595.2132*x^3*y+112297.6066*x^4*y-277614.9509*x*y^2*z^2-277614.9509*x^2*z*y^2-277614.9509*x^2*y*z^2+224595.2132*x^3*y^2+224595.2132*x^2*z^3-112297.6066*y^4*z^2-112297.6066*x^4*y^2+112297.6066*y^4*z+32533.00206*x*z+79764.60454*x*z^2-75426.87093*x^2*z-36870.73567*x^2*y^2-36870.73567*y^2*z^2-224595.2132*y^3*z-224595.2132*x*z^3+79764.60454*x^2*y+79764.60454*y^2*z-36870.73567*z^2*x^2",
-  /* Barth decic      */  "25.33143961*y^2*z^2*x^4 +25.15700632*y^4*z^2*x -34.82908387*y^2*z^4 +8.917960033*y^4*z^2 +0.04360832264*y^4*z^4 +16.49570037*y^4*z +8.917960033*x^4*y^2 -42.37063678*x^4*y^3 -34.82908387*y^4*x^2 +2.299854983*y^7*z^2 +25.37005208*x^4*y^5 +33.65896395*x^6*y^2*z -100.9768918*x^3*y^2*z^4 +1.198101193*x^3 +246.5161156*y^2*z^2*x^2 +25.36672152*x^3*y^4 +6.515326172*y^6*x^2 +44.38789864*y^2*z*x +6.273208191*y^5*z^2 +0.05111641659 +201.9537837*x^2*z^3*y^3 -8.109285345*x^3*z^2 +117.9808071*y^2*z^3*x +0.8487421525*x^8 -8.109285345*y^3*x^2 +6.515326172*x^6*z^2 +33.83339724*x^3*y^3 +50.48844592*x^4*y^2*z^4 -33.65896395*y^6*z*x +100.9768918*x^5*y*z +6.273208191*x^2*z^5 +100.9768918*x^4*y^3*z -201.9537837*x^3*y*z^3 -4.774233544*x^2*z^6 -21.54557109*x^5*y -3.716625642*x^3*z +6.273208191*x^5*y^2 +0.04360832264*x^4*z^4 -100.9768918*x^2*z^3*y^4 +33.65896395*y^2*z^6*x +16.49570037*x*z^4 +16.49570037*x^4*y -120.2077842*x^2*y*z^2 +9.865021177*x*z^6 -42.37063678*x^3*z^4 -3.39496861*x^7 -15.2723629*x^4*z^5 -2.299854983*x*z^7 +25.15700632*x^2*z^4*y +117.9808071*x^3*y^2*z +25.15700632*y^2*z^4*x +50.48844592*x^2*z^4*y^4 -25.60810291*x^3*y^2 -14.9720102*x^6*z -100.9768918*x^5*y^2*z -100.9768918*x^2*z^4*y^3 +6.515326172*y^2*z^6 -3.716625642*y^3*x -5.046246117*y*z^2 -100.9768918*x^4*y^3*z^2 -50.48844592*y^4*z^4*x +100.9768918*x^3*y^4*z +2.299854983*x^7*y^2 -3.940860141*y^8*x +5.090787632*y^6*z^4 -15.2723629*x^5*y^4 +0.8487421525*y^8 +2.299854983*x^2*z^7 -0.5749637458*x^2*z^8 -75.64545224*y^4*z*x -100.9768918*y^5*z*x^2 -50.48844592*x^4*y*z^4 +25.33143961*y^4*z^2*x^2 +1.198101193*z^3 +100.9768918*y^5*z*x +0.9611245006*y^5 -120.2077842*x^2*z*y^2 +3.940860141*y^2*z^8 -10.18157526*x^6*y^3 -8.456684027*x^4*y^6 +201.9537837*x^3*y^2*z^3 -100.9768918*x^2*z^5*y +19.60032929*y*z^4 -15.76344056*x^7*z^2 -3.940860141*x^8*z +0.2347202588*x^3*y +19.60032929*x^4*z +9.865021177*y^6*z -19.05645904*y*z*x -10.25601137*x^5*z +9.865021177*x^6*y +0.4659238756*x^2 -0.3389589536*x -0.3389589536*y +1.198101193*y^3 -3.380386036*y^4 -3.380386036*x^4 -8.109285345*y^2*z^3 -25.60810291*x^2*z^3 -4.774233544*x^6*y^2 +117.9808071*y^3*z^2*x -218.9576989*y^2*z^2*x^3 +25.15700632*x^4*y^2*z +117.9808071*x^2*z^3*y +100.9768918*x^2*z^5*y^2 +33.65896395*y^6*z*x^2 -33.65896395*x^6*y*z +100.9768918*y^4*z^3*x -50.48844592*x^4*y^4*z -50.74010416*x^3*y^5 -3.39496861*y^7 -5.892963096*x*z^2 -5.046246117*x^2*z -100.9768918*y^5*z^2*x -100.9768918*y^2*z^5*x -21.54557109*y^5*z +0.9611245006*z^5 +18.5125231*z^2*x^2 +25.15700632*x^4*y*z^2 -17.00391526*x^3*y*z -33.65896395*x*z^6*y +100.9768918*y^3*z^4*x +5.090787632*x^4*z^6 -34.82908387*x^4*z^2 +2.567983615*x*z +100.9768918*x^3*y*z^4 +3.940860141*x^8*z^2 -8.456684027*x^6*z^4 +16.91336805*y^3*z^6 +30.54472579*y^5*z^3 -15.76344056*y^7*x^2 +15.76344056*y^7*x +30.54472579*x^3*z^5 +25.37005208*x^5*z^4 +25.37005208*y^4*z^5 -10.18157526*y^6*z^3 +33.65896395*x^2*z^6*y -100.9768918*x^4*y^2*z^3 -15.2723629*y^5*z^4 -50.74010416*y^3*z^5 -100.9768918*x^3*y^4*z^2 +50.48844592*x^4*y^4*z^2 -201.9537837*x^3*y^3*z +0.5749637458*y^8*z -0.5749637458*y^8*z^2 +35.62606345*y^5*x^2 -100.9768918*x^5*y*z^2 +3.640421878*z^6 +0.9611245006*x^5 -21.54557109*x*z^5 +0.4659238756*y^2 -33.65896395*x^6*y^2*z^2 -33.65896395*y^6*z^2*x^2 +0.5749637458*x^8*y -0.5749637458*x^8*y^2 +0.2347202588*x*z^3 +3.640421878*x^6 +25.36672152*x^4*z^3 +25.36672152*y^3*z^4 +0.4659238756*z^2 -0.3389589536*z -120.2077842*x*y^2*z^2 +100.9768918*x*z^5*y +30.54472579*x^5*y^3 +16.91336805*x^6*z^3 -33.65896395*x^2*z^6*y^2 +33.65896395*x^6*y*z^2 +201.9537837*x^3*y^3*z^2 +2.567983615*x*y +18.5125231*x^2*y^2 -15.76344056*y^2*z^7 +5.090787632*x^6*y^4 -3.940860141*y*z^8 +100.9768918*y^5*z^2*x^2 +0.04360832264*x^4*y^4 +35.62606345*x^5*z^2 +117.9808071*x^3*y*z^2 -17.00391526*x*z^3*y +35.62606345*y^2*z^5 -4.774233544*y^6*z^2 -42.37063678*y^4*z^3 +0.5749637458*x*z^8 +3.940860141*y^8*x^2 -2.299854983*x^7*y -3.380386036*z^4 +0.2347202588*y^3*z -25.60810291*y^3*z^2 +16.91336805*x^3*y^6 +3.640421878*y^6 +33.83339724*x^3*z^3 +33.83339724*y^3*z^3 +19.60032929*y^4*x +8.917960033*x^2*z^4 -10.25601137*y*z^5 -3.716625642*y*z^3 -5.892963096*y^2*z -5.892963096*x^2*y +33.65896395*y^6*z^2*x +100.9768918*x^5*y^2*z^2 +44.38789864*y*z*x^2 +44.38789864*y*z^2*x -3.39496861*z^7 -10.18157526*x^3*z^6 +100.9768918*x^4*y*z^3 -5.046246117*x*y^2 -10.25601137*y^5*x -14.9720102*y*z^6 +15.76344056*y*z^7 +0.8487421525*z^8 -75.64545224*x*z^4*y -75.64545224*x^4*y*z +25.15700632*y^4*z*x^2 +18.5125231*y^2*z^2 -14.9720102*y^6*x -8.456684027*y^4*z^6 +2.567983615*y*z +15.76344056*x^7*z -218.9576989*y^3*z^2*x^2 +25.33143961*y^2*z^4*x^2 -218.9576989*y^2*z^3*x^2 -17.00391526*y^3*z*x +117.9808071*y^3*z*x^2 -201.9537837*y^3*z^3*x -50.74010416*x^5*z^3 -2.299854983*y^7*z",
-  /* Steiner relative */  "2-8*y*z*x-2*z-2*x-10*y+8*y^2-16*x*y^2-16*x^2*y+16*x^2*y^2+20*x*y-16*z^2*x^2+16*x^2*z+16*x*z^2+20*y*z-16*y*z^2-16*y^2*z+16*y^2*z^2-12*x*z",
-  /* Mitre            */  "4-8*z-16*x-12*y+28*y^2-16*x*y^2-16*x^2*y+16*x^2*y^2+16*x*y+16*z^2*x^2-16*x^2*z-16*x*z^2+16*y*z-16*y*z^2-16*y^2*z+16*y^2*z^2+16*x*z+8*z^2+16*y^4+16*x^4-32*x^3+32*x^2-32*y^3",
-  /* Glob tear        */  "16*x^5-32*x^4+24*x^3-8*x^2+x-2-4*y^2+4*y-4*z^2+4*z",
-  /* Piri tear        */  "x^4-1*x^3+y^2-1*y+.5+z^2-1*z",
-  /* Gumdrop torus    */  "-1792*z-2048*y*z^2-2368*x-1792*y+2048*y*z-2048*x^3+1024*x^4-2048*y^3-2048*z^3+1024*y^4+1024*z^4+4352*x*y+3392*x^2+2816*y^2+2816*z^2+641-4352*x*y^2+4352*x*z-4352*x*z^2-4352*x^2*z+4352*x^2*y^2+2048*y^2*z^2-4352*x^2*y-2048*y^2*z+4352*z^2*x^2",
-  /* Bretzel          */  "-1*z-4.5*x-2.53125*y+7.59375*y^2-18*x*y^2+18*x*y+72*x^4*y^2-72*x^4*y-144*x^3*y^2+144*x^3*y+z^2+5.0625*y^4+674*x^4+.55640625-196*x^3+38.5*x^2-1408*x^5+256*x^8-1024*x^7+1664*x^6+90*x^2*y^2-90*x^2*y-10.125*y^3",
-  /* Blob             */  "9*x^2-8.1*x+4.895+9*y^2-8.1*y+9*z^2-9*z+sin(12*x-5.4)+sin(12*y-5.4)+sin(12*z-6)",
-  /* Bifolia          */  "4-16*z-16*x+4*y^2+8*x^2*y^2+32*z^2*x^2-32*x^2*z-8*x*y^2-32*x*z^2+32*x*z+8*y^2*z^2-8*y^2*z+32*z^2+y^4+16*z^4+16*x^4-32*x^3+32*x^2-32*z^3-12*x^2*y+12*x*y-6*y-12*y*z^2+12*y*z",
-  /* Lemniscate       */  "16*x^4-32*x^3+20*x^2-4*x+2+4*y^2-4*y+4*z^2-4*z",
-  /* Planes           */  "x*y",
-  /* Cylinders        */  "((4*x-2)^2+(4*y-2)^2)^4+((4*x-2)^2+(4*z-2)^2)^4-((4*x-2)^2+(4*y-2)^2)^4*((4*x-2)^2+(4*z-2)^2)^4",
-  /* Torus            */  "(1.4-sqrt((6*x-3)^2+(6*y-3)^2))^2+(6*z-3)^2-1.44"
-} ;
diff --git a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/leaf_octree.cpp b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/leaf_octree.cpp
deleted file mode 100644
index 179975cf47..0000000000
--- a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/leaf_octree.cpp
+++ /dev/null
@@ -1,1120 +0,0 @@
-/**
- * \file    leaf_octree.cpp
- * \author  Thomas Lewiner   <tomlew@puc-rio.br>
- * \author  Matmidia Lab, Math Dept, PUC-Rio
- * \date    10/01/2010
- *
- *  Octree structure without intermediate nodes, hashtable and optimized operations
- */
-//_____________________________________________________________________________
-
-
-#ifndef WIN32
-#pragma implementation
-#endif // WIN32
-
-
-#include <stack>
-#include "leaf_octree.h"
-
-#ifdef HASH_HAS_ERASE
-
-//_____________________________________________________________________________
-// Create the root
-void LeafOctree::init()
-//-----------------------------------------------------------------------------
-{
-  _max_field = R_INV ;
-  _opt_level = L_INV ;
-  memset( _level_dist, 0, (MAX_LEVEL+1)*sizeof(uint) ) ;
-
-  HashField::KeyData kd ;
-  kd.data = 0.0 ;
-  kd.key  =  1  ;
-  _hash.insert( kd ) ;
-
-  _level_dist[0] = 1 ;
-}
-//_____________________________________________________________________________
-
-
-
-
-//_____________________________________________________________________________
-/// Compute the optimal level
-void LeafOctree::compute_opt_level()
-//-----------------------------------------------------------------------------
-{
-  Level left     = 0 ;
-  Level right    = MAX_LEVEL ;
-  uint  leftsum  =  0 ;
-  uint  rightsum =  0 ;
-  while( left < right )
-  {
-    uint leftsum_old = leftsum ;
-    if( leftsum <= rightsum )
-    {
-      leftsum += _level_dist[ left ] ;
-      ++left ;
-    }
-    if( leftsum_old >= rightsum )
-    {
-      rightsum += _level_dist[ right ] ;
-      --right ;
-    }
-  }  
-  _opt_level = right ;
-}
-//_____________________________________________________________________________
-
-
-//_____________________________________________________________________________
-// Check that each point scan or scribble is in the right node
-bool LeafOctree::check ()
-//-----------------------------------------------------------------------------
-{  
-  bool result = true ;
-
-  uint level_dist[MAX_LEVEL+1] ;
-  memset( level_dist, 0, (MAX_LEVEL+1)*sizeof(uint) ) ;
-  for( leaf_iterator it = leaves_begin() ; it() ; ++it )
-  {
-    Key k  = it.key() ;
-    level_dist[ key_level(k) ] ++ ;
-
-    Key ks = k << 3 ;
-    HashField::KeyData kd ;
-    for( int i = 0 ; i < 8 ; ++i )
-    {
-      if( node_exists( ks|i, kd ) )
-        printf("(leaf) Invalid leaf %d: has son %d\n", (int)k, (int)ks|i ) ;
-    }
-
-    if( node_exists( k>>3, kd ) )
-      printf("(leaf) Invalid leaf %d: has father %d\n", (int)k, (int)k>>3 ) ;
-  }
-
-  for( Level lv = 0 ; lv <= MAX_LEVEL ; ++lv )
-  {
-    if( _level_dist[lv] != level_dist[lv] )
-    {
-      printf("(leaf) Invalid level statistic %d: %d != %d\n", (int)lv, (int)_level_dist[lv], (int)level_dist[lv] ) ;
-      result = false ;
-    }
-  }
-
-  return result ;
-}
-//_____________________________________________________________________________
-
-
-
-
-//_____________________________________________________________________________
-// Deletes the content of the octree
-void LeafOctree::clear_octree()
-//-----------------------------------------------------------------------------
-{
-  _hash.reset() ;
-  _verts.reset() ;
-  _max_field = R_INV ;
-  _opt_level = L_INV ;
-  memset( _level_dist, 0, (MAX_LEVEL+1)*sizeof(uint) ) ;
-}
-//_____________________________________________________________________________
-
-
-
-
-
-//_____________________________________________________________________________
-// set the values of each leaf from the implicit function
-bool LeafOctree::set_impl( data_access *ref )
-//-----------------------------------------------------------------------------
-{
-  if( !ref ) return false ;
-  
-  _max_field = -FLT_MAX ;
-  for( leaf_iterator it = leaves_begin() ; it() ; ++it )
-  {
-    real v = (*ref).value_at( it.top() ) ;
-    *it = v ;
-    v = fabs(v) ;
-    if( _max_field < v ) _max_field = v ;
-  }
-  
-//  printf( "max field: %f\n", max_field() ) ;
-  return true ;
-}
-//_____________________________________________________________________________
-
-
-
-
-
-//_____________________________________________________________________________
-// Refine the octree according to the data access
-bool LeafOctree::refine( data_access *ref /*= NULL*/ )
-//-----------------------------------------------------------------------------
-{
-  if( !ref ) return false ;
-
-    clear() ;  init() ;
-
-  // traversal stack: iterator has a pre-ordered stack, and cannot be recursed on
-  geom_cell it = geom_root() ; // the only cell
-  std::stack< geom_cell > s ;
-  s.push( it ) ;
-  
-  // although it may refine only the leaves
-  // the leaf iterator may change during the refinement
-  bool refined = false ;
-  while( !s.empty() )
-  {
-    it = s.top() ;  s.pop() ;
-
-    // test for subdivision
-    if( !(*ref).need_refine( it ) ) continue ;
-    refined = true ;
-    
-    //_____________________________________________________________________________
-    // subdivides the cell in the tree
-    _hash.erase( it.key() ) ;
-
-    HashField::KeyData kd ;
-    kd.data = 0.0 ;
-
-    // recurse on the traversal
-    Key sk = it.key() << 3 ;
-    for( int i = 0 ; i < 8 ; ++i )
-    {
-      kd.key = sk | i ;
-      if( !_hash.insert( kd ) )
-      {
-        printf( "hash table saturated!\n" ) ;
-        exit(1) ;
-        return false ;
-      }
-      
-      s.push( geom_cell( kd.key, kd.data ) ) ;
-    }
-    
-    Level lv = it.lv() ;
-    _level_dist[ lv ] -= 1 ;
-    _level_dist[lv+1] += 8 ;
-  }
-  
-  compute_opt_level() ;
-  return refined ;
-}
-//_____________________________________________________________________________
-
-
-
-//_____________________________________________________________________________
-// Refine the octree according to the data access
-bool LeafOctree::adapt( data_access *ref /*= NULL*/ )
-//-----------------------------------------------------------------------------
-{
-  if( !ref ) return false ;
-
-    
-  // need to go for a stack structure
-  // this is horribly heavy, but the adaptation destroys the leaf iterator!
-  std::stack< geom_cell > s ;
-  for( leaf_iterator it = leaves_begin() ; it() ; ++it )
-    s.push( it.top() ) ;
-
-  
-  bool refined = false ;
-  while( !s.empty() )
-  {
-    geom_cell it = s.top() ;
-    s.pop() ;
-      
-    HashField::KeyData kd ;
-    if( !node_exists( it.key(), kd ) ) continue ;
-
-      // try to refine
-    std::stack< geom_cell > ref_s ;
-    ref_s.push( it ) ;
-    
-    bool it_refined = false ;
-    while( !ref_s.empty() )
-    {
-      geom_cell r_it = ref_s.top() ;  ref_s.pop() ;
-      
-      // test for subdivision
-      if( !(*ref).need_refine( r_it ) ) continue ;
-      refined = it_refined = true ;
-      
-      // subdivides the cell in the tree
-      _hash.erase( r_it.key() ) ;
-      
-      kd.data = 0.0 ;
-      
-      // recurse on the traversal
-      Key sk = r_it.key() << 3 ;
-      for( int i = 0 ; i < 8 ; ++i )
-      {
-        kd.key = sk | i ;
-        if( !_hash.insert( kd ) )
-        {
-          printf( "hash table saturated!\n" ) ;
-          exit(1) ;
-          return false ;
-        }
-        
-        ref_s.push( geom_cell( kd.key, kd.data ) ) ;
-      }
-      
-      Level lv = r_it.lv() ;
-      _level_dist[ lv ] -= 1 ;
-      _level_dist[lv+1] += 8 ;
-    }
-    if( it_refined ) continue ;
-
-    
-    // no need refine the current leaf: check parent
-    geom_cell father( it.key() >> 3, 0.0 ) ;
-    if( (*ref).need_refine( father ) ) continue ; // need to refine father = no need to simplify: OK!
-    
-    // need to simplify? check on brothers and nephews
-    std::stack< Key > nephews_s;
-    Key fk = father.key() << 3 ;
-    for( int i = 0 ; i < 8 ; ++i )
-    {
-      if( (fk | i) == it.key() ) continue ;
-      nephews_s.push( fk|i ) ;
-    }
-    std::stack< std::pair<Key,Level> > nephews_keys ;
-    bool keep_refined = false ;
-    while( !nephews_s.empty() )
-    {
-      Key n_it = nephews_s.top() ;  nephews_s.pop() ;
-
-      if( !node_exists( n_it, kd ) )
-      {
-        // look down for nephews
-        fk = n_it << 3 ;
-        for( int i = 0 ; i < 8 ; ++i )
-          nephews_s.push( fk|i ) ;
-        continue ;
-      }
-      
-      geom_cell g_it = geom_key( n_it ) ;
-      nephews_keys.push( std::make_pair(n_it,g_it.lv()) ) ;
-      if( (*ref).need_refine( g_it ) )
-      {
-        keep_refined = true ;
-        break ;
-      }
-    }
-    
-    if( keep_refined ) continue ;
-    refined = true ;
-    
-    // delete cell, brothers, nephews
-    nephews_keys.push( std::make_pair(it.key(),it.lv()) ) ;
-    while( !nephews_keys.empty() )
-    {
-      _hash.erase( nephews_keys.top().first  ) ;
-      _level_dist[ nephews_keys.top().second ] -= 1 ;
-      nephews_keys.pop() ;
-    }
-    
-    // recurse on father
-    kd.key = father.key() ;
-    kd.data = 0.0 ;
-    _hash.insert( kd ) ;
-    _level_dist[ father.lv() ] += 1 ;
-    s.push( father ) ;
-  }
-
-  compute_opt_level() ;
-  return refined ;
-}
-//_____________________________________________________________________________
-
-
-
-
-
-//_____________________________________________________________________________
-// Draw the octree with wireframe
-bool LeafOctree::draw_wire()
-//-----------------------------------------------------------------------------
-{
-  for( leaf_iterator it = leaves_begin() ; it() ; ++it )
-    it.draw_wire() ;
-  
-  return true ;
-}
-//_____________________________________________________________________________
-
-
-
-
-
-//_____________________________________________________________________________
-// Draw the octree with dots
-bool LeafOctree::draw_centers()
-//-----------------------------------------------------------------------------
-{
-  for( leaf_iterator it = leaves_begin() ; it() ; ++it )
-  {
-    ::glTexCoord1f( (GLfloat)fabs(*it / max_field()) ) ;
-    it.top().draw() ;
-  }
-  
-  return true ;
-}
-//_____________________________________________________________________________
-
-
-
-//_____________________________________________________________________________
-// Compute primal vertices
-bool LeafOctree::compute_primal_verts()
-//-----------------------------------------------------------------------------
-{
-    
-  // add all the inner vertices
-  for( leaf_iterator l_it = leaves_begin() ; l_it() ; ++l_it )
-  {
-    Key verts_k[8] ;
-    Level lv = vertices_keys( l_it.key(), verts_k ) ;
-    
-    HashVerts::KeyData kd ;
-    kd.data = lv ;
-    Key *v_ptr = verts_k ;
-    for( int i = 0 ; i < 8 ; ++i, ++v_ptr )
-    {
-      kd.key = *v_ptr ;
-      if( kd.key == KEY_INV ) continue ;
-      
-      HashVerts::KeyData &hk = _verts[ kd.key ] ;
-      if( hk.key == KEY_INV )
-        _verts.insert( kd ) ;
-      else if( hk.data < kd.data )
-        hk.data = kd.data ;
-    }
-  }
-
-  return true ;
-}
-//_____________________________________________________________________________
-
-
-
-//_____________________________________________________________________________
-// Octree dual caller
-bool LeafOctree::dual_cubes_walk( leaf_dual_walker &walker )
-//-----------------------------------------------------------------------------
-{
-  bool result = compute_primal_verts() ;
-
-  for( HashVerts::const_iterator v_it = _verts.cbegin() ; v_it() ; ++v_it )
-  {
-    const Level lv = *v_it ;
-    Key dual_verts[8] ;
-    dual_vertices_keys( v_it.key(), lv, dual_verts ) ;
-    
-    Key *dv_ptr = dual_verts ;
-    for( int i = 0 ; i < 8 ; ++i, ++dv_ptr )
-    {
-      // find_at, only the level too high case
-      Key &ki = *dv_ptr ;
-      HashField::KeyData kd ;
-      while( ki != 0 && !node_exists(ki,kd) )
-        ki >>= 3;
-    }
-    result &= walker( *this, dual_verts ) ;
-  }
-  
-  return result ;
-}
-//_____________________________________________________________________________
-
-
-
-
-//_____________________________________________________________________________
-// Isosurface walker
-bool leaf_isosurface_walker( LeafOctree &fo, Key *keys )
-//-----------------------------------------------------------------------------
-{
-  MarchingCubes &mc = fo.mc() ;
-  
-  /** isovalues at the cube vertices */
-  real            *cube    = mc.cube() ;
-  /** geometry of the cube */
-  Point           *space   = mc.space() ;
-  /** indexes of the cube */
-  Key             *indexes = mc.indexes() ;
-  
-  for( int j = 0 ; j < 8 ; ++j )
-  {
-    int i = (j==2)?3:(j==3)?2:(j==7)?6:(j==6)?7:j ;
-    const Key k = keys[j] ;
-    LeafOctree::geom_cell c = fo.geom_key(k) ;
-    cube[i] = *c ;
-    
-    space[i] = (Point)c ;
-    indexes[i] = k ;
-  }
-  
-  mc.tesselate_cube( 0.0 ) ;
-  
-  return true ;
-}
-//_____________________________________________________________________________
-
-
-
-
-//_____________________________________________________________________________
-// Build the isosurface using dual marching cubes
-bool LeafOctree::build_isosurface( data_access *ref )
-//-----------------------------------------------------------------------------
-{
-  if( !ref ) return false ;
-  _mc.dat_access() = ref ;
-  _verts.reset() ;
-  
-  
-    printf( "Build isosurface... " ) ;
-  bool result = false ;
-  
-  //_________________________________________________________________________
-  // Dual Marching Cubes
-  
-  _mc.init_all() ; 
-  
-  result = dual_cubes_walk( leaf_isosurface_walker ) ;
-  
-  _mc.clean_temps() ;
-  
-  printf( "generated %d vertices and %d faces!\n", _mc.nverts(), _mc.ntrigs() ) ;
-  
-  return result ;
-}
-//_____________________________________________________________________________
-
-
-
-
-
-//_____________________________________________________________________________
-// Isosurface drawing walker
-bool leaf_direct_isosurface_walker( LeafOctree &fo, Key *keys )
-//-----------------------------------------------------------------------------
-{
-  MC_Draw &mc = fo.mc_draw() ;
-  
-  /** isovalues at the cube vertices */
-  real            *cube    = mc.cube() ;
-  /** geometry of the cube */
-  Point           *space   = mc.space() ;
-  
-  for( int j = 0 ; j < 8 ; ++j )
-  {
-    int i = (j==2)?3:(j==3)?2:(j==7)?6:(j==6)?7:j ;
-    const LeafOctree::geom_cell c = fo.geom_key( keys[j] ) ;
-    cube[i] = *c ;
-    
-    space[i] = (Point)c ;
-  }
-  
-  mc.tesselate_cube( 0.0 ) ;
-  
-  return true ;
-}
-//_____________________________________________________________________________
-
-
-
-//_____________________________________________________________________________
-// Build the isosurface using dual marching cubes
-bool LeafOctree::direct_draw_isosurface( data_access *ref )
-//-----------------------------------------------------------------------------
-{
-  if( !ref ) return false ;
-  _mc_draw.dat_access() = ref ;
-  _verts.reset() ;
-  
-  
-    bool result = false ;
-  
-  // Dual Marching Cubes
-  ::glBegin( GL_TRIANGLES ) ;
-  {
-    result = dual_cubes_walk( leaf_direct_isosurface_walker ) ;
-  }
-  ::glEnd() ; // GL_TRIANGLES
-  
-  return result ;
-}
-//_____________________________________________________________________________
-
-
-
-
-
-
-//_____________________________________________________________________________
-// Draw walker
-bool leaf_draw_walker( LeafOctree &fo, Key *keys )
-//-----------------------------------------------------------------------------
-{
-  Cube cells[8] ;
-  for( int i = 0 ; i < 8 ; ++i )
-    cells[i] = key2cube( keys[i] ) ;
-  
-  ((Point)cells[0]).draw() ;
-  ((Point)cells[1]).draw() ;
-  
-  ((Point)cells[1]).draw() ;
-  ((Point)cells[3]).draw() ;
-  
-  ((Point)cells[3]).draw() ;
-  ((Point)cells[2]).draw() ;
-  
-  ((Point)cells[2]).draw() ;
-  ((Point)cells[0]).draw() ;
-  
-  ((Point)cells[4]).draw() ;
-  ((Point)cells[5]).draw() ;
-  
-  ((Point)cells[5]).draw() ;
-  ((Point)cells[7]).draw() ;
-  
-  ((Point)cells[7]).draw() ;
-  ((Point)cells[6]).draw() ;
-  
-  ((Point)cells[6]).draw() ;
-  ((Point)cells[4]).draw() ;
-  
-  ((Point)cells[0]).draw() ;
-  ((Point)cells[4]).draw() ;
-  
-  ((Point)cells[1]).draw() ;
-  ((Point)cells[5]).draw() ;
-  
-  ((Point)cells[2]).draw() ;
-  ((Point)cells[6]).draw() ;
-  
-  ((Point)cells[3]).draw() ;
-  ((Point)cells[7]).draw() ;
-  
-  return true ;
-}
-//_____________________________________________________________________________
-
-
-
-
-//_____________________________________________________________________________
-// Draw the dual octree with wireframe
-bool LeafOctree::draw_dual()
-//-----------------------------------------------------------------------------
-{
-  _verts.reset() ;
-  
-  ::glBegin( GL_LINES ) ;
-  bool result = dual_cubes_walk( leaf_draw_walker ) ;
-  ::glEnd() ;  // GL_LINES
-  
-  return result ;
-}
-//_____________________________________________________________________________
-
-
-
-
-//_____________________________________________________________________________
-// Do nothing walker, just for dual generation timing
-bool leaf_timing_walker( LeafOctree &fo, Key *keys )
-//-----------------------------------------------------------------------------
-{
-  return true ;
-}
-//_____________________________________________________________________________
-
-
-//_____________________________________________________________________________
-// Do nothing, just for dual generation timing
-bool LeafOctree::dual_timing()
-//-----------------------------------------------------------------------------
-{
-  _verts.reset() ;
-  
-    return dual_cubes_walk( leaf_timing_walker ) ;
-}
-//_____________________________________________________________________________
-
-
-
-
-
-//_____________________________________________________________________________
-// Prints statistics about the octree
-void LeafOctree::stats() const
-//-----------------------------------------------------------------------------
-{
-  int s = _hash.size() ;
-  printf( " number of nodes:\t%d\n", s ) ;
-#if USE_HASH_PTR
-  printf( " total memory:\t%d\n", (int) ( s * sizeof(HashField::KeyBucket) ) ) ;
-  _hash.stats() ;
-#else  // USE_HASH_PTR 
-  printf( " total memory:\t%d\n", (int) ( s * sizeof(HashField::KeyData  ) ) ) ;
-#endif // USE_HASH_PTR
-  
-  printf( " leaves' levels:\t" ) ;
-  for( Level l = 0 ; l <= MAX_LEVEL; ++l )
-    printf( "\t%d", _level_dist[l] ) ;
-  printf( "\n" ) ;
-
-  s = _verts.size() ;
-  printf( " number of dual nodes:\t%d\n", s ) ;
-#if USE_HASH_PTR
-  printf( " total memory of dual:\t%d\n", (int) ( s * sizeof(HashVerts::KeyBucket) ) ) ;
-  _verts.stats() ;
-#else  // USE_HASH_PTR 
-  printf( " total memory of dual:\t%d\n", (int) ( s * sizeof(HashVerts::KeyData  ) ) ) ;
-#endif // USE_HASH_PTR
-}
-//_____________________________________________________________________________
-
-
-
-
-
-//_____________________________________________________________________________
-//_____________________________________________________________________________
-// search operations
-
-
-//_____________________________________________________________________________
-// Find cells of the octree at a given position
-bool LeafOctree::find_leaf( Key k, Level o_lv, geom_cell &n ) const
-//-----------------------------------------------------------------------------
-{
-    
-  Level   shift  = 3*(MAX_LEVEL-o_lv) ;
-  Key     k_up   = k >> shift ;
-
-  HashField::KeyData kd_up ;
-  if( node_exists(k_up,kd_up) )
-  {
-    n = geom_cell( kd_up ) ;
-    return true ;
-  }
-
-  Key k_dw = k_up ;
-  HashField::KeyData kd_dw ;
-  
-  bool b_up, b_dw ;
-  do
-  {
-    b_up = k_up != KEY_INV ;
-    b_dw = shift > 2 ;
-
-    if( b_up )
-    {
-      k_up >>= 3;
-      if( node_exists(k_up,kd_up) )
-      {
-        n = geom_cell( kd_up ) ;
-        return true ;
-      }
-    }
-    
-    if( b_dw )
-    {
-      shift -= 3 ;
-      k_dw = k >> shift ;
-      if( node_exists(k_dw,kd_dw) )
-      {
-        n = geom_cell( kd_dw ) ;
-        return true ;
-      }
-    }
-  }
-  while( b_up || b_dw ) ;
-
-  return false ;
-}
-//_____________________________________________________________________________
-
-
-
-//_____________________________________________________________________________
-// Find cells of the octree inside a given box of center x,y and half side r
-bool LeafOctree::find_radius( real x, real y, real z, real r, List<geom_cell> &cells ) const
-//-----------------------------------------------------------------------------
-{
-    
-  cells.clear() ;
-
-  Level lv_b = (Level)floor( log(r)/log(0.5) ) ;
-  Key   k_b  = cube2key( Cube(x,y,z,lv_b) ) ;
-
-  Key neighbors[27] ;
-  neighbor_keys( k_b, neighbors ) ;
-  neighbors[13] = k_b ;
-
-  Key *k_ptr = neighbors ;
-  for( int dir = 0 ; dir < 27 ; ++dir, ++k_ptr )
-  {
-    Key k = *k_ptr ;
-    if( k == KEY_INV ) continue ;
-
-    // look up (faster...)
-    Key k_up = k ;
-    bool found_up = false ;
-    HashField::KeyData kd ;
-    do
-    {
-      if( node_exists(k_up,kd) )
-      {
-        geom_cell gc(kd) ;
-        real sz = gc.sz() + r ;
-        
-        // test directly with the key?
-        if( fabs( x-gc.x() ) <= sz && fabs( y-gc.y() ) <= sz && fabs( z-gc.z() ) <= sz )
-          cells.insert_unique( gc ) ;
-        
-        found_up = true ;
-        break ;
-      }
-      k_up >>= 3 ;
-    } while( k_up != 0 ) ;
-
-    if( found_up ) continue ;
-    
-    // look down
-    std::stack<Key> s ;
-    Key k_dw = k << 3 ;
-    ++lv_b ;
-    for( int i = 0 ; i < 8 ; ++i )
-      // test directly with the key before insertion?
-      s.push( k_dw | i ) ;
-
-    while( !s.empty() )
-    {
-      k_dw = s.top() ;
-      s.pop() ;
-      if( node_exists(k_dw,kd) )
-      {
-        geom_cell gc(kd) ;
-        real sz = gc.sz() + r ;
-        
-        // test directly with the key?
-        if( fabs( x-gc.x() ) <= sz && fabs( y-gc.y() ) <= sz && fabs( z-gc.z() ) <= sz )
-          cells.insert( gc ) ;
-
-        continue ;
-      }
-      
-      if( ++lv_b > MAX_LEVEL ) break ;
-      k_dw <<= 3 ;
-      for( int i = 0 ; i < 8 ; ++i )
-        // test directly with the key before insertion?
-        s.push( k_dw | i ) ;
-    }
-  }
-  
-  return true ;
-}
-//_____________________________________________________________________________
-
-
-
-//_____________________________________________________________________________
-// Find neighbor cells of the octree to a given cell
-bool LeafOctree::adjacent( Key k, List<geom_cell> &cells ) const
-//-----------------------------------------------------------------------------
-{
-    
-  cells.clear() ;
-
-  Key neighbors[27] ;
-  neighbor_keys( k, neighbors ) ;
-  
-  Key *k_ptr = neighbors ;
-  for( int dir = 0 ; dir < 27 ; ++dir, ++k_ptr )
-  {
-    Key ki = *k_ptr ;
-    if( ki == KEY_INV ) continue ;
-    
-    HashField::KeyData kd ;
-    if( node_exists(ki,kd) )
-    {
-      cells.insert( geom_cell(kd) );
-      continue ;
-    }
-
-    // look up (faster)
-    do
-    {
-      ki >>= 3 ;
-      if( key_contains( ki,k ) ) ki = 0 ;
-    } while( ki !=0 && !node_exists(ki,kd) ) ;
-    
-    if( ki > 0 )
-    {
-      cells.insert_unique( geom_cell(kd) ) ;
-      continue ;
-    }
-
-    ki = *k_ptr ;
-    
-    std::stack<Key> subneighbors ;
-    subneighbor_keys(ki, dir, subneighbors ) ;
-    while( !subneighbors.empty() )
-    {
-      Key ski = subneighbors.top() ;
-      subneighbors.pop() ;
-      
-      if( node_exists(ski,kd) )
-        cells.insert( geom_cell(kd) );
-      else
-      {
-        if( key_level(ski) >= MAX_LEVEL ) break ;
-        subneighbor_keys(ski, dir, subneighbors ) ;        
-      }
-    }
-  }
-  
-  return true ;
-}
-//_____________________________________________________________________________
-
-
-
-//_____________________________________________________________________________
-//_____________________________________________________________________________
-// I/O
-
-//_____________________________________________________________________________
-// Draws the intersecting cells of a plane with the octree with color
-void LeafOctree::draw_plane ( real nx, real ny, real nz, real d )
-//-----------------------------------------------------------------------------
-{
-  // retrieve the index of the most positive cube corner
-  bool fx = nx >= 0 ;
-  bool fy = ny >= 0 ;
-  bool fz = nz >= 0 ;
-  
-  real px,py,pz, mx,my,mz ;
-
-  ::glLineWidth( 1.0f ) ;
-  ::glDisable( GL_LIGHTING ) ;
-  ::glBegin( GL_LINES ) ;
-  {
-    for( leaf_iterator it = leaves_begin() ; it() ; ++it )
-    {
-      geom_cell n = it.top() ;
-      real sz_ = n.sz() ;
-      
-      // get the coordinates of the extremum vertices
-      if( fx ) { px = n.cx() + sz_ ;  mx = n.cx() - sz_ ; }
-      else     { px = n.cx() - sz_ ;  mx = n.cx() + sz_ ; }
-      if( fy ) { py = n.cy() + sz_ ;  my = n.cy() - sz_ ; }
-      else     { py = n.cy() - sz_ ;  my = n.cy() + sz_ ; }
-      if( fz ) { pz = n.cz() + sz_ ;  mz = n.cz() - sz_ ; }
-      else     { pz = n.cz() - sz_ ;  mz = n.cz() + sz_ ; }
-      
-      // plane/cube intersection test
-      if( (nx * px + ny * py + nz * pz + d >= 0.0) && (nx * mx + ny * my + nz * mz + d <= 0.0)  )
-      {
-        ::glTexCoord1f( (GLfloat)fabs(*n/max_field()) ) ;
-        n.draw_wire() ;
-      }
-    }
-  }
-  ::glEnd() ;  // GL_LINES		
-}
-//_____________________________________________________________________________
-
-
-
-
-
-//_____________________________________________________________________________
-// Draws the intersection of a plane with the octree with color
-void LeafOctree::draw_slice ( real nx, real ny, real nz, real d, float alpha )
-//-----------------------------------------------------------------------------
-{
-  // retrieve the index of the most positive cube corner
-  bool fx = nx >= 0 ;
-  bool fy = ny >= 0 ;
-  bool fz = nz >= 0 ;
-  
-  real px,py,pz, mx,my,mz ;
-  
-  ::glDisable( GL_LIGHTING ) ;
-  for( leaf_iterator it = leaves_begin() ; it() ; ++it )
-  {
-    geom_cell n = it.top() ;
-    real sz_ = n.sz() ;
-    
-    // get the coordinates of the extremum vertices
-    if( fx ) { px = n.cx() + sz_ ;  mx = n.cx() - sz_ ; }
-    else     { px = n.cx() - sz_ ;  mx = n.cx() + sz_ ; }
-    if( fy ) { py = n.cy() + sz_ ;  my = n.cy() - sz_ ; }
-    else     { py = n.cy() - sz_ ;  my = n.cy() + sz_ ; }
-    if( fz ) { pz = n.cz() + sz_ ;  mz = n.cz() - sz_ ; }
-    else     { pz = n.cz() - sz_ ;  mz = n.cz() + sz_ ; }
-    
-
-    // plane/cube intersection test
-    if( (nx * px + ny * py + nz * pz + d >= 0.0) && (nx * mx + ny * my + nz * mz + d <= 0.0)  )
-    {
-      // retrieves the signs of each cube corner
-      real val[8] ;
-      real v   = nx * n.cx() + ny * n.cy() + nz * n.cz() + d ;
-      int zeros = 0 ;
-      for( int i = 0 ; i < 8 ; ++i )
-      {
-        val[i] = v + nx * ((i&1)?sz_:-sz_) + ny * ((i&2)?sz_:-sz_) + nz * ((i&4)?sz_:-sz_) ;
-        if( fabs(val[i]) < R_EPSILON ) { val[i] = R_EPSILON ;  ++zeros ; }
-      }
-      
-      //_________________________________________________________________________
-      // degenerated intersection
-      if( zeros > 0 )
-      {
-        int npos = 0, nneg = 0 ;
-        for( int i = 0 ; i < 8 ; ++i )
-        {
-          if( fabs(val[i]) < R_EPSILON ) continue ;
-          if( val[i] < 0 )
-            ++nneg ;
-          else
-            ++npos ;
-        }
-        float def = (nneg>npos) ? (float)R_EPSILON : -(float)R_EPSILON ;
-        
-        for( int i = 0 ; i < 8 ; ++i )
-        {
-          if( fabs(val[i]) < R_EPSILON ) val[i] = def ;
-        }
-        //        continue ;
-      }
-      
-      //_________________________________________________________________________
-      // Continuation method
-      int v0=-1, v1=-1 ;  // current edge vertices
-      
-      // get the first intersection
-      static int edges[12][2] = { {0,1}, {0,2}, {0,4}, {1,3}, {1,5}, {2,3}, {2,6}, {3,7}, {4,5}, {4,6}, {5,7}, {6,7} } ;
-      for( int e = 0 ; e < 12 ; ++e )
-      {
-        if( val[ edges[e][0] ] * val[ edges[e][1] ] < 0 )
-        {
-          v0 = edges[e][0] ;
-          v1 = edges[e][1] ;
-          break ;
-        }
-      }
-      int  ov0 = v0, ov1 = v1 ;
-      
-      
-      // equation of previous face adjacent to v0v1: v>>c & 1 == s (c-th coordinate equal to +/- 1)
-      int pf = -1 ;  bool ps ;
-      if       ( (v0 & 1) == (v1 & 1) )   { pf = 0 ; ps = ((v0 & 1) /*>> 0*/) == 1 ; }
-      else   if( (v0 & 2) == (v1 & 2) )   { pf = 1 ; ps = ((v0 & 2)   >> 1  ) == 1 ; }
-      else /*if( (v0 & 4) == (v1 & 4) )*/ { pf = 2 ; ps = ((v0 & 4)   >> 2  ) == 1 ; }
-      
-      //      printf( "cube %d %d %d %d %d %d %d %d, march : (%d,%d) ", val[0]>0, val[1]>0, val[2]>0, val[3]>0, val[4]>0, val[5]>0, val[6]>0, val[7]>0, v0, v1 ) ;
-      
-      //_________________________________________________________________________
-      // marching
-      
-      GLfloat color = (GLfloat)fabs(*n / max_field()) ;
-		  //cmap.gl_color( at(*n) ) ;	
-      ::glBegin( GL_POLYGON ) ;
-      {
-        do
-        {
-          // equation of next face adjacent to v0v1
-          int nf = -1 ;  bool ns ;
-          if       ( pf != 0 && ((v0 & 1) == (v1 & 1)) )   { nf = 0 ; ns = ((v0 & 1) /*>> 0*/) == 1 ; }
-          else   if( pf != 1 && ((v0 & 2) == (v1 & 2)) )   { nf = 1 ; ns = ((v0 & 2)   >> 1  ) == 1 ; }
-          else /*if( pf != 2 && ((v0 & 4) == (v1 & 4)) )*/ { nf = 2 ; ns = ((v0 & 4)   >> 2  ) == 1 ; }
-          
-          /* equivalent construction
-           // get the direction perpendicular to v0v1
-           int of = (v0 ^ v1) & 7 ; // only bit of difference
-           of = of==1 ? 0 : (of==2 ? 1 : 2) ;
-           
-           // compute the equation of the next face adjacent to v0v1
-           int  nf = 3 - (pf+of) ;    // third option: {pf,nf,of}={0,1,2}
-           bool ns = (v0 >> nf) & 1 ; // value of the edge on that direction
-           */
-          
-          // compute the two next vertices (invert the pf-th bit
-          int v2 = ps ? ( v0 & (~(1<<pf)) ) : ( v0 | (1<<pf) ) ;
-          int v3 = ps ? ( v1 & (~(1<<pf)) ) : ( v1 | (1<<pf) ) ;
-          
-          // get the characteristic of the square
-          int  c = (val[v3] > 0) | ((val[v2] > 0) << 1) | ((val[v1] > 0) << 2) | ((val[v0] > 0) << 3) ;
-          if( c > 7 ) c = (~c)&7 ; // consider v0 as negative, and thus v1 as positive
-          /*
-           if( c < 4 )
-           { // degenerated intesection
-           printf( "degenerated intersection %d!\n", c ) ;
-           }
-           */
-          
-          //_______________________________________________________________________
-          // method of continuity on the cube surface
-          switch( c )
-          {
-            case  4 : v0 = v3 ;  break ;
-            case  5 : v0 = v2 ;  v1 = v3 ;  break ;
-            case  6 : /* impossible case */ break ;
-            case  7 : v1 = v2 ;  break ;
-          }
-          
-          
-          
-          
-          real cx =  n.cx();
-          real cy =  n.cy(); 
-          real cz =  n.cz();
-          real sz =  sz_;   
-          real a0 = val[v0];  
-          int i0 = v0; 
-          real a1 = val[v1];  
-          int i1  = v1;
-          
-          real w0 = a1 / (a1-a0) ;
-          real w1 = a0 / (a0-a1) ;
-          
-          real x = cx + w0 * ((i0&1)?sz:-sz) + w1 * ((i1&1)?sz:-sz);
-          real y = cy + w0 * ((i0&2)?sz:-sz) + w1 * ((i1&2)?sz:-sz);
-          real z = cz + w0 * ((i0&4)?sz:-sz) + w1 * ((i1&4)?sz:-sz);
-          
-          ::glTexCoord1d( color ) ;
-          ::glVertex3d(x, y, z) ;
-          
-          // next face
-          pf = nf ;  ps = ns ;
-          
-          //          printf( "(%d,%d) ", v0, v1 ) ;
-        } while( v0 != ov0 || v1 != ov1 ) ;
-        //        printf( "\n" ) ;
-      }
-      ::glEnd() ; // GL_POLYGON
-      
-    }
-  }
-}
-//_____________________________________________________________________________
-
-
-#endif // HASH_HAS_ERASE
diff --git a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/leaf_octree.h b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/leaf_octree.h
deleted file mode 100644
index a427ee32c6..0000000000
--- a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/leaf_octree.h
+++ /dev/null
@@ -1,332 +0,0 @@
-/**
- * \file    leaf_octree.h
- * \author  Thomas Lewiner   <tomlew@puc-rio.br>
- * \author  Matmidia Lab, Math Dept, PUC-Rio
- * \date    10/01/2010
- *
- *  Octree structure without intermediate nodes, hashtable and optimized operations
- */
-//_____________________________________________________________________________
-
-
-#pragma once
-
-#ifndef WIN32
-#pragma interface
-#endif // WIN32
-
-
-#include "mlist.h"
-#include "cube.h"
-#include "hash.h"
-#include "MarchingCubes.h"
-#include "mc_draw.h"
-#include "data_access.h"
-
-
-#ifdef HASH_HAS_ERASE
-
-
-//_____________________________________________________________________________
-// LeafOctree
-/// \class LeafOctree LeafOctree.h
-class LeafOctree
-//-----------------------------------------------------------------------------
-{
-// forward declaration
-public:
-  class geom_cell  ;
-  class leaf_iterator  ;
-
-// Elements
-protected:
-  /// Octree cell data structure
-  typedef Hash<real>  HashField ;
-
-  /// Hashtable of the octree nodes
-  HashField _hash ;
-  
-  /// Level distribution of the octree
-  uint _level_dist[MAX_LEVEL+1] ;
-  
-  /// Optimal level for direct search in the octree
-  Level _opt_level ;
-  
-  /// Maximal field of the octree
-  real _max_field ;
-  
-  /// Isosurface
-  MarchingCubes _mc ;
-  
-  /// Isosurface Draw
-  MC_Draw _mc_draw ;
-  
-private:
-  /// Octree vertices data structure
-  typedef Hash<Level> HashVerts ;
-  /// Hashtable of the octree vertices
-  HashVerts _verts ;
-  
-  
-//-----------------------------------------------------------------------------
-// Constructors
-public:
-  /// Default constructor: Constructs a octree with and empty root
-  LeafOctree() { init() ; }
-
-  /// Destructor: Free memory
-  ~LeafOctree() { clear() ; }
-
-
-  /// Create the root
-  void init() ;
-
-  /// Memory cleaning
-  void clear() { clear_octree() ;  _mc.clean_all() ; }
-
-  /// Delete the content of the octree
-  void clear_octree() ;
-  
-  /// Compute the optimal level
-  void compute_opt_level() ;
-  
-  /// Check that only the leaves have data
-  bool check () ;
-
-  /// Prints statistics about the octree
-  void stats() const ;
-    
-
-  /// Return the maximal level of the octree
-  Level  max_level() const { Level lv = MAX_LEVEL ; while( lv > 0 && !_level_dist[lv] ) --lv ; return lv ; }
-  
-  /// Return the optimal level of the octree
-  Level  opt_level() const { return _opt_level ; }
-  
-  /// Return the optimal level of the octree
-  Level &opt_level()  { return _opt_level ; }
-  
-  /// Return the maximal field of the octree
-  real max_field() const { return _max_field ; }
-   
-  /// Return the isosurface
-  MarchingCubes &mc() { return _mc ; }
-
-  /// Return the isosurface draw
-  MC_Draw &mc_draw() { return _mc_draw ; }
-  
-  /// set the values of each leaf from the implicit function
-  bool set_impl( data_access *ref = NULL ) ;
-  
-  /// Refine the octree according to the data access
-  bool refine( data_access *ref = NULL ) ;
-
-  /// Adapt the octree according to the data access
-  bool adapt( data_access *ref = NULL ) ;
-  
-  /// Draw the octree with wireframe
-  bool draw_wire() ;
-  
-  /// Draw the octree with dots
-  bool draw_centers() ;
-  
-  /// Dual function type
-  typedef bool leaf_dual_walker( LeafOctree &fo, Key *keys ) ;
-
-  /// Compute primal vertices
-  bool compute_primal_verts() ;
-  
-  /// Walk on the dual cubes
-  bool dual_cubes_walk( leaf_dual_walker &walker ) ;
-
-  /// Build the isosurface using dual marching cubes
-  bool build_isosurface( data_access *ref = NULL ) ;
-  
-  /// Draw the isosurface on-the-fly using dual marching cubes
-  bool direct_draw_isosurface( data_access *ref = NULL ) ;
-  
-  /// Draw the dual octree with wireframe
-  bool draw_dual() ;
-  
-  /// Do nothing, just for dual generation timing
-  bool dual_timing() ;
-  
-//-----------------------------------------------------------------------------
-// iterators
-public:
-  /// Create an iterator traversing the leaves of the tree from the root
-  inline leaf_iterator leaves_begin() { return leaf_iterator( *this ) ; }
-
-//-----------------------------------------------------------------------------
-// search operations
-public:
-  /// Find cells of the octree at a given position
-  bool find_leaf( Key k, Level o_lv, geom_cell &cell ) const ;
-  bool find_leaf( Key k, geom_cell &cell ) const { return find_leaf( k, opt_level(), cell ) ; }
-  bool find_leaf( real x, real y, real z, geom_cell &cell ) const { return find_leaf( cube2key( Cube(x,y,z,MAX_LEVEL) ), opt_level(), cell ) ; }
-
-  /// Find cells of the octree inside a given box of center x,y,z and half side r
-  bool find_radius( real x, real y, real z, real r, List<geom_cell> &cells ) const ;
-
-  /// Find adjacent cells of the octree to a given cell
-  bool adjacent( Key k, List<geom_cell> &cells ) const ;
-  bool adjacent( const geom_cell &cell, List<geom_cell> &cells ) const { return adjacent( cell.key(), cells ) ; }
-
-  /// Node existence
-  bool node_exists( Key k, HashField::KeyData &kd ) const { kd = _hash[k] ;  return kd.key != KEY_INV ; }
-  
-  //-----------------------------------------------------------------------------
-// I/O
-public:
-
-  /// Draws the intersecting cells of a plane with the octree with color
-  void draw_plane ( real nx, real ny, real nz, real d	  ) ;
-
-  /// Draws the intersection of a plane with the octree with color
-  void draw_slice ( real nx, real ny, real nz, real d, float alpha ) ;
-
-  /// Draws the isosurface of level l inside the dual graph
-  void draw_iso   () { _mc.draw_surf() ; }
-
-//_____________________________________________________________________________
-// Iterator Cell
-public :
-  /// Auxiliary structure to traverse the octree
-  class geom_cell : public Cube
-  //---------------------------------------------------------------------------
-  {
-    friend class LeafOctree ;
-
-  protected:
-    Key   _key   ;  ///< octree cell
-    real  _field ;  ///< field associated to the cell
-
-  //---------------------------------------------------------------------------
-  // Constructors
-  public:
-    /// Default constructor
-    geom_cell( Key key_ = KEY_INV, real field_ = R_INV ) : Cube(key2cube(key_)), _key(key_), _field(field_) {}
-
-    /// Default constructor
-    geom_cell( HashField::KeyData kd ) : Cube(key2cube(kd.key)), _key(kd.key), _field(kd.data) {}
-
-    /// Destructor
-    ~geom_cell() {}
-
-    /// Copy constructor
-    geom_cell( const geom_cell &i ) : Cube(i), _key(i._key), _field(i._field) {}
-
-    /// Assignment operator
-    geom_cell &operator = ( const geom_cell &i )
-    {  Cube::operator=(i) ;  _key = i._key ;  _field = i._field ;  return *this; }
-    
-
-  //---------------------------------------------------------------------------
-  // Public constant accessors
-  public  :
-    /// key const accessor
-    inline Key  key() const { return _key ; }
-    /// key accessor
-    inline Key &key() { return _key ; }
-
-    /// id const accessor
-    inline real  operator*() const { return _field ; }
-    
-    //---------------------------------------------------------------------------
-  // Tests
-  public :
-    /// equality operator
-    inline bool operator ==( const geom_cell &i ) const { return key() == i.key() ; }
-
-    /// inequality operator
-    inline bool operator !=( const geom_cell &i ) const { return key() != i.key() ; }
-
-    /// validation operator
-    inline bool      operator ()() const { return key() != KEY_INV ; }
-  };
-
-  const geom_cell geom_root() const { const Key root_key = 1 ; return geom_cell( root_key, _hash[root_key].data ) ; }
-  const geom_cell geom_key ( Key k ) const { return geom_cell( k, _hash[k].data ) ; }
-
-
-
-//_____________________________________________________________________________
-// Cell Iterator
-public :
-  /// Octree cell iterator : Traverse the octree returning basic information on the cells
-  class leaf_iterator
-  //---------------------------------------------------------------------------
-  {
-    friend class LeafOctree ;
-
-  protected:
-    /// Octree traversal iterator
-    HashField::iterator _it ;
-
-  //---------------------------------------------------------------------------
-  // Constructors
-  public:
-    /// Default constructor : Constructs an iterator from a cell
-    leaf_iterator( LeafOctree &o ) : _it( o._hash.begin() ) {}
-
-    /// Destructor
-    ~leaf_iterator() {}
-
-    /// Copy constructor
-    leaf_iterator( const leaf_iterator &i ) : _it(i._it) {}
-
-    /// Assignment operator
-    leaf_iterator &operator = ( const leaf_iterator &i )
-    { _it = i._it; return *this; }
-
-  //---------------------------------------------------------------------------
-  // Operations
-  public  :
-    /// equality operator
-    inline bool operator ==( const leaf_iterator &i ) const { return _it == i._it ; }
-
-    /// inequality operator
-    inline bool operator !=( const leaf_iterator &i ) const { return _it != i._it ; }
-
-    /// validation operator
-    inline bool      operator ()() const { return _it() ; }
-
-    /// next position
-    inline leaf_iterator &operator ++() { ++_it ; return *this ; }
-
-  //---------------------------------------------------------------------------
-  // Accessors
-  public  :
-    // cell accessor
-    inline geom_cell top() const { return geom_cell( key(), *_it ) ; }
-
-    /// id accessor
-    inline real &operator*() { return *_it ; }
-
-    /// level accessor
-    inline Level lv() { return key_level(_it.key()) ; }
-
-    /// size accessor
-    inline real  sz() { return Cube(0,0,0,lv()).sz() ; }
-    
-    /// key accessor
-    inline Key   key() const { return _it.key() ; }
-    
-    /// points accessor
-    inline bool is_leaf() const { return !is_inv(*_it) ; }
-
-    /// Draws the cell wire with opengl
-    void draw_wire  () const { top().draw_wire  () ; }
-
-  };
-} ;
-//_____________________________________________________________________________
-
-
-#else  // HASH_HAS_ERASE
-
-#include "opt_octree.h"
-typedef OptOctree LeafOctree ;
-
-#endif // HASH_HAS_ERASE
-
diff --git a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/mc_draw.cpp b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/mc_draw.cpp
deleted file mode 100644
index a1a76351cf..0000000000
--- a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/mc_draw.cpp
+++ /dev/null
@@ -1,695 +0,0 @@
-/**
- * @file    md_draw.cpp
- * @author  Thomas Lewiner <thomas.lewiner@polytechnique.org>
- * @author  Math Dept, PUC-Rio
- * @version 0.2
- * @date    12/08/2002
- *
- * @brief   MC_Draw Direct Draw Algorithm
- */
-//________________________________________________
-
-
-#if !defined(WIN32) || defined(__CYGWIN__)
-#pragma implementation
-#endif // WIN32
-
-#include <math.h>
-#include <time.h>
-#include <memory.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <float.h>
-#include "mc_draw.h"
-#include "LookUpTable.h"
-
-
-//_____________________________________________________________________________
-// print cube for debug
-void MC_Draw::print_cube() { printf( "\t%f %f %f %f %f %f %f %f\n", _cube[0], _cube[1], _cube[2], _cube[3], _cube[4], _cube[5], _cube[6], _cube[7]) ; }
-//_____________________________________________________________________________
-
-
-
-//_____________________________________________________________________________
-// main algorithm
-bool MC_Draw::tesselate_cube( real iso )
-//-----------------------------------------------------------------------------
-{
-  for( int p = 0 ; p < 8 ; ++p )
-  {
-    real &v = _cube[p] ;
-    v -= iso ;
-    if( fabs( v ) < R_EPSILON ) v = R_EPSILON ;
-  }
-  
-  if( !compute_intersection_points() ) return false ;
-
-  _lut_entry = 0 ;
-  for( int p = 0 ; p < 8 ; ++p )
-  {
-    if( _cube[p] > 0 ) _lut_entry += 1 << p ;
-  }
-
-  return process_cube( ) ;
-}
-//_____________________________________________________________________________
-
-
-
-//_____________________________________________________________________________
-//_____________________________________________________________________________
-
-
-//_____________________________________________________________________________
-// Compute the intersection points
-bool MC_Draw::compute_intersection_points()
-//-----------------------------------------------------------------------------
-{
-  bool res = false ;
-  res |= add_vertex( 0,1 ) ;
-  res |= add_vertex( 1,2 ) ;
-  res |= add_vertex( 2,3 ) ;
-  res |= add_vertex( 3,0 ) ;
-
-  res |= add_vertex( 4,5 ) ;
-  res |= add_vertex( 5,6 ) ;
-  res |= add_vertex( 6,7 ) ;
-  res |= add_vertex( 7,4 ) ;
-
-  res |= add_vertex( 0,4 ) ;
-  res |= add_vertex( 1,5 ) ;
-  res |= add_vertex( 2,6 ) ;
-  res |= add_vertex( 3,7 ) ;
-  
-  return res ;
-}
-//_____________________________________________________________________________
-
-
-
-
-
-//_____________________________________________________________________________
-// Test a face
-// if face>0 return true if the face contains a part of the surface
-bool MC_Draw::test_face( schar face )
-//-----------------------------------------------------------------------------
-{
-  real A,B,C,D ;
-
-  switch( face )
-  {
-  case -1 : case 1 :  A = _cube[0] ;  B = _cube[4] ;  C = _cube[5] ;  D = _cube[1] ;  break ;
-  case -2 : case 2 :  A = _cube[1] ;  B = _cube[5] ;  C = _cube[6] ;  D = _cube[2] ;  break ;
-  case -3 : case 3 :  A = _cube[2] ;  B = _cube[6] ;  C = _cube[7] ;  D = _cube[3] ;  break ;
-  case -4 : case 4 :  A = _cube[3] ;  B = _cube[7] ;  C = _cube[4] ;  D = _cube[0] ;  break ;
-  case -5 : case 5 :  A = _cube[0] ;  B = _cube[3] ;  C = _cube[2] ;  D = _cube[1] ;  break ;
-  case -6 : case 6 :  A = _cube[4] ;  B = _cube[7] ;  C = _cube[6] ;  D = _cube[5] ;  break ;
-  default : printf( "Invalid face code %d\n", face ) ;  print_cube() ;  A = B = C = D = 0 ;
-  };
-
-  if( fabs( A*C - B*D ) < R_EPSILON )
-    return face >= 0 ;
-  return face * A * ( A*C - B*D ) >= 0  ;  // face and A invert signs
-}
-//_____________________________________________________________________________
-
-
-
-
-
-//_____________________________________________________________________________
-// Test the interior of a cube
-// if s == 7, return true  if the interior is empty
-// if s ==-7, return false if the interior is empty
-bool MC_Draw::test_interior( schar s )
-//-----------------------------------------------------------------------------
-{
-  real t, At=0, Bt=0, Ct=0, Dt=0, a, b ;
-  char  test =  0 ;
-  char  edge = -1 ; // reference edge of the triangulation
-
-  switch( _case )
-  {
-  case  4 :
-  case 10 :
-    a = ( _cube[4] - _cube[0] ) * ( _cube[6] - _cube[2] ) - ( _cube[7] - _cube[3] ) * ( _cube[5] - _cube[1] ) ;
-    b =  _cube[2] * ( _cube[4] - _cube[0] ) + _cube[0] * ( _cube[6] - _cube[2] )
-             - _cube[1] * ( _cube[7] - _cube[3] ) - _cube[3] * ( _cube[5] - _cube[1] ) ;
-    t = - b / (2*a) ;
-    if( t<0 || t>1 ) return s>0 ;
-
-    At = _cube[0] + ( _cube[4] - _cube[0] ) * t ;
-    Bt = _cube[3] + ( _cube[7] - _cube[3] ) * t ;
-    Ct = _cube[2] + ( _cube[6] - _cube[2] ) * t ;
-    Dt = _cube[1] + ( _cube[5] - _cube[1] ) * t ;
-    break ;
-
-  case  6 :
-  case  7 :
-  case 12 :
-  case 13 :
-    switch( _case )
-    {
-    case  6 : edge = test6 [_config][2] ; break ;
-    case  7 : edge = test7 [_config][4] ; break ;
-    case 12 : edge = test12[_config][3] ; break ;
-    case 13 : edge = tiling13_5_1[_config][_subconfig][0] ; break ;
-    }
-    switch( edge )
-    {
-    case  0 :
-      t  = _cube[0] / ( _cube[0] - _cube[1] ) ;
-      At = 0 ;
-      Bt = _cube[3] + ( _cube[2] - _cube[3] ) * t ;
-      Ct = _cube[7] + ( _cube[6] - _cube[7] ) * t ;
-      Dt = _cube[4] + ( _cube[5] - _cube[4] ) * t ;
-      break ;
-    case  1 :
-      t  = _cube[1] / ( _cube[1] - _cube[2] ) ;
-      At = 0 ;
-      Bt = _cube[0] + ( _cube[3] - _cube[0] ) * t ;
-      Ct = _cube[4] + ( _cube[7] - _cube[4] ) * t ;
-      Dt = _cube[5] + ( _cube[6] - _cube[5] ) * t ;
-      break ;
-    case  2 :
-      t  = _cube[2] / ( _cube[2] - _cube[3] ) ;
-      At = 0 ;
-      Bt = _cube[1] + ( _cube[0] - _cube[1] ) * t ;
-      Ct = _cube[5] + ( _cube[4] - _cube[5] ) * t ;
-      Dt = _cube[6] + ( _cube[7] - _cube[6] ) * t ;
-      break ;
-    case  3 :
-      t  = _cube[3] / ( _cube[3] - _cube[0] ) ;
-      At = 0 ;
-      Bt = _cube[2] + ( _cube[1] - _cube[2] ) * t ;
-      Ct = _cube[6] + ( _cube[5] - _cube[6] ) * t ;
-      Dt = _cube[7] + ( _cube[4] - _cube[7] ) * t ;
-      break ;
-    case  4 :
-      t  = _cube[4] / ( _cube[4] - _cube[5] ) ;
-      At = 0 ;
-      Bt = _cube[7] + ( _cube[6] - _cube[7] ) * t ;
-      Ct = _cube[3] + ( _cube[2] - _cube[3] ) * t ;
-      Dt = _cube[0] + ( _cube[1] - _cube[0] ) * t ;
-      break ;
-    case  5 :
-      t  = _cube[5] / ( _cube[5] - _cube[6] ) ;
-      At = 0 ;
-      Bt = _cube[4] + ( _cube[7] - _cube[4] ) * t ;
-      Ct = _cube[0] + ( _cube[3] - _cube[0] ) * t ;
-      Dt = _cube[1] + ( _cube[2] - _cube[1] ) * t ;
-      break ;
-    case  6 :
-      t  = _cube[6] / ( _cube[6] - _cube[7] ) ;
-      At = 0 ;
-      Bt = _cube[5] + ( _cube[4] - _cube[5] ) * t ;
-      Ct = _cube[1] + ( _cube[0] - _cube[1] ) * t ;
-      Dt = _cube[2] + ( _cube[3] - _cube[2] ) * t ;
-      break ;
-    case  7 :
-      t  = _cube[7] / ( _cube[7] - _cube[4] ) ;
-      At = 0 ;
-      Bt = _cube[6] + ( _cube[5] - _cube[6] ) * t ;
-      Ct = _cube[2] + ( _cube[1] - _cube[2] ) * t ;
-      Dt = _cube[3] + ( _cube[0] - _cube[3] ) * t ;
-      break ;
-    case  8 :
-      t  = _cube[0] / ( _cube[0] - _cube[4] ) ;
-      At = 0 ;
-      Bt = _cube[3] + ( _cube[7] - _cube[3] ) * t ;
-      Ct = _cube[2] + ( _cube[6] - _cube[2] ) * t ;
-      Dt = _cube[1] + ( _cube[5] - _cube[1] ) * t ;
-      break ;
-    case  9 :
-      t  = _cube[1] / ( _cube[1] - _cube[5] ) ;
-      At = 0 ;
-      Bt = _cube[0] + ( _cube[4] - _cube[0] ) * t ;
-      Ct = _cube[3] + ( _cube[7] - _cube[3] ) * t ;
-      Dt = _cube[2] + ( _cube[6] - _cube[2] ) * t ;
-      break ;
-    case 10 :
-      t  = _cube[2] / ( _cube[2] - _cube[6] ) ;
-      At = 0 ;
-      Bt = _cube[1] + ( _cube[5] - _cube[1] ) * t ;
-      Ct = _cube[0] + ( _cube[4] - _cube[0] ) * t ;
-      Dt = _cube[3] + ( _cube[7] - _cube[3] ) * t ;
-      break ;
-    case 11 :
-      t  = _cube[3] / ( _cube[3] - _cube[7] ) ;
-      At = 0 ;
-      Bt = _cube[2] + ( _cube[6] - _cube[2] ) * t ;
-      Ct = _cube[1] + ( _cube[5] - _cube[1] ) * t ;
-      Dt = _cube[0] + ( _cube[4] - _cube[0] ) * t ;
-      break ;
-    default : printf( "Invalid edge %d\n", edge ) ;  print_cube() ;  break ;
-    }
-    break ;
-
-  default : printf( "Invalid ambiguous case %d\n", _case ) ;  print_cube() ;  break ;
-  }
-
-  if( At >= 0 ) test ++ ;
-  if( Bt >= 0 ) test += 2 ;
-  if( Ct >= 0 ) test += 4 ;
-  if( Dt >= 0 ) test += 8 ;
-  switch( test )
-  {
-  case  0 : return s>0 ;
-  case  1 : return s>0 ;
-  case  2 : return s>0 ;
-  case  3 : return s>0 ;
-  case  4 : return s>0 ;
-  case  5 : if( At * Ct - Bt * Dt <  R_EPSILON ) return s>0 ; break ;
-  case  6 : return s>0 ;
-  case  7 : return s<0 ;
-  case  8 : return s>0 ;
-  case  9 : return s>0 ;
-  case 10 : if( At * Ct - Bt * Dt >= R_EPSILON ) return s>0 ; break ;
-  case 11 : return s<0 ;
-  case 12 : return s>0 ;
-  case 13 : return s<0 ;
-  case 14 : return s<0 ;
-  case 15 : return s<0 ;
-  }
-
-  return s<0 ;
-}
-//_____________________________________________________________________________
-
-
-
-
-//_____________________________________________________________________________
-// Process a unit cube
-bool MC_Draw::process_cube( )
-//-----------------------------------------------------------------------------
-{
-  if( _originalMC )
-  {
-    char nt = 0 ;
-    while( casesClassic[_lut_entry][3*nt] != -1 ) nt++ ;
-    draw_triangle( casesClassic[_lut_entry], nt ) ;
-    return true ;
-  }
-
-  int   v12 = -1 ;
-  _case   = cases[_lut_entry][0] ;
-  _config = cases[_lut_entry][1] ;
-  _subconfig = 0 ;
-
-  switch( _case )
-  {
-  case  0 :
-    break ;
-
-  case  1 :
-    draw_triangle( tiling1[_config], 1 ) ;
-    break ;
-
-  case  2 :
-    draw_triangle( tiling2[_config], 2 ) ;
-    break ;
-
-  case  3 :
-    if( test_face( test3[_config]) )
-      draw_triangle( tiling3_2[_config], 4 ) ; // 3.2
-    else
-      draw_triangle( tiling3_1[_config], 2 ) ; // 3.1
-    break ;
-
-  case  4 :
-    if( test_interior( test4[_config]) )
-      draw_triangle( tiling4_1[_config], 2 ) ; // 4.1.1
-    else
-      draw_triangle( tiling4_2[_config], 6 ) ; // 4.1.2
-    break ;
-
-  case  5 :
-    draw_triangle( tiling5[_config], 3 ) ;
-    break ;
-
-  case  6 :
-    if( test_face( test6[_config][0]) )
-      draw_triangle( tiling6_2[_config], 5 ) ; // 6.2
-    else
-    {
-      if( test_interior( test6[_config][1]) )
-        draw_triangle( tiling6_1_1[_config], 3 ) ; // 6.1.1
-      else
-	  {
-        comp_c_vertex() ;
-        draw_triangle( tiling6_1_2[_config], 9 , v12) ; // 6.1.2
-      }
-    }
-    break ;
-
-  case  7 :
-    if( test_face( test7[_config][0] ) ) _subconfig +=  1 ;
-    if( test_face( test7[_config][1] ) ) _subconfig +=  2 ;
-    if( test_face( test7[_config][2] ) ) _subconfig +=  4 ;
-    switch( _subconfig )
-      {
-      case 0 :
-        draw_triangle( tiling7_1[_config], 3 ) ; break ;
-      case 1 :
-        draw_triangle( tiling7_2[_config][0], 5 ) ; break ;
-      case 2 :
-        draw_triangle( tiling7_2[_config][1], 5 ) ; break ;
-      case 3 :
-        comp_c_vertex() ;
-        draw_triangle( tiling7_3[_config][0], 9, v12 ) ; break ;
-      case 4 :
-        draw_triangle( tiling7_2[_config][2], 5 ) ; break ;
-      case 5 :
-        comp_c_vertex() ;
-        draw_triangle( tiling7_3[_config][1], 9, v12 ) ; break ;
-      case 6 :
-        comp_c_vertex() ;
-        draw_triangle( tiling7_3[_config][2], 9, v12 ) ; break ;
-      case 7 :
-        if( test_interior( test7[_config][3]) )
-          draw_triangle( tiling7_4_2[_config], 9 ) ;
-        else
-          draw_triangle( tiling7_4_1[_config], 5 ) ;
-        break ;
-      };
-    break ;
-
-  case  8 :
-    draw_triangle( tiling8[_config], 2 ) ;
-    break ;
-
-  case  9 :
-    draw_triangle( tiling9[_config], 4 ) ;
-    break ;
-
-  case 10 :
-    if( test_face( test10[_config][0]) )
-    {
-      if( test_face( test10[_config][1]) )
-        draw_triangle( tiling10_1_1_[_config], 4 ) ; // 10.1.1
-      else
-      {
-        comp_c_vertex() ;
-        draw_triangle( tiling10_2[_config], 8, v12 ) ; // 10.2
-      }
-    }
-    else
-    {
-      if( test_face( test10[_config][1]) )
-      {
-        comp_c_vertex() ;
-        draw_triangle( tiling10_2_[_config], 8, v12 ) ; // 10.2
-      }
-      else
-      {
-        if( test_interior( test10[_config][2]) )
-          draw_triangle( tiling10_1_1[_config], 4 ) ; // 10.1.1
-        else
-          draw_triangle( tiling10_1_2[_config], 8 ) ; // 10.1.2
-      }
-    }
-    break ;
-
-  case 11 :
-    draw_triangle( tiling11[_config], 4 ) ;
-    break ;
-
-  case 12 :
-    if( test_face( test12[_config][0]) )
-    {
-      if( test_face( test12[_config][1]) )
-        draw_triangle( tiling12_1_1_[_config], 4 ) ; // 12.1.1
-      else
-      {
-        comp_c_vertex() ;
-        draw_triangle( tiling12_2[_config], 8, v12 ) ; // 12.2
-      }
-    }
-    else
-    {
-      if( test_face( test12[_config][1]) )
-      {
-        comp_c_vertex() ;
-        draw_triangle( tiling12_2_[_config], 8, v12 ) ; // 12.2
-      }
-      else
-      {
-        if( test_interior( test12[_config][2]) )
-          draw_triangle( tiling12_1_1[_config], 4 ) ; // 12.1.1
-        else
-          draw_triangle( tiling12_1_2[_config], 8 ) ; // 12.1.2
-      }
-    }
-    break ;
-
-  case 13 :
-    if( test_face( test13[_config][0] ) ) _subconfig +=  1 ;
-    if( test_face( test13[_config][1] ) ) _subconfig +=  2 ;
-    if( test_face( test13[_config][2] ) ) _subconfig +=  4 ;
-    if( test_face( test13[_config][3] ) ) _subconfig +=  8 ;
-    if( test_face( test13[_config][4] ) ) _subconfig += 16 ;
-    if( test_face( test13[_config][5] ) ) _subconfig += 32 ;
-    switch( subconfig13[_subconfig] )
-    {
-      case 0 :/* 13.1 */
-        draw_triangle( tiling13_1[_config], 4 ) ; break ;
-
-      case 1 :/* 13.2 */
-        draw_triangle( tiling13_2[_config][0], 6 ) ; break ;
-      case 2 :/* 13.2 */
-        draw_triangle( tiling13_2[_config][1], 6 ) ; break ;
-      case 3 :/* 13.2 */
-        draw_triangle( tiling13_2[_config][2], 6 ) ; break ;
-      case 4 :/* 13.2 */
-        draw_triangle( tiling13_2[_config][3], 6 ) ; break ;
-      case 5 :/* 13.2 */
-        draw_triangle( tiling13_2[_config][4], 6 ) ; break ;
-      case 6 :/* 13.2 */
-        draw_triangle( tiling13_2[_config][5], 6 ) ; break ;
-
-      case 7 :/* 13.3 */
-        comp_c_vertex() ;
-        draw_triangle( tiling13_3[_config][0], 10, v12 ) ; break ;
-      case 8 :/* 13.3 */
-        comp_c_vertex() ;
-        draw_triangle( tiling13_3[_config][1], 10, v12 ) ; break ;
-      case 9 :/* 13.3 */
-        comp_c_vertex() ;
-        draw_triangle( tiling13_3[_config][2], 10, v12 ) ; break ;
-      case 10 :/* 13.3 */
-        comp_c_vertex() ;
-        draw_triangle( tiling13_3[_config][3], 10, v12 ) ; break ;
-      case 11 :/* 13.3 */
-        comp_c_vertex() ;
-        draw_triangle( tiling13_3[_config][4], 10, v12 ) ; break ;
-      case 12 :/* 13.3 */
-        comp_c_vertex() ;
-        draw_triangle( tiling13_3[_config][5], 10, v12 ) ; break ;
-      case 13 :/* 13.3 */
-        comp_c_vertex() ;
-        draw_triangle( tiling13_3[_config][6], 10, v12 ) ; break ;
-      case 14 :/* 13.3 */
-        comp_c_vertex() ;
-        draw_triangle( tiling13_3[_config][7], 10, v12 ) ; break ;
-      case 15 :/* 13.3 */
-        comp_c_vertex() ;
-        draw_triangle( tiling13_3[_config][8], 10, v12 ) ; break ;
-      case 16 :/* 13.3 */
-        comp_c_vertex() ;
-        draw_triangle( tiling13_3[_config][9], 10, v12 ) ; break ;
-      case 17 :/* 13.3 */
-        comp_c_vertex() ;
-        draw_triangle( tiling13_3[_config][10], 10, v12 ) ; break ;
-      case 18 :/* 13.3 */
-        comp_c_vertex() ;
-        draw_triangle( tiling13_3[_config][11], 10, v12 ) ; break ;
-
-      case 19 :/* 13.4 */
-        comp_c_vertex() ;
-        draw_triangle( tiling13_4[_config][0], 12, v12 ) ; break ;
-      case 20 :/* 13.4 */
-        comp_c_vertex() ;
-        draw_triangle( tiling13_4[_config][1], 12, v12 ) ; break ;
-      case 21 :/* 13.4 */
-        comp_c_vertex() ;
-        draw_triangle( tiling13_4[_config][2], 12, v12 ) ; break ;
-      case 22 :/* 13.4 */
-        comp_c_vertex() ;
-        draw_triangle( tiling13_4[_config][3], 12, v12 ) ; break ;
-
-      case 23 :/* 13.5 */
-        _subconfig = 0 ;
-        if( test_interior( test13[_config][6] ) )
-          draw_triangle( tiling13_5_1[_config][0], 6 ) ;
-        else
-          draw_triangle( tiling13_5_2[_config][0], 10 ) ;
-        break ;
-      case 24 :/* 13.5 */
-        _subconfig = 1 ;
-        if( test_interior( test13[_config][6] ) )
-          draw_triangle( tiling13_5_1[_config][1], 6 ) ;
-        else
-          draw_triangle( tiling13_5_2[_config][1], 10 ) ;
-        break ;
-      case 25 :/* 13.5 */
-        _subconfig = 2 ;
-        if( test_interior( test13[_config][6] ) )
-          draw_triangle( tiling13_5_1[_config][2], 6 ) ;
-        else
-          draw_triangle( tiling13_5_2[_config][2], 10 ) ;
-        break ;
-      case 26 :/* 13.5 */
-        _subconfig = 3 ;
-        if( test_interior( test13[_config][6] ) )
-          draw_triangle( tiling13_5_1[_config][3], 6 ) ;
-        else
-          draw_triangle( tiling13_5_2[_config][3], 10 ) ;
-        break ;
-
-      case 27 :/* 13.3 */
-        comp_c_vertex() ;
-        draw_triangle( tiling13_3_[_config][0], 10, v12 ) ; break ;
-      case 28 :/* 13.3 */
-        comp_c_vertex() ;
-        draw_triangle( tiling13_3_[_config][1], 10, v12 ) ; break ;
-      case 29 :/* 13.3 */
-        comp_c_vertex() ;
-        draw_triangle( tiling13_3_[_config][2], 10, v12 ) ; break ;
-      case 30 :/* 13.3 */
-        comp_c_vertex() ;
-        draw_triangle( tiling13_3_[_config][3], 10, v12 ) ; break ;
-      case 31 :/* 13.3 */
-        comp_c_vertex() ;
-        draw_triangle( tiling13_3_[_config][4], 10, v12 ) ; break ;
-      case 32 :/* 13.3 */
-        comp_c_vertex() ;
-        draw_triangle( tiling13_3_[_config][5], 10, v12 ) ; break ;
-      case 33 :/* 13.3 */
-        comp_c_vertex() ;
-        draw_triangle( tiling13_3_[_config][6], 10, v12 ) ; break ;
-      case 34 :/* 13.3 */
-        comp_c_vertex() ;
-        draw_triangle( tiling13_3_[_config][7], 10, v12 ) ; break ;
-      case 35 :/* 13.3 */
-        comp_c_vertex() ;
-        draw_triangle( tiling13_3_[_config][8], 10, v12 ) ; break ;
-      case 36 :/* 13.3 */
-        comp_c_vertex() ;
-        draw_triangle( tiling13_3_[_config][9], 10, v12 ) ; break ;
-      case 37 :/* 13.3 */
-        comp_c_vertex() ;
-        draw_triangle( tiling13_3_[_config][10], 10, v12 ) ; break ;
-      case 38 :/* 13.3 */
-        comp_c_vertex() ;
-        draw_triangle( tiling13_3_[_config][11], 10, v12 ) ; break ;
-
-      case 39 :/* 13.2 */
-        draw_triangle( tiling13_2_[_config][0], 6 ) ; break ;
-      case 40 :/* 13.2 */
-        draw_triangle( tiling13_2_[_config][1], 6 ) ; break ;
-      case 41 :/* 13.2 */
-        draw_triangle( tiling13_2_[_config][2], 6 ) ; break ;
-      case 42 :/* 13.2 */
-        draw_triangle( tiling13_2_[_config][3], 6 ) ; break ;
-      case 43 :/* 13.2 */
-        draw_triangle( tiling13_2_[_config][4], 6 ) ; break ;
-      case 44 :/* 13.2 */
-        draw_triangle( tiling13_2_[_config][5], 6 ) ; break ;
-
-      case 45 :/* 13.1 */
-        draw_triangle( tiling13_1_[_config], 4 ) ; break ;
-
-      default :
-        printf("Marching Cubes: Impossible case 13?\n" ) ;  print_cube() ;
-      }
-      break ;
-
-  case 14 :
-    draw_triangle( tiling14[_config], 4 ) ;
-    break ;
-  };
-  
-  return true ;
-}
-//_____________________________________________________________________________
-
-
-
-//_____________________________________________________________________________
-// Adding triangles
-void MC_Draw::draw_triangle( const char* trig_, char n, int v12 )
-//-----------------------------------------------------------------------------
-{
-  for( int t = 0 ; t < 3*n ; t++ )
-  {
-    switch( trig_[t] )
-    {
-      case  0 : _verts[0][1].draw() ; break ;
-      case  1 : _verts[1][2].draw() ; break ;
-      case  2 : _verts[2][3].draw() ; break ;
-      case  3 : _verts[3][0].draw() ; break ;
-      case  4 : _verts[4][5].draw() ; break ;
-      case  5 : _verts[5][6].draw() ; break ;
-      case  6 : _verts[6][7].draw() ; break ;
-      case  7 : _verts[7][4].draw() ; break ;
-      case  8 : _verts[0][4].draw() ; break ;
-      case  9 : _verts[1][5].draw() ; break ;
-      case 10 : _verts[2][6].draw() ; break ;
-      case 11 : _verts[3][7].draw() ; break ;
-      case 12 : _c_vert     .draw() ; break ;
-      default : break ;
-    }
-  }
-}
-//_____________________________________________________________________________
-
-
-
-
-//_____________________________________________________________________________
-// Adding vertices
-bool MC_Draw::add_vertex( char i, char j )
-//-----------------------------------------------------------------------------
-{
-  real ci = _cube[i] ;
-  real cj = _cube[j] ;
-  if( ci * cj >= 0 ) { _verts[i][j] = P_INV ; return false ; }
-  
-  _dat_access->interpolate( ci,cj, _space[i],_space[j], _verts[i][j] ) ;
-
-  return true ;
-}
-//-----------------------------------------------------------------------------
-
-bool MC_Draw::comp_c_vertex( )
-//-----------------------------------------------------------------------------
-{
-  real u = 0 ;
-
-  _c_vert.x() = _c_vert.y() = _c_vert.z() = 0 ;
-
-  // Computes the average of the intersection points of the cube
-  Point &v01 = _verts[0][1] ;  if( v01 != P_INV ) { ++u ; _c_vert += v01 ; }
-  Point &v12 = _verts[1][2] ;  if( v12 != P_INV ) { ++u ; _c_vert += v12 ; }
-  Point &v23 = _verts[2][3] ;  if( v23 != P_INV ) { ++u ; _c_vert += v23 ; }
-  Point &v30 = _verts[3][0] ;  if( v30 != P_INV ) { ++u ; _c_vert += v30 ; }
-  Point &v45 = _verts[4][5] ;  if( v45 != P_INV ) { ++u ; _c_vert += v45 ; }
-  Point &v56 = _verts[5][6] ;  if( v56 != P_INV ) { ++u ; _c_vert += v56 ; }
-  Point &v67 = _verts[6][7] ;  if( v67 != P_INV ) { ++u ; _c_vert += v67 ; }
-  Point &v74 = _verts[7][4] ;  if( v74 != P_INV ) { ++u ; _c_vert += v74 ; }
-  Point &v04 = _verts[0][4] ;  if( v04 != P_INV ) { ++u ; _c_vert += v04 ; }
-  Point &v15 = _verts[1][5] ;  if( v15 != P_INV ) { ++u ; _c_vert += v15 ; }
-  Point &v26 = _verts[2][6] ;  if( v26 != P_INV ) { ++u ; _c_vert += v26 ; }
-  Point &v37 = _verts[3][7] ;  if( v37 != P_INV ) { ++u ; _c_vert += v37 ; }
-  
-  _c_vert  /= u ;
-
-  return u > 0 ;
-}
-//_____________________________________________________________________________
-
-
-
diff --git a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/mc_draw.h b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/mc_draw.h
deleted file mode 100644
index c2099ee787..0000000000
--- a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/mc_draw.h
+++ /dev/null
@@ -1,116 +0,0 @@
-/**
- * @file    mc_draw.h
- * @author  Thomas Lewiner <thomas.lewiner@polytechnique.org>
- * @author  Math Dept, PUC-Rio
- * @version 0.2
- * @date    12/08/2002
- *
- * @brief   MarchingCubes Direct Draw
- */
-//________________________________________________
-
-
-#pragma once
-
-#if !defined(WIN32) || defined(__CYGWIN__)
-#pragma interface
-#endif // WIN32
-
-#include <map>
-#include "point.h"
-#include "data_access.h"
-
-
-//_____________________________________________________________________________
-/** Marching Cubes algorithm wrapper */
-/** \class MarchingCubes Direct Draw
-  * \brief Marching Cubes Direct Draw.
-  */
-class MC_Draw
-//-----------------------------------------------------------------------------
-{
-// Constructors
-public :
-  /**
-   * Main and default constructor
-   * \brief constructor
-   */
-  MC_Draw () : _originalMC(true) {}
-  /** Destructor */
-  ~MC_Draw () {}
-
-//-----------------------------------------------------------------------------
-// Accessors
-public :
-  /**
-   * selects wether the algorithm will use the enhanced topologically controlled lookup table or the original MarchingCubes
-   * \param originalMC true for the original Marching Cubes
-   */
-  inline void set_method    ( const bool originalMC = false ) { _originalMC = originalMC ; }
-
-//-----------------------------------------------------------------------------
-// Algorithm
-public :
-  /** retrieves the isovalues at the cube vertices */
-  real             *cube   () { return _cube ; }
-  /** retrieves the geometry of the cube */
-  Point            *space  () { return _space; }
-  /** retrieves the data accessor */
-  data_access     *&dat_access() { return _dat_access ; }
-
-  /**
-   * Main algorithm
-   * \param iso isovalue
-   */
-  bool tesselate_cube( real iso ) ;
-
-protected :
-  /** tesselates one cube */
-  bool process_cube ()             ;
-  /** tests if the components of the tesselation of the cube should be connected by the interior of an ambiguous face */
-  bool test_face    ( schar face ) ;
-  /** tests if the components of the tesselation of the cube should be connected through the interior of the cube */
-  bool test_interior( schar s )    ;
-
-
-//-----------------------------------------------------------------------------
-// Operations
-protected :
-  /** computes almost all the vertices of the mesh by interpolation along the cubes edges */
-  bool compute_intersection_points() ;
-
-  /** adds a vertex on edge cube[i] cube[j] */
-  bool add_vertex( char i, char j ) ;
-
-  /** compute a vertex inside the current cube */
-  bool comp_c_vertex() ;
-
-  /**
-   * routine to add a triangle to the mesh
-   * \param trig the code for the triangle as a sequence of edges index
-   * \param n    the number of triangles to produce
-   * \param v12  the index of the interior vertex to use, if necessary
-   */
-  void draw_triangle ( const char* trig, char n, int v12 = -1 ) ;
-
-  /** prints cube for debug */
-  void print_cube() ;
-
-//-----------------------------------------------------------------------------
-// Elements
-protected :
-  bool      _originalMC ;   /**< selects wether the algorithm will use the enhanced topologically controlled lookup table or the original MarchingCubes */
-
-  real      _cube[8]     ;  /**< values of the implicit function on the active cube */
-  Point     _space[8]    ;  /**< coordinates of the active cube */
-  Point     _verts[8][8] ;  /**< coordinates of the vertices, per edge */
-  Point     _c_vert      ;  /**< coordinates of the central vertex */
-  uchar     _lut_entry   ;  /**< cube sign representation in [0..255] */
-  uchar     _case        ;  /**< case of the active cube in [0..15] */
-  uchar     _config      ;  /**< configuration of the active cube */
-  uchar     _subconfig   ;  /**< subconfiguration of the active cube */
-  data_access *_dat_access ;  /**< data accessor */
-};
-//_____________________________________________________________________________
-
-
diff --git a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/mem_octree.cpp b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/mem_octree.cpp
deleted file mode 100644
index 9aa6df57ba..0000000000
--- a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/mem_octree.cpp
+++ /dev/null
@@ -1,1111 +0,0 @@
-/**
- * \file    mem_octree.cpp
- * \author  Thomas Lewiner   <tomlew@puc-rio.br>
- * \author  Matmidia Lab, Math Dept, PUC-Rio
- * \date    10/01/2010
- *
- *  Octree structure with hashtable and optimized operations without auxiliary memory
- */
-//_____________________________________________________________________________
-
-
-#ifndef WIN32
-#pragma implementation
-#endif // WIN32
-
-
-#include <stack>
-#include "mem_octree.h"
-
-
-//_____________________________________________________________________________
-// Create the root
-void MemOctree::init()
-//-----------------------------------------------------------------------------
-{
-  _max_field = R_INV ;
-  _opt_level = L_INV ;
-  memset( _level_dist, 0, (MAX_LEVEL+1)*sizeof(uint) ) ;
-
-  HashField::KeyData kd ;
-  kd.key  =  1  ;
-  kd.data = 0.0 ;
-  _hash.insert( kd ) ;
-
-  _level_dist[0] = 1 ;
-}
-//_____________________________________________________________________________
-
-
-
-
-//_____________________________________________________________________________
-/// Compute the optimal level
-void MemOctree::compute_opt_level()
-//-----------------------------------------------------------------------------
-{
-  Level left     = 0 ;
-  Level right    = MAX_LEVEL ;
-  uint  leftsum  =  0 ;
-  uint  rightsum =  0 ;
-  while( left < right )
-  {
-    uint leftsum_old = leftsum ;
-    if( leftsum <= rightsum )
-    {
-      leftsum += _level_dist[ left ] ;
-      ++left ;
-    }
-    if( leftsum_old >= rightsum )
-    {
-      rightsum += _level_dist[ right ] ;
-      --right ;
-    }
-  }  
-  _opt_level = right ;
-}
-//_____________________________________________________________________________
-
-
-//_____________________________________________________________________________
-// Check that each point scan or scribble is in the right node
-bool MemOctree::check ()
-//-----------------------------------------------------------------------------
-{
-  bool result = true ;
-
-  uint level_dist[MAX_LEVEL+1] ;
-  memset( level_dist, 0, (MAX_LEVEL+1)*sizeof(uint) ) ;
-  for( cell_iterator it = cells_begin() ; it() ; ++it )
-  {
-    if( is_leaf( it.key() ) )
-      level_dist[ key_level(it.key()) ] ++ ;
-    Key k = it.key() << 3 ;
-    bool has_son = false ;
-    bool all_sons = true  ;
-    for( int i = 0 ; i < 8 ; ++i )
-    {
-      if( _hash[ k | i ].key != KEY_INV )
-        has_son = true ;
-      else
-        all_sons = false ;
-    }
-    
-    if( it.is_leaf() && has_son )
-    {
-      printf("(mem) Invalid leaf %d: value %f\n", (int)k, _hash[k].data ) ;
-      result = false ;
-    }
-
-    if( has_son && !all_sons )
-    {
-      printf("(mem) Invalid subdivision %d: value %f\n", (int)k, _hash[k].data ) ;
-      result = false ;
-    }
-  }
-
-  for( Level lv = 0 ; lv <= MAX_LEVEL ; ++lv )
-  {
-    if( _level_dist[lv] != level_dist[lv] )
-    {
-      printf("(mem) Invalid level statistic %d: %d != %d\n", (int)lv, (int)_level_dist[lv], (int)level_dist[lv] ) ;
-      result = false ;
-    }
-  }
-
-  return result ;
-}
-//_____________________________________________________________________________
-
-
-
-
-
-//_____________________________________________________________________________
-// Deletes the content of the octree
-void MemOctree::clear_octree()
-//-----------------------------------------------------------------------------
-{
-  _hash .reset() ;
-  _max_field = R_INV ;
-  _opt_level = L_INV ;
-  memset( _level_dist, 0, (MAX_LEVEL+1)*sizeof(uint) ) ;
-}
-//_____________________________________________________________________________
-
-
-
-
-
-//_____________________________________________________________________________
-// set the values of each leaf from the implicit function
-bool MemOctree::set_impl( data_access *ref )
-//-----------------------------------------------------------------------------
-{
-  if( !ref ) return false ;
-  
-  _max_field = -FLT_MAX ;
-  for( cell_iterator it = cells_begin() ; it() ; ++it )
-  {
-    if( it.is_leaf() )
-    {
-      real v = (*ref).value_at( it.top() ) ;
-      *it = v ;
-      v = fabs(v) ;
-      if( _max_field < v ) _max_field = v ;
-    }
-//    else
-//      *it = R_INV ;
-  }
-  
-//  printf( "max field: %f\n", max_field() ) ;
-  return true ;
-}
-//_____________________________________________________________________________
-
-
-
-
-
-//_____________________________________________________________________________
-// Refine the octree according to the data access
-bool MemOctree::refine( data_access *ref /*= NULL*/ )
-//-----------------------------------------------------------------------------
-{
-  if( !ref ) return false ;
-
-    clear() ;  init() ;
-
-  // traversal stack: iterator has a pre-ordered stack, and cannot be recursed on
-  geom_cell it = geom_root() ;
-  std::stack< geom_cell > s ;
-  s.push( it ) ;
-  
-  // although it may refine only the leaves
-  // the leaf iterator may change during the refinement
-  bool refined = false ;
-  while( !s.empty() )
-  {
-    it = s.top() ;  s.pop() ;
-
-    // test for subdivision
-    if( !(*ref).need_refine( it ) ) continue ;
-    refined = true ;
-    
-    //_____________________________________________________________________________
-    // subdivides the cell in the tree
-    _hash[it.key()].data = it._field = R_INV ;
-    HashField::KeyData kd ;
-    kd.data = 0.0 ;
-
-    // recurse on the traversal
-    Key sk = it.key() << 3 ;
-    for( int i = 0 ; i < 8 ; ++i )
-    {
-      kd.key = sk | i ;
-      if( !_hash.insert( kd ) )
-      {
-        printf( "hash table saturated!\n" ) ;
-        exit(1) ;
-        return false ;
-      }
-      
-      s.push( geom_cell( kd.key, kd.data ) ) ;
-    }
-    Level lv = it.lv() ;
-    _level_dist[ lv ] -= 1 ;
-    _level_dist[lv+1] += 8 ;
-  }
-  
-  compute_opt_level() ;
-
-  return refined ;
-}
-//_____________________________________________________________________________
-
-
-
-//_____________________________________________________________________________
-// Refine the octree according to the data access
-bool MemOctree::adapt( data_access *ref /*= NULL*/ )
-//-----------------------------------------------------------------------------
-{
-  if( !ref ) return false ;
-
-#ifdef HASH_HAS_ERASE
-    
-  // traversal stack: iterator has a pre-ordered stack, and cannot be recursed on
-  geom_cell it = geom_root() ;
-  std::stack< geom_cell > s ;
-  s.push( it ) ;
-  
-  // although it may refine only the leaves
-  // the leaf iterator may change during the refinement
-  geom_cell sons[8] ;
-  bool refined = false ;
-  while( !s.empty() )
-  {
-    it = s.top() ;  s.pop() ;
-//    printf( "mem key %d\n", (int) it.key() ) ;
-
-    // look for the leaves
-    if( !it.is_leaf() )
-    {
-      if( !(*ref).need_refine( it ) )
-      {
-        std::stack< std::pair<Key,Level> > del_s ; // avoid level recomputation
-        del_s.push( std::make_pair( it.key(), it.lv() ) ) ;
-        while( !del_s.empty() )
-        {
-          Key n    = del_s.top().first << 3 ;
-          Level lv = del_s.top().second + 1 ;
-          del_s.pop() ;
-          
-          for( int i = 0 ; i < 8 ; ++i )
-          {
-            HashField::KeyData kd = _hash.erase( n|i ) ;
-            if( !is_inv( kd.data ) ) // is_leaf(n)
-            {
-              _level_dist[ lv ] -- ;
-              continue ;
-            }
-            del_s.push( std::make_pair( n|i, lv ) ) ;
-          }
-        }
-
-        refined = true ;
-        _level_dist[it.lv()] += 1 ;
-        _hash[it.key()].data = 0.0 ; // leaf now!
-        continue ;
-      }
-      
-      it.sons( sons, _hash ) ;
-      for( int i = 0 ; i < 8 ; ++i )
-        s.push( sons[i] ) ;
-      
-      continue ;
-    }
-
-    // test for subdivision
-    if( !(*ref).need_refine( it ) ) continue ;
-    refined = true ;
-    
-    //_____________________________________________________________________________
-    // subdivides the cell in the tree
-    _hash[it.key()].data = it._field = R_INV ;
-    HashField::KeyData kd ;
-    kd.data = 0.0 ;
-    
-    // recurse on the traversal
-    Key sk = it.key() << 3 ;
-    for( int i = 0 ; i < 8 ; ++i )
-    {
-      kd.key = sk | i ;
-      if( !_hash.insert( kd ) )
-      {
-        printf( "hash table saturated!\n" ) ;
-        exit(1) ;
-        return false ;
-      }
-      
-      s.push( geom_cell( kd.key, kd.data ) ) ;
-    }
-    
-    Level lv = it.lv() ;
-    _level_dist[ lv ] -= 1 ;
-    _level_dist[lv+1] += 8 ;
-  }
-  
-  compute_opt_level() ;
-  return refined ;
-  
-#else  // HASH_HAS_ERASE
-  // no remotion in the hash table!
-  return refine( ref ) ;
-#endif // HASH_HAS_ERASE
-}
-//_____________________________________________________________________________
-
-
-
-
-
-//_____________________________________________________________________________
-// Draw the octree with wireframe
-bool MemOctree::draw_wire()
-//-----------------------------------------------------------------------------
-{
-  for( leaf_iterator it = leaves_begin() ; it() ; ++it )
-    it.draw_wire() ;
-  
-  return true ;
-}
-//_____________________________________________________________________________
-
-
-
-
-
-//_____________________________________________________________________________
-// Draw the octree with dots
-bool MemOctree::draw_centers()
-//-----------------------------------------------------------------------------
-{
-  for( cell_iterator it = cells_begin() ; it() ; ++it )
-  {
-    ::glTexCoord1f( (GLfloat)fabs(*it / max_field()) ) ;
-    it.top().draw() ;
-  }
-  
-  return true ;
-}
-//_____________________________________________________________________________
-
-
-
-
-//_____________________________________________________________________________
-// Octree dual caller
-bool MemOctree::dual_cubes_walk( mem_dual_walker &walker )
-//-----------------------------------------------------------------------------
-{
-  bool result = true ;
-
-  // add all the inner vertices
-  for( leaf_iterator l_it = leaves_begin() ; l_it() ; ++l_it )
-  {
-    Key verts_k[8] ;
-    Level lv = vertices_keys( l_it.key(), verts_k ) ;
-
-    Key *v_ptr = verts_k ;
-    for( int i = 0 ; i < 8 ; ++i, ++v_ptr )
-    {
-      Key k = *v_ptr ;
-      if( k == KEY_INV ) continue ;
-
-      Key dual_verts[8] ;
-      dual_vertices_keys( k, lv, dual_verts ) ;
-      
-      bool run_walker = true ;
-      Key *dv_ptr = dual_verts ;
-      for( int j = 0 ; j < 8 ; ++j, ++dv_ptr )
-      {
-        if( j == i ) continue ;
-        
-        HashField::KeyData kd ;
-        
-        // neighbor has bigger size: skip
-        //   must be processed by the deepest level
-        if( !node_exists(*dv_ptr,kd) )
-          continue ;
-        
-        // neighbor is deeper: break
-        //   will be processed by that neighbor
-        if( !is_leaf(kd) )
-        {
-          run_walker = false ;
-          break ;
-        }
-        
-        // neighbor has same level
-        //   choose the first one in the order
-        if( j < i )
-        {
-          run_walker = false ;
-          break ;
-        }
-      }
-
-      if( run_walker )
-      {
-        dv_ptr = dual_verts ;
-        for( int j = 0 ; j < 8 ; ++j, ++dv_ptr )
-        {
-          // find_at, only the level too high case
-          Key &ki = *dv_ptr ;
-          HashField::KeyData kd ;
-          while( ki != 0 && !node_exists(ki,kd) )
-            ki >>= 3;
-        }
-        result &= walker( *this, dual_verts ) ;
-      }
-    }
-  }
-
-  return result ;
-}
-//_____________________________________________________________________________
-
-
-
-
-//_____________________________________________________________________________
-// Isosurface walker
-bool mem_isosurface_walker( MemOctree &fo, Key *keys )
-//-----------------------------------------------------------------------------
-{
-  MarchingCubes &mc = fo.mc() ;
-  
-  /** isovalues at the cube vertices */
-  real            *cube    = mc.cube() ;
-  /** geometry of the cube */
-  Point           *space   = mc.space() ;
-  /** indexes of the cube */
-  Key             *indexes = mc.indexes() ;
-  
-  for( int j = 0 ; j < 8 ; ++j )
-  {
-    int i = (j==2)?3:(j==3)?2:(j==7)?6:(j==6)?7:j ;
-    const Key k = keys[j] ;
-    MemOctree::geom_cell c = fo.geom_key(k) ;
-    cube[i] = *c ;
-    
-    space[i] = (Point)c ;
-    indexes[i] = k ;
-  }
-  
-  mc.tesselate_cube( 0.0 ) ;
-  
-  return true ;
-}
-//_____________________________________________________________________________
-
-
-
-
-//_____________________________________________________________________________
-// Build the isosurface using dual marching cubes
-bool MemOctree::build_isosurface( data_access *ref )
-//-----------------------------------------------------------------------------
-{
-  if( !ref ) return false ;
-  _mc.dat_access() = ref ;
-  
-    printf( "Build isosurface... " ) ;
-  bool result = false ;
-  
-  //_________________________________________________________________________
-  // Dual Marching Cubes
-  
-  _mc.init_all() ; 
-  
-  result = dual_cubes_walk( mem_isosurface_walker ) ;
-  
-  _mc.clean_temps() ;
-  
-  printf( "generated %d vertices and %d faces!\n", _mc.nverts(), _mc.ntrigs() ) ;
-  
-  return result ;
-}
-//_____________________________________________________________________________
-
-
-
-
-
-//_____________________________________________________________________________
-// Isosurface drawing walker
-bool mem_direct_isosurface_walker( MemOctree &fo, Key *keys )
-//-----------------------------------------------------------------------------
-{
-  MC_Draw &mc = fo.mc_draw() ;
-  
-  /** isovalues at the cube vertices */
-  real            *cube    = mc.cube() ;
-  /** geometry of the cube */
-  Point           *space   = mc.space() ;
-  
-  for( int j = 0 ; j < 8 ; ++j )
-  {
-    int i = (j==2)?3:(j==3)?2:(j==7)?6:(j==6)?7:j ;
-    const MemOctree::geom_cell c = fo.geom_key( keys[j] ) ;
-    cube[i] = *c ;
-    
-    space[i] = (Point)c ;
-  }
-  
-  mc.tesselate_cube( 0.0 ) ;
-  
-  return true ;
-}
-//_____________________________________________________________________________
-
-
-
-//_____________________________________________________________________________
-// Build the isosurface using dual marching cubes
-bool MemOctree::direct_draw_isosurface( data_access *ref )
-//-----------------------------------------------------------------------------
-{
-  if( !ref ) return false ;
-  _mc_draw.dat_access() = ref ;
-  
-    bool result = false ;
-  
-  // Dual Marching Cubes
-  ::glBegin( GL_TRIANGLES ) ;
-  {
-    result = dual_cubes_walk( mem_direct_isosurface_walker ) ;
-  }
-  ::glEnd() ; // GL_TRIANGLES
-  
-  return result ;
-}
-//_____________________________________________________________________________
-
-
-
-
-
-
-//_____________________________________________________________________________
-// Draw walker
-bool mem_draw_walker( MemOctree &fo, Key *keys )
-//-----------------------------------------------------------------------------
-{
-  Cube cells[8] ;
-  for( int i = 0 ; i < 8 ; ++i )
-    cells[i] = key2cube( keys[i] ) ;
-  
-  ((Point)cells[0]).draw() ;
-  ((Point)cells[1]).draw() ;
-  
-  ((Point)cells[1]).draw() ;
-  ((Point)cells[3]).draw() ;
-  
-  ((Point)cells[3]).draw() ;
-  ((Point)cells[2]).draw() ;
-  
-  ((Point)cells[2]).draw() ;
-  ((Point)cells[0]).draw() ;
-  
-  ((Point)cells[4]).draw() ;
-  ((Point)cells[5]).draw() ;
-  
-  ((Point)cells[5]).draw() ;
-  ((Point)cells[7]).draw() ;
-  
-  ((Point)cells[7]).draw() ;
-  ((Point)cells[6]).draw() ;
-  
-  ((Point)cells[6]).draw() ;
-  ((Point)cells[4]).draw() ;
-  
-  ((Point)cells[0]).draw() ;
-  ((Point)cells[4]).draw() ;
-  
-  ((Point)cells[1]).draw() ;
-  ((Point)cells[5]).draw() ;
-  
-  ((Point)cells[2]).draw() ;
-  ((Point)cells[6]).draw() ;
-  
-  ((Point)cells[3]).draw() ;
-  ((Point)cells[7]).draw() ;
-  
-  return true ;
-}
-//_____________________________________________________________________________
-
-
-
-
-//_____________________________________________________________________________
-// Draw the dual octree with wireframe
-bool MemOctree::draw_dual()
-//-----------------------------------------------------------------------------
-{
-  ::glBegin( GL_LINES ) ;
-  bool result = dual_cubes_walk( mem_draw_walker ) ;
-  ::glEnd() ;  // GL_LINES
-  
-  return result ;
-}
-//_____________________________________________________________________________
-
-
-
-
-//_____________________________________________________________________________
-// Do nothing walker, just for dual generation timing
-bool mem_timing_walker( MemOctree &fo, Key *keys )
-//-----------------------------------------------------------------------------
-{
-  return true ;
-}
-//_____________________________________________________________________________
-
-
-//_____________________________________________________________________________
-// Do nothing, just for dual generation timing
-bool MemOctree::dual_timing()
-//-----------------------------------------------------------------------------
-{
-    return dual_cubes_walk( mem_timing_walker ) ;
-}
-//_____________________________________________________________________________
-
-
-
-
-
-//_____________________________________________________________________________
-// Prints statistics about the octree
-void MemOctree::stats() const
-//-----------------------------------------------------------------------------
-{
-  int s = _hash.size() ;
-  printf( " number of nodes:\t%d\n", s ) ;
-#if USE_HASH_PTR
-  printf( " total memory:\t%d\n", (int) ( s * sizeof(HashField::KeyBucket) ) ) ;
-  _hash.stats() ;
-#else  // USE_HASH_PTR 
-  printf( " total memory:\t%d\n", (int) ( s * sizeof(HashField::KeyData  ) ) ) ;
-#endif // USE_HASH_PTR
-  
-  printf( " leaves' levels:\t" ) ;
-  for( Level l = 0 ; l <= MAX_LEVEL; ++l )
-    printf( "\t%d", _level_dist[l] ) ;
-  printf( "\n" ) ;
-}
-//_____________________________________________________________________________
-
-
-
-
-
-//_____________________________________________________________________________
-//_____________________________________________________________________________
-// search operations
-
-
-//_____________________________________________________________________________
-// Find cells of the octree at a given position
-bool MemOctree::find_leaf( Key k, Level o_lv, geom_cell &n ) const
-//-----------------------------------------------------------------------------
-{
-    
-  Level   shift = 3*(MAX_LEVEL-o_lv) ;
-  Key     ki    = k >> shift ;
-  HashField::KeyData kd ;
-  
-  // level too high
-  if( !node_exists(ki,kd) )
-  {
-    do
-    {
-      ki >>= 3;
-    }
-    while( ki !=0 && !node_exists(ki,kd) ) ;
-  }
-  // level correct or too low
-  else
-  {
-    HashField::KeyData kd_temp ;
-    do
-    {
-      kd_temp = kd ;
-      shift -= 3 ;
-      ki = k >> shift ;
-    }
-    while( ki !=0 && node_exists(ki,kd) ) ;
-    kd = kd_temp ;
-  }
-  n = geom_cell( kd ) ;
-
-  return kd.key != KEY_INV ;
-}
-//_____________________________________________________________________________
-
-
-
-//_____________________________________________________________________________
-// Find cells of the octree inside a given box of center x,y and half side r
-bool MemOctree::find_radius( real x, real y, real z, real r, List<geom_cell> &cells ) const
-//-----------------------------------------------------------------------------
-{
-    
-  cells.clear() ;
-
-  Level lv_b = (Level)floor( log(r)/log(0.5) ) ;
-  Key   k_b  = cube2key( Cube(x,y,z,lv_b) ) ;
-
-  Key neighbors[27] ;
-  neighbor_keys( k_b, neighbors ) ;
-
-  std::stack<Key> s ;
-  s.push( k_b ) ;
-  
-  Key *k_ptr = neighbors ;
-  for( int dir = 0 ; dir < 27 ; ++dir, ++k_ptr )
-    s.push( *k_ptr ) ;
-  
-  while( !s.empty() )
-  {
-    Key ki = s.top() ;
-    s.pop() ;
-    if( ki == KEY_INV ) continue ;
-    
-    HashField::KeyData kd ;
-    if( node_exists(ki,kd) )
-    {
-      if( is_leaf( kd ) )
-      {
-        geom_cell gc(kd) ;
-        real sz = gc.sz() + r ;
-
-        // test directly with the key?
-        if( fabs( x-gc.x() ) <= sz && fabs( y-gc.y() ) <= sz && fabs( z-gc.z() ) <= sz )
-          cells.insert( gc ) ;
-      }
-      else 
-      {
-        Key ski = ki << 3 ;
-        for( int i = 0 ; i < 8 ; ++i )
-          // test directly with the key before insertion?
-          s.push( ski | i ) ;
-      }
-    }        
-    else
-    {
-      HashField::KeyData kd ;
-      do
-      {
-        ki >>= 3 ;
-      } while( ki !=0 && !node_exists(ki,kd) ) ;
-      
-      if( ki > 0 )
-      {
-        geom_cell gc(kd) ;
-        real sz = gc.sz() + r ;
-
-        // test directly with the key?
-        if( fabs( x-gc.x() ) <= sz && fabs( y-gc.y() ) <= sz && fabs( z-gc.z() ) <= sz )
-          cells.insert_unique( gc ) ;
-      }
-    }
-  }
-  
-  return true ;
-}
-//_____________________________________________________________________________
-
-
-
-//_____________________________________________________________________________
-// Find neighbor cells of the octree to a given cell
-bool MemOctree::adjacent( Key k, List<geom_cell> &cells ) const
-//-----------------------------------------------------------------------------
-{
-    
-  cells.clear() ;
-
-  Key neighbors[27] ;
-  neighbor_keys( k, neighbors ) ;
-  
-  Key *k_ptr = neighbors ;
-  for( int dir = 0 ; dir < 27 ; ++dir, ++k_ptr )
-  {
-    Key ki = *k_ptr ;
-    if( ki == KEY_INV ) continue ;
-    
-    HashField::KeyData kd ;
-    if( node_exists(ki,kd) )
-    {
-      if( is_leaf( kd ) ) cells.insert( geom_cell(kd) );        
-      else 
-      {
-        std::stack<Key> subneighbors ;
-        subneighbor_keys(ki, dir, subneighbors ) ;
-        while( !subneighbors.empty() )
-        {
-          Key ski = subneighbors.top() ;
-          subneighbors.pop() ;
-          
-          real sdi ;
-          if( is_leaf( ski, sdi ) )
-            cells.insert( geom_cell( ski, sdi ) ) ;
-          else
-            subneighbor_keys(ski, dir, subneighbors ) ;
-        }
-      }
-    }        
-    else
-    {
-      HashField::KeyData kd ;
-      do
-      {
-        ki >>= 3 ;
-      } while( ki !=0 && !node_exists(ki,kd) ) ;
-
-      if( ki > 0 )
-        cells.insert_unique( geom_cell(kd) ) ;
-    }
-  }
-  
-  return true ;
-}
-//_____________________________________________________________________________
-
-
-
-//_____________________________________________________________________________
-//_____________________________________________________________________________
-// I/O
-
-//_____________________________________________________________________________
-// Draws the intersecting cells of a plane with the octree with color
-void MemOctree::draw_plane ( real nx, real ny, real nz, real d )
-//-----------------------------------------------------------------------------
-{
-  geom_cell n = geom_root() ;
-  
-  std::stack< geom_cell > s ;
-  s.push( n ) ;
-  
-  //_____________________________________________________________________________
-  // retrieve the index of the most positive cube corner
-  bool fx = nx >= 0 ;
-  bool fy = ny >= 0 ;
-  bool fz = nz >= 0 ;
-  
-  //_____________________________________________________________________________
-  
-  ::glLineWidth( 1.0f ) ;
-  ::glDisable( GL_LIGHTING ) ;
-  
-  real px,py,pz, mx,my,mz ;
-  while( !s.empty() )
-  {
-    n = s.top() ;  s.pop() ;
-    
-    if( n.is_leaf() )
-    {		
-      
-      ::glTexCoord1f( (GLfloat)fabs(*n/max_field()) ) ;
-      ::glBegin( GL_LINES ) ;
-      n.draw_wire() ;
-      ::glEnd() ;  // GL_LINES		
-      
-      continue ;
-    }
-    
-    //___________________________________________________________________________
-    // recursion
-    geom_cell sons[8] ;
-    n.sons( sons, _hash ) ;
-    real sz_ = sons[0].sz() ;
-    for( int i = 0 ; i < 8 ; ++i )
-    {
-      // get the coordinates of the extremum vertices
-      if( fx ) { px = sons[i].cx() + sz_ ;  mx = sons[i].cx() - sz_ ; }
-      else     { px = sons[i].cx() - sz_ ;  mx = sons[i].cx() + sz_ ; }
-      if( fy ) { py = sons[i].cy() + sz_ ;  my = sons[i].cy() - sz_ ; }
-      else     { py = sons[i].cy() - sz_ ;  my = sons[i].cy() + sz_ ; }
-      if( fz ) { pz = sons[i].cz() + sz_ ;  mz = sons[i].cz() - sz_ ; }
-      else     { pz = sons[i].cz() - sz_ ;  mz = sons[i].cz() + sz_ ; }
-      
-      // plane/cube intersection test
-      if( (nx * px + ny * py + nz * pz + d >= 0.0) && (nx * mx + ny * my + nz * mz + d <= 0.0)  )
-        s.push( sons[i] ) ;
-    }
-  }
-}
-//_____________________________________________________________________________
-
-
-
-
-
-//_____________________________________________________________________________
-// Draws the intersection of a plane with the octree with color
-void MemOctree::draw_slice ( real nx, real ny, real nz, real d, float alpha )
-//-----------------------------------------------------------------------------
-{
-  geom_cell n = geom_root() ;
-  
-  std::stack< geom_cell > s ;
-  s.push( n ) ;
-  
-  // retrieve the index of the most positive cube corner
-  bool fx = nx >= 0 ;
-  bool fy = ny >= 0 ;
-  bool fz = nz >= 0 ;
-  
-  
-  
-  //_____________________________________________________________________________
-  
-  ::glDisable( GL_LIGHTING ) ;
-  
-  real px,py,pz, mx,my,mz ;
-  while( !s.empty() )
-  {
-    n = s.top() ;  s.pop() ;
-    if( n.is_leaf() )
-    {
-      // retrieves the signs of each cube corner
-      real val[8] ;
-      real v   = nx * n.cx() + ny * n.cy() + nz * n.cz() + d ;
-      real sz_ = n.sz() ;
-      int zeros = 0 ;
-      for( int i = 0 ; i < 8 ; ++i )
-      {
-        val[i] = v + nx * ((i&1)?sz_:-sz_) + ny * ((i&2)?sz_:-sz_) + nz * ((i&4)?sz_:-sz_) ;
-        if( fabs(val[i]) < R_EPSILON ) { val[i] = R_EPSILON ;  ++zeros ; }
-      }
-      
-      //_________________________________________________________________________
-      // degenerated intersection
-      if( zeros > 0 )
-      {
-        int npos = 0, nneg = 0 ;
-        for( int i = 0 ; i < 8 ; ++i )
-        {
-          if( fabs(val[i]) < R_EPSILON ) continue ;
-          if( val[i] < 0 )
-            ++nneg ;
-          else
-            ++npos ;
-        }
-        float def = (nneg>npos) ? (float)R_EPSILON : -(float)R_EPSILON ;
-        
-        for( int i = 0 ; i < 8 ; ++i )
-        {
-          if( fabs(val[i]) < R_EPSILON ) val[i] = def ;
-        }
-        //        continue ;
-      }
-      
-      //_________________________________________________________________________
-      // Continuation method
-      int v0=-1, v1=-1 ;  // current edge vertices
-      
-      // get the first intersection
-      static int edges[12][2] = { {0,1}, {0,2}, {0,4}, {1,3}, {1,5}, {2,3}, {2,6}, {3,7}, {4,5}, {4,6}, {5,7}, {6,7} } ;
-      for( int e = 0 ; e < 12 ; ++e )
-      {
-        if( val[ edges[e][0] ] * val[ edges[e][1] ] < 0 )
-        {
-          v0 = edges[e][0] ;
-          v1 = edges[e][1] ;
-          break ;
-        }
-      }
-      int  ov0 = v0, ov1 = v1 ;
-      
-      
-      // equation of previous face adjacent to v0v1: v>>c & 1 == s (c-th coordinate equal to +/- 1)
-      int pf = -1 ;  bool ps ;
-      if       ( (v0 & 1) == (v1 & 1) )   { pf = 0 ; ps = ((v0 & 1) /*>> 0*/) == 1 ; }
-      else   if( (v0 & 2) == (v1 & 2) )   { pf = 1 ; ps = ((v0 & 2)   >> 1  ) == 1 ; }
-      else /*if( (v0 & 4) == (v1 & 4) )*/ { pf = 2 ; ps = ((v0 & 4)   >> 2  ) == 1 ; }
-      
-      //      printf( "cube %d %d %d %d %d %d %d %d, march : (%d,%d) ", val[0]>0, val[1]>0, val[2]>0, val[3]>0, val[4]>0, val[5]>0, val[6]>0, val[7]>0, v0, v1 ) ;
-      
-      //_________________________________________________________________________
-      // marching
-      
-      GLfloat color = (GLfloat)fabs(*n / max_field()) ;
-		  //cmap.gl_color( at(*n) ) ;	
-      ::glBegin( GL_POLYGON ) ;
-      {
-        do
-        {
-          // equation of next face adjacent to v0v1
-          int nf = -1 ;  bool ns ;
-          if       ( pf != 0 && ((v0 & 1) == (v1 & 1)) )   { nf = 0 ; ns = ((v0 & 1) /*>> 0*/) == 1 ; }
-          else   if( pf != 1 && ((v0 & 2) == (v1 & 2)) )   { nf = 1 ; ns = ((v0 & 2)   >> 1  ) == 1 ; }
-          else /*if( pf != 2 && ((v0 & 4) == (v1 & 4)) )*/ { nf = 2 ; ns = ((v0 & 4)   >> 2  ) == 1 ; }
-          
-          /* equivalent construction
-           // get the direction perpendicular to v0v1
-           int of = (v0 ^ v1) & 7 ; // only bit of difference
-           of = of==1 ? 0 : (of==2 ? 1 : 2) ;
-           
-           // compute the equation of the next face adjacent to v0v1
-           int  nf = 3 - (pf+of) ;    // third option: {pf,nf,of}={0,1,2}
-           bool ns = (v0 >> nf) & 1 ; // value of the edge on that direction
-           */
-          
-          // compute the two next vertices (invert the pf-th bit
-          int v2 = ps ? ( v0 & (~(1<<pf)) ) : ( v0 | (1<<pf) ) ;
-          int v3 = ps ? ( v1 & (~(1<<pf)) ) : ( v1 | (1<<pf) ) ;
-          
-          // get the characteristic of the square
-          int  c = (val[v3] > 0) | ((val[v2] > 0) << 1) | ((val[v1] > 0) << 2) | ((val[v0] > 0) << 3) ;
-          if( c > 7 ) c = (~c)&7 ; // consider v0 as negative, and thus v1 as positive
-          /*
-           if( c < 4 )
-           { // degenerated intesection
-           printf( "degenerated intersection %d!\n", c ) ;
-           }
-           */
-          
-          //_______________________________________________________________________
-          // method of continuity on the cube surface
-          switch( c )
-          {
-            case  4 : v0 = v3 ;  break ;
-            case  5 : v0 = v2 ;  v1 = v3 ;  break ;
-            case  6 : /* impossible case */ break ;
-            case  7 : v1 = v2 ;  break ;
-          }
-          
-          
-          
-          
-          real cx =  n.cx();
-          real cy =  n.cy(); 
-          real cz =  n.cz();
-          real sz =  sz_;   
-          real a0 = val[v0];  
-          int i0 = v0; 
-          real a1 = val[v1];  
-          int i1  = v1;
-          
-          real w0 = a1 / (a1-a0) ;
-          real w1 = a0 / (a0-a1) ;
-          
-          real x = cx + w0 * ((i0&1)?sz:-sz) + w1 * ((i1&1)?sz:-sz);
-          real y = cy + w0 * ((i0&2)?sz:-sz) + w1 * ((i1&2)?sz:-sz);
-          real z = cz + w0 * ((i0&4)?sz:-sz) + w1 * ((i1&4)?sz:-sz);
-          
-          ::glTexCoord1d( color ) ;
-          ::glVertex3d(x, y, z) ;
-          
-          // next face
-          pf = nf ;  ps = ns ;
-          
-          //          printf( "(%d,%d) ", v0, v1 ) ;
-        } while( v0 != ov0 || v1 != ov1 ) ;
-        //        printf( "\n" ) ;
-      }
-      ::glEnd() ; // GL_POLYGON
-      
-      continue ;
-    }
-    
-    //___________________________________________________________________________
-    // recursion
-    geom_cell sons[8] ;
-    n.sons( sons, _hash ) ;
-    real sz_ = sons[0].sz() ;
-    for( int i = 0 ; i < 8 ; ++i )
-    {
-      // get the coordinates of the extremum vertices
-      if( fx ) { px = sons[i].cx() + sz_ ;  mx = sons[i].cx() - sz_ ; }
-      else     { px = sons[i].cx() - sz_ ;  mx = sons[i].cx() + sz_ ; }
-      if( fy ) { py = sons[i].cy() + sz_ ;  my = sons[i].cy() - sz_ ; }
-      else     { py = sons[i].cy() - sz_ ;  my = sons[i].cy() + sz_ ; }
-      if( fz ) { pz = sons[i].cz() + sz_ ;  mz = sons[i].cz() - sz_ ; }
-      else     { pz = sons[i].cz() - sz_ ;  mz = sons[i].cz() + sz_ ; }
-      
-      // plane/cube intersection test
-      if( (nx * px + ny * py + nz * pz + d >= 0.0) && (nx * mx + ny * my + nz * mz + d <= 0.0)  )
-        s.push( sons[i] ) ;
-    }
-  }
-}
-//_____________________________________________________________________________
-
diff --git a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/mem_octree.h b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/mem_octree.h
deleted file mode 100644
index a161235b44..0000000000
--- a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/mem_octree.h
+++ /dev/null
@@ -1,367 +0,0 @@
-/**
- * \file    mem_octree.h
- * \author  Thomas Lewiner   <tomlew@puc-rio.br>
- * \author  Matmidia Lab, Math Dept, PUC-Rio
- * \date    10/01/2010
- *
- *  Octree structure with hashtable and optimized operations without auxiliary memory
- */
-//_____________________________________________________________________________
-
-
-#pragma once
-
-
-#ifndef WIN32
-#pragma interface
-#endif // WIN32
-
-
-#include "mlist.h"
-#include "cube.h"
-#include "hash.h"
-#include "MarchingCubes.h"
-#include "mc_draw.h"
-#include "data_access.h"
-
-
-
-//_____________________________________________________________________________
-// MemOctree
-/// \class MemOctree MemOctree.h
-class MemOctree
-//-----------------------------------------------------------------------------
-{
-// forward declaration
-public:
-  class geom_cell  ;
-  class cell_iterator  ;
-  class leaf_iterator  ;
-
-// Elements
-protected:
-  /// Octree cell data structure
-  typedef Hash<real>  HashField ;
-
-  /// Hashtable of the octree nodes
-  HashField _hash ;
-  
-  /// Level distribution of the octree
-  uint _level_dist[MAX_LEVEL+1] ;
-  
-  /// Memimal level for direct search in the octree
-  Level _opt_level ;
-  
-  /// Maximal field of the octree
-  real _max_field ;
-  
-  /// Isosurface
-  MarchingCubes _mc ;
-
-  /// Isosurface Draw
-  MC_Draw _mc_draw ;
-
-//-----------------------------------------------------------------------------
-// Constructors
-public:
-  /// Default constructor: Constructs a octree with and empty root
-  MemOctree() { init() ; }
-
-  /// Destructor: Free memory
-  ~MemOctree() { clear() ; }
-
-
-  /// Create the root
-  void init() ;
-
-  /// Memory cleaning
-  void clear() { clear_octree() ;  _mc.clean_all() ; }
-
-  /// Delete the content of the octree
-  void clear_octree() ;
-
-  /// Compute the optimal level
-  void compute_opt_level() ;
-  
-  /// Check that only the leaves have data
-  bool check () ;
-
-  /// Prints statistics about the octree
-  void stats() const ;
-
-  /// Return the maximal level of the octree
-  Level  max_level() const { Level lv = MAX_LEVEL ; while( lv > 0 && !_level_dist[lv] ) --lv ; return lv ; }
-  
-  /// Return the optimal level of the octree
-  Level  opt_level() const { return _opt_level ; }
-  
-  /// Return the optimal level of the octree
-  Level &opt_level()  { return _opt_level ; }
-  
-  /// Return the maximal field of the octree
-  real max_field() const { return _max_field ; }
-   
-  /// Return the isosurface
-  MarchingCubes &mc() { return _mc ; }
-
-  /// Return the isosurface draw
-  MC_Draw &mc_draw() { return _mc_draw ; }
-  
-  /// set the values of each leaf from the implicit function
-  bool set_impl( data_access *ref = NULL ) ;
-  
-  /// Refine the octree according to the data access
-  bool refine( data_access *ref = NULL ) ;
-
-  /// Adapt the octree according to the data access
-  bool adapt( data_access *ref = NULL ) ;
-  
-  /// Draw the octree with wireframe
-  bool draw_wire() ;
-  
-  /// Draw the octree with dots
-  bool draw_centers() ;
-  
-  /// Dual function type
-  typedef bool mem_dual_walker( MemOctree &fo, Key *keys ) ;
-
-  /// Walk on the dual cubes
-  bool dual_cubes_walk( mem_dual_walker &walker ) ;
-
-  /// Build the isosurface using dual marching cubes
-  bool build_isosurface( data_access *ref = NULL ) ;
-  
-  /// Draw the isosurface on-the-fly using dual marching cubes
-  bool direct_draw_isosurface( data_access *ref = NULL ) ;
-  
-  /// Draw the dual octree with wireframe
-  bool draw_dual() ;
-  
-  /// Do nothing, just for dual generation timing
-  bool dual_timing() ;
-  
-//-----------------------------------------------------------------------------
-// iterators
-public:
-  /// Create an iterator traversing the tree from the root
-  inline cell_iterator cells_begin() { return cell_iterator( *this ) ; }
-
-  /// Create an iterator traversing the leaves of the tree from the root
-  inline leaf_iterator leaves_begin() { return leaf_iterator( *this ) ; }
-
-//-----------------------------------------------------------------------------
-// search operations
-public:
-  /// Find cells of the octree at a given position
-  bool find_leaf( Key k, Level o_lv, geom_cell &cell ) const ;
-  bool find_leaf( Key k, geom_cell &cell ) const { return find_leaf( k, opt_level(), cell ) ; }
-  bool find_leaf( real x, real y, real z, geom_cell &cell ) const { return find_leaf( cube2key( Cube(x,y,z,MAX_LEVEL) ), opt_level(), cell ) ; }
-
-  /// Find cells of the octree inside a given box of center x,y,z and half side r
-  bool find_radius( real x, real y, real z, real r, List<geom_cell> &cells ) const ;
-
-  /// Find adjacent cells of the octree to a given cell
-  bool adjacent( Key k, List<geom_cell> &cells ) const ;
-  bool adjacent( const geom_cell &cell, List<geom_cell> &cells ) const { return adjacent( cell.key(), cells ) ; }
-
-  /// Leaf test based on the field value
-  bool is_leaf( const HashField::KeyData &kd ) const { return !is_inv( kd.data ) ; }
-  
-  /// Leaf test based on the field value
-  bool is_leaf( Key k, real &d ) const { const HashField::KeyData &kd = _hash[k] ; d = kd.data ; return is_leaf( kd ) ; }
-
-  /// Leaf test based on the field value
-  bool is_leaf( Key k ) const { return is_leaf( _hash[k] ) ; }
-  
-  /// Node existence
-  bool node_exists( Key k, HashField::KeyData &kd ) const { kd = _hash[k] ;  return kd.key != KEY_INV ; }
-  
-  //-----------------------------------------------------------------------------
-// I/O
-public:
-
-  /// Draws the intersecting cells of a plane with the octree with color
-  void draw_plane ( real nx, real ny, real nz, real d	  ) ;
-
-  /// Draws the intersection of a plane with the octree with color
-  void draw_slice ( real nx, real ny, real nz, real d, float alpha ) ;
-
-  /// Draws the isosurface of level l inside the dual graph
-  void draw_iso   () { _mc.draw_surf() ; }
-
-//_____________________________________________________________________________
-// Iterator Cell
-public :
-  /// Auxiliary structure to traverse the octree
-  class geom_cell : public Cube
-  //---------------------------------------------------------------------------
-  {
-    friend class MemOctree ;
-
-  protected:
-    Key   _key   ;  ///< octree cell
-    real  _field ;  ///< field associated to the cell
-
-  //---------------------------------------------------------------------------
-  // Constructors
-  public:
-    /// Default constructor
-    geom_cell( Key key_ = KEY_INV, real field_ = R_INV ) : Cube(key2cube(key_)), _key(key_), _field(field_) {}
-
-    /// Default constructor
-    geom_cell( HashField::KeyData kd ) : Cube(key2cube(kd.key)), _key(kd.key), _field(kd.data) {}
-
-    /// Destructor
-    ~geom_cell() {}
-
-    /// Copy constructor
-    geom_cell( const geom_cell &i ) : Cube(i), _key(i._key), _field(i._field) {}
-
-    /// Assignment operator
-    geom_cell &operator = ( const geom_cell &i )
-    {  Cube::operator=(i) ;  _key = i._key ;  _field = i._field ;  return *this; }
-    
-
-  //---------------------------------------------------------------------------
-  // Public constant accessors
-  public  :
-    /// key const accessor
-    inline Key  key() const { return _key ; }
-    /// key accessor
-    inline Key &key() { return _key ; }
-
-    /// id const accessor
-    inline real  operator*() const { return _field ; }
-    
-    //---------------------------------------------------------------------------
-  // Tests
-  public :
-    /// equality operator
-    inline bool operator ==( const geom_cell &i ) const { return key() == i.key() ; }
-
-    /// inequality operator
-    inline bool operator !=( const geom_cell &i ) const { return key() != i.key() ; }
-
-    /// leaf test
-    inline bool is_leaf() const { return !is_inv(*(*this)) ; }
-
-    /// validation operator
-    inline bool      operator ()() const { return key() != KEY_INV ; }
-
-  //---------------------------------------------------------------------------
-  // Operations
-  public  :
-    /// sons
-    inline bool sons( geom_cell *s /*[8]*/, const HashField &hash )
-    {
-      if( is_leaf() ) return false ;
-
-      Key k = _key << 3 ;
-      for( int i = 0 ; i < 8 ; ++i )
-      {
-        s[i]._key   = k | i ;
-        s[i]._field = hash[k|i].data ;
-        (Cube&)s[i] = key2cube(s[i]._key) ;
-      }
-      return true ;
-    }
-  };
-
-  const geom_cell geom_root() const { const Key root_key = 1 ; return geom_cell( root_key, _hash[root_key].data ) ; }
-  const geom_cell geom_key ( Key k ) const { return geom_cell( k, _hash[k].data ) ; }
-
-
-
-//_____________________________________________________________________________
-// Cell Iterator
-public :
-  /// Octree cell iterator : Traverse the octree returning basic information on the cells
-  class cell_iterator
-  //---------------------------------------------------------------------------
-  {
-    friend class MemOctree ;
-
-  protected:
-    /// Octree traversal iterator
-    HashField::iterator _it ;
-
-  //---------------------------------------------------------------------------
-  // Constructors
-  public:
-    /// Default constructor : Constructs an iterator from a cell
-    cell_iterator( MemOctree &o ) : _it( o._hash.begin() ) {}
-
-    /// Destructor
-    ~cell_iterator() {}
-
-    /// Copy constructor
-    cell_iterator( const cell_iterator &i ) : _it(i._it) {}
-
-    /// Assignment operator
-    cell_iterator &operator = ( const cell_iterator &i )
-    { _it = i._it; return *this; }
-
-  //---------------------------------------------------------------------------
-  // Operations
-  public  :
-    /// equality operator
-    inline bool operator ==( const cell_iterator &i ) const { return _it == i._it ; }
-
-    /// inequality operator
-    inline bool operator !=( const cell_iterator &i ) const { return _it != i._it ; }
-
-    /// validation operator
-    inline bool      operator ()() const { return _it() ; }
-
-    /// next position
-    inline cell_iterator &operator ++() { ++_it ; return *this ; }
-
-  //---------------------------------------------------------------------------
-  // Accessors
-  public  :
-    // cell accessor
-    inline geom_cell top() const { return geom_cell( key(), *_it ) ; }
-
-    /// id accessor
-    inline real &operator*() { return *_it ; }
-
-    /// level accessor
-    inline Level lv() { return key_level(_it.key()) ; }
-
-    /// size accessor
-    inline real  sz() { return Cube(0,0,0,lv()).sz() ; }
-    
-    /// key accessor
-    inline Key   key() const { return _it.key() ; }
-    
-    /// points accessor
-    inline bool is_leaf() const { return !is_inv(*_it) ; }
-
-    /// Draws the cell wire with opengl
-    void draw_wire  () const { top().draw_wire  () ; }
-
-  };
-
-
-  /// Octree leaf iterator : Traverse the octree returning basic information on the leaves
-  class leaf_iterator : public cell_iterator
-  //---------------------------------------------------------------------------
-  {
-    public :
-    leaf_iterator( MemOctree &o ) : cell_iterator( o )
-    { if( (*this)() && !this->is_leaf() ) ++(*this) ; }
-
-    
-    /// next position
-    inline leaf_iterator &operator ++()
-    {
-      cell_iterator &it = *this ;
-      do ++it ; while ( it() && !it.is_leaf() ) ;
-      return *this ;
-    }
-  } ;
-} ;
-//_____________________________________________________________________________
-
-
-
diff --git a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/mlist.h b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/mlist.h
deleted file mode 100644
index 1a86fec0b2..0000000000
--- a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/mlist.h
+++ /dev/null
@@ -1,502 +0,0 @@
-/**
- * @file    mlist.h
- * @author  Thomas Lewiner <thomas.lewiner@polytechnique.org>
- * @version 0.3
- * @date    28/06/2004
- *
- * @brief   template list class
- */
-//_____________________________________________________________________________
-
-
-
-#pragma once
-
-#include <stdlib.h> // qsort
-
-typedef unsigned int  lsize ;
-typedef const lsize   clsize ;
-
-//_____________________________________________________________________________
-/// template list class
-template <typename T> class List
-//-----------------------------------------------------------------------------
-{
-// types
-public :
-  class node ;
-  class iterator ;
-  class const_iterator ;
-
-//-----------------------------------------------------------------------------
-// default constructors
-public  :
-  /// default constructors
-  List() : _first((node*)NULL) {}
-
-  /// one-element constructor
-  List( const T &val ) : _first((node*)NULL) { insert(val) ; }
-
-  /// copy constructor (reverse order)
-  List( const List<T> &l ) : _first((node*)NULL)
-    {
-      for( const_iterator it = l.cbegin() ; it() ; ++it )
-        insert( *it ) ;
-    }
-
-  /// assignment operator
-  List<T> &operator = ( const List<T> &l ) { if( this != &l) { clear() ;  for( const_iterator it = l.cbegin() ; it() ; ++it ) insert( *it ) ; }  return *this; }
-
-  /// destructor
-  ~List() { clear() ; }
-
-  /// number of elements of the list
-  clsize size() const { lsize n = 0 ; for( const_iterator it = cbegin() ; it() ; ++it ) ++n ; return n ; }
-
-  /// number of elements of the list
-  bool size_greater( clsize m ) const { lsize n = 0 ; for( const_iterator it = cbegin() ; it() ; ++it ) { if(++n > m) return true ; } return false ; }
-
-  /// number of elements of the list
-  bool size_greater_or_equal( clsize m ) const { if( m == 0 ) return true ; lsize n = 0 ; for( const_iterator it = cbegin() ; it() ; ++it ) { if(++n >= m) return true ; } return false ; }
-
-  /// tests if the list has one element
-  bool empty () const { return _first == (node*)NULL ; }
-
-  /// tests if the list has two elements
-  bool single() const { return !empty() && _first->next() == (node*)NULL ; }
-
-  /// tests if the list has three elements
-  bool pair  () const { return !empty() && _first->next() != (node*)NULL && _first->next()->next() == (node*)NULL ; }
-
-  /// tests if the list has more than three elements
-  bool triple() const { return !empty() && _first->next() != (node*)NULL && _first->next()->next() != (node*)NULL ; }
-
-  const T  first () const { return _first->val() ; }  ///< first element accessor
-  T       &first ()       { return _first->val() ; }  ///< first element accessor
-  const T  second() const { return _first->next()->val() ; }  ///< second element accessor
-  T       &second()       { return _first->next()->val() ; }  ///< second element accessor
-  const T  third () const { return _first->next()->next()->val() ; }  ///< third element accessor
-  T       &third ()       { return _first->next()->next()->val() ; }  ///< third element accessor
-
-  /// get the first two elements
-  bool firsts( T &t1, T &t2 ) const { if( !empty() ) { t1 = first() ; if( !single() ) { t2 = second() ; return true ; } } return false ; }
-  /// get the first three elements
-  bool firsts( T &t1, T &t2, T &t3 ) const { if( firsts( t1,t2 ) ) { if( !pair() ) t3 = third() ; return true ; } return false ; }
-
-  const T  top () const { return _first->val() ; }  ///< first element accessor
-  T       &top ()       { return _first->val() ; }  ///< first element accessor
-
-//-----------------------------------------------------------------------------
-// clear
-public  :
-  /// destructor
-  void clear()
-    {
-      node *p = _first ;
-      while( p != (node*)NULL )
-      {
-        node *n = p->next() ;
-        delete p ;
-        p = n ;
-      }
-      _first = (node*)NULL ;
-    }
-
-  /// emptyness test
-  inline bool empty() { return _first == (node*)NULL ; }
-
-//-----------------------------------------------------------------------------
-// find and replace
-public  :
-  /// membership test
-  const_iterator cfind( const T &val ) const { for( const_iterator it = cbegin() ; it() ; ++it )  if( (*it) == val ) return it ; return cend() ; }
-
-  /// membership test
-  iterator find( const T &val ) { for( iterator it = begin() ; it() ; ++it )  if( (*it) == val ) return it ; return end() ; }
-
-  /// membership test (return also the last pointer for eventual remotion)
-  iterator find( const T &val, iterator &lst ) { lst = end() ; for( iterator it = begin() ; it() ; ++it ) { if( *it == val ) return it ;  lst = it ; } return end() ; }
-
-  /// membership test
-  clsize pos( const T &val ) const { lsize i = 0 ; for( const_iterator it = cbegin() ; it() ; ++it, ++i )  if( *it == val ) return i ; return (clsize)-1 ; }
-
-  /// get the minimal element
-  const_iterator min_val() const { if( empty() ) return cend() ; const_iterator it = cbegin(), m = it ; for( ++it ; it() ; ++it ) { if( *it < *m  ) m = it ; } return m ; }
-
-  /// get the minimal element
-  iterator min_val() { if( empty() ) return end() ; iterator it = begin(), m = it ; for( ++it ; it() ; ++it ) { if( *it < *m  ) m = it ; } return m ; }
-
-  /// get the maximal element
-  const_iterator max_val() const { if( empty() ) return cend() ; const_iterator it = cbegin(), m = it ; for( ++it ; it() ; ++it ) { if( *it > *m  ) m = it ; } return m ; }
-
-  /// get the maximal element
-  iterator max_val() { if( empty() ) return end() ; iterator it = begin(), m = it ; for( ++it ; it() ; ++it ) { if( *it > *m  ) m = it ; } return m ; }
-
-  /// replacing the elements of a list
-  clsize replace( const T &old_val, const T &new_val )
-    {
-      lsize n = 0 ;
-      for( iterator it = begin() ; it() ; ++it )
-        if( *it == old_val ) { *it = new_val ;  ++n ; }
-      return n ;
-    }
-
-//-----------------------------------------------------------------------------
-// element insertion
-public  :
-  /// insertion at the beginning
-  inline void push_front( const T &val ) { _first = new node( val, _first ) ; }
-
-  /// insertion in the middle
-  iterator push_after( const T &val, iterator i = begin() )
-    {
-      if( i == end() ) { push_front( val ) ; return begin() ; }
-      i._node->next() = new node( val, i._node->next() ) ;
-      return ++i ;
-    }
-
-  /// insertion at the end
-  iterator push_back( const T &val )
-    {
-      return push_after( val, last() ) ;
-    }
-
-  /// insertion
-  inline void insert( const T &val ) { push_front( val ) ; }
-  
-  /// insertion
-  inline void push( const T &val ) { push_front( val ) ; }
-  
-  /// insertion without duplicates
-  inline bool insert_unique( const T &val ) { if( !find(val)() ) {push_front( val ); return true;} return false; }
-
-
-  /// list insertion (reverse, at the begining)
-  void insert( const List<T> &l )
-    { for( const_iterator lit = l.cbegin() ; lit() ; ++lit ) insert( *lit ) ; }
-
-  /// list insertion without duplicates (reverse, at the begining)
-  void insert_unique( const List<T> &l )
-    { for( const_iterator lit = l.cbegin() ; lit() ; ++lit ) insert_unique( *lit ) ; }
-
-  /// list insertion (ordered)
-  void insert_ordered( const List<T> &l )
-    {
-      const_iterator lit = l.cbegin() ;
-      iterator it = push_back( *lit ) ;
-      for( ; lit() ; ++lit )
-        it = push_after( *lit, it ) ;
-    }
-
-
-  /// copy a list and clear its content
-  void insert_and_clear( List<T> &l )
-    {
-      if( this == &l ) return ;
-      iterator lst = last() ;
-      if( lst() )
-        lst._node->next() = l._first ;
-      else
-        _first = l._first ;
-      l._first = NULL ;
-    }
-
-//-----------------------------------------------------------------------------
-// element remotion
-public  :
-  /// removing the first element of the list
-  void remove_first()
-    {
-      node *p = _first->next() ;
-      delete _first ;
-      _first = p ;
-    }
-
-  /// removing the first element of the list
-  void pop() { remove_first() ; }
-
-  /// removing elements from the list
-  void remove_next( iterator &prev )
-    {
-      node *p ;
-      if( prev == end() )
-      { p = _first->next() ; delete _first ; _first = p ; }
-      else if( prev._node )
-      { p = prev._node->next() ; prev._node->next() = p->next() ; delete p ; }
-    }
-
-  /// removing elements from the list
-  bool remove( T &val )
-  {
-    iterator prev = end() ;
-    for( iterator it = begin() ; it() ; )
-    {
-      if( *it != val ) { prev = it ; ++it ; continue ; }
-      val = *it ;
-      node *p ;
-      if( prev == end() )
-      { p = _first->next() ; delete _first ; _first = p ; it = begin() ; }
-      else
-      { p = it._node ; prev._node->next() = it._node->next() ; delete p ; it = prev ; ++it ; }
-      return true ;
-    }
-    return false ;
-  }
-
-  /// removing elements from the list
-  clsize remove_all( const T &val )
-    {
-      lsize n = 0 ;
-      iterator prev = end() ;
-      for( iterator it = begin() ; it() ; )
-      {
-        if( *it != val ) { prev = it ; ++it ; continue ; }
-        node *p ;
-        if( prev == end() )
-        { p = _first->next() ; delete _first ; _first = p ; it = begin() ; }
-        else
-        { p = it._node ; prev._node->next() = it._node->next() ; delete p ; it = prev ; ++it ; }
-        ++n ;
-        if( !it() ) return n ;
-      }
-      return n ;
-    }
-
-
-//-----------------------------------------------------------------------------
-// sort
-public  :
-  /// array transform
-  void get_array( T *a, clsize sz /*= size()*/ )
-    {
-      lsize i = 0 ;
-      for( const_iterator it = cbegin() ; it() && i < sz ; ++it, ++i )
-        a[i] = *it ;
-    }
-
-  /// array transform
-  T *get_array( clsize sz /*= size()*/ )
-    {
-      T  *a = new T[sz] ;
-      get_array( a,sz ) ;
-      return a ;
-    }
-
-  /// array read
-  void set_array( clsize sz = 0, const T *a = (const T*)NULL )
-    {
-      clear() ;
-      if( sz == 0 ) return ;
-      push_front( a[0] ) ;
-      iterator it = begin() ;
-      for( lsize i = 1 ; i < sz ; ++i )
-        it = push_after( a[i], it ) ;
-    }
-
-  /// sort
-  void sort( int compare(const void*,const void*) )
-    {
-      clsize sz = size() ;
-      T  *a  = get_array( sz ) ;
-      qsort( (void*)a, sz, sizeof(T), compare ) ;
-      set_array( sz, a ) ;
-      delete [] a ;
-    }
-
-//-----------------------------------------------------------------------------
-// Elements
-private :
-  node  *_first; ///< link to the first element
-
-
-
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-// node representation
-public :
-  /// node of a list
-  class node
-  {
-  public :
-  // constructors
-    /// default constructors
-    node( T val_, node *next_ = (node*)NULL ) : _val (val_) , _next (next_) {}
-
-    /// destructor
-    ~node() {}
-
-    /// copy constructor
-    node( const node &n ) : _val(n.val()), _next(n.next()) {}
-
-    /// assignment operator
-    node &operator = ( const node &n )
-    { _val = n.val(); _next = n.next(); return this; }
-
-  //-----------------------------------------------------------------------------
-  // Accessors
-  public  :
-    inline const T    &val () const { return _val  ; }  ///< accesses the value of the node
-    inline const node *next() const { return _next ; }  ///< accesses the next element
-
-    inline T     &val () { return _val  ; }  ///< accesses the value of the node
-    inline node *&next() { return _next ; }  ///< accesses the next element
-
-  //-----------------------------------------------------------------------------
-  // Elements
-  private :
-    T      _val ; ///< value
-    node  *_next; ///< link to the next element
-  };
-
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-// const_iterator
-public :
-  /// list const iterator
-  class const_iterator
-  {
-  public :
-  // constructors
-    /// default constructors
-    const_iterator( node *n = (node*)NULL ) : _node(n) {}
-
-    /// destructor
-    ~const_iterator() {}
-
-    /// copy constructor
-    const_iterator( const const_iterator &i ) : _node(i._node) {}
-
-    /// assignment operator
-    const_iterator &operator = ( const const_iterator &i )
-    { _node = i._node; return *this; }
-
-    friend class List<T> ;
-
-  //-----------------------------------------------------------------------------
-  // Operations
-  public  :
-    inline bool            operator ==( const const_iterator &i ) const { return _node == i._node ; }  ///< equality operator
-    inline bool            operator !=( const const_iterator &i ) const { return _node != i._node ; }  ///< inequality operator
-    inline bool            operator ()() const { return _node != (node*)NULL ; }                       ///< validation operator
-    inline const T        &operator * () const { return _node->val() ; }                               ///< value accessor
-    inline const_iterator &operator ++() { _node = _node->next() ; return *this ; }              ///< accesses the next position
-
-  //-----------------------------------------------------------------------------
-  // Elements
-  private :
-    node  *_node; ///< node position
-  };
-
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-// iterator
-public :
-  /// list iterator
-  class iterator
-  {
-  public :
-  // constructors
-    /// default constructors
-    iterator( node *n = (node*)NULL ) : _node(n) {}
-
-    /// destructor
-    ~iterator() {}
-
-    /// copy constructor
-    iterator( const iterator &i ) : _node(i._node) {}
-
-    /// assignment operator
-    iterator &operator = ( const iterator &i )
-    { _node = i._node; return *this; }
-
-    friend class List <T> ;
-
-  //-----------------------------------------------------------------------------
-  // Operations
-  public  :
-    inline bool      operator ==( const iterator &i ) const { return _node == i._node ; }  ///< equality operator
-    inline bool      operator !=( const iterator &i ) const { return _node != i._node ; }  ///< inequality operator
-    inline bool      operator ()() const { return _node != (node*)NULL ; }                 ///< validation operator
-    inline T        &operator * () const { return _node->val() ; }                         ///< value accessor
-    inline iterator &operator ++() { _node = _node->next() ; return *this ; }        ///< accesses the next position
-
-  //-----------------------------------------------------------------------------
-  // Elements
-  private :
-    node  *_node; ///< node position
-  };
-
-//-----------------------------------------------------------------------------
-// iterator creation
-public  :
-  inline const_iterator cbegin() const { return const_iterator( _first ) ; }      ///< iterator creation
-  inline const_iterator cend  () const { return const_iterator( (node*)NULL ) ; }  ///< iterator end
-  inline iterator begin() { return iterator( _first ) ; }      ///< iterator creation
-  inline iterator end  () { return iterator( (node*)NULL ) ; }  ///< iterator end
-
-  /// last position
-  iterator last () { iterator lst = end(), it = begin() ; while( it() ) { lst = it ; ++it ; } return lst ; }
-};
-//_____________________________________________________________________________
-
-
-
-
-//_____________________________________________________________________________
-/// template list class
-template <typename T> class Queue : public List<T>
-//-----------------------------------------------------------------------------
-{
-//-----------------------------------------------------------------------------
-// default constructors
-public  :
-  /// default constructors
-  Queue() : List<T>() { _last = this->end() ; }
-
-  /// one-element constructor
-  Queue( const T &val ) : List<T>( val ) { _last = this->begin() ; }
-
-  /// copy constructor (reverse order)
-  Queue( const Queue<T> &q ) : List<T>()
-    { for( typename List<T>::const_iterator it = q.cbegin() ; it() ; ++it ) Queue<T>::insert( *it ) ; }
-
-  /// assignment operator
-  Queue<T> &operator = ( const Queue<T> &q )
-   { if( this != &q) { this->clear() ;  for( typename List<T>::const_iterator it = q.cbegin() ; it() ; ++it ) insert( *it ) ; }  return *this; }
-
-  /// destructor
-  ~Queue() { this->clear() ; }
-
-
-//-----------------------------------------------------------------------------
-// element insertion
-public  :
-  /// insertion at the end
-  inline void insert( const T &val )
-    { _last = push_after( val, _last ) ; }
-
-  /// queue insertion
-  void insert( const Queue<T> &l )
-    { for( typename List<T>::const_iterator lit = l.cbegin() ; lit() ; ++lit ) insert( *lit ) ; }
-
-//-----------------------------------------------------------------------------
-// stqndqrd function
-public  :
-  /// first element
-  inline const T front() const { return this->first() ; }
-
-  /// insertion at the end
-  inline void push( const T &val ) { this->insert( val ) ; }
-
-  /// deletion at the beginning
-  inline void pop () { this->remove_first() ;  if( this->empty() ) _last = this->end() ; }
-
-
-//-----------------------------------------------------------------------------
-// Elements
-private :
-  typename List<T>::iterator _last; ///< link to the last element
-};
-//_____________________________________________________________________________
-
-
diff --git a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/morton.cpp b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/morton.cpp
deleted file mode 100644
index 43799f63ef..0000000000
--- a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/morton.cpp
+++ /dev/null
@@ -1,458 +0,0 @@
-/**
- * \file    morton.cpp
- * \author  Thomas Lewiner   <tomlew@puc-rio.br>
- * \author  Rener Pereira de Castro <rener@mat.puc-rio.br> 
- * \author  Matmidia Lab, Math Dept, PUC-Rio
- * \date    10/01/2010
- *
- * \brief  Morton codes manipulation
- *
- * Morton codes manipulation
- */
-//_____________________________________________________________________________
-
-
-#ifndef WIN32
-#pragma implementation
-#endif // WIN32
-
-#include "morton.h"
-
-//_____________________________________________________________________________
-// static
-#ifdef UNIX
-real  R_INV = strtof("NAN(char-sequence)", NULL); //nanf(0) ;
-#else
-real  R_INV = nan(0) ;
-#endif
-
-Level L_INV = (Level)-1 ;
-Point P_INV( R_INV, R_INV, R_INV ) ;
-Cube  C_INV( P_INV, L_INV ) ;
-Key   KEY_INV = 0 ;
-//_____________________________________________________________________________
-
-
-//_____________________________________________________________________________
-// Static Members Aux
-
-
-// 1 << ((dz==0)+(dy==0)+(dx==0))
-static const char nsubneighbors[27] = { 1, // Direction (-1,-1,-1)
-                                        2, // Direction (-1,-1, 0)
-                                        1, // Direction (-1,-1, 1)
-                                        2, // Direction (-1, 0,-1)
-                                        4, // Direction (-1, 0, 0)
-                                        2, // Direction (-1, 0, 1)
-                                        1, // Direction (-1, 1,-1)
-                                        2, // Direction (-1, 1, 0)
-                                        1, // Direction (-1, 1, 1)
-                                        2, // Direction ( 0,-1,-1)
-                                        4, // Direction ( 0,-1, 0)
-                                        2, // Direction ( 0,-1, 1)
-                                        4, // Direction ( 0, 0,-1)
-                                        0, // Direction ( 0, 0, 0)
-                                        4, // Direction ( 0, 0, 1)
-                                        2, // Direction ( 0, 1,-1)
-                                        4, // Direction ( 0, 1, 0)
-                                        2, // Direction ( 0, 1, 1)
-                                        1, // Direction ( 1,-1,-1)
-                                        2, // Direction ( 1,-1, 0)
-                                        1, // Direction ( 1,-1, 1)
-                                        2, // Direction ( 1, 0,-1)
-                                        4, // Direction ( 1, 0, 0)
-                                        2, // Direction ( 1, 0, 1)
-                                        1, // Direction ( 1, 1,-1)
-                                        2, // Direction ( 1, 1, 0)
-                                        1, // Direction ( 1, 1, 1)                               
-                                      };
-
-static const char l3b[27][4] = { {7,-1,-1,-1},{6, 7,-1,-1},{6,-1,-1,-1},{5, 7,-1,-1},{4, 5, 6, 7},{4, 6,-1,-1},{ 5,-1,-1,-1},
-                                 {4, 5,-1,-1},{4,-1,-1,-1},{3, 7,-1,-1},{2, 3, 6, 7},{2, 6,-1,-1},{1, 3, 5, 7},{-1,-1,-1,-1},
-                                 {0, 2, 4, 6},{1, 5,-1,-1},{0, 1, 4, 5},{0, 4,-1,-1},{3,-1,-1,-1},{2, 3,-1,-1},{ 2,-1,-1,-1},
-                                 {1, 3,-1,-1},{0, 1, 2, 3},{0, 2,-1,-1},{1,-1,-1,-1},{0, 1,-1,-1},{0,-1,-1,-1},};
-//_____________________________________________________________________________
-// Contraction and Dilatation Masks
-static const uint three_2 = 9 ;
-static const uint three_1 = 3 ;
-static const uint three_0 = 1 ;
-static const uint shift_2a = 18, shift_2b = 36 ;
-static const uint shift_1a =  6, shift_1b = 12 ;
-static const uint shift_0a =  2, shift_0b =  4 ;
-static const Key dilate_mask_2 = (Key)0x7FC0000FF80001FFLL ;  // bits 1 from 0-9, 27-36 and 54-63
-static const Key dilate_mask_1 = (Key)0x01C0E070381C0E07LL ;  // bits 1 from 0-3, 9-12, 18-21,...
-static const Key dilate_mask_0 = (Key)0x9249249249249249LL ;  // bits 1 at 0,3,6,9,12,...
-static const Key dilate_tz     = (Key)0x4924924924924924LL ;  // bits 1 at 2,5,8,11,14,...    rigth to left
-static const Key dilate_ty     = (Key)0x2492492492492492LL ;  // bits 1 at 1,4,7,10,13,...
-static const Key dilate_tx     = (Key)0x9249249249249249LL ;  // bits 1 at 0,3,6,9,12,...  
-static const Key dilate_t1     = (Key)0xB6DB6DB6DB6DB6DBLL ;  // bits 0 at 2,5,8,11,14,...    = ~tz
-static const Key dilate_t2     = (Key)0xDB6DB6DB6DB6DB6DLL ;  // bits 0 at 1,4,7,10,13,...    = ~ty
-static const Key dilate_t3     = (Key)0x6DB6DB6DB6DB6DB6LL ;  // bits 0 at 0,3,6,9,12,...     = ~tx
-
-//_____________________________________________________________________________
-// Step Directions Find Neighbours - 26                              (dz,dy,dx)
-static const Key dir_neigh[27] = { (Key)0xFFFFFFFFFFFFFFFFLL , // Direction (-1,-1,-1)
-                                   (Key)0x6DB6DB6DB6DB6DB6LL , // Direction (-1,-1, 0)
-                                   (Key)0x6DB6DB6DB6DB6DB7LL , // Direction (-1,-1, 1)
-                                   (Key)0xDB6DB6DB6DB6DB6DLL , // Direction (-1, 0,-1)
-                                   (Key)0x4924924924924924LL , // Direction (-1, 0, 0)
-                                   (Key)0x4924924924924925LL , // Direction (-1, 0, 1)
-                                   (Key)0xDB6DB6DB6DB6DB6FLL , // Direction (-1, 1,-1)
-                                   (Key)0x4924924924924926LL , // Direction (-1, 1, 0)
-                                   (Key)0x4924924924924927LL , // Direction (-1, 1, 1)
-                                   (Key)0xB6DB6DB6DB6DB6DBLL , // Direction ( 0,-1,-1)
-                                   (Key)0x2492492492492492LL , // Direction ( 0,-1, 0)
-                                   (Key)0x2492492492492493LL , // Direction ( 0,-1, 1)
-                                   (Key)0x9249249249249249LL , // Direction ( 0, 0,-1)
-                                   (Key)0x0000000000000000LL , // Direction ( 0, 0, 0)
-                                   (Key)0x0000000000000001LL , // Direction ( 0, 0, 1)
-                                   (Key)0x924924924924924BLL , // Direction ( 0, 1,-1)
-                                   (Key)0x0000000000000002LL , // Direction ( 0, 1, 0)
-                                   (Key)0x0000000000000003LL , // Direction ( 0, 1, 1)
-                                   (Key)0xB6DB6DB6DB6DB6DFLL , // Direction ( 1,-1,-1)
-                                   (Key)0x2492492492492496LL , // Direction ( 1,-1, 0)
-                                   (Key)0x2492492492492497LL , // Direction ( 1,-1, 1)
-                                   (Key)0x924924924924924DLL , // Direction ( 1, 0,-1)
-                                   (Key)0x0000000000000004LL , // Direction ( 1, 0, 0)
-                                   (Key)0x0000000000000005LL , // Direction ( 1, 0, 1)
-                                   (Key)0x924924924924924FLL , // Direction ( 1, 1,-1)
-                                   (Key)0x0000000000000006LL , // Direction ( 1, 1, 0)
-                                   (Key)0x0000000000000007LL , // Direction ( 1, 1, 1)                               
-                                 };
-
-//_____________________________________________________________________________
-
-
-
-
-
-//_____________________________________________________________________________
-// octree depth level associated to a morton key ( = (bit length - 1) / 3 )
-Level key_level ( Key k )
-//_____________________________________________________________________________
-{
-  static const real lg2_3 = 1.0 / (log(2)*3) ;
-  if( k == KEY_INV ) return L_INV ;
-  return (Level) floor( log(k) * lg2_3 ) ;
-/*
-  Level count = 0 ;
-  do
-  {
-    k >>= 3 ;
-    ++count;
-  }
-  while( k > 0 ) ;
-	  
-  return count-1 ;
-*/
-}
-//_____________________________________________________________________________
-
-
-//_____________________________________________________________________________
-// containment text implemented directly onf the key
-bool key_contains( Key k_big, Key k_small )
-//_____________________________________________________________________________
-{
-  while( (k_small!=KEY_INV) && ((k_small>>3) != k_big) )
-    k_small >>= 3;
-  return k_small != KEY_INV ;  
-  // k_small & 7
-}
-//_____________________________________________________________________________
-
-
-
-//_____________________________________________________________________________
-// convert an octree cube to a morton key using integer contraction
-Key cube2key ( const Cube &c )
-//_____________________________________________________________________________
-{
-  uint level = c.lv();
-	Key  m     = 1 << level ;
-	real sz    = (real) m ;
-	
-	Key bz = (Key) floor( c.z() * sz ) ;
-	Key by = (Key) floor( c.y() * sz ) ;
-	Key bx = (Key) floor( c.x() * sz ) ;
-	/*
-	 if( bz >= m ) bz = m-1 ;
-	 if( by >= m ) by = m-1 ;
-	 if( bx >= m ) bx = m-1 ;
-	 */
-	
-	if( level > three_2 )
-	{
-		bz = ( bz | (bz << shift_2a) | (bz << shift_2b) ) & dilate_mask_2 ;
-		by = ( by | (by << shift_2a) | (by << shift_2b) ) & dilate_mask_2 ;
-		bx = ( bx | (bx << shift_2a) | (bx << shift_2b) ) & dilate_mask_2 ;
-	}
-	if( level > three_1 )
-	{
-		bz = ( bz | (bz << shift_1a) | (bz << shift_1b) ) & dilate_mask_1 ;
-		by = ( by | (by << shift_1a) | (by << shift_1b) ) & dilate_mask_1 ;
-		bx = ( bx | (bx << shift_1a) | (bx << shift_1b) ) & dilate_mask_1 ;
-	}
-	if( level > three_0 )
-	{
-		bz = ( bz | (bz << shift_0a) | (bz << shift_0b) ) & dilate_mask_0 ;
-		by = ( by | (by << shift_0a) | (by << shift_0b) ) & dilate_mask_0 ;
-		bx = ( bx | (bx << shift_0a) | (bx << shift_0b) ) & dilate_mask_0 ;
-	}
-  return (Key(1) << (3*level)) | (bz << 2) | (by << 1) | bx ;
-}
-//_____________________________________________________________________________
-
-
-//_____________________________________________________________________________
-// convert a morton key to a key using integer dilation
-const Cube key2cube ( Key  key )
-//_____________________________________________________________________________
-{
-  if( key == KEY_INV )
-    return C_INV ;
-  
-  Level level = key_level( key ) ;
-  Key bz( (key >> 2) & dilate_mask_0 ) ;
-  Key by( (key >> 1) & dilate_mask_0 ) ;
-  Key bx( (   key  ) & dilate_mask_0 ) ;
-  
-  if( level > three_0 )
-  {
-    bz = ( bz | (bz >> shift_0a) | (bz >> shift_0b) ) & dilate_mask_1 ;
-    by = ( by | (by >> shift_0a) | (by >> shift_0b) ) & dilate_mask_1 ;
-    bx = ( bx | (bx >> shift_0a) | (bx >> shift_0b) ) & dilate_mask_1 ;
-    
-    if( level > three_1 )
-    {
-      bz = ( bz | (bz >> shift_1a) | (bz >> shift_1b) ) & dilate_mask_2 ;
-      by = ( by | (by >> shift_1a) | (by >> shift_1b) ) & dilate_mask_2 ;
-      bx = ( bx | (bx >> shift_1a) | (bx >> shift_1b) ) & dilate_mask_2 ;
-      
-      if( level > three_2 )
-      {
-        bz = bz | (bz >> shift_2a) | (bz >> shift_2b) ;
-        by = by | (by >> shift_2a) | (by >> shift_2b) ;
-        bx = bx | (bx >> shift_2a) | (bx >> shift_2b) ;
-      }
-    }
-  }
-  
-  Key length_mask = (1 << level) -1 ;
-  bz &= length_mask ;
-  by &= length_mask ;
-  bx &= length_mask ;
-  
-  Cube c ;
-  c.lv() = level ;
-  real sz  = c.sz() ;
-  real sz2 = sz*2 ;
-  c.z() = (real)(bz) * sz2 + sz ;
-  c.y() = (real)(by) * sz2 + sz ;
-  c.x() = (real)(bx) * sz2 + sz ;
-
-  return c ;
-}
-//_____________________________________________________________________________
-
-
-
-//_____________________________________________________________________________
-// addition in dilated integer
-Key addition_locate_code( const Key& N , const Key& DN )
-//-----------------------------------------------------------------------------
-{
-  return (
-          ( ((N | dilate_t1) + (DN & dilate_tz)) & dilate_tz ) |
-          ( ((N | dilate_t2) + (DN & dilate_ty)) & dilate_ty ) |
-          ( ((N | dilate_t3) + (DN & dilate_tx)) & dilate_tx ) 
-          );
-}
-//_____________________________________________________________________________
-
-
-
-//_____________________________________________________________________________
-// addition in dilated integer
-Key substraction_locate_code( const Key& N , const Key& DN )
-//-----------------------------------------------------------------------------
-{
-  return (
-          ( ((N & dilate_tz) - (DN & dilate_tz)) & dilate_tz ) |
-          ( ((N & dilate_ty) - (DN & dilate_ty)) & dilate_ty ) |
-          ( ((N & dilate_tx) - (DN & dilate_tx)) & dilate_tx ) 
-         );
-}
-//_____________________________________________________________________________
-
-
-
-//_____________________________________________________________________________
-// generate a list of 27 neighbor keys of same level, with their direction, indexed by 9*(dz+1) + 3*(dy+1) + (dx+1)
-bool neighbor_keys( Key k, Key *neighbors )
-//_____________________________________________________________________________
-{
-  Level nbits_neigh = 3*key_level(k) ;
-  for( uint dir = 0 ; dir < 27 ; ++dir ) 
-  {
-    Key &nk = neighbors[dir] ;
-    if( dir == 13 ) { nk = KEY_INV ; continue ; }
-    nk = addition_locate_code( k , dir_neigh[dir] ) ; 
-    if( (nk >> nbits_neigh) != 1 )
-      nk = KEY_INV ;
-  }
-  return true ;
-}
-//_____________________________________________________________________________
-
-
-
-//_____________________________________________________________________________
-// generate a list of the subneighbor keys from a neighbor direction
-// returns the number of subneighbors
-char subneighbor_keys( Key k, char dir, std::stack<Key> &subneighbors )
-//_____________________________________________________________________________
-{
-  k <<= 3 ;
-  char nsub = nsubneighbors[dir] ;
-  for( char i = 0 ; i < nsub ; ++i )
-  {
-    subneighbors.push( k | l3b[dir][i] ) ;
-  }
-  return nsub ; 
-}
-//_____________________________________________________________________________
-
-
-
-//_____________________________________________________________________________
-void print_binary( const Key k )
-//_____________________________________________________________________________
-{
-  printf( "0x" ) ;
-  for( char i = 63 ; i >= 0 ; --i )
-    printf( "%c", (k>>i)&1 ? '1' : '0' ) ;
-}
-//_____________________________________________________________________________
-
-
-//_____________________________________________________________________________
-// generate a list of 8 vertices keys
-Level vertices_keys( Key k, Key *verts )
-//_____________________________________________________________________________
-{
-  Level lv = key_level(k) ;
-  Key   lv_k = 1 << (3*lv) ;
-  Key   lv_K = lv_k << 1 ;
-
-  for( int i = 0 ; i < 8 ; ++i )
-  {
-    Key vk = addition_locate_code( k,i ) ;
-
-    if( vk >= lv_K || !((vk-lv_k)&dilate_tx) || !((vk-lv_k)&dilate_ty) || !((vk-lv_k)&dilate_tz) )
-    {
-      verts[i] = KEY_INV ;
-      continue ;
-    }
-    
-    verts[i] = vk << 3*(MAX_LEVEL - lv) ;
-  }
-  return lv ;
-
-/*  
-  Level lv = key_level(k) ;
-  Key   lv_k = 1 << (3*lv) ;
-  Key   lv_K = lv_k << 1 ;
-
-  Cube c = key2cube(k) ;
-  const real ix = c.x () ;
-  const real iy = c.y () ;
-  const real iz = c.z () ;
-  const real is = c.sz() ;
-  
-  for( int i = 0 ; i < 8 ; ++i )
-  {
-    Key vk = addition_locate_code( k,i ) ;
-    Cube v( (i&1) ? ix+is : ix-is,
-            (i&2) ? iy+is : iy-is,
-            (i&4) ? iz+is : iz-is,
-            MAX_LEVEL ) ;
-    bool invalid = (
-                    v.x() <= 0.0 || v.x() >= 1 ||
-                    v.y() <= 0.0 || v.y() >= 1 ||
-                    v.z() <= 0.0 || v.z() >= 1
-                   ) ;
-    bool k_invalid = vk >= lv_K || !((vk-lv_k)&dilate_tx) || !((vk-lv_k)&dilate_ty) || !((vk-lv_k)&dilate_tz) ;
-    if( invalid != k_invalid )
-      printf( "problem\n" ) ;
-    if( invalid )
-    {
-      verts[i] = KEY_INV ;
-      continue ;
-    }
-    
-    vk <<= 3*(MAX_LEVEL - lv) ;
-    verts[i] = cube2key(v) ;
-    if( vk != verts[i] )
-      printf( "problem\n" ) ;
-  }
-  return c.lv() ;
-*/
-}
-//_____________________________________________________________________________
-
-
-
-//_____________________________________________________________________________
-// generate a list of 8 dual vertices keys from a vertex key and the deepest neighbor level
-bool dual_vertices_keys( Key k, Level lv, Key *dual_verts )
-//_____________________________________________________________________________
-{
-  Key dk = k >> (3*(MAX_LEVEL - lv)) ;
-  
-  for( int i = 0 ; i < 8 ; ++i )
-  {
-    dual_verts[i] = substraction_locate_code( dk,i ) ;
-  }
-  
-  return true ;
-
-/*  
-  Key dk = k >> (3*(MAX_LEVEL - lv)) ;
-  
-  Cube c = key2cube( k ) ;
-  c.lv() = lv ;
-  
-  const real ix = c.x () ;
-  const real iy = c.y () ;
-  const real iz = c.z () ;
-  const real is = c.sz() ;
-  
-//  print_binary( k ) ;
-//  printf( " <- \n" ) ;
-  for( int i = 0 ; i < 8 ; ++i )
-  {
-    Cube dv( (i&1) ? ix+is : ix-is,
-             (i&2) ? iy+is : iy-is,
-             (i&4) ? iz+is : iz-is,
-             lv ) ;
-    
-    dual_verts[i] = cube2key(dv) ;
-    if( substraction_locate_code( dk,7-i) != dual_verts[i] )
-      printf( "problem\n" ) ;
-//    print_binary( dual_verts[i] ) ;
-//    printf( "\n" ) ;
-//    print_binary( substraction_locate_code( dk,7-i) ) ;
-//    printf( "\n" ) ;
-  }
-//  printf( "\n" ) ;
-  
-  return true ;
-*/
-}
-//_____________________________________________________________________________
-
-
-// testar que dois cubos se intersectam???
-
-
diff --git a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/morton.h b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/morton.h
deleted file mode 100644
index 63563ad7f8..0000000000
--- a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/morton.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/**
- * \file    morton.h
- * \author  Thomas Lewiner   <tomlew@puc-rio.br>
- * \author  Rener Pereira de Castro <rener@mat.puc-rio.br> 
- * \author  Matmidia Lab, Math Dept, PUC-Rio
- * \date    10/01/2010
- *
- * \brief  Morton codes manipulation
- *
- * Morton codes manipulation
-*/
-//_____________________________________________________________________________
-
-
-
-#pragma once
-
-#ifndef WIN32
-#pragma interface
-#endif // WIN32
-
-
-#include <stdint.h>
-#include <stdio.h>
-#include <math.h>
-#include <stack>
-#include "cube.h"
-
-typedef uint64_t Key;
-extern Key KEY_INV ;
-const uint MAX_LEVEL = (sizeof(Key)*8-1)/3 ;
-
-//_____________________________________________________________________________
-
-/// octree depth level associated to a morton key ( = (bit length - 1) / 3 )
-Level key_level ( Key k ) ;
-
-/// containment text implemented directly onf the key
-bool key_contains( Key k_big, Key k_small ) ;
-
-/// convert an octree cube to a morton key using integer contraction
-Key cube2key ( const Cube &c ) ; 
-
-/// convert a morton key to a key using integer dilation
-const Cube key2cube ( Key  k ) ; 
-
-/// generate a list of 27 neighbor keys of same level, with their direction, indexed by 9*(dx+1) + 3*(dy+1) + (dz+1)
-bool neighbor_keys( Key k, Key *neighbors ) ;
-
-/// generate a list of the subneighbor keys from a neighbor direction, and return the number of subneighbors
-char subneighbor_keys( Key k, char dir, std::stack<Key> &subneighbors ) ;
-
-/// generate a list of 8 vertices keys from a cell key
-Level vertices_keys( Key k, Key *verts ) ;
-
-/// generate a list of 8 dual vertices keys from a vertex key and the deepest neighbor level
-bool dual_vertices_keys( Key k, Level lv, Key *dual_verts ) ;
-
-//_____________________________________________________________________________
-
-
-
diff --git a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/mvector.h b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/mvector.h
deleted file mode 100644
index e38dc5bb00..0000000000
--- a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/mvector.h
+++ /dev/null
@@ -1,261 +0,0 @@
-/**
- * \file    mvector.h
- * \author  Thomas Lewiner   <tomlew@puc-rio.br>
- * \author  Matmidia Lab, Math Dept, PUC-Rio
- * \date    10/01/2010
- *
- * \brief  light array container
- *
- * Light array container
- */
-//_____________________________________________________________________________
-
-
-#pragma once
-
-#include <stdlib.h>
-#include <string.h>  // memcpy, memset
-#include <mlist.h>
-
-/// unsigned int alias
-typedef unsigned int uint ;
-/// const unsigned int alias
-typedef const uint cuint ;
-
-/// default data size
-#define INITIAL_MVECTOR_SIZE ((uint)1024)
-
-
-//_____________________________________________________________________________
-// mvector
-/// \class mvector mvector.h
-template< typename Data > class mvector
-//-----------------------------------------------------------------------------
-{
-// Constructors
-public :
-  /// Constructor
-  mvector() : _data((Data*)NULL), _allocated_size(0), _used_size(0) {} ;
-
-  /// Destructor
-  ~mvector() { clear() ; }
-
-  // no copy on purpose
-
-//------------------------------------------------
-// Operations
-public :
-  /// delete the data
-  void clear() { free(_data) ; _data = (Data*)NULL ;  _allocated_size = 0 ;  _used_size = 0 ;  _deleted.clear() ; }
-
-  /// estimation of the memory that will be used
-  bool reserve( uint n )
-  {
-    if( n < INITIAL_MVECTOR_SIZE ) n = INITIAL_MVECTOR_SIZE ;
-    if( n <= _allocated_size ) return true ;
-
-    Data *temp = _data ;
-    _data = (Data*)malloc( n*sizeof(Data) ) ;
-    if( temp ) memcpy( _data, temp, _used_size*sizeof(Data) ) ;
-    memset( _data + _used_size, 0, (n-_used_size)*sizeof(Data) ) ;
-    free( temp ) ;
-
-    _allocated_size = n ;
-    return _data != (Data*)NULL ;
-  }
-
-  /// reserve space for n new elements
-  bool reserve_more( uint n )
-  {
-    if( _used_size + n > _allocated_size + _deleted.size() )
-    {
-      uint new_size = 2*_allocated_size ;
-      if( new_size < _used_size + n ) new_size = _used_size + n ;
-      //return reserve( 2*_allocated_size ) ;
-      return reserve( new_size ) ;
-    }
-    return true ;
-  }
-
-  /// insert n new elements
-  bool allocate_more( uint n )
-  {
-    if( !reserve_more( n ) ) return false ;
-    _used_size += n ;
-    return true ;
-  }
-
-  /// add one more element and
-  Data &add( uint &id )
-  {
-    if( _deleted.empty() )
-    {
-      id = _used_size ;
-      allocate_more( 1 ) ;
-    }
-    else
-    {
-      id = _deleted.first() ;
-      _deleted.remove_first() ;
-    }
-    return at(id) ;
-  }
-
-  /// lazy remotion
-  bool remove( uint id )
-  {
-    if( id+1 == _used_size )
-      --_used_size ;
-    else
-      _deleted.insert(id) ;
-    return true ;
-  }
-
-
-//------------------------------------------------
-// Accessor
-public :
-  /// size accessor
-  uint size() {  return _used_size - _deleted.size() ; }
-
-  /// size accessor
-  uint used_size() {  return _used_size ; }
-
-  /// non checked const accessor
-  const Data &at( uint id ) const { return _data[id] ; }
-  /// non checked accessor
-  Data &at( uint id ) { return _data[id] ; }
-
-  /// non checked const accessor
-  const Data &operator[]( uint id ) const { return at(id) ; }
-  /// non checked accessor
-  Data &operator[]( uint id ) { return at(id) ; }
-
-  /// non checked pointer accessor
-  Data *operator +( uint id ) { return _data + id ; }
-
-  /// id range validity check
-  bool is_valid( uint id ) {  return (id < size() && id>=0) ; }
-
-  /// id validity check
-  bool is_deleted( uint id ) {  return is_valid(id) && _deleted.find(id) () ; }
-
-
-//------------------------------------------------
-// Elements
-private :
-  /// main data array
-  Data *_data ;
-
-  /// real data size
-  uint  _allocated_size ;
-
-  /// filled data size
-  uint  _used_size ;
-
-  /// deleted data
-  List<uint> _deleted ;
-
-
-//------------------------------------------------
-// iterator
-public :
-  /// iterator
-  class iterator
-  {
-  public :
-  // constructors
-    /// default constructors
-    iterator( mvector<Data> &vec_, uint id_ = 0 ) : _vec(vec_), _id(id_) {}
-
-    /// destructor
-    ~iterator() {}
-
-    /// copy constructor
-    iterator( const iterator &it ) : _vec(it._vec), _id(it._id) {}
-
-    /// assignment operator
-    iterator &operator = ( const iterator &it )
-    { _vec = it._vec; _id = it._id;  return *this; }
-
-  //-----------------------------------------------------------------------------
-  // Operations
-  public  :
-    /// equality operator
-    inline bool        operator ==( const iterator &it ) const { return &_vec == &it._vec && _id == it._id ; }
-    /// inequality operator
-    inline bool        operator !=( const iterator &it ) const { return &_vec != &it._vec || _id != it._id ; }
-
-    /// validation operator
-    inline bool        operator ()() const { return _vec.is_valid( _id ) ; }
-
-    /// id accessor
-    inline uint        id         () const { return _id                  ; }
-
-    /// value accessor
-    inline const Data &operator * () const { return _vec[_id]            ; }
-
-    /// value accessor
-    inline Data       &operator * ()       { return _vec[_id]            ; }
-
-    /// accesses the next position
-    inline iterator   &operator ++()       { do ++_id ; while( _vec.is_valid(_id) && _vec.is_deleted(_id) ) ;  return *this ; }
-
-  //-----------------------------------------------------------------------------
-  // Elements
-  private :
-    mvector<Data> &_vec ; ///< data vector
-    uint           _id  ; ///< node position
-  };
-
-  //------------------------------------------------
-  // const_iterator
-  public :
-  /// const_iterator
-  class const_iterator
-  {
-    public :
-    // constructors
-    /// default constructors
-    const_iterator( const mvector<Data> &vec_, uint id_ = 0 ) : _vec(vec_), _id(id_) {}
-    
-    /// destructor
-    ~const_iterator() {}
-    
-    //-----------------------------------------------------------------------------
-    // Operations
-    public  :
-    /// equality operator
-    inline bool        operator ==( const const_iterator &it ) const { return &_vec == &it._vec && _id == it._id ; }
-    /// inequality operator
-    inline bool        operator !=( const const_iterator &it ) const { return &_vec != &it._vec || _id != it._id ; }
-    
-    /// validation operator
-    inline bool        operator ()() const { return _vec.is_valid( _id ) ; }
-    
-    /// id accessor
-    inline uint        id         () const { return _id                  ; }
-    
-    /// value accessor
-    inline const Data &operator * () const { return _vec[_id]            ; }
-    
-    /// accesses the next position
-    inline const_iterator   &operator ++()       { do ++_id ; while( _vec.is_valid(_id) && _vec.is_deleted(_id) ) ;  return *this ; }
-    
-    //-----------------------------------------------------------------------------
-    // Elements
-    private :
-    const mvector<Data> &_vec ; ///< data vector
-    uint                 _id  ; ///< node position
-  };
-  
-  public :
-  /// Node iterator creation
-  iterator begin( uint id = 0 ) { return iterator( *this, id ) ; }
-  /// Node const iterator creation
-  const_iterator cbegin( uint id = 0 ) { return const_iterator( *this, id ) ; }
-
-};
-//_____________________________________________________________________________
-
-
diff --git a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/opt_octree.cpp b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/opt_octree.cpp
deleted file mode 100644
index 2e2b539ee8..0000000000
--- a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/opt_octree.cpp
+++ /dev/null
@@ -1,1121 +0,0 @@
-/**
- * \file    opt_octree.cpp
- * \author  Thomas Lewiner   <tomlew@puc-rio.br>
- * \author  Matmidia Lab, Math Dept, PUC-Rio
- * \date    10/01/2010
- *
- *  Octree structure with hashtable and optimized operations
- */
-//_____________________________________________________________________________
-
-
-#ifndef WIN32
-#pragma implementation
-#endif // WIN32
-
-
-#include <stack>
-#include "opt_octree.h"
-
-/// invalid key
-template<> Hash<Level>::KeyData Hash<Level>::KD_INV = { KEY_INV, L_INV } ;
-
-
-//_____________________________________________________________________________
-// Create the root
-void OptOctree::init()
-//-----------------------------------------------------------------------------
-{
-  _max_field = R_INV ;
-  _opt_level = L_INV ;
-  memset( _level_dist, 0, (MAX_LEVEL+1)*sizeof(uint) ) ;
-
-  HashField::KeyData kd ;
-  kd.key  =  1  ;
-  kd.data = 0.0 ;
-  _hash.insert( kd ) ;
-
-  _level_dist[0] = 1 ;
-}
-//_____________________________________________________________________________
-
-
-
-
-//_____________________________________________________________________________
-/// Compute the optimal level
-void OptOctree::compute_opt_level()
-//-----------------------------------------------------------------------------
-{
-  Level left     = 0 ;
-  Level right    = MAX_LEVEL ;
-  uint  leftsum  =  0 ;
-  uint  rightsum =  0 ;
-  while( left < right )
-  {
-    uint leftsum_old = leftsum ;
-    if( leftsum <= rightsum )
-    {
-      leftsum += _level_dist[ left ] ;
-      ++left ;
-    }
-    if( leftsum_old >= rightsum )
-    {
-      rightsum += _level_dist[ right ] ;
-      --right ;
-    }
-  }  
-  _opt_level = right ;
-}
-//_____________________________________________________________________________
-
-
-//_____________________________________________________________________________
-// Check that each point scan or scribble is in the right node
-bool OptOctree::check ()
-//-----------------------------------------------------------------------------
-{
-  bool result = true ;
-
-  uint level_dist[MAX_LEVEL+1] ;
-  memset( level_dist, 0, (MAX_LEVEL+1)*sizeof(uint) ) ;
-  for( cell_iterator it = cells_begin() ; it() ; ++it )
-  {
-    if( is_leaf( it.key() ) )
-      level_dist[ key_level(it.key()) ] ++ ;
-    Key k = it.key() << 3 ;
-    bool has_son = false ;
-    bool all_sons = true  ;
-    for( int i = 0 ; i < 8 ; ++i )
-    {
-      if( _hash[ k | i ].key != KEY_INV )
-        has_son = true ;
-      else
-        all_sons = false ;
-    }
-    
-    if( it.is_leaf() && has_son )
-    {
-      printf("(opt) Invalid leaf %d: value %f\n", (int)k, _hash[k].data ) ;
-      result = false ;
-    }
-
-    if( has_son && !all_sons )
-    {
-      printf("(opt) Invalid subdivision %d: value %f\n", (int)k, _hash[k].data ) ;
-      result = false ;
-    }
-  }
-
-  for( Level lv = 0 ; lv <= MAX_LEVEL ; ++lv )
-  {
-    if( _level_dist[lv] != level_dist[lv] )
-    {
-      printf("(opt) Invalid level statistic %d: %d != %d\n", (int)lv, (int)_level_dist[lv], (int)level_dist[lv] ) ;
-      result = false ;
-    }
-  }
-
-  return result ;
-}
-//_____________________________________________________________________________
-
-
-
-
-
-//_____________________________________________________________________________
-// Deletes the content of the octree
-void OptOctree::clear_octree()
-//-----------------------------------------------------------------------------
-{
-  _hash .reset() ;
-  _verts.reset() ;
-  _max_field = R_INV ;
-  _opt_level = L_INV ;
-  memset( _level_dist, 0, (MAX_LEVEL+1)*sizeof(uint) ) ;
-}
-//_____________________________________________________________________________
-
-
-
-
-
-//_____________________________________________________________________________
-// set the values of each leaf from the implicit function
-bool OptOctree::set_impl( data_access *ref )
-//-----------------------------------------------------------------------------
-{
-  if( !ref ) return false ;
-  
-  _max_field = -FLT_MAX ;
-  for( cell_iterator it = cells_begin() ; it() ; ++it )
-  {
-    if( it.is_leaf() )
-    {
-      real v = (*ref).value_at( it.top() ) ;
-      *it = v ;
-      v = fabs(v) ;
-      if( _max_field < v ) _max_field = v ;
-    }
-//    else
-//      *it = R_INV ;
-  }
-  
-//  printf( "max field: %f\n", max_field() ) ;
-  return true ;
-}
-//_____________________________________________________________________________
-
-
-
-
-
-//_____________________________________________________________________________
-// Refine the octree according to the data access
-bool OptOctree::refine( data_access *ref /*= NULL*/ )
-//-----------------------------------------------------------------------------
-{
-  if( !ref ) return false ;
-
-    clear() ;  init() ;
-
-  // traversal stack: iterator has a pre-ordered stack, and cannot be recursed on
-  geom_cell it = geom_root() ;
-  std::stack< geom_cell > s ;
-  s.push( it ) ;
-  
-  // although it may refine only the leaves
-  // the leaf iterator may change during the refinement
-  bool refined = false ;
-  while( !s.empty() )
-  {
-    it = s.top() ;  s.pop() ;
-
-    // test for subdivision
-    if( !(*ref).need_refine( it ) ) continue ;
-    refined = true ;
-    
-    //_____________________________________________________________________________
-    // subdivides the cell in the tree
-    _hash[it.key()].data = it._field = R_INV ;
-    HashField::KeyData kd ;
-    kd.data = 0.0 ;
-
-    // recurse on the traversal
-    Key sk = it.key() << 3 ;
-    for( int i = 0 ; i < 8 ; ++i )
-    {
-      kd.key = sk | i ;
-      if( !_hash.insert( kd ) )
-      {
-        printf( "hash table saturated!\n" ) ;
-        exit(1) ;
-        return false ;
-      }
-      
-      s.push( geom_cell( kd.key, kd.data ) ) ;
-    }
-    Level lv = it.lv() ;
-    _level_dist[ lv ] -= 1 ;
-    _level_dist[lv+1] += 8 ;
-  }
-  
-  compute_opt_level() ;
-
-  return refined ;
-}
-//_____________________________________________________________________________
-
-
-
-//_____________________________________________________________________________
-// Refine the octree according to the data access
-bool OptOctree::adapt( data_access *ref /*= NULL*/ )
-//-----------------------------------------------------------------------------
-{
-  if( !ref ) return false ;
-
-#ifdef HASH_HAS_ERASE
-    
-  // traversal stack: iterator has a pre-ordered stack, and cannot be recursed on
-  geom_cell it = geom_root() ;
-  std::stack< geom_cell > s ;
-  s.push( it ) ;
-  
-  // although it may refine only the leaves
-  // the leaf iterator may change during the refinement
-  geom_cell sons[8] ;
-  bool refined = false ;
-  while( !s.empty() )
-  {
-    it = s.top() ;  s.pop() ;
-//    printf( "opt key %d\n", (int) it.key() ) ;
-
-    // look for the leaves
-    if( !it.is_leaf() )
-    {
-      if( !(*ref).need_refine( it ) )
-      {
-        std::stack< std::pair<Key,Level> > del_s ; // avoid level recomputation
-        del_s.push( std::make_pair( it.key(), it.lv() ) ) ;
-        while( !del_s.empty() )
-        {
-          Key n    = del_s.top().first << 3 ;
-          Level lv = del_s.top().second + 1 ;
-          del_s.pop() ;
-          
-          for( int i = 0 ; i < 8 ; ++i )
-          {
-            HashField::KeyData kd = _hash.erase( n|i ) ;
-            if( !is_inv( kd.data ) ) // is_leaf(n)
-            {
-              _level_dist[ lv ] -- ;
-              continue ;
-            }
-            del_s.push( std::make_pair( n|i, lv ) ) ;
-          }
-        }
-
-        refined = true ;
-        _level_dist[it.lv()] += 1 ;
-        _hash[it.key()].data = 0.0 ; // leaf now!
-        continue ;
-      }
-      
-      it.sons( sons, _hash ) ;
-      for( int i = 0 ; i < 8 ; ++i )
-        s.push( sons[i] ) ;
-      
-      continue ;
-    }
-
-    // test for subdivision
-    if( !(*ref).need_refine( it ) ) continue ;
-    refined = true ;
-    
-    //_____________________________________________________________________________
-    // subdivides the cell in the tree
-    _hash[it.key()].data = it._field = R_INV ;
-    HashField::KeyData kd ;
-    kd.data = 0.0 ;
-    
-    // recurse on the traversal
-    Key sk = it.key() << 3 ;
-    for( int i = 0 ; i < 8 ; ++i )
-    {
-      kd.key = sk | i ;
-      if( !_hash.insert( kd ) )
-      {
-        printf( "hash table saturated!\n" ) ;
-        exit(1) ;
-        return false ;
-      }
-      
-      s.push( geom_cell( kd.key, kd.data ) ) ;
-    }
-    
-    Level lv = it.lv() ;
-    _level_dist[ lv ] -= 1 ;
-    _level_dist[lv+1] += 8 ;
-  }
-  
-  compute_opt_level() ;
-  return refined ;
-  
-#else  // HASH_HAS_ERASE
-  // no remotion in the hash table!
-  return refine( ref ) ;
-#endif // HASH_HAS_ERASE
-}
-//_____________________________________________________________________________
-
-
-
-
-
-//_____________________________________________________________________________
-// Draw the octree with wireframe
-bool OptOctree::draw_wire()
-//-----------------------------------------------------------------------------
-{
-  for( leaf_iterator it = leaves_begin() ; it() ; ++it )
-    it.draw_wire() ;
-  
-  return true ;
-}
-//_____________________________________________________________________________
-
-
-
-
-
-//_____________________________________________________________________________
-// Draw the octree with dots
-bool OptOctree::draw_centers()
-//-----------------------------------------------------------------------------
-{
-  for( cell_iterator it = cells_begin() ; it() ; ++it )
-  {
-    ::glTexCoord1f( (GLfloat)fabs(*it / max_field()) ) ;
-    it.top().draw() ;
-  }
-  
-  return true ;
-}
-//_____________________________________________________________________________
-
-
-
-
-//_____________________________________________________________________________
-// Compute primal vertices
-bool OptOctree::compute_primal_verts()
-//-----------------------------------------------------------------------------
-{
-    
-  // add all the inner vertices
-  for( leaf_iterator l_it = leaves_begin() ; l_it() ; ++l_it )
-  {
-    Key verts_k[8] ;
-    Level lv = vertices_keys( l_it.key(), verts_k ) ;
-    
-    HashVerts::KeyData kd ;
-    kd.data = lv ;
-    Key *v_ptr = verts_k ;
-    for( int i = 0 ; i < 8 ; ++i, ++v_ptr )
-    {
-      kd.key = *v_ptr ;
-      if( kd.key == KEY_INV ) continue ;
-      
-      HashVerts::KeyData &hk = _verts[ kd.key ] ;
-      if( hk.key == KEY_INV )
-        _verts.insert( kd ) ;
-      else if( hk.data < kd.data )
-        hk.data = kd.data ;
-    }
-  }
-  
-  return true ;
-}
-//_____________________________________________________________________________
-
-
-
-//_____________________________________________________________________________
-// Octree dual caller
-bool OptOctree::dual_cubes_walk( opt_dual_walker &walker )
-//-----------------------------------------------------------------------------
-{
-  bool result = compute_primal_verts() ;
-  
-  for( HashVerts::const_iterator v_it = _verts.cbegin() ; v_it() ; ++v_it )
-  {
-    const Level lv = *v_it ;
-    Key dual_verts[8] ;
-    dual_vertices_keys( v_it.key(), lv, dual_verts ) ;
-
-    Key *dv_ptr = dual_verts ;
-    for( int i = 0 ; i < 8 ; ++i, ++dv_ptr )
-    {
-      // find_at, only the level too high case
-      Key &ki = *dv_ptr ;
-      HashField::KeyData kd ;
-      while( ki != 0 && !node_exists(ki,kd) )
-        ki >>= 3;
-    }
-    result &= walker( *this, dual_verts ) ;
-  }
-
-  return result ;
-}
-//_____________________________________________________________________________
-
-
-
-
-//_____________________________________________________________________________
-// Isosurface walker
-bool opt_isosurface_walker( OptOctree &fo, Key *keys )
-//-----------------------------------------------------------------------------
-{
-  MarchingCubes &mc = fo.mc() ;
-  
-  /** isovalues at the cube vertices */
-  real            *cube    = mc.cube() ;
-  /** geometry of the cube */
-  Point           *space   = mc.space() ;
-  /** indexes of the cube */
-  Key             *indexes = mc.indexes() ;
-  
-  for( int j = 0 ; j < 8 ; ++j )
-  {
-    int i = (j==2)?3:(j==3)?2:(j==7)?6:(j==6)?7:j ;
-    const Key k = keys[j] ;
-    OptOctree::geom_cell c = fo.geom_key(k) ;
-    cube[i] = *c ;
-    
-    space[i] = (Point)c ;
-    indexes[i] = k ;
-  }
-  
-  mc.tesselate_cube( 0.0 ) ;
-  
-  return true ;
-}
-//_____________________________________________________________________________
-
-
-
-
-//_____________________________________________________________________________
-// Build the isosurface using dual marching cubes
-bool OptOctree::build_isosurface( data_access *ref )
-//-----------------------------------------------------------------------------
-{
-  if( !ref ) return false ;
-  _mc.dat_access() = ref ;
-  _verts.reset() ;
-  
-    printf( "Build isosurface... " ) ;
-  bool result = false ;
-  
-  //_________________________________________________________________________
-  // Dual Marching Cubes
-  
-  _mc.init_all() ; 
-  
-  result = dual_cubes_walk( opt_isosurface_walker ) ;
-  
-  _mc.clean_temps() ;
-  
-  printf( "generated %d vertices and %d faces!\n", _mc.nverts(), _mc.ntrigs() ) ;
-  
-  return result ;
-}
-//_____________________________________________________________________________
-
-
-
-
-
-//_____________________________________________________________________________
-// Isosurface drawing walker
-bool opt_direct_isosurface_walker( OptOctree &fo, Key *keys )
-//-----------------------------------------------------------------------------
-{
-  MC_Draw &mc = fo.mc_draw() ;
-  
-  /** isovalues at the cube vertices */
-  real            *cube    = mc.cube() ;
-  /** geometry of the cube */
-  Point           *space   = mc.space() ;
-  
-  for( int j = 0 ; j < 8 ; ++j )
-  {
-    int i = (j==2)?3:(j==3)?2:(j==7)?6:(j==6)?7:j ;
-    const OptOctree::geom_cell c = fo.geom_key( keys[j] ) ;
-    cube[i] = *c ;
-    
-    space[i] = (Point)c ;
-  }
-  
-  mc.tesselate_cube( 0.0 ) ;
-  
-  return true ;
-}
-//_____________________________________________________________________________
-
-
-
-//_____________________________________________________________________________
-// Build the isosurface using dual marching cubes
-bool OptOctree::direct_draw_isosurface( data_access *ref )
-//-----------------------------------------------------------------------------
-{
-  if( !ref ) return false ;
-  _mc_draw.dat_access() = ref ;
-  _verts.reset() ;
-  
-    bool result = false ;
-  
-  // Dual Marching Cubes
-  ::glBegin( GL_TRIANGLES ) ;
-  {
-    result = dual_cubes_walk( opt_direct_isosurface_walker ) ;
-  }
-  ::glEnd() ; // GL_TRIANGLES
-  
-  return result ;
-}
-//_____________________________________________________________________________
-
-
-
-
-
-
-//_____________________________________________________________________________
-// Draw walker
-bool opt_draw_walker( OptOctree &fo, Key *keys )
-//-----------------------------------------------------------------------------
-{
-  Cube cells[8] ;
-  for( int i = 0 ; i < 8 ; ++i )
-    cells[i] = key2cube( keys[i] ) ;
-  
-  ((Point)cells[0]).draw() ;
-  ((Point)cells[1]).draw() ;
-  
-  ((Point)cells[1]).draw() ;
-  ((Point)cells[3]).draw() ;
-  
-  ((Point)cells[3]).draw() ;
-  ((Point)cells[2]).draw() ;
-  
-  ((Point)cells[2]).draw() ;
-  ((Point)cells[0]).draw() ;
-  
-  ((Point)cells[4]).draw() ;
-  ((Point)cells[5]).draw() ;
-  
-  ((Point)cells[5]).draw() ;
-  ((Point)cells[7]).draw() ;
-  
-  ((Point)cells[7]).draw() ;
-  ((Point)cells[6]).draw() ;
-  
-  ((Point)cells[6]).draw() ;
-  ((Point)cells[4]).draw() ;
-  
-  ((Point)cells[0]).draw() ;
-  ((Point)cells[4]).draw() ;
-  
-  ((Point)cells[1]).draw() ;
-  ((Point)cells[5]).draw() ;
-  
-  ((Point)cells[2]).draw() ;
-  ((Point)cells[6]).draw() ;
-  
-  ((Point)cells[3]).draw() ;
-  ((Point)cells[7]).draw() ;
-  
-  return true ;
-}
-//_____________________________________________________________________________
-
-
-
-
-//_____________________________________________________________________________
-// Draw the dual octree with wireframe
-bool OptOctree::draw_dual()
-//-----------------------------------------------------------------------------
-{
-  _verts.reset() ;
-
-  ::glBegin( GL_LINES ) ;
-  bool result = dual_cubes_walk( opt_draw_walker ) ;
-  ::glEnd() ;  // GL_LINES
-  
-  return result ;
-}
-//_____________________________________________________________________________
-
-
-
-
-//_____________________________________________________________________________
-// Do nothing walker, just for dual generation timing
-bool opt_timing_walker( OptOctree &fo, Key *keys )
-//-----------------------------------------------------------------------------
-{
-  return true ;
-}
-//_____________________________________________________________________________
-
-
-//_____________________________________________________________________________
-// Do nothing, just for dual generation timing
-bool OptOctree::dual_timing()
-//-----------------------------------------------------------------------------
-{
-  _verts.reset() ;
-
-    return dual_cubes_walk( opt_timing_walker ) ;
-}
-//_____________________________________________________________________________
-
-
-
-
-
-//_____________________________________________________________________________
-// Prints statistics about the octree
-void OptOctree::stats() const
-//-----------------------------------------------------------------------------
-{
-  int s = _hash.size() ;
-  printf( " number of nodes:\t%d\n", s ) ;
-#if USE_HASH_PTR
-  printf( " total memory:\t%d\n", (int) ( s * sizeof(HashField::KeyBucket) ) ) ;
-  _hash.stats() ;
-#else  // USE_HASH_PTR 
-  printf( " total memory:\t%d\n", (int) ( s * sizeof(HashField::KeyData  ) ) ) ;
-#endif // USE_HASH_PTR
-  
-  printf( " leaves' levels:\t" ) ;
-  for( Level l = 0 ; l <= MAX_LEVEL; ++l )
-    printf( "\t%d", _level_dist[l] ) ;
-  printf( "\n" ) ;
-  
-  s = _verts.size() ;
-  printf( " number of dual nodes:\t%d\n", s ) ;
-#if USE_HASH_PTR
-  printf( " total memory of dual:\t%d\n", (int) ( s * sizeof(HashVerts::KeyBucket) ) ) ;
-  _verts.stats() ;
-#else  // USE_HASH_PTR 
-  printf( " total memory of dual:\t%d\n", (int) ( s * sizeof(HashVerts::KeyData  ) ) ) ;
-#endif // USE_HASH_PTR
-}
-//_____________________________________________________________________________
-
-
-
-
-
-//_____________________________________________________________________________
-//_____________________________________________________________________________
-// search operations
-
-
-//_____________________________________________________________________________
-// Find cells of the octree at a given position
-bool OptOctree::find_leaf( Key k, Level o_lv, geom_cell &n ) const
-//-----------------------------------------------------------------------------
-{
-    
-  Level   shift = 3*(MAX_LEVEL-o_lv) ;
-  Key     ki    = k >> shift ;
-  HashField::KeyData kd ;
-  
-  // level too high
-  if( !node_exists(ki,kd) )
-  {
-    do
-    {
-      ki >>= 3;
-    }
-    while( ki !=0 && !node_exists(ki,kd) ) ;
-  }
-  // level correct or too low
-  else
-  {
-    HashField::KeyData kd_temp ;
-    do
-    {
-      kd_temp = kd ;
-      shift -= 3 ;
-      ki = k >> shift ;
-    }
-    while( ki !=0 && node_exists(ki,kd) ) ;
-    kd = kd_temp ;
-  }
-  n = geom_cell( kd ) ;
-
-  return kd.key != KEY_INV ;
-}
-//_____________________________________________________________________________
-
-
-
-//_____________________________________________________________________________
-// Find cells of the octree inside a given box of center x,y and half side r
-bool OptOctree::find_radius( real x, real y, real z, real r, List<geom_cell> &cells ) const
-//-----------------------------------------------------------------------------
-{
-    
-  cells.clear() ;
-
-  Level lv_b = (Level)floor( log(r)/log(0.5) ) ;
-  Key   k_b  = cube2key( Cube(x,y,z,lv_b) ) ;
-
-  Key neighbors[27] ;
-  neighbor_keys( k_b, neighbors ) ;
-
-  std::stack<Key> s ;
-  s.push( k_b ) ;
-  
-  Key *k_ptr = neighbors ;
-  for( int dir = 0 ; dir < 27 ; ++dir, ++k_ptr )
-    s.push( *k_ptr ) ;
-  
-  while( !s.empty() )
-  {
-    Key ki = s.top() ;
-    s.pop() ;
-    if( ki == KEY_INV ) continue ;
-    
-    HashField::KeyData kd ;
-    if( node_exists(ki,kd) )
-    {
-      if( is_leaf( kd ) )
-      {
-        geom_cell gc(kd) ;
-        real sz = gc.sz() + r ;
-
-        // test directly with the key?
-        if( fabs( x-gc.x() ) <= sz && fabs( y-gc.y() ) <= sz && fabs( z-gc.z() ) <= sz )
-          cells.insert( gc ) ;
-      }
-      else 
-      {
-        Key ski = ki << 3 ;
-        for( int i = 0 ; i < 8 ; ++i )
-          // test directly with the key before insertion?
-          s.push( ski | i ) ;
-      }
-    }        
-    else
-    {
-      HashField::KeyData kd ;
-      do
-      {
-        ki >>= 3 ;
-      } while( ki !=0 && !node_exists(ki,kd) ) ;
-      
-      if( ki > 0 )
-      {
-        geom_cell gc(kd) ;
-        real sz = gc.sz() + r ;
-
-        // test directly with the key?
-        if( fabs( x-gc.x() ) <= sz && fabs( y-gc.y() ) <= sz && fabs( z-gc.z() ) <= sz )
-          cells.insert_unique( gc ) ;
-      }
-    }
-  }
-  
-  return true ;
-}
-//_____________________________________________________________________________
-
-
-
-//_____________________________________________________________________________
-// Find neighbor cells of the octree to a given cell
-bool OptOctree::adjacent( Key k, List<geom_cell> &cells ) const
-//-----------------------------------------------------------------------------
-{
-    
-  cells.clear() ;
-
-  Key neighbors[27] ;
-  neighbor_keys( k, neighbors ) ;
-  
-  Key *k_ptr = neighbors ;
-  for( int dir = 0 ; dir < 27 ; ++dir, ++k_ptr )
-  {
-    Key ki = *k_ptr ;
-    if( ki == KEY_INV ) continue ;
-    
-    HashField::KeyData kd ;
-    if( node_exists(ki,kd) )
-    {
-      if( is_leaf( kd ) ) cells.insert( geom_cell(kd) );        
-      else 
-      {
-        std::stack<Key> subneighbors ;
-        subneighbor_keys(ki, dir, subneighbors ) ;
-        while( !subneighbors.empty() )
-        {
-          Key ski = subneighbors.top() ;
-          subneighbors.pop() ;
-          
-          real sdi ;
-          if( is_leaf( ski, sdi ) )
-            cells.insert( geom_cell( ski, sdi ) ) ;
-          else
-            subneighbor_keys(ski, dir, subneighbors ) ;
-        }
-      }
-    }        
-    else
-    {
-      HashField::KeyData kd ;
-      do
-      {
-        ki >>= 3 ;
-      } while( ki !=0 && !node_exists(ki,kd) ) ;
-
-      if( ki > 0 )
-        cells.insert_unique( geom_cell(kd) ) ;
-    }
-  }
-  
-  return true ;
-}
-//_____________________________________________________________________________
-
-
-
-//_____________________________________________________________________________
-//_____________________________________________________________________________
-// I/O
-
-//_____________________________________________________________________________
-// Draws the intersecting cells of a plane with the octree with color
-void OptOctree::draw_plane ( real nx, real ny, real nz, real d )
-//-----------------------------------------------------------------------------
-{
-  geom_cell n = geom_root() ;
-  
-  std::stack< geom_cell > s ;
-  s.push( n ) ;
-  
-  //_____________________________________________________________________________
-  // retrieve the index of the most positive cube corner
-  bool fx = nx >= 0 ;
-  bool fy = ny >= 0 ;
-  bool fz = nz >= 0 ;
-  
-  //_____________________________________________________________________________
-  
-  ::glLineWidth( 1.0f ) ;
-  ::glDisable( GL_LIGHTING ) ;
-  
-  real px,py,pz, mx,my,mz ;
-  while( !s.empty() )
-  {
-    n = s.top() ;  s.pop() ;
-    
-    if( n.is_leaf() )
-    {		
-      
-      ::glTexCoord1f( (GLfloat)fabs(*n/max_field()) ) ;
-      ::glBegin( GL_LINES ) ;
-      n.draw_wire() ;
-      ::glEnd() ;  // GL_LINES		
-      
-      continue ;
-    }
-    
-    //___________________________________________________________________________
-    // recursion
-    geom_cell sons[8] ;
-    n.sons( sons, _hash ) ;
-    real sz_ = sons[0].sz() ;
-    for( int i = 0 ; i < 8 ; ++i )
-    {
-      // get the coordinates of the extremum vertices
-      if( fx ) { px = sons[i].cx() + sz_ ;  mx = sons[i].cx() - sz_ ; }
-      else     { px = sons[i].cx() - sz_ ;  mx = sons[i].cx() + sz_ ; }
-      if( fy ) { py = sons[i].cy() + sz_ ;  my = sons[i].cy() - sz_ ; }
-      else     { py = sons[i].cy() - sz_ ;  my = sons[i].cy() + sz_ ; }
-      if( fz ) { pz = sons[i].cz() + sz_ ;  mz = sons[i].cz() - sz_ ; }
-      else     { pz = sons[i].cz() - sz_ ;  mz = sons[i].cz() + sz_ ; }
-      
-      // plane/cube intersection test
-      if( (nx * px + ny * py + nz * pz + d >= 0.0) && (nx * mx + ny * my + nz * mz + d <= 0.0)  )
-        s.push( sons[i] ) ;
-    }
-  }
-}
-//_____________________________________________________________________________
-
-
-
-
-
-//_____________________________________________________________________________
-// Draws the intersection of a plane with the octree with color
-void OptOctree::draw_slice ( real nx, real ny, real nz, real d, float alpha )
-//-----------------------------------------------------------------------------
-{
-  geom_cell n = geom_root() ;
-  
-  std::stack< geom_cell > s ;
-  s.push( n ) ;
-  
-  // retrieve the index of the most positive cube corner
-  bool fx = nx >= 0 ;
-  bool fy = ny >= 0 ;
-  bool fz = nz >= 0 ;
-  
-  
-  
-  //_____________________________________________________________________________
-  
-  ::glDisable( GL_LIGHTING ) ;
-  
-  real px,py,pz, mx,my,mz ;
-  while( !s.empty() )
-  {
-    n = s.top() ;  s.pop() ;
-    if( n.is_leaf() )
-    {
-      // retrieves the signs of each cube corner
-      real val[8] ;
-      real v   = nx * n.cx() + ny * n.cy() + nz * n.cz() + d ;
-      real sz_ = n.sz() ;
-      int zeros = 0 ;
-      for( int i = 0 ; i < 8 ; ++i )
-      {
-        val[i] = v + nx * ((i&1)?sz_:-sz_) + ny * ((i&2)?sz_:-sz_) + nz * ((i&4)?sz_:-sz_) ;
-        if( fabs(val[i]) < R_EPSILON ) { val[i] = R_EPSILON ;  ++zeros ; }
-      }
-      
-      //_________________________________________________________________________
-      // degenerated intersection
-      if( zeros > 0 )
-      {
-        int npos = 0, nneg = 0 ;
-        for( int i = 0 ; i < 8 ; ++i )
-        {
-          if( fabs(val[i]) < R_EPSILON ) continue ;
-          if( val[i] < 0 )
-            ++nneg ;
-          else
-            ++npos ;
-        }
-        float def = (nneg>npos) ? (float)R_EPSILON : -(float)R_EPSILON ;
-        
-        for( int i = 0 ; i < 8 ; ++i )
-        {
-          if( fabs(val[i]) < R_EPSILON ) val[i] = def ;
-        }
-        //        continue ;
-      }
-      
-      //_________________________________________________________________________
-      // Continuation method
-      int v0=-1, v1=-1 ;  // current edge vertices
-      
-      // get the first intersection
-      static int edges[12][2] = { {0,1}, {0,2}, {0,4}, {1,3}, {1,5}, {2,3}, {2,6}, {3,7}, {4,5}, {4,6}, {5,7}, {6,7} } ;
-      for( int e = 0 ; e < 12 ; ++e )
-      {
-        if( val[ edges[e][0] ] * val[ edges[e][1] ] < 0 )
-        {
-          v0 = edges[e][0] ;
-          v1 = edges[e][1] ;
-          break ;
-        }
-      }
-      int  ov0 = v0, ov1 = v1 ;
-      
-      
-      // equation of previous face adjacent to v0v1: v>>c & 1 == s (c-th coordinate equal to +/- 1)
-      int pf = -1 ;  bool ps ;
-      if       ( (v0 & 1) == (v1 & 1) )   { pf = 0 ; ps = ((v0 & 1) /*>> 0*/) == 1 ; }
-      else   if( (v0 & 2) == (v1 & 2) )   { pf = 1 ; ps = ((v0 & 2)   >> 1  ) == 1 ; }
-      else /*if( (v0 & 4) == (v1 & 4) )*/ { pf = 2 ; ps = ((v0 & 4)   >> 2  ) == 1 ; }
-      
-      //      printf( "cube %d %d %d %d %d %d %d %d, march : (%d,%d) ", val[0]>0, val[1]>0, val[2]>0, val[3]>0, val[4]>0, val[5]>0, val[6]>0, val[7]>0, v0, v1 ) ;
-      
-      //_________________________________________________________________________
-      // marching
-      
-      GLfloat color = (GLfloat)fabs(*n / max_field()) ;
-		  //cmap.gl_color( at(*n) ) ;	
-      ::glBegin( GL_POLYGON ) ;
-      {
-        do
-        {
-          // equation of next face adjacent to v0v1
-          int nf = -1 ;  bool ns ;
-          if       ( pf != 0 && ((v0 & 1) == (v1 & 1)) )   { nf = 0 ; ns = ((v0 & 1) /*>> 0*/) == 1 ; }
-          else   if( pf != 1 && ((v0 & 2) == (v1 & 2)) )   { nf = 1 ; ns = ((v0 & 2)   >> 1  ) == 1 ; }
-          else /*if( pf != 2 && ((v0 & 4) == (v1 & 4)) )*/ { nf = 2 ; ns = ((v0 & 4)   >> 2  ) == 1 ; }
-          
-          /* equivalent construction
-           // get the direction perpendicular to v0v1
-           int of = (v0 ^ v1) & 7 ; // only bit of difference
-           of = of==1 ? 0 : (of==2 ? 1 : 2) ;
-           
-           // compute the equation of the next face adjacent to v0v1
-           int  nf = 3 - (pf+of) ;    // third option: {pf,nf,of}={0,1,2}
-           bool ns = (v0 >> nf) & 1 ; // value of the edge on that direction
-           */
-          
-          // compute the two next vertices (invert the pf-th bit
-          int v2 = ps ? ( v0 & (~(1<<pf)) ) : ( v0 | (1<<pf) ) ;
-          int v3 = ps ? ( v1 & (~(1<<pf)) ) : ( v1 | (1<<pf) ) ;
-          
-          // get the characteristic of the square
-          int  c = (val[v3] > 0) | ((val[v2] > 0) << 1) | ((val[v1] > 0) << 2) | ((val[v0] > 0) << 3) ;
-          if( c > 7 ) c = (~c)&7 ; // consider v0 as negative, and thus v1 as positive
-          /*
-           if( c < 4 )
-           { // degenerated intesection
-           printf( "degenerated intersection %d!\n", c ) ;
-           }
-           */
-          
-          //_______________________________________________________________________
-          // method of continuity on the cube surface
-          switch( c )
-          {
-            case  4 : v0 = v3 ;  break ;
-            case  5 : v0 = v2 ;  v1 = v3 ;  break ;
-            case  6 : /* impossible case */ break ;
-            case  7 : v1 = v2 ;  break ;
-          }
-          
-          
-          
-          
-          real cx =  n.cx();
-          real cy =  n.cy(); 
-          real cz =  n.cz();
-          real sz =  sz_;   
-          real a0 = val[v0];  
-          int i0 = v0; 
-          real a1 = val[v1];  
-          int i1  = v1;
-          
-          real w0 = a1 / (a1-a0) ;
-          real w1 = a0 / (a0-a1) ;
-          
-          real x = cx + w0 * ((i0&1)?sz:-sz) + w1 * ((i1&1)?sz:-sz);
-          real y = cy + w0 * ((i0&2)?sz:-sz) + w1 * ((i1&2)?sz:-sz);
-          real z = cz + w0 * ((i0&4)?sz:-sz) + w1 * ((i1&4)?sz:-sz);
-          
-          ::glTexCoord1d( color ) ;
-          ::glVertex3d(x, y, z) ;
-          
-          // next face
-          pf = nf ;  ps = ns ;
-          
-          //          printf( "(%d,%d) ", v0, v1 ) ;
-        } while( v0 != ov0 || v1 != ov1 ) ;
-        //        printf( "\n" ) ;
-      }
-      ::glEnd() ; // GL_POLYGON
-      
-      continue ;
-    }
-    
-    //___________________________________________________________________________
-    // recursion
-    geom_cell sons[8] ;
-    n.sons( sons, _hash ) ;
-    real sz_ = sons[0].sz() ;
-    for( int i = 0 ; i < 8 ; ++i )
-    {
-      // get the coordinates of the extremum vertices
-      if( fx ) { px = sons[i].cx() + sz_ ;  mx = sons[i].cx() - sz_ ; }
-      else     { px = sons[i].cx() - sz_ ;  mx = sons[i].cx() + sz_ ; }
-      if( fy ) { py = sons[i].cy() + sz_ ;  my = sons[i].cy() - sz_ ; }
-      else     { py = sons[i].cy() - sz_ ;  my = sons[i].cy() + sz_ ; }
-      if( fz ) { pz = sons[i].cz() + sz_ ;  mz = sons[i].cz() - sz_ ; }
-      else     { pz = sons[i].cz() - sz_ ;  mz = sons[i].cz() + sz_ ; }
-      
-      // plane/cube intersection test
-      if( (nx * px + ny * py + nz * pz + d >= 0.0) && (nx * mx + ny * my + nz * mz + d <= 0.0)  )
-        s.push( sons[i] ) ;
-    }
-  }
-}
-//_____________________________________________________________________________
-
diff --git a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/opt_octree.h b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/opt_octree.h
deleted file mode 100644
index e6a90e93b0..0000000000
--- a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/opt_octree.h
+++ /dev/null
@@ -1,376 +0,0 @@
-/**
- * \file    opt_octree.h
- * \author  Thomas Lewiner   <tomlew@puc-rio.br>
- * \author  Matmidia Lab, Math Dept, PUC-Rio
- * \date    10/01/2010
- *
- *  Octree structure with hashtable and optimized operations
- */
-//_____________________________________________________________________________
-
-
-#pragma once
-
-
-#ifndef WIN32
-#pragma interface
-#endif // WIN32
-
-
-#include "mlist.h"
-#include "cube.h"
-#include "hash.h"
-#include "MarchingCubes.h"
-#include "mc_draw.h"
-#include "data_access.h"
-
-
-
-//_____________________________________________________________________________
-// OptOctree
-/// \class OptOctree OptOctree.h
-class OptOctree
-//-----------------------------------------------------------------------------
-{
-// forward declaration
-public:
-  class geom_cell  ;
-  class cell_iterator  ;
-  class leaf_iterator  ;
-
-// Elements
-protected:
-  /// Octree cell data structure
-  typedef Hash<real>  HashField ;
-
-  /// Hashtable of the octree nodes
-  HashField _hash ;
-  
-  /// Level distribution of the octree
-  uint _level_dist[MAX_LEVEL+1] ;
-  
-  /// Optimal level for direct search in the octree
-  Level _opt_level ;
-  
-  /// Maximal field of the octree
-  real _max_field ;
-  
-  /// Isosurface
-  MarchingCubes _mc ;
-
-  /// Isosurface Draw
-  MC_Draw _mc_draw ;
-
-private :
-  /// Octree vertices data structure
-  typedef Hash<Level> HashVerts ;
-  /// Hashtable of the octree vertices
-  HashVerts _verts ;
-
-//-----------------------------------------------------------------------------
-// Constructors
-public:
-  /// Default constructor: Constructs a octree with and empty root
-  OptOctree() { init() ; }
-
-  /// Destructor: Free memory
-  ~OptOctree() { clear() ; }
-
-
-  /// Create the root
-  void init() ;
-
-  /// Memory cleaning
-  void clear() { clear_octree() ;  _mc.clean_all() ; }
-
-  /// Delete the content of the octree
-  void clear_octree() ;
-
-  /// Compute the optimal level
-  void compute_opt_level() ;
-  
-  /// Check that only the leaves have data
-  bool check () ;
-
-  /// Prints statistics about the octree
-  void stats() const ;
-
-  /// Return the maximal level of the octree
-  Level  max_level() const { Level lv = MAX_LEVEL ; while( lv > 0 && !_level_dist[lv] ) --lv ; return lv ; }
-  
-  /// Return the optimal level of the octree
-  Level  opt_level() const { return _opt_level ; }
-  
-  /// Return the optimal level of the octree
-  Level &opt_level()  { return _opt_level ; }
-  
-  /// Return the maximal field of the octree
-  real max_field() const { return _max_field ; }
-   
-  /// Return the isosurface
-  MarchingCubes &mc() { return _mc ; }
-
-  /// Return the isosurface draw
-  MC_Draw &mc_draw() { return _mc_draw ; }
-  
-  /// set the values of each leaf from the implicit function
-  bool set_impl( data_access *ref = NULL ) ;
-  
-  /// Refine the octree according to the data access
-  bool refine( data_access *ref = NULL ) ;
-
-  /// Adapt the octree according to the data access
-  bool adapt( data_access *ref = NULL ) ;
-  
-  /// Draw the octree with wireframe
-  bool draw_wire() ;
-  
-  /// Draw the octree with dots
-  bool draw_centers() ;
-  
-  /// Dual function type
-  typedef bool opt_dual_walker( OptOctree &fo, Key *keys ) ;
-
-  /// Compute primal vertices
-  bool compute_primal_verts() ;
-  
-  /// Walk on the dual cubes
-  bool dual_cubes_walk( opt_dual_walker &walker ) ;
-
-  /// Build the isosurface using dual marching cubes
-  bool build_isosurface( data_access *ref = NULL ) ;
-  
-  /// Draw the isosurface on-the-fly using dual marching cubes
-  bool direct_draw_isosurface( data_access *ref = NULL ) ;
-  
-  /// Draw the dual octree with wireframe
-  bool draw_dual() ;
-  
-  /// Do nothing, just for dual generation timing
-  bool dual_timing() ;
-  
-//-----------------------------------------------------------------------------
-// iterators
-public:
-  /// Create an iterator traversing the tree from the root
-  inline cell_iterator cells_begin() { return cell_iterator( *this ) ; }
-
-  /// Create an iterator traversing the leaves of the tree from the root
-  inline leaf_iterator leaves_begin() { return leaf_iterator( *this ) ; }
-
-//-----------------------------------------------------------------------------
-// search operations
-public:
-  /// Find cells of the octree at a given position
-  bool find_leaf( Key k, Level o_lv, geom_cell &cell ) const ;
-  bool find_leaf( Key k, geom_cell &cell ) const { return find_leaf( k, opt_level(), cell ) ; }
-  bool find_leaf( real x, real y, real z, geom_cell &cell ) const { return find_leaf( cube2key( Cube(x,y,z,MAX_LEVEL) ), opt_level(), cell ) ; }
-
-  /// Find cells of the octree inside a given box of center x,y,z and half side r
-  bool find_radius( real x, real y, real z, real r, List<geom_cell> &cells ) const ;
-
-  /// Find adjacent cells of the octree to a given cell
-  bool adjacent( Key k, List<geom_cell> &cells ) const ;
-  bool adjacent( const geom_cell &cell, List<geom_cell> &cells ) const { return adjacent( cell.key(), cells ) ; }
-
-  /// Leaf test based on the field value
-  bool is_leaf( const HashField::KeyData &kd ) const { return !is_inv( kd.data ) ; }
-  
-  /// Leaf test based on the field value
-  bool is_leaf( Key k, real &d ) const { const HashField::KeyData &kd = _hash[k] ; d = kd.data ; return is_leaf( kd ) ; }
-
-  /// Leaf test based on the field value
-  bool is_leaf( Key k ) const { return is_leaf( _hash[k] ) ; }
-  
-  /// Node existence
-  bool node_exists( Key k, HashField::KeyData &kd ) const { kd = _hash[k] ;  return kd.key != KEY_INV ; }
-  
-  //-----------------------------------------------------------------------------
-// I/O
-public:
-
-  /// Draws the intersecting cells of a plane with the octree with color
-  void draw_plane ( real nx, real ny, real nz, real d	  ) ;
-
-  /// Draws the intersection of a plane with the octree with color
-  void draw_slice ( real nx, real ny, real nz, real d, float alpha ) ;
-
-  /// Draws the isosurface of level l inside the dual graph
-  void draw_iso   () { _mc.draw_surf() ; }
-
-//_____________________________________________________________________________
-// Iterator Cell
-public :
-  /// Auxiliary structure to traverse the octree
-  class geom_cell : public Cube
-  //---------------------------------------------------------------------------
-  {
-    friend class OptOctree ;
-
-  protected:
-    Key   _key   ;  ///< octree cell
-    real  _field ;  ///< field associated to the cell
-
-  //---------------------------------------------------------------------------
-  // Constructors
-  public:
-    /// Default constructor
-    geom_cell( Key key_ = KEY_INV, real field_ = R_INV ) : Cube(key2cube(key_)), _key(key_), _field(field_) {}
-
-    /// Default constructor
-    geom_cell( HashField::KeyData kd ) : Cube(key2cube(kd.key)), _key(kd.key), _field(kd.data) {}
-
-    /// Destructor
-    ~geom_cell() {}
-
-    /// Copy constructor
-    geom_cell( const geom_cell &i ) : Cube(i), _key(i._key), _field(i._field) {}
-
-    /// Assignment operator
-    geom_cell &operator = ( const geom_cell &i )
-    {  Cube::operator=(i) ;  _key = i._key ;  _field = i._field ;  return *this; }
-    
-
-  //---------------------------------------------------------------------------
-  // Public constant accessors
-  public  :
-    /// key const accessor
-    inline Key  key() const { return _key ; }
-    /// key accessor
-    inline Key &key() { return _key ; }
-
-    /// id const accessor
-    inline real  operator*() const { return _field ; }
-    
-    //---------------------------------------------------------------------------
-  // Tests
-  public :
-    /// equality operator
-    inline bool operator ==( const geom_cell &i ) const { return key() == i.key() ; }
-
-    /// inequality operator
-    inline bool operator !=( const geom_cell &i ) const { return key() != i.key() ; }
-
-    /// leaf test
-    inline bool is_leaf() const { return !is_inv(*(*this)) ; }
-
-    /// validation operator
-    inline bool      operator ()() const { return key() != KEY_INV ; }
-
-  //---------------------------------------------------------------------------
-  // Operations
-  public  :
-    /// sons
-    inline bool sons( geom_cell *s /*[8]*/, const HashField &hash )
-    {
-      if( is_leaf() ) return false ;
-
-      Key k = _key << 3 ;
-      for( int i = 0 ; i < 8 ; ++i )
-      {
-        s[i]._key   = k | i ;
-        s[i]._field = hash[k|i].data ;
-        (Cube&)s[i] = key2cube(s[i]._key) ;
-      }
-      return true ;
-    }
-  };
-
-  const geom_cell geom_root() const { const Key root_key = 1 ; return geom_cell( root_key, _hash[root_key].data ) ; }
-  const geom_cell geom_key ( Key k ) const { return geom_cell( k, _hash[k].data ) ; }
-
-
-
-//_____________________________________________________________________________
-// Cell Iterator
-public :
-  /// Octree cell iterator : Traverse the octree returning basic information on the cells
-  class cell_iterator
-  //---------------------------------------------------------------------------
-  {
-    friend class OptOctree ;
-
-  protected:
-    /// Octree traversal iterator
-    HashField::iterator _it ;
-
-  //---------------------------------------------------------------------------
-  // Constructors
-  public:
-    /// Default constructor : Constructs an iterator from a cell
-    cell_iterator( OptOctree &o ) : _it( o._hash.begin() ) {}
-
-    /// Destructor
-    ~cell_iterator() {}
-
-    /// Copy constructor
-    cell_iterator( const cell_iterator &i ) : _it(i._it) {}
-
-    /// Assignment operator
-    cell_iterator &operator = ( const cell_iterator &i )
-    { _it = i._it; return *this; }
-
-  //---------------------------------------------------------------------------
-  // Operations
-  public  :
-    /// equality operator
-    inline bool operator ==( const cell_iterator &i ) const { return _it == i._it ; }
-
-    /// inequality operator
-    inline bool operator !=( const cell_iterator &i ) const { return _it != i._it ; }
-
-    /// validation operator
-    inline bool      operator ()() const { return _it() ; }
-
-    /// next position
-    inline cell_iterator &operator ++() { ++_it ; return *this ; }
-
-  //---------------------------------------------------------------------------
-  // Accessors
-  public  :
-    // cell accessor
-    inline geom_cell top() const { return geom_cell( key(), *_it ) ; }
-
-    /// id accessor
-    inline real &operator*() { return *_it ; }
-
-    /// level accessor
-    inline Level lv() { return key_level(_it.key()) ; }
-
-    /// size accessor
-    inline real  sz() { return Cube(0,0,0,lv()).sz() ; }
-    
-    /// key accessor
-    inline Key   key() const { return _it.key() ; }
-    
-    /// points accessor
-    inline bool is_leaf() const { return !is_inv(*_it) ; }
-
-    /// Draws the cell wire with opengl
-    void draw_wire  () const { top().draw_wire  () ; }
-
-  };
-
-
-  /// Octree leaf iterator : Traverse the octree returning basic information on the leaves
-  class leaf_iterator : public cell_iterator
-  //---------------------------------------------------------------------------
-  {
-    public :
-    leaf_iterator( OptOctree &o ) : cell_iterator( o )
-    { if( (*this)() && !this->is_leaf() ) ++(*this) ; }
-
-    
-    /// next position
-    inline leaf_iterator &operator ++()
-    {
-      cell_iterator &it = *this ;
-      do ++it ; while ( it() && !it.is_leaf() ) ;
-      return *this ;
-    }
-  } ;
-} ;
-//_____________________________________________________________________________
-
-
-
diff --git a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/perf_main.cpp b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/perf_main.cpp
deleted file mode 100644
index 17c64fd125..0000000000
--- a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/perf_main.cpp
+++ /dev/null
@@ -1,265 +0,0 @@
-/**
- * \file    perf_main.cpp
- * \author  Thomas Lewiner   <tomlew@puc-rio.br>
- * \author  Matmidia Lab, Math Dept, PUC-Rio
- * \date    10/01/2010
- *
- *  Octree performances test
- */
-//_____________________________________________________________________________
-
-
-/*
-with pointers
- level 10,12: hash 27, non hash 31
- level 8: hash 27, non hash 37
- 
-without pointers
- level 10: hash 21, non hash 31
- level 8: hash 21, non hash 37/40
-*/
-
-
-#define OCTREE_SWITCH 2
-
-#ifdef OCTREE_SWITCH
-# if   OCTREE_SWITCH==0
-#  define OCTREE_PTR   1
-# elif OCTREE_SWITCH==1
-#  define OCTREE_HASH  1
-# elif OCTREE_SWITCH==2
-#  define OCTREE_OPT   1
-# elif OCTREE_SWITCH==3
-#  define OCTREE_LEAF  1
-# elif OCTREE_SWITCH==4
-#  define OCTREE_MEM   1
-# endif // OCTREE_SWITCH
-#endif // OCTREE_SWITCH
-
-
-// switch values between pointer and hash octree
-#if !OCTREE_PTR && !OCTREE_HASH && !OCTREE_OPT && !OCTREE_LEAF && !OCTREE_MEM
-// # define OCTREE_PTR  1
-// # define OCTREE_HASH 1
-# define OCTREE_OPT  1
-// # define OCTREE_LEAF 1
-// # define OCTREE_MEM  1
-#endif // !OCTREE_PTR && !OCTREE_HASH && !OCTREE_OPT && !OCTREE_LEAF && !OCTREE_MEM
-
-
-#ifdef OCTREE_PTR
-# undef OCTREE_HASH
-# undef OCTREE_OPT  
-# undef OCTREE_LEAF 
-# undef OCTREE_MEM  
-# define OCTREE_STRING "0 pointer"
-# include "ptr_octree.h"
-  /// octree type
-  typedef PtrOctree Octree ;
-#endif //OCTREE_PTR
-
-
-#ifdef OCTREE_HASH
-# undef OCTREE_PTR
-# undef OCTREE_OPT  
-# undef OCTREE_LEAF 
-# undef OCTREE_MEM  
-# define OCTREE_STRING "1 hash"
-# include "hash_octree.h"
-  /// octree type
-  typedef HashOctree Octree ;
-#endif //OCTREE_HASH
-
-
-#ifdef OCTREE_OPT
-# undef OCTREE_PTR
-# undef OCTREE_HASH
-# undef OCTREE_LEAF 
-# undef OCTREE_MEM  
-# define OCTREE_STRING "2 opt"
-# include "opt_octree.h"
-  /// octree type
-  typedef OptOctree Octree ;
-#endif //OCTREE_OPT
-
-
-#ifdef OCTREE_LEAF
-# undef OCTREE_PTR
-# undef OCTREE_HASH
-# undef OCTREE_OPT  
-# undef OCTREE_MEM  
-# define OCTREE_STRING "3 leaf"
-# include "leaf_octree.h"
-/// octree type
-typedef LeafOctree Octree ;
-#endif //OCTREE_LEAF
-
-
-#ifdef OCTREE_MEM
-# undef OCTREE_PTR
-# undef OCTREE_HASH
-# undef OCTREE_OPT  
-# undef OCTREE_LEAF 
-# define OCTREE_STRING "4 mem"
-# include "mem_octree.h"
-/// octree type
-typedef MemOctree Octree ;
-#endif //OCTREE_MEM
-
-
-#ifndef NPOINTS
-# define NPOINTS 100
-#endif // NPOINTS
-
-#ifndef RADIUS
-# define RADIUS (0.003f)
-#endif // RADIUS
-
-#ifndef NDUALS
-# define NDUALS 10
-#endif // NDUALS
-
-#ifndef MLEVEL
-# define MLEVEL 5
-#endif // MLEVEL
-
-#ifndef IMPLFUN // set to 0 for random
-# define IMPLFUN 1
-#endif // IMPLFUN
-
-#ifndef ISOVAL
-# define ISOVAL 0.5
-#endif // ISOVAL
-
-
-#include "hash.h"
-#include "implfuns.h"
-#include <stdio.h>
-
-//_____________________________________________________________________________
-//
-int main( int argc , char* argv[] )
-//-----------------------------------------------------------------------------
-{
-#if OCTREE_LEAF && !USE_HASH_PTR
-  return 0 ;
-#endif // OCTREE_LEAF && !USE_HASH_PTR
-  
-  srand(77) ;
-//  Chrono::ResetClocks() ;
-
-  printf( "\n\n\n-----------------------------------------------------------------------------\n"
-         OCTREE_STRING
-         "\n\thash\t%s\tpointers\n"
-         "\thash bits =\t%d\n"
-         "\tnon hash bits=\t%d\n"
-         "\tmax_level =\t%d\n"
-         "\tdensity =\t%f\n"
-         "\tnpoints =\t%d\n"
-         "\tradius =\t%f\n"
-         "\timplicit function =\t%s\n"
-         "\tisovalue =\t%f\n"
-         "\tnumber of duals=\t%d\n\n",
-         (USE_HASH_PTR ? "with" : "without"), HASH_BITS, NON_HASH_BITS, MLEVEL, RAND_THRES, NPOINTS, RADIUS, fun_list[IMPLFUN], ISOVAL, NDUALS ) ;
-  fflush(stdout);
-  
-  /// main data structure
-  Octree octree ;
-#if IMPLFUN==0
-  data_rand ref( MLEVEL ) ;
-  octree.refine( &ref ) ;
-#else  // IMPLFUN
-  data_func ref( MLEVEL, ISOVAL, fun_def[IMPLFUN] ) ;
-  octree.refine( &ref ) ;
-  octree.set_impl( &ref ) ;
-#endif // IMPLFUN
-  fflush(stdout);
-
-  
-/*  
-  //-------------------------------------------------
-  // search for random points
-  Chrono::ResetClocks() ;
-  printf( "\n\nRandom Points\n" ) ;
-  for( int i = 0 ; i < NPOINTS ; ++i )
-  {
-    real x = (real)rand()/(real)RAND_MAX;
-    real y = (real)rand()/(real)RAND_MAX;
-    real z = (real)rand()/(real)RAND_MAX;
-    Octree::geom_cell gc ;
-    List<Octree::geom_cell> gc_list ;
-    octree.find_leaf( x,y,z, gc ) ; 
-    octree.find_radius( x,y,z, RADIUS, gc_list ) ; gc_list.clear() ;
-    octree.adjacent( gc, gc_list ) ; gc_list.clear() ;
-  }
-  Chrono::PrintClocks() ;
-  fflush(stdout);
-  //-------------------------------------------------
-
-
-  //-------------------------------------------------
-  // search for all leaves once
-  printf( "\nLeaves\n" ) ;
-  Chrono::ResetClocks() ;
-  for( Octree::leaf_iterator it = octree.leaves_begin() ; it() ; ++it )
-  {
-    Octree::geom_cell g_it = it.top() ;
-    Octree::geom_cell gc ;
-    List<Octree::geom_cell> gc_list ;
-    octree.find_leaf( g_it.cx(), g_it.cy(), g_it.cz(), gc ) ; 
-    octree.find_radius( g_it.cx(), g_it.cy(), g_it.cz(), RADIUS, gc_list ) ; gc_list.clear() ;
-    octree.adjacent( gc, gc_list ) ; gc_list.clear() ;
-  }
-  Chrono::PrintClocks() ;
-  fflush(stdout);
-  //-------------------------------------------------
-  
-  
-  //-------------------------------------------------
-  // search for all points at the maximal level
-  printf( "\n\nGrid\n" ) ;
-  Level lv = octree.max_level() - 4 ;
-  real step = 1.0 / (1 << lv) ;
-  Chrono::ResetClocks() ;
-  for( real x = 0.0 ; x <= 1.0 ; x += step )
-  {
-    for( real y = 0.0 ; y <= 1.0 ; y += step )
-    {
-      for( real z = 0.0 ; z <= 1.0 ; z += step )
-      {
-        Octree::geom_cell gc ;
-        List<Octree::geom_cell> gc_list ;
-        octree.find_leaf( x,y,z, gc ) ; 
-        octree.find_radius( x,y,z, RADIUS, gc_list ) ; gc_list.clear() ;
-        octree.adjacent( gc, gc_list ) ; gc_list.clear() ;
-      }
-    }
-  }
-  Chrono::PrintClocks() ;
-  fflush(stdout);
-  //-------------------------------------------------
-*/
-
-  //-------------------------------------------------
-  // build many duals
-  printf( "\n\nDuals\n" ) ;
-//  Chrono::ResetClocks() ;
-  for( int i = 0 ; i < NDUALS ; ++i )
-  {
-#if IMPLFUN==0
-    octree.dual_timing() ;
-#else  // IMPLFUN
-    octree.mc().clean_all() ;
-    octree.build_isosurface(&ref) ;
-#endif // IMPLFUN
-  }
-//  Chrono::PrintClocks() ;
-  octree.stats() ;
-  fflush(stdout);
-  //-------------------------------------------------
-
-  
-  return 0; 
-}
-//_____________________________________________________________________________
-
diff --git a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/point.h b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/point.h
deleted file mode 100644
index c2e82b863b..0000000000
--- a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/point.h
+++ /dev/null
@@ -1,289 +0,0 @@
-/**
- * \file    point.h
- * \author  Thomas Lewiner   <tomlew@puc-rio.br>
- * \author  Matmidia Lab, Math Dept, PUC-Rio
- * \date    10/01/2010
- *
- * \brief  (Point/Vector Class).
- */
-/**------------------------------------------------------------------------------------*/
-
-
-#pragma once
-
-#include <stdlib.h>
-#include <float.h>   // FLT_EPSILON
-#include <math.h>   // nan
-#ifdef UNIX
-#include <GL/gl.h>
-#else
-#include <OpenGL/GL.h>
-#endif
-
-
-
-//------------------------------------------------
-/** real number type */
-typedef float           real ;
-typedef const real     creal ;
-#define R_PI      ((creal)3.1415926535897932384626433832795)
-#define R_EPSILON ((real)FLT_EPSILON)
-inline bool is_inv( real x ) { return isnan(x) ; }
-extern real R_INV ;
-
-/** integer number aliases */
-typedef   signed char  schar ;
-typedef unsigned char  uchar ;
-typedef unsigned  int   uint ;
-typedef const     int   cint ;
-typedef const    uint  cuint ;
-
-/** \brief Axis Definition */
-enum Axis { X = 0, Y = 1, Z = 2 } ;
-//------------------------------------------------
-
-
-/** \brief point with normal */
-class Point
-  {
-    protected :
-    real  _x, _y, _z ;
-    
-    public :
-    Point() : _x(R_INV), _y(R_INV), _z(R_INV) {}
-    Point( creal x_, creal y_, creal z_ ) : _x(x_), _y(y_), _z(z_) {}
-    Point( const Point &p_ ) : _x(p_._x), _y(p_._y), _z(p_._z) {}
-    Point  &operator = ( const Point &p_ )
-    { _x=p_._x ;  _y=p_._y ;  _z=p_._z ;  return *this; }
-    
-    
-    public :
-    inline real &x()       { return _x ; }
-    inline real &y()       { return _y ; }
-    inline real &z()       { return _z ; }
-    inline creal x() const { return _x ; }
-    inline creal y() const { return _y ; }
-    inline creal z() const { return _z ; }
-    
-    inline creal &operator[] ( Axis a ) const
-    { switch( a ) {
-      case X : return _x ;
-      case Y : return _y ;
-      case Z : return _z ;
-      default: return R_INV ;
-    } }
-    inline real  &operator[] ( Axis a )
-    { switch( a ) {
-      case X : return _x ;
-      case Y : return _y ;
-      case Z : return _z ;
-      default: return R_INV ;
-    } }    
-    
-    /**------------------------------------------------------------------------------------*/
-    inline bool valid()
-    {
-      return
-      ( !is_inv( x() ) ) &&
-      ( !is_inv( y() ) ) &&
-      ( !is_inv( z() ) ) ;
-    }
-    inline bool invalid()
-    {
-      return
-      ( is_inv( x() ) ) ||
-      ( is_inv( y() ) ) ||
-      ( is_inv( z() ) ) ;
-    }
-    
-    
-    /**------------------------------------------------------------------------------------*/
-    // Basic operations
-    
-    /// +=
-    inline Point &operator+= ( const Point &p_ )
-    {
-      x() += p_.x() ;  y() += p_.y() ;  z() += p_.z() ;
-      return *this ;
-    }
-    /// unary -
-    inline const Point operator- ()
-    {
-      x() = -x() ;  y() = -y() ;  z() = -z() ;
-      return *this ;
-    }
-    /// -=
-    inline Point &operator-= ( const Point &p_ )
-    {
-      x() -= p_.x() ;  y() -= p_.y() ;  z() -= p_.z() ;
-      return *this ;
-    }
-    /// *= scalar
-    inline Point &operator*= ( const real l )
-    {
-      x() *= l ;  y() *= l ;  z() *= l ;
-      return *this ;
-    }
-    /// /= scalar
-    inline Point &operator/= ( const real l )
-    {
-      if( fabs(l) < R_EPSILON ) return *this ;
-      real s = 1.0/l ;
-      return *this *= s ;
-    }
-
-    
-    /**------------------------------------------------------------------------------------*/
-    // Norms
-    inline real length () const
-    {
-      return hypot( hypot( x(), y() ), z() ) ;
-    }
-    inline real norm   () const { return length() ; }
-    inline real dist   ( const Point &p_ ) const { Point r = *this ; r -= p_ ;  return r.length() ; }
-
-    inline bool operator== ( const Point &p_ ) const { return dist( p_ ) < R_EPSILON ; }
-    inline bool operator!= ( const Point &p_ ) const { return !( *this == p_ ) ; }
-    
-    inline bool normalize()
-    {
-      real l = length() ;
-      if( l < R_EPSILON ) return false ;
-      *this /= l ;
-      return true ;
-    }
-    
-    /** replaces p by the by-coordinate minimum of p and p_ */
-    inline void pmin( const Point &p_ )
-    { 
-      if( x() > p_.x() ) x() = p_.x() ; 
-      if( y() > p_.y() ) y() = p_.y() ; 
-      if( z() > p_.z() ) z() = p_.z() ; 
-    }
-    
-    /** replaces p by the by-coordinate maximum of p and p_ */
-    inline void pmax( const Point &p_ )
-    { 
-      if( x() < p_.x() ) x() = p_.x() ; 
-      if( y() < p_.y() ) y() = p_.y() ; 
-      if( z() < p_.z() ) z() = p_.z() ; 
-    }
-    
-    //-----------------------------------------------------------------------------
-    // Drawing
-  public:
-    /// Draws the point with opengl
-    void draw () const { ::glVertex3f( (float)x(), (float)y(), (float)z() ) ; }
-  } ;
-
-// Valid point
-extern Point P_INV ;
-
-
-/**------------------------------------------------------------------------------------*/
-// Geometric Operations
-
-/// +
-inline const Point operator+  ( const Point &p, const Point &p_ )
-{
-  Point r = p ;
-  return (r += p_) ;
-}
-/// -
-inline const Point operator-  ( const Point &p, const Point &p_ )
-{
-  Point r = p ;
-  return r -= p_ ;
-}
-/// * scalar
-inline const Point  operator*  ( const Point &p, const real l )
-{
-  Point r = p ;
-  return r *= l ;
-}
-/// * scalar
-inline const Point  operator*  ( const real l, const Point &p )
-{
-  return p * l ;
-}
-/// / scalar
-inline const Point  operator/  ( const Point &p, const real l )
-{
-  Point r = p ;
-  return r /= l ;
-}
-
-/// scalar (dot) product
-inline real operator* ( const Point &p, const Point &p_ )
-{
-  return p.x()*p_.x() + p.y()*p_.y() + p.z()*p_.z() ;
-}
-/// vector (cross) product 
-static inline const Point operator^  ( const Point &p, const Point &p_ )
-{
-  Point r ;
-  r.x() = p.y() * p_.z()  -  p.z() * p_.y() ;
-  r.y() = p.z() * p_.x()  -  p.x() * p_.z() ;
-  r.z() = p.x() * p_.y()  -  p.y() * p_.x() ;
-  return r ;
-}
-static inline real det( const Point &p, const Point &q, const Point &r )
-{
-  return
-  p.x()*q.y()*r.z() + p.y()*q.z()*r.x() + p.z()*q.x()*r.y() -
-  p.z()*q.y()*r.x() - p.x()*q.z()*r.y() - p.y()*q.x()*r.z() ;
-}
-
-
-/**------------------------------------------------------------------------------------*/
-// Geometric Operations
-
-inline real length ( const Point &p ) { return p.length() ; }
-inline real norm   ( const Point &p ) { return p.norm() ; }
-inline real dist   ( const Point &p, const Point &p_ ) { return p.dist(p_) ; }
-inline real sqdist ( const Point &p, const Point &p_ ) { Point r = p-p_ ; return r*r ; }
-
-/** \brief Computes the normal of a triangle
- * \param const Point &v0
- * \param const Point &v1
- * \param const Point &v2 */
-inline const Point normal (const Point & v0, const Point & v1, const Point & v2)
-{
-  Point n = ( v1-v0 ) ^ ( v2 - v0 ) ;
-  n.normalize() ;
-  return n ;
-}
-
-/** \brief Computes the area of a triangle
- * \param const Point &v0
- * \param const Point &v1
- * \param const Point &v2 */
-inline real area (const Point & v0, const Point & v1, const Point & v2)
-{
-  return 0.5 * norm( ( v1-v0 ) ^ ( v2 - v0 ) );
-}
-
-/** \brief Computes the cotangent of ange v v1,v v2
- * \param const Point &v
- * \param const Point &v1
- * \param const Point &v2 */
-inline const real cotan (const Point & v, const Point & v1, const Point & v2)
-{
-  Point u = v1-v ;
-  Point w = v2-v ;
-  return (u*w) / norm( u ^ w ) ;
-}
-
-/** \brief Computes the middle of an edge
- * \param const Point &v0
- * \param const Point &v1 */
-inline const Point middle (const Point & v0, const Point & v1)
-{
-  return 0.5 * (v0+v1) ;
-}
-
-
-inline void pmin( Point &p, const Point &p_ ) { p.pmin( p_ ) ; }
-inline void pmax( Point &p, const Point &p_ ) { p.pmax( p_ ) ; }
-
-
diff --git a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/ptr_octree.cpp b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/ptr_octree.cpp
deleted file mode 100644
index 8b3fa39d2d..0000000000
--- a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/ptr_octree.cpp
+++ /dev/null
@@ -1,1289 +0,0 @@
-/**
- * \file    ptr_octree.cpp
- * \author  Thomas Lewiner   <tomlew@puc-rio.br>
- * \author  Matmidia Lab, Math Dept, PUC-Rio
- * \date    10/01/2010
- *
- *  Octree structure with son-brother pointers
- */
-//_____________________________________________________________________________
-
-
-#ifndef WIN32
-#pragma implementation
-#endif // WIN32
-
-
-#include "ptr_octree.h"
-
-
-//_____________________________________________________________________________
-// Create the root
-void PtrOctree::init()
-//-----------------------------------------------------------------------------
-{
-  _root.brother   = NULL ;
-  _root.first_son = NULL ;
-  _root.field     = 0.0  ;  
-  
-  _max_level = 0 ;
-  _max_field = R_INV ;
-}
-//_____________________________________________________________________________
-
-
-
-
-//_____________________________________________________________________________
-// Check that each point scan or scribble is in the right node
-bool PtrOctree::check ()
-//-----------------------------------------------------------------------------
-{
-  bool result = true ;
-  return result ;
-}
-//_____________________________________________________________________________
-
-
-
-
-//_____________________________________________________________________________
-// Delete the branch below a given node
-void PtrOctree::clear_branch( cell *b )
-//-----------------------------------------------------------------------------
-{
-  std::stack<cell*> s ;
-  s.push( b ) ;
-  while( !s.empty() )
-  {
-    cell *n = s.top() ;
-    cell *son  = n->first_son ;
-    cell *prev = n ;
-    while( son != (cell*)NULL ) // look two levels to be able to update pointers
-    {
-      cell *next = son->brother ;
-      if( !son->first_son ) // son is a leaf
-      {
-        delete son ;
-        if( prev == n )
-          n->first_son = next ;
-        else
-          prev->brother = next ;
-      }
-      else
-      {
-        prev = son ;
-        s.push( son ) ;
-      }
-      son = next ;
-    }
-    if( !n->first_son ) // now it is a leaf
-      s.pop() ;
-  }
-}
-//_____________________________________________________________________________
-
-
-
-
-
-//_____________________________________________________________________________
-// set the values of each leaf from the implicit function
-bool PtrOctree::set_impl( data_access *ref )
-//-----------------------------------------------------------------------------
-{  
-  if( !ref ) return false ;
-
-  _max_field = -FLT_MAX ;
-  for( cell_iterator it = cells_begin() ; it() ; ++it )
-  {
-    if( it.is_leaf() )
-    {
-      real v = (*ref).value_at( it.top() ) ;
-      *it = v ;
-      v = fabs(v) ;
-      if( _max_field < v ) _max_field = v ;
-    }
-    else
-      *it = R_INV ;
-  }
-  
-//  printf( "max field: %f\n", max_field() ) ;
-  return true ;
-}
-//_____________________________________________________________________________
-
-
-
-
-
-//_____________________________________________________________________________
-// Refine the octree according to the data access
-bool PtrOctree::refine( data_access *ref /*= NULL*/ )
-//-----------------------------------------------------------------------------
-{
-  if( !ref ) return false ;
-
-    clear() ;  init() ;
-  
-  // traversal stack: iterator has a pre-ordered stack, and cannot be recursed on
-  geom_cell it( &_root ) ;
-  std::stack< geom_cell > s ;
-  s.push( it ) ;
-  
-  // although it may refine only the leaves
-  // the leaf iterator may change during the refinement
-  bool refined = false ;
-  while( !s.empty() )
-  {
-    it = s.top() ;  s.pop() ;
-    geom_cell sons[8] ;
-    
-    // test for subdivision
-    if( !(*ref).need_refine( it ) ) continue ;
-    refined = true ;
-    
-    //_____________________________________________________________________________
-    // subdivides the cell in the tree
-    for( int i = 0 ; i < 8 ; ++i )
-    {
-      sons[i].cell     () = new cell ;
-      sons[i].first_son() = (cell*)NULL ;
-      sons[i].brother  () = (cell*)NULL ;
-      sons[i].cell()->field  = 0.0 ;
-      
-      if( i == 0 ) it.first_son() = sons[i].cell() ;
-      else sons[i-1].brother()    = sons[i].cell() ;
-    }
-    it.sons( sons ) ;
-    //if( _max_level < it.lv() ) _max_level = it.lv() ;
-    if( _max_level < sons[0].lv() ) _max_level = sons[0].lv() ;
-    
-    // recurse on the traversal
-    for( int i = 0 ; i < 8 ; ++i )
-      s.push( sons[i] ) ;
-  }
-  
-  return refined ;
-}
-//_____________________________________________________________________________
-
-
-
-//_____________________________________________________________________________
-// Refine the octree according to the data access
-bool PtrOctree::adapt( data_access *ref /*= NULL*/ )
-//-----------------------------------------------------------------------------
-{
-  if( !ref ) return false ;
-
-    _max_level = 0 ;
-  
-  // traversal stack: iterator has a pre-ordered stack, and cannot be recursed on
-  geom_cell it( &_root ) ;
-  std::stack< geom_cell > s ;
-  s.push( it ) ;
-  
-  // although it may refine only the leaves
-  // the leaf iterator may change during the refinement
-  bool refined = false ;
-  while( !s.empty() )
-  {
-    it = s.top() ;  s.pop() ;
-    geom_cell sons[8] ;
-
-    // look for the leaves
-    if( !it.is_leaf() )
-    {
-      if( !(*ref).need_refine( it ) )
-      {
-        clear_branch( it.cell() ) ;
-        refined = true ;
-        continue ;
-      }
-
-      it.sons( sons ) ;
-      for( int i = 0 ; i < 8 ; ++i )
-        s.push( sons[i] ) ;
-
-      if( _max_level < sons[0].lv() ) _max_level = sons[0].lv() ;
-      continue ;
-    }
-
-    // test for subdivision
-    if( !(*ref).need_refine( it ) ) continue ;
-    refined = true ;
-    
-    //_____________________________________________________________________________
-    // subdivides the cell in the tree
-    for( int i = 0 ; i < 8 ; ++i )
-    {
-      sons[i].cell     () = new cell ;
-      sons[i].first_son() = (cell*)NULL ;
-      sons[i].brother  () = (cell*)NULL ;
-      sons[i].cell()->field  = 0.0 ;
-      
-      if( i == 0 ) it.first_son() = sons[i].cell() ;
-      else sons[i-1].brother()    = sons[i].cell() ;
-    }
-    it.sons( sons ) ;
-    //if( _max_level < it.lv() ) _max_level = it.lv() ;
-    if( _max_level < sons[0].lv() ) _max_level = sons[0].lv() ;
-    
-    // recurse on the traversal
-    for( int i = 0 ; i < 8 ; ++i )
-      s.push( sons[i] ) ;
-  }
-  
-  return refined ;
-}
-//_____________________________________________________________________________
-
-
-
-
-//_____________________________________________________________________________
-// Draw the octree with wireframe
-bool PtrOctree::draw_wire()
-//-----------------------------------------------------------------------------
-{
-  for( leaf_iterator it = leaves_begin() ; it() ; ++it )
-    it.draw_wire() ;
-  
-  return true ;
-}
-//_____________________________________________________________________________
-
-
-
-
-
-//_____________________________________________________________________________
-// Draw the octree with dots
-bool PtrOctree::draw_centers()
-//-----------------------------------------------------------------------------
-{
-  for( cell_iterator it = cells_begin() ; it() ; ++it )
-  {
-    ::glTexCoord1f( (GLfloat)fabs(*it / max_field()) ) ;
-    it.top().draw() ;
-  }
-  
-  return true ;
-}
-//_____________________________________________________________________________
-
-
-
-
-//_____________________________________________________________________________
-// Recursion structure
-typedef struct
-//-----------------------------------------------------------------------------
-{
-  enum { DUAL_VERTEX=0, DUAL_EDGE=1, DUAL_FACE=2, DUAL_CUBE=3 } type ;
-  PtrOctree::geom_cell  cells[8]  ;
-  int                   direction ;
-} ptr_dual_iterator_struct ;
-//-----------------------------------------------------------------------------
-// edge pattern for cubes
-// direction : x -> 0, y -> 1, z -> 2, other -> -1
-static const int dir_edges[19][3] = {
-  {0,1,0}, {0,2,1}, {0,4,2}, {1,3,1}, {1,5,2}, {2,3,0}, {2,6,2}, {3,7,2}, {4,5,0}, {4,6,1}, {5,7,1}, {6,7,0},
-  {0,5,-1}, {0,6,-1}, {1,7,-1}, {2,7,-1}, {0,3,-1}, {4,7,-1}, {0,7,-1} } ;
-//_____________________________________________________________________________
-
-
-
-#define PRINT_DUAL_DEBUG 0
-
-//_____________________________________________________________________________
-// Debug print
-void print_final_cube( PtrOctree::geom_cell *cells, float M )
-{
-#if PRINT_DUAL_DEBUG
-  printf( "cube (%d,%d,%d)  (%d,%d,%d)  (%d,%d,%d)  (%d,%d,%d)  (%d,%d,%d)  (%d,%d,%d)  (%d,%d,%d)  (%d,%d,%d) \n",
-         (int)(cells[0].cx()*M), (int)(cells[0].cy()*M), (int)(cells[0].cz()*M),
-         (int)(cells[1].cx()*M), (int)(cells[1].cy()*M), (int)(cells[1].cz()*M),
-         (int)(cells[2].cx()*M), (int)(cells[2].cy()*M), (int)(cells[2].cz()*M),
-         (int)(cells[3].cx()*M), (int)(cells[3].cy()*M), (int)(cells[3].cz()*M),
-         (int)(cells[4].cx()*M), (int)(cells[4].cy()*M), (int)(cells[4].cz()*M),
-         (int)(cells[5].cx()*M), (int)(cells[5].cy()*M), (int)(cells[5].cz()*M),
-         (int)(cells[6].cx()*M), (int)(cells[6].cy()*M), (int)(cells[6].cz()*M),
-         (int)(cells[7].cx()*M), (int)(cells[7].cy()*M), (int)(cells[7].cz()*M) ) ;
-#endif  // PRINT_DUAL_DEBUG
-}
-//-----------------------------------------------------------------------------
-void print_dual_cube( const char*ori, PtrOctree::geom_cell *cells, float M )
-{
-#if PRINT_DUAL_DEBUG
-  printf( "%s->cube (%d,%d,%d)  (%d,%d,%d)  (%d,%d,%d)  (%d,%d,%d)  (%d,%d,%d)  (%d,%d,%d)  (%d,%d,%d)  (%d,%d,%d) \n", ori,
-         (int)(cells[0].cx()*M), (int)(cells[0].cy()*M), (int)(cells[0].cz()*M),
-         (int)(cells[1].cx()*M), (int)(cells[1].cy()*M), (int)(cells[1].cz()*M),
-         (int)(cells[2].cx()*M), (int)(cells[2].cy()*M), (int)(cells[2].cz()*M),
-         (int)(cells[3].cx()*M), (int)(cells[3].cy()*M), (int)(cells[3].cz()*M),
-         (int)(cells[4].cx()*M), (int)(cells[4].cy()*M), (int)(cells[4].cz()*M),
-         (int)(cells[5].cx()*M), (int)(cells[5].cy()*M), (int)(cells[5].cz()*M),
-         (int)(cells[6].cx()*M), (int)(cells[6].cy()*M), (int)(cells[6].cz()*M),
-         (int)(cells[7].cx()*M), (int)(cells[7].cy()*M), (int)(cells[7].cz()*M) ) ;
-#endif  // PRINT_DUAL_DEBUG
-}
-//-----------------------------------------------------------------------------
-void print_dual_face( const char*ori, PtrOctree::geom_cell *cells, float M )
-{
-#if PRINT_DUAL_DEBUG
-  printf( "%s->face (%d,%d,%d)  (%d,%d,%d)  (%d,%d,%d)  (%d,%d,%d)\n", ori,
-         (int)(cells[0].cx()*M), (int)(cells[0].cy()*M), (int)(cells[0].cz()*M),
-         (int)(cells[1].cx()*M), (int)(cells[1].cy()*M), (int)(cells[1].cz()*M),
-         (int)(cells[2].cx()*M), (int)(cells[2].cy()*M), (int)(cells[2].cz()*M),
-         (int)(cells[3].cx()*M), (int)(cells[3].cy()*M), (int)(cells[3].cz()*M) ) ;
-#endif  // PRINT_DUAL_DEBUG
-}
-//-----------------------------------------------------------------------------
-void print_dual_edge( const char*ori, PtrOctree::geom_cell *cells, float M )
-{
-#if PRINT_DUAL_DEBUG
-  printf( "%s->edge (%d,%d,%d)  (%d,%d,%d)\n", ori,
-         (int)(cells[0].cx()*M), (int)(cells[0].cy()*M), (int)(cells[0].cz()*M),
-         (int)(cells[1].cx()*M), (int)(cells[1].cy()*M), (int)(cells[1].cz()*M) ) ;
-#endif  // PRINT_DUAL_DEBUG
-}
-//-----------------------------------------------------------------------------
-void print_dual_vertex( const char*ori, PtrOctree::geom_cell *cells, float M )
-{
-#if PRINT_DUAL_DEBUG
-  printf( "%s->vertex (%d,%d,%d)\n", ori,
-         (int)(cells[0].cx()*M), (int)(cells[0].cy()*M), (int)(cells[0].cz()*M) ) ;
-#endif  // PRINT_DUAL_DEBUG
-}
-//_____________________________________________________________________________
-
-
-//_____________________________________________________________________________
-// Rebuild the octree dual
-bool PtrOctree::dual_cubes_walk( ptr_dual_walker &walker )
-//-----------------------------------------------------------------------------
-{
-  bool result = true ;
-  
-  float M = 1 << (max_level()+1) ;
-  
-  
-  // face pattern for a cube
-  // direction : yz -> 0, zx -> 1, xy -> 2
-  static const int faces[6][5] = {
-    {0,1,2,3, 2}, {4,5,6,7, 2}, {0,1,4,5, 1}, {2,3,6,7, 1}, {0,2,4,6, 0}, {1,3,5,7, 0} } ;
-  
-  // traversal stack: iterator has a pre-ordered stack, and cannot be recursed on
-  ptr_dual_iterator_struct dual_it ;
-  dual_it.type     = ptr_dual_iterator_struct::DUAL_VERTEX ;
-  dual_it.cells[0] = geom_cell( &_root ) ;
-  std::stack< ptr_dual_iterator_struct > s ;
-  s.push( dual_it ) ;
-  
-  _dual_temp_memory = s.size() ;
-  while( !s.empty() )
-  {
-    int s_size = s.size() ;
-    if( s_size > _dual_temp_memory ) _dual_temp_memory = s_size ;
-
-    dual_it = s.top() ;  s.pop() ;
-    
-    //_____________________________________________________________________________
-    //_____________________________________________________________________________
-    // vertex case
-    if( dual_it.type == ptr_dual_iterator_struct::DUAL_VERTEX )
-    {
-      if( dual_it.cells[0].is_leaf() ) continue ;
-      
-      geom_cell sons[8] ;
-      dual_it.cells[0].sons( sons ) ;
-      
-      //_____________________________________________________________________________
-      // vertex
-      dual_it.type = ptr_dual_iterator_struct::DUAL_VERTEX ;
-      for( int i = 0 ; i < 8 ; ++i )
-      {
-        dual_it.cells[0] = sons[i] ;
-        s.push( dual_it ) ;
-        print_dual_vertex( "vertex", dual_it.cells, M ) ;
-      }
-      
-      //_____________________________________________________________________________
-      // edge
-      dual_it.type = ptr_dual_iterator_struct::DUAL_EDGE ;
-      for( int i = 0 ; i < 12 ; ++i )
-      {
-        dual_it.cells[0] = sons[ dir_edges[i][0] ] ;
-        dual_it.cells[1] = sons[ dir_edges[i][1] ] ;
-        dual_it.direction = dir_edges[i][2] ;
-        s.push( dual_it ) ;
-        print_dual_edge( "vertex", dual_it.cells, M ) ;
-      }
-      
-      //_____________________________________________________________________________
-      // face
-      dual_it.type = ptr_dual_iterator_struct::DUAL_FACE ;
-      for( int i = 0 ; i < 6 ; ++i )
-      {
-        dual_it.cells[0] = sons[ faces[i][0] ] ;
-        dual_it.cells[1] = sons[ faces[i][1] ] ;
-        dual_it.cells[2] = sons[ faces[i][2] ] ;
-        dual_it.cells[3] = sons[ faces[i][3] ] ;
-        dual_it.direction = faces[i][4] ;
-        s.push( dual_it ) ;
-        print_dual_face( "vertex", dual_it.cells, M ) ;
-      }
-      
-      //_____________________________________________________________________________
-      // cube
-      dual_it.type = ptr_dual_iterator_struct::DUAL_CUBE ;
-      for( int i = 0 ; i < 8 ; ++i ) dual_it.cells[i] = sons[i] ;
-      s.push( dual_it ) ;
-      print_dual_cube( "vertex", dual_it.cells, M ) ;
-      
-      continue ;
-    }
-    
-    
-    //_____________________________________________________________________________
-    //_____________________________________________________________________________
-    // edge case
-    else if( dual_it.type == ptr_dual_iterator_struct::DUAL_EDGE )
-    {
-      geom_cell all_sons[2][8] ;
-      if( dual_it.cells[0].is_leaf() )
-      {
-        if( dual_it.cells[1].is_leaf() )
-          continue ;
-        
-        // repeat father
-        for( int i = 0 ; i < 8 ; ++i )
-          all_sons[0][i] = dual_it.cells[0] ;
-        
-        dual_it.cells[1].sons( all_sons[1] ) ;
-      }
-      else
-      {
-        dual_it.cells[0].sons( all_sons[0] ) ;
-        
-        if( dual_it.cells[1].is_leaf() )
-        {
-          // repeat father
-          for( int i = 0 ; i < 8 ; ++i )
-            all_sons[1][i] = dual_it.cells[1] ;
-        }
-        else
-          dual_it.cells[1].sons( all_sons[1] ) ;
-      }
-      
-      
-      //_____________________________________________________________________________
-      // local cube
-      geom_cell sons[8] ;
-      int dir = dual_it.direction ;
-      switch( dir )
-      {
-          // x-aligned edge
-        case 0 :
-          sons[0] = all_sons[0][1] ;
-          sons[1] = all_sons[1][0] ;
-          sons[2] = all_sons[0][3] ;
-          sons[3] = all_sons[1][2] ;
-          sons[4] = all_sons[0][5] ;
-          sons[5] = all_sons[1][4] ;
-          sons[6] = all_sons[0][7] ;
-          sons[7] = all_sons[1][6] ;
-          break ;
-          
-          // y-aligned edge
-        case 1 :
-          sons[0] = all_sons[0][2] ;
-          sons[1] = all_sons[0][3] ;
-          sons[2] = all_sons[1][0] ;
-          sons[3] = all_sons[1][1] ;
-          sons[4] = all_sons[0][6] ;
-          sons[5] = all_sons[0][7] ;
-          sons[6] = all_sons[1][4] ;
-          sons[7] = all_sons[1][5] ;
-          break ;
-          
-          // z-aligned edge
-        case 2 :
-          sons[0] = all_sons[0][4] ;
-          sons[1] = all_sons[0][5] ;
-          sons[2] = all_sons[0][6] ;
-          sons[3] = all_sons[0][7] ;
-          sons[4] = all_sons[1][0] ;
-          sons[5] = all_sons[1][1] ;
-          sons[6] = all_sons[1][2] ;
-          sons[7] = all_sons[1][3] ;
-          break ;
-      }
-      
-      //_____________________________________________________________________________
-      // edge
-      dual_it.direction = dir ; // same direction
-      dual_it.type = ptr_dual_iterator_struct::DUAL_EDGE ;
-      for( int i = 0 ; i < 12 ; ++i )
-      {
-        if( dir_edges[i][2] != dir ) continue ;
-        dual_it.cells[0] = sons[ dir_edges[i][0] ] ;
-        dual_it.cells[1] = sons[ dir_edges[i][1] ] ;
-        s.push( dual_it ) ;
-        print_dual_edge( "edge", dual_it.cells, M ) ;
-      }
-      
-      //_____________________________________________________________________________
-      // face
-      dual_it.type = ptr_dual_iterator_struct::DUAL_FACE ;
-      for( int i = 0 ; i < 6 ; ++i )
-      {
-        if( faces[i][4] == dir ) continue ;
-        dual_it.cells[0] = sons[ faces[i][0] ] ;
-        dual_it.cells[1] = sons[ faces[i][1] ] ;
-        dual_it.cells[2] = sons[ faces[i][2] ] ;
-        dual_it.cells[3] = sons[ faces[i][3] ] ;
-        dual_it.direction = faces[i][4] ;
-        s.push( dual_it ) ;
-        print_dual_face( "edge", dual_it.cells, M ) ;
-      }
-      
-      //_____________________________________________________________________________
-      // cube
-      dual_it.type = ptr_dual_iterator_struct::DUAL_CUBE ;
-      for( int i = 0 ; i < 8 ; ++i ) dual_it.cells[i] = sons[i] ;
-      s.push( dual_it ) ;
-      print_dual_cube( "edge", dual_it.cells, M ) ;
-      
-      continue ;
-    }
-    
-    
-    //_____________________________________________________________________________
-    //_____________________________________________________________________________
-    // face case
-    else if( dual_it.type == ptr_dual_iterator_struct::DUAL_FACE )
-    {
-      geom_cell all_sons[4][8] ;
-      bool leaf = true ;
-      for( int i = 0 ; i < 4 ; ++i )
-      {
-        if( dual_it.cells[i].is_leaf() )
-        {
-          // repeat father
-          for( int j = 0 ; j < 8 ; ++j )
-            all_sons[i][j] = dual_it.cells[i] ;
-        }
-        else
-        {
-          leaf = false ;
-          dual_it.cells[i].sons( all_sons[i] ) ;
-        }
-      }
-      if( leaf ) continue ;
-      
-      
-      //_____________________________________________________________________________
-      // local cube
-      geom_cell sons[8] ;
-      int dir = dual_it.direction ;
-      switch( dir )
-      {
-          // yz-aligned face
-        case 0 :
-          sons[0] = all_sons[0][6] ;
-          sons[1] = all_sons[0][7] ;
-          sons[2] = all_sons[1][4] ;
-          sons[3] = all_sons[1][5] ;
-          sons[4] = all_sons[2][2] ;
-          sons[5] = all_sons[2][3] ;
-          sons[6] = all_sons[3][0] ;
-          sons[7] = all_sons[3][1] ;
-          break ;
-          
-          // zx-aligned edge
-        case 1 :
-          sons[0] = all_sons[0][5] ;
-          sons[1] = all_sons[1][4] ;
-          sons[2] = all_sons[0][7] ;
-          sons[3] = all_sons[1][6] ;
-          sons[4] = all_sons[2][1] ;
-          sons[5] = all_sons[3][0] ;
-          sons[6] = all_sons[2][3] ;
-          sons[7] = all_sons[3][2] ;
-          break ;
-          
-          // xy-aligned edge
-        case 2 :
-          sons[0] = all_sons[0][3] ;
-          sons[1] = all_sons[1][2] ;
-          sons[2] = all_sons[2][1] ;
-          sons[3] = all_sons[3][0] ;
-          sons[4] = all_sons[0][7] ;
-          sons[5] = all_sons[1][6] ;
-          sons[6] = all_sons[2][5] ;
-          sons[7] = all_sons[3][4] ;
-          break ;
-      }
-      
-      //_____________________________________________________________________________
-      // face
-      // same direction
-      dual_it.direction = dir ;
-      dual_it.type = ptr_dual_iterator_struct::DUAL_FACE ;
-      for( int i = 0 ; i < 6 ; ++i )
-      {
-        if( faces[i][4] != dir ) continue ;
-        dual_it.cells[0] = sons[ faces[i][0] ] ;
-        dual_it.cells[1] = sons[ faces[i][1] ] ;
-        dual_it.cells[2] = sons[ faces[i][2] ] ;
-        dual_it.cells[3] = sons[ faces[i][3] ] ;
-        //        dual_it.direction = faces[i][4] ;
-        s.push( dual_it ) ;
-        print_dual_face( "face", dual_it.cells, M ) ;
-      }
-      
-      //_____________________________________________________________________________
-      // cube
-      dual_it.type = ptr_dual_iterator_struct::DUAL_CUBE ;
-      for( int i = 0 ; i < 8 ; ++i ) dual_it.cells[i] = sons[i] ;
-      s.push( dual_it ) ;
-      print_dual_cube( "face", dual_it.cells, M ) ;
-      
-      continue ;
-    }
-    
-    
-    //_____________________________________________________________________________
-    //_____________________________________________________________________________
-    // cube case
-    else if( dual_it.type == ptr_dual_iterator_struct::DUAL_CUBE )
-    {
-      bool leaf = true ;
-      
-      //_____________________________________________________________________________
-      // cube
-      for( int i = 0 ; i < 8 ; ++i )
-      {
-        // copy father
-        if( dual_it.cells[i].is_leaf() )
-          continue ;
-        
-        // else
-        leaf = false ;
-        geom_cell sons[8] ;
-        dual_it.cells[i].sons( sons ) ;
-        dual_it.cells[i] = sons[ 7-i ] ;
-      }
-      
-      // finally add dual cube
-      if( leaf )
-      {
-        result &= walker( *this, dual_it.cells ) ;
-        print_final_cube( dual_it.cells, M ) ;
-      }
-      else
-      {
-        s.push( dual_it ) ;
-        print_dual_cube( "cube", dual_it.cells, M ) ;
-      }
-      
-      continue ;
-    }
-    
-  }
-  
-  return result ;
-}
-//_____________________________________________________________________________
-
-
-
-
-
-#include "morton.h"
-//_____________________________________________________________________________
-// Isosurface walker
-bool ptr_isosurface_walker( PtrOctree &fo, PtrOctree::geom_cell *cells )
-//-----------------------------------------------------------------------------
-{
-  MarchingCubes &mc = fo.mc() ;
-  
-  /** isovalues at the cube vertices */
-  real            *cube    = mc.cube() ;
-  /** geometry of the cube */
-  Point           *space   = mc.space() ;
-  /** indexes of the cube */
-  Key             *indexes = mc.indexes() ;
-  
-  for( int j = 0 ; j < 8 ; ++j )
-  {
-    int i = (j==2)?3:(j==3)?2:(j==7)?6:(j==6)?7:j ;
-    const PtrOctree::geom_cell &c = cells[j] ;
-    cube[i] = c.cell()->field ;
-    
-    space[i] = (Point&)c ;
-    indexes[i] = cube2key((Cube&)c) ;
-  }
-  
-  mc.tesselate_cube( 0.0 ) ;
-  
-  return true ;
-}
-//_____________________________________________________________________________
-
-
-
-//_____________________________________________________________________________
-// Build the isosurface using dual marching cubes
-bool PtrOctree::build_isosurface( data_access *ref )
-//-----------------------------------------------------------------------------
-{
-  if( !ref ) return false ;
-  _mc.dat_access() = ref ;
-  
-    printf( "Build isosurface... " ) ;
-  bool result = false ;
-  
-  //_________________________________________________________________________
-  // Dual Marching Cubes
-  
-  _mc.init_all() ;
-  
-  result = dual_cubes_walk( ptr_isosurface_walker ) ;
-  
-  _mc.clean_temps() ;
-  
-  printf( "generated %d vertices and %d faces!\n", _mc.nverts(), _mc.ntrigs() ) ;
-  
-  return result ;
-}
-//_____________________________________________________________________________
-
-
-
-
-
-//_____________________________________________________________________________
-// Isosurface drawing walker
-bool ptr_direct_isosurface_walker( PtrOctree &fo, PtrOctree::geom_cell *cells )
-//-----------------------------------------------------------------------------
-{
-  MC_Draw &mc = fo.mc_draw() ;
-  
-  /** isovalues at the cube vertices */
-  real            *cube    = mc.cube() ;
-  /** geometry of the cube */
-  Point           *space   = mc.space() ;
-  
-  for( int j = 0 ; j < 8 ; ++j )
-  {
-    int i = (j==2)?3:(j==3)?2:(j==7)?6:(j==6)?7:j ;
-    const PtrOctree::geom_cell &c = cells[j] ;
-    cube[i] = c.cell()->field ;
-    
-    space[i] = (Point&)c ;
-  }
-  
-  mc.tesselate_cube( 0.0 ) ;
-  
-  return true ;
-}
-//_____________________________________________________________________________
-
-
-
-//_____________________________________________________________________________
-// Build the isosurface using dual marching cubes
-bool PtrOctree::direct_draw_isosurface( data_access *ref )
-//-----------------------------------------------------------------------------
-{
-  if( !ref ) return false ;
-  _mc_draw.dat_access() = ref ;
-  
-    bool result = false ;
-  
-  // Dual Marching Cubes
-  ::glBegin( GL_TRIANGLES ) ;
-  {
-    result = dual_cubes_walk( ptr_direct_isosurface_walker ) ;
-  }
-  ::glEnd() ; // GL_TRIANGLES
-  
-  return result ;
-}
-//_____________________________________________________________________________
-
-
-
-
-
-
-//_____________________________________________________________________________
-// Draw walker
-bool ptr_draw_walker( PtrOctree &fo, PtrOctree::geom_cell *cells )
-//-----------------------------------------------------------------------------
-{
-  ((Point)cells[0]).draw() ;
-  ((Point)cells[1]).draw() ;
-  
-  ((Point)cells[1]).draw() ;
-  ((Point)cells[3]).draw() ;
-  
-  ((Point)cells[3]).draw() ;
-  ((Point)cells[2]).draw() ;
-  
-  ((Point)cells[2]).draw() ;
-  ((Point)cells[0]).draw() ;
-  
-  ((Point)cells[4]).draw() ;
-  ((Point)cells[5]).draw() ;
-  
-  ((Point)cells[5]).draw() ;
-  ((Point)cells[7]).draw() ;
-  
-  ((Point)cells[7]).draw() ;
-  ((Point)cells[6]).draw() ;
-  
-  ((Point)cells[6]).draw() ;
-  ((Point)cells[4]).draw() ;
-  
-  ((Point)cells[0]).draw() ;
-  ((Point)cells[4]).draw() ;
-  
-  ((Point)cells[1]).draw() ;
-  ((Point)cells[5]).draw() ;
-  
-  ((Point)cells[2]).draw() ;
-  ((Point)cells[6]).draw() ;
-  
-  ((Point)cells[3]).draw() ;
-  ((Point)cells[7]).draw() ;
-  
-  return true ;
-}
-//_____________________________________________________________________________
-
-
-
-
-//_____________________________________________________________________________
-// Draw the dual octree with wireframe
-bool PtrOctree::draw_dual()
-//-----------------------------------------------------------------------------
-{
-  ::glBegin( GL_LINES ) ;
-  bool result = dual_cubes_walk( ptr_draw_walker ) ;
-  ::glEnd() ;  // GL_LINES
-  
-  return result ;
-}
-//_____________________________________________________________________________
-
-
-
-
-//_____________________________________________________________________________
-// Do nothing walker, just for dual generation timing
-bool ptr_timing_walker( PtrOctree &fo, PtrOctree::geom_cell *cells )
-//-----------------------------------------------------------------------------
-{
-  return true ;
-}
-//_____________________________________________________________________________
-
-
-//_____________________________________________________________________________
-// Do nothing, just for dual generation timing
-bool PtrOctree::dual_timing()
-//-----------------------------------------------------------------------------
-{
-    return dual_cubes_walk( ptr_timing_walker ) ;
-}
-//_____________________________________________________________________________
-
-
-
-
-
-//_____________________________________________________________________________
-// Prints statistics about the octree
-void PtrOctree::stats()
-//-----------------------------------------------------------------------------
-{
-  uint level_dist[MAX_LEVEL+1] ;
-  memset( level_dist, 0, (MAX_LEVEL+1)*sizeof(uint) ) ;
-  
-  int s = 0 ;
-  for( cell_iterator it = cells_begin() ; it() ; ++it )
-  {
-    ++s ;
-    if( it.is_leaf() ) level_dist[ it.lv() ] ++ ;
-  }
-  
-  printf( " number of nodes:\t%d\n", s ) ;
-  printf( " total memory:\t%d\n", (int) ( s * sizeof(cell) ) ) ;
-  
-  printf( " leaves' levels:\t" ) ;
-  for( Level l = 0 ; l <= MAX_LEVEL; ++l )
-    printf( "\t%d", level_dist[l] ) ;
-  printf( "\n" ) ;
-  
-  printf( " max size of the stack:\t%d\n", _dual_temp_memory ) ;
-  printf( " total memory of stack:\t%d\n", (int) ( _dual_temp_memory * sizeof(ptr_dual_iterator_struct) ) ) ;
-}
-//_____________________________________________________________________________
-
-
-
-
-
-//_____________________________________________________________________________
-//_____________________________________________________________________________
-// search operations
-
-
-//_____________________________________________________________________________
-// Find cells of the octree at a given position
-bool PtrOctree::find_leaf( real x, real y, real z, geom_cell &n )
-//-----------------------------------------------------------------------------
-{
-  
-  n = geom_cell( &_root ) ;
-  
-  while( !n.is_leaf() )
-  {
-    ++n.lv() ;
-    real sz = n.sz() ;
-    
-    // side test :
-    //  0->back  lower left, 1->back  lower right, 2->back  upper left, 3->back  upper right
-    //  4->front lower left, 5->front lower right, 6->front upper left, 7->front upper right
-    int i = ( (n.cz() < z) << 2 ) | ( (n.cy() < y) << 1 ) | (n.cx() < x) ;
-    n.cx() += (i&1) ? +sz : -sz ;
-    n.cy() += (i&2) ? +sz : -sz ;
-    n.cz() += (i&4) ? +sz : -sz ;
-    
-    n.cell() = n.first_son() ;
-    while( --i > -1 ) n.cell() = n.brother() ;
-  }
-  
-  return true ;
-}
-//_____________________________________________________________________________
-
-
-
-//_____________________________________________________________________________
-// Find cells of the octree inside a given box of center x,y and half side r
-bool PtrOctree::find_radius( real x, real y, real z, real r, List<geom_cell> &cells )
-//-----------------------------------------------------------------------------
-{
-    
-  cells.clear() ;
-  
-  geom_cell n( &_root ) ;
-  
-  std::stack< geom_cell > s ;
-  s.push( n ) ;
-  
-  while( !s.empty() )
-  {
-    n = s.top() ;  s.pop() ;
-//    printf( "%d\t%.4f\t%.4f\t%.4f\n", (int)n.lv(), n.x(), n.y(), n.z() ) ;
-    if( n.is_leaf() )
-    {
-      cells.insert( n ) ;
-      continue ;
-    }
-    
-    geom_cell sons[8] ;
-    n.sons( sons ) ;
-    real sz_ = sons[0].sz() + r ;
-    for( int i = 0 ; i < 8 ; ++i )
-    {
-      if( (fabs( sons[i].cx() - x ) < sz_ ) &&
-          (fabs( sons[i].cy() - y ) < sz_ ) &&
-          (fabs( sons[i].cz() - z ) < sz_ ) )
-        s.push( sons[i] ) ;
-    }
-  }
-//  printf( "\n" ) ;
-  
-  return true ;
-}
-//_____________________________________________________________________________
-
-
-
-//_____________________________________________________________________________
-// Find neighbor cells of the octree to a given cell
-bool PtrOctree::adjacent( const geom_cell &cell, List<geom_cell> &cells )
-//-----------------------------------------------------------------------------
-{
-  return find_radius( cell.cx(), cell.cy(), cell.cz(), cell.sz() + (real) 0.5 / (1 << max_level() ) , cells ) ;
-}
-//_____________________________________________________________________________
-
-
-
-//_____________________________________________________________________________
-//_____________________________________________________________________________
-// I/O
-
-//_____________________________________________________________________________
-// Draws the intersecting cells of a plane with the octree with color
-void PtrOctree::draw_plane ( real nx, real ny, real nz, real d )
-//-----------------------------------------------------------------------------
-{
-  geom_cell n( &_root ) ;
-  
-  std::stack< geom_cell > s ;
-  s.push( n ) ;
-  
-  //_____________________________________________________________________________
-  // retrieve the index of the most positive cube corner
-  bool fx = nx >= 0 ;
-  bool fy = ny >= 0 ;
-  bool fz = nz >= 0 ;
-  
-  //_____________________________________________________________________________
-  
-  ::glLineWidth( (GLfloat)1.0 ) ;
-  ::glDisable( GL_LIGHTING ) ;
-  
-  real px,py,pz, mx,my,mz ;
-  while( !s.empty() )
-  {
-    n = s.top() ;  s.pop() ;
-    
-    if( n.is_leaf() )
-    {		
-      
-      ::glTexCoord1f( (GLfloat)fabs(*n/max_field()) ) ;
-      ::glBegin( GL_LINES ) ;
-      n.draw_wire() ;
-      ::glEnd() ;  // GL_LINES		
-      
-      continue ;
-    }
-    
-    //___________________________________________________________________________
-    // recursion
-    geom_cell sons[8] ;
-    n.sons( sons ) ;
-    real sz_ = sons[0].sz() ;
-    for( int i = 0 ; i < 8 ; ++i )
-    {
-      // get the coordinates of the extremum vertices
-      if( fx ) { px = sons[i].cx() + sz_ ;  mx = sons[i].cx() - sz_ ; }
-      else     { px = sons[i].cx() - sz_ ;  mx = sons[i].cx() + sz_ ; }
-      if( fy ) { py = sons[i].cy() + sz_ ;  my = sons[i].cy() - sz_ ; }
-      else     { py = sons[i].cy() - sz_ ;  my = sons[i].cy() + sz_ ; }
-      if( fz ) { pz = sons[i].cz() + sz_ ;  mz = sons[i].cz() - sz_ ; }
-      else     { pz = sons[i].cz() - sz_ ;  mz = sons[i].cz() + sz_ ; }
-      
-      // plane/cube intersection test
-      if( (nx * px + ny * py + nz * pz + d >= 0.0) && (nx * mx + ny * my + nz * mz + d <= 0.0)  )
-        s.push( sons[i] ) ;
-    }
-  }
-}
-//_____________________________________________________________________________
-
-
-
-
-
-//_____________________________________________________________________________
-// Draws the intersection of a plane with the octree with color
-void PtrOctree::draw_slice ( real nx, real ny, real nz, real d, float alpha )
-//-----------------------------------------------------------------------------
-{
-  geom_cell n( &_root ) ;
-  
-  std::stack< geom_cell > s ;
-  s.push( n ) ;
-  
-  // retrieve the index of the most positive cube corner
-  bool fx = nx >= 0 ;
-  bool fy = ny >= 0 ;
-  bool fz = nz >= 0 ;
-  
-  
-  
-  //_____________________________________________________________________________
-  
-  ::glDisable( GL_LIGHTING ) ;
-  
-  real px,py,pz, mx,my,mz ;
-  while( !s.empty() )
-  {
-    n = s.top() ;  s.pop() ;
-    if( n.is_leaf() )
-    {
-      // retrieves the signs of each cube corner
-      real val[8] ;
-      real v   = nx * n.cx() + ny * n.cy() + nz * n.cz() + d ;
-      real sz_ = n.sz() ;
-      int zeros = 0 ;
-      for( int i = 0 ; i < 8 ; ++i )
-      {
-        val[i] = v + nx * ((i&1)?sz_:-sz_) + ny * ((i&2)?sz_:-sz_) + nz * ((i&4)?sz_:-sz_) ;
-        if( fabs(val[i]) < R_EPSILON ) { val[i] = R_EPSILON ;  ++zeros ; }
-      }
-      
-      //_________________________________________________________________________
-      // degenerated intersection
-      if( zeros > 0 )
-      {
-        int npos = 0, nneg = 0 ;
-        for( int i = 0 ; i < 8 ; ++i )
-        {
-          if( fabs(val[i]) < R_EPSILON ) continue ;
-          if( val[i] < 0 )
-            ++nneg ;
-          else
-            ++npos ;
-        }
-        float def = (nneg>npos) ? (GLfloat)R_EPSILON : (GLfloat)-R_EPSILON ;
-        
-        for( int i = 0 ; i < 8 ; ++i )
-        {
-          if( fabs(val[i]) < R_EPSILON ) val[i] = def ;
-        }
-        //        continue ;
-      }
-      
-      //_________________________________________________________________________
-      // Continuation method
-      int v0=-1, v1=-1 ;  // current edge vertices
-      
-      // get the first intersection
-      static int edges[12][2] = { {0,1}, {0,2}, {0,4}, {1,3}, {1,5}, {2,3}, {2,6}, {3,7}, {4,5}, {4,6}, {5,7}, {6,7} } ;
-      for( int e = 0 ; e < 12 ; ++e )
-      {
-        if( val[ edges[e][0] ] * val[ edges[e][1] ] < 0 )
-        {
-          v0 = edges[e][0] ;
-          v1 = edges[e][1] ;
-          break ;
-        }
-      }
-      int  ov0 = v0, ov1 = v1 ;
-      
-      
-      // equation of previous face adjacent to v0v1: v>>c & 1 == s (c-th coordinate equal to +/- 1)
-      int pf = -1 ;  bool ps ;
-      if       ( (v0 & 1) == (v1 & 1) )   { pf = 0 ; ps = ((v0 & 1) /*>> 0*/) == 1 ; }
-      else   if( (v0 & 2) == (v1 & 2) )   { pf = 1 ; ps = ((v0 & 2)   >> 1  ) == 1 ; }
-      else /*if( (v0 & 4) == (v1 & 4) )*/ { pf = 2 ; ps = ((v0 & 4)   >> 2  ) == 1 ; }
-      
-      //      printf( "cube %d %d %d %d %d %d %d %d, march : (%d,%d) ", val[0]>0, val[1]>0, val[2]>0, val[3]>0, val[4]>0, val[5]>0, val[6]>0, val[7]>0, v0, v1 ) ;
-      
-      //_________________________________________________________________________
-      // marching
-      
-      GLfloat color = (GLfloat)fabs(*n / max_field()) ;
-      ::glBegin( GL_POLYGON ) ;
-      {
-        do
-        {
-          // equation of next face adjacent to v0v1
-          int nf = -1 ;  bool ns ;
-          if       ( pf != 0 && ((v0 & 1) == (v1 & 1)) )   { nf = 0 ; ns = ((v0 & 1) /*>> 0*/) == 1 ; }
-          else   if( pf != 1 && ((v0 & 2) == (v1 & 2)) )   { nf = 1 ; ns = ((v0 & 2)   >> 1  ) == 1 ; }
-          else /*if( pf != 2 && ((v0 & 4) == (v1 & 4)) )*/ { nf = 2 ; ns = ((v0 & 4)   >> 2  ) == 1 ; }
-          
-          /* equivalent construction
-           // get the direction perpendicular to v0v1
-           int of = (v0 ^ v1) & 7 ; // only bit of difference
-           of = of==1 ? 0 : (of==2 ? 1 : 2) ;
-           
-           // compute the equation of the next face adjacent to v0v1
-           int  nf = 3 - (pf+of) ;    // third option: {pf,nf,of}={0,1,2}
-           bool ns = (v0 >> nf) & 1 ; // value of the edge on that direction
-           */
-          
-          // compute the two next vertices (invert the pf-th bit
-          int v2 = ps ? ( v0 & (~(1<<pf)) ) : ( v0 | (1<<pf) ) ;
-          int v3 = ps ? ( v1 & (~(1<<pf)) ) : ( v1 | (1<<pf) ) ;
-          
-          // get the characteristic of the square
-          int  c = (val[v3] > 0) | ((val[v2] > 0) << 1) | ((val[v1] > 0) << 2) | ((val[v0] > 0) << 3) ;
-          if( c > 7 ) c = (~c)&7 ; // consider v0 as negative, and thus v1 as positive
-          /*
-           if( c < 4 )
-           { // degenerated intesection
-           printf( "degenerated intersection %d!\n", c ) ;
-           }
-           */
-          
-          //_______________________________________________________________________
-          // method of continuity on the cube surface
-          switch( c )
-          {
-            case  4 : v0 = v3 ;  break ;
-            case  5 : v0 = v2 ;  v1 = v3 ;  break ;
-            case  6 : /* impossible case */ break ;
-            case  7 : v1 = v2 ;  break ;
-          }
-          
-          
-          
-          
-          real cx =  n.cx();
-          real cy =  n.cy(); 
-          real cz =  n.cz();
-          real sz =  sz_;   
-          real a0 = val[v0];  
-          int i0 = v0; 
-          real a1 = val[v1];  
-          int i1  = v1;
-          
-          real w0 = a1 / (a1-a0) ;
-          real w1 = a0 / (a0-a1) ;
-          
-          real x = cx + w0 * ((i0&1)?sz:-sz) + w1 * ((i1&1)?sz:-sz);
-          real y = cy + w0 * ((i0&2)?sz:-sz) + w1 * ((i1&2)?sz:-sz);
-          real z = cz + w0 * ((i0&4)?sz:-sz) + w1 * ((i1&4)?sz:-sz);
-          
-          ::glTexCoord1d( color ) ;
-          ::glVertex3d(x, y, z) ;
-          
-          // next face
-          pf = nf ;  ps = ns ;
-          
-          //          printf( "(%d,%d) ", v0, v1 ) ;
-        } while( v0 != ov0 || v1 != ov1 ) ;
-        //        printf( "\n" ) ;
-      }
-      ::glEnd() ; // GL_POLYGON
-      
-      continue ;
-    }
-    
-    //___________________________________________________________________________
-    // recursion
-    geom_cell sons[8] ;
-    n.sons( sons ) ;
-    real sz_ = sons[0].sz() ;
-    for( int i = 0 ; i < 8 ; ++i )
-    {
-      // get the coordinates of the extremum vertices
-      if( fx ) { px = sons[i].cx() + sz_ ;  mx = sons[i].cx() - sz_ ; }
-      else     { px = sons[i].cx() - sz_ ;  mx = sons[i].cx() + sz_ ; }
-      if( fy ) { py = sons[i].cy() + sz_ ;  my = sons[i].cy() - sz_ ; }
-      else     { py = sons[i].cy() - sz_ ;  my = sons[i].cy() + sz_ ; }
-      if( fz ) { pz = sons[i].cz() + sz_ ;  mz = sons[i].cz() - sz_ ; }
-      else     { pz = sons[i].cz() - sz_ ;  mz = sons[i].cz() + sz_ ; }
-      
-      // plane/cube intersection test
-      if( (nx * px + ny * py + nz * pz + d >= 0.0) && (nx * mx + ny * my + nz * mz + d <= 0.0)  )
-        s.push( sons[i] ) ;
-    }
-  }
-}
-//_____________________________________________________________________________
-
diff --git a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/ptr_octree.h b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/ptr_octree.h
deleted file mode 100644
index 7907e2865c..0000000000
--- a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/ptr_octree.h
+++ /dev/null
@@ -1,400 +0,0 @@
-/**
- * \file    ptr_octree.h
- * \author  Thomas Lewiner   <tomlew@puc-rio.br>
- * \author  Matmidia Lab, Math Dept, PUC-Rio
- * \date    10/01/2010
- *
- *  Octree structure with son-brother pointers
- */
-//_____________________________________________________________________________
-
-
-#pragma once
-
-
-#ifndef WIN32
-#pragma interface
-#endif // WIN32
-
-
-#include <stack>
-#include "mlist.h"
-#include "cube.h"
-#include "MarchingCubes.h"
-#include "mc_draw.h"
-#include "data_access.h"
-
-
-//_____________________________________________________________________________
-// PtrOctree
-/// \class PtrOctree PtrOctree.h
-class PtrOctree
-//-----------------------------------------------------------------------------
-{
-// forward declaration
-public:
-  class geom_cell  ;
-  class cell_iterator  ;
-  class leaf_iterator  ;
-
-// Elements
-protected:
-  /// Octree cell data structure
-  typedef struct cell
-  {
-    struct cell *brother   ;  ///< next brother of the cell
-    struct cell *first_son ;  ///< first son of the cell
-    real         field     ;  ///< field supported by the cell
-  } cell ;
-
-  /// Root of the octree
-  cell _root ;
-
-  /// Maximal level of the octree (for find_adjacent)
-  Level _max_level ;
-  
-  /// Maximal field of the octree
-  real _max_field ;
-  
-  /// Isosurface
-  MarchingCubes _mc ;
-
-  /// Isosurface Draw
-  MC_Draw _mc_draw ;
-  
-  /// Dual run memory consumption
-  uint _dual_temp_memory ;
-  
-  //-----------------------------------------------------------------------------
-// Constructors
-public:
-  /// Default constructor: Constructs a octree with and empty root
-  PtrOctree() { init() ; }
-
-  /// Destructor: Free memory
-  ~PtrOctree() { clear() ; }
-
-
-  /// Create the root
-  void init() ;
-
-  /// Memory cleaning
-  void clear() { clear_octree() ;  _mc.clean_all() ; }
-
-  /// Delete the branch below a given node
-  void clear_branch( cell *b ) ;
-
-  /// Delete the content of the octree
-  void clear_octree() { clear_branch( &_root ) ; }
-
-  /// Check that only the leaves have data
-  bool check () ;
-
-  /// Prints statistics about the octree
-  void stats() ;
-  
-  
-  /// Return the maximal level of the octree
-  Level  max_level() const { return _max_level ; }
-  
-  /// Return the maximal field of the octree
-  real max_field() const { return _max_field ; }
-   
-  /// Return the isosurface
-  MarchingCubes &mc() { return _mc ; }
-  
-  /// Return the isosurface draw
-  MC_Draw &mc_draw() { return _mc_draw ; }
-  
-  /// set the values of each leaf from the implicit function
-  bool set_impl( data_access *ref = NULL ) ;
-  
-  /// Refine the octree according to the data access
-  bool refine( data_access *ref = NULL ) ;
-  
-  /// Adapt the octree according to the data access
-  bool adapt( data_access *ref = NULL ) ;
-  
-  /// Draw the octree with wireframe
-  bool draw_wire() ;
-  
-  /// Draw the octree with dots
-  bool draw_centers() ;
-  
-  /// Dual function type
-  typedef bool ptr_dual_walker( PtrOctree &fo, geom_cell *cells ) ;
-
-  /// Walk on the dual cubes
-  bool dual_cubes_walk( ptr_dual_walker &walker ) ;
-
-  /// Build the isosurface using dual marching cubes
-  bool build_isosurface( data_access *ref = NULL ) ;
-  
-  /// Draw the isosurface on-the-fly using dual marching cubes
-  bool direct_draw_isosurface( data_access *ref = NULL ) ;
-  
-  /// Draw the dual octree with wireframe
-  bool draw_dual() ;
-  
-  /// Do nothing, just for dual generation timing
-  bool dual_timing() ;
-  
-//-----------------------------------------------------------------------------
-// iterators
-public:
-  /// Create an iterator traversing the tree from the root
-  inline cell_iterator cells_begin() { return cell_iterator( &_root ) ; }
-
-  /// Create an iterator traversing the leaves of the tree from the root
-  inline leaf_iterator leaves_begin() { return leaf_iterator( &_root ) ; }
-
-//-----------------------------------------------------------------------------
-// search operations
-public:
-  /// Find cells of the octree at a given position
-  bool find_leaf( real x, real y, real z, geom_cell &cell ) ;
-
-  /// Find cells of the octree inside a given box of center x,y,z and half side r
-  bool find_radius( real x, real y, real z, real r, List<geom_cell> &cells ) ;
-
-  /// Find adjacent cells of the octree to a given cell
-  bool adjacent( const geom_cell &cell, List<geom_cell> &cells ) ;
-
-
-//-----------------------------------------------------------------------------
-// I/O
-public:
-
-  /// Draws the intersecting cells of a plane with the octree with color
-  void draw_plane ( real nx, real ny, real nz, real d	  ) ;
-
-  /// Draws the intersection of a plane with the octree with color
-  void draw_slice ( real nx, real ny, real nz, real d, float alpha ) ;
-
-  /// Draws the isosurface of level l inside the dual graph
-  void draw_iso   () { _mc.draw_surf() ; }
-
-//_____________________________________________________________________________
-// Iterator Cell
-public :
-  /// Auxiliary structure to traverse the octree
-  class geom_cell : public Cube
-  //---------------------------------------------------------------------------
-  {
-    friend class PtrOctree ;
-
-  protected:
-    PtrOctree::cell *_cell   ;  ///< octree cell
-
-  //---------------------------------------------------------------------------
-  // Constructors
-  public:
-    /// Default constructor: Constructs an iterator from a cell
-    geom_cell( PtrOctree::cell *cell_ = NULL, real cx_ = 0.5, real cy_ = 0.5, real cz_ = 0.5, Level lv_ = 0 )
-      : Cube(cx_,cy_,cz_,lv_), _cell(cell_) {}
-
-    /// Destructor
-    ~geom_cell() {}
-
-
-    /// Copy constructor
-    geom_cell( const geom_cell &i )
-      : Cube(i), _cell(i._cell) {}
-
-    /// Assignment operator
-    geom_cell &operator = ( const geom_cell &i )
-    { Cube::operator=(i); _cell=i._cell; return *this; }
-
-  //---------------------------------------------------------------------------
-  // Public constant accessors
-  public  :
-    /// cell const accessor
-    inline const PtrOctree::cell * cell() const { return _cell ; }
-    /// cell accessor
-    inline PtrOctree::cell *&cell() { return _cell ; }
-
-    /// first son const accessor
-    inline const PtrOctree::cell * first_son() const { return _cell->first_son ; }
-    /// first son accessor
-    inline PtrOctree::cell *&first_son() { return _cell->first_son ; }
-    
-    /// brother const accessor
-    inline const PtrOctree::cell * brother() const { return _cell->brother ; }
-    /// brother accessor
-    inline PtrOctree::cell *&brother() { return _cell->brother ; }
-    
-    /// id const accessor
-    inline real  operator*() const { return cell()->field ; }
-    /// id accessor
-    inline real &operator*() { return cell()->field ; }
-    
-    //---------------------------------------------------------------------------
-  // Tests
-  public :
-    /// equality operator
-    inline bool operator ==( const geom_cell &i ) const { return cell() == i.cell() ; }
-
-    /// inequality operator
-    inline bool operator !=( const geom_cell &i ) const { return cell() != i.cell() ; }
-
-    /// leaf test
-    inline bool is_leaf() const { return first_son() == NULL ; }
-
-    /// validation operator
-    inline bool      operator ()() const { return cell() != NULL ; }
-
-  //---------------------------------------------------------------------------
-  // Operations
-  public  :
-    /// sons
-    inline bool sons( geom_cell *s /*[8]*/ )
-    {
-      if( !first_son() ) return false ;
-
-      int    level_ = lv() + 1 ;
-      real sz_    = sz() / 2.0 ;
-      for( int i = 0 ; i < 8 ; ++i )
-      {
-        s[i].cell () = (i==0) ? first_son() : s[i-1].brother() ;
-        s[i].lv   () = level_ ;
-        s[i].cx   () = (i&1) ? cx() + sz_ : cx() - sz_ ;
-        s[i].cy   () = (i&2) ? cy() + sz_ : cy() - sz_ ;
-        s[i].cz   () = (i&4) ? cz() + sz_ : cz() - sz_ ;
-      }
-      return true ;
-    }
-
-    /// get son from side i
-    inline bool son( int i , geom_cell &s )
-    {
-      if( is_leaf() ) return false ;
-
-      real sz_ = s.sz() / 2.0 ;
-      ++s.lv() ;
-      s.cx() = (i&1) ? cx() + sz_ : cx() - sz_ ;
-      s.cy() = (i&2) ? cy() + sz_ : cy() - sz_ ;
-      s.cz() = (i&4) ? cz() + sz_ : cz() - sz_ ;
-
-      s.cell() = first_son() ;
-      while( --i > -1 ) s.cell() = s.brother() ;
-
-      return true ;
-    }
-  };
-
-
-//_____________________________________________________________________________
-// Cell Iterator
-public :
-  /// Octree cell iterator : Traverse the octree returning basic information on the cells
-  class cell_iterator
-  //---------------------------------------------------------------------------
-  {
-    friend class PtrOctree ;
-
-  protected:
-    /// Octree traversal stack
-    std::stack<geom_cell> _s ;
-
-  //---------------------------------------------------------------------------
-  // Constructors
-  public:
-    /// Default constructor : Constructs an iterator from a cell
-    cell_iterator( PtrOctree::cell *root = NULL, real cx_ = 0.5, real cy_ = 0.5, real cz_ = 0.5, Level lv_ = 0 )
-    { if( root ) _s.push( geom_cell( root, cx_, cy_, cz_, lv_ ) ) ; }
-
-    /// Destructor
-    ~cell_iterator() {}
-
-    /// Copy constructor
-    cell_iterator( const cell_iterator &i ) : _s(i._s) {}
-
-    /// Assignment operator
-    cell_iterator &operator = ( const cell_iterator &i )
-    { _s = i._s; return *this; }
-
-  //---------------------------------------------------------------------------
-  // Operations
-  public  :
-    /// validation operator
-    inline bool      operator ()() const { return !_s.empty() ; }
-
-    /// next position
-    inline cell_iterator &operator ++()
-    {
-      if( _s.empty() ) return *this ;
-      geom_cell n = _s.top() ;  _s.pop() ;
-      if( n.is_leaf() ) return *this ;
-
-      // depth first search
-      geom_cell sons[8] ;
-      n.sons( sons ) ;
-      for( int i = 0 ; i < 8 ; ++i )
-        _s.push( sons[i] ) ;
-
-      return *this ;
-    }
-
-  //---------------------------------------------------------------------------
-  // Accessors
-  public  :
-    /// geom_cell accessor
-    inline geom_cell &top() { return _s.top() ; }
-
-    /// id accessor
-    inline real &operator*() { return * _s.top() ; }
-
-    /// level accessor
-    inline Level  &lv() { return _s.top().lv() ; }
-
-    /// center x position accessor
-    inline real &cx() { return _s.top().cx() ; }
-
-    /// center y position accessor
-    inline real &cy() { return _s.top().cy() ; }
-
-    /// center y position accessor
-    inline real &cz() { return _s.top().cz() ; }
-
-    /// size accessor
-    inline real  sz() { return _s.top().sz() ; }
-
-    /// points accessor
-    inline bool is_leaf() const { return _s.top().is_leaf() ; }
-
-    /// inside test
-    inline bool contains( real x, real y, real z ) const { return _s.top().contains( x,y,z ) ; }
-
-    /// get son from its side:
-    inline bool son( int i , geom_cell &s_ )       { return _s.top().son(i,s_) ; }
-
-    /// Draws the cell wire with opengl
-    void draw_wire  () const { _s.top().draw_wire  () ; }
-
-  protected :
-    /// stack accessor for ad hoc iterations
-    inline std::stack< geom_cell > &s() { return _s ; }
-  };
-
-
-  /// Octree leaf iterator : Traverse the octree returning basic information on the leaves
-  class leaf_iterator : public cell_iterator
-  //---------------------------------------------------------------------------
-  {
-    public :
-    leaf_iterator( PtrOctree::cell *root = NULL, real cx_ = 0.5, real cy_ = 0.5, real cz_ = 0.5, Level lv_ = 0 ) : cell_iterator( root, cx_,cy_,cz_,lv_ )
-    { if( root && !this->is_leaf() ) ++(*this) ; }
-
-    
-    /// next position
-    inline leaf_iterator &operator ++()
-    {
-      cell_iterator &it = *this ;
-      do ++it ; while ( it() && !it.is_leaf() ) ;
-      return *this ;
-    }
-  } ;
-} ;
-//_____________________________________________________________________________
-
-
diff --git a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/viz_glui_cmdline.cpp b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/viz_glui_cmdline.cpp
deleted file mode 100644
index 5625ab45bf..0000000000
--- a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/viz_glui_cmdline.cpp
+++ /dev/null
@@ -1,71 +0,0 @@
-/**
- * @file    glui_cmdline.cpp
- * @author  Thomas Lewiner <thomas.lewiner@polytechnique.org>
- * @author  Math Dept, PUC-Rio
- * @version 0.1
- * @date    20/08/2007
- *
- * @brief   Example Graphical interface: command line parser
- */
-//________________________________________________
-
-
-#ifndef WIN32
-#pragma implementation "viz_glui_defs.h"
-#endif // WIN32
-
-#include "viz_glui_defs.h"
-
-
-//_____________________________________________________________________________
-// parse command line
-bool parse_command_line(int argc, char* argv[])
-//-----------------------------------------------------------------------------
-{
-  bool quit = false ;
-  
-  for( int i = 1 ; i < argc ; ++i )
-  {
-    if     ( !strcmp( argv[i], "-lv" ) )
-    {
-      if( ++i != argc ) { max_level = atoi( argv[i] ) ; }
-    }
-    
-    else if( !strcmp( argv[i], "+ortho" ) )
-    {
-      ortho = true ;
-    }
-    else if( !strcmp( argv[i], "-ortho" ) )
-    {
-      ortho = false ;
-    }
-    else if( !strcmp( argv[i], "-pos" ) )
-    {
-      if( ++i != argc ) { obj_pos[0] = atof( argv[i] ) ; }
-      if( ++i != argc ) { obj_pos[1] = atof( argv[i] ) ; }
-      if( ++i != argc ) { obj_pos[2] = atof( argv[i] ) ; }
-    }
-    else if( !strcmp( argv[i], "-rot" ) )
-    {
-      for( int j = 0 ; j < 16 ; ++j )
-        if( ++i != argc ) { view_rotate[j] = atof( argv[i] ) ; }
-    }
-    else if( !strcmp( argv[i], "-view" ) )
-    {
-      control_cb( LOAD_VIEWPORT_ID ) ;
-    }
-    else if( !strcmp( argv[i], "-q" ) )
-    {
-      quit = true ;
-    }
-    else if( !strcmp( argv[i], "-h" ) )
-    {
-      printf( "usage %s [-in file.xyz] [-q]\n", argv[0] ) ;
-    }
-  }
-  //  glui_side  ->sync_live() ;
-  glui_bottom->sync_live() ;
-  
-  return quit ;
-}
-//_____________________________________________________________________________
diff --git a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/viz_glui_controls.cpp b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/viz_glui_controls.cpp
deleted file mode 100644
index 55c9fc35d2..0000000000
--- a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/viz_glui_controls.cpp
+++ /dev/null
@@ -1,346 +0,0 @@
-/**
- * @file    glui_controls.cpp
- * @author  Thomas Lewiner <thomas.lewiner@polytechnique.org>
- * @author  Math Dept, PUC-Rio
- * @version 0.1
- * @date    30/05/2006
- *
- * @brief   Octree graphical interface: interface controls
- */
-//________________________________________________
-
-
-#if !defined(WIN32) || defined(__CYGWIN__)
-#pragma implementation "viz_glui_defs.h"
-#endif // WIN32
-
-
-#include "viz_glui_defs.h"
-#include "implfuns.h"
-
-
-//_____________________________________________________________________________
-// declarations of this file
-
-// main object: octree
-Octree  octree  ;
-
-// switch between implicit funciont or volumetric data
-int impl_data = SWITCH_DATA ;
-
-// octree implicit data wrapper
-data_func *dat_func = NULL ;
-
-// octree data file wrapper
-data_file  *dat_data  = NULL ;
-
-
-// maximal level of the tree
-int   max_level  = 4;
-
-// isovalue
-float iso_val    = 0.0 ;
-
-// curvature threshold
-float curv_thres = 0.5 ;
-
-// selected implicit function
-int curr_fun = 0 ;
-
-
-//-----------------------------------------------------------------------------
-
-// main glui class: (right) side panel
-GLUI *glui_side   = NULL ;
-
-// bottom panel
-GLUI *glui_bottom = NULL ;
-
-// name of the import file
-GLUI_FileBrowser *file_browser  ;
-
-// iso file
-GLUI_String filename  ;
-
-// formula of the implicit function
-GLUI_String impl_fun     ;
-
-//-----------------------------------------------------------------------------
-
-// control events callback
-void control_cb( int control ) ;
-
-// create side panel
-void create_side_panel() ;
-
-// create bottom panel
-void create_bottom_panel() ;
-
-/// set file extension
-int set_ext( const char ext[4] ) ;
-
-//_____________________________________________________________________________
-
-
-
-
-//_____________________________________________________________________________
-// control events callback
-void control_cb( int control )
-//-----------------------------------------------------------------------------
-{
-  data_access *ref = NULL ;
-  switch( impl_data )
-  {
-    case SWITCH_IMPL   : ref = dat_func   ; break ;
-    case SWITCH_DATA   : ref = dat_data   ; break ;
-  }
-  
-  switch( control )
-  {
-    case SET_IMPL_DATA_ID :
-      switch( impl_data )
-      {
-      case SWITCH_IMPL   : delete dat_func   ;  dat_func   = new data_func      ( max_level, iso_val, impl_fun ) ;  break ;
-      case SWITCH_DATA   : delete dat_data   ;  dat_data   = new data_file      ( max_level, iso_val, filename.c_str() ) ;  break ;
-      } 
-      break ;
-
-    case SET_VAL_ID :
-      if( !ref ) break ;
-      ref->_max_level = max_level ;
-      ref->_iso_val = iso_val ;
-      octree.set_impl( ref ) ;
-      octree.check() ;
-      break ;
-
-    case REFINE_ID        :
-      if( !ref ) break ;
-      ref->_max_level = max_level ;
-      ref->_iso_val = iso_val ;
-      octree.clear() ;
-      octree.refine( ref ) ;
-      octree.set_impl( ref ) ;
-      octree.check() ;
-      break ;
-      
-    case ADAPT_ID        :
-      if( !ref ) break ;
-      ref->_max_level = max_level ;
-      ref->_iso_val   = iso_val ;
-      octree.adapt( ref ) ;
-      octree.set_impl( ref ) ;
-      octree.check() ;
-      break ;
-
-    case ISO_BUILD_ID :
-      if( !ref ) break ;
-      ref->_iso_val = iso_val ;
-      octree.build_isosurface(ref) ;
-      octree.mc().writeOFF("iso.off") ;
-      octree.check() ;
-      break ;
-      
-      // set implicit function
-    case FUN_ID   :
-      if( curr_fun == 0 ) break ;
-      impl_fun.clear() ;
-      impl_fun = fun_def[curr_fun] ;
-      control_cb( SET_IMPL_DATA_ID ) ;
-      control_cb( ADAPT_ID ) ;
-      glui_bottom->sync_live() ;
-      break ;
-      
-      
-      // load/save viewpoint
-    case SAVE_VIEWPORT_ID   : save_viewport() ;  break ;
-      
-    case LOAD_VIEWPORT_ID   : load_viewport() ;  glui_bottom->sync_live() ;  break ;
-      
-      // reset rotation
-    case RESET_ROTATION_ID    :
-      view_rotate[ 0] = view_rotate[ 5] = view_rotate[10] = view_rotate[15] = 1.0f ;
-      view_rotate[ 1] = view_rotate[ 2] = view_rotate[ 3] = view_rotate[ 4] = 0.0f ;
-      view_rotate[ 6] = view_rotate[ 7] = view_rotate[ 8] = view_rotate[ 9] = 0.0f ;
-      view_rotate[11] = view_rotate[12] = view_rotate[13] = view_rotate[14] = 0.0f ;
-      break ;
-      
-      // reset translation
-    case RESET_TRANSLATION_ID :  obj_pos[0] = obj_pos[1] = 0.0f ;  break ;
-      // reset zoom
-    case RESET_ZOOM_ID        :  obj_pos[2] = 0.0f ;  break ;
-      
-      // changed a parameter
-    case REDRAW_ID          :  break ;
-      
-      // changed a parameter
-    case FILENAME_ID        :  filename = file_browser->current_dir + file_browser->get_file() ;
-      
-      // orthographic/perspective projection
-    case PROJ_ID            :  reshape   (0,0) ;  break ;
-      
-    case EXIT_ID            : 
-      delete dat_func   ;
-      delete dat_data   ;
-      octree.clear() ;
-      exit(0) ;
-      break ;
-      
-    default :  break ;
-  }
-  
-  ::glutPostRedisplay();
-}
-//_____________________________________________________________________________
-
-
-
-
-//_____________________________________________________________________________
-//_____________________________________________________________________________
-
-
-
-//_____________________________________________________________________________
-// create side panel
-void create_side_panel()
-//-----------------------------------------------------------------------------
-{
-  glui_side = NULL ;
-}
-//_____________________________________________________________________________
-
-
-
-
-
-//_____________________________________________________________________________
-// create bottom panel
-void create_bottom_panel()
-//-----------------------------------------------------------------------------
-{
-  GLUI_Rollout     *roll ;
-  GLUI_EditText    *text ;
-  GLUI_Rotation    *rot  ;
-  GLUI_Translation *trans;
-  GLUI_RadioGroup  *radio;
-  GLUI_Listbox     *list ;
-  GLUI_Scrollbar   *sb   ;
-  
-  glui_bottom = GLUI_Master.create_glui("controls") ; //create_glui_subwindow( main_window, GLUI_SUBWINDOW_BOTTOM );
-  
-  //--------------------------------------------------//
-
-  file_browser = new GLUI_FileBrowser( glui_bottom, "iso file", false, FILENAME_ID, control_cb ) ;
-  file_browser->current_dir =  "data" ;
-  file_browser->fbreaddir( "data" ) ;
-
-  filename = "data/engine.iso.gz";
-  text = glui_bottom ->add_edittext( "iso file"  , filename ) ;
-  text->set_w( 200 ) ;
-
-  list = glui_bottom->add_listbox( "Implicit Functions:", &curr_fun, FUN_ID, control_cb );
-  for( int i=0; i<NFUNS; i++ ) list->add_item( i, fun_list[i] );
-  
-  impl_fun = "";
-  text = glui_bottom ->add_edittext( "impl fun"  , impl_fun ) ;
-  text->set_w( 200 ) ;
-  
-
-  //--------------------------------------------------//
-  // 
-  roll  = glui_bottom ->add_rollout( "iso value", true );
-  sb = new GLUI_Scrollbar( roll, "iso value in [-1,1]",GLUI_SCROLL_HORIZONTAL, &iso_val, ADAPT_ID,control_cb);
-  sb->set_float_limits(-1,1);
-  sb->set_speed( .005f );
-  
-  roll  = glui_bottom ->add_rollout( "level in [2,7]", true );
-  sb = new GLUI_Scrollbar( roll, "level", GLUI_SCROLL_HORIZONTAL, &max_level, ADAPT_ID, control_cb);
-  sb->set_int_limits(2,7);
-  sb->set_speed( .005f );
-
-  //--------------------------------------------------//  
-  glui_bottom->add_column( true );
-  radio = glui_bottom->add_radiogroup( &impl_data, SET_IMPL_DATA_ID, control_cb ) ;
-  glui_bottom->add_radiobutton_to_group( radio, "Implicit function" ) ;
-  glui_bottom->add_radiobutton_to_group( radio, "Direct data file" ) ;
-
-  //--------------------------------------------------//
-  
-  
-  glui_bottom ->add_button  ( "load"      , SET_IMPL_DATA_ID, control_cb ) ;
-  glui_bottom ->add_button  ( "set values", SET_VAL_ID   , control_cb ) ;
-  glui_bottom ->add_button  ( "refine"    , REFINE_ID, control_cb ) ;
-  glui_bottom ->add_button  ( "adapt"     , ADAPT_ID , control_cb ) ;
-  
-  
-  //--------------------------------------------------//
-  // display element
-  glui_bottom->add_checkbox( "ortho"    , &ortho               , PROJ_ID  , control_cb );
-  glui_bottom->add_checkbox( "octree"   , &show_octree         , REDRAW_ID, control_cb );
-  glui_bottom->add_checkbox( "nodes"    , &show_nodes          , REDRAW_ID, control_cb );
-  glui_bottom->add_checkbox( "dual"     , &show_dual           , REDRAW_ID, control_cb );
-  glui_bottom->add_checkbox( "surface"  , &show_iso            , REDRAW_ID, control_cb );
-  glui_bottom->add_checkbox( "dir surf" , &show_direct_iso     , SET_VAL_ID, control_cb );
-  glui_bottom->add_checkbox( "dir sur w", &show_direct_iso_wire, SET_VAL_ID, control_cb );
-  
-
-  glui_bottom ->add_button  ( "Isosurface", ISO_BUILD_ID, control_cb ) ;
-  
-//  glui_bottom->add_button( "Redraw", REDRAW_ID, control_cb ) ;
-  
-  glui_bottom ->add_button( "Open View", LOAD_VIEWPORT_ID, control_cb ) ;
-  glui_bottom ->add_button( "Save View", SAVE_VIEWPORT_ID, control_cb ) ;
-  glui_bottom ->add_button( "Quit", EXIT_ID, control_cb );
-  glui_bottom->add_column( true );
-  
-  
-  glui_bottom->add_column( true );
-  
-  //--------------------------------------------------//
-  // position
-  roll  = glui_bottom ->add_rollout( "3D position", true );
-  objects_rot = glui_bottom->add_rotation_to_panel( roll, "Objects", view_rotate );
-  objects_rot->set_spin( 1.0f );
-  glui_bottom->add_button_to_panel( roll, "Reset", RESET_ROTATION_ID, control_cb ) ;
-  glui_bottom->add_column_to_panel( roll, false );
-  
-  objects_mv = glui_bottom->add_translation_to_panel( roll, "Objects XY", GLUI_TRANSLATION_XY, obj_pos );
-  objects_mv->set_speed( .005f );
-  glui_bottom->add_button_to_panel( roll, "Reset", RESET_TRANSLATION_ID, control_cb ) ;
-  glui_bottom->add_column_to_panel( roll, false );
-  
-  objects_zm = glui_bottom->add_translation_to_panel( roll, "Objects Z", GLUI_TRANSLATION_Z, &obj_pos[2] );
-  objects_zm->set_speed( .005f );
-  glui_bottom->add_button_to_panel( roll, "Reset", RESET_ZOOM_ID, control_cb ) ;
-  
-  
-  //--------------------------------------------------//
-  // Lights
-  roll = glui_bottom->add_rollout( "Lights", true );
-  rot  = glui_bottom->add_rotation_to_panel( roll, "Blue Light", light0_rotation );
-  rot->set_spin( .82f );
-  
-  rot  = glui_bottom->add_rotation_to_panel( roll, "Orange Light", light1_rotation );
-  rot->set_spin( .82f );
-  
-  
-  glui_bottom->add_column_to_panel( roll, false );
-  
-  glui_bottom->add_checkbox_to_panel( roll, "On", &light0_enabled );
-  text = glui_bottom->add_edittext_to_panel( roll, "Id (%)", GLUI_EDITTEXT_INT, &light0_intensity );
-  text->set_int_limits( 0, 100 );
-  text->set_w(4) ;
-  text = glui_bottom->add_edittext_to_panel( roll, "Is (%)", GLUI_EDITTEXT_INT, &light0_intensity2 );
-  text->set_int_limits( 0, 100 );
-  text->set_w(4) ;
-  
-  glui_bottom->add_checkbox_to_panel( roll, "On", &light1_enabled );
-  text = glui_bottom->add_edittext_to_panel( roll, "Id (%)", GLUI_EDITTEXT_INT, &light1_intensity );
-  text->set_int_limits( 0, 100 );
-  text->set_w(4) ;
-  text = glui_bottom->add_edittext_to_panel( roll, "Is (%)", GLUI_EDITTEXT_INT, &light1_intensity2 );
-  text->set_int_limits( 0, 100 );
-  text->set_w(4) ;
-}
-//_____________________________________________________________________________
diff --git a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/viz_glui_defs.h b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/viz_glui_defs.h
deleted file mode 100644
index b9760f9b81..0000000000
--- a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/viz_glui_defs.h
+++ /dev/null
@@ -1,361 +0,0 @@
-/**
- * @file    glui_defs.h
- * @author  Thomas Lewiner <thomas.lewiner@polytechnique.org>
- * @author  Math Dept, PUC-Rio
- * @version 0.1
- * @date    30/05/2006
- *
- * @brief   Octree graphical interface
- */
-//________________________________________________
-
-
-#pragma once
-
-#if !defined(WIN32) || defined(__CYGWIN__)
-#pragma interface
-#endif // WIN32
-
-
-#include <GL/glui.h>      // openGL user interface
-
-
-#define OCTREE_SWITCH 4
-
-//_____________________________________________________________________________
-// octree switch
-#ifdef OCTREE_SWITCH
-# if   OCTREE_SWITCH==0
-#  define OCTREE_PTR   1
-# elif OCTREE_SWITCH==1
-#  define OCTREE_HASH  1
-# elif OCTREE_SWITCH==2
-#  define OCTREE_OPT   1
-# elif OCTREE_SWITCH==3
-#  define OCTREE_LEAF  1
-# elif OCTREE_SWITCH==4
-#  define OCTREE_MEM   1
-# endif // OCTREE_SWITCH
-#endif // OCTREE_SWITCH
-
-
-// switch values between pointer and hash octree
-#if !OCTREE_PTR && !OCTREE_HASH && !OCTREE_OPT && !OCTREE_LEAF && !OCTREE_MEM
-// # define OCTREE_PTR  1
-// # define OCTREE_HASH 1
-# define OCTREE_OPT  1
-// # define OCTREE_LEAF 1
-// # define OCTREE_MEM  1
-#endif // !OCTREE_PTR && !OCTREE_HASH && !OCTREE_OPT && !OCTREE_LEAF && !OCTREE_MEM
-
-
-#ifdef OCTREE_PTR
-# undef OCTREE_HASH
-# undef OCTREE_OPT  
-# undef OCTREE_LEAF 
-# undef OCTREE_MEM  
-# define OCTREE_STRING "pointer octree"
-# include "ptr_octree.h"
-/// octree type
-typedef PtrOctree Octree ;
-#endif //OCTREE_PTR
-
-
-#ifdef OCTREE_HASH
-# undef OCTREE_PTR
-# undef OCTREE_OPT  
-# undef OCTREE_LEAF 
-# undef OCTREE_MEM  
-# define OCTREE_STRING "hash octree"
-# include "hash_octree.h"
-/// octree type
-typedef HashOctree Octree ;
-#endif //OCTREE_HASH
-
-
-#ifdef OCTREE_OPT
-# undef OCTREE_PTR
-# undef OCTREE_HASH
-# undef OCTREE_LEAF 
-# undef OCTREE_MEM  
-# define OCTREE_STRING "optimized octree"
-# include "opt_octree.h"
-/// octree type
-typedef OptOctree Octree ;
-#endif //OCTREE_OPT
-
-
-#ifdef OCTREE_LEAF
-# undef OCTREE_PTR
-# undef OCTREE_HASH
-# undef OCTREE_OPT  
-# undef OCTREE_MEM  
-# define OCTREE_STRING "leaf octree"
-# include "leaf_octree.h"
-/// octree type
-typedef LeafOctree Octree ;
-#endif //OCTREE_LEAF
-
-
-#ifdef OCTREE_MEM
-# undef OCTREE_PTR
-# undef OCTREE_HASH
-# undef OCTREE_OPT  
-# undef OCTREE_LEAF 
-# define OCTREE_STRING "mem octree"
-# include "mem_octree.h"
-/// octree type
-typedef MemOctree Octree ;
-#endif //OCTREE_MEM
-
-
-
-#ifdef _DEBUG
-#define PRINT_GL_DEBUG  { if( ::glGetError() != GL_NO_ERROR ) printf( "openGL watch at line %d: %s\n", __LINE__, ::gluErrorString( ::glGetError() ) ) ; }
-#else  // _DEBUG
-#define PRINT_GL_DEBUG  {}
-#endif // _DEBUG
-
-
-
-//_____________________________________________________________________________
-// Main objects
-
-  /// main object: octree
-  extern Octree  octree  ;
-
-  /// switch between implicit funciont or volumetric data
-  extern int        impl_data   ;
-
-  /// switch values between implicit funciont or volumetric data
-  enum { SWITCH_IMPL = 0, SWITCH_DATA = 1 } ;
-
-  /// octree implicit data wrapper
-  extern data_func *dat_func ;
-
-  /// octree data file wrapper
-  extern data_file *dat_data  ;
-
-  /// maximal level of the tree
-  extern int   max_level ;
-
-  /// isovalue
-  extern float iso_val ;
-
-
-//-----------------------------------------------------------------------------
-// Display elements
-
-  /// display element switch: octree wireframe
-  extern int   show_octree        ;
-  /// display element switch: octree cells' centers
-  extern int   show_nodes         ;
-  /// display element switch: octree dual
-  extern int   show_dual          ;  
-  /// display element switch: isosurface of the field
-  extern int   show_iso           ;  
-  /// display element switch: direct drawing isosurface of the field
-  extern int   show_direct_iso    ;
-  /// display element switch: direct drawing wire isosurface of the field
-  extern int   show_direct_iso_wire ;  
-
-
-//-----------------------------------------------------------------------------
-// GLUI windows
-
-  /// main window id
-  extern int  main_window ;
-
-  /// main glui class: (right) side panel
-  extern GLUI *glui_side   ;
-
-  /// bottom panel
-  extern GLUI *glui_bottom ;
-
-
-/// create side panel
-void create_side_panel() ;
-
-/// create bottom panel
-void create_bottom_panel() ;
-
-/// control events callback
-void control_cb( int control ) ;
-
-/// parse command line
-bool parse_command_line(int argc, char* argv[]) ;
-
-
-//-----------------------------------------------------------------------------
-// Lights
-
-  /// enable blue light
-  extern int   light0_enabled   ;
-
-  /// enable orange light
-  extern int   light1_enabled   ;
-
-  /// blue light intensity
-  extern int   light0_intensity ;
-
-  /// orange light intensity
-  extern int   light1_intensity ;
-
-  /// blue light intensity (specular)
-  extern int   light0_intensity2 ;
-
-  /// orange light intensity (specular)
-  extern int   light1_intensity2 ;
-
-  /// blue light diffuse color
-  extern float light0_diffuse[4] ;
-
-  /// orange light diffuse color
-  extern float light1_diffuse[4] ;
-
-  /// blue light position
-  extern float light0_rotation[16] ;
-
-  /// orange light position
-  extern float light1_rotation[16] ;
-
-
-//-----------------------------------------------------------------------------
-// mouse and object movements
-
-  /// motion type (-1 -> no motion, 0 -> rotate, 1 -> zoom, 2 -> translate)
-  extern int  motion_type ;
-
-  /// window trackball
-  extern GLUI_Rotation     mouse_rot   ;
-  /// panel trackball
-  extern GLUI_Rotation    *objects_rot ;
-  /// window translation
-  extern GLUI_Translation  mouse_mv    ;
-  /// panel translation
-  extern GLUI_Translation *objects_mv  ;
-  /// window zoom
-  extern GLUI_Translation  mouse_zm    ;
-  /// panel zoom
-  extern GLUI_Translation *objects_zm  ;
-
-  /// number of calls for updating the GLUI control
-  extern int ncalls ;
-
-  /// export movie switch
-  extern int export_movie ;
-
-  /// automatic rotation
-  extern int auto_rotate  ;
-
-  /// automatic x translation
-  extern int auto_translate_x ;
-
-  /// automatic y translation
-  extern int auto_translate_y ;
-
-  /// automatic zoom
-  extern int auto_zoom ;
-
-  /// automatic plane
-  extern int auto_translate_d ;
-
-  /// mouse x position
-  extern int mouse_x ;
-
-  /// mouse y position
-  extern int mouse_y ;
-
-/// init mouse and window controls
-void init_trackballs() ;
-
-/// mouse events tracking
-void mouse(int button, int button_state, int x, int y ) ;
-
-/// mouse motion tracking
-void motion(int x, int y ) ;
-
-/// keyboard events
-void keyboard(unsigned char key, int x, int y);
-
-//-----------------------------------------------------------------------------
-// implicit function
-
-  /// implicit function formula
-  extern GLUI_String impl_fun  ;
-
-
-//-----------------------------------------------------------------------------
-// i/o filenames
-
-  /// iso file
-  extern GLUI_String filename  ;
-
-  /// file browser
-  extern GLUI_FileBrowser *file_browser ;
-
-
-
-//-----------------------------------------------------------------------------
-// drawing parameters
-
-  /// orthographic / perspective projection switch
-  extern int ortho ;
-  /// object rotation
-  extern float view_rotate[16] ;
-  /// object translation
-  extern float obj_pos    [3 ] ;
-
-  /// point size
-  extern int point_size;
-
-/// 3D projection matrix
-void project( int o, float sx, float sy, int &tx, int &ty, int &tw, int &th ) ;
-
-/// window resizing
-void reshape( int x, int y ) ;
-
-/// main drawing function
-void display() ;
-
-/// print screen
-void export_png() ;
-
-/// load viewport
-void load_viewport() ;
-/// save viewport
-void save_viewport() ;
-
-
-//_____________________________________________________________________________
-
-
-
-
-//_____________________________________________________________________________
-/// Callback ids
-enum
-{
-  SET_IMPL_DATA_ID     ,
-  SET_VAL_ID           ,
-  REFINE_ID            ,
-  ADAPT_ID             ,
-  ISO_BUILD_ID         ,
-  SEARCH_ID            ,
-  FUN_ID               ,
-
-  SAVE_VIEWPORT_ID     ,
-  LOAD_VIEWPORT_ID     ,
-
-  RESET_ROTATION_ID    ,
-  RESET_TRANSLATION_ID ,
-  RESET_ZOOM_ID        ,
-
-  REDRAW_ID            ,
-  FILENAME_ID          ,
-  PROJ_ID              ,  
-
-  EXIT_ID              
-};
-//_____________________________________________________________________________
-
diff --git a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/viz_glui_draws.cpp b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/viz_glui_draws.cpp
deleted file mode 100644
index 5a8662d386..0000000000
--- a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/viz_glui_draws.cpp
+++ /dev/null
@@ -1,321 +0,0 @@
-/**
- * @file    glui_draws.cpp
- * @author  Thomas Lewiner <thomas.lewiner@polytechnique.org>
- * @author  Math Dept, PUC-Rio
- * @version 0.1
- * @date    30/05/2006
- *
- * @brief   Octree graphical interface: drawing commands
- */
-//________________________________________________
-
-
-#if !defined(WIN32) || defined(__CYGWIN__)
-#pragma implementation "viz_glui_defs.h"
-#endif // WIN32
-
-
-#include "viz_glui_defs.h"
-
-
-//_____________________________________________________________________________
-// declarations of this file
-
-
-// display element switches
-int   show_octree         = 1 ;
-int   show_nodes          = 0 ;
-int   show_dual           = 0 ;
-int   show_iso            = 0 ;
-int   show_direct_iso     = 0 ;
-int   show_direct_iso_wire = 0 ;
-
-// orthographic / perspective projection
-int   ortho =   0   ;
-
-// object transformation
-float view_rotate[16] = { 1.0f,0.0f,0.0f,0.0f, 0.0f,1.0f,0.0f,0.0f, 0.0f,0.0f,1.0f,0.0f, 0.0f,0.0f,0.0f,1.0f };
-float obj_pos    [3 ] = { 0.0f, 0.0f, 0.0f };
-
-
-//-----------------------------------------------------------------------------
-// lights
-int   light0_enabled        =   1 ;
-int   light1_enabled        =   0 ;
-int   light0_intensity      = 100 ;
-int   light1_intensity      =  60 ;
-int   light0_intensity2      = 50 ;
-int   light1_intensity2      = 30 ;
-GLfloat light0_diffuse [ 4] = {.7f, .7f, 1.0f, 1.0f};
-GLfloat light1_diffuse [ 4] = {.9f, .7f, 0.2f, 1.0f};
-GLfloat light0_position[ 4] = {.5f, .5f, 10.0f, 0.0f};
-GLfloat light1_position[ 4] = {-1.0f, -1.0f, 10.0f, 0.0f};
-GLfloat light0_rotation[16] = {1,0,0,0, 0,1,0,0, 0,0,1,0, 0,0,0,1 };
-GLfloat light1_rotation[16] = {1,0,0,0, 0,1,0,0, 0,0,1,0, 0,0,0,1 };
-
-//-----------------------------------------------------------------------------
-
-// 3D projection matrix
-void project( int o, float sx, float sy, int &tx, int &ty, int &tw, int &th ) ;
-
-// window resizing
-void reshape( int x, int y ) ;
-
-// main drawing function
-void display() ;
-
-//_____________________________________________________________________________
-
-
-
-//_____________________________________________________________________________
-// 3D projection matrix
-void project( int o, float sx, float sy, int &tx, int &ty, int &tw, int &th )
-//-----------------------------------------------------------------------------
-{  
-  // get viewport
-  GLUI_Master.get_viewport_area( &tx, &ty, &tw, &th );
-
-  tw = (int)( tw * sx );
-  th = (int)( th * sy );
-  ::glViewport( tx, ty, tw, th );
-
-  // sets the projection matrix
-  ::glMatrixMode(GL_PROJECTION);
-  ::glLoadIdentity();
-
-  // sets the viewport
-  if( o )
-  {
-    if( th > tw )
-      ::glOrtho( -1.2, 1.2, -1.2*(double)th/tw, 1.2*(double)th/tw, 0.0, 10.0  ) ;
-    else
-      ::glOrtho( -1.2*(double)tw/th, 1.2*(double)tw/th, -1.2, 1.2, 0.0, 10.0  ) ;
-  }
-  else
-    ::gluPerspective( 45.0, th>0?(double)tw/th:1.0, 0.5, 10.0 );
-
-  ::gluLookAt( 0.0f,0.0f,3.0f, 0.0f,0.0f,0.5f, 0.0f,1.0f,0.0f ) ;
-
-  // switch to the modelview matrix
-  ::glMatrixMode( GL_MODELVIEW );
-  ::glLoadIdentity();
-}
-//_____________________________________________________________________________
-
-
-
-
-//_____________________________________________________________________________
-// window resizing
-void reshape( int x, int y )
-//-----------------------------------------------------------------------------
-{
-  ::glutSetWindow(main_window);
-  
-  int tx, ty, tw, th;
-  project( ortho, 1.0f, 1.0f, tx, ty, tw, th ) ;
-
-  // sets the window trackball
-  mouse_rot.set_w( tw ) ;
-  mouse_rot.set_h( th ) ;
-  mouse_mv .set_w( tw ) ;
-  mouse_mv .set_h( th ) ;
-  mouse_zm .set_w( tw ) ;
-  mouse_zm .set_h( th ) ;
-
-  // redisplay
-  ::glutPostRedisplay();
-}
-//_____________________________________________________________________________
-
-
-
-//_____________________________________________________________________________
-// main drawing function
-void display()
-//-----------------------------------------------------------------------------
-{
-  ::glutSetWindow(main_window);
-
-  // clear screen
-  ::glClear( GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT );
-  if( !true ) { ::glutSwapBuffers();  return ; }
-
-  int tx, ty, tw, th ;
-  project( ortho, 1.0f, 1.0f, tx, ty, tw, th ) ;
-  
-  ::glEnable( GL_DEPTH_TEST );
-  ::glShadeModel(GL_SMOOTH);
-  ::glEnable(GL_LIGHTING);
-
-  //::glDisable (GL_LIGHTING);
-  float val[3] ;
-  if ( light0_enabled )
-  {
-    ::glEnable( GL_LIGHT0 ) ;
-
-    val[0] = light0_diffuse[0] * light0_intensity / 100 ;
-    val[1] = light0_diffuse[1] * light0_intensity / 100 ;
-    val[2] = light0_diffuse[2] * light0_intensity / 100 ;
-    ::glLightfv(GL_LIGHT0, GL_DIFFUSE, val );
-    
-    val[0] = light0_diffuse[0] * light0_intensity2 / 100 ;
-    val[1] = light0_diffuse[1] * light0_intensity2 / 100 ;
-    val[2] = light0_diffuse[2] * light0_intensity2 / 100 ;
-    ::glLightfv(GL_LIGHT0, GL_SPECULAR, val );    
-    const GLfloat light0_ambient[4] =  {0.1f, 0.1f, 0.3f, 1.0f};
-    ::glLightfv(GL_LIGHT0, GL_AMBIENT, light0_ambient);
-    
-
-    ::glLoadIdentity();
-    ::glMultMatrixf( light0_rotation );
-    ::glLightfv(GL_LIGHT0, GL_POSITION, light0_position);
-
-  }
-  else 
-    ::glDisable( GL_LIGHT0 ); 
-  
-  if ( light1_enabled )
-  {
-    ::glEnable( GL_LIGHT1 );
-
-    val[0] = light1_diffuse[0] * light1_intensity / 100 ;
-    val[1] = light1_diffuse[1] * light1_intensity / 100 ;
-    val[2] = light1_diffuse[2] * light1_intensity / 100 ;
-    ::glLightfv(GL_LIGHT1, GL_DIFFUSE, val );
-
-    val[0] = light1_diffuse[0] * light1_intensity2 / 100 ;
-    val[1] = light1_diffuse[1] * light1_intensity2 / 100 ;
-    val[2] = light1_diffuse[2] * light1_intensity2 / 100 ;
-    ::glLightfv(GL_LIGHT1, GL_SPECULAR, val );
-    const GLfloat light1_ambient[4] =  {0.1f, 0.1f, 0.3f, 1.0f};
-    ::glLightfv(GL_LIGHT1, GL_AMBIENT, light1_ambient);
-    
-    ::glLoadIdentity();
-    ::glMultMatrixf( light1_rotation );
-    ::glLightfv(GL_LIGHT1, GL_POSITION, light1_position);
-
-  }
-  else 
-    ::glDisable( GL_LIGHT1 );  
-
-  // transformation matrix
-  ::glLoadIdentity();
-  ::glTranslatef( obj_pos[0], obj_pos[1], obj_pos[2] );
-  if( ortho )
-  {
-    ::glScalef( 1.0+obj_pos[2], 1.0+obj_pos[2], 1.0+obj_pos[2] ) ;
-     ::glEnable( GL_NORMALIZE );
-  }
-  else
-  {
-    ::glDisable( GL_NORMALIZE );
-  }
-
-  ::glMultMatrixf( view_rotate );
-  ::glTranslatef( -0.5f, -0.5f, -0.5f );
-  PRINT_GL_DEBUG ;
-
-//-----------------------------------------------------------------------------
-// 3D display
-
-  data_access *ref = NULL ;
-  switch( impl_data )
-  {
-    case SWITCH_IMPL   : ref = dat_func   ; break ;
-    case SWITCH_DATA   : ref = dat_data   ; break ;
-  }
-  if( ref )
-    ::glScalef( ref->_sx, ref->_sy, ref->_sz ) ;
-
-  // octree wireframe
-  if( show_octree         )
-  {
-    ::glDisable( GL_TEXTURE_1D ) ;
-    ::glLineWidth( 0.5 ) ;
-    ::glColor3f( 0.3f, 0.3f, 0.5f ) ;
-    ::glBegin( GL_LINES ) ;
-    {
-      octree.draw_wire() ;
-    }
-    ::glEnd() ;  // GL_LINES
-  }
-
-
-  // cells' centers
-  if( show_nodes          )
-  {
-    ::glEnable( GL_TEXTURE_1D ) ;
-    ::glPointSize( 4.0 ) ;
-    ::glColor3f( 0.0f, 0.8f, 0.2f ) ;
-    ::glBegin( GL_POINTS ) ;
-    {
-      octree.draw_centers() ;
-    }
-    ::glEnd() ;  // GL_POINTS
-  }
-
-  // octree dual
-  if( show_dual           )
-  {
-    ::glDisable( GL_TEXTURE_1D ) ;
-    ::glDisable(GL_LIGHTING);
-    octree.draw_dual() ;	 
-    ::glEnable(GL_LIGHTING);  
-  }
-  
-  // isosurface of the field
-  if( show_iso            )
-  {
-    ::glDisable( GL_TEXTURE_1D ) ;
-    ::glDisable(GL_LIGHTING);
-    ::glPolygonMode(GL_FRONT_AND_BACK, GL_LINE) ;
-    ::glColor3f( 0.3f, 0.3f, 0.5f ) ;    
-    ::glBegin( GL_TRIANGLES ) ;
-    octree.draw_iso() ;	 
-    ::glEnd() ; // GL_TRIANGLES
-
-    ::glEnable(GL_LIGHTING);  
-    ::glPolygonMode(GL_FRONT_AND_BACK, GL_FILL) ;
-    ::glColor3f( 0.6f, 0.6f, 0.7f ) ;    
-    ::glBegin( GL_TRIANGLES ) ;
-    octree.draw_iso() ;	 
-    ::glEnd() ; // GL_TRIANGLES
-  }
-  
-  if( ref && show_direct_iso_wire )
-  {
-    ::glDisable( GL_TEXTURE_1D ) ;
-    
-    ::glDisable(GL_LIGHTING);
-    ::glPolygonMode(GL_FRONT_AND_BACK, GL_LINE) ;
-    ::glColor3f( 0.3f, 0.3f, 0.5f ) ;    
-    ::glBegin( GL_TRIANGLES ) ;
-    octree.direct_draw_isosurface(ref) ;	 
-    ::glEnd() ; // GL_TRIANGLES
-  }
-
-  if( ref && show_direct_iso      )
-  {
-    ::glDisable( GL_TEXTURE_1D ) ;
-
-    ::glEnable(GL_LIGHTING);  
-    ::glPolygonMode(GL_FRONT_AND_BACK, GL_FILL) ;
-    ::glColor3f( 0.6f, 0.6f, 0.7f ) ;    
-    ::glBegin( GL_TRIANGLES ) ;
-    octree.direct_draw_isosurface(ref) ;	 
-    ::glEnd() ; // GL_TRIANGLES
-  }
-  
-  PRINT_GL_DEBUG ;
-
-  // next frame
-  ::glutSwapBuffers();
-}
-//_____________________________________________________________________________
-
-
-
-
-
diff --git a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/viz_glui_export.cpp b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/viz_glui_export.cpp
deleted file mode 100644
index 948cae6ebe..0000000000
--- a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/viz_glui_export.cpp
+++ /dev/null
@@ -1,323 +0,0 @@
-/**
- * @file    glui_export.cpp
- * @author  Thomas Lewiner <thomas.lewiner@polytechnique.org>
- * @author  Math Dept, PUC-Rio
- * @version 0.1
- * @date    20/08/2007
- *
- * @brief   Example Graphical interface: screen image exporatation
- */
-//________________________________________________
-
-
-#ifndef WIN32
-#pragma implementation "viz_glui_defs.h"
-#endif // WIN32
-
-#include <png.h>
-#include <stdio.h>
-#include "viz_glui_defs.h"
-
-
-
-//_____________________________________________________________________________
-// declarations of this file
-
-// set file extension of filename
-int  set_ext( const char ext[3], char *fn ) ;
-
-// PPM export
-void export_ppm() ;
-
-// PNG image export
-void export_png() ;
-
-// Viewport save
-void save_viewport() ;
-
-// Viewport load
-void load_viewport() ;
-
-//_____________________________________________________________________________
-
-
-
-//_____________________________________________________________________________
-// set file extension of filename
-int set_ext( const char ext[3], char *fn )
-//-----------------------------------------------------------------------------
-{
-  strcpy( fn, filename.c_str() ) ;
-  int l = (int)strlen(fn) ;
-  if( l == 0 ) return 0 ;
-  if( fn[l-4] != '.' )
-  {
-    strcat( fn, "." ) ;
-    strcat( fn, ext ) ;
-  }
-  else if( strcmp( fn + l-3, ext ) )
-  {
-    fn[l-3] = ext[0] ;
-    fn[l-2] = ext[1] ;
-    fn[l-1] = ext[2] ;
-  }
-
-  return l ;
-}
-//_____________________________________________________________________________
-
-
-
-//_____________________________________________________________________________
-// PPM export
-void export_ppm()
-//-----------------------------------------------------------------------------
-{
-  char fn[1024] ;
-  set_ext( "ppm", fn ) ;
-  FILE *fp = fopen( fn, "w" ) ;
-  if( !fp ) return ;
-
-  int tx, ty, tw, th;
-  glutSetWindow(main_window);
-  GLUI_Master.get_viewport_area( &tx, &ty, &tw, &th );
-
-  // read openGL buffer
-  int buf_size = (tw * th * 3);
-  unsigned char *buffer = new unsigned char[buf_size] ;
-  memset(buffer, 0, buf_size * sizeof(unsigned char)) ;
-  display() ;
-  glFinish() ;
-  glPixelStorei( GL_PACK_ALIGNMENT,  1 ); // Force 1-byte alignment
-  glPixelStorei( GL_PACK_ROW_LENGTH, 0 );
-  glPixelStorei( GL_PACK_SKIP_ROWS,  0 );
-  glPixelStorei( GL_PACK_SKIP_PIXELS,0 );
-  glReadPixels(tx, ty, tw, th, GL_RGB, GL_UNSIGNED_BYTE, buffer);
-
-  // write the header
-  fprintf(fp, "P6\n%d %d\n", tw, th);
-  fprintf(fp, "# %s (Affine Surface by Thomas Lewiner)\n", fn ) ;
-  fprintf(fp, "255\n");
-
-  // write file
-  for (int i = 0; i < buf_size; ++i)
-    fputc( buffer[i], fp ) ;
-
-  delete [] buffer ;
-
-  fclose(fp);
-  printf( "exported image to PPM file %s\n", fn ) ;
-
-}
-//_____________________________________________________________________________
-
-
-//_____________________________________________________________________________
-//
-void export_tga()
-//-----------------------------------------------------------------------------
-{
-  char fn[1024] ;
-  set_ext("tga", fn) ;
-  FILE *fp = fopen( fn, "w" ) ;
-  if (!fp)
-     return ;
-
-  int tx, ty, tw, th;
-  glutSetWindow(main_window);
-  GLUI_Master.get_viewport_area(&tx, &ty, &tw, &th);
-
-  int             buf_size  = 18 + (tw* th * 3);  // HEADER_SIZE  ==> 18
-  unsigned char*  buffer    = new unsigned char[buf_size] ;
-  memset(buffer, 0, buf_size * sizeof(unsigned char)) ;
-
-  // Header
-  buffer[2] = 2;     // Non-compressed
-  buffer[12] = tw & 255;
-  buffer[13] = (tw >> 8) & 255 ;
-  buffer[14] = th & 255;
-  buffer[15] = (th >> 8) & 255 ;
-  buffer[16] = 24;    // 24 bits per pixel
-
-  // Read openGL buffer
-  display() ;
-  glFinish() ;
-  glPixelStorei(GL_PACK_ALIGNMENT, 1); // Force 1-byte alignment
-  glPixelStorei(GL_PACK_ROW_LENGTH, 0);
-  glPixelStorei(GL_PACK_SKIP_ROWS, 0);
-  glPixelStorei(GL_PACK_SKIP_PIXELS, 0);
-  glReadPixels(tx, ty, tw, th, GL_RGB, GL_UNSIGNED_BYTE, buffer + 18);
-
-  // Conversion from RGB to BGR
-  for (int i = 18; i < buf_size; i += 3)
-  {
-     unsigned char  temp  = buffer[i];
-     buffer[i] = buffer[i + 2];
-     buffer[i + 2] = temp;
-  }
-
-  // Write file
-  fwrite(buffer, sizeof(unsigned char), buf_size, fp);
-  fclose(fp);
-  delete[] buffer ;
-  printf("exported image to TGA file %s\n", fn ) ;
-}
-//_____________________________________________________________________________
-
-
-
-//_____________________________________________________________________________
-//_____________________________________________________________________________
-
-
-
-
-//_____________________________________________________________________________
-//
-void save_viewport()
-//-----------------------------------------------------------------------------
-{
-  char fn[1024] ;
-  set_ext( "view", fn ) ;
-  FILE *fp = fopen( fn, "w" ) ;
-  if( !fp ) return ;
-  fprintf( fp, "rotate:\n\t%f %f %f %f\n\t%f %f %f %f\n\t%f %f %f %f\n\t%f %f %f %f\n\n",
-          view_rotate[ 0], view_rotate[ 1], view_rotate[ 2], view_rotate[ 3],
-          view_rotate[ 4], view_rotate[ 5], view_rotate[ 6], view_rotate[ 7],
-          view_rotate[ 8], view_rotate[ 9], view_rotate[10], view_rotate[11],
-          view_rotate[12], view_rotate[13], view_rotate[14], view_rotate[15] ) ;
-  fprintf( fp, "translate:\t%f %f %f\n", obj_pos[0], obj_pos[1], obj_pos[2] ) ;
-
-  fprintf( fp, "plane rotate:\n\t%f %f %f %f\n\t%f %f %f %f\n\t%f %f %f %f\n\t%f %f %f %f\n\t%f\n\n",
-          1.0,0.0,0.0,0.0, 0.0,1.0,0.0,0.0, 0.0,0.0,1.0,0.0, 0.0,0.0,0.0,1.0, 0.0 ) ;
-  
-  fprintf( fp, "corner size:\t%f %f\n", 0.0,0.0 ) ;
-  fprintf( fp, "corner trans:\t%f %f %f\n", 0.0,0.0,1.0 ) ;
-  
-  
-  fprintf( fp, "light 0:\n\t%d %d %d\n\t%f %f %f %f\n\t%f %f %f %f\n\t%f %f %f %f\n\t%f %f %f %f\n\t%f %f %f %f\n\n\n",
-          light0_enabled, light0_intensity, light0_intensity2, 
-          light0_diffuse [ 0], light0_diffuse [ 1], light0_diffuse [ 2], light0_diffuse [ 3],
-          light0_rotation[ 0], light0_rotation[ 1], light0_rotation[ 2], light0_rotation[ 3],
-          light0_rotation[ 4], light0_rotation[ 5], light0_rotation[ 6], light0_rotation[ 7],
-          light0_rotation[ 8], light0_rotation[ 9], light0_rotation[10], light0_rotation[11],
-          light0_rotation[12], light0_rotation[13], light0_rotation[14], light0_rotation[15] ) ;
-  
-  fprintf( fp, "light 1:\n\t%d %d %d\n\t%f %f %f %f\n\t%f %f %f %f\n\t%f %f %f %f\n\t%f %f %f %f\n\t%f %f %f %f\n\n\n",
-          light1_enabled, light1_intensity, light1_intensity2, 
-          light1_diffuse [ 0], light1_diffuse [ 1], light1_diffuse [ 2], light1_diffuse [ 3],
-          light1_rotation[ 0], light1_rotation[ 1], light1_rotation[ 2], light1_rotation[ 3],
-          light1_rotation[ 4], light1_rotation[ 5], light1_rotation[ 6], light1_rotation[ 7],
-          light1_rotation[ 8], light1_rotation[ 9], light1_rotation[10], light1_rotation[11],
-          light1_rotation[12], light1_rotation[13], light1_rotation[14], light1_rotation[15] ) ;
-  
-  fclose( fp ) ;
-
-  printf("saved viewport to file %s\n", fn ) ;
-}
-//_____________________________________________________________________________
-
-
-
-
-
-//_____________________________________________________________________________
-//
-void load_viewport()
-//-----------------------------------------------------------------------------
-{
-  char fn[1024] ;
-  set_ext("view",fn) ;
-  FILE* fp  = fopen( fn, "r" ) ;
-  if( !fp ) return ;
-  fscanf( fp, "rotate: %f %f %f %f  %f %f %f %f  %f %f %f %f  %f %f %f %f ",
-         view_rotate +  0, view_rotate +  1, view_rotate +  2, view_rotate +  3,
-         view_rotate +  4, view_rotate +  5, view_rotate +  6, view_rotate +  7,
-         view_rotate +  8, view_rotate +  9, view_rotate + 10, view_rotate + 11,
-         view_rotate + 12, view_rotate + 13, view_rotate + 14, view_rotate + 15 ) ;
-  fscanf( fp, "translate: %f %f %f ", obj_pos + 0, obj_pos + 1, obj_pos + 2 ) ;
-
-  fscanf ( fp, "plane rotate:\n\t%*f %*f %*f %*f\n\t%*f %*f %*f %*f\n\t%*f %*f %*f %*f\n\t%*f %*f %*f %*f\n\t%*f\n\n" ) ;
-  
-  fscanf ( fp, "corner size:\t%*f %*f\n" ) ;
-  fscanf ( fp, "corner trans:\t%*f %*f %*f\n" ) ;
-  
-  
-  fscanf ( fp, "light 0:\n\t%d %d %d\n\t%f %f %f %f\n\t%f %f %f %f\n\t%f %f %f %f\n\t%f %f %f %f\n\t%f %f %f %f\n\n\n",
-          &light0_enabled, &light0_intensity, &light0_intensity2, 
-          light0_diffuse  +  0, light0_diffuse  +  1, light0_diffuse  +  2, light0_diffuse  +  3,
-          light0_rotation +  0, light0_rotation +  1, light0_rotation +  2, light0_rotation +  3,
-          light0_rotation +  4, light0_rotation +  5, light0_rotation +  6, light0_rotation +  7,
-          light0_rotation +  8, light0_rotation +  9, light0_rotation + 10, light0_rotation + 11,
-          light0_rotation + 12, light0_rotation + 13, light0_rotation + 14, light0_rotation + 15 ) ;
-  
-  fscanf ( fp, "light 1:\n\t%d %d %d\n\t%f %f %f %f\n\t%f %f %f %f\n\t%f %f %f %f\n\t%f %f %f %f\n\t%f %f %f %f\n\n\n",
-          &light1_enabled, &light1_intensity, &light1_intensity2, 
-          light1_diffuse  +  0, light1_diffuse  +  1, light1_diffuse  +  2, light1_diffuse  +  3,
-          light1_rotation +  0, light1_rotation +  1, light1_rotation +  2, light1_rotation +  3,
-          light1_rotation +  4, light1_rotation +  5, light1_rotation +  6, light1_rotation +  7,
-          light1_rotation +  8, light1_rotation +  9, light1_rotation + 10, light1_rotation + 11,
-          light1_rotation + 12, light1_rotation + 13, light1_rotation + 14, light1_rotation + 15 ) ;
-
-  fclose( fp ) ;
-  
-  printf("loaded viewport from file %s\n", fn ) ;
-}
-//_____________________________________________________________________________
-
-
-
-
-
-
-//_____________________________________________________________________________
-// PNG export
-void export_png()
-//-----------------------------------------------------------------------------
-{
-  char fn[1024] ;
-  set_ext( "png", fn ) ;
-  FILE *fp = fopen( fn, "wb" ) ;
-  if( !fp ) return ;
-  
-  int tx, ty, tw, th;
-  glutSetWindow(main_window);
-  GLUI_Master.get_viewport_area( &tx, &ty, &tw, &th );
-  
-  // read openGL buffer
-  int buf_size = (tw * th * 3);
-  unsigned char *buffer = new unsigned char[buf_size] ;
-  memset(buffer, 0, buf_size * sizeof(unsigned char)) ;
-  display() ;
-  glFinish() ;
-  glPixelStorei( GL_PACK_ALIGNMENT,  1 ); // Force 1-byte alignment
-  glPixelStorei( GL_PACK_ROW_LENGTH, 0 );
-  glPixelStorei( GL_PACK_SKIP_ROWS,  0 );
-  glPixelStorei( GL_PACK_SKIP_PIXELS,0 );
-  glReadPixels(tx, ty, tw, th, GL_RGB, GL_UNSIGNED_BYTE, buffer);
-  
-
-  png_structp png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING,NULL, NULL, NULL);
-  png_infop info_ptr = png_create_info_struct(png_ptr);
-  if (setjmp(png_jmpbuf(png_ptr)))
-  {
-    png_destroy_write_struct(&png_ptr, &info_ptr);
-    fclose(fp);
-    return;
-  }
-  png_init_io(png_ptr, fp);
-  png_set_IHDR(png_ptr, info_ptr, tw, th, 8, PNG_COLOR_TYPE_RGB, PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_DEFAULT, PNG_FILTER_TYPE_DEFAULT);
-  png_write_info(png_ptr, info_ptr);
-  for (int i=0; i<th; i++)
-    png_write_row(png_ptr, &(buffer[3*tw*((th-1) - i)]));
-  png_write_end(png_ptr, NULL);
-  png_destroy_write_struct(&png_ptr, &info_ptr);
-  
-  delete [] buffer ;
-  
-  fclose(fp);
-  printf( "exported image to PNG file %s\n", fn ) ;
-}
-//_____________________________________________________________________________
-
-
diff --git a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/viz_glui_main.cpp b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/viz_glui_main.cpp
deleted file mode 100644
index 1c1671f95d..0000000000
--- a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/viz_glui_main.cpp
+++ /dev/null
@@ -1,189 +0,0 @@
-/**
- * @file    glui_main.h
- * @author  Thomas Lewiner <thomas.lewiner@polytechnique.org>
- * @author  Math Dept, PUC-Rio
- * @version 0.1
- * @date    30/05/2006
- *
- * @brief   Octree graphical interface: commandline parser and main pipeline
- */
-//________________________________________________
-
-
-#if !defined(WIN32) || defined(__CYGWIN__)
-#pragma implementation "viz_glui_defs.h"
-#endif // WIN32
-
-#if WIN32 && _DEBUG
-#include <vld.h>
-#endif // WIN32 && _DEBUG
-
-#include "viz_glui_defs.h"
-#include "hash.h"
-
-
-//_____________________________________________________________________________
-// declarations of this file
-
-// main window id
-int  main_window  = -1 ;
-
-// export movie switch
-int export_movie  =  0 ;
-
-//-----------------------------------------------------------------------------
-
-// idle behaviour: redraw constantly
-void idle() ;
-
-//_____________________________________________________________________________
-
-
-
-
-
-//_____________________________________________________________________________
-// idel behaviour: redraw constantly
-void idle()
-//-----------------------------------------------------------------------------
-{
-  if ( ::glutGetWindow() != main_window ) ::glutSetWindow(main_window);
-
-
-  if( auto_rotate )
-  {
-    objects_rot->iaction_mouse_down_handler( 0,0 ) ;
-    objects_rot->iaction_mouse_held_down_handler( 0,0, 1 ) ;
-    objects_rot->iaction_mouse_held_down_handler( 1,0, 1 ) ;
-    objects_rot->iaction_mouse_up_handler( 1,0, 1 ) ;
-  }
-
-  if( auto_translate_x )
-  {
-    obj_pos[0] += auto_translate_x * 0.01f ;
-    objects_mv->sync_live(0,1) ;
-  }
-
-  if( auto_translate_y )
-  {
-    obj_pos[1] += auto_translate_y * 0.01f ;
-    objects_mv->sync_live(0,1) ;
-  }
-
-  if( auto_zoom )
-  {
-    obj_pos[2] += auto_zoom * 0.01f ;
-    objects_zm->sync_live(0,1) ;
-  }
-
-  if( export_movie ) export_png() ;
-  ::glutPostRedisplay();
-}
-//_____________________________________________________________________________
-
-
-
-
-//_____________________________________________________________________________
-// main
-int main(int argc, char* argv[])
-//-----------------------------------------------------------------------------
-{
-  printf( OCTREE_STRING " (hash %s pointers, %d bits) visualization with:\n\n", (USE_HASH_PTR ? "with" : "without"), HASH_BITS ) ;
-
-  // create main window
-  ::glutInit( &argc, argv ) ;
-  ::glutInitDisplayMode( GLUT_RGB | GLUT_DOUBLE | GLUT_DEPTH );
-  ::glutInitWindowPosition( 50, 50 );
-  ::glutInitWindowSize( 800, 600 );
-  main_window = ::glutCreateWindow( "Dual Octree" );
-
-
-
-  //--------------------------------------------------//
-  // Create the side and bottom subwindow
-#ifdef WIN32
-  create_bottom_panel() ;
-  create_side_panel  () ;
-#else  // WIN32
-  create_side_panel  () ;
-  create_bottom_panel() ;
-#endif // WIN32
-
-  //--------------------------------------------------//
-  // set callback functions
-  ::glutMouseFunc        ( mouse );
-  ::glutMotionFunc       ( motion );
-  ::glutDisplayFunc      ( display );
-  ::glutKeyboardFunc     ( keyboard );
-  GLUI_Master.set_glutIdleFunc   ( idle    );
-  GLUI_Master.set_glutReshapeFunc( reshape );
-
-  //--------------------------------------------------//
-  // init trackball
-  init_trackballs() ;
-
-
-  //--------------------------------------------------//
-
-  ::glEnable( GL_DEPTH_TEST );
-  ::glEnable(GL_COLOR_MATERIAL);
-  ::glDisable(GL_NORMALIZE);
-  
-  ::glPolygonOffset( 1.0f, -0.1f );
-  ::glEnable(GL_POLYGON_OFFSET_FILL) ;
-  /*
-  ::glEnable(GL_ALPHA_TEST);
-  ::glEnable(GL_BLEND ) ;
-  ::glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA) ;  
-*/
-  ::glClearColor( 1,1,1,1 );
-  
-  ::glEnable(GL_LIGHTING);
-  const GLfloat light0_ambient[4] =  {0.1f, 0.1f, 0.3f, 1.0f};
-  ::glEnable(GL_LIGHT0);
-  ::glLightfv(GL_LIGHT0, GL_AMBIENT, light0_ambient);
-  ::glLightfv(GL_LIGHT0, GL_DIFFUSE, light0_diffuse);
-
-  const GLfloat light1_ambient[4] =  {0.1f, 0.1f, 0.3f, 1.0f};
-  ::glEnable(GL_LIGHT1);
-  ::glLightfv(GL_LIGHT1, GL_AMBIENT, light1_ambient);
-  ::glLightfv(GL_LIGHT1, GL_DIFFUSE, light1_diffuse);
-
-  ::glShadeModel(GL_SMOOTH);
-
-  //--------------------------------------------------//
-  // texture color map
-  GLuint colormap_texture;
-  
-  // allocate a texture name
-  ::glGenTextures( 1, &colormap_texture );
-  
-  // select our current texture
-  ::glBindTexture( GL_TEXTURE_1D, colormap_texture );
-  
-  // select modulate to mix texture with color for shading
-  ::glTexEnvf( GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE );
-  
-  // when texture area is small, bilinear filter the closest mipmap
-  ::glTexParameterf( GL_TEXTURE_1D, GL_TEXTURE_MIN_FILTER, GL_LINEAR );
-  // when texture area is large, bilinear filter the original
-  ::glTexParameterf( GL_TEXTURE_1D, GL_TEXTURE_MAG_FILTER, GL_LINEAR );
-  
-  // the texture wraps over at the edges (repeat)
-  ::glTexParameterf( GL_TEXTURE_1D, GL_TEXTURE_WRAP_S, GL_CLAMP );
-  
-  GLfloat color_jet[3 * 256] = { 0.000000f, 0.000000f, 0.515625f, 0.000000f, 0.000000f, 0.531250f, 0.000000f, 0.000000f, 0.546875f, 0.000000f, 0.000000f, 0.562500f, 0.000000f, 0.000000f, 0.578125f, 0.000000f, 0.000000f, 0.593750f, 0.000000f, 0.000000f, 0.609375f, 0.000000f, 0.000000f, 0.625000f, 0.000000f, 0.000000f, 0.640625f, 0.000000f, 0.000000f, 0.656250f, 0.000000f, 0.000000f, 0.671875f, 0.000000f, 0.000000f, 0.687500f, 0.000000f, 0.000000f, 0.703125f, 0.000000f, 0.000000f, 0.718750f, 0.000000f, 0.000000f, 0.734375f, 0.000000f, 0.000000f, 0.750000f, 0.000000f, 0.000000f, 0.765625f, 0.000000f, 0.000000f, 0.781250f, 0.000000f, 0.000000f, 0.796875f, 0.000000f, 0.000000f, 0.812500f, 0.000000f, 0.000000f, 0.828125f, 0.000000f, 0.000000f, 0.843750f, 0.000000f, 0.000000f, 0.859375f, 0.000000f, 0.000000f, 0.875000f, 0.000000f, 0.000000f, 0.890625f, 0.000000f, 0.000000f, 0.906250f, 0.000000f, 0.000000f, 0.921875f, 0.000000f, 0.000000f, 0.937500f, 0.000000f, 0.000000f, 0.953125f, 0.000000f, 0.000000f, 0.968750f, 0.000000f, 0.000000f, 0.984375f, 0.000000f, 0.000000f, 1.000000f, 0.000000f, 0.015625f, 1.000000f, 0.000000f, 0.031250f, 1.000000f, 0.000000f, 0.046875f, 1.000000f, 0.000000f, 0.062500f, 1.000000f, 0.000000f, 0.078125f, 1.000000f, 0.000000f, 0.093750f, 1.000000f, 0.000000f, 0.109375f, 1.000000f, 0.000000f, 0.125000f, 1.000000f, 0.000000f, 0.140625f, 1.000000f, 0.000000f, 0.156250f, 1.000000f, 0.000000f, 0.171875f, 1.000000f, 0.000000f, 0.187500f, 1.000000f, 0.000000f, 0.203125f, 1.000000f, 0.000000f, 0.218750f, 1.000000f, 0.000000f, 0.234375f, 1.000000f, 0.000000f, 0.250000f, 1.000000f, 0.000000f, 0.265625f, 1.000000f, 0.000000f, 0.281250f, 1.000000f, 0.000000f, 0.296875f, 1.000000f, 0.000000f, 0.312500f, 1.000000f, 0.000000f, 0.328125f, 1.000000f, 0.000000f, 0.343750f, 1.000000f, 0.000000f, 0.359375f, 1.000000f, 0.000000f, 0.375000f, 1.000000f, 0.000000f, 0.390625f, 1.000000f, 0.000000f, 0.406250f, 1.000000f, 0.000000f, 0.421875f, 1.000000f, 0.000000f, 0.437500f, 1.000000f, 0.000000f, 0.453125f, 1.000000f, 0.000000f, 0.468750f, 1.000000f, 0.000000f, 0.484375f, 1.000000f, 0.000000f, 0.500000f, 1.000000f, 0.000000f, 0.515625f, 1.000000f, 0.000000f, 0.531250f, 1.000000f, 0.000000f, 0.546875f, 1.000000f, 0.000000f, 0.562500f, 1.000000f, 0.000000f, 0.578125f, 1.000000f, 0.000000f, 0.593750f, 1.000000f, 0.000000f, 0.609375f, 1.000000f, 0.000000f, 0.625000f, 1.000000f, 0.000000f, 0.640625f, 1.000000f, 0.000000f, 0.656250f, 1.000000f, 0.000000f, 0.671875f, 1.000000f, 0.000000f, 0.687500f, 1.000000f, 0.000000f, 0.703125f, 1.000000f, 0.000000f, 0.718750f, 1.000000f, 0.000000f, 0.734375f, 1.000000f, 0.000000f, 0.750000f, 1.000000f, 0.000000f, 0.765625f, 1.000000f, 0.000000f, 0.781250f, 1.000000f, 0.000000f, 0.796875f, 1.000000f, 0.000000f, 0.812500f, 1.000000f, 0.000000f, 0.828125f, 1.000000f, 0.000000f, 0.843750f, 1.000000f, 0.000000f, 0.859375f, 1.000000f, 0.000000f, 0.875000f, 1.000000f, 0.000000f, 0.890625f, 1.000000f, 0.000000f, 0.906250f, 1.000000f, 0.000000f, 0.921875f, 1.000000f, 0.000000f, 0.937500f, 1.000000f, 0.000000f, 0.953125f, 1.000000f, 0.000000f, 0.968750f, 1.000000f, 0.000000f, 0.984375f, 1.000000f, 0.000000f, 1.000000f, 1.000000f, 0.015625f, 1.000000f, 1.000000f, 0.031250f, 1.000000f, 0.984375f, 0.046875f, 1.000000f, 0.968750f, 0.062500f, 1.000000f, 0.953125f, 0.078125f, 1.000000f, 0.937500f, 0.093750f, 1.000000f, 0.921875f, 0.109375f, 1.000000f, 0.906250f, 0.125000f, 1.000000f, 0.890625f, 0.140625f, 1.000000f, 0.875000f, 0.156250f, 1.000000f, 0.859375f, 0.171875f, 1.000000f, 0.843750f, 0.187500f, 1.000000f, 0.828125f, 0.203125f, 1.000000f, 0.812500f, 0.218750f, 1.000000f, 0.796875f, 0.234375f, 1.000000f, 0.781250f, 0.250000f, 1.000000f, 0.765625f, 0.265625f, 1.000000f, 0.750000f, 0.281250f, 1.000000f, 0.734375f, 0.296875f, 1.000000f, 0.718750f, 0.312500f, 1.000000f, 0.703125f, 0.328125f, 1.000000f, 0.687500f, 0.343750f, 1.000000f, 0.671875f, 0.359375f, 1.000000f, 0.656250f, 0.375000f, 1.000000f, 0.640625f, 0.390625f, 1.000000f, 0.625000f, 0.406250f, 1.000000f, 0.609375f, 0.421875f, 1.000000f, 0.593750f, 0.437500f, 1.000000f, 0.578125f, 0.453125f, 1.000000f, 0.562500f, 0.468750f, 1.000000f, 0.546875f, 0.484375f, 1.000000f, 0.531250f, 0.500000f, 1.000000f, 0.515625f, 0.515625f, 1.000000f, 0.500000f, 0.531250f, 1.000000f, 0.484375f, 0.546875f, 1.000000f, 0.468750f, 0.562500f, 1.000000f, 0.453125f, 0.578125f, 1.000000f, 0.437500f, 0.593750f, 1.000000f, 0.421875f, 0.609375f, 1.000000f, 0.406250f, 0.625000f, 1.000000f, 0.390625f, 0.640625f, 1.000000f, 0.375000f, 0.656250f, 1.000000f, 0.359375f, 0.671875f, 1.000000f, 0.343750f, 0.687500f, 1.000000f, 0.328125f, 0.703125f, 1.000000f, 0.312500f, 0.718750f, 1.000000f, 0.296875f, 0.734375f, 1.000000f, 0.281250f, 0.750000f, 1.000000f, 0.265625f, 0.765625f, 1.000000f, 0.250000f, 0.781250f, 1.000000f, 0.234375f, 0.796875f, 1.000000f, 0.218750f, 0.812500f, 1.000000f, 0.203125f, 0.828125f, 1.000000f, 0.187500f, 0.843750f, 1.000000f, 0.171875f, 0.859375f, 1.000000f, 0.156250f, 0.875000f, 1.000000f, 0.140625f, 0.890625f, 1.000000f, 0.125000f, 0.906250f, 1.000000f, 0.109375f, 0.921875f, 1.000000f, 0.093750f, 0.937500f, 1.000000f, 0.078125f, 0.953125f, 1.000000f, 0.062500f, 0.968750f, 1.000000f, 0.046875f, 0.984375f, 1.000000f, 0.031250f, 1.000000f, 1.000000f, 0.015625f, 1.000000f, 1.000000f, 0.000000f, 1.000000f, 0.984375f, 0.000000f, 1.000000f, 0.968750f, 0.000000f, 1.000000f, 0.953125f, 0.000000f, 1.000000f, 0.937500f, 0.000000f, 1.000000f, 0.921875f, 0.000000f, 1.000000f, 0.906250f, 0.000000f, 1.000000f, 0.890625f, 0.000000f, 1.000000f, 0.875000f, 0.000000f, 1.000000f, 0.859375f, 0.000000f, 1.000000f, 0.843750f, 0.000000f, 1.000000f, 0.828125f, 0.000000f, 1.000000f, 0.812500f, 0.000000f, 1.000000f, 0.796875f, 0.000000f, 1.000000f, 0.781250f, 0.000000f, 1.000000f, 0.765625f, 0.000000f, 1.000000f, 0.750000f, 0.000000f, 1.000000f, 0.734375f, 0.000000f, 1.000000f, 0.718750f, 0.000000f, 1.000000f, 0.703125f, 0.000000f, 1.000000f, 0.687500f, 0.000000f, 1.000000f, 0.671875f, 0.000000f, 1.000000f, 0.656250f, 0.000000f, 1.000000f, 0.640625f, 0.000000f, 1.000000f, 0.625000f, 0.000000f, 1.000000f, 0.609375f, 0.000000f, 1.000000f, 0.593750f, 0.000000f, 1.000000f, 0.578125f, 0.000000f, 1.000000f, 0.562500f, 0.000000f, 1.000000f, 0.546875f, 0.000000f, 1.000000f, 0.531250f, 0.000000f, 1.000000f, 0.515625f, 0.000000f, 1.000000f, 0.500000f, 0.000000f, 1.000000f, 0.484375f, 0.000000f, 1.000000f, 0.468750f, 0.000000f, 1.000000f, 0.453125f, 0.000000f, 1.000000f, 0.437500f, 0.000000f, 1.000000f, 0.421875f, 0.000000f, 1.000000f, 0.406250f, 0.000000f, 1.000000f, 0.390625f, 0.000000f, 1.000000f, 0.375000f, 0.000000f, 1.000000f, 0.359375f, 0.000000f, 1.000000f, 0.343750f, 0.000000f, 1.000000f, 0.328125f, 0.000000f, 1.000000f, 0.312500f, 0.000000f, 1.000000f, 0.296875f, 0.000000f, 1.000000f, 0.281250f, 0.000000f, 1.000000f, 0.265625f, 0.000000f, 1.000000f, 0.250000f, 0.000000f, 1.000000f, 0.234375f, 0.000000f, 1.000000f, 0.218750f, 0.000000f, 1.000000f, 0.203125f, 0.000000f, 1.000000f, 0.187500f, 0.000000f, 1.000000f, 0.171875f, 0.000000f, 1.000000f, 0.156250f, 0.000000f, 1.000000f, 0.140625f, 0.000000f, 1.000000f, 0.125000f, 0.000000f, 1.000000f, 0.109375f, 0.000000f, 1.000000f, 0.093750f, 0.000000f, 1.000000f, 0.078125f, 0.000000f, 1.000000f, 0.062500f, 0.000000f, 1.000000f, 0.046875f, 0.000000f, 1.000000f, 0.031250f, 0.000000f, 1.000000f, 0.015625f, 0.000000f, 1.000000f, 0.000000f, 0.000000f, 0.984375f, 0.000000f, 0.000000f, 0.968750f, 0.000000f, 0.000000f, 0.953125f, 0.000000f, 0.000000f, 0.937500f, 0.000000f, 0.000000f, 0.921875f, 0.000000f, 0.000000f, 0.906250f, 0.000000f, 0.000000f, 0.890625f, 0.000000f, 0.000000f, 0.875000f, 0.000000f, 0.000000f, 0.859375f, 0.000000f, 0.000000f, 0.843750f, 0.000000f, 0.000000f, 0.828125f, 0.000000f, 0.000000f, 0.812500f, 0.000000f, 0.000000f, 0.796875f, 0.000000f, 0.000000f, 0.781250f, 0.000000f, 0.000000f, 0.765625f, 0.000000f, 0.000000f, 0.750000f, 0.000000f, 0.000000f, 0.734375f, 0.000000f, 0.000000f, 0.718750f, 0.000000f, 0.000000f, 0.703125f, 0.000000f, 0.000000f, 0.687500f, 0.000000f, 0.000000f, 0.671875f, 0.000000f, 0.000000f, 0.656250f, 0.000000f, 0.000000f, 0.640625f, 0.000000f, 0.000000f, 0.625000f, 0.000000f, 0.000000f, 0.609375f, 0.000000f, 0.000000f, 0.593750f, 0.000000f, 0.000000f, 0.578125f, 0.000000f, 0.000000f, 0.562500f, 0.000000f, 0.000000f, 0.546875f, 0.000000f, 0.000000f, 0.531250f, 0.000000f, 0.000000f, 0.515625f, 0.000000f, 0.000000f };
-  ::glTexImage1D( GL_TEXTURE_1D, 0, GL_RGB, 256, 0, GL_RGB, GL_FLOAT, color_jet ) ;
-
-  //--------------------------------------------------//
-  // Parse command line
-  bool quit = parse_command_line(argc, argv) ;
-
-  //--------------------------------------------------//
-  // GLUT main loop
-  if( !quit ) ::glutMainLoop();
-
-  return 0 ;
-}
-//_____________________________________________________________________________
diff --git a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/viz_glui_mouse.cpp b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/viz_glui_mouse.cpp
deleted file mode 100644
index b46fe65f7f..0000000000
--- a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/fastdualoctree_sgp/viz_glui_mouse.cpp
+++ /dev/null
@@ -1,312 +0,0 @@
-/**
- * @file    glui_mouse.cpp
- * @author  Thomas Lewiner <thomas.lewiner@polytechnique.org>
- * @author  Math Dept, PUC-Rio
- * @version 0.1
- * @date    30/05/2006
- *
- * @brief   Octree Graphical interface: mouse controls
- */
-//________________________________________________
-
-
-#if !defined(WIN32) || defined(__CYGWIN__)
-#pragma implementation "viz_glui_defs.h"
-#endif // WIN32
-
-
-#include "viz_glui_defs.h"
-
-
-//_____________________________________________________________________________
-// declarations of this file
-
-// motion type (-1 -> no motion, 0 -> rotate, 1 -> zoom, 2 -> translate)
-int motion_type = -1 ;
-
-// panel and window trackballs and sliders
-GLUI_Rotation     mouse_rot, *objects_rot, *plane_rot   ;
-GLUI_Translation  mouse_mv , *objects_mv , *plane_trans ;
-GLUI_Translation  mouse_zm , *objects_zm  ;
-
-// number of calls for updating the GLUI control
-int ncalls = 0 ;
-
-//-----------------------------------------------------------------------------
-
-// init mouse and window controls
-void init_trackballs() ;
-
-// mouse events tracking
-void mouse(int button, int button_state, int x, int y ) ;
-
-// mouse motion tracking
-void motion(int x, int y ) ;
-
-// automatic rotation
-int auto_rotate  = 0 ;
-
-// automatic x translation
-int auto_translate_x = 0 ;
-
-// automatic y translation
-int auto_translate_y = 0 ;
-
-// automatic zoom
-int auto_zoom = 0 ;
-
-// automatic plane
-int auto_translate_d = 0 ;
-
-// mouse x position
-int mouse_x = 0 ;
-
-// mouse y position
-int mouse_y = 0 ;
-
-
-//_____________________________________________________________________________
-
-
-
-
-//_____________________________________________________________________________
-// init mouse and window controls
-void init_trackballs()
-//-----------------------------------------------------------------------------
-{
-  // init trackball
-
-  int tx,ty,tw,th ;
-  GLUI_Master.get_viewport_area( &tx, &ty, &tw, &th );
-
-  mouse_rot.set_spin(0.05f) ;
-  mouse_rot.set_w( tw ) ;
-  mouse_rot.set_h( th ) ;
-  mouse_rot.set_ptr_val( view_rotate );
-  mouse_rot.init_live() ;
-
-  mouse_mv.set_speed(0.005f) ;
-  mouse_mv.set_w( tw ) ;
-  mouse_mv.set_h( th ) ;
-  mouse_mv.set_ptr_val( obj_pos );
-  mouse_mv.init_live() ;
-
-  mouse_mv.trans_type = GLUI_TRANSLATION_XY;
-  mouse_mv.float_array_size = 2 ;
-  mouse_mv.hidden = true ;
-
-  mouse_zm.set_speed(0.01f) ;
-  mouse_zm.set_w( tw ) ;
-  mouse_zm.set_h( th ) ;
-  mouse_zm.set_ptr_val( &obj_pos[2] );
-  mouse_zm.init_live() ;
-
-  mouse_zm.trans_type = GLUI_TRANSLATION_Z ;
-  mouse_zm.float_array_size = 1 ;
-  mouse_zm.hidden = true ;
-}
-//_____________________________________________________________________________
-
-
-
-//_____________________________________________________________________________
-// mouse events
-void mouse(int button, int button_state, int x, int y )
-//-----------------------------------------------------------------------------
-{
-  mouse_x = x ;
-  mouse_y = y ;
-
-  // determine motion type
-  if     ( glutGetModifiers() & GLUT_ACTIVE_CTRL  ) motion_type = 1 ;
-  else if( glutGetModifiers() & GLUT_ACTIVE_SHIFT ) motion_type = 2 ;
-  else if( glutGetModifiers() & GLUT_ACTIVE_ALT   ) motion_type = 3 ;
-  else                                              motion_type = 0 ;
-
-  switch( motion_type )
-  {
-      // rotation
-    case 0 :
-      // line selection
-      if ( button == GLUT_LEFT_BUTTON){
-        if (button_state == GLUT_DOWN )
-        {
-          mouse_rot.init_live() ;
-          mouse_rot.mouse_down_handler(x,y) ;
-        }
-        if ( button_state != GLUT_DOWN )
-        {
-          mouse_rot.mouse_up_handler(x,y,1) ;
-          motion_type = -1 ;
-        }
-        objects_rot->sync_live(0,1) ;
-      }
-      if ( button == GLUT_RIGHT_BUTTON && button_state == GLUT_DOWN)
-      {
-      }   
-      break ;
-      
-      // zoom
-    case 1 :
-      if ( button == GLUT_LEFT_BUTTON && button_state == GLUT_DOWN )
-      {
-        mouse_zm.init_live() ;
-        mouse_zm.glui = glui_bottom ;
-        mouse_zm.mouse_down_handler(x,y) ;
-        mouse_zm.glui = NULL ;
-        
-      }
-      if ( button_state != GLUT_DOWN )
-      {
-        mouse_zm.glui = glui_bottom ;
-        mouse_zm.mouse_up_handler(x,y,1) ;
-        mouse_zm.glui = NULL ;
-        motion_type = -1 ;
-      }
-      objects_zm->sync_live(0,1) ;
-      break ;
-      
-      // translation
-    case 2 :
-      if ( button == GLUT_LEFT_BUTTON && button_state == GLUT_DOWN )
-      {
-        mouse_mv.init_live() ;
-        mouse_mv.glui = glui_bottom ;
-        mouse_mv.mouse_down_handler(x,y) ;
-        mouse_mv.glui = NULL ;
-      }
-      if ( button_state != GLUT_DOWN )
-      {
-        mouse_mv.glui = glui_bottom ;
-        mouse_mv.mouse_up_handler(x,y,1) ;
-        mouse_mv.glui = NULL ;
-        motion_type = -1 ;
-      }
-      objects_mv->sync_live(0,1) ;
-      break ;
-
-    // no movement
-    default :
-      break ;
-  }
-  ncalls = 0 ;
-}
-//_____________________________________________________________________________
-
-
-//_____________________________________________________________________________
-// keyboard
-void keyboard(unsigned char key, int x, int y)
-{
-  switch(key)
-  {
-  case 's':
-	  export_png();
-	  break;
-
-  case 'S':
-	  export_movie = !export_movie;
-	  break;
-
-  case 'r' :
-    if( auto_rotate == -1 ) auto_rotate = 0 ;
-    else auto_rotate = -1 ;
-    break ;
-
-  case 'R' :
-    if( auto_rotate == +1 ) auto_rotate = 0 ;
-    else auto_rotate = +1 ;
-    break ;
-
-  case 'D' :
-    if( auto_translate_d == -1 ) auto_translate_d = 0 ;
-    else auto_translate_d = -1 ;
-    break ;
-
-  case 'd' :
-    if( auto_translate_d == +1 ) auto_translate_d = 0 ;
-    else auto_translate_d = +1 ;
-    break ;
-
-  case 'X' :
-    if( auto_translate_x == -1 ) auto_translate_x = 0 ;
-    else auto_translate_x = -1 ;
-    break ;
-
-  case 'x' :
-    if( auto_translate_x == +1 ) auto_translate_x = 0 ;
-    else auto_translate_x = +1 ;
-    break ;
-
-  case 'Y' :
-    if( auto_translate_y == -1 ) auto_translate_y = 0 ;
-    else auto_translate_y = -1 ;
-    break ;
-
-  case 'y' :
-    if( auto_translate_y == +1 ) auto_translate_y = 0 ;
-    else auto_translate_y = +1 ;
-    break ;
-
-  case 'Z' :
-    if( auto_zoom == -1 ) auto_zoom = 0 ;
-    else auto_zoom = -1 ;
-    break ;
-
-  case 'z' :
-    if( auto_zoom == +1 ) auto_zoom = 0 ;
-    else auto_zoom = +1 ;
-    break ;
-
-  default:
-    break;
-  }
-}
-//_____________________________________________________________________________
-
-
-
-//_____________________________________________________________________________
-// motion
-void motion(int x, int y )
-//-----------------------------------------------------------------------------
-{
-  mouse_x = x ;
-  mouse_y = y ;
-
-  switch( motion_type )
-  {
-      // rotation
-    case 0 :
-      mouse_rot.glui = glui_bottom ;
-      mouse_rot.iaction_mouse_held_down_handler(x,y,1);
-      mouse_rot.glui = NULL ;
-      if( ++ncalls > 10 ) { objects_rot->sync_live(0,1) ;  ncalls = 0 ; }
-      break ;
-      
-      // zoom
-    case 1 :
-      mouse_zm.glui = glui_bottom ;
-      mouse_zm.iaction_mouse_held_down_handler(x,y,1);
-      mouse_zm.glui = NULL ;
-      
-      if( ++ncalls > 10 ) { objects_zm->sync_live(0,1) ; ncalls = 0 ; }
-      break ;
-      
-      // translation
-    case 2 :
-      mouse_mv.glui = glui_bottom ;
-      mouse_mv.iaction_mouse_held_down_handler(x,y,1);
-      mouse_mv.glui = NULL ;
-      
-      if( ++ncalls > 10 ) { objects_mv->sync_live(0,1) ; ncalls = 0 ; }
-      break ;
-      
-      // no movement
-    default :
-      break ;
-  }
-  ::glutPostRedisplay() ;
-}
-//_____________________________________________________________________________

From e8bdf072fe8ae7583597ca33680844158f36789d Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Wed, 4 Apr 2012 17:42:44 +0100
Subject: [PATCH 161/317] rhoSimplecFoam: Update wrt latest relaxation strategy
 and move into rhoSimpleFoam

---
 .../solvers/compressible/rhoSimpleFoam/Allwclean      |  9 +++++++++
 .../solvers/compressible/rhoSimpleFoam/Allwmake       |  1 +
 .../solvers/compressible/rhoSimpleFoam/UEqn.H         |  1 +
 .../solvers/compressible/rhoSimpleFoam/hEqn.H         |  4 +++-
 .../solvers/compressible/rhoSimpleFoam/pEqn.H         |  2 +-
 .../{ => rhoSimpleFoam}/rhoSimplecFoam/Make/files     |  0
 .../{ => rhoSimpleFoam}/rhoSimplecFoam/Make/options   |  2 +-
 .../{ => rhoSimpleFoam}/rhoSimplecFoam/createFields.H |  0
 .../{ => rhoSimpleFoam}/rhoSimplecFoam/pEqn.H         | 11 +++--------
 .../rhoSimplecFoam/rhoSimplecFoam.C                   |  0
 10 files changed, 19 insertions(+), 11 deletions(-)
 create mode 100755 applications/solvers/compressible/rhoSimpleFoam/Allwclean
 rename applications/solvers/compressible/{ => rhoSimpleFoam}/rhoSimplecFoam/Make/files (100%)
 rename applications/solvers/compressible/{ => rhoSimpleFoam}/rhoSimplecFoam/Make/options (93%)
 rename applications/solvers/compressible/{ => rhoSimpleFoam}/rhoSimplecFoam/createFields.H (100%)
 rename applications/solvers/compressible/{ => rhoSimpleFoam}/rhoSimplecFoam/pEqn.H (88%)
 rename applications/solvers/compressible/{ => rhoSimpleFoam}/rhoSimplecFoam/rhoSimplecFoam.C (100%)

diff --git a/applications/solvers/compressible/rhoSimpleFoam/Allwclean b/applications/solvers/compressible/rhoSimpleFoam/Allwclean
new file mode 100755
index 0000000000..49e4b69482
--- /dev/null
+++ b/applications/solvers/compressible/rhoSimpleFoam/Allwclean
@@ -0,0 +1,9 @@
+#!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
+set -x
+
+wclean
+wclean rhoPorousMRFSimpleFoam
+wclean rhoSimplecFoam
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/applications/solvers/compressible/rhoSimpleFoam/Allwmake b/applications/solvers/compressible/rhoSimpleFoam/Allwmake
index 33916c7b39..e0b621c253 100755
--- a/applications/solvers/compressible/rhoSimpleFoam/Allwmake
+++ b/applications/solvers/compressible/rhoSimpleFoam/Allwmake
@@ -4,5 +4,6 @@ set -x
 
 wmake
 wmake rhoPorousMRFSimpleFoam
+wmake rhoSimplecFoam
 
 # ----------------------------------------------------------------- end-of-file
diff --git a/applications/solvers/compressible/rhoSimpleFoam/UEqn.H b/applications/solvers/compressible/rhoSimpleFoam/UEqn.H
index 21ec2646be..f1bed4d071 100644
--- a/applications/solvers/compressible/rhoSimpleFoam/UEqn.H
+++ b/applications/solvers/compressible/rhoSimpleFoam/UEqn.H
@@ -3,6 +3,7 @@
     tmp<fvVectorMatrix> UEqn
     (
         fvm::div(phi, U)
+      - fvm::Sp(fvc::div(phi), U)
       + turbulence->divDevRhoReff(U)
     );
 
diff --git a/applications/solvers/compressible/rhoSimpleFoam/hEqn.H b/applications/solvers/compressible/rhoSimpleFoam/hEqn.H
index 8ff402a2b1..879578cf49 100644
--- a/applications/solvers/compressible/rhoSimpleFoam/hEqn.H
+++ b/applications/solvers/compressible/rhoSimpleFoam/hEqn.H
@@ -1,11 +1,13 @@
 {
+    volScalarField K("K", 0.5*magSqr(U));
+
     fvScalarMatrix hEqn
     (
         fvm::div(phi, h)
       - fvm::Sp(fvc::div(phi), h)
       - fvm::laplacian(turbulence->alphaEff(), h)
      ==
-      - fvc::div(phi, 0.5*magSqr(U), "div(phi,K)")
+        fvc::div(phi)*K - fvc::div(phi, K)
     );
 
     hEqn.relax();
diff --git a/applications/solvers/compressible/rhoSimpleFoam/pEqn.H b/applications/solvers/compressible/rhoSimpleFoam/pEqn.H
index 56c444cdab..cefee48969 100644
--- a/applications/solvers/compressible/rhoSimpleFoam/pEqn.H
+++ b/applications/solvers/compressible/rhoSimpleFoam/pEqn.H
@@ -28,7 +28,7 @@ if (simple.transonic())
         );
 
         // Relax the pressure equation to ensure diagonal-dominance
-        pEqn.relax(mesh.equationRelaxationFactor("pEqn"));
+        pEqn.relax();
 
         pEqn.setReference(pRefCell, pRefValue);
 
diff --git a/applications/solvers/compressible/rhoSimplecFoam/Make/files b/applications/solvers/compressible/rhoSimpleFoam/rhoSimplecFoam/Make/files
similarity index 100%
rename from applications/solvers/compressible/rhoSimplecFoam/Make/files
rename to applications/solvers/compressible/rhoSimpleFoam/rhoSimplecFoam/Make/files
diff --git a/applications/solvers/compressible/rhoSimplecFoam/Make/options b/applications/solvers/compressible/rhoSimpleFoam/rhoSimplecFoam/Make/options
similarity index 93%
rename from applications/solvers/compressible/rhoSimplecFoam/Make/options
rename to applications/solvers/compressible/rhoSimpleFoam/rhoSimplecFoam/Make/options
index 9d578f011a..30c1e55d31 100644
--- a/applications/solvers/compressible/rhoSimplecFoam/Make/options
+++ b/applications/solvers/compressible/rhoSimpleFoam/rhoSimplecFoam/Make/options
@@ -1,5 +1,5 @@
 EXE_INC = \
-    -I../rhoSimpleFoam \
+    -I.. \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
     -I$(LIB_SRC)/turbulenceModels \
     -I$(LIB_SRC)/turbulenceModels/compressible/RAS/RASModel \
diff --git a/applications/solvers/compressible/rhoSimplecFoam/createFields.H b/applications/solvers/compressible/rhoSimpleFoam/rhoSimplecFoam/createFields.H
similarity index 100%
rename from applications/solvers/compressible/rhoSimplecFoam/createFields.H
rename to applications/solvers/compressible/rhoSimpleFoam/rhoSimplecFoam/createFields.H
diff --git a/applications/solvers/compressible/rhoSimplecFoam/pEqn.H b/applications/solvers/compressible/rhoSimpleFoam/rhoSimplecFoam/pEqn.H
similarity index 88%
rename from applications/solvers/compressible/rhoSimplecFoam/pEqn.H
rename to applications/solvers/compressible/rhoSimpleFoam/rhoSimplecFoam/pEqn.H
index a4d9325522..379e720c04 100644
--- a/applications/solvers/compressible/rhoSimplecFoam/pEqn.H
+++ b/applications/solvers/compressible/rhoSimpleFoam/rhoSimplecFoam/pEqn.H
@@ -29,21 +29,17 @@ if (simple.transonic())
         (
             "phic",
             fvc::interpolate(rho/AtU - rho/AU)*fvc::snGrad(p)*mesh.magSf()
-          + phid*(fvc::interpolate(p) - fvc::interpolate(p, "UD"))
         );
 
-        //refCast<mixedFvPatchScalarField>(p.boundaryField()[1]).refValue()
-        //    = p.boundaryField()[1];
-
         fvScalarMatrix pEqn
         (
             fvm::div(phid, p)
           + fvc::div(phic)
-          - fvm::Sp(fvc::div(phid), p)
-          + fvc::div(phid)*p
           - fvm::laplacian(rho/AtU, p)
         );
-        //pEqn.relax();
+
+        // Relax the pressure equation to ensure diagonal-dominance
+        pEqn.relax();
 
         pEqn.setReference(pRefCell, pRefValue);
 
@@ -71,7 +67,6 @@ else
         fvScalarMatrix pEqn
         (
             fvc::div(phiHbyA)
-        //- fvm::laplacian(rho/AU, p)
           - fvm::laplacian(rho/AtU, p)
         );
 
diff --git a/applications/solvers/compressible/rhoSimplecFoam/rhoSimplecFoam.C b/applications/solvers/compressible/rhoSimpleFoam/rhoSimplecFoam/rhoSimplecFoam.C
similarity index 100%
rename from applications/solvers/compressible/rhoSimplecFoam/rhoSimplecFoam.C
rename to applications/solvers/compressible/rhoSimpleFoam/rhoSimplecFoam/rhoSimplecFoam.C

From be78e2026ea7a831e0c8812ed69c299090772c8c Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Wed, 4 Apr 2012 17:43:09 +0100
Subject: [PATCH 162/317] rhoSimplecFoam: Update header

---
 .../compressible/rhoSimpleFoam/rhoSimplecFoam/rhoSimplecFoam.C  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/applications/solvers/compressible/rhoSimpleFoam/rhoSimplecFoam/rhoSimplecFoam.C b/applications/solvers/compressible/rhoSimpleFoam/rhoSimplecFoam/rhoSimplecFoam.C
index 937358e0f5..37334e7955 100644
--- a/applications/solvers/compressible/rhoSimpleFoam/rhoSimplecFoam/rhoSimplecFoam.C
+++ b/applications/solvers/compressible/rhoSimpleFoam/rhoSimplecFoam/rhoSimplecFoam.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

From 42612f2db58b0aaec1b876c75eed194083cd2576 Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Wed, 4 Apr 2012 17:44:18 +0100
Subject: [PATCH 163/317] turbulenceModels/compressible/RAS: ensure transport
 equations produce bounded solutions even if continuity is not obeyed

---
 src/turbulenceModels/compressible/RAS/LRR/LRR.C               | 4 +++-
 .../compressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C    | 4 +++-
 .../compressible/RAS/LaunderSharmaKE/LaunderSharmaKE.C        | 4 +++-
 .../compressible/RAS/RNGkEpsilon/RNGkEpsilon.C                | 4 +++-
 .../compressible/RAS/SpalartAllmaras/SpalartAllmaras.C        | 1 +
 src/turbulenceModels/compressible/RAS/kEpsilon/kEpsilon.C     | 4 +++-
 src/turbulenceModels/compressible/RAS/kOmegaSST/kOmegaSST.C   | 4 +++-
 .../compressible/RAS/realizableKE/realizableKE.C              | 4 +++-
 8 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/src/turbulenceModels/compressible/RAS/LRR/LRR.C b/src/turbulenceModels/compressible/RAS/LRR/LRR.C
index e0958e376e..be15b76474 100644
--- a/src/turbulenceModels/compressible/RAS/LRR/LRR.C
+++ b/src/turbulenceModels/compressible/RAS/LRR/LRR.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -351,6 +351,7 @@ void LRR::correct()
     (
         fvm::ddt(rho_, epsilon_)
       + fvm::div(phi_, epsilon_)
+      - fvm::Sp(fvc::ddt(rho_) + fvc::div(phi_), epsilon_)
     //- fvm::laplacian(Ceps*rho_*(k_/epsilon_)*R_, epsilon_)
       - fvm::laplacian(DepsilonEff(), epsilon_)
      ==
@@ -393,6 +394,7 @@ void LRR::correct()
     (
         fvm::ddt(rho_, R_)
       + fvm::div(phi_, R_)
+      - fvm::Sp(fvc::ddt(rho_) + fvc::div(phi_), R_)
     //- fvm::laplacian(Cs*rho_*(k_/epsilon_)*R_, R_)
       - fvm::laplacian(DREff(), R_)
       + fvm::Sp(Clrr1_*rho_*epsilon_/k_, R_)
diff --git a/src/turbulenceModels/compressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C b/src/turbulenceModels/compressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C
index 6aef97660a..fb9bee6570 100644
--- a/src/turbulenceModels/compressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C
+++ b/src/turbulenceModels/compressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -389,6 +389,7 @@ void LaunderGibsonRSTM::correct()
     (
         fvm::ddt(rho_, epsilon_)
       + fvm::div(phi_, epsilon_)
+      - fvm::Sp(fvc::ddt(rho_) + fvc::div(phi_), epsilon_)
     //- fvm::laplacian(Ceps*rho_*(k_/epsilon_)*R_, epsilon_)
       - fvm::laplacian(DepsilonEff(), epsilon_)
      ==
@@ -432,6 +433,7 @@ void LaunderGibsonRSTM::correct()
     (
         fvm::ddt(rho_, R_)
       + fvm::div(phi_, R_)
+      - fvm::Sp(fvc::ddt(rho_) + fvc::div(phi_), R_)
     //- fvm::laplacian(Cs*rho_*(k_/epsilon_)*R_, R_)
       - fvm::laplacian(DREff(), R_)
       + fvm::Sp(Clg1_*rho_*epsilon_/k_, R_)
diff --git a/src/turbulenceModels/compressible/RAS/LaunderSharmaKE/LaunderSharmaKE.C b/src/turbulenceModels/compressible/RAS/LaunderSharmaKE/LaunderSharmaKE.C
index 996f0e5d2c..d03f6b5de9 100644
--- a/src/turbulenceModels/compressible/RAS/LaunderSharmaKE/LaunderSharmaKE.C
+++ b/src/turbulenceModels/compressible/RAS/LaunderSharmaKE/LaunderSharmaKE.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -314,6 +314,7 @@ void LaunderSharmaKE::correct()
     (
         fvm::ddt(rho_, epsilon_)
       + fvm::div(phi_, epsilon_)
+      - fvm::Sp(fvc::ddt(rho_) + fvc::div(phi_), epsilon_)
       - fvm::laplacian(DepsilonEff(), epsilon_)
      ==
         C1_*G*epsilon_/k_ + fvm::SuSp((C3_ - 2.0/3.0*C1_)*rho_*divU, epsilon_)
@@ -333,6 +334,7 @@ void LaunderSharmaKE::correct()
     (
         fvm::ddt(rho_, k_)
       + fvm::div(phi_, k_)
+      - fvm::Sp(fvc::ddt(rho_) + fvc::div(phi_), k_)
       - fvm::laplacian(DkEff(), k_)
      ==
         G - fvm::SuSp(2.0/3.0*rho_*divU, k_)
diff --git a/src/turbulenceModels/compressible/RAS/RNGkEpsilon/RNGkEpsilon.C b/src/turbulenceModels/compressible/RAS/RNGkEpsilon/RNGkEpsilon.C
index d1d751e54d..96155d40a4 100644
--- a/src/turbulenceModels/compressible/RAS/RNGkEpsilon/RNGkEpsilon.C
+++ b/src/turbulenceModels/compressible/RAS/RNGkEpsilon/RNGkEpsilon.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -321,6 +321,7 @@ void RNGkEpsilon::correct()
     (
         fvm::ddt(rho_, epsilon_)
       + fvm::div(phi_, epsilon_)
+      - fvm::Sp(fvc::ddt(rho_) + fvc::div(phi_), epsilon_)
       - fvm::laplacian(DepsilonEff(), epsilon_)
       ==
         (C1_ - R)*G*epsilon_/k_
@@ -342,6 +343,7 @@ void RNGkEpsilon::correct()
     (
         fvm::ddt(rho_, k_)
       + fvm::div(phi_, k_)
+      - fvm::Sp(fvc::ddt(rho_) + fvc::div(phi_), k_)
       - fvm::laplacian(DkEff(), k_)
       ==
         G - fvm::SuSp(2.0/3.0*rho_*divU, k_)
diff --git a/src/turbulenceModels/compressible/RAS/SpalartAllmaras/SpalartAllmaras.C b/src/turbulenceModels/compressible/RAS/SpalartAllmaras/SpalartAllmaras.C
index 358e6810ec..b76872cfa1 100644
--- a/src/turbulenceModels/compressible/RAS/SpalartAllmaras/SpalartAllmaras.C
+++ b/src/turbulenceModels/compressible/RAS/SpalartAllmaras/SpalartAllmaras.C
@@ -416,6 +416,7 @@ void SpalartAllmaras::correct()
     (
         fvm::ddt(rho_, nuTilda_)
       + fvm::div(phi_, nuTilda_)
+      - fvm::Sp(fvc::ddt(rho_) + fvc::div(phi_), nuTilda_)
       - fvm::laplacian(DnuTildaEff(), nuTilda_)
       - Cb2_/sigmaNut_*rho_*magSqr(fvc::grad(nuTilda_))
      ==
diff --git a/src/turbulenceModels/compressible/RAS/kEpsilon/kEpsilon.C b/src/turbulenceModels/compressible/RAS/kEpsilon/kEpsilon.C
index 2db4878a4c..aa63cf9f23 100644
--- a/src/turbulenceModels/compressible/RAS/kEpsilon/kEpsilon.C
+++ b/src/turbulenceModels/compressible/RAS/kEpsilon/kEpsilon.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -292,6 +292,7 @@ void kEpsilon::correct()
     (
         fvm::ddt(rho_, epsilon_)
       + fvm::div(phi_, epsilon_)
+      - fvm::Sp(fvc::ddt(rho_) + fvc::div(phi_), epsilon_)
       - fvm::laplacian(DepsilonEff(), epsilon_)
      ==
         C1_*G*epsilon_/k_
@@ -313,6 +314,7 @@ void kEpsilon::correct()
     (
         fvm::ddt(rho_, k_)
       + fvm::div(phi_, k_)
+      - fvm::Sp(fvc::ddt(rho_) + fvc::div(phi_), k_)
       - fvm::laplacian(DkEff(), k_)
      ==
         G
diff --git a/src/turbulenceModels/compressible/RAS/kOmegaSST/kOmegaSST.C b/src/turbulenceModels/compressible/RAS/kOmegaSST/kOmegaSST.C
index e4032d854c..e1ffc23d8d 100644
--- a/src/turbulenceModels/compressible/RAS/kOmegaSST/kOmegaSST.C
+++ b/src/turbulenceModels/compressible/RAS/kOmegaSST/kOmegaSST.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -411,6 +411,7 @@ void kOmegaSST::correct()
     (
         fvm::ddt(rho_, omega_)
       + fvm::div(phi_, omega_)
+      - fvm::Sp(fvc::ddt(rho_) + fvc::div(phi_), omega_)
       - fvm::laplacian(DomegaEff(F1), omega_)
      ==
         rhoGammaF1*GbyMu
@@ -435,6 +436,7 @@ void kOmegaSST::correct()
     (
         fvm::ddt(rho_, k_)
       + fvm::div(phi_, k_)
+      - fvm::Sp(fvc::ddt(rho_) + fvc::div(phi_), k_)
       - fvm::laplacian(DkEff(F1), k_)
      ==
         min(G, (c1_*betaStar_)*rho_*k_*omega_)
diff --git a/src/turbulenceModels/compressible/RAS/realizableKE/realizableKE.C b/src/turbulenceModels/compressible/RAS/realizableKE/realizableKE.C
index c169831c51..bb0f3041fa 100644
--- a/src/turbulenceModels/compressible/RAS/realizableKE/realizableKE.C
+++ b/src/turbulenceModels/compressible/RAS/realizableKE/realizableKE.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -331,6 +331,7 @@ void realizableKE::correct()
     (
         fvm::ddt(rho_, epsilon_)
       + fvm::div(phi_, epsilon_)
+      - fvm::Sp(fvc::ddt(rho_) + fvc::div(phi_), epsilon_)
       - fvm::laplacian(DepsilonEff(), epsilon_)
      ==
         C1*rho_*magS*epsilon_
@@ -355,6 +356,7 @@ void realizableKE::correct()
     (
         fvm::ddt(rho_, k_)
       + fvm::div(phi_, k_)
+      - fvm::Sp(fvc::ddt(rho_) + fvc::div(phi_), k_)
       - fvm::laplacian(DkEff(), k_)
      ==
         G - fvm::SuSp(2.0/3.0*rho_*divU, k_)

From fca4d338eac17cf371b81637e44d0f416fbde560 Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Wed, 4 Apr 2012 17:44:42 +0100
Subject: [PATCH 164/317] rhoSimplecFoam/squareBend: Update tutorial for latest
 version of rhoSimplecFoam

---
 tutorials/compressible/rhoSimplecFoam/squareBend/0/p          | 4 ++--
 .../compressible/rhoSimplecFoam/squareBend/system/fvSolution  | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/tutorials/compressible/rhoSimplecFoam/squareBend/0/p b/tutorials/compressible/rhoSimplecFoam/squareBend/0/p
index 5e1d1effb2..79a1eeb028 100644
--- a/tutorials/compressible/rhoSimplecFoam/squareBend/0/p
+++ b/tutorials/compressible/rhoSimplecFoam/squareBend/0/p
@@ -26,8 +26,8 @@ boundaryField
     }
     inlet
     {
-        //type            zeroGradient;
-        type            mixed;
+        type            zeroGradient;
+        //type            mixed;
         refValue        uniform 110000;
         refGradient     uniform 0;
         valueFraction   uniform 0.3;
diff --git a/tutorials/compressible/rhoSimplecFoam/squareBend/system/fvSolution b/tutorials/compressible/rhoSimplecFoam/squareBend/system/fvSolution
index df2018d930..09afca5761 100644
--- a/tutorials/compressible/rhoSimplecFoam/squareBend/system/fvSolution
+++ b/tutorials/compressible/rhoSimplecFoam/squareBend/system/fvSolution
@@ -65,8 +65,9 @@ relaxationFactors
     }
     equations
     {
+        p               1;
         U               0.9;
-        h               0.8;
+        h               0.9;
         k               0.9;
         epsilon         0.9;
     }

From 09e91aab32441f6df30f9f4f51af4304f0fd152a Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Thu, 5 Apr 2012 11:26:39 +0100
Subject: [PATCH 165/317] ENH: rotorDiskSource - updated calculation of co-ord
 sys for parallel running

---
 .../basicSource/rotorDiskSource/rotorDiskSource.C          | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/fieldSources/basicSource/rotorDiskSource/rotorDiskSource.C b/src/fieldSources/basicSource/rotorDiskSource/rotorDiskSource.C
index 8177c02efa..c2a3511485 100644
--- a/src/fieldSources/basicSource/rotorDiskSource/rotorDiskSource.C
+++ b/src/fieldSources/basicSource/rotorDiskSource/rotorDiskSource.C
@@ -252,7 +252,7 @@ void Foam::rotorDiskSource::createCoordinateSystem()
     {
         case gmAuto:
         {
-            // determine rotation origin
+            // determine rotation origin (cell volume weighted)
             scalar sumV = 0.0;
             const scalarField& V = mesh_.V();
             const vectorField& C = mesh_.C();
@@ -262,6 +262,8 @@ void Foam::rotorDiskSource::createCoordinateSystem()
                 sumV += V[cellI];
                 origin += V[cellI]*C[cellI];
             }
+            reduce(origin, sumOp<vector>());
+            reduce(sumV, sumOp<scalar>());
             origin /= sumV;
 
             // determine first radial vector
@@ -277,6 +279,8 @@ void Foam::rotorDiskSource::createCoordinateSystem()
                     magR = mag(test);
                 }
             }
+            reduce(dx1, maxMagSqrOp<vector>());
+            magR = mag(dx1);
 
             // determine second radial vector and cross to determine axis
             forAll(cells_, i)
@@ -292,6 +296,7 @@ void Foam::rotorDiskSource::createCoordinateSystem()
                     }
                 }
             }
+            reduce(axis, maxMagSqrOp<vector>());
             axis /= mag(axis);
 
             // axis direction is somewhat arbitrary - check if user needs

From 41c635c33df101988a413506b7debc4615971c27 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Thu, 5 Apr 2012 12:52:13 +0100
Subject: [PATCH 166/317] STYLE: tetOverlapVolume: removed unused function

---
 .../tetOverlapVolume/tetOverlapVolume.C       | 87 -------------------
 .../tetOverlapVolume/tetOverlapVolume.H       | 11 ---
 2 files changed, 98 deletions(-)

diff --git a/src/sampling/meshToMeshInterpolation/tetOverlapVolume/tetOverlapVolume.C b/src/sampling/meshToMeshInterpolation/tetOverlapVolume/tetOverlapVolume.C
index a16a386f8a..bf6b050e4e 100644
--- a/src/sampling/meshToMeshInterpolation/tetOverlapVolume/tetOverlapVolume.C
+++ b/src/sampling/meshToMeshInterpolation/tetOverlapVolume/tetOverlapVolume.C
@@ -45,93 +45,6 @@ Foam::tetOverlapVolume::tetOverlapVolume()
 
 // * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * * * //
 
-void Foam::tetOverlapVolume::tetTetOverlap
-(
-    const tetPoints& tetA,
-    const tetPoints& tetB,
-    tetIntersectionList& insideTets,
-    label& nInside,
-    tetIntersectionList& outsideTets,
-    label& nOutside
-) const
-{
-    // Work storage
-    tetIntersectionList cutInsideTets;
-    label nCutInside = 0;
-
-    tetPointRef::storeOp inside(insideTets, nInside);
-    tetPointRef::storeOp cutInside(cutInsideTets, nCutInside);
-    tetPointRef::dummyOp outside;
-
-
-    // Cut tetA with all inwards pointing faces of tetB. Any tets remaining
-    // in aboveTets are inside tetB.
-
-    {
-        // face0
-        plane pl0(tetB[1], tetB[3], tetB[2]);
-
-        // Cut and insert subtets into cutInsideTets (either by getting
-        // an index from freeSlots or by appending to insideTets) or
-        // insert into outsideTets
-        tetA.tet().sliceWithPlane(pl0, cutInside, outside);
-    }
-
-    if (nCutInside == 0)
-    {
-        nInside = nCutInside;
-        return;
-    }
-
-    {
-        // face1
-        plane pl1(tetB[0], tetB[2], tetB[3]);
-
-        nInside = 0;
-
-        for (label i = 0; i < nCutInside; i++)
-        {
-            cutInsideTets[i].tet().sliceWithPlane(pl1, inside, outside);
-        }
-
-        if (nInside == 0)
-        {
-            return;
-        }
-    }
-
-    {
-        // face2
-        plane pl2(tetB[0], tetB[3], tetB[1]);
-
-        nCutInside = 0;
-
-        for (label i = 0; i < nInside; i++)
-        {
-            insideTets[i].tet().sliceWithPlane(pl2, cutInside, outside);
-        }
-
-        if (nCutInside == 0)
-        {
-            nInside = nCutInside;
-            return;
-        }
-    }
-
-    {
-        // face3
-        plane pl3(tetB[0], tetB[1], tetB[2]);
-
-        nInside = 0;
-
-        for (label i = 0; i < nCutInside; i++)
-        {
-            cutInsideTets[i].tet().sliceWithPlane(pl3, inside, outside);
-        }
-    }
-}
-
-
 Foam::scalar Foam::tetOverlapVolume::tetTetOverlapVol
 (
     const tetPoints& tetA,
diff --git a/src/sampling/meshToMeshInterpolation/tetOverlapVolume/tetOverlapVolume.H b/src/sampling/meshToMeshInterpolation/tetOverlapVolume/tetOverlapVolume.H
index c898f427d1..e8890a3ee9 100644
--- a/src/sampling/meshToMeshInterpolation/tetOverlapVolume/tetOverlapVolume.H
+++ b/src/sampling/meshToMeshInterpolation/tetOverlapVolume/tetOverlapVolume.H
@@ -55,17 +55,6 @@ class tetOverlapVolume
 {
     // Private member functions
 
-        //- Tet overlap
-        void tetTetOverlap
-        (
-            const tetPoints& tetA,
-            const tetPoints& tetB,
-            tetIntersectionList& insideTets,
-            label& nInside,
-            tetIntersectionList& outsideTets,
-            label& nOutside
-        ) const;
-
         //- Tet Overlap Vol
         scalar tetTetOverlapVol
         (

From 0aa129a377e78930453cc9d1e67c4cb8c026b522 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Thu, 5 Apr 2012 12:53:44 +0100
Subject: [PATCH 167/317] STYLE: polyMeshTetDecomposition: spelling

---
 .../polyMeshTetDecomposition/polyMeshTetDecomposition.C       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/OpenFOAM/meshes/polyMesh/polyMeshTetDecomposition/polyMeshTetDecomposition.C b/src/OpenFOAM/meshes/polyMesh/polyMeshTetDecomposition/polyMeshTetDecomposition.C
index 8a9136b68a..ef697325b6 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyMeshTetDecomposition/polyMeshTetDecomposition.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyMeshTetDecomposition/polyMeshTetDecomposition.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -197,7 +197,7 @@ Foam::label Foam::polyMeshTetDecomposition::findBasePoint
     }
 
     // If a base point hasn't triggered a return by now, then there is
-    // non that can produce a good decomposition
+    // none that can produce a good decomposition
     return -1;
 }
 

From d52a96c56144839ebfea661ad31ffa6b3c743abf Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Thu, 5 Apr 2012 12:54:27 +0100
Subject: [PATCH 168/317] STYLE: globalMeshData: spelling

---
 src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.H | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.H b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.H
index a3530dc86c..3a3c234821 100644
--- a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.H
+++ b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -544,7 +544,7 @@ public:
                 const labelListList& globalEdgeSlaves() const;
                 const labelListList& globalEdgeTransformedSlaves() const;
                 const mapDistribute& globalEdgeSlavesMap() const;
-                //- Is my edge same orientation master edge
+                //- Is my edge same orientation as master edge
                 const PackedBoolList& globalEdgeOrientation() const;
 
             // Coupled point to boundary faces. These are uncoupled boundary

From 90943a387e7df3054c1321a9361a30a8d7dbc4ce Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Thu, 5 Apr 2012 12:54:50 +0100
Subject: [PATCH 169/317] STYLE: tetrahedron: date format

---
 src/OpenFOAM/meshes/primitiveShapes/tetrahedron/tetrahedron.H | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/OpenFOAM/meshes/primitiveShapes/tetrahedron/tetrahedron.H b/src/OpenFOAM/meshes/primitiveShapes/tetrahedron/tetrahedron.H
index 803cc7599e..1900aee387 100644
--- a/src/OpenFOAM/meshes/primitiveShapes/tetrahedron/tetrahedron.H
+++ b/src/OpenFOAM/meshes/primitiveShapes/tetrahedron/tetrahedron.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

From 50367fc3ae8a398edbf27d12d60c6a828c0e148b Mon Sep 17 00:00:00 2001
From: laurence <laurence>
Date: Thu, 5 Apr 2012 16:32:01 +0100
Subject: [PATCH 170/317] BUG: surfaceFeatureExtract: Create
 extendedFeatureEdgeMesh directory if not present

---
 .../surface/surfaceFeatureExtract/surfaceFeatureExtract.C       | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtract.C b/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtract.C
index 1494fadab0..5aae0ede0e 100644
--- a/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtract.C
+++ b/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtract.C
@@ -767,6 +767,8 @@ int main(int argc, char *argv[])
         Info<< nl << "Writing extendedFeatureEdgeMesh to "
             << feMesh.objectPath() << endl;
 
+        mkDir(feMesh.path());
+
         if (writeObj)
         {
             feMesh.writeObj(feMesh.path()/surfFileName.lessExt().name());

From bae7a57c7cc2bc18ba873c7b7941eb59aeddb777 Mon Sep 17 00:00:00 2001
From: laurence <laurence>
Date: Thu, 5 Apr 2012 16:34:10 +0100
Subject: [PATCH 171/317] ENH: cvMesh: Force lookup of specialiseFeaturePoints

---
 .../cvMesh/conformalVoronoiMesh/cvControls/cvControls.C         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cvControls/cvControls.C b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cvControls/cvControls.C
index 996aa71abf..15c82e64c5 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cvControls/cvControls.C
+++ b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cvControls/cvControls.C
@@ -61,7 +61,7 @@ Foam::cvControls::cvControls
 
     specialiseFeaturePoints_ = Switch
     (
-        surfDict.lookupOrDefault<Switch>("specialiseFeaturePoints", false)
+        surfDict.lookup("specialiseFeaturePoints")
     );
 
     surfaceSearchDistanceCoeff_ = readScalar

From 3c8d8c149e851c8b4c9effe43180c704fc8fc435 Mon Sep 17 00:00:00 2001
From: laurence <laurence>
Date: Thu, 5 Apr 2012 16:37:01 +0100
Subject: [PATCH 172/317] ENH: cvMesh: Allow lookup for baffle surfaces

---
 .../conformationSurfaces/conformationSurfaces.C             | 2 +-
 .../conformationSurfaces/conformationSurfaces.H             | 3 +++
 .../conformationSurfaces/conformationSurfacesI.H            | 6 ++++++
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformationSurfaces/conformationSurfaces.C b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformationSurfaces/conformationSurfaces.C
index e012b1fa44..c9ae92f498 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformationSurfaces/conformationSurfaces.C
+++ b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformationSurfaces/conformationSurfaces.C
@@ -249,6 +249,7 @@ Foam::conformationSurfaces::conformationSurfaces
 
     Info<< endl
         << "Testing for locationInMesh " << locationInMesh_ << endl;
+
     forAll(surfaces_, s)
     {
         const searchableSurface& surface(allGeometry_[surfaces_[s]]);
@@ -267,7 +268,6 @@ Foam::conformationSurfaces::conformationSurfaces
 
             referenceVolumeTypes_[s] = vTypes[0];
 
-
             Info<< "    is "
                 << searchableSurface::volumeTypeNames[referenceVolumeTypes_[s]]
                 << " surface " << surface.name()
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformationSurfaces/conformationSurfaces.H b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformationSurfaces/conformationSurfaces.H
index 9387f2e0f3..c1bdac76ba 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformationSurfaces/conformationSurfaces.H
+++ b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformationSurfaces/conformationSurfaces.H
@@ -303,6 +303,9 @@ public:
             //- Find which patch is closest to the point
             label findPatch(const point& pt) const;
 
+            //- Is the surface a baffle
+            inline bool isBaffle(const label index) const;
+
 
         // Write
 
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformationSurfaces/conformationSurfacesI.H b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformationSurfaces/conformationSurfacesI.H
index c773d21b46..a4a6595d31 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformationSurfaces/conformationSurfacesI.H
+++ b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformationSurfaces/conformationSurfacesI.H
@@ -62,4 +62,10 @@ const Foam::treeBoundBox& Foam::conformationSurfaces::globalBounds() const
 }
 
 
+bool Foam::conformationSurfaces::isBaffle(const label index) const
+{
+    return baffleSurfaces_[index];
+}
+
+
 // ************************************************************************* //

From 0c89fb1daa2955983c5c802f2d4a86c6a3702e3d Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Thu, 5 Apr 2012 16:45:49 +0100
Subject: [PATCH 173/317] ENH: motionSmoother: delete tet-basepoints after
 moving

---
 src/dynamicMesh/motionSmoother/motionSmoother.C | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/dynamicMesh/motionSmoother/motionSmoother.C b/src/dynamicMesh/motionSmoother/motionSmoother.C
index cace37690b..6542432aea 100644
--- a/src/dynamicMesh/motionSmoother/motionSmoother.C
+++ b/src/dynamicMesh/motionSmoother/motionSmoother.C
@@ -903,7 +903,9 @@ Foam::tmp<Foam::scalarField> Foam::motionSmoother::movePoints
         testSyncPositions(newPoints, 1E-6*mesh_.bounds().mag());
     }
 
-    tmp<scalarField> tsweptVol = mesh_.movePoints(newPoints);
+    // Move actual mesh points. Make sure to delete tetBasePtIs so it
+    // gets rebuilt.
+    tmp<scalarField> tsweptVol = mesh_.movePoints(newPoints, true);
 
     pp_.movePoints(mesh_.points());
 

From 70c9c27bdcf5d5529531e6d952a61068336909c5 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Thu, 5 Apr 2012 16:46:26 +0100
Subject: [PATCH 174/317] COMP: tetOverlapVolume: scoping error

---
 .../tetOverlapVolume/tetOverlapVolume.C                       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/sampling/meshToMeshInterpolation/tetOverlapVolume/tetOverlapVolume.C b/src/sampling/meshToMeshInterpolation/tetOverlapVolume/tetOverlapVolume.C
index bf6b050e4e..43061586de 100644
--- a/src/sampling/meshToMeshInterpolation/tetOverlapVolume/tetOverlapVolume.C
+++ b/src/sampling/meshToMeshInterpolation/tetOverlapVolume/tetOverlapVolume.C
@@ -51,9 +51,9 @@ Foam::scalar Foam::tetOverlapVolume::tetTetOverlapVol
     const tetPoints& tetB
 ) const
 {
-    tetIntersectionList insideTets;
+    tetPointRef::tetIntersectionList insideTets;
     label nInside = 0;
-    tetIntersectionList cutInsideTets;
+    tetPointRef::tetIntersectionList cutInsideTets;
     label nCutInside = 0;
 
     tetPointRef::storeOp inside(insideTets, nInside);

From abf262f008d81ce50fc39864ba560567c1c01328 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Thu, 5 Apr 2012 16:47:11 +0100
Subject: [PATCH 175/317] ENH: polyMesh: movePoints to optionally clear
 tetBasePt structure

---
 src/OpenFOAM/meshes/polyMesh/polyMesh.C | 13 +++++++++++--
 src/OpenFOAM/meshes/polyMesh/polyMesh.H |  8 ++++++--
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/src/OpenFOAM/meshes/polyMesh/polyMesh.C b/src/OpenFOAM/meshes/polyMesh/polyMesh.C
index 960e35ddd4..8877cdafcf 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyMesh.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyMesh.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -1092,7 +1092,8 @@ const Foam::pointField& Foam::polyMesh::oldPoints() const
 
 Foam::tmp<Foam::scalarField> Foam::polyMesh::movePoints
 (
-    const pointField& newPoints
+    const pointField& newPoints,
+    const bool deleteDemandDrivenData
 )
 {
     if (debug)
@@ -1146,6 +1147,14 @@ Foam::tmp<Foam::scalarField> Foam::polyMesh::movePoints
 
     // Force recalculation of all geometric data with new points
 
+    if (deleteDemandDrivenData)
+    {
+        // Remove the stored tet base points
+        tetBasePtIsPtr_.clear();
+        // Remove the cell tree
+        cellTreePtr_.clear();
+    }
+
     bounds_ = boundBox(points_);
     boundary_.movePoints(points_);
 
diff --git a/src/OpenFOAM/meshes/polyMesh/polyMesh.H b/src/OpenFOAM/meshes/polyMesh/polyMesh.H
index d67896744f..6c01333974 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyMesh.H
+++ b/src/OpenFOAM/meshes/polyMesh/polyMesh.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -442,7 +442,11 @@ public:
             }
 
             //- Move points, returns volumes swept by faces in motion
-            virtual tmp<scalarField> movePoints(const pointField&);
+            virtual tmp<scalarField> movePoints
+            (
+                const pointField&,
+                const bool deleteDemandDrivenData = false
+            );
 
             //- Reset motion
             void resetMotion() const;

From 5f6611356ef106042fbc1a5dd3de167875a22ba6 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Thu, 5 Apr 2012 16:50:37 +0100
Subject: [PATCH 176/317] ENH: pre-commit-hook: abort upon bad date.

---
 bin/tools/pre-commit-hook | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/bin/tools/pre-commit-hook b/bin/tools/pre-commit-hook
index 1a8ae0181a..551af76c6c 100755
--- a/bin/tools/pre-commit-hook
+++ b/bin/tools/pre-commit-hook
@@ -275,6 +275,7 @@ checkCopyright()
     year=$(date +%Y)
     echo "$hookName: check copyright ..." 1>&2
 
+    badFiles=$(
     for f in $fileList
     do
         startYear=`grep "Copyright.*OpenFOAM" $f | sed 's/[^0-9]*\([0-9]*\).*/\1/g'`
@@ -287,19 +288,24 @@ checkCopyright()
                 # Date is of type 2011-2012 OpenFOAM Foundation
                 if [ "$year" != "$endYear" ]
                 then
-                    echo "Updated copyright for: $f"
+                    echo "Updated copyright for: $f" 1>&2
+                    echo "$f"
                     sed -i "s/$startYear-$endYear OpenFOAM/$startYear-$year OpenFOAM/g" $f
                 fi
             else
                 # Date is of type 2011 OpenFOAM Foundation
                 if [ "$year" != "$startYear" ]
                 then
-                    echo "Updated copyright for: $f"
+                    echo "$f"
+                    echo "Updated copyright for: $f" 1>&2
                     sed -i "s/$startYear OpenFOAM/$startYear-$year OpenFOAM/g" $f
                 fi
             fi
         fi
     done
+    )
+
+    dieOnBadFiles "Some copyright dates were automatically updated; Please check these before pushing"
 }
 
 

From 76b9e64fee5d160b0924c670407e306533b98e8b Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Thu, 5 Apr 2012 17:50:41 +0100
Subject: [PATCH 177/317] dimensionedType: Removed temporary debug message

---
 src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.C | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.C b/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.C
index acaed52ac9..83f76cf8a3 100644
--- a/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.C
+++ b/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.C
@@ -128,8 +128,6 @@ dimensioned<Type>::dimensioned
     dimensions_(dimSet),
     value_(pTraits<Type>::zero)
 {
-    Info<< "dimensioned<Type>::dimensioned" << endl;
-
     token nextToken(is);
     is.putBack(nextToken);
 

From ed368b434ce7d3416200ce84fc11d346a9aee6c9 Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Thu, 5 Apr 2012 17:51:45 +0100
Subject: [PATCH 178/317] mixerVessel2D tutorials: Added missing topoSetDict

---
 .../mixerVessel2D/system/topoSetDict          | 32 +++++++++++++++++++
 .../mixerVessel2D/system/topoSetDict          | 32 +++++++++++++++++++
 2 files changed, 64 insertions(+)
 create mode 100644 tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/system/topoSetDict
 create mode 100644 tutorials/multiphase/twoPhaseEulerFoam/mixerVessel2D/system/topoSetDict

diff --git a/tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/system/topoSetDict b/tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/system/topoSetDict
new file mode 100644
index 0000000000..bf749449bf
--- /dev/null
+++ b/tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/system/topoSetDict
@@ -0,0 +1,32 @@
+/*--------------------------------*- 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    "system";
+    object      topoSetDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+actions
+(
+    {
+        name    rotor;
+        type    cellSet;
+        action  new;
+        source  zoneToCell;
+        sourceInfo
+        {
+            name rotor;
+        }
+    }
+);
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/mixerVessel2D/system/topoSetDict b/tutorials/multiphase/twoPhaseEulerFoam/mixerVessel2D/system/topoSetDict
new file mode 100644
index 0000000000..bf749449bf
--- /dev/null
+++ b/tutorials/multiphase/twoPhaseEulerFoam/mixerVessel2D/system/topoSetDict
@@ -0,0 +1,32 @@
+/*--------------------------------*- 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    "system";
+    object      topoSetDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+actions
+(
+    {
+        name    rotor;
+        type    cellSet;
+        action  new;
+        source  zoneToCell;
+        sourceInfo
+        {
+            name rotor;
+        }
+    }
+);
+
+// ************************************************************************* //

From 15911a90c08588d88dcbe906aa5ccd459a1096eb Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Tue, 10 Apr 2012 12:26:36 +0100
Subject: [PATCH 179/317] ENH: UPstream.C: use 2 scalars instead of
 user-defined data type

---
 src/Pstream/mpi/UPstream.C | 132 ++-----------------------------------
 1 file changed, 4 insertions(+), 128 deletions(-)

diff --git a/src/Pstream/mpi/UPstream.C b/src/Pstream/mpi/UPstream.C
index e5b2808ca6..3123aa4787 100644
--- a/src/Pstream/mpi/UPstream.C
+++ b/src/Pstream/mpi/UPstream.C
@@ -41,40 +41,6 @@ License
 #   define MPI_SCALAR MPI_DOUBLE
 #endif
 
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-namespace Foam
-{
-    typedef struct
-    {
-        scalar value;
-        label count;
-    } CountAndValue;
-
-    void reduceSum
-    (
-        void *in,
-        void *inOut,
-        int *len,
-        MPI_Datatype *dptr
-    )
-    {
-        CountAndValue* inPtr =
-            reinterpret_cast<CountAndValue*>(in);
-        CountAndValue* inOutPtr =
-            reinterpret_cast<CountAndValue*>(inOut);
-
-        for (int i=0; i< *len; ++i)
-        {
-            inOutPtr->value += inPtr->value;
-            inOutPtr->count += inPtr->count;
-            inPtr++;
-            inOutPtr++;
-        }
-    }
-}
-
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 // NOTE:
@@ -493,101 +459,11 @@ void Foam::sumReduce
     const int tag
 )
 {
-    static bool hasDataType_ = false;
-    static MPI_Datatype mesg_mpi_strct_;
-    static MPI_Op myOp_;
+    vector2D twoScalars(Value, scalar(Count));
+    reduce(twoScalars, sumOp<vector2D>());
 
-    if (Pstream::debug)
-    {
-        Pout<< "Foam::sumReduce : value:" << Value
-            << " count:" << Count << endl;
-    }
-
-    if (!UPstream::parRun())
-    {
-        return;
-    }
-
-    if (UPstream::nProcs() <= UPstream::nProcsSimpleSum)
-    {
-        reduce(Value, sumOp<scalar>(), tag);
-        reduce(Count, sumOp<label>(), tag);
-    }
-    else
-    {
-        CountAndValue in,out;
-
-        if (!hasDataType_)
-        {
-            int lengths[2];
-            lengths[0] = 1;
-            lengths[1] = 1;
-            MPI_Datatype types[2];
-            types[0] = MPI_DOUBLE;
-            types[1] = MPI_INT;
-            MPI_Aint addresses[2];
-            MPI_Address(&in.value, &addresses[0]);
-            MPI_Address(&in.count, &addresses[1]);
-            MPI_Aint offsets[2];
-            offsets[0] = 0;
-            offsets[1] = addresses[1]-addresses[0];
-
-            if
-            (
-                MPI_Type_create_struct
-                (
-                    2,
-                    lengths,
-                    offsets,
-                    types,
-                    &mesg_mpi_strct_
-                )
-            )
-            {
-                FatalErrorIn("Foam::sumReduce()")
-                    << "MPI_Type_create_struct" << abort(FatalError);
-            }
-            if (MPI_Type_commit(&mesg_mpi_strct_))
-            {
-                FatalErrorIn("Foam::sumReduce()")
-                    << "MPI_Type_commit" << abort(FatalError);
-            }
-            if (MPI_Op_create(reduceSum, true, &myOp_))
-            {
-                FatalErrorIn("Foam::sumReduce()")
-                    << "MPI_Op_create" << abort(FatalError);
-            }
-
-            hasDataType_ = true;
-        }
-
-        in.value = Value;
-        in.count = Count;
-        if
-        (
-            MPI_Allreduce
-            (
-                &in,
-                &out,
-                1,
-                mesg_mpi_strct_,
-                myOp_,
-                MPI_COMM_WORLD
-            )
-        )
-        {
-            FatalErrorIn("Foam::sumReduce(..)")
-                << "Problem." << abort(FatalError);
-        }
-        Value = out.value;
-        Count = out.count;
-    }
-
-    if (Pstream::debug)
-    {
-        Pout<< "Foam::reduce : reduced value:" << Value
-            << " reduced count:" << Count << endl;
-    }
+    Value = twoScalars.x();
+    Count = twoScalars.y();
 }
 
 

From ccb510e6ffb7287c1d6a53fa9e73ff83030d6572 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Tue, 10 Apr 2012 12:29:42 +0100
Subject: [PATCH 180/317] ENH: meshRefinement.C: no need to dump cell centres
 anymore with ParaFoam handling polys

---
 .../meshRefinement/meshRefinement.C           | 22 -------------------
 1 file changed, 22 deletions(-)

diff --git a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinement.C b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinement.C
index c2565fc670..e12394624b 100644
--- a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinement.C
+++ b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinement.C
@@ -2216,28 +2216,6 @@ void Foam::meshRefinement::dumpRefinementLevel() const
 
         pointRefLevel.write();
     }
-
-    // Dump cell centres
-    {
-        for (direction i=0; i<vector::nComponents; i++)
-        {
-            volScalarField cci
-            (
-                IOobject
-                (
-                    "cc" + word(vector::componentNames[i]),
-                    mesh_.time().timeName(),
-                    mesh_,
-                    IOobject::NO_READ,
-                    IOobject::NO_WRITE,
-                    false
-                ),
-                mesh_.C().component(i)
-            );
-
-            cci.write();
-        }
-    }
 }
 
 

From 16ee9174f9c4a70263010575867ad543e215fe67 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Tue, 10 Apr 2012 12:30:38 +0100
Subject: [PATCH 181/317] ENH: vtkUnstructuredReader: handle more vtk file
 types

---
 src/fileFormats/vtk/vtkUnstructuredReader.C | 20 ++++++++++++++++----
 src/fileFormats/vtk/vtkUnstructuredReader.H |  8 +++++++-
 2 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/src/fileFormats/vtk/vtkUnstructuredReader.C b/src/fileFormats/vtk/vtkUnstructuredReader.C
index 049f68f89b..5bb8b8d8f9 100644
--- a/src/fileFormats/vtk/vtkUnstructuredReader.C
+++ b/src/fileFormats/vtk/vtkUnstructuredReader.C
@@ -36,14 +36,18 @@ defineTypeNameAndDebug(Foam::vtkUnstructuredReader, 0);
 
 template<>
 const char*
-Foam::NamedEnum<Foam::vtkUnstructuredReader::vtkDataType, 4>::names[] =
+Foam::NamedEnum<Foam::vtkUnstructuredReader::vtkDataType, 8>::names[] =
 {
     "int",
+    "unsigned_int",
+    "long",
+    "unsigned_long",
     "float",
+    "double",
     "string",
     "vtkIdType"
 };
-const Foam::NamedEnum<Foam::vtkUnstructuredReader::vtkDataType, 4>
+const Foam::NamedEnum<Foam::vtkUnstructuredReader::vtkDataType, 8>
 Foam::vtkUnstructuredReader::vtkDataTypeNames;
 
 
@@ -385,6 +389,9 @@ void Foam::vtkUnstructuredReader::readField
     switch (vtkDataTypeNames[dataType])
     {
         case VTK_INT:
+        case VTK_UINT:
+        case VTK_LONG:
+        case VTK_ULONG:
         case VTK_ID:
         {
             autoPtr<labelIOField> fieldVals
@@ -406,6 +413,7 @@ void Foam::vtkUnstructuredReader::readField
         break;
 
         case VTK_FLOAT:
+        case VTK_DOUBLE:
         {
             autoPtr<scalarIOField> fieldVals
             (
@@ -627,7 +635,7 @@ void Foam::vtkUnstructuredReader::read(ISstream& inFile)
             }
 
             word primitiveTag(inFile);
-            if (primitiveTag != "float")
+            if (primitiveTag != "float" && primitiveTag != "double")
             {
                 FatalIOErrorIn("vtkUnstructuredReader::read(..)", inFile)
                     << "Expected 'float' entry but found "
@@ -809,7 +817,11 @@ void Foam::vtkUnstructuredReader::read(ISstream& inFile)
                 3*wantedSize
             );
 
-            if (vtkDataTypeNames[dataType] == VTK_FLOAT)
+            if
+            (
+                vtkDataTypeNames[dataType] == VTK_FLOAT
+             || vtkDataTypeNames[dataType] == VTK_DOUBLE
+            )
             {
                 objectRegistry::iterator iter = reg.find(dataName);
                 scalarField s(*dynamic_cast<const scalarField*>(iter()));
diff --git a/src/fileFormats/vtk/vtkUnstructuredReader.H b/src/fileFormats/vtk/vtkUnstructuredReader.H
index 201012eaec..e31bfb0d41 100644
--- a/src/fileFormats/vtk/vtkUnstructuredReader.H
+++ b/src/fileFormats/vtk/vtkUnstructuredReader.H
@@ -28,6 +28,8 @@ Description
     Reader for vtk unstructured_grid legacy files. Supports single CELLS, POINTS
     etc. entry only.
 
+    - all integer types (int, unsigned_int, long etc.) become Foam::label
+    - all real types (float, double) become Foam::scalar
     - POINTS becomes OpenFOAM points
     - CELLS gets split into OpenFOAM
         - cells
@@ -69,12 +71,16 @@ public:
         enum vtkDataType
         {
             VTK_INT,
+            VTK_UINT,
+            VTK_LONG,
+            VTK_ULONG,
             VTK_FLOAT,
+            VTK_DOUBLE,
             VTK_STRING,
             VTK_ID
         };
 
-        static const NamedEnum<vtkDataType, 4> vtkDataTypeNames;
+        static const NamedEnum<vtkDataType, 8> vtkDataTypeNames;
 
 
         //- Enumeration defining the vtk dataset types

From 5dce1d372fdbe40fe974b1563acfdf218be7b52b Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Tue, 10 Apr 2012 12:31:26 +0100
Subject: [PATCH 182/317] ENH: polyMeshIO: clear storage before reading points;
 added check on sizes

---
 src/OpenFOAM/meshes/polyMesh/polyMeshIO.C | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/src/OpenFOAM/meshes/polyMesh/polyMeshIO.C b/src/OpenFOAM/meshes/polyMesh/polyMeshIO.C
index ea3b05f0ca..a296fd336a 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyMeshIO.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyMeshIO.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -407,9 +407,12 @@ Foam::polyMesh::readUpdateState Foam::polyMesh::readUpdate()
 
         clearGeom();
 
-        points_.instance() = pointsInst;
 
-        points_ = pointIOField
+        label nOldPoints = points_.size();
+
+        points_.clear();
+
+        pointIOField newPoints
         (
             IOobject
             (
@@ -423,6 +426,19 @@ Foam::polyMesh::readUpdateState Foam::polyMesh::readUpdate()
             )
         );
 
+        if (nOldPoints != 0 && nOldPoints != newPoints.size())
+        {
+            FatalErrorIn("polyMesh::readUpdate()")
+                << "Point motion detected but number of points "
+                << newPoints.size() << " in "
+                << newPoints.objectPath() << " does not correspond to "
+                << " current " << nOldPoints
+                << exit(FatalError);
+        }
+
+        points_.transfer(newPoints);
+        points_.instance() = pointsInst;
+
         // Derived info
         bounds_ = boundBox(points_);
 

From bdfbea228ca31b56cddef9cc2caefdfcdc62d890 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Tue, 10 Apr 2012 12:33:45 +0100
Subject: [PATCH 183/317] STYLE: snappyHexMeshDict, surfaceMeshTriangulate:
 corrected comment

---
 .../utilities/mesh/generation/snappyHexMesh/snappyHexMeshDict | 3 ++-
 .../surface/surfaceMeshTriangulate/surfaceMeshTriangulate.C   | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMeshDict b/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMeshDict
index 1ca6b3f29a..0e760387eb 100644
--- a/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMeshDict
+++ b/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMeshDict
@@ -158,7 +158,8 @@ castellatedMeshControls
             //      internal : keep them as internal faces (default)
             //      baffle   : create baffles from them. This gives more
             //                 freedom in mesh motion
-            //      boundary : create loose-standing boundary faces.
+            //      boundary : create free-standing boundary faces (baffles
+            //                 but without the shared points)
             //faceType internal;
         }
     }
diff --git a/applications/utilities/surface/surfaceMeshTriangulate/surfaceMeshTriangulate.C b/applications/utilities/surface/surfaceMeshTriangulate/surfaceMeshTriangulate.C
index 55f01f1e2c..a3cc3221cd 100644
--- a/applications/utilities/surface/surfaceMeshTriangulate/surfaceMeshTriangulate.C
+++ b/applications/utilities/surface/surfaceMeshTriangulate/surfaceMeshTriangulate.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -312,7 +312,7 @@ int main(int argc, char *argv[])
 
             triSurface allSurf(allFaces, allPatches, allPoints);
 
-            // Cleanup (which does point merge as well
+            // Cleanup (which does point merge as well)
             allSurf.cleanup(false);
 
             // Write surface mesh

From 868c4af0c2c150fdb3b34ac586474c862de0eb0c Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Tue, 10 Apr 2012 12:34:15 +0100
Subject: [PATCH 184/317] BUG: cvMesh: build cvMeshSurfaceSimplify through
 Allwmake

---
 applications/utilities/mesh/generation/cvMesh/Allwmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/applications/utilities/mesh/generation/cvMesh/Allwmake b/applications/utilities/mesh/generation/cvMesh/Allwmake
index 2a998cb690..eb453138ce 100755
--- a/applications/utilities/mesh/generation/cvMesh/Allwmake
+++ b/applications/utilities/mesh/generation/cvMesh/Allwmake
@@ -4,7 +4,7 @@ set -x
 
 wmake libso conformalVoronoiMesh
 wmake
-wmake cvMeshSurfaceSimplify
 wmake cvMeshBackgroundMesh
+(cd cvMeshSurfaceSimplify && ./Allwmake)
 
 # ----------------------------------------------------------------- end-of-file

From 14703be717661b8b2b396f1e06da4ce41f7025d1 Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Tue, 10 Apr 2012 12:35:01 +0100
Subject: [PATCH 185/317] ENH: Added Allwmake script for sprayFoam solvers

---
 applications/solvers/lagrangian/sprayFoam/Allwmake | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100755 applications/solvers/lagrangian/sprayFoam/Allwmake

diff --git a/applications/solvers/lagrangian/sprayFoam/Allwmake b/applications/solvers/lagrangian/sprayFoam/Allwmake
new file mode 100755
index 0000000000..542509db74
--- /dev/null
+++ b/applications/solvers/lagrangian/sprayFoam/Allwmake
@@ -0,0 +1,9 @@
+#!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
+set -x
+
+wmake
+
+wmake sprayEngineFoam
+
+# ----------------------------------------------------------------- end-of-file

From 2afe6a95c60354d3d8ed046cd8ab198fa123f9c0 Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Tue, 10 Apr 2012 14:23:13 +0100
Subject: [PATCH 186/317] BUG: Corrected re-read of under-relaxation factors in
 fvSolution

---
 src/OpenFOAM/matrices/solution/solution.C | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/OpenFOAM/matrices/solution/solution.C b/src/OpenFOAM/matrices/solution/solution.C
index dde12a8553..c54a2a77fa 100644
--- a/src/OpenFOAM/matrices/solution/solution.C
+++ b/src/OpenFOAM/matrices/solution/solution.C
@@ -65,6 +65,8 @@ void Foam::solution::read(const dictionary& dict)
         else
         {
             // backwards compatibility
+            fieldRelaxDict_.clear();
+
             const wordList entryNames(relaxDict.toc());
             forAll(entryNames, i)
             {

From 2dd3db1384c1c5751f84ba90b18338dc1bd63f4e Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Tue, 10 Apr 2012 14:27:42 +0100
Subject: [PATCH 187/317] STYLE: Updated copyright year

---
 src/OpenFOAM/matrices/solution/solution.C | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/OpenFOAM/matrices/solution/solution.C b/src/OpenFOAM/matrices/solution/solution.C
index c54a2a77fa..50eb2fb96c 100644
--- a/src/OpenFOAM/matrices/solution/solution.C
+++ b/src/OpenFOAM/matrices/solution/solution.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

From c3a728b2ab6113f7094741475661bacb71a4b9dd Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Thu, 12 Apr 2012 11:05:58 +0100
Subject: [PATCH 188/317] OStringStream: Corrected comment

---
 src/OpenFOAM/db/IOstreams/StringStreams/OStringStream.H | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/OpenFOAM/db/IOstreams/StringStreams/OStringStream.H b/src/OpenFOAM/db/IOstreams/StringStreams/OStringStream.H
index 449e4fb5a4..a0228359c9 100644
--- a/src/OpenFOAM/db/IOstreams/StringStreams/OStringStream.H
+++ b/src/OpenFOAM/db/IOstreams/StringStreams/OStringStream.H
@@ -116,7 +116,7 @@ public:
 
         // Edit
 
-            //- Clear the OStringStream
+            //- Rewind the OStringStream
             void rewind()
             {
 #               if __GNUC__ < 4 && __GNUC_MINOR__ < 4

From 5a4d3ccd2ee0d929d868515ef2ba7aab162b7e5a Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Thu, 12 Apr 2012 11:06:37 +0100
Subject: [PATCH 189/317] OStringStream: Updated header

---
 src/OpenFOAM/db/IOstreams/StringStreams/OStringStream.H | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/OpenFOAM/db/IOstreams/StringStreams/OStringStream.H b/src/OpenFOAM/db/IOstreams/StringStreams/OStringStream.H
index a0228359c9..57a789bbcf 100644
--- a/src/OpenFOAM/db/IOstreams/StringStreams/OStringStream.H
+++ b/src/OpenFOAM/db/IOstreams/StringStreams/OStringStream.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -119,11 +119,11 @@ public:
             //- Rewind the OStringStream
             void rewind()
             {
-#               if __GNUC__ < 4 && __GNUC_MINOR__ < 4
+                #if __GNUC__ < 4 && __GNUC_MINOR__ < 4
                 stdStream().rdbuf()->pubsetbuf(" ", 1);
-#               else
+                #else
                 stdStream().rdbuf()->pubseekpos(0);
-#               endif
+                #endif
             }
 
 

From 25504bf8562b6a98eeab5bf4b72745888e92b7d0 Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Thu, 12 Apr 2012 11:07:47 +0100
Subject: [PATCH 190/317] Settings and wmake: Updated the use of
 WM_COMPILER_LIB_ARCH to set the library path

---
 etc/config/settings.csh           | 52 ++++++++++++++++++-------------
 etc/config/settings.sh            | 51 ++++++++++++++++--------------
 wmake/rules/General/mplibMPICH    |  2 +-
 wmake/rules/General/mplibMPICH-GM |  2 +-
 wmake/rules/General/mplibOPENMPI  |  2 +-
 5 files changed, 62 insertions(+), 47 deletions(-)

diff --git a/etc/config/settings.csh b/etc/config/settings.csh
index 179d145140..94e5618bff 100644
--- a/etc/config/settings.csh
+++ b/etc/config/settings.csh
@@ -41,6 +41,9 @@ alias _foamAddMan 'setenv MANPATH \!*\:${MANPATH}'
 # Set environment variables according to system type
 setenv WM_ARCH `uname -s`
 
+# Default WM_COMPILER_LIB_ARCH for 32bit
+setenv WM_COMPILER_LIB_ARCH
+
 switch ($WM_ARCH)
 case Linux:
     setenv WM_ARCH linux
@@ -269,12 +272,7 @@ case ThirdParty:
         _foamAddPath    $gccDir/bin
 
         # add compiler libraries to run-time environment
-        # 64-bit needs lib64, but 32-bit needs lib (not lib32)
-        if ($WM_ARCH_OPTION == 64 && $?WM_COMPILER_LIB_ARCH) then
-            _foamAddLib     $gccDir/lib$WM_COMPILER_LIB_ARCH
-        else
-            _foamAddLib     $gccDir/lib
-        endif
+        _foamAddLib     $gccDir/lib$WM_COMPILER_LIB_ARCH
 
         # add gmp/mpfr libraries to run-time environment
         _foamAddLib     $gmpDir/lib
@@ -371,21 +369,6 @@ unset boost_version cgal_version
 unsetenv MPI_ARCH_PATH MPI_HOME FOAM_MPI_LIBBIN
 
 switch ("$WM_MPLIB")
-case OPENMPI:
-    setenv FOAM_MPI openmpi-1.5.4
-    # optional configuration tweaks:
-    _foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config/openmpi.csh`
-
-    setenv MPI_ARCH_PATH $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$FOAM_MPI
-
-    # Tell OpenMPI where to find its install directory
-    setenv OPAL_PREFIX $MPI_ARCH_PATH
-
-    _foamAddPath    $MPI_ARCH_PATH/bin
-    _foamAddLib     $MPI_ARCH_PATH/lib
-    _foamAddMan     $MPI_ARCH_PATH/share/man
-    breaksw
-
 case SYSTEMOPENMPI:
     # Use the system installed openmpi, get library directory via mpicc
     setenv FOAM_MPI openmpi-system
@@ -410,13 +393,36 @@ case SYSTEMOPENMPI:
     unset libDir
     breaksw
 
+case OPENMPI:
+    setenv FOAM_MPI openmpi-1.5.4
+    # optional configuration tweaks:
+    _foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config/openmpi.csh`
+
+    setenv MPI_ARCH_PATH $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$FOAM_MPI
+
+    # Tell OpenMPI where to find its install directory
+    setenv OPAL_PREFIX $MPI_ARCH_PATH
+
+    _foamAddPath    $MPI_ARCH_PATH/bin
+
+    # 64-bit on OpenSuSE 12.1 uses lib64 others use lib
+    _foamAddLib     $MPI_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH
+    _foamAddLib     $MPI_ARCH_PATH/lib
+
+    _foamAddMan     $MPI_ARCH_PATH/share/man
+    breaksw
+
 case MPICH:
     setenv FOAM_MPI mpich2-1.1.1p1
     setenv MPI_HOME $WM_THIRD_PARTY_DIR/$FOAM_MPI
     setenv MPI_ARCH_PATH $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$FOAM_MPI
 
     _foamAddPath    $MPI_ARCH_PATH/bin
+
+    # 64-bit on OpenSuSE 12.1 uses lib64 others use lib
+    _foamAddLib     $MPI_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH
     _foamAddLib     $MPI_ARCH_PATH/lib
+
     _foamAddMan     $MPI_ARCH_PATH/share/man
     breaksw
 
@@ -427,7 +433,11 @@ case MPICH-GM:
     setenv GM_LIB_PATH /opt/gm/lib64
 
     _foamAddPath    $MPI_ARCH_PATH/bin
+
+    # 64-bit on OpenSuSE 12.1 uses lib64 others use lib
+    _foamAddLib     $MPI_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH
     _foamAddLib     $MPI_ARCH_PATH/lib
+
     _foamAddLib     $GM_LIB_PATH
     breaksw
 
diff --git a/etc/config/settings.sh b/etc/config/settings.sh
index 95c7046ec7..dc39c480e1 100644
--- a/etc/config/settings.sh
+++ b/etc/config/settings.sh
@@ -294,14 +294,7 @@ OpenFOAM | ThirdParty)
         _foamAddPath    $gccDir/bin
 
         # add compiler libraries to run-time environment
-        # 64-bit needs lib64, but 32-bit needs lib (not lib32)
-        if [ "$WM_ARCH_OPTION" = 64 ]
-        then
-            _foamAddLib     $gccDir/lib$WM_COMPILER_LIB_ARCH
-        else
-            _foamAddLib     $gccDir/lib
-        fi
-
+        _foamAddLib     $gccDir/lib$WM_COMPILER_LIB_ARCH
 
         # add gmp/mpfr libraries to run-time environment
         _foamAddLib     $gmpDir/lib
@@ -401,21 +394,6 @@ unset boost_version cgal_version
 unset MPI_ARCH_PATH MPI_HOME FOAM_MPI_LIBBIN
 
 case "$WM_MPLIB" in
-OPENMPI)
-    export FOAM_MPI=openmpi-1.5.4
-    # optional configuration tweaks:
-    _foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config/openmpi.sh`
-
-    export MPI_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$FOAM_MPI
-
-    # Tell OpenMPI where to find its install directory
-    export OPAL_PREFIX=$MPI_ARCH_PATH
-
-    _foamAddPath    $MPI_ARCH_PATH/bin
-    _foamAddLib     $MPI_ARCH_PATH/lib
-    _foamAddMan     $MPI_ARCH_PATH/share/man
-    ;;
-
 SYSTEMOPENMPI)
     # Use the system installed openmpi, get library directory via mpicc
     export FOAM_MPI=openmpi-system
@@ -441,13 +419,36 @@ SYSTEMOPENMPI)
     unset libDir
     ;;
 
+OPENMPI)
+    export FOAM_MPI=openmpi-1.5.4
+    # optional configuration tweaks:
+    _foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config/openmpi.sh`
+
+    export MPI_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$FOAM_MPI
+
+    # Tell OpenMPI where to find its install directory
+    export OPAL_PREFIX=$MPI_ARCH_PATH
+
+    _foamAddPath    $MPI_ARCH_PATH/bin
+
+    # 64-bit on OpenSuSE 12.1 uses lib64 others use lib
+    _foamAddLib     $MPI_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH
+    _foamAddLib     $MPI_ARCH_PATH/lib
+
+    _foamAddMan     $MPI_ARCH_PATH/share/man
+    ;;
+
 MPICH)
     export FOAM_MPI=mpich2-1.1.1p1
     export MPI_HOME=$WM_THIRD_PARTY_DIR/$FOAM_MPI
     export MPI_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$FOAM_MPI
 
     _foamAddPath    $MPI_ARCH_PATH/bin
+
+    # 64-bit on OpenSuSE 12.1 uses lib64 others use lib
+    _foamAddLib     $MPI_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH
     _foamAddLib     $MPI_ARCH_PATH/lib
+
     _foamAddMan     $MPI_ARCH_PATH/share/man
     ;;
 
@@ -458,7 +459,11 @@ MPICH-GM)
     export GM_LIB_PATH=/opt/gm/lib64
 
     _foamAddPath    $MPI_ARCH_PATH/bin
+
+    # 64-bit on OpenSuSE 12.1 uses lib64 others use lib
+    _foamAddLib     $MPI_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH
     _foamAddLib     $MPI_ARCH_PATH/lib
+
     _foamAddLib     $GM_LIB_PATH
     ;;
 
diff --git a/wmake/rules/General/mplibMPICH b/wmake/rules/General/mplibMPICH
index e5a38a8e38..0abee120ca 100644
--- a/wmake/rules/General/mplibMPICH
+++ b/wmake/rules/General/mplibMPICH
@@ -1,3 +1,3 @@
 PFLAGS     = -DMPICH_SKIP_MPICXX
 PINC       = -I$(MPI_ARCH_PATH)/include
-PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpich -lrt
+PLIBS      = -L$(MPI_ARCH_PATH)/lib$(WM_COMPILER_LIB_ARCH) -L$(MPI_ARCH_PATH)/lib -lmpich -lrt
diff --git a/wmake/rules/General/mplibMPICH-GM b/wmake/rules/General/mplibMPICH-GM
index 88493ebc70..4c97ec851f 100644
--- a/wmake/rules/General/mplibMPICH-GM
+++ b/wmake/rules/General/mplibMPICH-GM
@@ -1,3 +1,3 @@
 PFLAGS     =
 PINC       = -I$(MPI_ARCH_PATH)/include
-PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpich -L$(GM_LIB_PATH) -lgm
+PLIBS      = -L$(MPI_ARCH_PATH)/lib$(WM_COMPILER_LIB_ARCH) -L$(MPI_ARCH_PATH)/lib -lmpich -L$(GM_LIB_PATH) -lgm
diff --git a/wmake/rules/General/mplibOPENMPI b/wmake/rules/General/mplibOPENMPI
index 834d2d3e22..c888c38556 100644
--- a/wmake/rules/General/mplibOPENMPI
+++ b/wmake/rules/General/mplibOPENMPI
@@ -1,3 +1,3 @@
 PFLAGS     = -DOMPI_SKIP_MPICXX
 PINC       = -I$(MPI_ARCH_PATH)/include
-PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpi
+PLIBS      = -L$(MPI_ARCH_PATH)/lib$(WM_COMPILER_LIB_ARCH) -L$(MPI_ARCH_PATH)/lib -lmpi

From bc1477592d44a4dc276853bf5ed4c0ce1487eb71 Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Thu, 12 Apr 2012 16:49:28 +0100
Subject: [PATCH 191/317] ENH: Updates to rotorDiskSource momentum source -
 code restructuring - better spefication of rotor axis direction (uses
 pointAbove) - run-time selectable trim models - new rotor trimming model:
 targetForce

---
 src/fieldSources/Make/files                   |   6 +-
 .../rotorDiskSource/rotorDiskSource.C         | 218 +++++++++++++---
 .../rotorDiskSource/rotorDiskSource.H         |  71 +++---
 .../rotorDiskSource/rotorDiskSourceI.H        |  41 +++
 .../rotorDiskSourceTemplates.C                | 150 -----------
 .../trimModel/fixed/fixedTrim.C               |  96 +++++++
 .../trimModel/fixed/fixedTrim.H               |  95 +++++++
 .../trimModel/targetForce/targetForceTrim.C   | 234 ++++++++++++++++++
 .../trimModel/targetForce/targetForceTrim.H   | 126 ++++++++++
 .../trimModel/trimModel/trimModel.C           |  67 +++++
 .../trimModel/trimModel/trimModel.H           | 135 ++++++++++
 .../trimModel/trimModel/trimModelNew.C        |  59 +++++
 12 files changed, 1080 insertions(+), 218 deletions(-)
 create mode 100644 src/fieldSources/basicSource/rotorDiskSource/rotorDiskSourceI.H
 create mode 100644 src/fieldSources/basicSource/rotorDiskSource/trimModel/fixed/fixedTrim.C
 create mode 100644 src/fieldSources/basicSource/rotorDiskSource/trimModel/fixed/fixedTrim.H
 create mode 100644 src/fieldSources/basicSource/rotorDiskSource/trimModel/targetForce/targetForceTrim.C
 create mode 100644 src/fieldSources/basicSource/rotorDiskSource/trimModel/targetForce/targetForceTrim.H
 create mode 100644 src/fieldSources/basicSource/rotorDiskSource/trimModel/trimModel/trimModel.C
 create mode 100644 src/fieldSources/basicSource/rotorDiskSource/trimModel/trimModel/trimModel.H
 create mode 100644 src/fieldSources/basicSource/rotorDiskSource/trimModel/trimModel/trimModelNew.C

diff --git a/src/fieldSources/Make/files b/src/fieldSources/Make/files
index 0df9defae4..1db2de4b5e 100644
--- a/src/fieldSources/Make/files
+++ b/src/fieldSources/Make/files
@@ -15,6 +15,10 @@ basicSource/rotorDiskSource/profileModel/profileModel.C
 basicSource/rotorDiskSource/profileModel/profileModelList.C
 basicSource/rotorDiskSource/profileModel/lookup/lookupProfile.C
 basicSource/rotorDiskSource/profileModel/series/seriesProfile.C
+basicSource/rotorDiskSource/trimModel/trimModel/trimModel.C
+basicSource/rotorDiskSource/trimModel/trimModel/trimModelNew.C
+basicSource/rotorDiskSource/trimModel/fixed/fixedTrim.C
+basicSource/rotorDiskSource/trimModel/targetForce/targetForceTrim.C
 
 basicSource/actuationDiskSource/actuationDiskSource.C
 basicSource/radialActuationDiskSource/radialActuationDiskSource.C
@@ -25,4 +29,4 @@ $(interRegion)/constantHeatTransfer/constantHeatTransfer.C
 $(interRegion)/tabulatedHeatTransfer/tabulatedHeatTransfer.C
 $(interRegion)/variableHeatTransfer/variableHeatTransfer.C
 
-LIB = $(FOAM_LIBBIN)/libfieldSources
\ No newline at end of file
+LIB = $(FOAM_LIBBIN)/libfieldSources
diff --git a/src/fieldSources/basicSource/rotorDiskSource/rotorDiskSource.C b/src/fieldSources/basicSource/rotorDiskSource/rotorDiskSource.C
index c2a3511485..f3fe86843d 100644
--- a/src/fieldSources/basicSource/rotorDiskSource/rotorDiskSource.C
+++ b/src/fieldSources/basicSource/rotorDiskSource/rotorDiskSource.C
@@ -26,8 +26,8 @@ License
 #include "rotorDiskSource.H"
 #include "addToRunTimeSelectionTable.H"
 #include "mathematicalConstants.H"
+#include "trimModel.H"
 #include "unitConversion.H"
-#include "geometricOneField.H"
 #include "fvMatrices.H"
 #include "syncTools.H"
 
@@ -123,6 +123,8 @@ void Foam::rotorDiskSource::checkData()
 
 void Foam::rotorDiskSource::setFaceArea(vector& axis, const bool correct)
 {
+    area_ = 0.0;
+
     static const scalar tol = 0.8;
 
     const label nInternalFaces = mesh_.nInternalFaces();
@@ -299,12 +301,15 @@ void Foam::rotorDiskSource::createCoordinateSystem()
             reduce(axis, maxMagSqrOp<vector>());
             axis /= mag(axis);
 
-            // axis direction is somewhat arbitrary - check if user needs
-            // needs to reverse
-            bool reverse(readBool(coeffs_.lookup("reverseAxis")));
-            if (reverse)
+            // correct the axis direction using a point above the rotor
             {
-                axis *= -1.0;
+                vector pointAbove(coeffs_.lookup("pointAbove"));
+                vector dir = pointAbove - origin;
+                dir /= mag(dir);
+                if ((dir & axis) < 0)
+                {
+                    axis *= -1.0;
+                }
             }
 
             coeffs_.lookup("refDirection") >> refDir;
@@ -380,9 +385,6 @@ void Foam::rotorDiskSource::constructGeometry()
         scalar cPos = cos(beta);
         scalar sPos = sin(beta);
         invR_[i] = tensor(cPos, 0.0, -sPos, 0.0, 1.0, 0.0, sPos, 0.0, cPos);
-
-        // geometric angle of attack - not including twist [radians]
-        alphag_[i] = trim_.alphaC + trim_.A*cos(psi) + trim_.B*sin(psi);
     }
 }
 
@@ -444,13 +446,12 @@ Foam::rotorDiskSource::rotorDiskSource
     inletVelocity_(vector::zero),
     tipEffect_(1.0),
     flap_(),
-    trim_(),
+    trim_(trimModel::New(*this, coeffs_)),
     blade_(coeffs_.subDict("blade")),
     profiles_(coeffs_.subDict("profiles")),
     x_(cells_.size(), vector::zero),
     R_(cells_.size(), I),
     invR_(cells_.size(), I),
-    alphag_(cells_.size(), 0.0),
     area_(cells_.size(), 0.0),
     coordSys_(false),
     rMax_(0.0)
@@ -467,34 +468,179 @@ Foam::rotorDiskSource::~rotorDiskSource()
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
+void Foam::rotorDiskSource::calculate
+(
+    const vectorField& U,
+    const scalarField& alphag,
+    vectorField& force,
+    const bool divideVolume,
+    const bool output
+) const
+{
+    tmp<volScalarField> trho;
+    if (rhoName_ != "none")
+    {
+        trho = mesh_.lookupObject<volScalarField>(rhoName_);
+    }
+
+    const scalarField& V = mesh_.V();
+
+
+    // logging info
+    scalar dragEff = 0.0;
+    scalar liftEff = 0.0;
+    scalar AOAmin = GREAT;
+    scalar AOAmax = -GREAT;
+
+    forAll(cells_, i)
+    {
+        if (area_[i] > ROOTVSMALL)
+        {
+            const label cellI = cells_[i];
+
+            const scalar radius = x_[i].x();
+
+            // velocity in local cylindrical reference frame
+            vector Uc = coordSys_.localVector(U[cellI]);
+
+            // apply correction in local system due to coning
+            Uc = R_[i] & Uc;
+
+            // set radial component of velocity to zero
+            Uc.x() = 0.0;
+
+            // remove blade linear velocity from blade normal component
+            Uc.y() -= radius*omega_;
+
+            // determine blade data for this radius
+            // i1 = index of upper bound data point in blade list
+            scalar twist = 0.0;
+            scalar chord = 0.0;
+            label i1 = -1;
+            label i2 = -1;
+            scalar invDr = 0.0;
+            blade_.interpolate(radius, twist, chord, i1, i2, invDr);
+
+            // effective angle of attack
+            scalar alphaEff =
+                mathematical::pi + atan2(Uc.z(), Uc.y()) - (alphag[i] + twist);
+
+            if (alphaEff > mathematical::pi)
+            {
+                alphaEff -= mathematical::twoPi;
+            }
+            if (alphaEff < -mathematical::pi)
+            {
+                alphaEff += mathematical::twoPi;
+            }
+
+            AOAmin = min(AOAmin, alphaEff);
+            AOAmax = max(AOAmax, alphaEff);
+
+            // determine profile data for this radius and angle of attack
+            const label profile1 = blade_.profileID()[i1];
+            const label profile2 = blade_.profileID()[i2];
+
+            scalar Cd1 = 0.0;
+            scalar Cl1 = 0.0;
+            profiles_[profile1].Cdl(alphaEff, Cd1, Cl1);
+
+            scalar Cd2 = 0.0;
+            scalar Cl2 = 0.0;
+            profiles_[profile2].Cdl(alphaEff, Cd2, Cl2);
+
+            scalar Cd = invDr*(Cd2 - Cd1) + Cd1;
+            scalar Cl = invDr*(Cl2 - Cl1) + Cl1;
+
+            // apply tip effect for blade lift
+            scalar tipFactor = neg(radius/rMax_ - tipEffect_);
+
+            // calculate forces perpendicular to blade
+            scalar pDyn = 0.5*magSqr(Uc);
+            if (trho.valid())
+            {
+                pDyn *= trho()[cellI];
+            }
+
+            scalar f = pDyn*chord*nBlades_*area_[i]/mathematical::twoPi;
+            vector localForce = vector(0.0, f*Cd, tipFactor*f*Cl);
+
+            // convert force from local coning system into rotor cylindrical
+            localForce = invR_[i] & localForce;
+
+            // accumulate forces
+            dragEff += localForce.y();
+            liftEff += localForce.z();
+
+            // convert force to global cartesian co-ordinate system
+            force[cellI] = coordSys_.globalVector(localForce);
+
+            if (divideVolume)
+            {
+                force[cellI] /= V[cellI];
+            }
+        }
+    }
+
+
+    if (output)
+    {
+        reduce(AOAmin, minOp<scalar>());
+        reduce(AOAmax, maxOp<scalar>());
+        reduce(dragEff, sumOp<scalar>());
+        reduce(liftEff, sumOp<scalar>());
+
+        Info<< type() << " output:" << nl
+            << "    min/max(AOA)   = " << radToDeg(AOAmin) << ", "
+            << radToDeg(AOAmax) << nl
+            << "    Effective drag = " << dragEff << nl
+            << "    Effective lift = " << liftEff << endl;
+    }
+}
+
+
 void Foam::rotorDiskSource::addSup(fvMatrix<vector>& eqn, const label fieldI)
 {
-    // add source to rhs of eqn
-
-    const volVectorField& U = eqn.psi();
-
+    dimensionSet dims = dimless;
     if (eqn.dimensions() == dimForce)
     {
         coeffs_.lookup("rhoName") >> rhoName_;
-
-        const volScalarField& rho =
-            mesh_.lookupObject<volScalarField>(rhoName_);
-
-        eqn -= calculateForces
-            (
-                rho.internalField(),
-                inflowVelocity(U),
-                dimForce/dimVolume
-            );
+        dims.reset(dimForce/dimVolume);
     }
     else
     {
-        eqn -= calculateForces
-            (
-                oneField(),
-                inflowVelocity(U),
-                dimForce/dimVolume/dimDensity
-            );
+        dims.reset(dimForce/dimVolume/dimDensity);
+    }
+
+    volVectorField force
+    (
+        IOobject
+        (
+            "rotorForce",
+            mesh_.time().timeName(),
+            mesh_,
+            IOobject::NO_READ,
+            IOobject::NO_WRITE
+        ),
+        mesh_,
+        dimensionedVector("zero", dims, vector::zero)
+    );
+
+    const volVectorField& U = eqn.psi();
+
+    const vectorField Uin = inflowVelocity(U);
+
+    trim_->correct(Uin, force);
+
+    calculate(Uin, trim_->thetag(), force);
+
+
+    // add source to rhs of eqn
+    eqn -= force;
+
+    if (mesh_.time().outputTime())
+    {
+        force.write();
     }
 }
 
@@ -527,12 +673,10 @@ bool Foam::rotorDiskSource::read(const dictionary& dict)
         flapCoeffs.lookup("beta1") >> flap_.beta1;
         flapCoeffs.lookup("beta2") >> flap_.beta2;
         flap_.beta0 = degToRad(flap_.beta0);
+        flap_.beta1 = degToRad(flap_.beta1);
+        flap_.beta2 = degToRad(flap_.beta2);
 
-        const dictionary& trimCoeffs(coeffs_.subDict("trimCoeffs"));
-        trimCoeffs.lookup("alphaC") >> trim_.alphaC;
-        trimCoeffs.lookup("A") >> trim_.A;
-        trimCoeffs.lookup("B") >> trim_.B;
-        trim_.alphaC = degToRad(trim_.alphaC);
+        trim_->read(coeffs_);        
 
         checkData();
 
@@ -542,7 +686,7 @@ bool Foam::rotorDiskSource::read(const dictionary& dict)
 
         if (debug)
         {
-            writeField("alphag", alphag_, true);
+            writeField("alphag", trim_->thetag()(), true);
             writeField("faceArea", area_, true);
         }
 
diff --git a/src/fieldSources/basicSource/rotorDiskSource/rotorDiskSource.H b/src/fieldSources/basicSource/rotorDiskSource/rotorDiskSource.H
index 946c752999..2df09f9f7b 100644
--- a/src/fieldSources/basicSource/rotorDiskSource/rotorDiskSource.H
+++ b/src/fieldSources/basicSource/rotorDiskSource/rotorDiskSource.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -37,13 +37,16 @@ Description
             fieldNames      (U);    // names of fields on which to apply source
             rhoName         rho;    // density field if compressible case
             nBlades         3;      // number of blades
-            tip effect      0.96;   // normalised radius above which lift = 0
+            tipEffect       0.96;   // normalised radius above which lift = 0
 
             inletFlowType   local;  // inlet flow type specification
 
             geometryMode    auto;   // geometry specification
 
             refDirection    (-1 0 0); // reference direction
+                                      // - used as reference for psi angle
+
+            trimModel       fixed;  // fixed || targetForce
 
             flapCoeffs
             {
@@ -51,16 +54,12 @@ Description
                 beta1           0;  // lateral flapping coeff
                 beta2           0;  // longitudinal flapping coeff
             }
-            trimCoeffs
-            {
-                alphac          15; // collective pitch angle [deg]
-                A               0;  // lateral cyclic coeff
-                B               0;  // longitudinal cyclic coeff
-            }
+
             blade
             {
                 ...
             }
+
             profiles
             {
                 ...
@@ -102,6 +101,9 @@ SourceFiles
 namespace Foam
 {
 
+// Forward declaration of classes
+class trimModel;
+
 /*---------------------------------------------------------------------------*\
                       Class rotorDiskSource Declaration
 \*---------------------------------------------------------------------------*/
@@ -140,13 +142,6 @@ protected:
             scalar beta2;   // longitudinal flapping coeff
         };
 
-        struct trimData
-        {
-            scalar alphaC;  // collective pitch angle
-            scalar A;       // lateral cyclic coeff
-            scalar B;       // longitudinal cyclic coeff
-        };
-
 
     // Protected data
 
@@ -172,8 +167,8 @@ protected:
         //- Blade flap coefficients [rad/s]
         flapData flap_;
 
-        //- Blad trim coefficients
-        trimData trim_;
+        //- Trim model
+        autoPtr<trimModel> trim_;
 
         //- Blade data
         bladeModel blade_;
@@ -181,7 +176,8 @@ protected:
         //- Profile data
         profileModelList profiles_;
 
-        //- Cell centre positions in local rotor frame (Cartesian x, y, z)
+        //- Cell centre positions in local rotor frame
+        //  (Cylindrical r, theta, z)
         List<point> x_;
 
         //- Rotation tensor for flap angle
@@ -190,9 +186,6 @@ protected:
         //- Inverse rotation tensor for flap angle
         List<tensor> invR_;
 
-        //- Geometric angle of attack [deg]
-        List<scalar> alphag_;
-
         //- Area [m2]
         List<scalar> area_;
 
@@ -220,15 +213,6 @@ protected:
         //- Return the inlet flow field
         tmp<vectorField> inflowVelocity(const volVectorField& U) const;
 
-        //- Calculate forces
-        template<class RhoType>
-        tmp<volVectorField> calculateForces
-        (
-            const RhoType& rho,
-            const vectorField& U,
-            const dimensionSet& dims
-        );
-
         //- Helper function to write rotor values
         template<class Type>
         void writeField
@@ -264,6 +248,29 @@ public:
 
     // Member Functions
 
+        // Access
+            
+            //- Return the cell centre positions in local rotor frame
+            // (Cylindrical r, theta, z)
+            inline const List<point>& x() const;
+
+            //- Return the rotor co-ordinate system (r, theta, z)
+            inline const cylindricalCS& coordSys() const;
+
+
+        // Evaluation
+
+            //- Calculate forces
+            void calculate
+            (
+                const vectorField& U,
+                const scalarField& alphag,
+                vectorField& force,
+                const bool divideVolume = true,
+                const bool output = true
+            ) const;
+
+
         // Source term addition
 
             //- Source term to fvMatrix<vector>
@@ -286,6 +293,10 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+#include "rotorDiskSourceI.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
 #ifdef NoRepository
     #include "rotorDiskSourceTemplates.C"
 #endif
diff --git a/src/fieldSources/basicSource/rotorDiskSource/rotorDiskSourceI.H b/src/fieldSources/basicSource/rotorDiskSource/rotorDiskSourceI.H
new file mode 100644
index 0000000000..23ca3b0e80
--- /dev/null
+++ b/src/fieldSources/basicSource/rotorDiskSource/rotorDiskSourceI.H
@@ -0,0 +1,41 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "rotorDiskSource.H"
+
+const Foam::List<Foam::point>& Foam::rotorDiskSource::x() const
+{
+    return x_;
+}
+
+
+const Foam::cylindricalCS& Foam::rotorDiskSource::coordSys() const
+{
+    return coordSys_;
+}
+
+
+// ************************************************************************* //
+
diff --git a/src/fieldSources/basicSource/rotorDiskSource/rotorDiskSourceTemplates.C b/src/fieldSources/basicSource/rotorDiskSource/rotorDiskSourceTemplates.C
index dc9f78440e..ae574946a6 100644
--- a/src/fieldSources/basicSource/rotorDiskSource/rotorDiskSourceTemplates.C
+++ b/src/fieldSources/basicSource/rotorDiskSource/rotorDiskSourceTemplates.C
@@ -24,13 +24,8 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "rotorDiskSource.H"
-#include "addToRunTimeSelectionTable.H"
-#include "mathematicalConstants.H"
-#include "unitConversion.H"
 #include "volFields.H"
 
-using namespace Foam::constant::mathematical;
-
 // * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
 
 template<class Type>
@@ -81,149 +76,4 @@ void Foam::rotorDiskSource::writeField
 }
 
 
-template<class RhoType>
-Foam::tmp<Foam::volVectorField> Foam::rotorDiskSource::calculateForces
-(
-    const RhoType& rho,
-    const vectorField& U,
-    const dimensionSet& dims
-)
-{
-    tmp<volVectorField> tForce
-    (
-        new volVectorField
-        (
-            IOobject
-            (
-                "rotorForce",
-                mesh_.time().timeName(),
-                mesh_,
-                IOobject::NO_READ,
-                IOobject::NO_WRITE
-            ),
-            mesh_,
-            dimensionedVector("zero", dims, vector::zero)
-        )
-    );
-
-    vectorField& force = tForce().internalField();
-    const scalarField& V = mesh_.V();
-
-
-    // logging info
-    scalar dragEff = 0.0;
-    scalar liftEff = 0.0;
-    scalar AOAmin = GREAT;
-    scalar AOAmax = -GREAT;
-
-    forAll(cells_, i)
-    {
-        if (area_[i] > ROOTVSMALL)
-        {
-            const label cellI = cells_[i];
-
-            const scalar radius = x_[i].x();
-
-            // velocity in local cylindrical reference frame
-            vector Uc = coordSys_.localVector(U[cellI]);
-
-            // apply correction in local system due to coning
-            Uc = R_[i] & Uc;
-
-            // set radial component of velocity to zero
-            Uc.x() = 0.0;
-
-            // remove blade linear velocity from blade normal component
-            Uc.y() -= radius*omega_;
-
-            // velocity magnitude
-            scalar magUc = mag(Uc);
-
-            // determine blade data for this radius
-            // i1 = index of upper bound data point in blade list
-            scalar twist = 0.0;
-            scalar chord = 0.0;
-            label i1 = -1;
-            label i2 = -1;
-            scalar invDr = 0.0;
-            blade_.interpolate(radius, twist, chord, i1, i2, invDr);
-
-            // effective angle of attack
-            scalar alphaEff = pi + atan2(Uc.z(), Uc.y()) - (alphag_[i] + twist);
-            if (alphaEff > pi)
-            {
-                alphaEff -= twoPi;
-            }
-            if (alphaEff < -pi)
-            {
-                alphaEff += twoPi;
-            }
-
-            AOAmin = min(AOAmin, alphaEff);
-            AOAmax = max(AOAmax, alphaEff);
-
-            // determine profile data for this radius and angle of attack
-            const label profile1 = blade_.profileID()[i1];
-            const label profile2 = blade_.profileID()[i2];
-
-            scalar Cd1 = 0.0;
-            scalar Cl1 = 0.0;
-            profiles_[profile1].Cdl(alphaEff, Cd1, Cl1);
-
-            scalar Cd2 = 0.0;
-            scalar Cl2 = 0.0;
-            profiles_[profile2].Cdl(alphaEff, Cd2, Cl2);
-
-            scalar Cd = invDr*(Cd2 - Cd1) + Cd1;
-            scalar Cl = invDr*(Cl2 - Cl1) + Cl1;
-
-            // apply tip effect for blade lift
-            scalar tipFactor = 1.0;
-            if (radius/rMax_ > tipEffect_)
-            {
-                tipFactor = 0.0;
-            }
-
-            // calculate forces perpendicular to blade
-            scalar pDyn = 0.5*rho[cellI]*sqr(magUc);
-            scalar f = pDyn*chord*nBlades_*area_[i]/twoPi;
-            vector localForce = vector(0.0, f*Cd, tipFactor*f*Cl);
-
-            // convert force from local coning system into rotor cylindrical
-            localForce = invR_[i] & localForce;
-
-            // accumulate forces
-            dragEff += localForce.y();
-            liftEff += localForce.z();
-
-            // convert force to global cartesian co-ordinate system
-            force[cellI] = coordSys_.globalVector(localForce);
-
-            force[cellI] /= V[cellI];
-        }
-    }
-
-
-    if (mesh_.time().outputTime())
-    {
-        tForce().write();
-    }
-
-
-    reduce(AOAmin, minOp<scalar>());
-    reduce(AOAmax, maxOp<scalar>());
-    reduce(dragEff, sumOp<scalar>());
-    reduce(liftEff, sumOp<scalar>());
-
-    Info<< type() << " output:" << nl
-        << "    min/max(AOA)   = " << radToDeg(AOAmin) << ", "
-        << radToDeg(AOAmax) << nl
-        << "    Effective drag = " << dragEff << nl
-        << "    Effective lift = " << liftEff << endl;
-
-
-    return tForce;
-}
-
-
 // ************************************************************************* //
diff --git a/src/fieldSources/basicSource/rotorDiskSource/trimModel/fixed/fixedTrim.C b/src/fieldSources/basicSource/rotorDiskSource/trimModel/fixed/fixedTrim.C
new file mode 100644
index 0000000000..4d8f1499e5
--- /dev/null
+++ b/src/fieldSources/basicSource/rotorDiskSource/trimModel/fixed/fixedTrim.C
@@ -0,0 +1,96 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "fixedTrim.H"
+#include "addToRunTimeSelectionTable.H"
+#include "unitConversion.H"
+#include "mathematicalConstants.H"
+
+using namespace Foam::constant;
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    defineTypeNameAndDebug(fixedTrim, 0);
+
+    addToRunTimeSelectionTable(trimModel, fixedTrim, dictionary);
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::fixedTrim::fixedTrim(const rotorDiskSource& rotor, const dictionary& dict)
+:
+    trimModel(rotor, dict, typeName),
+    thetag_(rotor.cells().size(), 0.0)
+{
+    read(dict);
+}
+
+
+// * * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * //
+
+Foam::fixedTrim::~fixedTrim()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::fixedTrim::read(const dictionary& dict)
+{
+    trimModel::read(dict);
+
+    scalar theta0 = degToRad(readScalar(coeffs_.lookup("theta0")));
+    scalar theta1c = degToRad(readScalar(coeffs_.lookup("theta1c")));
+    scalar theta1s = degToRad(readScalar(coeffs_.lookup("theta1s")));
+
+    const List<vector>& x = rotor_.x();
+    forAll(thetag_, i)
+    {
+        scalar psi = x[i].y();
+        if (psi < 0)
+        {
+            psi += mathematical::twoPi;
+        }
+
+        thetag_[i] = theta0 + theta1c*cos(psi) + theta1s*sin(psi);
+    }
+}
+
+
+Foam::tmp<Foam::scalarField> Foam::fixedTrim::thetag() const
+{
+    return tmp<scalarField>(thetag_);
+}
+
+
+void Foam::fixedTrim::correct(const vectorField& U, vectorField& force)
+{
+    // do nothing
+}
+
+
+// ************************************************************************* //
diff --git a/src/fieldSources/basicSource/rotorDiskSource/trimModel/fixed/fixedTrim.H b/src/fieldSources/basicSource/rotorDiskSource/trimModel/fixed/fixedTrim.H
new file mode 100644
index 0000000000..aa11919671
--- /dev/null
+++ b/src/fieldSources/basicSource/rotorDiskSource/trimModel/fixed/fixedTrim.H
@@ -0,0 +1,95 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::fixedTrim
+
+Description
+    Fixed trim coefficients
+
+SourceFiles
+    fixedTrim.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef fixedTrim_H
+#define fixedTrim_H
+
+#include "trimModel.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                         Class fixedTrim Declaration
+\*---------------------------------------------------------------------------*/
+
+class fixedTrim
+:
+    public trimModel
+{
+
+protected:
+
+    // Protected data
+
+        //- Geometric angle of attack [rad]
+        scalarField thetag_;
+
+
+public:
+
+    //- Run-time type information
+    TypeName("fixedTrim");
+
+    //- Constructor
+    fixedTrim(const rotorDiskSource& rotor, const dictionary& dict);
+
+    //- Destructor
+    virtual ~fixedTrim();
+
+
+    // Member functions
+
+        //- Read
+        void read(const dictionary& dict);
+
+        //- Return the geometric angle of attack [rad]
+        virtual tmp<scalarField> thetag() const;
+
+        //- Correct the model
+        virtual void correct(const vectorField& U, vectorField& force);
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/fieldSources/basicSource/rotorDiskSource/trimModel/targetForce/targetForceTrim.C b/src/fieldSources/basicSource/rotorDiskSource/trimModel/targetForce/targetForceTrim.C
new file mode 100644
index 0000000000..409015d885
--- /dev/null
+++ b/src/fieldSources/basicSource/rotorDiskSource/trimModel/targetForce/targetForceTrim.C
@@ -0,0 +1,234 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "targetForceTrim.H"
+#include "addToRunTimeSelectionTable.H"
+#include "unitConversion.H"
+#include "mathematicalConstants.H"
+
+using namespace Foam::constant;
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    defineTypeNameAndDebug(targetForceTrim, 0);
+
+    addToRunTimeSelectionTable(trimModel, targetForceTrim, dictionary);
+}
+
+
+// * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
+
+Foam::vector Foam::targetForceTrim::calcForce
+(
+    const vectorField& U,
+    const scalarField& thetag,
+    vectorField& force    
+) const
+{
+    rotor_.calculate(U, thetag, force, false, false);
+
+    const labelList& cells = rotor_.cells();
+    const vectorField& C = rotor_.mesh().C();
+
+    const vector& origin = rotor_.coordSys().origin();
+    const vector& rollAxis = rotor_.coordSys().e1();
+    const vector& pitchAxis = rotor_.coordSys().e2();
+    const vector& yawAxis = rotor_.coordSys().e3();
+
+    vector f(vector::zero);
+    forAll(cells, i)
+    {
+        label cellI = cells[i];
+
+        vector moment = force[cellI]^(C[cellI] - origin);
+        f[0] += force[cellI] & yawAxis;
+        f[1] += moment & pitchAxis;
+        f[2] += moment & rollAxis;
+    }
+
+    reduce(f, sumOp<vector>());
+    
+    return f;
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::targetForceTrim::targetForceTrim
+(
+    const rotorDiskSource& rotor,
+    const dictionary& dict
+)
+:
+    trimModel(rotor, dict, typeName),
+    calcFrequency_(-1),
+    target_(vector::zero),
+    theta_(vector::zero),
+    nIter_(50),
+    tol_(1e-8),
+    relax_(1.0),
+    dTheta_(degToRad(0.1))
+{
+    read(dict);
+}
+
+
+// * * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * //
+
+Foam::targetForceTrim::~targetForceTrim()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::targetForceTrim::read(const dictionary& dict)
+{
+    trimModel::read(dict);
+
+    const dictionary& targetDict(coeffs_.subDict("target"));
+    target_[0] = readScalar(targetDict.lookup("fThrust"));
+    target_[1] = readScalar(targetDict.lookup("mPitch"));
+    target_[2] = readScalar(targetDict.lookup("mRoll"));
+
+    const dictionary& pitchAngleDict(coeffs_.subDict("pitchAngles"));
+    theta_[0] = degToRad(readScalar(pitchAngleDict.lookup("theta0Ini")));
+    theta_[1] = degToRad(readScalar(pitchAngleDict.lookup("theta1cIni")));
+    theta_[2] = degToRad(readScalar(pitchAngleDict.lookup("theta1sIni")));
+
+    coeffs_.lookup("calcFrequency") >> calcFrequency_;
+
+    coeffs_.readIfPresent("nIter", nIter_);
+    coeffs_.readIfPresent("tol", tol_);
+    coeffs_.readIfPresent("relax", relax_);
+
+    if (coeffs_.readIfPresent("dTheta", dTheta_))
+    {
+        dTheta_ = degToRad(dTheta_);
+    }
+}
+
+
+Foam::tmp<Foam::scalarField> Foam::targetForceTrim::thetag() const
+{
+    const List<vector>& x = rotor_.x();
+
+    tmp<scalarField> ttheta(new scalarField(x.size()));
+    scalarField& t = ttheta();
+
+    forAll(t, i)
+    {
+        scalar psi = x[i].y();
+        if (psi < 0)
+        {
+            psi += mathematical::twoPi;
+        }
+
+        t[i] = theta_[0] + theta_[1]*cos(psi) + theta_[2]*sin(psi);
+    }
+
+    return ttheta;
+}
+
+
+void Foam::targetForceTrim::correct(const vectorField& U, vectorField& force)
+{
+    if (rotor_.mesh().time().timeIndex() % calcFrequency_ == 0)
+    {
+        // iterate to find new pitch angles to achieve target force
+        scalar err = GREAT;
+        label iter = 0;
+        tensor J(tensor::zero);
+
+        while ((err > tol_) && (iter < nIter_))
+        {
+            // cache initial theta vector
+            vector theta0(theta_);
+
+            // set initial values
+            vector old = calcForce(U, thetag(), force);
+
+            // construct Jacobian by perturbing the pitch angles
+            // by +/-(dTheta_/2)
+            for (label pitchI = 0; pitchI < 3; pitchI++)
+            {
+                theta_[pitchI] -= dTheta_/2.0;
+                vector f0 = calcForce(U, thetag(), force);
+
+                theta_[pitchI] += dTheta_;
+                vector f1 = calcForce(U, thetag(), force);
+
+                vector ddTheta = (f1 - f0)/dTheta_;
+
+                J[pitchI + 0] = ddTheta[0];
+                J[pitchI + 3] = ddTheta[1];
+                J[pitchI + 6] = ddTheta[2];
+
+                theta_ = theta0;
+            }
+
+            // calculate the change in pitch angle vector
+            vector dt = inv(J) & (target_ - old);
+
+            // update pitch angles
+            vector thetaNew = theta_ + relax_*dt;
+
+            // update error
+            err = mag(thetaNew - theta_);
+
+            // update for next iteration
+            theta_ = thetaNew;
+            iter++;
+        }
+
+        if (iter == nIter_)
+        {
+            WarningIn
+            (
+                "void Foam::targetForceTrim::correct"
+                "("
+                    "const vectorField&, "
+                    "vectorField&"
+                ")"
+            )   << "Trim routine not converged in " << iter
+                << " iterations, max residual = " << err << endl;
+        }
+        else
+        {
+            Info<< type() << ": converged in " << iter
+                << " iterations" << endl;
+        }
+
+        Info<< "    new pitch angles:" << nl
+            << "        theta0  = " << radToDeg(theta_[0]) << nl
+            << "        theta1c = " << radToDeg(theta_[1]) << nl
+            << "        theta1s = " << radToDeg(theta_[2]) << nl
+            << endl;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/src/fieldSources/basicSource/rotorDiskSource/trimModel/targetForce/targetForceTrim.H b/src/fieldSources/basicSource/rotorDiskSource/trimModel/targetForce/targetForceTrim.H
new file mode 100644
index 0000000000..a030cfb4a9
--- /dev/null
+++ b/src/fieldSources/basicSource/rotorDiskSource/trimModel/targetForce/targetForceTrim.H
@@ -0,0 +1,126 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::targetForceTrim
+
+Description
+    Target force trim coefficients
+
+SourceFiles
+    targetForceTrim.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef targetForceTrim_H
+#define targetForceTrim_H
+
+#include "trimModel.H"
+#include "tensor.H"
+#include "vector.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                      Class targetForceTrim Declaration
+\*---------------------------------------------------------------------------*/
+
+class targetForceTrim
+:
+    public trimModel
+{
+
+protected:
+
+    // Protected data
+
+        //- Number of iterations between calls to 'correct'
+        label calcFrequency_;
+
+        //- Target force [N]
+        vector target_;
+
+        //- Pitch angles (collective, roll, pitch) [rad]
+        vector theta_;
+
+        //- Maximum number of iterations in trim routine
+        label nIter_;
+
+        //- Convergence tolerance
+        scalar tol_;
+
+        //- Under-relaxation coefficient
+        scalar relax_;
+
+        //- Perturbation angle used to determine jacobian
+        scalar dTheta_;
+
+
+    // Protected member functions
+
+        //- Calculate the rotor forces
+        vector calcForce
+        (
+            const vectorField& U,
+            const scalarField& alphag,
+            vectorField& force    
+        ) const;
+
+
+public:
+
+    //- Run-time type information
+    TypeName("targetForceTrim");
+
+    //- Constructor
+    targetForceTrim(const rotorDiskSource& rotor, const dictionary& dict);
+
+    //- Destructor
+    virtual ~targetForceTrim();
+
+
+    // Member functions
+
+        //- Read
+        void read(const dictionary& dict);
+
+        //- Return the geometric angle of attack [rad]
+        virtual tmp<scalarField> thetag() const;
+
+        //- Correct the model
+        virtual void correct(const vectorField& U, vectorField& force);
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/fieldSources/basicSource/rotorDiskSource/trimModel/trimModel/trimModel.C b/src/fieldSources/basicSource/rotorDiskSource/trimModel/trimModel/trimModel.C
new file mode 100644
index 0000000000..115d58c7b4
--- /dev/null
+++ b/src/fieldSources/basicSource/rotorDiskSource/trimModel/trimModel/trimModel.C
@@ -0,0 +1,67 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "trimModel.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    defineTypeNameAndDebug(trimModel, 0);
+    defineRunTimeSelectionTable(trimModel, dictionary);
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::trimModel::trimModel
+(
+    const rotorDiskSource& rotor,
+    const dictionary& dict,
+    const word& name
+)
+:
+    rotor_(rotor),
+    name_(name),
+    coeffs_(dictionary::null)
+{
+    read(dict);
+}
+
+// * * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * //
+
+Foam::trimModel::~trimModel()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::trimModel::read(const dictionary& dict)
+{
+    coeffs_ = dict.subDict(name_ + "Coeffs");
+}
+
+
+// ************************************************************************* //
diff --git a/src/fieldSources/basicSource/rotorDiskSource/trimModel/trimModel/trimModel.H b/src/fieldSources/basicSource/rotorDiskSource/trimModel/trimModel/trimModel.H
new file mode 100644
index 0000000000..b69f062e30
--- /dev/null
+++ b/src/fieldSources/basicSource/rotorDiskSource/trimModel/trimModel/trimModel.H
@@ -0,0 +1,135 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::trimModel
+
+Description
+    Trim model base class
+
+SourceFiles
+    trimModel.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef trimModel_H
+#define trimModel_H
+
+#include "rotorDiskSource.H"
+#include "dictionary.H"
+#include "runTimeSelectionTables.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                         Class trimModel Declaration
+\*---------------------------------------------------------------------------*/
+
+class trimModel
+{
+
+protected:
+
+    // Protected data
+
+        //- Reference to the rotor source model
+        const rotorDiskSource& rotor_;
+
+        //- Name of model
+        const word name_;
+
+        //- Coefficients dictionary
+        dictionary coeffs_;
+
+
+public:
+
+    //- Run-time type information
+    TypeName("trimModel");
+
+
+    // Declare runtime constructor selection table
+
+        declareRunTimeSelectionTable
+        (
+            autoPtr,
+            trimModel,
+            dictionary,
+            (
+                const rotorDiskSource& rotor,
+                const dictionary& dict
+            ),
+            (rotor, dict)
+        );
+
+
+    // Constructors
+
+        //- Construct from components
+        trimModel
+        (
+            const rotorDiskSource& rotor,
+            const dictionary& dict,
+            const word& name
+        );
+
+
+    // Selectors
+
+        //- Return a reference to the selected trim model
+        static autoPtr<trimModel> New
+        (
+            const rotorDiskSource& rotor,
+            const dictionary& dict
+        );
+
+
+    //- Destructor
+    virtual ~trimModel();
+
+
+    // Member functions
+
+        //- Read
+        virtual void read(const dictionary& dict);
+
+        //- Return the geometric angle of attack [rad]
+        virtual tmp<scalarField> thetag() const = 0;
+
+        //- Correct the model
+        virtual void correct(const vectorField& U, vectorField& force) = 0;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/fieldSources/basicSource/rotorDiskSource/trimModel/trimModel/trimModelNew.C b/src/fieldSources/basicSource/rotorDiskSource/trimModel/trimModel/trimModelNew.C
new file mode 100644
index 0000000000..97efa17c74
--- /dev/null
+++ b/src/fieldSources/basicSource/rotorDiskSource/trimModel/trimModel/trimModelNew.C
@@ -0,0 +1,59 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "trimModel.H"
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::autoPtr<Foam::trimModel> Foam::trimModel::New
+(
+    const rotorDiskSource& rotor,
+    const dictionary& dict
+)
+{
+    const word modelType(dict.lookup(typeName));
+
+    Info<< "    Selecting " << typeName << " " << modelType << endl;
+
+    dictionaryConstructorTable::iterator cstrIter =
+        dictionaryConstructorTablePtr_->find(modelType);
+
+    if (cstrIter == dictionaryConstructorTablePtr_->end())
+    {
+        FatalErrorIn
+        (
+            "trimModel::New(const rotorDiskSource&, const dictionary&)"
+        )   << "Unknown " << typeName << " type "
+            << modelType << nl << nl
+            << "Valid " << typeName << " types are:" << nl
+            << dictionaryConstructorTablePtr_->sortedToc()
+            << exit(FatalError);
+    }
+
+    return autoPtr<trimModel>(cstrIter()(rotor, dict));
+}
+
+
+// ************************************************************************* //

From 37de1d4badb02b6fbf47cd9c4f524810afcb243c Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Thu, 12 Apr 2012 17:40:05 +0100
Subject: [PATCH 192/317] ENH: timeVaryingMappedFixedValuePoint: pointField
 version of timeVaryingMapped

---
 .../timeVaryingMappedFixedValueFvPatchField.C | 441 +++-------------
 .../timeVaryingMappedFixedValueFvPatchField.H |  47 +-
 src/fvMotionSolver/Make/files                 |  20 +-
 ...meVaryingMappedFixedValuePointPatchField.C | 482 ++++++++++++++++++
 ...meVaryingMappedFixedValuePointPatchField.H | 195 +++++++
 ...eVaryingMappedFixedValuePointPatchFields.C |  43 ++
 ...eVaryingMappedFixedValuePointPatchFields.H |  57 +++
 src/meshTools/Make/files                      |   1 +
 .../pointToPointPlanarInterpolation.C         | 322 ++++++++++++
 .../pointToPointPlanarInterpolation.H         | 164 ++++++
 ...pointToPointPlanarInterpolationTemplates.C |  71 +++
 .../triSurfaceTools/triSurfaceTools.H         |   4 +-
 12 files changed, 1438 insertions(+), 409 deletions(-)
 create mode 100644 src/fvMotionSolver/pointPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValuePointPatchField.C
 create mode 100644 src/fvMotionSolver/pointPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValuePointPatchField.H
 create mode 100644 src/fvMotionSolver/pointPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValuePointPatchFields.C
 create mode 100644 src/fvMotionSolver/pointPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValuePointPatchFields.H
 create mode 100644 src/meshTools/triSurface/triSurfaceTools/pointToPointPlanarInterpolation.C
 create mode 100644 src/meshTools/triSurface/triSurfaceTools/pointToPointPlanarInterpolation.H
 create mode 100644 src/meshTools/triSurface/triSurfaceTools/pointToPointPlanarInterpolationTemplates.C

diff --git a/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.C
index 61fb24ba77..1831bd903d 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -25,12 +25,7 @@ License
 
 #include "timeVaryingMappedFixedValueFvPatchField.H"
 #include "Time.H"
-#include "triSurfaceTools.H"
-#include "triSurface.H"
-#include "vector2D.H"
-#include "OFstream.H"
 #include "AverageIOField.H"
-#include "Random.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -51,9 +46,6 @@ timeVaryingMappedFixedValueFvPatchField
     fieldTableName_(iF.name()),
     setAverage_(false),
     perturb_(0),
-    referenceCS_(NULL),
-    nearestVertex_(0),
-    nearestVertexWeight_(0),
     sampleTimes_(0),
     startSampleTime_(-1),
     startSampledValues_(0),
@@ -78,9 +70,7 @@ timeVaryingMappedFixedValueFvPatchField
     fieldTableName_(ptf.fieldTableName_),
     setAverage_(ptf.setAverage_),
     perturb_(ptf.perturb_),
-    referenceCS_(NULL),
-    nearestVertex_(0),
-    nearestVertexWeight_(0),
+    mapperPtr_(ptf.mapperPtr_),
     sampleTimes_(0),
     startSampleTime_(-1),
     startSampledValues_(0),
@@ -104,9 +94,7 @@ timeVaryingMappedFixedValueFvPatchField
     fieldTableName_(iF.name()),
     setAverage_(readBool(dict.lookup("setAverage"))),
     perturb_(dict.lookupOrDefault("perturb", 1E-5)),
-    referenceCS_(NULL),
-    nearestVertex_(0),
-    nearestVertexWeight_(0),
+    mapperPtr_(NULL),
     sampleTimes_(0),
     startSampleTime_(-1),
     startSampledValues_(0),
@@ -139,9 +127,7 @@ timeVaryingMappedFixedValueFvPatchField
     fieldTableName_(ptf.fieldTableName_),
     setAverage_(ptf.setAverage_),
     perturb_(ptf.perturb_),
-    referenceCS_(ptf.referenceCS_),
-    nearestVertex_(ptf.nearestVertex_),
-    nearestVertexWeight_(ptf.nearestVertexWeight_),
+    mapperPtr_(ptf.mapperPtr_),
     sampleTimes_(ptf.sampleTimes_),
     startSampleTime_(ptf.startSampleTime_),
     startSampledValues_(ptf.startSampledValues_),
@@ -165,9 +151,7 @@ timeVaryingMappedFixedValueFvPatchField
     fieldTableName_(ptf.fieldTableName_),
     setAverage_(ptf.setAverage_),
     perturb_(ptf.perturb_),
-    referenceCS_(ptf.referenceCS_),
-    nearestVertex_(ptf.nearestVertex_),
-    nearestVertexWeight_(ptf.nearestVertexWeight_),
+    mapperPtr_(ptf.mapperPtr_),
     sampleTimes_(ptf.sampleTimes_),
     startSampleTime_(ptf.startSampleTime_),
     startSampledValues_(ptf.startSampledValues_),
@@ -192,6 +176,10 @@ void timeVaryingMappedFixedValueFvPatchField<Type>::autoMap
         startSampledValues_.autoMap(m);
         endSampledValues_.autoMap(m);
     }
+    // Clear interpolator
+    mapperPtr_.clear();
+    startSampleTime_ = -1;
+    endSampleTime_ = -1;
 }
 
 
@@ -209,295 +197,11 @@ void timeVaryingMappedFixedValueFvPatchField<Type>::rmap
 
     startSampledValues_.rmap(tiptf.startSampledValues_, addr);
     endSampledValues_.rmap(tiptf.endSampledValues_, addr);
-}
 
-
-template<class Type>
-void timeVaryingMappedFixedValueFvPatchField<Type>::readSamplePoints()
-{
-    // Read the sample points
-
-    pointIOField samplePoints
-    (
-        IOobject
-        (
-            "points",
-            this->db().time().constant(),
-            "boundaryData"/this->patch().name(),
-            this->db(),
-            IOobject::MUST_READ,
-            IOobject::AUTO_WRITE,
-            false
-        )
-    );
-
-    const fileName samplePointsFile = samplePoints.filePath();
-
-    if (debug)
-    {
-        Info<< "timeVaryingMappedFixedValueFvPatchField :"
-            << " Read " << samplePoints.size() << " sample points from "
-            << samplePointsFile << endl;
-    }
-
-    // Determine coordinate system from samplePoints
-
-    if (samplePoints.size() < 3)
-    {
-        FatalErrorIn
-        (
-            "timeVaryingMappedFixedValueFvPatchField<Type>::readSamplePoints()"
-        )   << "Only " << samplePoints.size() << " points read from file "
-            << samplePoints.objectPath() << nl
-            << "Need at least three non-colinear samplePoints"
-            << " to be able to interpolate."
-            << "\n    on patch " << this->patch().name()
-            << " of points " << samplePoints.name()
-            << " in file " << samplePoints.objectPath()
-            << exit(FatalError);
-    }
-
-    const point& p0 = samplePoints[0];
-
-    // Find furthest away point
-    vector e1;
-    label index1 = -1;
-    scalar maxDist = -GREAT;
-
-    for (label i = 1; i < samplePoints.size(); i++)
-    {
-        const vector d = samplePoints[i] - p0;
-        scalar magD = mag(d);
-
-        if (magD > maxDist)
-        {
-            e1 = d/magD;
-            index1 = i;
-            maxDist = magD;
-        }
-    }
-    // Find point that is furthest away from line p0-p1
-    const point& p1 = samplePoints[index1];
-
-    label index2 = -1;
-    maxDist = -GREAT;
-    for (label i = 1; i < samplePoints.size(); i++)
-    {
-        if (i != index1)
-        {
-            const point& p2 = samplePoints[i];
-            vector e2(p2 - p0);
-            e2 -= (e2&e1)*e1;
-            scalar magE2 = mag(e2);
-
-            if (magE2 > maxDist)
-            {
-                index2 = i;
-                maxDist = magE2;
-            }
-        }
-    }
-    if (index2 == -1)
-    {
-        FatalErrorIn
-        (
-            "timeVaryingMappedFixedValueFvPatchField<Type>::readSamplePoints()"
-        )   << "Cannot find points that make valid normal." << nl
-            << "Have so far points " << p0 << " and " << p1
-            << "Need at least three sample points which are not in a line."
-            << "\n    on patch " << this->patch().name()
-            << " of points " << samplePoints.name()
-            << " in file " << samplePoints.objectPath()
-            << exit(FatalError);
-    }
-
-    vector n = e1^(samplePoints[index2]-p0);
-    n /= mag(n);
-
-    if (debug)
-    {
-        Info<< "timeVaryingMappedFixedValueFvPatchField :"
-            << " Used points " << p0 << ' ' << samplePoints[index1]
-            << ' ' << samplePoints[index2]
-            << " to define coordinate system with normal " << n << endl;
-    }
-
-    referenceCS_.reset
-    (
-        new coordinateSystem
-        (
-            "reference",
-            p0,  // origin
-            n,   // normal
-            e1   // 0-axis
-        )
-    );
-
-    tmp<vectorField> tlocalVertices
-    (
-        referenceCS().localPosition(samplePoints)
-    );
-    vectorField& localVertices = tlocalVertices();
-
-    const boundBox bb(localVertices, true);
-    const point bbMid(bb.midpoint());
-
-    if (debug)
-    {
-        Info<< "timeVaryingMappedFixedValueFvPatchField :"
-            << " Perturbing points with " << perturb_
-            << " fraction of a random position inside " << bb
-            << " to break any ties on regular meshes."
-            << nl << endl;
-    }
-
-    Random rndGen(123456);
-    forAll(localVertices, i)
-    {
-        localVertices[i] +=
-            perturb_
-           *(rndGen.position(bb.min(), bb.max())-bbMid);
-    }
-
-    // Determine triangulation
-    List<vector2D> localVertices2D(localVertices.size());
-    forAll(localVertices, i)
-    {
-        localVertices2D[i][0] = localVertices[i][0];
-        localVertices2D[i][1] = localVertices[i][1];
-    }
-
-    triSurface s(triSurfaceTools::delaunay2D(localVertices2D));
-
-    tmp<pointField> tlocalFaceCentres
-    (
-        referenceCS().localPosition
-        (
-            this->patch().patch().faceCentres()
-        )
-    );
-    const pointField& localFaceCentres = tlocalFaceCentres();
-
-    if (debug)
-    {
-        Pout<< "readSamplePoints :"
-            <<" Dumping triangulated surface to triangulation.stl" << endl;
-        s.write(this->db().time().path()/"triangulation.stl");
-
-        OFstream str(this->db().time().path()/"localFaceCentres.obj");
-        Pout<< "readSamplePoints :"
-            << " Dumping face centres to " << str.name() << endl;
-
-        forAll(localFaceCentres, i)
-        {
-            const point& p = localFaceCentres[i];
-            str<< "v " << p.x() << ' ' << p.y() << ' ' << p.z() << nl;
-        }
-    }
-
-    // Determine interpolation onto face centres.
-    triSurfaceTools::calcInterpolationWeights
-    (
-        s,
-        localFaceCentres,   // points to interpolate to
-        nearestVertex_,
-        nearestVertexWeight_
-    );
-
-
-
-    // Read the times for which data is available
-
-    const fileName samplePointsDir = samplePointsFile.path();
-
-    sampleTimes_ = Time::findTimes(samplePointsDir);
-
-    if (debug)
-    {
-        Info<< "timeVaryingMappedFixedValueFvPatchField : In directory "
-            << samplePointsDir << " found times " << timeNames(sampleTimes_)
-            << endl;
-    }
-}
-
-
-template<class Type>
-wordList timeVaryingMappedFixedValueFvPatchField<Type>::timeNames
-(
-    const instantList& times
-)
-{
-    wordList names(times.size());
-
-    forAll(times, i)
-    {
-        names[i] = times[i].name();
-    }
-    return names;
-}
-
-
-template<class Type>
-void timeVaryingMappedFixedValueFvPatchField<Type>::findTime
-(
-    const fileName& instance,
-    const fileName& local,
-    const scalar timeVal,
-    label& lo,
-    label& hi
-) const
-{
-    lo = startSampleTime_;
-    hi = -1;
-
-    for (label i = startSampleTime_+1; i < sampleTimes_.size(); i++)
-    {
-        if (sampleTimes_[i].value() > timeVal)
-        {
-            break;
-        }
-        else
-        {
-            lo = i;
-        }
-    }
-
-    if (lo == -1)
-    {
-        FatalErrorIn("findTime")
-            << "Cannot find starting sampling values for current time "
-            << timeVal << nl
-            << "Have sampling values for times "
-            << timeNames(sampleTimes_) << nl
-            << "In directory "
-            <<  this->db().time().constant()/"boundaryData"/this->patch().name()
-            << "\n    on patch " << this->patch().name()
-            << " of field " << fieldTableName_
-            << exit(FatalError);
-    }
-
-    if (lo < sampleTimes_.size()-1)
-    {
-        hi = lo+1;
-    }
-
-
-    if (debug)
-    {
-        if (hi == -1)
-        {
-            Pout<< "findTime : Found time " << timeVal << " after"
-                << " index:" << lo << " time:" << sampleTimes_[lo].value()
-                << endl;
-        }
-        else
-        {
-            Pout<< "findTime : Found time " << timeVal << " inbetween"
-                << " index:" << lo << " time:" << sampleTimes_[lo].value()
-                << " and index:" << hi << " time:" << sampleTimes_[hi].value()
-                << endl;
-        }
-    }
+    // Clear interpolator
+    mapperPtr_.clear();
+    startSampleTime_ = -1;
+    endSampleTime_ = -1;
 }
 
 
@@ -507,22 +211,84 @@ void timeVaryingMappedFixedValueFvPatchField<Type>::checkTable()
     // Initialise
     if (startSampleTime_ == -1 && endSampleTime_ == -1)
     {
-        readSamplePoints();
+        pointIOField samplePoints
+        (
+            IOobject
+            (
+                "points",
+                this->db().time().constant(),
+                "boundaryData"/this->patch().name(),
+                this->db(),
+                IOobject::MUST_READ,
+                IOobject::AUTO_WRITE,
+                false
+            )
+        );
+
+        const fileName samplePointsFile = samplePoints.filePath();
+
+        if (debug)
+        {
+            Info<< "timeVaryingMappedFixedValueFvPatchField :"
+                << " Read " << samplePoints.size() << " sample points from "
+                << samplePointsFile << endl;
+        }
+
+        // Allocate the interpolator
+        mapperPtr_.reset
+        (
+            new pointToPointPlanarInterpolation
+            (
+                samplePoints,
+                 this->patch().patch().faceCentres(),
+                perturb_
+            )
+        );
+
+        // Read the times for which data is available
+        const fileName samplePointsDir = samplePointsFile.path();
+        sampleTimes_ = Time::findTimes(samplePointsDir);
+
+        if (debug)
+        {
+            Info<< "timeVaryingMappedFixedValueFvPatchField : In directory "
+                << samplePointsDir << " found times "
+                << pointToPointPlanarInterpolation::timeNames(sampleTimes_)
+                << endl;
+        }
     }
 
+
     // Find current time in sampleTimes
     label lo = -1;
     label hi = -1;
 
-    findTime
+    bool foundTime = mapperPtr_().findTime
     (
-        this->db().time().constant(),
-        "boundaryData"/this->patch().name(),
+        sampleTimes_,
+        startSampleTime_,
         this->db().time().value(),
         lo,
         hi
     );
 
+    if (!foundTime)
+    {
+        FatalErrorIn
+        (
+            "timeVaryingMappedFixedValueFvPatchField<Type>::checkTable"
+        )   << "Cannot find starting sampling values for current time "
+            << this->db().time().value() << nl
+            << "Have sampling values for times "
+            << pointToPointPlanarInterpolation::timeNames(sampleTimes_) << nl
+            << "In directory "
+            <<  this->db().time().constant()/"boundaryData"/this->patch().name()
+            << "\n    on patch " << this->patch().name()
+            << " of field " << fieldTableName_
+            << exit(FatalError);
+    }
+
+
     // Update sampled data fields.
 
     if (lo != startSampleTime_)
@@ -573,7 +339,7 @@ void timeVaryingMappedFixedValueFvPatchField<Type>::checkTable()
             );
 
             startAverage_ = vals.average();
-            startSampledValues_ = interpolate(vals);
+            startSampledValues_ = mapperPtr_().interpolate(vals);
         }
     }
 
@@ -617,61 +383,22 @@ void timeVaryingMappedFixedValueFvPatchField<Type>::checkTable()
                 )
             );
             endAverage_ = vals.average();
-            endSampledValues_ = interpolate(vals);
+            endSampledValues_ = mapperPtr_().interpolate(vals);
         }
     }
 }
 
 
-template<class Type>
-tmp<Field<Type> > timeVaryingMappedFixedValueFvPatchField<Type>::interpolate
-(
-    const Field<Type>& sourceFld
-) const
-{
-    tmp<Field<Type> > tfld(new Field<Type>(nearestVertex_.size()));
-    Field<Type>& fld = tfld();
-
-    forAll(fld, i)
-    {
-        const FixedList<label, 3>& verts = nearestVertex_[i];
-        const FixedList<scalar, 3>& w = nearestVertexWeight_[i];
-
-        if (verts[2] == -1)
-        {
-            if (verts[1] == -1)
-            {
-                // Use vertex0 only
-                fld[i] = sourceFld[verts[0]];
-            }
-            else
-            {
-                // Use vertex 0,1
-                fld[i] =
-                    w[0]*sourceFld[verts[0]]
-                  + w[1]*sourceFld[verts[1]];
-            }
-        }
-        else
-        {
-            fld[i] =
-                w[0]*sourceFld[verts[0]]
-              + w[1]*sourceFld[verts[1]]
-              + w[2]*sourceFld[verts[2]];
-        }
-    }
-    return tfld;
-}
-
-
 template<class Type>
 void timeVaryingMappedFixedValueFvPatchField<Type>::updateCoeffs()
 {
+
     if (this->updated())
     {
         return;
     }
 
+
     checkTable();
 
     // Interpolate between the sampled data
@@ -768,7 +495,7 @@ void timeVaryingMappedFixedValueFvPatchField<Type>::write(Ostream& os) const
 {
     fvPatchField<Type>::write(os);
     os.writeKeyword("setAverage") << setAverage_ << token::END_STATEMENT << nl;
-    os.writeKeyword("peturb") << perturb_ << token::END_STATEMENT << nl;
+    os.writeKeyword("perturb") << perturb_ << token::END_STATEMENT << nl;
 
     if (fieldTableName_ != this->dimensionedInternalField().name())
     {
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.H
index e3ac112154..1494efec35 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -66,9 +66,9 @@ SourceFiles
 #define timeVaryingMappedFixedValueFvPatchField_H
 
 #include "fixedValueFvPatchFields.H"
-#include "coordinateSystem.H"
 #include "FixedList.H"
 #include "instantList.H"
+#include "pointToPointPlanarInterpolation.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -95,16 +95,8 @@ class timeVaryingMappedFixedValueFvPatchField
         //- Fraction of perturbation (fraction of bounding box) to add
         scalar perturb_;
 
-        //- Coordinate system
-        autoPtr<coordinateSystem> referenceCS_;
-
-        //- Current interpolation addressing to face centres of underlying
-        //  patch
-        List<FixedList<label, 3> > nearestVertex_;
-
-        //- Current interpolation factors to face centres of underlying
-        //  patch
-        List<FixedList<scalar, 3> > nearestVertexWeight_;
+        //- 2D interpolation
+        autoPtr<pointToPointPlanarInterpolation> mapperPtr_;
 
         //- List of boundaryData time directories
         instantList sampleTimes_;
@@ -127,31 +119,6 @@ class timeVaryingMappedFixedValueFvPatchField
         //- If setAverage: end average value
         Type endAverage_;
 
-
-    // Private Member Functions
-
-        //- Get names of times
-        static wordList timeNames(const instantList&);
-
-        //- Find times around current time
-        void findTime
-        (
-            const fileName& instance,
-            const fileName& local,
-            const scalar timeVal,
-            label& lo,
-            label& hi
-        ) const;
-
-
-        //- Read boundary points and determine interpolation weights to patch
-        //  faceCentres
-        void readSamplePoints();
-
-        //- Do actual interpolation using current weights
-        tmp<Field<Type> > interpolate(const Field<Type>&) const;
-
-
 public:
 
     //- Runtime type information
@@ -224,12 +191,6 @@ public:
 
         // Access
 
-            //- Return the coordinateSystem
-            const coordinateSystem& referenceCS() const
-            {
-                return referenceCS_;
-            }
-
             //- Return startSampledValues
             const Field<Type> startSampledValues()
             {
diff --git a/src/fvMotionSolver/Make/files b/src/fvMotionSolver/Make/files
index bea2f10656..43dc7513e7 100644
--- a/src/fvMotionSolver/Make/files
+++ b/src/fvMotionSolver/Make/files
@@ -26,13 +26,19 @@ motionDiffusivity/manipulators/exponential/exponentialDiffusivity.C
 fvPatchFields/derived/cellMotion/cellMotionFvPatchFields.C
 fvPatchFields/derived/surfaceSlipDisplacement/surfaceSlipDisplacementFvPatchFields.C
 
-pointPatchFields/derived/oscillatingVelocity/oscillatingVelocityPointPatchVectorField.C
-pointPatchFields/derived/angularOscillatingVelocity/angularOscillatingVelocityPointPatchVectorField.C
+derivedPoint = pointPatchFields/derived
+
+$(derivedPoint)/oscillatingVelocity/oscillatingVelocityPointPatchVectorField.C
+$(derivedPoint)/angularOscillatingVelocity/angularOscillatingVelocityPointPatchVectorField.C
+
+$(derivedPoint)/oscillatingDisplacement/oscillatingDisplacementPointPatchVectorField.C
+$(derivedPoint)/angularOscillatingDisplacement/angularOscillatingDisplacementPointPatchVectorField.C
+$(derivedPoint)/surfaceSlipDisplacement/surfaceSlipDisplacementPointPatchVectorField.C
+$(derivedPoint)/surfaceDisplacement/surfaceDisplacementPointPatchVectorField.C
+$(derivedPoint)/waveDisplacement/waveDisplacementPointPatchVectorField.C
+
+$(derivedPoint)/timeVaryingMappedFixedValue/timeVaryingMappedFixedValuePointPatchFields.C
+
 
-pointPatchFields/derived/oscillatingDisplacement/oscillatingDisplacementPointPatchVectorField.C
-pointPatchFields/derived/angularOscillatingDisplacement/angularOscillatingDisplacementPointPatchVectorField.C
-pointPatchFields/derived/surfaceSlipDisplacement/surfaceSlipDisplacementPointPatchVectorField.C
-pointPatchFields/derived/surfaceDisplacement/surfaceDisplacementPointPatchVectorField.C
-pointPatchFields/derived/waveDisplacement/waveDisplacementPointPatchVectorField.C
 
 LIB = $(FOAM_LIBBIN)/libfvMotionSolvers
diff --git a/src/fvMotionSolver/pointPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValuePointPatchField.C b/src/fvMotionSolver/pointPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValuePointPatchField.C
new file mode 100644
index 0000000000..e1bdfc0910
--- /dev/null
+++ b/src/fvMotionSolver/pointPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValuePointPatchField.C
@@ -0,0 +1,482 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "timeVaryingMappedFixedValuePointPatchField.H"
+#include "Time.H"
+#include "AverageIOField.H"
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template<class Type>
+Foam::
+timeVaryingMappedFixedValuePointPatchField<Type>::
+timeVaryingMappedFixedValuePointPatchField
+(
+    const pointPatch& p,
+    const DimensionedField<Type, pointMesh>& iF
+)
+:
+    fixedValuePointPatchField<Type>(p, iF),
+    fieldTableName_(iF.name()),
+    setAverage_(false),
+    perturb_(0),
+    sampleTimes_(0),
+    startSampleTime_(-1),
+    startSampledValues_(0),
+    startAverage_(pTraits<Type>::zero),
+    endSampleTime_(-1),
+    endSampledValues_(0),
+    endAverage_(pTraits<Type>::zero)
+
+{}
+
+
+template<class Type>
+Foam::
+timeVaryingMappedFixedValuePointPatchField<Type>::
+timeVaryingMappedFixedValuePointPatchField
+(
+    const timeVaryingMappedFixedValuePointPatchField<Type>& ptf,
+    const pointPatch& p,
+    const DimensionedField<Type, pointMesh>& iF,
+    const pointPatchFieldMapper& mapper
+)
+:
+    fixedValuePointPatchField<Type>(ptf, p, iF, mapper),
+    fieldTableName_(ptf.fieldTableName_),
+    setAverage_(ptf.setAverage_),
+    perturb_(ptf.perturb_),
+    mapperPtr_(ptf.mapperPtr_),
+    sampleTimes_(0),
+    startSampleTime_(-1),
+    startSampledValues_(0),
+    startAverage_(pTraits<Type>::zero),
+    endSampleTime_(-1),
+    endSampledValues_(0),
+    endAverage_(pTraits<Type>::zero)
+{}
+
+
+template<class Type>
+Foam::
+timeVaryingMappedFixedValuePointPatchField<Type>::
+timeVaryingMappedFixedValuePointPatchField
+(
+    const pointPatch& p,
+    const DimensionedField<Type, pointMesh>& iF,
+    const dictionary& dict
+)
+:
+    fixedValuePointPatchField<Type>(p, iF),
+    fieldTableName_(iF.name()),
+    setAverage_(readBool(dict.lookup("setAverage"))),
+    perturb_(dict.lookupOrDefault("perturb", 1E-5)),
+    mapperPtr_(NULL),
+    sampleTimes_(0),
+    startSampleTime_(-1),
+    startSampledValues_(0),
+    startAverage_(pTraits<Type>::zero),
+    endSampleTime_(-1),
+    endSampledValues_(0),
+    endAverage_(pTraits<Type>::zero)
+{
+    dict.readIfPresent("fieldTableName", fieldTableName_);
+    updateCoeffs();
+}
+
+
+template<class Type>
+Foam::
+timeVaryingMappedFixedValuePointPatchField<Type>::
+timeVaryingMappedFixedValuePointPatchField
+(
+    const timeVaryingMappedFixedValuePointPatchField<Type>& ptf
+)
+:
+    fixedValuePointPatchField<Type>(ptf),
+    fieldTableName_(ptf.fieldTableName_),
+    setAverage_(ptf.setAverage_),
+    perturb_(ptf.perturb_),
+    mapperPtr_(ptf.mapperPtr_),
+    sampleTimes_(ptf.sampleTimes_),
+    startSampleTime_(ptf.startSampleTime_),
+    startSampledValues_(ptf.startSampledValues_),
+    startAverage_(ptf.startAverage_),
+    endSampleTime_(ptf.endSampleTime_),
+    endSampledValues_(ptf.endSampledValues_),
+    endAverage_(ptf.endAverage_)
+{}
+
+
+template<class Type>
+Foam::
+timeVaryingMappedFixedValuePointPatchField<Type>::
+timeVaryingMappedFixedValuePointPatchField
+(
+    const timeVaryingMappedFixedValuePointPatchField<Type>& ptf,
+    const DimensionedField<Type, pointMesh>& iF
+)
+:
+    fixedValuePointPatchField<Type>(ptf, iF),
+    fieldTableName_(ptf.fieldTableName_),
+    setAverage_(ptf.setAverage_),
+    perturb_(ptf.perturb_),
+    mapperPtr_(ptf.mapperPtr_),
+    sampleTimes_(ptf.sampleTimes_),
+    startSampleTime_(ptf.startSampleTime_),
+    startSampledValues_(ptf.startSampledValues_),
+    startAverage_(ptf.startAverage_),
+    endSampleTime_(ptf.endSampleTime_),
+    endSampledValues_(ptf.endSampledValues_),
+    endAverage_(ptf.endAverage_)
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class Type>
+void Foam::timeVaryingMappedFixedValuePointPatchField<Type>::checkTable()
+{
+    // Initialise
+    if (startSampleTime_ == -1 && endSampleTime_ == -1)
+    {
+        const polyMesh& pMesh = this->patch().boundaryMesh().mesh()();
+
+        // Read the initial point position
+        pointField meshPts;
+
+        if (pMesh.pointsInstance() == pMesh.facesInstance())
+        {
+            meshPts = pointField(pMesh.points(), this->patch().meshPoints());
+        }
+        else
+        {
+            // Load points from facesInstance
+            if (debug)
+            {
+                Info<< "Reloading points0 from " << pMesh.facesInstance()
+                    << endl;
+            }
+
+            pointIOField points0
+            (
+                IOobject
+                (
+                    "points",
+                    pMesh.facesInstance(),
+                    polyMesh::meshSubDir,
+                    pMesh,
+                    IOobject::MUST_READ,
+                    IOobject::NO_WRITE,
+                    false
+                )
+            );
+            meshPts = pointField(points0, this->patch().meshPoints());
+        }
+
+        pointIOField samplePoints
+        (
+            IOobject
+            (
+                "points",
+                this->db().time().constant(),
+                "boundaryData"/this->patch().name(),
+                this->db(),
+                IOobject::MUST_READ,
+                IOobject::AUTO_WRITE,
+                false
+            )
+        );
+
+        mapperPtr_.reset
+        (
+            new pointToPointPlanarInterpolation
+            (
+                samplePoints,
+                meshPts,
+                perturb_
+            )
+        );
+
+        // Read the times for which data is available
+
+        const fileName samplePointsFile = samplePoints.filePath();
+        const fileName samplePointsDir = samplePointsFile.path();
+        sampleTimes_ = Time::findTimes(samplePointsDir);
+
+        if (debug)
+        {
+            Info<< "timeVaryingMappedFixedValuePointPatchField : In directory "
+                << samplePointsDir << " found times "
+                << pointToPointPlanarInterpolation::timeNames(sampleTimes_)
+                << endl;
+        }
+    }
+
+    // Find current time in sampleTimes
+    label lo = -1;
+    label hi = -1;
+
+    bool foundTime = mapperPtr_().findTime
+    (
+        sampleTimes_,
+        startSampleTime_,
+        this->db().time().value(),
+        lo,
+        hi
+    );
+
+    if (!foundTime)
+    {
+        FatalErrorIn
+        (
+            "timeVaryingMappedFixedValuePointPatchField<Type>::checkTable"
+        )   << "Cannot find starting sampling values for current time "
+            << this->db().time().value() << nl
+            << "Have sampling values for times "
+            << pointToPointPlanarInterpolation::timeNames(sampleTimes_) << nl
+            << "In directory "
+            <<  this->db().time().constant()/"boundaryData"/this->patch().name()
+            << "\n    on patch " << this->patch().name()
+            << " of field " << fieldTableName_
+            << exit(FatalError);
+    }
+
+
+    // Update sampled data fields.
+
+    if (lo != startSampleTime_)
+    {
+        startSampleTime_ = lo;
+
+        if (startSampleTime_ == endSampleTime_)
+        {
+            // No need to reread since are end values
+            if (debug)
+            {
+                Pout<< "checkTable : Setting startValues to (already read) "
+                    <<   "boundaryData"
+                        /this->patch().name()
+                        /sampleTimes_[startSampleTime_].name()
+                    << endl;
+            }
+            startSampledValues_ = endSampledValues_;
+            startAverage_ = endAverage_;
+        }
+        else
+        {
+            if (debug)
+            {
+                Pout<< "checkTable : Reading startValues from "
+                    <<   "boundaryData"
+                        /this->patch().name()
+                        /sampleTimes_[lo].name()
+                    << endl;
+            }
+
+            // Reread values and interpolate
+            AverageIOField<Type> vals
+            (
+                IOobject
+                (
+                    fieldTableName_,
+                    this->db().time().constant(),
+                    "boundaryData"
+                   /this->patch().name()
+                   /sampleTimes_[startSampleTime_].name(),
+                    this->db(),
+                    IOobject::MUST_READ,
+                    IOobject::AUTO_WRITE,
+                    false
+                )
+            );
+
+            startAverage_ = vals.average();
+            startSampledValues_ = mapperPtr_().interpolate(vals);
+        }
+    }
+
+    if (hi != endSampleTime_)
+    {
+        endSampleTime_ = hi;
+
+        if (endSampleTime_ == -1)
+        {
+            // endTime no longer valid. Might as well clear endValues.
+            if (debug)
+            {
+                Pout<< "checkTable : Clearing endValues" << endl;
+            }
+            endSampledValues_.clear();
+        }
+        else
+        {
+            if (debug)
+            {
+                Pout<< "checkTable : Reading endValues from "
+                    <<   "boundaryData"
+                        /this->patch().name()
+                        /sampleTimes_[endSampleTime_].name()
+                    << endl;
+            }
+            // Reread values and interpolate
+            AverageIOField<Type> vals
+            (
+                IOobject
+                (
+                    fieldTableName_,
+                    this->db().time().constant(),
+                    "boundaryData"
+                   /this->patch().name()
+                   /sampleTimes_[endSampleTime_].name(),
+                    this->db(),
+                    IOobject::MUST_READ,
+                    IOobject::AUTO_WRITE,
+                    false
+                )
+            );
+            endAverage_ = vals.average();
+            endSampledValues_ = mapperPtr_().interpolate(vals);
+        }
+    }
+}
+
+
+template<class Type>
+void Foam::timeVaryingMappedFixedValuePointPatchField<Type>::updateCoeffs()
+{
+    if (this->updated())
+    {
+        return;
+    }
+
+    checkTable();
+
+    // Interpolate between the sampled data
+
+    Type wantedAverage;
+
+    if (endSampleTime_ == -1)
+    {
+        // only start value
+        if (debug)
+        {
+            Pout<< "updateCoeffs : Sampled, non-interpolated values"
+                << " from start time:"
+                << sampleTimes_[startSampleTime_].name() << nl;
+        }
+
+        this->operator==(startSampledValues_);
+        wantedAverage = startAverage_;
+    }
+    else
+    {
+        scalar start = sampleTimes_[startSampleTime_].value();
+        scalar end = sampleTimes_[endSampleTime_].value();
+
+        scalar s = (this->db().time().value()-start)/(end-start);
+
+        if (debug)
+        {
+            Pout<< "updateCoeffs : Sampled, interpolated values"
+                << " between start time:"
+                << sampleTimes_[startSampleTime_].name()
+                << " and end time:" << sampleTimes_[endSampleTime_].name()
+                << " with weight:" << s << endl;
+        }
+
+        this->operator==((1-s)*startSampledValues_ + s*endSampledValues_);
+        wantedAverage = (1-s)*startAverage_ + s*endAverage_;
+    }
+
+    // Enforce average. Either by scaling (if scaling factor > 0.5) or by
+    // offsetting.
+    if (setAverage_)
+    {
+        const Field<Type>& fld = *this;
+
+        Type averagePsi = gAverage(fld);
+
+        if (debug)
+        {
+            Pout<< "updateCoeffs :"
+                << " actual average:" << averagePsi
+                << " wanted average:" << wantedAverage
+                << endl;
+        }
+
+        if (mag(averagePsi) < VSMALL)
+        {
+            // Field too small to scale. Offset instead.
+            const Type offset = wantedAverage - averagePsi;
+            if (debug)
+            {
+                Pout<< "updateCoeffs :"
+                    << " offsetting with:" << offset << endl;
+            }
+            this->operator==(fld+offset);
+        }
+        else
+        {
+            const scalar scale = mag(wantedAverage)/mag(averagePsi);
+
+            if (debug)
+            {
+                Pout<< "updateCoeffs :"
+                    << " scaling with:" << scale << endl;
+            }
+            this->operator==(scale*fld);
+        }
+    }
+
+    if (debug)
+    {
+        Pout<< "updateCoeffs : set fixedValue to min:" << gMin(*this)
+            << " max:" << gMax(*this) << endl;
+    }
+
+    fixedValuePointPatchField<Type>::updateCoeffs();
+}
+
+
+template<class Type>
+void Foam::timeVaryingMappedFixedValuePointPatchField<Type>::write
+(
+    Ostream& os
+) const
+{
+    fixedValuePointPatchField<Type>::write(os);
+    os.writeKeyword("setAverage") << setAverage_ << token::END_STATEMENT << nl;
+    os.writeKeyword("perturb") << perturb_ << token::END_STATEMENT << nl;
+
+    if (fieldTableName_ != this->dimensionedInternalField().name())
+    {
+        os.writeKeyword("fieldTableName") << fieldTableName_
+            << token::END_STATEMENT << nl;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/src/fvMotionSolver/pointPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValuePointPatchField.H b/src/fvMotionSolver/pointPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValuePointPatchField.H
new file mode 100644
index 0000000000..108ec6786e
--- /dev/null
+++ b/src/fvMotionSolver/pointPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValuePointPatchField.H
@@ -0,0 +1,195 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::timeVaryingMappedFixedValuePointPatchField
+
+Description
+    A time-varying form of a mapped fixed value boundary condition.
+
+See Also
+    Foam::timeVaryingMappedFixedValueFvPatchField
+
+SourceFiles
+    timeVaryingMappedFixedValuePointPatchField.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef timeVaryingMappedFixedValuePointPatchField_H
+#define timeVaryingMappedFixedValuePointPatchField_H
+
+#include "fixedValuePointPatchField.H"
+#include "instantList.H"
+#include "pointToPointPlanarInterpolation.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+        Class timeVaryingMappedFixedValuePointPatchField Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class Type>
+class timeVaryingMappedFixedValuePointPatchField
+:
+    public fixedValuePointPatchField<Type>
+{
+    // Private data
+
+        //- Name of the field data table, defaults to the name of the field
+        word fieldTableName_;
+
+        //- If true adjust the mapped field to maintain average value
+        bool setAverage_;
+
+        //- Fraction of perturbation (fraction of bounding box) to add
+        scalar perturb_;
+
+        //- 2D interpolation
+        autoPtr<pointToPointPlanarInterpolation> mapperPtr_;
+
+        //- List of boundaryData time directories
+        instantList sampleTimes_;
+
+        //- Current starting index in sampleTimes
+        label startSampleTime_;
+
+        //- Interpolated values from startSampleTime
+        Field<Type> startSampledValues_;
+
+        //- If setAverage: starting average value
+        Type startAverage_;
+
+        //- Current end index in sampleTimes
+        label endSampleTime_;
+
+        //- Interpolated values from endSampleTime
+        Field<Type> endSampledValues_;
+
+        //- If setAverage: end average value
+        Type endAverage_;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("timeVaryingMappedFixedValue");
+
+
+    // Constructors
+
+        //- Construct from patch and internal field
+        timeVaryingMappedFixedValuePointPatchField
+        (
+            const pointPatch&,
+            const DimensionedField<Type, pointMesh>&
+        );
+
+        //- Construct from patch, internal field and dictionary
+        timeVaryingMappedFixedValuePointPatchField
+        (
+            const pointPatch&,
+            const DimensionedField<Type, pointMesh>&,
+            const dictionary&
+        );
+
+        //- Construct by mapping given patch field onto a new patch
+        timeVaryingMappedFixedValuePointPatchField
+        (
+            const timeVaryingMappedFixedValuePointPatchField<Type>&,
+            const pointPatch&,
+            const DimensionedField<Type, pointMesh>&,
+            const pointPatchFieldMapper&
+        );
+
+        //- Construct as copy
+        timeVaryingMappedFixedValuePointPatchField
+        (
+            const timeVaryingMappedFixedValuePointPatchField<Type>&
+        );
+
+        //- Construct and return a clone
+        virtual autoPtr<pointPatchField<Type> > clone() const
+        {
+            return autoPtr<pointPatchField<Type> >
+            (
+                new timeVaryingMappedFixedValuePointPatchField<Type>(*this)
+            );
+        }
+
+        //- Construct as copy setting internal field reference
+        timeVaryingMappedFixedValuePointPatchField
+        (
+            const timeVaryingMappedFixedValuePointPatchField<Type>&,
+            const DimensionedField<Type, pointMesh>&
+        );
+
+        //- Construct and return a clone setting internal field reference
+        virtual autoPtr<pointPatchField<Type> > clone
+        (
+            const DimensionedField<Type, pointMesh>& iF
+        ) const
+        {
+            return autoPtr<pointPatchField<Type> >
+            (
+                new timeVaryingMappedFixedValuePointPatchField<Type>(*this, iF)
+            );
+        }
+
+
+    // Member functions
+
+        // Utility functions
+
+            //- Find boundary data inbetween current time and interpolate
+            void checkTable();
+
+
+        // Evaluation functions
+
+            //- Update the coefficients associated with the patch field
+            virtual void updateCoeffs();
+
+
+        //- Write
+        virtual void write(Ostream&) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+#   include "timeVaryingMappedFixedValuePointPatchField.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/fvMotionSolver/pointPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValuePointPatchFields.C b/src/fvMotionSolver/pointPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValuePointPatchFields.C
new file mode 100644
index 0000000000..ed847ab52d
--- /dev/null
+++ b/src/fvMotionSolver/pointPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValuePointPatchFields.C
@@ -0,0 +1,43 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "timeVaryingMappedFixedValuePointPatchFields.H"
+#include "pointPatchFields.H"
+#include "addToRunTimeSelectionTable.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+makePointPatchFields(timeVaryingMappedFixedValue);
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// ************************************************************************* //
diff --git a/src/fvMotionSolver/pointPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValuePointPatchFields.H b/src/fvMotionSolver/pointPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValuePointPatchFields.H
new file mode 100644
index 0000000000..ad06b48066
--- /dev/null
+++ b/src/fvMotionSolver/pointPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValuePointPatchFields.H
@@ -0,0 +1,57 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+InClass
+    Foam::timeVaryingMappedFixedValuePointPatchFields
+
+Description
+
+SourceFiles
+    timeVaryingMappedFixedValuePointPatchFields.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef timeVaryingMappedFixedValuePointPatchFields_H
+#define timeVaryingMappedFixedValuePointPatchFields_H
+
+#include "timeVaryingMappedFixedValuePointPatchField.H"
+#include "fieldTypes.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+makePointPatchFieldTypedefs(timeVaryingMappedFixedValue);
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/meshTools/Make/files b/src/meshTools/Make/files
index 5912ea12e4..3329c2b28d 100644
--- a/src/meshTools/Make/files
+++ b/src/meshTools/Make/files
@@ -158,6 +158,7 @@ triSurface/triangleFuncs/triangleFuncs.C
 triSurface/surfaceFeatures/surfaceFeatures.C
 triSurface/triSurfaceTools/triSurfaceTools.C
 triSurface/triSurfaceTools/geompack/geompack.C
+triSurface/triSurfaceTools/pointToPointPlanarInterpolation.C
 
 twoDPointCorrector/twoDPointCorrector.C
 
diff --git a/src/meshTools/triSurface/triSurfaceTools/pointToPointPlanarInterpolation.C b/src/meshTools/triSurface/triSurfaceTools/pointToPointPlanarInterpolation.C
new file mode 100644
index 0000000000..c60be140af
--- /dev/null
+++ b/src/meshTools/triSurface/triSurfaceTools/pointToPointPlanarInterpolation.C
@@ -0,0 +1,322 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "pointToPointPlanarInterpolation.H"
+#include "boundBox.H"
+#include "Random.H"
+#include "vector2D.H"
+#include "triSurface.H"
+#include "triSurfaceTools.H"
+#include "OFstream.H"
+#include "Time.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+defineTypeNameAndDebug(Foam::pointToPointPlanarInterpolation, 0);
+
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+Foam::coordinateSystem
+Foam::pointToPointPlanarInterpolation::calcCoordinateSystem
+(
+    const pointField& points
+) const
+{
+    if (points.size() < 3)
+    {
+        FatalErrorIn
+        (
+            "pointToPointPlanarInterpolation::calcCoordinateSystem"
+            "(const pointField&)"
+        )   << "Only " << points.size() << " provided." << nl
+            << "Need at least three non-colinear points"
+            << " to be able to interpolate."
+            << exit(FatalError);
+    }
+
+    const point& p0 = points[0];
+
+    // Find furthest away point
+    vector e1;
+    label index1 = -1;
+    scalar maxDist = -GREAT;
+
+    for (label i = 1; i < points.size(); i++)
+    {
+        const vector d = points[i] - p0;
+        scalar magD = mag(d);
+
+        if (magD > maxDist)
+        {
+            e1 = d/magD;
+            index1 = i;
+            maxDist = magD;
+        }
+    }
+    // Find point that is furthest away from line p0-p1
+    const point& p1 = points[index1];
+
+    label index2 = -1;
+    maxDist = -GREAT;
+    for (label i = 1; i < points.size(); i++)
+    {
+        if (i != index1)
+        {
+            const point& p2 = points[i];
+            vector e2(p2 - p0);
+            e2 -= (e2&e1)*e1;
+            scalar magE2 = mag(e2);
+
+            if (magE2 > maxDist)
+            {
+                index2 = i;
+                maxDist = magE2;
+            }
+        }
+    }
+    if (index2 == -1)
+    {
+        FatalErrorIn
+        (
+            "pointToPointPlanarInterpolation::calcCoordinateSystem"
+            "(const pointField&)"
+        )   << "Cannot find points that make valid normal." << nl
+            << "Have so far points " << p0 << " and " << p1
+            << "Need at least three points which are not in a line."
+            << exit(FatalError);
+    }
+
+    vector n = e1^(points[index2]-p0);
+    n /= mag(n);
+
+    if (debug)
+    {
+        Info<< "pointToPointPlanarInterpolation::calcCoordinateSystem :"
+            << " Used points " << p0 << ' ' << points[index1]
+            << ' ' << points[index2]
+            << " to define coordinate system with normal " << n << endl;
+    }
+
+    return coordinateSystem
+    (
+        "reference",
+        p0,  // origin
+        n,   // normal
+        e1   // 0-axis
+    );
+}
+
+
+void Foam::pointToPointPlanarInterpolation::calcWeights
+(
+    const pointField& sourcePoints,
+    const pointField& destPoints
+)
+{
+    tmp<vectorField> tlocalVertices
+    (
+        referenceCS_.localPosition(sourcePoints)
+    );
+    vectorField& localVertices = tlocalVertices();
+
+    const boundBox bb(localVertices, true);
+    const point bbMid(bb.midpoint());
+
+    if (debug)
+    {
+        Info<< "pointToPointPlanarInterpolation::readData :"
+            << " Perturbing points with " << perturb_
+            << " fraction of a random position inside " << bb
+            << " to break any ties on regular meshes."
+            << nl << endl;
+    }
+
+    Random rndGen(123456);
+    forAll(localVertices, i)
+    {
+        localVertices[i] +=
+            perturb_
+           *(rndGen.position(bb.min(), bb.max())-bbMid);
+    }
+
+    // Determine triangulation
+    List<vector2D> localVertices2D(localVertices.size());
+    forAll(localVertices, i)
+    {
+        localVertices2D[i][0] = localVertices[i][0];
+        localVertices2D[i][1] = localVertices[i][1];
+    }
+
+    triSurface s(triSurfaceTools::delaunay2D(localVertices2D));
+
+    tmp<pointField> tlocalFaceCentres
+    (
+        referenceCS_.localPosition
+        (
+            destPoints
+        )
+    );
+    const pointField& localFaceCentres = tlocalFaceCentres();
+
+    if (debug)
+    {
+        Pout<< "pointToPointPlanarInterpolation::readData :"
+            <<" Dumping triangulated surface to triangulation.stl" << endl;
+        s.write("triangulation.stl");
+
+        OFstream str("localFaceCentres.obj");
+        Pout<< "readSamplePoints :"
+            << " Dumping face centres to " << str.name() << endl;
+
+        forAll(localFaceCentres, i)
+        {
+            const point& p = localFaceCentres[i];
+            str<< "v " << p.x() << ' ' << p.y() << ' ' << p.z() << nl;
+        }
+    }
+
+    // Determine interpolation onto face centres.
+    triSurfaceTools::calcInterpolationWeights
+    (
+        s,
+        localFaceCentres,   // points to interpolate to
+        nearestVertex_,
+        nearestVertexWeight_
+    );
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::pointToPointPlanarInterpolation::pointToPointPlanarInterpolation
+(
+    const pointField& sourcePoints,
+    const pointField& destPoints,
+    const scalar perturb
+)
+:
+    perturb_(perturb),
+    referenceCS_(calcCoordinateSystem(sourcePoints))
+
+{
+    calcWeights(sourcePoints, destPoints);
+}
+
+
+Foam::pointToPointPlanarInterpolation::pointToPointPlanarInterpolation
+(
+    const coordinateSystem& referenceCS,
+    const pointField& sourcePoints,
+    const pointField& destPoints,
+    const scalar perturb
+)
+:
+    perturb_(perturb),
+    referenceCS_(referenceCS)
+{
+    calcWeights(sourcePoints, destPoints);
+}
+
+
+// * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
+
+Foam::wordList Foam::pointToPointPlanarInterpolation::timeNames
+(
+    const instantList& times
+)
+{
+    wordList names(times.size());
+
+    forAll(times, i)
+    {
+        names[i] = times[i].name();
+    }
+    return names;
+}
+
+
+bool Foam::pointToPointPlanarInterpolation::findTime
+(
+    const instantList& times,
+    const label startSampleTime,
+    const scalar timeVal,
+    label& lo,
+    label& hi
+)
+{
+    lo = startSampleTime;
+    hi = -1;
+
+    for (label i = startSampleTime+1; i < times.size(); i++)
+    {
+        if (times[i].value() > timeVal)
+        {
+            break;
+        }
+        else
+        {
+            lo = i;
+        }
+    }
+
+    if (lo == -1)
+    {
+        //FatalErrorIn("findTime(..)")
+        //    << "Cannot find starting sampling values for current time "
+        //    << timeVal << nl
+        //    << "Have sampling values for times "
+        //    << timeNames(times) << nl
+        //    << exit(FatalError);
+        return false;
+    }
+
+    if (lo < times.size()-1)
+    {
+        hi = lo+1;
+    }
+
+
+    if (debug)
+    {
+        if (hi == -1)
+        {
+            Pout<< "findTime : Found time " << timeVal << " after"
+                << " index:" << lo << " time:" << times[lo].value()
+                << endl;
+        }
+        else
+        {
+            Pout<< "findTime : Found time " << timeVal << " inbetween"
+                << " index:" << lo << " time:" << times[lo].value()
+                << " and index:" << hi << " time:" << times[hi].value()
+                << endl;
+        }
+    }
+    return true;
+}
+
+
+// ************************************************************************* //
diff --git a/src/meshTools/triSurface/triSurfaceTools/pointToPointPlanarInterpolation.H b/src/meshTools/triSurface/triSurfaceTools/pointToPointPlanarInterpolation.H
new file mode 100644
index 0000000000..daec2e4688
--- /dev/null
+++ b/src/meshTools/triSurface/triSurfaceTools/pointToPointPlanarInterpolation.H
@@ -0,0 +1,164 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::pointToPointPlanarInterpolation
+
+Description
+    Interpolates between two sets of unstructured points using 2D Delaunay
+    triangulation. Used in e.g. timeVaryingMapped bcs.
+
+SourceFiles
+    pointToPointPlanarInterpolation.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef pointToPointPlanarInterpolation_H
+#define pointToPointPlanarInterpolation_H
+
+#include "FixedList.H"
+#include "coordinateSystem.H"
+#include "instantList.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+               Class pointToPointPlanarInterpolation Declaration
+\*---------------------------------------------------------------------------*/
+
+class pointToPointPlanarInterpolation
+{
+    // Private data
+
+        //- Perturbation factor
+        const scalar perturb_;
+
+        //- Coordinate system
+        coordinateSystem referenceCS_;
+
+        //- Current interpolation addressing to face centres of underlying
+        //  patch
+        List<FixedList<label, 3> > nearestVertex_;
+
+        //- Current interpolation factors to face centres of underlying
+        //  patch
+        List<FixedList<scalar, 3> > nearestVertexWeight_;
+
+    // Private Member Functions
+
+        //- Calculate a local coordinate system from set of points
+        coordinateSystem calcCoordinateSystem(const pointField&) const;
+
+        //- Calculate addressing and weights
+        void calcWeights
+        (
+            const pointField& sourcePoints,
+            const pointField& destPoints
+        );
+
+public:
+
+    // Declare name of the class and its debug switch
+    ClassName("pointToPointPlanarInterpolation");
+
+
+    // Constructors
+
+        //- Construct from 3D locations. Determines local coordinate system
+        //  from sourcePoints and maps onto that.
+        pointToPointPlanarInterpolation
+        (
+            const pointField& sourcePoints,
+            const pointField& destPoints,
+            const scalar perturb
+        );
+
+        //- Construct from coordinate system and locations.
+        pointToPointPlanarInterpolation
+        (
+            const coordinateSystem& referenceCS,
+            const pointField& sourcePoints,
+            const pointField& destPoints,
+            const scalar perturb
+        );
+
+
+    // Member Functions
+
+        //- Return the coordinateSystem
+        const coordinateSystem& referenceCS() const
+        {
+            return referenceCS_;
+        }
+
+        //  patch
+        const List<FixedList<label, 3> >& nearestVertex() const
+        {
+            return nearestVertex_;
+        }
+
+        //- Current interpolation factors to face centres of underlying
+        //  patch
+        const List<FixedList<scalar, 3> >& nearestVertexWeight() const
+        {
+            return nearestVertexWeight_;
+        }
+
+        //- Helper: extract words of times
+        static wordList timeNames(const instantList&);
+
+        //- Helper: find time. Return true if succesful.
+        static bool findTime
+        (
+            const instantList& times,
+            const label startSampleTime,
+            const scalar timeVal,
+            label& lo,
+            label& hi
+        );
+
+        //- Interpolate from field on source points to dest points
+        template<class Type>
+        tmp<Field<Type> > interpolate(const Field<Type>& sourceFld) const;
+
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+#   include "pointToPointPlanarInterpolationTemplates.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/meshTools/triSurface/triSurfaceTools/pointToPointPlanarInterpolationTemplates.C b/src/meshTools/triSurface/triSurfaceTools/pointToPointPlanarInterpolationTemplates.C
new file mode 100644
index 0000000000..9159a03edd
--- /dev/null
+++ b/src/meshTools/triSurface/triSurfaceTools/pointToPointPlanarInterpolationTemplates.C
@@ -0,0 +1,71 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "pointToPointPlanarInterpolation.H"
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class Type>
+Foam::tmp<Foam::Field<Type> > Foam::pointToPointPlanarInterpolation::interpolate
+(
+    const Field<Type>& sourceFld
+) const
+{
+    tmp<Field<Type> > tfld(new Field<Type>(nearestVertex_.size()));
+    Field<Type>& fld = tfld();
+
+    forAll(fld, i)
+    {
+        const FixedList<label, 3>& verts = nearestVertex_[i];
+        const FixedList<scalar, 3>& w = nearestVertexWeight_[i];
+
+        if (verts[2] == -1)
+        {
+            if (verts[1] == -1)
+            {
+                // Use vertex0 only
+                fld[i] = sourceFld[verts[0]];
+            }
+            else
+            {
+                // Use vertex 0,1
+                fld[i] =
+                    w[0]*sourceFld[verts[0]]
+                  + w[1]*sourceFld[verts[1]];
+            }
+        }
+        else
+        {
+            fld[i] =
+                w[0]*sourceFld[verts[0]]
+              + w[1]*sourceFld[verts[1]]
+              + w[2]*sourceFld[verts[2]];
+        }
+    }
+    return tfld;
+}
+
+
+// ************************************************************************* //
diff --git a/src/meshTools/triSurface/triSurfaceTools/triSurfaceTools.H b/src/meshTools/triSurface/triSurfaceTools/triSurfaceTools.H
index 2328aa8284..ede548fd83 100644
--- a/src/meshTools/triSurface/triSurfaceTools/triSurfaceTools.H
+++ b/src/meshTools/triSurface/triSurfaceTools/triSurfaceTools.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -25,7 +25,7 @@ Class
     Foam::triSurfaceTools
 
 Description
-    A collection of tools for triSurfaceMesh
+    A collection of tools for triSurface.
 
 SourceFiles
     triSurfaceTools.C

From 48c70a91df4c2f0eb896731ef36a8dba7b5bc7ac Mon Sep 17 00:00:00 2001
From: sergio <sergio>
Date: Fri, 13 Apr 2012 16:31:07 +0100
Subject: [PATCH 193/317] ENH: Adding dimensioSet to DataEntry and modify
 MRFZone entry types

---
 .../dimensionedType/dimensionedType.C         |  10 ++
 .../dimensionedType/dimensionedType.H         |   3 +
 .../primitives/functions/DataEntry/CSV/CSV.H  |  16 +++
 .../CompatibilityConstant.C                   |  43 ++++++-
 .../CompatibilityConstant.H                   |  14 +++
 .../functions/DataEntry/Constant/Constant.C   |  40 +++++-
 .../functions/DataEntry/Constant/Constant.H   |  14 +++
 .../functions/DataEntry/DataEntry/DataEntry.C | 116 +++++++++++++++---
 .../functions/DataEntry/DataEntry/DataEntry.H |  53 ++++++--
 .../DataEntry/DataEntry/DataEntryNew.C        |  10 +-
 .../functions/DataEntry/Table/Table.C         |   6 +
 .../functions/DataEntry/Table/Table.H         |  18 ++-
 .../functions/DataEntry/Table/TableBase.C     |  33 ++++-
 .../functions/DataEntry/Table/TableBase.H     |  14 +++
 .../functions/DataEntry/TableFile/TableFile.C |   5 +
 .../functions/DataEntry/TableFile/TableFile.H |  21 +++-
 .../DataEntry/polynomial/polynomial.C         |  38 +++++-
 .../DataEntry/polynomial/polynomial.H         |  16 ++-
 .../cfdTools/general/MRF/MRFZone.C            |  37 ++++--
 .../cfdTools/general/MRF/MRFZone.H            |  13 +-
 .../cfdTools/general/MRF/MRFZoneTemplates.C   |  12 +-
 .../mixerVessel2D/constant/MRFZones           |   6 +-
 .../mixerVessel2D/constant/MRFZones           |   6 +-
 .../mixerVesselAMI2D/constant/MRFZones        |   6 +-
 .../mixerVessel2D/constant/MRFZones           |   6 +-
 .../mixerVessel2D/constant/MRFZones           |   6 +-
 .../mixerVessel2D/constant/MRFZones           |   6 +-
 .../mixerVessel2D/constant/MRFZones           |   6 +-
 .../mixerVessel2D/constant/MRFZones           |   6 +-
 29 files changed, 488 insertions(+), 92 deletions(-)

diff --git a/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.C b/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.C
index acaed52ac9..0ea21821e5 100644
--- a/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.C
+++ b/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.C
@@ -154,6 +154,16 @@ dimensioned<Type>::dimensioned
 }
 
 
+template <class Type>
+dimensioned<Type>::dimensioned
+()
+:
+    name_("undefined"),
+    dimensions_(dimless),
+    value_(pTraits<Type>::zero)
+{}
+
+
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template <class Type>
diff --git a/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.H b/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.H
index 03fd0084ef..3cb8e0222a 100644
--- a/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.H
+++ b/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.H
@@ -107,6 +107,9 @@ public:
         //- Construct from an Istream with a given name and dimensions
         dimensioned(const word&, const dimensionSet&, Istream&);
 
+        //- Null constructor
+        dimensioned();
+
         //- Construct from dictionary, with default value.
         static dimensioned<Type> lookupOrDefault
         (
diff --git a/src/OpenFOAM/primitives/functions/DataEntry/CSV/CSV.H b/src/OpenFOAM/primitives/functions/DataEntry/CSV/CSV.H
index 905544b489..14e6eb1fb5 100644
--- a/src/OpenFOAM/primitives/functions/DataEntry/CSV/CSV.H
+++ b/src/OpenFOAM/primitives/functions/DataEntry/CSV/CSV.H
@@ -163,6 +163,22 @@ public:
                 return TableBase<Type>::integrate(x1, x2);
             }
 
+            //- Return dimensioned constant value
+            virtual dimensioned<Type> dimValue(const scalar x) const
+            {
+                return TableBase<Type>::dimValue(x);
+            }
+
+            //- Integrate between two values and return dimensioned type
+            virtual dimensioned<Type> dimIntegrate
+            (
+                const scalar x1,
+                const scalar x2
+            ) const
+            {
+                return TableBase<Type>::dimIntegrate(x1, x2);
+            }
+
 
     // I/O
 
diff --git a/src/OpenFOAM/primitives/functions/DataEntry/CompatibilityConstant/CompatibilityConstant.C b/src/OpenFOAM/primitives/functions/DataEntry/CompatibilityConstant/CompatibilityConstant.C
index 205b4b5732..78c6a4d7c5 100644
--- a/src/OpenFOAM/primitives/functions/DataEntry/CompatibilityConstant/CompatibilityConstant.C
+++ b/src/OpenFOAM/primitives/functions/DataEntry/CompatibilityConstant/CompatibilityConstant.C
@@ -34,9 +34,27 @@ Foam::CompatibilityConstant<Type>::CompatibilityConstant
 )
 :
     DataEntry<Type>(entryName),
-    value_(pTraits<Type>::zero)
+    value_(pTraits<Type>::zero),
+    dimensions_(dimless)
 {
-    dict.lookup(entryName)  >> value_;
+    Istream& is(dict.lookup(entryName));
+
+    token firstToken(is);
+    if (firstToken.isWord())
+    {
+        token nextToken(is);
+        if (nextToken == token::BEGIN_SQR)
+        {
+            is.putBack(nextToken);
+            is >> dimensions_;
+            is >> value_;
+        }
+    }
+    else
+    {
+        is.putBack(firstToken);
+        is  >> value_;
+    }
 }
 
 
@@ -47,10 +65,10 @@ Foam::CompatibilityConstant<Type>::CompatibilityConstant
 )
 :
     DataEntry<Type>(cnst),
-    value_(cnst.value_)
+    value_(cnst.value_),
+    dimensions_(cnst.dimensions_)
 {}
 
-
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
 template<class Type>
@@ -78,6 +96,23 @@ Type Foam::CompatibilityConstant<Type>::integrate
 }
 
 
+template<class Type>
+Foam::dimensioned<Type> Foam::CompatibilityConstant<Type>::
+dimValue(const scalar x) const
+{
+    return dimensioned<Type>("dimensionedValue", dimensions_, value_);
+}
+
+
+template<class Type>
+Foam::dimensioned<Type> Foam::CompatibilityConstant<Type>::dimIntegrate
+(
+    const scalar x1, const scalar x2
+) const
+{
+    return dimensioned<Type>("dimensionedValue", dimensions_, (x2-x1)*value_);
+}
+
 // * * * * * * * * * * * * * *  IOStream operators * * * * * * * * * * * * * //
 
 #include "CompatibilityConstantIO.C"
diff --git a/src/OpenFOAM/primitives/functions/DataEntry/CompatibilityConstant/CompatibilityConstant.H b/src/OpenFOAM/primitives/functions/DataEntry/CompatibilityConstant/CompatibilityConstant.H
index 9e2f46bb20..8ce8d28170 100644
--- a/src/OpenFOAM/primitives/functions/DataEntry/CompatibilityConstant/CompatibilityConstant.H
+++ b/src/OpenFOAM/primitives/functions/DataEntry/CompatibilityConstant/CompatibilityConstant.H
@@ -42,6 +42,7 @@ SourceFiles
 #define CompatibilityConstant_H
 
 #include "DataEntry.H"
+#include "dimensionSet.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -68,6 +69,9 @@ class CompatibilityConstant
         //- Constant value
         Type value_;
 
+        //- The dimension set
+        dimensionSet dimensions_;
+
 
     // Private Member Functions
 
@@ -111,6 +115,16 @@ public:
         //- Integrate between two values
         Type integrate(const scalar x1, const scalar x2) const;
 
+        //- Return dimensioned constant value
+        dimensioned<Type> dimValue(const scalar) const;
+
+        //- Integrate between two values and return dimensioned type
+        dimensioned<Type> dimIntegrate
+        (
+            const scalar x1,
+            const scalar x2
+        ) const;
+
 
     // I/O
 
diff --git a/src/OpenFOAM/primitives/functions/DataEntry/Constant/Constant.C b/src/OpenFOAM/primitives/functions/DataEntry/Constant/Constant.C
index 410052f560..a1b7f4777b 100644
--- a/src/OpenFOAM/primitives/functions/DataEntry/Constant/Constant.C
+++ b/src/OpenFOAM/primitives/functions/DataEntry/Constant/Constant.C
@@ -31,12 +31,27 @@ template<class Type>
 Foam::Constant<Type>::Constant(const word& entryName, const dictionary& dict)
 :
     DataEntry<Type>(entryName),
-    value_(pTraits<Type>::zero)
+    value_(pTraits<Type>::zero),
+    dimensions_(dimless)
 {
     Istream& is(dict.lookup(entryName));
     word entryType(is);
-
-    is  >> value_;
+    token firstToken(is);
+    if (firstToken.isWord())
+    {
+        token nextToken(is);
+        if (nextToken == token::BEGIN_SQR)
+        {
+            is.putBack(nextToken);
+            is >> dimensions_;
+            is >> value_;
+        }
+    }
+    else
+    {
+        is.putBack(firstToken);
+        is  >> value_;
+    }
 }
 
 
@@ -44,7 +59,8 @@ template<class Type>
 Foam::Constant<Type>::Constant(const Constant<Type>& cnst)
 :
     DataEntry<Type>(cnst),
-    value_(cnst.value_)
+    value_(cnst.value_),
+    dimensions_(cnst.dimensions_)
 {}
 
 
@@ -71,6 +87,22 @@ Type Foam::Constant<Type>::integrate(const scalar x1, const scalar x2) const
 }
 
 
+template<class Type>
+Foam::dimensioned<Type> Foam::Constant<Type>::dimValue(const scalar x) const
+{
+    return dimensioned<Type>("dimensionedValue", dimensions_, value_);
+}
+
+
+template<class Type>
+Foam::dimensioned<Type> Foam::Constant<Type>::dimIntegrate
+(
+    const scalar x1, const scalar x2
+) const
+{
+    return dimensioned<Type>("dimensionedValue", dimensions_, (x2-x1)*value_);
+}
+
 // * * * * * * * * * * * * * *  IOStream operators * * * * * * * * * * * * * //
 
 #include "ConstantIO.C"
diff --git a/src/OpenFOAM/primitives/functions/DataEntry/Constant/Constant.H b/src/OpenFOAM/primitives/functions/DataEntry/Constant/Constant.H
index c42e07e054..0c251fec03 100644
--- a/src/OpenFOAM/primitives/functions/DataEntry/Constant/Constant.H
+++ b/src/OpenFOAM/primitives/functions/DataEntry/Constant/Constant.H
@@ -41,6 +41,7 @@ SourceFiles
 #define Constant_H
 
 #include "DataEntry.H"
+#include "dimensionSet.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -67,6 +68,9 @@ class Constant
         //- Constant value
         Type value_;
 
+        //- The dimension set
+        dimensionSet dimensions_;
+
 
     // Private Member Functions
 
@@ -107,6 +111,16 @@ public:
         //- Integrate between two values
         Type integrate(const scalar x1, const scalar x2) const;
 
+        //- Return dimensioned constant value
+        dimensioned<Type> dimValue(const scalar) const;
+
+        //- Integrate between two values and return dimensioned type
+        dimensioned<Type> dimIntegrate
+        (
+            const scalar x1,
+            const scalar x2
+        ) const;
+
 
     // I/O
 
diff --git a/src/OpenFOAM/primitives/functions/DataEntry/DataEntry/DataEntry.C b/src/OpenFOAM/primitives/functions/DataEntry/DataEntry/DataEntry.C
index c4083d8517..985a050021 100644
--- a/src/OpenFOAM/primitives/functions/DataEntry/DataEntry/DataEntry.C
+++ b/src/OpenFOAM/primitives/functions/DataEntry/DataEntry/DataEntry.C
@@ -76,6 +76,22 @@ Type Foam::DataEntry<Type>::value(const scalar x) const
 }
 
 
+template<class Type>
+Type Foam::DataEntry<Type>::integrate(const scalar x1, const scalar x2) const
+{
+    notImplemented
+    (
+        "Type Foam::DataEntry<Type>::integrate"
+        "("
+            "const scalar, "
+            "const scalar"
+        ") const"
+    );
+
+    return pTraits<Type>::zero;
+}
+
+
 template<class Type>
 Foam::tmp<Foam::Field<Type> > Foam::DataEntry<Type>::value
 (
@@ -93,22 +109,6 @@ Foam::tmp<Foam::Field<Type> > Foam::DataEntry<Type>::value
 }
 
 
-template<class Type>
-Type Foam::DataEntry<Type>::integrate(const scalar x1, const scalar x2) const
-{
-    notImplemented
-    (
-        "Type Foam::DataEntry<Type>::integrate"
-        "("
-            "const scalar, "
-            "const scalar"
-        ") const"
-    );
-
-    return pTraits<Type>::zero;
-}
-
-
 template<class Type>
 Foam::tmp<Foam::Field<Type> > Foam::DataEntry<Type>::integrate
 (
@@ -127,6 +127,90 @@ Foam::tmp<Foam::Field<Type> > Foam::DataEntry<Type>::integrate
 }
 
 
+
+template<class Type>
+Foam::dimensioned<Type> Foam::DataEntry<Type>::dimValue(const scalar x) const
+{
+    notImplemented
+    (
+        "dimensioned<Type> Foam::DataEntry<dimensioned<Type> >::dimValue"
+        "(const scalar) const"
+    );
+
+    return dimensioned<Type>("zero", dimless, pTraits<Type>::zero);
+}
+
+
+template<class Type>
+Foam::dimensioned<Type> Foam::DataEntry<Type>::dimIntegrate
+(
+    const scalar x1,
+    const scalar x2
+) const
+{
+    notImplemented
+    (
+        "dimensioned<Type> Foam::DataEntry<Type>::dimIntegrate"
+        "("
+            "const scalar, "
+            "const scalar"
+        ") const"
+    );
+
+    return dimensioned<Type>("zero", dimless, pTraits<Type>::zero);
+}
+
+
+template<class Type>
+Foam::tmp<Foam::Field<Foam::dimensioned<Type> > >
+Foam::DataEntry<Type>::dimValue
+(
+    const scalarField& x
+) const
+{
+
+    tmp<Field<dimensioned<Type> > > tfld
+    (
+        new Field<dimensioned<Type> >
+        (
+            x.size(),
+            dimensioned<Type>("zero", dimless, pTraits<Type>::zero)
+        )
+    );
+
+    Field<dimensioned<Type> >& fld = tfld();
+
+    forAll(x, i)
+    {
+        fld[i] = this->dimValue(x[i]);
+    }
+    return tfld;
+}
+
+
+template<class Type>
+Foam::tmp<Foam::Field<Foam::dimensioned<Type> > >
+Foam::DataEntry<Type>::dimIntegrate
+(
+    const scalarField& x1,
+    const scalarField& x2
+) const
+{
+    tmp<Field<dimensioned<Type> > > tfld
+    (
+        new Field<dimensioned<Type> >(x1.size())
+    );
+
+    Field<dimensioned<Type> >& fld = tfld();
+
+    forAll(x1, i)
+    {
+        fld[i] = this->dimIntegrate(x1[i], x2[i]);
+    }
+    return tfld;
+}
+
+
 // * * * * * * * * * * * * * *  IOStream operators * * * * * * * * * * * * * //
 
 #include "DataEntryIO.C"
diff --git a/src/OpenFOAM/primitives/functions/DataEntry/DataEntry/DataEntry.H b/src/OpenFOAM/primitives/functions/DataEntry/DataEntry/DataEntry.H
index 3061fa00f6..9cfdb66e25 100644
--- a/src/OpenFOAM/primitives/functions/DataEntry/DataEntry/DataEntry.H
+++ b/src/OpenFOAM/primitives/functions/DataEntry/DataEntry/DataEntry.H
@@ -41,6 +41,7 @@ SourceFiles
 
 #include "dictionary.H"
 #include "Field.H"
+#include "dimensionedType.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -141,23 +142,49 @@ public:
             virtual void convertTimeBase(const Time& t);
 
 
-        // Evaluation
+public:
 
-            //- Return value as a function of (scalar) independent variable
-            virtual Type value(const scalar x) const;
 
-            //- Return value as a function of (scalar) independent variable
-            virtual tmp<Field<Type> > value(const scalarField& x) const;
+    // Evaluation
 
-            //- Integrate between two (scalar) values
-            virtual Type integrate(const scalar x1, const scalar x2) const;
+        //- Return value as a function of (scalar) independent variable
+        virtual Type value(const scalar x) const;
 
-            //- Integrate between two (scalar) values
-            virtual tmp<Field<Type> > integrate
-            (
-                const scalarField& x1,
-                const scalarField& x2
-            ) const;
+        //- Return value as a function of (scalar) independent variable
+        virtual tmp<Field<Type> > value(const scalarField& x) const;
+
+        //- Integrate between two (scalar) values
+        virtual Type integrate(const scalar x1, const scalar x2) const;
+
+        //- Integrate between two (scalar) values
+        virtual tmp<Field<Type> > integrate
+        (
+            const scalarField& x1,
+            const scalarField& x2
+        ) const;
+
+        //- Return dimensioned type
+        virtual dimensioned<Type> dimValue(const scalar x) const;
+
+        //- Return dimensioned type as a function of (scalar)
+        virtual tmp<Field<dimensioned<Type> > > dimValue
+        (
+            const scalarField& x
+        ) const;
+
+        //- Integrate between two scalars and returns a dimensioned type
+        virtual dimensioned<Type> dimIntegrate
+        (
+            const scalar x1,
+            const scalar x2
+        ) const;
+
+        //- Integrate between two scalars and returns list of dimensioned type
+        virtual tmp<Field<dimensioned<Type> > > dimIntegrate
+        (
+            const scalarField& x1,
+            const scalarField& x2
+        ) const;
 
 
     // I/O
diff --git a/src/OpenFOAM/primitives/functions/DataEntry/DataEntry/DataEntryNew.C b/src/OpenFOAM/primitives/functions/DataEntry/DataEntry/DataEntryNew.C
index 5786665f6a..dfbb95674b 100644
--- a/src/OpenFOAM/primitives/functions/DataEntry/DataEntry/DataEntryNew.C
+++ b/src/OpenFOAM/primitives/functions/DataEntry/DataEntry/DataEntryNew.C
@@ -41,7 +41,15 @@ Foam::autoPtr<Foam::DataEntry<Type> > Foam::DataEntry<Type>::New
     word DataEntryType;
     if (firstToken.isWord())
     {
-        DataEntryType = firstToken.wordToken();
+        // Dimensioned type default compatibility
+        if (firstToken.wordToken() == entryName)
+        {
+            DataEntryType = "CompatibilityConstant";
+        }
+        else
+        {
+            DataEntryType = firstToken.wordToken();
+        }
     }
     else
     {
diff --git a/src/OpenFOAM/primitives/functions/DataEntry/Table/Table.C b/src/OpenFOAM/primitives/functions/DataEntry/Table/Table.C
index dd60ac90fb..56c7a2b669 100644
--- a/src/OpenFOAM/primitives/functions/DataEntry/Table/Table.C
+++ b/src/OpenFOAM/primitives/functions/DataEntry/Table/Table.C
@@ -36,6 +36,12 @@ Foam::Table<Type>::Table(const word& entryName, const dictionary& dict)
     Istream& is(dict.lookup(entryName));
     word entryType(is);
 
+    token firstToken(is);
+    is.putBack(firstToken);
+    if (firstToken == token::BEGIN_SQR)
+    {
+        is >> this->dimensions_;
+    }
     is  >> this->table_;
 
     TableBase<Type>::check();
diff --git a/src/OpenFOAM/primitives/functions/DataEntry/Table/Table.H b/src/OpenFOAM/primitives/functions/DataEntry/Table/Table.H
index 3f19ec38f2..63d7b293e3 100644
--- a/src/OpenFOAM/primitives/functions/DataEntry/Table/Table.H
+++ b/src/OpenFOAM/primitives/functions/DataEntry/Table/Table.H
@@ -30,7 +30,7 @@ Description
     in the form, e.g. for an entry \<entryName\> that is (scalar, vector):
 
     \verbatim
-        <entryName>   table
+        <entryName>   table [0 1 0 0 0] //dimension set optional
         (
             0.0 (1 2 3)
             1.0 (4 5 6)
@@ -129,6 +129,22 @@ public:
                 return TableBase<Type>::integrate(x1, x2);
             }
 
+             //- Return dimensioned constant value
+            virtual dimensioned<Type> dimValue(const scalar x) const
+            {
+                return TableBase<Type>::dimValue(x);
+            }
+
+            //- Integrate between two values and return dimensioned type
+            virtual dimensioned<Type> dimIntegrate
+            (
+                const scalar x1,
+                const scalar x2
+            )
+            {
+                return TableBase<Type>::dimIntegrate(x1, x2);
+            }
+
 
     // I/O
 
diff --git a/src/OpenFOAM/primitives/functions/DataEntry/Table/TableBase.C b/src/OpenFOAM/primitives/functions/DataEntry/Table/TableBase.C
index cadc9c53a5..c977618e2a 100644
--- a/src/OpenFOAM/primitives/functions/DataEntry/Table/TableBase.C
+++ b/src/OpenFOAM/primitives/functions/DataEntry/Table/TableBase.C
@@ -39,7 +39,8 @@ Foam::TableBase<Type>::TableBase(const word& name, const dictionary& dict)
             dict.lookupOrDefault<word>("outOfBounds", "clamp")
         )
     ),
-    table_()
+    table_(),
+    dimensions_(dimless)
 {}
 
 
@@ -48,7 +49,8 @@ Foam::TableBase<Type>::TableBase(const TableBase<Type>& tbl)
 :
     name_(tbl.name_),
     boundsHandling_(tbl.boundsHandling_),
-    table_(tbl.table_)
+    table_(tbl.table_),
+    dimensions_(tbl.dimensions_)
 {}
 
 
@@ -330,6 +332,11 @@ Type Foam::TableBase<Type>::value(const scalar x) const
         i++;
     }
 
+Info <<
+     (xDash - table_[i].first())/(table_[i+1].first() - table_[i].first())
+      * (table_[i+1].second() - table_[i].second())
+      + table_[i].second() << endl;
+
     // Linear interpolation to find value
     return Type
     (
@@ -403,6 +410,28 @@ Type Foam::TableBase<Type>::integrate(const scalar x1, const scalar x2) const
 }
 
 
+template<class Type>
+Foam::dimensioned<Type> Foam::TableBase<Type>::
+dimValue(const scalar x) const
+{
+    return dimensioned<Type>("dimensionedValue", dimensions_, this->value(x));
+}
+
+
+template<class Type>
+Foam::dimensioned<Type> Foam::TableBase<Type>::dimIntegrate
+(
+    const scalar x1, const scalar x2
+) const
+{
+    return dimensioned<Type>
+    (
+        "dimensionedValue",
+        dimensions_,
+        this->integrate(x2, x1)
+    );
+}
+
 // * * * * * * * * * * * * * *  IOStream operators * * * * * * * * * * * * * //
 
 #include "TableBaseIO.C"
diff --git a/src/OpenFOAM/primitives/functions/DataEntry/Table/TableBase.H b/src/OpenFOAM/primitives/functions/DataEntry/Table/TableBase.H
index a5cd5edeea..15164b3d90 100644
--- a/src/OpenFOAM/primitives/functions/DataEntry/Table/TableBase.H
+++ b/src/OpenFOAM/primitives/functions/DataEntry/Table/TableBase.H
@@ -37,6 +37,7 @@ SourceFiles
 
 #include "DataEntry.H"
 #include "Tuple2.H"
+#include "dimensionSet.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -87,6 +88,9 @@ protected:
         //- Table data
         List<Tuple2<scalar, Type> > table_;
 
+        //- The dimension set
+        dimensionSet dimensions_;
+
 
     // Protected Member Functions
 
@@ -138,6 +142,16 @@ public:
         //- Integrate between two (scalar) values
         virtual Type integrate(const scalar x1, const scalar x2) const;
 
+        //- Return dimensioned constant value
+        virtual dimensioned<Type> dimValue(const scalar x) const;
+
+        //- Integrate between two values and return dimensioned type
+        virtual dimensioned<Type> dimIntegrate
+        (
+            const scalar x1,
+            const scalar x2
+        ) const;
+
 
     // I/O
 
diff --git a/src/OpenFOAM/primitives/functions/DataEntry/TableFile/TableFile.C b/src/OpenFOAM/primitives/functions/DataEntry/TableFile/TableFile.C
index c2553ee03d..5323ac6a85 100644
--- a/src/OpenFOAM/primitives/functions/DataEntry/TableFile/TableFile.C
+++ b/src/OpenFOAM/primitives/functions/DataEntry/TableFile/TableFile.C
@@ -37,6 +37,11 @@ Foam::TableFile<Type>::TableFile(const word& entryName, const dictionary& dict)
     const dictionary coeffs(dict.subDict(type() + "Coeffs"));
     coeffs.lookup("fileName") >> fName_;
 
+    if (coeffs.found("dimensions"))
+    {
+        coeffs.lookup("dimensions") >> this->dimensions_;
+    }
+
     fileName expandedFile(fName_);
     IFstream is(expandedFile.expand());
 
diff --git a/src/OpenFOAM/primitives/functions/DataEntry/TableFile/TableFile.H b/src/OpenFOAM/primitives/functions/DataEntry/TableFile/TableFile.H
index 5c31c5cf68..f167c21156 100644
--- a/src/OpenFOAM/primitives/functions/DataEntry/TableFile/TableFile.H
+++ b/src/OpenFOAM/primitives/functions/DataEntry/TableFile/TableFile.H
@@ -31,8 +31,9 @@ Description
         <entryName>   tableFile;
         tableFileCoeffs
         {
-            fileName        dataFile;   // name of data file
-            outOfBounds     clamp;      // optional out-of-bounds handling
+            dimensions      [0 0 1 0 0]; // optional dimensions
+            fileName        dataFile;    // name of data file
+            outOfBounds     clamp;       // optional out-of-bounds handling
         }
     \endverbatim
 
@@ -145,6 +146,22 @@ public:
                 return TableBase<Type>::integrate(x1, x2);
             }
 
+            //- Return dimensioned constant value
+            virtual dimensioned<Type> dimValue(const scalar x) const
+            {
+                return TableBase<Type>::dimValue(x);
+            }
+
+            //- Integrate between two values and return dimensioned type
+            virtual dimensioned<Type> dimIntegrate
+            (
+                const scalar x1,
+                const scalar x2
+            )
+            {
+                return TableBase<Type>::dimIntegrate(x1, x2);
+            }
+
 
     // I/O
 
diff --git a/src/OpenFOAM/primitives/functions/DataEntry/polynomial/polynomial.C b/src/OpenFOAM/primitives/functions/DataEntry/polynomial/polynomial.C
index c9c8ba3f65..d015aede93 100644
--- a/src/OpenFOAM/primitives/functions/DataEntry/polynomial/polynomial.C
+++ b/src/OpenFOAM/primitives/functions/DataEntry/polynomial/polynomial.C
@@ -42,11 +42,19 @@ Foam::polynomial::polynomial(const word& entryName, const dictionary& dict)
 :
     DataEntry<scalar>(entryName),
     coeffs_(),
-    canIntegrate_(true)
+    canIntegrate_(true),
+    dimensions_(dimless)
 {
     Istream& is(dict.lookup(entryName));
     word entryType(is);
 
+    token firstToken(is);
+    is.putBack(firstToken);
+    if (firstToken == token::BEGIN_SQR)
+    {
+        is >> this->dimensions_;
+    }
+
     is  >> coeffs_;
 
     if (!coeffs_.size())
@@ -85,7 +93,8 @@ Foam::polynomial::polynomial
 :
     DataEntry<scalar>(entryName),
     coeffs_(coeffs),
-    canIntegrate_(true)
+    canIntegrate_(true),
+    dimensions_(dimless)
 {
     if (!coeffs_.size())
     {
@@ -125,7 +134,8 @@ Foam::polynomial::polynomial(const polynomial& poly)
 :
     DataEntry<scalar>(poly),
     coeffs_(poly.coeffs_),
-    canIntegrate_(poly.canIntegrate_)
+    canIntegrate_(poly.canIntegrate_),
+    dimensions_(poly.dimensions_)
 {}
 
 
@@ -180,4 +190,26 @@ Foam::scalar Foam::polynomial::integrate(const scalar x1, const scalar x2) const
 }
 
 
+Foam::dimensioned<Foam::scalar> Foam::polynomial::dimValue
+(
+    const scalar x
+) const
+{
+    return dimensioned<scalar>("dimensionedValue", dimensions_, value(x));
+}
+
+
+Foam::dimensioned<Foam::scalar> Foam::polynomial::dimIntegrate
+(
+    const scalar x1, const scalar x2
+) const
+{
+    return dimensioned<scalar>
+    (
+        "dimensionedValue",
+        dimensions_,
+        integrate(x1, x2)
+    );
+}
+
 // ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/functions/DataEntry/polynomial/polynomial.H b/src/OpenFOAM/primitives/functions/DataEntry/polynomial/polynomial.H
index 2c2cbcb30f..dc4fc7986b 100644
--- a/src/OpenFOAM/primitives/functions/DataEntry/polynomial/polynomial.H
+++ b/src/OpenFOAM/primitives/functions/DataEntry/polynomial/polynomial.H
@@ -30,7 +30,7 @@ Description
     describes y = x^2 + 2x^3
 
     \verbatim
-        <entryName>   polynomial
+        <entryName>   polynomial  [0 0 1 0 0] // optional dimensions
         (
             (1    2)
             (2    3)
@@ -47,6 +47,7 @@ SourceFiles
 
 #include "DataEntry.H"
 #include "Tuple2.H"
+#include "dimensionSet.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -79,6 +80,9 @@ class polynomial
         //- Flag to indicate whether poly can be integrated
         bool canIntegrate_;
 
+        //- The dimension set
+        dimensionSet dimensions_;
+
 
     // Private Member Functions
 
@@ -129,6 +133,16 @@ public:
             //- Integrate between two (scalar) values
             scalar integrate(const scalar x1, const scalar x2) const;
 
+            //- Return dimensioned constant value
+            dimensioned<scalar> dimValue(const scalar) const;
+
+            //- Integrate between two values and return dimensioned type
+            dimensioned<scalar> dimIntegrate
+            (
+                const scalar x1,
+                const scalar x2
+            ) const;
+
 
     // I/O
 
diff --git a/src/finiteVolume/cfdTools/general/MRF/MRFZone.C b/src/finiteVolume/cfdTools/general/MRF/MRFZone.C
index ab1837b1f6..9b88668dcc 100644
--- a/src/finiteVolume/cfdTools/general/MRF/MRFZone.C
+++ b/src/finiteVolume/cfdTools/general/MRF/MRFZone.C
@@ -240,8 +240,7 @@ Foam::MRFZone::MRFZone(const fvMesh& mesh, Istream& is)
     ),
     origin_(dict_.lookup("origin")),
     axis_(dict_.lookup("axis")),
-    omega_(dict_.lookup("omega")),
-    Omega_("Omega", omega_*axis_)
+    omega_(DataEntry<scalar>::New("omega", dict_))
 {
     if (dict_.found("patches"))
     {
@@ -256,7 +255,6 @@ Foam::MRFZone::MRFZone(const fvMesh& mesh, Istream& is)
     const polyBoundaryMesh& patches = mesh_.boundaryMesh();
 
     axis_ = axis_/mag(axis_);
-    Omega_ = omega_*axis_;
 
     excludedPatchLabels_.setSize(excludedPatchNames_.size());
 
@@ -309,7 +307,9 @@ void Foam::MRFZone::addCoriolis
     vectorField& ddtUc = ddtU.internalField();
     const vectorField& Uc = U.internalField();
 
-    const vector& Omega = Omega_.value();
+    const scalar t = mesh_.time().timeOutputValue();
+
+    const vector& Omega = omega_->value(t)*axis_;
 
     forAll(cells, i)
     {
@@ -331,7 +331,9 @@ void Foam::MRFZone::addCoriolis(fvVectorMatrix& UEqn) const
     vectorField& Usource = UEqn.source();
     const vectorField& U = UEqn.psi();
 
-    const vector& Omega = Omega_.value();
+    const scalar t = mesh_.time().timeOutputValue();
+
+    const vector& Omega = omega_->value(t)*axis_;
 
     forAll(cells, i)
     {
@@ -357,7 +359,9 @@ void Foam::MRFZone::addCoriolis
     vectorField& Usource = UEqn.source();
     const vectorField& U = UEqn.psi();
 
-    const vector& Omega = Omega_.value();
+    const scalar t = mesh_.time().timeOutputValue();
+
+    const vector& Omega = omega_->value(t)*axis_;
 
     forAll(cells, i)
     {
@@ -371,9 +375,11 @@ void Foam::MRFZone::relativeVelocity(volVectorField& U) const
 {
     const volVectorField& C = mesh_.C();
 
-    const vector& origin = origin_.value();
+    const vector& origin = origin_;
 
-    const vector& Omega = Omega_.value();
+    const scalar t = mesh_.time().timeOutputValue();
+
+    const vector& Omega = omega_->value(t)*axis_;
 
     const labelList& cells = mesh_.cellZones()[cellZoneID_];
 
@@ -411,9 +417,11 @@ void Foam::MRFZone::absoluteVelocity(volVectorField& U) const
 {
     const volVectorField& C = mesh_.C();
 
-    const vector& origin = origin_.value();
+    const vector& origin = origin_;
 
-    const vector& Omega = Omega_.value();
+    const scalar t = mesh_.time().timeOutputValue();
+
+    const vector& Omega = omega_->value(t)*axis_;
 
     const labelList& cells = mesh_.cellZones()[cellZoneID_];
 
@@ -481,9 +489,12 @@ void Foam::MRFZone::absoluteFlux
 
 void Foam::MRFZone::correctBoundaryVelocity(volVectorField& U) const
 {
-    const vector& origin = origin_.value();
+    const vector& origin = origin_;
+
+    const scalar t = mesh_.time().timeOutputValue();
+
+    const vector& Omega = omega_->value(t)*axis_;
 
-    const vector& Omega = Omega_.value();
 
     // Included patches
     forAll(includedFaces_, patchi)
@@ -511,7 +522,7 @@ Foam::Ostream& Foam::operator<<(Ostream& os, const MRFZone& MRF)
     os  << token::BEGIN_BLOCK << incrIndent << nl;
     os.writeKeyword("origin") << MRF.origin_ << token::END_STATEMENT << nl;
     os.writeKeyword("axis") << MRF.axis_ << token::END_STATEMENT << nl;
-    os.writeKeyword("omega") << MRF.omega_ << token::END_STATEMENT << nl;
+    MRF.omega_->writeData(os);
 
     if (MRF.excludedPatchNames_.size())
     {
diff --git a/src/finiteVolume/cfdTools/general/MRF/MRFZone.H b/src/finiteVolume/cfdTools/general/MRF/MRFZone.H
index 5c5cd245c0..46fb94c39a 100644
--- a/src/finiteVolume/cfdTools/general/MRF/MRFZone.H
+++ b/src/finiteVolume/cfdTools/general/MRF/MRFZone.H
@@ -49,6 +49,7 @@ SourceFiles
 #include "fvMatricesFwd.H"
 #include "fvMatrices.H"
 #include "DataEntry.H"
+#include "autoPtr.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -86,10 +87,14 @@ class MRFZone
         //- Excluded faces (per patch) that do not move with the MRF
         labelListList excludedFaces_;
 
-        const dimensionedVector origin_;
-        dimensionedVector axis_;
-        dimensionedScalar omega_;
-        dimensionedVector Omega_;
+        //- Origin of the axis
+        const vector origin_;
+
+        //- Axis vector
+        vector axis_;
+
+        //- Angular velocty (rad/sec)
+        autoPtr<DataEntry<scalar> > omega_;
 
 
     // Private Member Functions
diff --git a/src/finiteVolume/cfdTools/general/MRF/MRFZoneTemplates.C b/src/finiteVolume/cfdTools/general/MRF/MRFZoneTemplates.C
index 23cae40603..6a13cac888 100644
--- a/src/finiteVolume/cfdTools/general/MRF/MRFZoneTemplates.C
+++ b/src/finiteVolume/cfdTools/general/MRF/MRFZoneTemplates.C
@@ -41,8 +41,10 @@ void Foam::MRFZone::relativeRhoFlux
     const surfaceVectorField& Cf = mesh_.Cf();
     const surfaceVectorField& Sf = mesh_.Sf();
 
-    const vector& origin = origin_.value();
-    const vector& Omega = Omega_.value();
+    const vector& origin = origin_;
+
+    const scalar t = mesh_.time().timeOutputValue();
+    const vector& Omega = omega_->value(t)*axis_;
 
     const vectorField& Cfi = Cf.internalField();
     const vectorField& Sfi = Sf.internalField();
@@ -92,8 +94,10 @@ void Foam::MRFZone::absoluteRhoFlux
     const surfaceVectorField& Cf = mesh_.Cf();
     const surfaceVectorField& Sf = mesh_.Sf();
 
-    const vector& origin = origin_.value();
-    const vector& Omega = Omega_.value();
+    const vector& origin = origin_;
+
+    const scalar t = mesh_.time().timeOutputValue();
+    const vector& Omega = omega_->value(t)*axis_;
 
     const vectorField& Cfi = Cf.internalField();
     const vectorField& Sfi = Sf.internalField();
diff --git a/tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/constant/MRFZones b/tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/constant/MRFZones
index b38f82ed73..7c255d51db 100644
--- a/tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/constant/MRFZones
+++ b/tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/constant/MRFZones
@@ -22,9 +22,9 @@ FoamFile
         // Fixed patches (by default they 'move' with the MRF zone)
         nonRotatingPatches ();
 
-        origin    origin [0 1 0 0 0 0 0]  (0 0 0);
-        axis      axis   [0 0 0 0 0 0 0]  (0 0 1);
-        omega     omega  [0 0 -1 0 0 0 0] 1047.2;
+        origin    (0 0 0);
+        axis      (0 0 1);
+        omega     constant 1047.2;
     }
 )
 
diff --git a/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/constant/MRFZones b/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/constant/MRFZones
index 5fd26d2ab9..87c1c43c6e 100644
--- a/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/constant/MRFZones
+++ b/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/constant/MRFZones
@@ -22,9 +22,9 @@ FoamFile
         // Fixed patches (by default they 'move' with the MRF zone)
         nonRotatingPatches ();
 
-        origin    origin [0 1 0 0 0 0 0]  (0 0 0);
-        axis      axis   [0 0 0 0 0 0 0]  (0 0 1);
-        omega     omega  [0 0 -1 0 0 0 0] 104.72;
+        origin    (0 0 0);
+        axis      (0 0 1);
+        omega     104.72;
     }
 )
 
diff --git a/tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/constant/MRFZones b/tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/constant/MRFZones
index 5fd26d2ab9..d1c9dd95d9 100644
--- a/tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/constant/MRFZones
+++ b/tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/constant/MRFZones
@@ -22,9 +22,9 @@ FoamFile
         // Fixed patches (by default they 'move' with the MRF zone)
         nonRotatingPatches ();
 
-        origin    origin [0 1 0 0 0 0 0]  (0 0 0);
-        axis      axis   [0 0 0 0 0 0 0]  (0 0 1);
-        omega     omega  [0 0 -1 0 0 0 0] 104.72;
+        origin    (0 0 0);
+        axis      (0 0 1);
+        omega     constant 104.72;
     }
 )
 
diff --git a/tutorials/multiphase/MRFInterFoam/mixerVessel2D/constant/MRFZones b/tutorials/multiphase/MRFInterFoam/mixerVessel2D/constant/MRFZones
index 73226af946..ec52208dc0 100644
--- a/tutorials/multiphase/MRFInterFoam/mixerVessel2D/constant/MRFZones
+++ b/tutorials/multiphase/MRFInterFoam/mixerVessel2D/constant/MRFZones
@@ -22,9 +22,9 @@ FoamFile
         // Fixed patches (by default they 'move' with the MRF zone)
         nonRotatingPatches ();
 
-        origin    origin [0 1 0 0 0 0 0]  (0 0 0);
-        axis      axis   [0 0 0 0 0 0 0]  (0 0 1);
-        omega     omega  [0 0 -1 0 0 0 0] 6.2831853;
+        origin    (0 0 0);
+        axis      (0 0 1);
+        omega     constant 6.2831853;
     }
 )
 
diff --git a/tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/constant/MRFZones b/tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/constant/MRFZones
index 73226af946..ec52208dc0 100644
--- a/tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/constant/MRFZones
+++ b/tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/constant/MRFZones
@@ -22,9 +22,9 @@ FoamFile
         // Fixed patches (by default they 'move' with the MRF zone)
         nonRotatingPatches ();
 
-        origin    origin [0 1 0 0 0 0 0]  (0 0 0);
-        axis      axis   [0 0 0 0 0 0 0]  (0 0 1);
-        omega     omega  [0 0 -1 0 0 0 0] 6.2831853;
+        origin    (0 0 0);
+        axis      (0 0 1);
+        omega     constant 6.2831853;
     }
 )
 
diff --git a/tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/constant/MRFZones b/tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/constant/MRFZones
index 25c3311d0b..7dd518ca65 100644
--- a/tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/constant/MRFZones
+++ b/tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/constant/MRFZones
@@ -22,9 +22,9 @@ FoamFile
         // Fixed patches (by default they 'move' with the MRF zone)
         nonRotatingPatches ();
 
-        origin    origin [0 1 0 0 0 0 0]  (0 0 0);
-        axis      axis   [0 0 0 0 0 0 0]  (0 0 1);
-        omega     omega  [0 0 -1 0 0 0 0] 10.472;
+        origin    (0 0 0);
+        axis      (0 0 1);
+        omega     constant 10.472;
     }
 )
 
diff --git a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/constant/MRFZones b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/constant/MRFZones
index 25c3311d0b..7dd518ca65 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/constant/MRFZones
+++ b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/constant/MRFZones
@@ -22,9 +22,9 @@ FoamFile
         // Fixed patches (by default they 'move' with the MRF zone)
         nonRotatingPatches ();
 
-        origin    origin [0 1 0 0 0 0 0]  (0 0 0);
-        axis      axis   [0 0 0 0 0 0 0]  (0 0 1);
-        omega     omega  [0 0 -1 0 0 0 0] 10.472;
+        origin    (0 0 0);
+        axis      (0 0 1);
+        omega     constant 10.472;
     }
 )
 
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/mixerVessel2D/constant/MRFZones b/tutorials/multiphase/twoPhaseEulerFoam/mixerVessel2D/constant/MRFZones
index 25c3311d0b..7dd518ca65 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/mixerVessel2D/constant/MRFZones
+++ b/tutorials/multiphase/twoPhaseEulerFoam/mixerVessel2D/constant/MRFZones
@@ -22,9 +22,9 @@ FoamFile
         // Fixed patches (by default they 'move' with the MRF zone)
         nonRotatingPatches ();
 
-        origin    origin [0 1 0 0 0 0 0]  (0 0 0);
-        axis      axis   [0 0 0 0 0 0 0]  (0 0 1);
-        omega     omega  [0 0 -1 0 0 0 0] 10.472;
+        origin    (0 0 0);
+        axis      (0 0 1);
+        omega     constant 10.472;
     }
 )
 

From 2738c6b91757efdd8cd1276a3dae7c6d8c53de8c Mon Sep 17 00:00:00 2001
From: sergio <sergio>
Date: Fri, 13 Apr 2012 17:01:50 +0100
Subject: [PATCH 194/317] BUG: Making consistent the epsilon Ew with the
 standard kEpsilon model

---
 .../compressible/RAS/LaunderSharmaKE/LaunderSharmaKE.C         | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/turbulenceModels/compressible/RAS/LaunderSharmaKE/LaunderSharmaKE.C b/src/turbulenceModels/compressible/RAS/LaunderSharmaKE/LaunderSharmaKE.C
index d03f6b5de9..c7c10d0ae9 100644
--- a/src/turbulenceModels/compressible/RAS/LaunderSharmaKE/LaunderSharmaKE.C
+++ b/src/turbulenceModels/compressible/RAS/LaunderSharmaKE/LaunderSharmaKE.C
@@ -317,7 +317,8 @@ void LaunderSharmaKE::correct()
       - fvm::Sp(fvc::ddt(rho_) + fvc::div(phi_), epsilon_)
       - fvm::laplacian(DepsilonEff(), epsilon_)
      ==
-        C1_*G*epsilon_/k_ + fvm::SuSp((C3_ - 2.0/3.0*C1_)*rho_*divU, epsilon_)
+        C1_*G*epsilon_/k_
+      - fvm::SuSp(((2.0/3.0)*C1_ + C3_)*rho_*divU, epsilon_)
       - fvm::Sp(C2_*f2()*rho_*epsilon_/k_, epsilon_)
     //+ 0.75*1.5*flameKproduction*epsilon_/k_
       + E

From 41acdf1606fc3d9c3a2db42d5e7773f79c3e568f Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Mon, 16 Apr 2012 09:39:53 +0100
Subject: [PATCH 195/317] BUG: mergePoints - implementation redefined default
 args to function

---
 src/OpenFOAM/meshes/meshTools/mergePoints.C | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/OpenFOAM/meshes/meshTools/mergePoints.C b/src/OpenFOAM/meshes/meshTools/mergePoints.C
index 954c6aa86e..04d3462197 100644
--- a/src/OpenFOAM/meshes/meshTools/mergePoints.C
+++ b/src/OpenFOAM/meshes/meshTools/mergePoints.C
@@ -180,7 +180,7 @@ bool Foam::mergePoints
     const bool verbose,
     labelList& pointMap,
     List<Type>& newPoints,
-    const Type& origin = Type::zero
+    const Type& origin
 )
 {
     label nUnique = mergePoints

From 7435d65a60ba787284851a2231834c495a181449 Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Mon, 16 Apr 2012 10:05:13 +0100
Subject: [PATCH 196/317] ENH: Corrected ambiguous construction from tmp msgs
 (llvm/clang)

---
 src/dynamicFvMesh/dynamicRefineFvMesh/dynamicRefineFvMesh.C | 5 +++++
 .../basicSource/rotorDiskSource/rotorDiskSource.C           | 2 +-
 .../mappedPatches/mappedPolyPatch/mappedPatchBase.C         | 2 +-
 .../field/fieldValues/faceSource/faceSourceTemplates.C      | 6 +++---
 .../renumberMethods/springRenumber/springRenumber.C         | 2 +-
 src/sampling/sampledSet/writers/ensight/ensightSetWriter.C  | 4 ++--
 6 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicRefineFvMesh.C b/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicRefineFvMesh.C
index 3b295f46dd..b0f22f5f7e 100644
--- a/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicRefineFvMesh.C
+++ b/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicRefineFvMesh.C
@@ -240,10 +240,15 @@ Foam::dynamicRefineFvMesh::refine
         }
     }
 
+//    // Remove the stored tet base points
+//    tetBasePtIsPtr_.clear();
+//    // Remove the cell tree
+//    cellTreePtr_.clear();
 
     // Update fields
     updateMesh(map);
 
+
     // Move mesh
     /*
     pointField newPoints;
diff --git a/src/fieldSources/basicSource/rotorDiskSource/rotorDiskSource.C b/src/fieldSources/basicSource/rotorDiskSource/rotorDiskSource.C
index f3fe86843d..e6381c543b 100644
--- a/src/fieldSources/basicSource/rotorDiskSource/rotorDiskSource.C
+++ b/src/fieldSources/basicSource/rotorDiskSource/rotorDiskSource.C
@@ -628,7 +628,7 @@ void Foam::rotorDiskSource::addSup(fvMatrix<vector>& eqn, const label fieldI)
 
     const volVectorField& U = eqn.psi();
 
-    const vectorField Uin = inflowVelocity(U);
+    const vectorField Uin(inflowVelocity(U));
 
     trim_->correct(Uin, force);
 
diff --git a/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBase.C b/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBase.C
index f1ad35baae..79db701887 100644
--- a/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBase.C
+++ b/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBase.C
@@ -431,7 +431,7 @@ void Foam::mappedPatchBase::calcMapping() const
     tmp<pointField> patchPoints(facePoints(patch_));
 
     // Get offsetted points
-    const pointField offsettedPoints = samplePoints(patchPoints());
+    const pointField offsettedPoints(samplePoints(patchPoints()));
 
 
     // Do a sanity check
diff --git a/src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSourceTemplates.C b/src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSourceTemplates.C
index 892593d036..450ac18d91 100644
--- a/src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSourceTemplates.C
+++ b/src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSourceTemplates.C
@@ -153,14 +153,14 @@ Type Foam::fieldValues::faceSource::processSameTypeValues
         }
         case opAreaAverage:
         {
-            const scalarField magSf = mag(Sf);
+            const scalarField magSf(mag(Sf));
 
             result = sum(values*magSf)/sum(magSf);
             break;
         }
         case opAreaIntegrate:
         {
-            const scalarField magSf = mag(Sf);
+            const scalarField magSf(mag(Sf));
 
             result = sum(values*magSf);
             break;
@@ -177,7 +177,7 @@ Type Foam::fieldValues::faceSource::processSameTypeValues
         }
         case opCoV:
         {
-            const scalarField magSf = mag(Sf);
+            const scalarField magSf(mag(Sf));
 
             Type meanValue = sum(values*magSf)/sum(magSf);
 
diff --git a/src/renumber/renumberMethods/springRenumber/springRenumber.C b/src/renumber/renumberMethods/springRenumber/springRenumber.C
index 0bc9466494..764be3018d 100644
--- a/src/renumber/renumberMethods/springRenumber/springRenumber.C
+++ b/src/renumber/renumberMethods/springRenumber/springRenumber.C
@@ -138,7 +138,7 @@ Foam::labelList Foam::springRenumber::renumber
             << "  average force:" << average(mag(sumForce)) << endl;
 
         // Determine displacement.
-        scalarField displacement = deltaT*sumForce;
+        scalarField displacement(deltaT*sumForce);
 
         //Pout<< "Displacement :" << nl
         //    << "    min    : " << min(displacement) << nl
diff --git a/src/sampling/sampledSet/writers/ensight/ensightSetWriter.C b/src/sampling/sampledSet/writers/ensight/ensightSetWriter.C
index 23d8e7843d..d481a41532 100644
--- a/src/sampling/sampledSet/writers/ensight/ensightSetWriter.C
+++ b/src/sampling/sampledSet/writers/ensight/ensightSetWriter.C
@@ -157,7 +157,7 @@ void Foam::ensightSetWriter<Type>::write
                 << "coordinates" << nl;
             for (direction cmpt = 0; cmpt < pTraits<Type>::nComponents; cmpt++)
             {
-                const scalarField fld = valueSets[setI]->component(cmpt);
+                const scalarField fld(valueSets[setI]->component(cmpt));
                 forAll(fld, i)
                 {
                     if (mag(fld[i]) >= scalar(floatScalarVSMALL))
@@ -293,7 +293,7 @@ void Foam::ensightSetWriter<Type>::write
                     cmpt++
                 )
                 {
-                    const scalarField fld = fieldVals[trackI].component(cmpt);
+                    const scalarField fld(fieldVals[trackI].component(cmpt));
                     forAll(fld, i)
                     {
                         if (mag(fld[i]) >= scalar(floatScalarVSMALL))

From faee00655552ea97e9532bd5d9f6b6d4034756c3 Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Mon, 16 Apr 2012 11:11:49 +0100
Subject: [PATCH 197/317] BUG: Rotor source - corrected definition of Cl/Cd for
 series profile

---
 .../rotorDiskSource/profileModel/series/seriesProfile.C     | 4 ++--
 .../rotorDiskSource/profileModel/series/seriesProfile.H     | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/fieldSources/basicSource/rotorDiskSource/profileModel/series/seriesProfile.C b/src/fieldSources/basicSource/rotorDiskSource/profileModel/series/seriesProfile.C
index 865ed3ab62..fb69507825 100644
--- a/src/fieldSources/basicSource/rotorDiskSource/profileModel/series/seriesProfile.C
+++ b/src/fieldSources/basicSource/rotorDiskSource/profileModel/series/seriesProfile.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -48,7 +48,7 @@ Foam::scalar Foam::seriesProfile::evaluate
 
     forAll(values, i)
     {
-        result += values[i]*cos((i+1)*xIn);
+        result += values[i]*sin((i + 1)*xIn);
     }
 
     return result;
diff --git a/src/fieldSources/basicSource/rotorDiskSource/profileModel/series/seriesProfile.H b/src/fieldSources/basicSource/rotorDiskSource/profileModel/series/seriesProfile.H
index 73b474aae1..7c4793e28e 100644
--- a/src/fieldSources/basicSource/rotorDiskSource/profileModel/series/seriesProfile.H
+++ b/src/fieldSources/basicSource/rotorDiskSource/profileModel/series/seriesProfile.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -28,8 +28,8 @@ Description
     Series-up based profile data - drag and lift coefficients computed as
     sum of cosine series
 
-        Cd = sum_i(CdCoeff)*cos(i*AOA)
-        Cl = sum_i(ClCoeff)*cos(i*AOA)
+        Cd = sum_i(CdCoeff)*sin(i*AOA)
+        Cl = sum_i(ClCoeff)*sin(i*AOA)
 
     where:
         AOA = angle of attack [deg] converted to [rad] internally

From 25dafe92eabc66b731877ba2f13dd28c9fc8fd21 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Mon, 16 Apr 2012 11:36:13 +0100
Subject: [PATCH 198/317] ENH: decomposePar: add -time option.

---
 .../decomposePar/decomposePar.C               | 1116 ++++++++---------
 1 file changed, 557 insertions(+), 559 deletions(-)

diff --git a/applications/utilities/parallelProcessing/decomposePar/decomposePar.C b/applications/utilities/parallelProcessing/decomposePar/decomposePar.C
index 02acd59236..c7b96b44b3 100644
--- a/applications/utilities/parallelProcessing/decomposePar/decomposePar.C
+++ b/applications/utilities/parallelProcessing/decomposePar/decomposePar.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -43,7 +43,10 @@ Usage
     Copy any \a uniform directories too.
 
     \param -constant \n
-    Override controlDict settings and use constant directory.
+    \param -time xxx:yyy \n
+    Override controlDict settings and decompose selected times. Does not
+    re-decompose the mesh i.e. does not handle moving mesh or changing
+    mesh cases.
 
     \param -fields \n
     Use existing geometry decomposition and convert fields only.
@@ -123,11 +126,9 @@ int main(int argc, char *argv[])
         "ifRequired",
         "only decompose geometry if the number of domains has changed"
     );
-    argList::addBoolOption
-    (
-        "constant",
-        "include the 'constant/' dir in the times list"
-    );
+
+    // Include explicit constant options, have zero from time range
+    timeSelector::addOptions(true, false);
 
     #include "setRootCase.H"
 
@@ -146,23 +147,10 @@ int main(int argc, char *argv[])
     bool forceOverwrite          = args.optionFound("force");
     bool ifRequiredDecomposition = args.optionFound("ifRequired");
 
+    // Set time from database
     #include "createTime.H"
-
-    // Allow -constant to override controlDict settings.
-    if (args.optionFound("constant"))
-    {
-        instantList timeDirs = timeSelector::select0(runTime, args);
-        if (runTime.timeName() != runTime.constant())
-        {
-            FatalErrorIn(args.executable())
-                << "No '" << runTime.constant() << "' time present." << endl
-                << "Valid times are " << runTime.times()
-                << exit(FatalError);
-        }
-    }
-
-
-    Info<< "Time = " << runTime.timeName() << endl;
+    // Allow override of time
+    instantList times = timeSelector::selectIfPresent(runTime, args);
 
     // determine the existing processor count directly
     label nProcs = 0;
@@ -334,475 +322,394 @@ int main(int argc, char *argv[])
     }
 
 
-    // Search for list of objects for this time
-    IOobjectList objects(mesh, runTime.timeName());
-
-    // Construct the vol fields
-    // ~~~~~~~~~~~~~~~~~~~~~~~~
-    PtrList<volScalarField> volScalarFields;
-    readFields(mesh, objects, volScalarFields);
-
-    PtrList<volVectorField> volVectorFields;
-    readFields(mesh, objects, volVectorFields);
-
-    PtrList<volSphericalTensorField> volSphericalTensorFields;
-    readFields(mesh, objects, volSphericalTensorFields);
-
-    PtrList<volSymmTensorField> volSymmTensorFields;
-    readFields(mesh, objects, volSymmTensorFields);
-
-    PtrList<volTensorField> volTensorFields;
-    readFields(mesh, objects, volTensorFields);
-
-
-    // Construct the dimensioned fields
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    PtrList<DimensionedField<scalar, volMesh> > dimScalarFields;
-    readFields(mesh, objects, dimScalarFields);
-
-    PtrList<DimensionedField<vector, volMesh> > dimVectorFields;
-    readFields(mesh, objects, dimVectorFields);
-
-    PtrList<DimensionedField<sphericalTensor, volMesh> >
-        dimSphericalTensorFields;
-    readFields(mesh, objects, dimSphericalTensorFields);
-
-    PtrList<DimensionedField<symmTensor, volMesh> > dimSymmTensorFields;
-    readFields(mesh, objects, dimSymmTensorFields);
-
-    PtrList<DimensionedField<tensor, volMesh> > dimTensorFields;
-    readFields(mesh, objects, dimTensorFields);
-
-
-    // Construct the surface fields
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    PtrList<surfaceScalarField> surfaceScalarFields;
-    readFields(mesh, objects, surfaceScalarFields);
-    PtrList<surfaceVectorField> surfaceVectorFields;
-    readFields(mesh, objects, surfaceVectorFields);
-    PtrList<surfaceSphericalTensorField> surfaceSphericalTensorFields;
-    readFields(mesh, objects, surfaceSphericalTensorFields);
-    PtrList<surfaceSymmTensorField> surfaceSymmTensorFields;
-    readFields(mesh, objects, surfaceSymmTensorFields);
-    PtrList<surfaceTensorField> surfaceTensorFields;
-    readFields(mesh, objects, surfaceTensorFields);
-
-
-    // Construct the point fields
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~
-    pointMesh pMesh(mesh);
-
-    PtrList<pointScalarField> pointScalarFields;
-    readFields(pMesh, objects, pointScalarFields);
-
-    PtrList<pointVectorField> pointVectorFields;
-    readFields(pMesh, objects, pointVectorFields);
-
-    PtrList<pointSphericalTensorField> pointSphericalTensorFields;
-    readFields(pMesh, objects, pointSphericalTensorFields);
-
-    PtrList<pointSymmTensorField> pointSymmTensorFields;
-    readFields(pMesh, objects, pointSymmTensorFields);
-
-    PtrList<pointTensorField> pointTensorFields;
-    readFields(pMesh, objects, pointTensorFields);
-
-
-    // Construct the Lagrangian fields
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-    fileNameList cloudDirs
-    (
-        readDir(runTime.timePath()/cloud::prefix, fileName::DIRECTORY)
-    );
-
-    // Particles
-    PtrList<Cloud<indexedParticle> > lagrangianPositions(cloudDirs.size());
-    // Particles per cell
-    PtrList< List<SLList<indexedParticle*>*> > cellParticles(cloudDirs.size());
-
-    PtrList<PtrList<labelIOField> > lagrangianLabelFields(cloudDirs.size());
-    PtrList<PtrList<labelFieldCompactIOField> > lagrangianLabelFieldFields
-    (
-        cloudDirs.size()
-    );
-    PtrList<PtrList<scalarIOField> > lagrangianScalarFields(cloudDirs.size());
-    PtrList<PtrList<scalarFieldCompactIOField> > lagrangianScalarFieldFields
-    (
-        cloudDirs.size()
-    );
-    PtrList<PtrList<vectorIOField> > lagrangianVectorFields(cloudDirs.size());
-    PtrList<PtrList<vectorFieldCompactIOField> > lagrangianVectorFieldFields
-    (
-        cloudDirs.size()
-    );
-    PtrList<PtrList<sphericalTensorIOField> > lagrangianSphericalTensorFields
-    (
-        cloudDirs.size()
-    );
-    PtrList<PtrList<sphericalTensorFieldCompactIOField> >
-        lagrangianSphericalTensorFieldFields(cloudDirs.size());
-    PtrList<PtrList<symmTensorIOField> > lagrangianSymmTensorFields
-    (
-        cloudDirs.size()
-    );
-    PtrList<PtrList<symmTensorFieldCompactIOField> >
-    lagrangianSymmTensorFieldFields
-    (
-        cloudDirs.size()
-    );
-    PtrList<PtrList<tensorIOField> > lagrangianTensorFields
-    (
-        cloudDirs.size()
-    );
-    PtrList<PtrList<tensorFieldCompactIOField> > lagrangianTensorFieldFields
-    (
-        cloudDirs.size()
-    );
-
-    label cloudI = 0;
-
-    forAll(cloudDirs, i)
+    // Loop over all times
+    forAll(times, timeI)
     {
-        IOobjectList sprayObjs
+        runTime.setTime(times[timeI], timeI);
+
+        Info<< "Time = " << runTime.timeName() << endl;
+
+        // Search for list of objects for this time
+        IOobjectList objects(mesh, runTime.timeName());
+
+
+        // Construct the vol fields
+        // ~~~~~~~~~~~~~~~~~~~~~~~~
+        PtrList<volScalarField> volScalarFields;
+        readFields(mesh, objects, volScalarFields);
+        PtrList<volVectorField> volVectorFields;
+        readFields(mesh, objects, volVectorFields);
+        PtrList<volSphericalTensorField> volSphericalTensorFields;
+        readFields(mesh, objects, volSphericalTensorFields);
+        PtrList<volSymmTensorField> volSymmTensorFields;
+        readFields(mesh, objects, volSymmTensorFields);
+        PtrList<volTensorField> volTensorFields;
+        readFields(mesh, objects, volTensorFields);
+
+
+        // Construct the dimensioned fields
+        // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+        PtrList<DimensionedField<scalar, volMesh> > dimScalarFields;
+        readFields(mesh, objects, dimScalarFields);
+        PtrList<DimensionedField<vector, volMesh> > dimVectorFields;
+        readFields(mesh, objects, dimVectorFields);
+        PtrList<DimensionedField<sphericalTensor, volMesh> >
+            dimSphericalTensorFields;
+        readFields(mesh, objects, dimSphericalTensorFields);
+        PtrList<DimensionedField<symmTensor, volMesh> > dimSymmTensorFields;
+        readFields(mesh, objects, dimSymmTensorFields);
+        PtrList<DimensionedField<tensor, volMesh> > dimTensorFields;
+        readFields(mesh, objects, dimTensorFields);
+
+
+        // Construct the surface fields
+        // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+        PtrList<surfaceScalarField> surfaceScalarFields;
+        readFields(mesh, objects, surfaceScalarFields);
+        PtrList<surfaceVectorField> surfaceVectorFields;
+        readFields(mesh, objects, surfaceVectorFields);
+        PtrList<surfaceSphericalTensorField> surfaceSphericalTensorFields;
+        readFields(mesh, objects, surfaceSphericalTensorFields);
+        PtrList<surfaceSymmTensorField> surfaceSymmTensorFields;
+        readFields(mesh, objects, surfaceSymmTensorFields);
+        PtrList<surfaceTensorField> surfaceTensorFields;
+        readFields(mesh, objects, surfaceTensorFields);
+
+
+        // Construct the point fields
+        // ~~~~~~~~~~~~~~~~~~~~~~~~~~
+        pointMesh pMesh(mesh);
+
+        PtrList<pointScalarField> pointScalarFields;
+        readFields(pMesh, objects, pointScalarFields);
+        PtrList<pointVectorField> pointVectorFields;
+        readFields(pMesh, objects, pointVectorFields);
+        PtrList<pointSphericalTensorField> pointSphericalTensorFields;
+        readFields(pMesh, objects, pointSphericalTensorFields);
+        PtrList<pointSymmTensorField> pointSymmTensorFields;
+        readFields(pMesh, objects, pointSymmTensorFields);
+        PtrList<pointTensorField> pointTensorFields;
+        readFields(pMesh, objects, pointTensorFields);
+
+
+        // Construct the Lagrangian fields
+        // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+        fileNameList cloudDirs
         (
-            mesh,
-            runTime.timeName(),
-            cloud::prefix/cloudDirs[i]
+            readDir(runTime.timePath()/cloud::prefix, fileName::DIRECTORY)
         );
 
-        IOobject* positionsPtr = sprayObjs.lookup("positions");
+        // Particles
+        PtrList<Cloud<indexedParticle> > lagrangianPositions(cloudDirs.size());
+        // Particles per cell
+        PtrList< List<SLList<indexedParticle*>*> > cellParticles
+        (
+            cloudDirs.size()
+        );
 
-        if (positionsPtr)
+        PtrList<PtrList<labelIOField> > lagrangianLabelFields
+        (
+            cloudDirs.size()
+        );
+        PtrList<PtrList<labelFieldCompactIOField> > lagrangianLabelFieldFields
+        (
+            cloudDirs.size()
+        );
+        PtrList<PtrList<scalarIOField> > lagrangianScalarFields
+        (
+            cloudDirs.size()
+        );
+        PtrList<PtrList<scalarFieldCompactIOField> > lagrangianScalarFieldFields
+        (
+            cloudDirs.size()
+        );
+        PtrList<PtrList<vectorIOField> > lagrangianVectorFields
+        (
+            cloudDirs.size()
+        );
+        PtrList<PtrList<vectorFieldCompactIOField> > lagrangianVectorFieldFields
+        (
+            cloudDirs.size()
+        );
+        PtrList<PtrList<sphericalTensorIOField> >
+        lagrangianSphericalTensorFields
+        (
+            cloudDirs.size()
+        );
+        PtrList<PtrList<sphericalTensorFieldCompactIOField> >
+            lagrangianSphericalTensorFieldFields(cloudDirs.size());
+        PtrList<PtrList<symmTensorIOField> > lagrangianSymmTensorFields
+        (
+            cloudDirs.size()
+        );
+        PtrList<PtrList<symmTensorFieldCompactIOField> >
+        lagrangianSymmTensorFieldFields
+        (
+            cloudDirs.size()
+        );
+        PtrList<PtrList<tensorIOField> > lagrangianTensorFields
+        (
+            cloudDirs.size()
+        );
+        PtrList<PtrList<tensorFieldCompactIOField> > lagrangianTensorFieldFields
+        (
+            cloudDirs.size()
+        );
+
+        label cloudI = 0;
+
+        forAll(cloudDirs, i)
         {
-            // Read lagrangian particles
-            // ~~~~~~~~~~~~~~~~~~~~~~~~~
-
-            Info<< "Identified lagrangian data set: " << cloudDirs[i] << endl;
-
-            lagrangianPositions.set
-            (
-                cloudI,
-                new Cloud<indexedParticle>
-                (
-                    mesh,
-                    cloudDirs[i],
-                    false
-                )
-            );
-
-
-            // Sort particles per cell
-            // ~~~~~~~~~~~~~~~~~~~~~~~
-
-            cellParticles.set
-            (
-                cloudI,
-                new List<SLList<indexedParticle*>*>
-                (
-                    mesh.nCells(),
-                    static_cast<SLList<indexedParticle*>*>(NULL)
-                )
-            );
-
-            label i = 0;
-
-            forAllIter
-            (
-                Cloud<indexedParticle>,
-                lagrangianPositions[cloudI],
-                iter
-            )
-            {
-                iter().index() = i++;
-
-                label celli = iter().cell();
-
-                // Check
-                if (celli < 0 || celli >= mesh.nCells())
-                {
-                    FatalErrorIn(args.executable())
-                        << "Illegal cell number " << celli
-                        << " for particle with index " << iter().index()
-                        << " at position " << iter().position() << nl
-                        << "Cell number should be between 0 and "
-                        << mesh.nCells()-1 << nl
-                        << "On this mesh the particle should be in cell "
-                        << mesh.findCell(iter().position())
-                        << exit(FatalError);
-                }
-
-                if (!cellParticles[cloudI][celli])
-                {
-                    cellParticles[cloudI][celli] = new SLList<indexedParticle*>
-                    ();
-                }
-
-                cellParticles[cloudI][celli]->append(&iter());
-            }
-
-            // Read fields
-            // ~~~~~~~~~~~
-
-            IOobjectList lagrangianObjects
+            IOobjectList sprayObjs
             (
                 mesh,
                 runTime.timeName(),
-                cloud::prefix/cloudDirs[cloudI]
+                cloud::prefix/cloudDirs[i]
             );
 
-            lagrangianFieldDecomposer::readFields
-            (
-                cloudI,
-                lagrangianObjects,
-                lagrangianLabelFields
-            );
+            IOobject* positionsPtr = sprayObjs.lookup("positions");
 
-            lagrangianFieldDecomposer::readFieldFields
-            (
-                cloudI,
-                lagrangianObjects,
-                lagrangianLabelFieldFields
-            );
+            if (positionsPtr)
+            {
+                // Read lagrangian particles
+                // ~~~~~~~~~~~~~~~~~~~~~~~~~
 
-            lagrangianFieldDecomposer::readFields
-            (
-                cloudI,
-                lagrangianObjects,
-                lagrangianScalarFields
-            );
+                Info<< "Identified lagrangian data set: " << cloudDirs[i]
+                    << endl;
 
-            lagrangianFieldDecomposer::readFieldFields
-            (
-                cloudI,
-                lagrangianObjects,
-                lagrangianScalarFieldFields
-            );
-
-            lagrangianFieldDecomposer::readFields
-            (
-                cloudI,
-                lagrangianObjects,
-                lagrangianVectorFields
-            );
-
-            lagrangianFieldDecomposer::readFieldFields
-            (
-                cloudI,
-                lagrangianObjects,
-                lagrangianVectorFieldFields
-            );
-
-            lagrangianFieldDecomposer::readFields
-            (
-                cloudI,
-                lagrangianObjects,
-                lagrangianSphericalTensorFields
-            );
-
-            lagrangianFieldDecomposer::readFieldFields
-            (
-                cloudI,
-                lagrangianObjects,
-                lagrangianSphericalTensorFieldFields
-            );
-
-            lagrangianFieldDecomposer::readFields
-            (
-                cloudI,
-                lagrangianObjects,
-                lagrangianSymmTensorFields
-            );
-
-            lagrangianFieldDecomposer::readFieldFields
-            (
-                cloudI,
-                lagrangianObjects,
-                lagrangianSymmTensorFieldFields
-            );
-
-            lagrangianFieldDecomposer::readFields
-            (
-                cloudI,
-                lagrangianObjects,
-                lagrangianTensorFields
-            );
-
-            lagrangianFieldDecomposer::readFieldFields
-            (
-                cloudI,
-                lagrangianObjects,
-                lagrangianTensorFieldFields
-            );
-
-            cloudI++;
-        }
-    }
-
-    lagrangianPositions.setSize(cloudI);
-    cellParticles.setSize(cloudI);
-    lagrangianLabelFields.setSize(cloudI);
-    lagrangianLabelFieldFields.setSize(cloudI);
-    lagrangianScalarFields.setSize(cloudI);
-    lagrangianScalarFieldFields.setSize(cloudI);
-    lagrangianVectorFields.setSize(cloudI);
-    lagrangianVectorFieldFields.setSize(cloudI);
-    lagrangianSphericalTensorFields.setSize(cloudI);
-    lagrangianSphericalTensorFieldFields.setSize(cloudI);
-    lagrangianSymmTensorFields.setSize(cloudI);
-    lagrangianSymmTensorFieldFields.setSize(cloudI);
-    lagrangianTensorFields.setSize(cloudI);
-    lagrangianTensorFieldFields.setSize(cloudI);
+                lagrangianPositions.set
+                (
+                    cloudI,
+                    new Cloud<indexedParticle>
+                    (
+                        mesh,
+                        cloudDirs[i],
+                        false
+                    )
+                );
 
 
-    // Any uniform data to copy/link?
-    fileName uniformDir("uniform");
+                // Sort particles per cell
+                // ~~~~~~~~~~~~~~~~~~~~~~~
 
-    if (isDir(runTime.timePath()/uniformDir))
-    {
-        Info<< "Detected additional non-decomposed files in "
-            << runTime.timePath()/uniformDir
-            << endl;
-    }
-    else
-    {
-        uniformDir.clear();
-    }
+                cellParticles.set
+                (
+                    cloudI,
+                    new List<SLList<indexedParticle*>*>
+                    (
+                        mesh.nCells(),
+                        static_cast<SLList<indexedParticle*>*>(NULL)
+                    )
+                );
 
-    Info<< endl;
+                label i = 0;
 
-    // split the fields over processors
-    for (label procI = 0; procI < mesh.nProcs(); procI++)
-    {
-        Info<< "Processor " << procI << ": field transfer" << endl;
+                forAllIter
+                (
+                    Cloud<indexedParticle>,
+                    lagrangianPositions[cloudI],
+                    iter
+                )
+                {
+                    iter().index() = i++;
 
-        // open the database
-        Time processorDb
-        (
-            Time::controlDictName,
-            args.rootPath(),
-            args.caseName()/fileName(word("processor") + name(procI))
-        );
+                    label celli = iter().cell();
 
-        processorDb.setTime(runTime);
+                    // Check
+                    if (celli < 0 || celli >= mesh.nCells())
+                    {
+                        FatalErrorIn(args.executable())
+                            << "Illegal cell number " << celli
+                            << " for particle with index " << iter().index()
+                            << " at position " << iter().position() << nl
+                            << "Cell number should be between 0 and "
+                            << mesh.nCells()-1 << nl
+                            << "On this mesh the particle should be in cell "
+                            << mesh.findCell(iter().position())
+                            << exit(FatalError);
+                    }
 
-        // remove files remnants that can cause horrible problems
-        // - mut and nut are used to mark the new turbulence models,
-        //   their existence prevents old models from being upgraded
-        {
-            fileName timeDir(processorDb.path()/processorDb.timeName());
+                    if (!cellParticles[cloudI][celli])
+                    {
+                        cellParticles[cloudI][celli] =
+                            new SLList<indexedParticle*>();
+                    }
 
-            rm(timeDir/"mut");
-            rm(timeDir/"nut");
+                    cellParticles[cloudI][celli]->append(&iter());
+                }
+
+                // Read fields
+                // ~~~~~~~~~~~
+
+                IOobjectList lagrangianObjects
+                (
+                    mesh,
+                    runTime.timeName(),
+                    cloud::prefix/cloudDirs[cloudI]
+                );
+
+                lagrangianFieldDecomposer::readFields
+                (
+                    cloudI,
+                    lagrangianObjects,
+                    lagrangianLabelFields
+                );
+
+                lagrangianFieldDecomposer::readFieldFields
+                (
+                    cloudI,
+                    lagrangianObjects,
+                    lagrangianLabelFieldFields
+                );
+
+                lagrangianFieldDecomposer::readFields
+                (
+                    cloudI,
+                    lagrangianObjects,
+                    lagrangianScalarFields
+                );
+
+                lagrangianFieldDecomposer::readFieldFields
+                (
+                    cloudI,
+                    lagrangianObjects,
+                    lagrangianScalarFieldFields
+                );
+
+                lagrangianFieldDecomposer::readFields
+                (
+                    cloudI,
+                    lagrangianObjects,
+                    lagrangianVectorFields
+                );
+
+                lagrangianFieldDecomposer::readFieldFields
+                (
+                    cloudI,
+                    lagrangianObjects,
+                    lagrangianVectorFieldFields
+                );
+
+                lagrangianFieldDecomposer::readFields
+                (
+                    cloudI,
+                    lagrangianObjects,
+                    lagrangianSphericalTensorFields
+                );
+
+                lagrangianFieldDecomposer::readFieldFields
+                (
+                    cloudI,
+                    lagrangianObjects,
+                    lagrangianSphericalTensorFieldFields
+                );
+
+                lagrangianFieldDecomposer::readFields
+                (
+                    cloudI,
+                    lagrangianObjects,
+                    lagrangianSymmTensorFields
+                );
+
+                lagrangianFieldDecomposer::readFieldFields
+                (
+                    cloudI,
+                    lagrangianObjects,
+                    lagrangianSymmTensorFieldFields
+                );
+
+                lagrangianFieldDecomposer::readFields
+                (
+                    cloudI,
+                    lagrangianObjects,
+                    lagrangianTensorFields
+                );
+
+                lagrangianFieldDecomposer::readFieldFields
+                (
+                    cloudI,
+                    lagrangianObjects,
+                    lagrangianTensorFieldFields
+                );
+
+                cloudI++;
+            }
         }
 
-        // read the mesh
-        fvMesh procMesh
-        (
-            IOobject
-            (
-                regionName,
-                processorDb.timeName(),
-                processorDb
-            )
-        );
+        lagrangianPositions.setSize(cloudI);
+        cellParticles.setSize(cloudI);
+        lagrangianLabelFields.setSize(cloudI);
+        lagrangianLabelFieldFields.setSize(cloudI);
+        lagrangianScalarFields.setSize(cloudI);
+        lagrangianScalarFieldFields.setSize(cloudI);
+        lagrangianVectorFields.setSize(cloudI);
+        lagrangianVectorFieldFields.setSize(cloudI);
+        lagrangianSphericalTensorFields.setSize(cloudI);
+        lagrangianSphericalTensorFieldFields.setSize(cloudI);
+        lagrangianSymmTensorFields.setSize(cloudI);
+        lagrangianSymmTensorFieldFields.setSize(cloudI);
+        lagrangianTensorFields.setSize(cloudI);
+        lagrangianTensorFieldFields.setSize(cloudI);
 
-        labelIOList faceProcAddressing
-        (
-            IOobject
-            (
-                "faceProcAddressing",
-                procMesh.facesInstance(),
-                procMesh.meshSubDir,
-                procMesh,
-                IOobject::MUST_READ,
-                IOobject::NO_WRITE
-            )
-        );
 
-        labelIOList cellProcAddressing
-        (
-            IOobject
-            (
-                "cellProcAddressing",
-                procMesh.facesInstance(),
-                procMesh.meshSubDir,
-                procMesh,
-                IOobject::MUST_READ,
-                IOobject::NO_WRITE
-            )
-        );
+        // Any uniform data to copy/link?
+        fileName uniformDir("uniform");
 
-        labelIOList boundaryProcAddressing
-        (
-            IOobject
-            (
-                "boundaryProcAddressing",
-                procMesh.facesInstance(),
-                procMesh.meshSubDir,
-                procMesh,
-                IOobject::MUST_READ,
-                IOobject::NO_WRITE
-            )
-        );
-
-        // FV fields
+        if (isDir(runTime.timePath()/uniformDir))
         {
-            fvFieldDecomposer fieldDecomposer
-            (
-                mesh,
-                procMesh,
-                faceProcAddressing,
-                cellProcAddressing,
-                boundaryProcAddressing
-            );
-
-            fieldDecomposer.decomposeFields(volScalarFields);
-            fieldDecomposer.decomposeFields(volVectorFields);
-            fieldDecomposer.decomposeFields(volSphericalTensorFields);
-            fieldDecomposer.decomposeFields(volSymmTensorFields);
-            fieldDecomposer.decomposeFields(volTensorFields);
-
-            fieldDecomposer.decomposeFields(surfaceScalarFields);
-            fieldDecomposer.decomposeFields(surfaceVectorFields);
-            fieldDecomposer.decomposeFields(surfaceSphericalTensorFields);
-            fieldDecomposer.decomposeFields(surfaceSymmTensorFields);
-            fieldDecomposer.decomposeFields(surfaceTensorFields);
+            Info<< "Detected additional non-decomposed files in "
+                << runTime.timePath()/uniformDir
+                << endl;
+        }
+        else
+        {
+            uniformDir.clear();
         }
 
-        // Dimensioned fields
+        Info<< endl;
+
+        // split the fields over processors
+        for (label procI = 0; procI < mesh.nProcs(); procI++)
         {
-            dimFieldDecomposer fieldDecomposer
+            Info<< "Processor " << procI << ": field transfer" << endl;
+
+            // open the database
+            Time processorDb
             (
-                mesh,
-                procMesh,
-                faceProcAddressing,
-                cellProcAddressing
+                Time::controlDictName,
+                args.rootPath(),
+                args.caseName()/fileName(word("processor") + name(procI))
             );
 
-            fieldDecomposer.decomposeFields(dimScalarFields);
-            fieldDecomposer.decomposeFields(dimVectorFields);
-            fieldDecomposer.decomposeFields(dimSphericalTensorFields);
-            fieldDecomposer.decomposeFields(dimSymmTensorFields);
-            fieldDecomposer.decomposeFields(dimTensorFields);
-        }
+            processorDb.setTime(runTime);
 
+            // remove files remnants that can cause horrible problems
+            // - mut and nut are used to mark the new turbulence models,
+            //   their existence prevents old models from being upgraded
+            {
+                fileName timeDir(processorDb.path()/processorDb.timeName());
 
-        // Point fields
-        if
-        (
-            pointScalarFields.size()
-         || pointVectorFields.size()
-         || pointSphericalTensorFields.size()
-         || pointSymmTensorFields.size()
-         || pointTensorFields.size()
-        )
-        {
-            labelIOList pointProcAddressing
+                rm(timeDir/"mut");
+                rm(timeDir/"nut");
+            }
+
+            // read the mesh
+            fvMesh procMesh
             (
                 IOobject
                 (
-                    "pointProcAddressing",
+                    regionName,
+                    processorDb.timeName(),
+                    processorDb
+                )
+            );
+
+            labelIOList faceProcAddressing
+            (
+                IOobject
+                (
+                    "faceProcAddressing",
                     procMesh.facesInstance(),
                     procMesh.meshSubDir,
                     procMesh,
@@ -811,138 +718,229 @@ int main(int argc, char *argv[])
                 )
             );
 
-            pointMesh procPMesh(procMesh);
-
-            pointFieldDecomposer fieldDecomposer
+            labelIOList cellProcAddressing
             (
-                pMesh,
-                procPMesh,
-                pointProcAddressing,
-                boundaryProcAddressing
+                IOobject
+                (
+                    "cellProcAddressing",
+                    procMesh.facesInstance(),
+                    procMesh.meshSubDir,
+                    procMesh,
+                    IOobject::MUST_READ,
+                    IOobject::NO_WRITE
+                )
             );
 
-            fieldDecomposer.decomposeFields(pointScalarFields);
-            fieldDecomposer.decomposeFields(pointVectorFields);
-            fieldDecomposer.decomposeFields(pointSphericalTensorFields);
-            fieldDecomposer.decomposeFields(pointSymmTensorFields);
-            fieldDecomposer.decomposeFields(pointTensorFields);
-        }
+            labelIOList boundaryProcAddressing
+            (
+                IOobject
+                (
+                    "boundaryProcAddressing",
+                    procMesh.facesInstance(),
+                    procMesh.meshSubDir,
+                    procMesh,
+                    IOobject::MUST_READ,
+                    IOobject::NO_WRITE
+                )
+            );
 
-
-        // If there is lagrangian data write it out
-        forAll(lagrangianPositions, cloudI)
-        {
-            if (lagrangianPositions[cloudI].size())
+            // FV fields
             {
-                lagrangianFieldDecomposer fieldDecomposer
+                fvFieldDecomposer fieldDecomposer
                 (
                     mesh,
                     procMesh,
                     faceProcAddressing,
                     cellProcAddressing,
-                    cloudDirs[cloudI],
-                    lagrangianPositions[cloudI],
-                    cellParticles[cloudI]
+                    boundaryProcAddressing
                 );
 
-                // Lagrangian fields
+                fieldDecomposer.decomposeFields(volScalarFields);
+                fieldDecomposer.decomposeFields(volVectorFields);
+                fieldDecomposer.decomposeFields(volSphericalTensorFields);
+                fieldDecomposer.decomposeFields(volSymmTensorFields);
+                fieldDecomposer.decomposeFields(volTensorFields);
+
+                fieldDecomposer.decomposeFields(surfaceScalarFields);
+                fieldDecomposer.decomposeFields(surfaceVectorFields);
+                fieldDecomposer.decomposeFields(surfaceSphericalTensorFields);
+                fieldDecomposer.decomposeFields(surfaceSymmTensorFields);
+                fieldDecomposer.decomposeFields(surfaceTensorFields);
+            }
+
+            // Dimensioned fields
+            {
+                dimFieldDecomposer fieldDecomposer
+                (
+                    mesh,
+                    procMesh,
+                    faceProcAddressing,
+                    cellProcAddressing
+                );
+
+                fieldDecomposer.decomposeFields(dimScalarFields);
+                fieldDecomposer.decomposeFields(dimVectorFields);
+                fieldDecomposer.decomposeFields(dimSphericalTensorFields);
+                fieldDecomposer.decomposeFields(dimSymmTensorFields);
+                fieldDecomposer.decomposeFields(dimTensorFields);
+            }
+
+
+            // Point fields
+            if
+            (
+                pointScalarFields.size()
+             || pointVectorFields.size()
+             || pointSphericalTensorFields.size()
+             || pointSymmTensorFields.size()
+             || pointTensorFields.size()
+            )
+            {
+                labelIOList pointProcAddressing
+                (
+                    IOobject
+                    (
+                        "pointProcAddressing",
+                        procMesh.facesInstance(),
+                        procMesh.meshSubDir,
+                        procMesh,
+                        IOobject::MUST_READ,
+                        IOobject::NO_WRITE
+                    )
+                );
+
+                pointMesh procPMesh(procMesh);
+
+                pointFieldDecomposer fieldDecomposer
+                (
+                    pMesh,
+                    procPMesh,
+                    pointProcAddressing,
+                    boundaryProcAddressing
+                );
+
+                fieldDecomposer.decomposeFields(pointScalarFields);
+                fieldDecomposer.decomposeFields(pointVectorFields);
+                fieldDecomposer.decomposeFields(pointSphericalTensorFields);
+                fieldDecomposer.decomposeFields(pointSymmTensorFields);
+                fieldDecomposer.decomposeFields(pointTensorFields);
+            }
+
+
+            // If there is lagrangian data write it out
+            forAll(lagrangianPositions, cloudI)
+            {
+                if (lagrangianPositions[cloudI].size())
                 {
-                    fieldDecomposer.decomposeFields
+                    lagrangianFieldDecomposer fieldDecomposer
                     (
+                        mesh,
+                        procMesh,
+                        faceProcAddressing,
+                        cellProcAddressing,
                         cloudDirs[cloudI],
-                        lagrangianLabelFields[cloudI]
+                        lagrangianPositions[cloudI],
+                        cellParticles[cloudI]
                     );
-                    fieldDecomposer.decomposeFieldFields
+
+                    // Lagrangian fields
+                    {
+                        fieldDecomposer.decomposeFields
+                        (
+                            cloudDirs[cloudI],
+                            lagrangianLabelFields[cloudI]
+                        );
+                        fieldDecomposer.decomposeFieldFields
+                        (
+                            cloudDirs[cloudI],
+                            lagrangianLabelFieldFields[cloudI]
+                        );
+                        fieldDecomposer.decomposeFields
+                        (
+                            cloudDirs[cloudI],
+                            lagrangianScalarFields[cloudI]
+                        );
+                        fieldDecomposer.decomposeFieldFields
+                        (
+                            cloudDirs[cloudI],
+                            lagrangianScalarFieldFields[cloudI]
+                        );
+                        fieldDecomposer.decomposeFields
+                        (
+                            cloudDirs[cloudI],
+                            lagrangianVectorFields[cloudI]
+                        );
+                        fieldDecomposer.decomposeFieldFields
+                        (
+                            cloudDirs[cloudI],
+                            lagrangianVectorFieldFields[cloudI]
+                        );
+                        fieldDecomposer.decomposeFields
+                        (
+                            cloudDirs[cloudI],
+                            lagrangianSphericalTensorFields[cloudI]
+                        );
+                        fieldDecomposer.decomposeFieldFields
+                        (
+                            cloudDirs[cloudI],
+                            lagrangianSphericalTensorFieldFields[cloudI]
+                        );
+                        fieldDecomposer.decomposeFields
+                        (
+                            cloudDirs[cloudI],
+                            lagrangianSymmTensorFields[cloudI]
+                        );
+                        fieldDecomposer.decomposeFieldFields
+                        (
+                            cloudDirs[cloudI],
+                            lagrangianSymmTensorFieldFields[cloudI]
+                        );
+                        fieldDecomposer.decomposeFields
+                        (
+                            cloudDirs[cloudI],
+                            lagrangianTensorFields[cloudI]
+                        );
+                        fieldDecomposer.decomposeFieldFields
+                        (
+                            cloudDirs[cloudI],
+                            lagrangianTensorFieldFields[cloudI]
+                        );
+                    }
+                }
+            }
+
+
+            // Any non-decomposed data to copy?
+            if (uniformDir.size())
+            {
+                const fileName timePath = processorDb.timePath();
+
+                if (copyUniform || mesh.distributed())
+                {
+                    cp
                     (
-                        cloudDirs[cloudI],
-                        lagrangianLabelFieldFields[cloudI]
+                        runTime.timePath()/uniformDir,
+                        timePath/uniformDir
                     );
-                    fieldDecomposer.decomposeFields
+                }
+                else
+                {
+                    // link with relative paths
+                    const string parentPath = string("..")/"..";
+
+                    fileName currentDir(cwd());
+                    chDir(timePath);
+                    ln
                     (
-                        cloudDirs[cloudI],
-                        lagrangianScalarFields[cloudI]
-                    );
-                    fieldDecomposer.decomposeFieldFields
-                    (
-                        cloudDirs[cloudI],
-                        lagrangianScalarFieldFields[cloudI]
-                    );
-                    fieldDecomposer.decomposeFields
-                    (
-                        cloudDirs[cloudI],
-                        lagrangianVectorFields[cloudI]
-                    );
-                    fieldDecomposer.decomposeFieldFields
-                    (
-                        cloudDirs[cloudI],
-                        lagrangianVectorFieldFields[cloudI]
-                    );
-                    fieldDecomposer.decomposeFields
-                    (
-                        cloudDirs[cloudI],
-                        lagrangianSphericalTensorFields[cloudI]
-                    );
-                    fieldDecomposer.decomposeFieldFields
-                    (
-                        cloudDirs[cloudI],
-                        lagrangianSphericalTensorFieldFields[cloudI]
-                    );
-                    fieldDecomposer.decomposeFields
-                    (
-                        cloudDirs[cloudI],
-                        lagrangianSymmTensorFields[cloudI]
-                    );
-                    fieldDecomposer.decomposeFieldFields
-                    (
-                        cloudDirs[cloudI],
-                        lagrangianSymmTensorFieldFields[cloudI]
-                    );
-                    fieldDecomposer.decomposeFields
-                    (
-                        cloudDirs[cloudI],
-                        lagrangianTensorFields[cloudI]
-                    );
-                    fieldDecomposer.decomposeFieldFields
-                    (
-                        cloudDirs[cloudI],
-                        lagrangianTensorFieldFields[cloudI]
+                        parentPath/runTime.timeName()/uniformDir,
+                        uniformDir
                     );
+                    chDir(currentDir);
                 }
             }
         }
-
-
-        // Any non-decomposed data to copy?
-        if (uniformDir.size())
-        {
-            const fileName timePath = processorDb.timePath();
-
-            if (copyUniform || mesh.distributed())
-            {
-                cp
-                (
-                    runTime.timePath()/uniformDir,
-                    timePath/uniformDir
-                );
-            }
-            else
-            {
-                // link with relative paths
-                const string parentPath = string("..")/"..";
-
-                fileName currentDir(cwd());
-                chDir(timePath);
-                ln
-                (
-                    parentPath/runTime.timeName()/uniformDir,
-                    uniformDir
-                );
-                chDir(currentDir);
-            }
-        }
     }
 
-
     Info<< "\nEnd.\n" << endl;
 
     return 0;

From aa7c66a3ffad756e57f3eaa3dd8de2411a6f6c57 Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Mon, 16 Apr 2012 11:46:35 +0100
Subject: [PATCH 199/317] twoPhaseMixture: Added support for named phases e.g.
 in transportProperties

phases (air water);
---
 .../multiphase/cavitatingFoam/createFields.H  | 53 ++++++++-----------
 .../multiphase/interFoam/createFields.H       | 16 +-----
 .../twoLiquidMixingFoam/createFields.H        | 16 +-----
 .../twoPhaseMixture.C                         | 19 +++++--
 .../twoPhaseMixture.H                         | 16 +++++-
 5 files changed, 54 insertions(+), 66 deletions(-)

diff --git a/applications/solvers/multiphase/cavitatingFoam/createFields.H b/applications/solvers/multiphase/cavitatingFoam/createFields.H
index 49c7de1473..dbacf1dbd3 100644
--- a/applications/solvers/multiphase/cavitatingFoam/createFields.H
+++ b/applications/solvers/multiphase/cavitatingFoam/createFields.H
@@ -25,38 +25,6 @@
         mesh
     );
 
-    volScalarField gamma
-    (
-        IOobject
-        (
-            "gamma",
-            runTime.timeName(),
-            mesh,
-            IOobject::NO_READ,
-            IOobject::AUTO_WRITE
-        ),
-        max(min((rho - rholSat)/(rhovSat - rholSat), scalar(1)), scalar(0))
-    );
-    gamma.oldTime();
-
-    Info<< "Creating compressibilityModel\n" << endl;
-    autoPtr<barotropicCompressibilityModel> psiModel =
-        barotropicCompressibilityModel::New
-        (
-            thermodynamicProperties,
-            gamma
-        );
-
-    const volScalarField& psi = psiModel->psi();
-
-    rho == max
-    (
-        psi*p
-      + (1.0 - gamma)*rhol0
-      + ((gamma*psiv + (1.0 - gamma)*psil) - psi)*pSat,
-        rhoMin
-    );
-
     Info<< "Reading field U\n" << endl;
     volVectorField U
     (
@@ -78,6 +46,27 @@
 
     twoPhaseMixture twoPhaseProperties(U, phiv, "gamma");
 
+    volScalarField& gamma(twoPhaseProperties.alpha1());
+    gamma.oldTime();
+
+    Info<< "Creating compressibilityModel\n" << endl;
+    autoPtr<barotropicCompressibilityModel> psiModel =
+        barotropicCompressibilityModel::New
+        (
+            thermodynamicProperties,
+            gamma
+        );
+
+    const volScalarField& psi = psiModel->psi();
+
+    rho == max
+    (
+        psi*p
+      + (1.0 - gamma)*rhol0
+      + ((gamma*psiv + (1.0 - gamma)*psil) - psi)*pSat,
+        rhoMin
+    );
+
     // Create incompressible turbulence model
     autoPtr<incompressible::turbulenceModel> turbulence
     (
diff --git a/applications/solvers/multiphase/interFoam/createFields.H b/applications/solvers/multiphase/interFoam/createFields.H
index 34dea334e8..68765262db 100644
--- a/applications/solvers/multiphase/interFoam/createFields.H
+++ b/applications/solvers/multiphase/interFoam/createFields.H
@@ -12,20 +12,6 @@
         mesh
     );
 
-    Info<< "Reading field alpha1\n" << endl;
-    volScalarField alpha1
-    (
-        IOobject
-        (
-            "alpha1",
-            runTime.timeName(),
-            mesh,
-            IOobject::MUST_READ,
-            IOobject::AUTO_WRITE
-        ),
-        mesh
-    );
-
     Info<< "Reading field U\n" << endl;
     volVectorField U
     (
@@ -46,6 +32,8 @@
     Info<< "Reading transportProperties\n" << endl;
     twoPhaseMixture twoPhaseProperties(U, phi);
 
+    volScalarField& alpha1(twoPhaseProperties.alpha1());
+
     const dimensionedScalar& rho1 = twoPhaseProperties.rho1();
     const dimensionedScalar& rho2 = twoPhaseProperties.rho2();
 
diff --git a/applications/solvers/multiphase/twoLiquidMixingFoam/createFields.H b/applications/solvers/multiphase/twoLiquidMixingFoam/createFields.H
index 73af502ce2..0d01b9a9e5 100644
--- a/applications/solvers/multiphase/twoLiquidMixingFoam/createFields.H
+++ b/applications/solvers/multiphase/twoLiquidMixingFoam/createFields.H
@@ -12,20 +12,6 @@
         mesh
     );
 
-    Info<< "Reading field alpha1\n" << endl;
-    volScalarField alpha1
-    (
-        IOobject
-        (
-            "alpha1",
-            runTime.timeName(),
-            mesh,
-            IOobject::MUST_READ,
-            IOobject::AUTO_WRITE
-        ),
-        mesh
-    );
-
     Info<< "Reading field U\n" << endl;
     volVectorField U
     (
@@ -45,6 +31,8 @@
     Info<< "Reading transportProperties\n" << endl;
     twoPhaseMixture twoPhaseProperties(U, phi);
 
+    volScalarField& alpha1(twoPhaseProperties.alpha1());
+
     const dimensionedScalar& rho1 = twoPhaseProperties.rho1();
     const dimensionedScalar& rho2 = twoPhaseProperties.rho2();
 
diff --git a/src/transportModels/incompressible/incompressibleTwoPhaseMixture/twoPhaseMixture.C b/src/transportModels/incompressible/incompressibleTwoPhaseMixture/twoPhaseMixture.C
index 43f1ca8733..392704b940 100644
--- a/src/transportModels/incompressible/incompressibleTwoPhaseMixture/twoPhaseMixture.C
+++ b/src/transportModels/incompressible/incompressibleTwoPhaseMixture/twoPhaseMixture.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -59,8 +59,8 @@ Foam::twoPhaseMixture::twoPhaseMixture
 :
     transportModel(U, phi),
 
-    phase1Name_("phase1"),
-    phase2Name_("phase2"),
+    phase1Name_(found("phases") ? wordList(lookup("phases"))[0] : "phase1"),
+    phase2Name_(found("phases") ? wordList(lookup("phases"))[1] : "phase2"),
 
     nuModel1_
     (
@@ -89,7 +89,18 @@ Foam::twoPhaseMixture::twoPhaseMixture
     U_(U),
     phi_(phi),
 
-    alpha1_(U_.db().lookupObject<const volScalarField> (alpha1Name)),
+    alpha1_
+    (
+        IOobject
+        (
+            found("phases") ? word("alpha" + phase1Name_) : alpha1Name,
+            U_.time().timeName(),
+            U_.db(),
+            IOobject::MUST_READ,
+            IOobject::AUTO_WRITE
+        ),
+        U_.mesh()
+    ),
 
     nu_
     (
diff --git a/src/transportModels/incompressible/incompressibleTwoPhaseMixture/twoPhaseMixture.H b/src/transportModels/incompressible/incompressibleTwoPhaseMixture/twoPhaseMixture.H
index 5e5eaaf10b..025d95f701 100644
--- a/src/transportModels/incompressible/incompressibleTwoPhaseMixture/twoPhaseMixture.H
+++ b/src/transportModels/incompressible/incompressibleTwoPhaseMixture/twoPhaseMixture.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -69,7 +69,7 @@ protected:
         const volVectorField& U_;
         const surfaceScalarField& phi_;
 
-        const volScalarField& alpha1_;
+        volScalarField alpha1_;
 
         volScalarField nu_;
 
@@ -110,6 +110,18 @@ public:
             return phase2Name_;
         }
 
+        //- Return the phase-fraction of phase 1
+        const volScalarField& alpha1() const
+        {
+            return alpha1_;
+        }
+
+        //- Return the phase-fraction of phase 1
+        volScalarField& alpha1()
+        {
+            return alpha1_;
+        }
+
         //- Return const-access to phase1 viscosityModel
         const viscosityModel& nuModel1() const
         {

From 8e3e1808ec0ef83ed1229a8af70b6a3c46ab8258 Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Mon, 16 Apr 2012 11:47:28 +0100
Subject: [PATCH 200/317] compressibleInterFoam: Added thermal support

---
 .../compressibleInterFoam/Make/files          |   1 +
 .../multiphase/compressibleInterFoam/TEqn.H   |  20 ++
 .../compressibleInterDyMFoam.C                |   8 +-
 .../compressibleInterDyMFoam/pEqn.H           |  88 --------
 .../compressibleInterFoam.C                   |   5 +-
 .../compressibleInterFoam/createFields.H      | 105 ++++++++--
 .../wallHeatTransferFvPatchScalarField.C      | 184 +++++++++++++++++
 .../wallHeatTransferFvPatchScalarField.H      | 194 ++++++++++++++++++
 .../multiphase/compressibleInterFoam/pEqn.H   |  61 +++---
 .../les/depthCharge2D/0/T.org                 |  34 +++
 .../0/{alpha1.org => alphawater.org}          |   2 +-
 .../les/depthCharge2D/Allclean                |   3 +-
 .../les/depthCharge2D/Allrun                  |   3 +-
 .../constant/polyMesh/blockMeshDict           |  34 ++-
 .../constant/transportProperties              |  14 +-
 .../les/depthCharge2D/system/controlDict      |   2 +-
 .../les/depthCharge2D/system/fvSchemes        |   5 +-
 .../les/depthCharge2D/system/fvSolution       |   2 +-
 .../les/depthCharge2D/system/setFieldsDict    |   8 +-
 .../les/depthCharge3D/0/T.org                 |  29 +++
 .../0/{alpha1.org => alphawater.org}          |   2 +-
 .../les/depthCharge3D/Allclean                |   2 +-
 .../les/depthCharge3D/Allrun                  |   3 +-
 .../constant/transportProperties              |  14 +-
 .../les/depthCharge3D/system/fvSchemes        |   5 +-
 .../les/depthCharge3D/system/fvSolution       |   2 +-
 .../les/depthCharge3D/system/setFieldsDict    |   8 +-
 27 files changed, 651 insertions(+), 187 deletions(-)
 create mode 100644 applications/solvers/multiphase/compressibleInterFoam/TEqn.H
 delete mode 100644 applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/pEqn.H
 create mode 100644 applications/solvers/multiphase/compressibleInterFoam/derivedFvPatchFields/wallHeatTransfer/wallHeatTransferFvPatchScalarField.C
 create mode 100644 applications/solvers/multiphase/compressibleInterFoam/derivedFvPatchFields/wallHeatTransfer/wallHeatTransferFvPatchScalarField.H
 create mode 100644 tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/0/T.org
 rename tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/0/{alpha1.org => alphawater.org} (97%)
 create mode 100644 tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/0/T.org
 rename tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/0/{alpha1.org => alphawater.org} (97%)

diff --git a/applications/solvers/multiphase/compressibleInterFoam/Make/files b/applications/solvers/multiphase/compressibleInterFoam/Make/files
index de5437219c..0e009f09bc 100644
--- a/applications/solvers/multiphase/compressibleInterFoam/Make/files
+++ b/applications/solvers/multiphase/compressibleInterFoam/Make/files
@@ -1,3 +1,4 @@
+derivedFvPatchFields/wallHeatTransfer/wallHeatTransferFvPatchScalarField.C
 compressibleInterFoam.C
 
 EXE = $(FOAM_APPBIN)/compressibleInterFoam
diff --git a/applications/solvers/multiphase/compressibleInterFoam/TEqn.H b/applications/solvers/multiphase/compressibleInterFoam/TEqn.H
new file mode 100644
index 0000000000..34b6bd35dd
--- /dev/null
+++ b/applications/solvers/multiphase/compressibleInterFoam/TEqn.H
@@ -0,0 +1,20 @@
+{
+    volScalarField kByCv
+    (
+        "kByCv",
+        (alpha1*k1/Cv1 + alpha2*k2/Cv2)
+      + (alpha1*rho1 + alpha2*rho2)*turbulence->nut()
+    );
+
+    solve
+    (
+        fvm::ddt(rho, T)
+      + fvm::div(rhoPhi, T)
+      - fvm::laplacian(kByCv, T)
+      + p*fvc::div(phi)*(alpha1/Cv1 + alpha2/Cv2)
+    );
+
+    // Update compressibilities
+    psi1 = 1.0/(R1*T);
+    psi2 = 1.0/(R2*T);
+}
diff --git a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/compressibleInterDyMFoam.C b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/compressibleInterDyMFoam.C
index 1ac1596c4d..a4cfc215fc 100644
--- a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/compressibleInterDyMFoam.C
+++ b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/compressibleInterDyMFoam.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -25,7 +25,7 @@ Application
     compressibleInterDyMFoam
 
 Description
-    Solver for 2 compressible, isothermal immiscible fluids using a VOF
+    Solver for 2 compressible, non-isothermal immiscible fluids using a VOF
     (volume of fluid) phase-fraction based interface capturing approach,
     with optional mesh motion and mesh topology changes including adaptive
     re-meshing.
@@ -124,11 +124,15 @@ int main(int argc, char *argv[])
             solve(fvm::ddt(rho) + fvc::div(rhoPhi));
 
             #include "UEqn.H"
+            #include "TEqn.H"
 
             // --- Pressure corrector loop
             while (pimple.correct())
             {
                 #include "pEqn.H"
+
+                // Make the fluxes relative to the mesh motion
+                fvc::makeRelative(phi, U);
             }
         }
 
diff --git a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/pEqn.H b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/pEqn.H
deleted file mode 100644
index 26666c4120..0000000000
--- a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/pEqn.H
+++ /dev/null
@@ -1,88 +0,0 @@
-{
-    volScalarField rAU(1.0/UEqn.A());
-    surfaceScalarField rAUf(fvc::interpolate(rAU));
-
-    tmp<fvScalarMatrix> p_rghEqnComp;
-
-    if (pimple.transonic())
-    {
-        p_rghEqnComp =
-        (
-            fvm::ddt(p_rgh)
-          + fvm::div(phi, p_rgh)
-          - fvm::Sp(fvc::div(phi), p_rgh)
-        );
-    }
-    else
-    {
-        p_rghEqnComp =
-        (
-            fvm::ddt(p_rgh)
-          + fvc::div(phi, p_rgh)
-          - fvc::Sp(fvc::div(phi), p_rgh)
-        );
-    }
-
-
-    U = rAU*UEqn.H();
-
-    surfaceScalarField phiU
-    (
-        "phiU",
-        (fvc::interpolate(U) & mesh.Sf())
-      + fvc::ddtPhiCorr(rAU, rho, U, phi)
-    );
-
-    phi = phiU +
-        (
-            fvc::interpolate(interface.sigmaK())*fvc::snGrad(alpha1)
-          - ghf*fvc::snGrad(rho)
-        )*rAUf*mesh.magSf();
-
-    while (pimple.correctNonOrthogonal())
-    {
-        fvScalarMatrix p_rghEqnIncomp
-        (
-            fvc::div(phi)
-          - fvm::laplacian(rAUf, p_rgh)
-        );
-
-        solve
-        (
-            (
-                max(alpha1, scalar(0))*(psi1/rho1)
-              + max(alpha2, scalar(0))*(psi2/rho2)
-            )
-           *p_rghEqnComp()
-          + p_rghEqnIncomp,
-            mesh.solver(p_rgh.select(pimple.finalInnerIter()))
-        );
-
-        if (pimple.finalNonOrthogonalIter())
-        {
-            dgdt =
-                (pos(alpha2)*(psi2/rho2) - pos(alpha1)*(psi1/rho1))
-               *(p_rghEqnComp & p_rgh);
-            phi += p_rghEqnIncomp.flux();
-        }
-    }
-
-    U += rAU*fvc::reconstruct((phi - phiU)/rAUf);
-    U.correctBoundaryConditions();
-
-    p = max
-    (
-        (p_rgh + gh*(alpha1*rho10 + alpha2*rho20))
-       /(1.0 - gh*(alpha1*psi1 + alpha2*psi2)),
-        pMin
-    );
-
-    rho1 = rho10 + psi1*p;
-    rho2 = rho20 + psi2*p;
-
-    Info<< "max(U) " << max(mag(U)).value() << endl;
-    Info<< "min(p_rgh) " << min(p_rgh).value() << endl;
-
-    // Make the fluxes relative to the mesh motion
-    fvc::makeRelative(phi, U);
-}
diff --git a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFoam.C b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFoam.C
index 4ad1b3d01d..58dd7e6866 100644
--- a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFoam.C
+++ b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFoam.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -25,7 +25,7 @@ Application
     compressibleInterFoam
 
 Description
-    Solver for 2 compressible, isothermal immiscible fluids using a VOF
+    Solver for 2 compressible, non-isothermal immiscible fluids using a VOF
     (volume of fluid) phase-fraction based interface capturing approach.
 
     The momentum and other fluid properties are of the "mixture" and a single
@@ -82,6 +82,7 @@ int main(int argc, char *argv[])
             solve(fvm::ddt(rho) + fvc::div(rhoPhi));
 
             #include "UEqn.H"
+            #include "TEqn.H"
 
             // --- Pressure corrector loop
             while (pimple.correct())
diff --git a/applications/solvers/multiphase/compressibleInterFoam/createFields.H b/applications/solvers/multiphase/compressibleInterFoam/createFields.H
index c598cb75ce..4930743887 100644
--- a/applications/solvers/multiphase/compressibleInterFoam/createFields.H
+++ b/applications/solvers/multiphase/compressibleInterFoam/createFields.H
@@ -12,23 +12,6 @@
         mesh
     );
 
-    Info<< "Reading field alpha1\n" << endl;
-    volScalarField alpha1
-    (
-        IOobject
-        (
-            "alpha1",
-            runTime.timeName(),
-            mesh,
-            IOobject::MUST_READ,
-            IOobject::AUTO_WRITE
-        ),
-        mesh
-    );
-
-    Info<< "Calculating field alpha1\n" << endl;
-    volScalarField alpha2("alpha2", scalar(1) - alpha1);
-
     Info<< "Reading field U\n" << endl;
     volVectorField U
     (
@@ -45,10 +28,19 @@
 
     #include "createPhi.H"
 
-
     Info<< "Reading transportProperties\n" << endl;
     twoPhaseMixture twoPhaseProperties(U, phi);
 
+    volScalarField& alpha1(twoPhaseProperties.alpha1());
+
+    Info<< "Calculating phase-fraction alpha" << twoPhaseProperties.phase2Name()
+        << nl << endl;
+    volScalarField alpha2
+    (
+        "alpha" + twoPhaseProperties.phase2Name(),
+        scalar(1) - alpha1
+    );
+
     dimensionedScalar rho10
     (
         twoPhaseProperties.subDict
@@ -65,22 +57,91 @@
         ).lookup("rho0")
     );
 
-    dimensionedScalar psi1
+    dimensionedScalar k1
     (
         twoPhaseProperties.subDict
         (
             twoPhaseProperties.phase1Name()
-        ).lookup("psi")
+        ).lookup("k")
     );
 
-    dimensionedScalar psi2
+    dimensionedScalar k2
     (
         twoPhaseProperties.subDict
         (
             twoPhaseProperties.phase2Name()
-        ).lookup("psi")
+        ).lookup("k")
     );
 
+    dimensionedScalar Cv1
+    (
+        twoPhaseProperties.subDict
+        (
+            twoPhaseProperties.phase1Name()
+        ).lookup("Cv")
+    );
+
+    dimensionedScalar Cv2
+    (
+        twoPhaseProperties.subDict
+        (
+            twoPhaseProperties.phase2Name()
+        ).lookup("Cv")
+    );
+
+    dimensionedScalar R1
+    (
+        twoPhaseProperties.subDict
+        (
+            twoPhaseProperties.phase1Name()
+        ).lookup("R")
+    );
+
+    dimensionedScalar R2
+    (
+        twoPhaseProperties.subDict
+        (
+            twoPhaseProperties.phase2Name()
+        ).lookup("R")
+    );
+
+    Info<< "Reading field T\n" << endl;
+    volScalarField T
+    (
+        IOobject
+        (
+            "T",
+            runTime.timeName(),
+            mesh,
+            IOobject::MUST_READ,
+            IOobject::AUTO_WRITE
+        ),
+        mesh
+    );
+
+    volScalarField psi1
+    (
+        IOobject
+        (
+            "psi1",
+            runTime.timeName(),
+            mesh
+        ),
+        1.0/(R1*T)
+    );
+
+    volScalarField psi2
+    (
+        IOobject
+        (
+            "psi2",
+            runTime.timeName(),
+            mesh
+        ),
+        1.0/(R2*T)
+    );
+    psi2.oldTime();
+
     dimensionedScalar pMin(twoPhaseProperties.lookup("pMin"));
 
     Info<< "Calculating field g.h\n" << endl;
diff --git a/applications/solvers/multiphase/compressibleInterFoam/derivedFvPatchFields/wallHeatTransfer/wallHeatTransferFvPatchScalarField.C b/applications/solvers/multiphase/compressibleInterFoam/derivedFvPatchFields/wallHeatTransfer/wallHeatTransferFvPatchScalarField.C
new file mode 100644
index 0000000000..e6782e8b3a
--- /dev/null
+++ b/applications/solvers/multiphase/compressibleInterFoam/derivedFvPatchFields/wallHeatTransfer/wallHeatTransferFvPatchScalarField.C
@@ -0,0 +1,184 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "wallHeatTransferFvPatchScalarField.H"
+#include "addToRunTimeSelectionTable.H"
+#include "fvPatchFieldMapper.H"
+#include "volFields.H"
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::wallHeatTransferFvPatchScalarField::wallHeatTransferFvPatchScalarField
+(
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF
+)
+:
+    mixedFvPatchScalarField(p, iF),
+    Tinf_(p.size(), 0.0),
+    alphaWall_(p.size(), 0.0)
+{
+    refValue() = 0.0;
+    refGrad() = 0.0;
+    valueFraction() = 0.0;
+}
+
+
+Foam::wallHeatTransferFvPatchScalarField::wallHeatTransferFvPatchScalarField
+(
+    const wallHeatTransferFvPatchScalarField& ptf,
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF,
+    const fvPatchFieldMapper& mapper
+)
+:
+    mixedFvPatchScalarField(ptf, p, iF, mapper),
+    Tinf_(ptf.Tinf_, mapper),
+    alphaWall_(ptf.alphaWall_, mapper)
+{}
+
+
+Foam::wallHeatTransferFvPatchScalarField::wallHeatTransferFvPatchScalarField
+(
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF,
+    const dictionary& dict
+)
+:
+    mixedFvPatchScalarField(p, iF),
+    Tinf_("Tinf", dict, p.size()),
+    alphaWall_("alphaWall", dict, p.size())
+{
+    refValue() = Tinf_;
+    refGrad() = 0.0;
+    valueFraction() = 0.0;
+
+    if (dict.found("value"))
+    {
+        fvPatchField<scalar>::operator=
+        (
+            scalarField("value", dict, p.size())
+        );
+    }
+    else
+    {
+        evaluate();
+    }
+}
+
+
+Foam::wallHeatTransferFvPatchScalarField::wallHeatTransferFvPatchScalarField
+(
+    const wallHeatTransferFvPatchScalarField& tppsf
+)
+:
+    mixedFvPatchScalarField(tppsf),
+    Tinf_(tppsf.Tinf_),
+    alphaWall_(tppsf.alphaWall_)
+{}
+
+
+Foam::wallHeatTransferFvPatchScalarField::wallHeatTransferFvPatchScalarField
+(
+    const wallHeatTransferFvPatchScalarField& tppsf,
+    const DimensionedField<scalar, volMesh>& iF
+)
+:
+    mixedFvPatchScalarField(tppsf, iF),
+    Tinf_(tppsf.Tinf_),
+    alphaWall_(tppsf.alphaWall_)
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::wallHeatTransferFvPatchScalarField::autoMap
+(
+    const fvPatchFieldMapper& m
+)
+{
+    scalarField::autoMap(m);
+    Tinf_.autoMap(m);
+    alphaWall_.autoMap(m);
+}
+
+
+void Foam::wallHeatTransferFvPatchScalarField::rmap
+(
+    const fvPatchScalarField& ptf,
+    const labelList& addr
+)
+{
+    mixedFvPatchScalarField::rmap(ptf, addr);
+
+    const wallHeatTransferFvPatchScalarField& tiptf =
+        refCast<const wallHeatTransferFvPatchScalarField>(ptf);
+
+    Tinf_.rmap(tiptf.Tinf_, addr);
+    alphaWall_.rmap(tiptf.alphaWall_, addr);
+}
+
+
+void Foam::wallHeatTransferFvPatchScalarField::updateCoeffs()
+{
+    if (updated())
+    {
+        return;
+    }
+
+    const fvPatchScalarField& Cpw =
+        patch().lookupPatchField<volScalarField, scalar>("Cp");
+
+    const fvPatchScalarField& kByCpw =
+        patch().lookupPatchField<volScalarField, scalar>("kByCp");
+
+    valueFraction() =
+        1.0/
+        (
+            1.0
+          + Cpw*kByCpw*patch().deltaCoeffs()/alphaWall_
+        );
+
+    mixedFvPatchScalarField::updateCoeffs();
+}
+
+
+void Foam::wallHeatTransferFvPatchScalarField::write(Ostream& os) const
+{
+    fvPatchScalarField::write(os);
+    Tinf_.writeEntry("Tinf", os);
+    alphaWall_.writeEntry("alphaWall", os);
+    writeEntry("value", os);
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    makePatchTypeField(fvPatchScalarField, wallHeatTransferFvPatchScalarField);
+}
+
+// ************************************************************************* //
diff --git a/applications/solvers/multiphase/compressibleInterFoam/derivedFvPatchFields/wallHeatTransfer/wallHeatTransferFvPatchScalarField.H b/applications/solvers/multiphase/compressibleInterFoam/derivedFvPatchFields/wallHeatTransfer/wallHeatTransferFvPatchScalarField.H
new file mode 100644
index 0000000000..cf5284a087
--- /dev/null
+++ b/applications/solvers/multiphase/compressibleInterFoam/derivedFvPatchFields/wallHeatTransfer/wallHeatTransferFvPatchScalarField.H
@@ -0,0 +1,194 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::wallHeatTransferFvPatchScalarField
+
+Description
+    Enthalpy boundary conditions for wall heat transfer
+
+SourceFiles
+    wallHeatTransferFvPatchScalarField.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef wallHeatTransferFvPatchScalarField_H
+#define wallHeatTransferFvPatchScalarField_H
+
+#include "mixedFvPatchFields.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                  Class wallHeatTransferFvPatch Declaration
+\*---------------------------------------------------------------------------*/
+
+class wallHeatTransferFvPatchScalarField
+:
+    public mixedFvPatchScalarField
+{
+    // Private data
+
+        //- Tinf
+        scalarField Tinf_;
+
+        //- alphaWall
+        scalarField alphaWall_;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("wallHeatTransfer");
+
+
+    // Constructors
+
+        //- Construct from patch and internal field
+        wallHeatTransferFvPatchScalarField
+        (
+            const fvPatch&,
+            const DimensionedField<scalar, volMesh>&
+        );
+
+        //- Construct from patch, internal field and dictionary
+        wallHeatTransferFvPatchScalarField
+        (
+            const fvPatch&,
+            const DimensionedField<scalar, volMesh>&,
+            const dictionary&
+        );
+
+        //- Construct by mapping given wallHeatTransferFvPatchScalarField
+        // onto a new patch
+        wallHeatTransferFvPatchScalarField
+        (
+            const wallHeatTransferFvPatchScalarField&,
+            const fvPatch&,
+            const DimensionedField<scalar, volMesh>&,
+            const fvPatchFieldMapper&
+        );
+
+        //- Construct as copy
+        wallHeatTransferFvPatchScalarField
+        (
+            const wallHeatTransferFvPatchScalarField&
+        );
+
+        //- Construct and return a clone
+        virtual tmp<fvPatchScalarField> clone() const
+        {
+            return tmp<fvPatchScalarField>
+            (
+                new wallHeatTransferFvPatchScalarField(*this)
+            );
+        }
+
+        //- Construct as copy setting internal field reference
+        wallHeatTransferFvPatchScalarField
+        (
+            const wallHeatTransferFvPatchScalarField&,
+            const DimensionedField<scalar, volMesh>&
+        );
+
+        //- Construct and return a clone setting internal field reference
+        virtual tmp<fvPatchScalarField> clone
+        (
+            const DimensionedField<scalar, volMesh>& iF
+        ) const
+        {
+            return tmp<fvPatchScalarField>
+            (
+                new wallHeatTransferFvPatchScalarField(*this, iF)
+            );
+        }
+
+
+    // Member functions
+
+        // Access
+
+            //- Return Tinf
+            const scalarField& Tinf() const
+            {
+                return Tinf_;
+            }
+
+            //- Return reference to Tinf to allow adjustment
+            scalarField& Tinf()
+            {
+                return Tinf_;
+            }
+
+            //- Return alphaWall
+            const scalarField& alphaWall() const
+            {
+                return alphaWall_;
+            }
+
+            //- Return reference to alphaWall to allow adjustment
+            scalarField& alphaWall()
+            {
+                return alphaWall_;
+            }
+
+
+        // Mapping functions
+
+            //- Map (and resize as needed) from self given a mapping object
+            virtual void autoMap
+            (
+                const fvPatchFieldMapper&
+            );
+
+            //- Reverse map the given fvPatchField onto this fvPatchField
+            virtual void rmap
+            (
+                const fvPatchScalarField&,
+                const labelList&
+            );
+
+
+        // Evaluation functions
+
+            //- Update the coefficients associated with the patch field
+            virtual void updateCoeffs();
+
+
+        //- Write
+        virtual void write(Ostream&) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/applications/solvers/multiphase/compressibleInterFoam/pEqn.H b/applications/solvers/multiphase/compressibleInterFoam/pEqn.H
index 035e8e237d..b803b1ac18 100644
--- a/applications/solvers/multiphase/compressibleInterFoam/pEqn.H
+++ b/applications/solvers/multiphase/compressibleInterFoam/pEqn.H
@@ -1,28 +1,31 @@
 {
-    volScalarField rAU(1.0/UEqn.A());
-    surfaceScalarField rAUf(fvc::interpolate(rAU));
+    rho1 = rho10 + psi1*p;
+    rho2 = rho20 + psi2*p;
 
-    tmp<fvScalarMatrix> p_rghEqnComp;
+    volScalarField rAU = 1.0/UEqn.A();
+    surfaceScalarField rAUf = fvc::interpolate(rAU);
 
-    if (pimple.transonic())
+    tmp<fvScalarMatrix> p_rghEqnComp1;
+    tmp<fvScalarMatrix> p_rghEqnComp2;
+
+    //if (transonic)
+    //{
+    //}
+    //else
     {
-        p_rghEqnComp =
-        (
-            fvm::ddt(p_rgh)
-          + fvm::div(phi, p_rgh)
-          - fvm::Sp(fvc::div(phi), p_rgh)
-        );
-    }
-    else
-    {
-        p_rghEqnComp =
-        (
-            fvm::ddt(p_rgh)
-          + fvc::div(phi, p_rgh)
-          - fvc::Sp(fvc::div(phi), p_rgh)
-        );
-    }
+        surfaceScalarField phid1("phid1", fvc::interpolate(psi1)*phi);
+        surfaceScalarField phid2("phid2", fvc::interpolate(psi2)*phi);
 
+        p_rghEqnComp1 =
+            fvc::ddt(rho1) + psi1*correction(fvm::ddt(p_rgh))
+          + fvc::div(phid1, p_rgh)
+          - fvc::Sp(fvc::div(phid1), p_rgh);
+
+        p_rghEqnComp2 =
+            fvc::ddt(rho2) + psi2*correction(fvm::ddt(p_rgh))
+          + fvc::div(phid2, p_rgh)
+          - fvc::Sp(fvc::div(phid2), p_rgh);
+    }
 
     U = rAU*UEqn.H();
 
@@ -39,6 +42,10 @@
           - ghf*fvc::snGrad(rho)
         )*rAUf*mesh.magSf();
 
+    // Thermodynamic density needs to be updated by psi*d(p) after the
+    // pressure solution - done in 2 parts. Part 1:
+    //thermo.rho() -= psi*p_rgh;
+
     while (pimple.correctNonOrthogonal())
     {
         fvScalarMatrix p_rghEqnIncomp
@@ -50,19 +57,23 @@
         solve
         (
             (
-                max(alpha1, scalar(0))*(psi1/rho1)
-              + max(alpha2, scalar(0))*(psi2/rho2)
+                (max(alpha1, scalar(0))/rho1)*p_rghEqnComp1()
+              + (max(alpha2, scalar(0))/rho2)*p_rghEqnComp2()
             )
-           *p_rghEqnComp()
           + p_rghEqnIncomp,
             mesh.solver(p_rgh.select(pimple.finalInnerIter()))
         );
 
         if (pimple.finalNonOrthogonalIter())
         {
+            // Second part of thermodynamic density update
+            //thermo.rho() += psi*p_rgh;
+
             dgdt =
-                (pos(alpha2)*(psi2/rho2) - pos(alpha1)*(psi1/rho1))
-               *(p_rghEqnComp & p_rgh);
+            (
+                pos(alpha2)*(p_rghEqnComp2 & p_rgh)/rho2
+              - pos(alpha1)*(p_rghEqnComp1 & p_rgh)/rho1
+            );
             phi += p_rghEqnIncomp.flux();
         }
     }
diff --git a/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/0/T.org b/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/0/T.org
new file mode 100644
index 0000000000..e5ac2eeb27
--- /dev/null
+++ b/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/0/T.org
@@ -0,0 +1,34 @@
+/*--------------------------------*- 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;
+    object      alpha1;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 0 0 1 0 0 0];
+
+internalField   uniform 300;
+
+boundaryField
+{
+    walls
+    {
+        type            zeroGradient;
+    }
+
+    defaultFaces
+    {
+        type            empty;
+    }
+}
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/0/alpha1.org b/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/0/alphawater.org
similarity index 97%
rename from tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/0/alpha1.org
rename to tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/0/alphawater.org
index b55820f9a9..d90b720092 100644
--- a/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/0/alpha1.org
+++ b/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/0/alphawater.org
@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    object      alpha1;
+    object      alphawater;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/Allclean b/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/Allclean
index 1f81d5f86a..d6e8dce5df 100755
--- a/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/Allclean
+++ b/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/Allclean
@@ -1,5 +1,6 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
 
 foamCleanTutorials cases
 rm -rf processor*
-rm -rf 0/p_rgh 0/p_rgh.gz 0/alpha1 0/alpha1.gz
+rm -rf 0/p_rgh.gz 0/alphawater.gz 0/T.gz
diff --git a/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/Allrun b/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/Allrun
index 5fd844dc71..76547516b7 100755
--- a/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/Allrun
+++ b/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/Allrun
@@ -8,8 +8,9 @@ cd ${0%/*} || exit 1    # run from this directory
 application=`getApplication`
 
 runApplication blockMesh
-cp 0/alpha1.org 0/alpha1
+cp 0/alphawater.org 0/alphawater
 cp 0/p_rgh.org 0/p_rgh
+cp 0/T.org 0/T
 runApplication setFields
 runApplication $application
 
diff --git a/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/constant/polyMesh/blockMeshDict b/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/constant/polyMesh/blockMeshDict
index 22d11441f9..9ed9a630b5 100644
--- a/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/constant/polyMesh/blockMeshDict
+++ b/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/constant/polyMesh/blockMeshDict
@@ -33,28 +33,20 @@ blocks
     hex (0 1 2 3 4 5 6 7) (80 160 1) simpleGrading (1 1 1)
 );
 
-boundary
+patches
 (
-    walls
-    {
-        type wall;
-        faces
-        (
-            (3 7 6 2)
-            (0 4 7 3)
-            (2 6 5 1)
-            (1 5 4 0)
-        );
-    }
-    frontAndBack
-    {
-        type empty;
-        faces
-        (
-            (0 3 2 1)
-            (4 5 6 7)
-        );
-    }
+    wall walls
+    (
+        (3 7 6 2)
+        (0 4 7 3)
+        (2 6 5 1)
+        (1 5 4 0)
+    )
+    empty frontAndBack
+    (
+        (0 3 2 1)
+        (4 5 6 7)
+    )
 );
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/constant/transportProperties b/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/constant/transportProperties
index 67e66cd27d..1803697ff7 100644
--- a/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/constant/transportProperties
+++ b/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/constant/transportProperties
@@ -15,22 +15,28 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-phase1
+phases (water air);
+
+water
 {
     transportModel  Newtonian;
     nu              nu [ 0 2 -1 0 0 0 0 ] 1e-06;
+    k               k         [1 1 -3 -1 0 0 0] 0; //0.613;
     rho             rho [ 1 -3 0 0 0 0 0 ] 1000;
     rho0            rho0 [ 1 -3 0 0 0 0 0 ] 1000;
-    psi             psi [ 0 -2 2 0 0 ] 1e-05;
+    R               R         [0 2 -2 -1 0] 3000;
+    Cv              Cv        [0 2 -2 -1 0] 4179;
 }
 
-phase2
+air
 {
     transportModel  Newtonian;
     nu              nu [ 0 2 -1 0 0 0 0 ] 1.589e-05;
+    k               k         [1 1 -3 -1 0 0 0] 0; //2.63e-2;
     rho             rho [ 1 -3 0 0 0 0 0 ] 1;
     rho0            rho0 [ 1 -3 0 0 0 0 0 ] 0;
-    psi             psi [ 0 -2 2 0 0 ] 1e-05;
+    R               R         [0 2 -2 -1 0] 287;
+    Cv              Cv        [0 2 -2 -1 0] 721;
 }
 
 pMin            pMin [ 1 -1 -2 0 0 0 0 ] 10000;
diff --git a/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/system/controlDict b/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/system/controlDict
index 4c225df9c7..933d1de450 100644
--- a/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/system/controlDict
+++ b/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/system/controlDict
@@ -17,7 +17,7 @@ FoamFile
 
 application     compressibleInterFoam;
 
-startFrom       latestTime;
+startFrom       startTime;
 
 startTime       0;
 
diff --git a/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/system/fvSchemes b/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/system/fvSchemes
index 5ab2bdc2fd..c35af6cc4f 100644
--- a/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/system/fvSchemes
+++ b/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/system/fvSchemes
@@ -30,7 +30,9 @@ divSchemes
     div(rho*phi,U)  Gauss upwind;
     div(phi,alpha)  Gauss vanLeer;
     div(phirb,alpha) Gauss interfaceCompression 1;
-    div(phi,p_rgh)  Gauss upwind;
+    div(phid1,p_rgh) Gauss upwind;
+    div(phid2,p_rgh) Gauss upwind;
+    div(rho*phi,T)  Gauss upwind;
     div(phi,k)      Gauss vanLeer;
     div((nuEff*dev(T(grad(U))))) Gauss linear;
 }
@@ -55,7 +57,6 @@ fluxRequired
     default         no;
     p_rgh;
     pcorr;
-    gamma;
 }
 
 
diff --git a/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/system/fvSolution b/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/system/fvSolution
index 4a7f094cec..4618974546 100644
--- a/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/system/fvSolution
+++ b/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/system/fvSolution
@@ -91,7 +91,7 @@ solvers
         nSweeps         1;
     }
 
-    "(k|B|nuTilda)"
+    "(T|k|B|nuTilda).*"
     {
         solver          PBiCG;
         preconditioner  DILU;
diff --git a/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/system/setFieldsDict b/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/system/setFieldsDict
index 37f90fd1d5..88198a4d24 100644
--- a/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/system/setFieldsDict
+++ b/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/system/setFieldsDict
@@ -17,8 +17,9 @@ FoamFile
 
 defaultFieldValues
 (
-    volScalarFieldValue alpha1 1
+    volScalarFieldValue alphawater 1
     volScalarFieldValue p_rgh 1e5
+    volScalarFieldValue T 300
 );
 
 regions
@@ -29,8 +30,9 @@ regions
         radius 0.1;
         fieldValues
         (
-            volScalarFieldValue alpha1 0
+            volScalarFieldValue alphawater 0
             volScalarFieldValue p_rgh 1e6
+            volScalarFieldValue T 578
         );
     }
     boxToCell
@@ -38,7 +40,7 @@ regions
         box (-10 1 -1) (10 10 1);
         fieldValues
         (
-            volScalarFieldValue alpha1 0
+            volScalarFieldValue alphawater 0
         );
     }
 );
diff --git a/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/0/T.org b/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/0/T.org
new file mode 100644
index 0000000000..b40cb08478
--- /dev/null
+++ b/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/0/T.org
@@ -0,0 +1,29 @@
+/*--------------------------------*- 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;
+    object      alpha1;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 0 0 1 0 0 0];
+
+internalField   uniform 300;
+
+boundaryField
+{
+    walls
+    {
+        type            zeroGradient;
+    }
+}
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/0/alpha1.org b/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/0/alphawater.org
similarity index 97%
rename from tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/0/alpha1.org
rename to tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/0/alphawater.org
index b15de21b75..62be61f403 100644
--- a/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/0/alpha1.org
+++ b/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/0/alphawater.org
@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    object      alpha1.org;
+    object      alphawater;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/Allclean b/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/Allclean
index 902055c7f7..539c772166 100755
--- a/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/Allclean
+++ b/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/Allclean
@@ -3,6 +3,6 @@ cd ${0%/*} || exit 1    # run from this directory
 
 foamCleanTutorials cases
 rm -rf processor*
-rm -rf 0/p_rgh 0/p_rgh.gz 0/alpha1 0/alpha1.gz
+rm -rf 0/p_rgh 0/p_rgh.gz 0/alphawater 0/alphawater.gz 0/T.gz
 
 # ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/Allrun b/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/Allrun
index ac00d007bc..0941ac4aa1 100755
--- a/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/Allrun
+++ b/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/Allrun
@@ -8,8 +8,9 @@ cd ${0%/*} || exit 1    # run from this directory
 application=`getApplication`
 
 runApplication blockMesh
-cp 0/alpha1.org 0/alpha1
+cp 0/alphawater.org 0/alphawater
 cp 0/p_rgh.org 0/p_rgh
+cp 0/T.org 0/T
 runApplication setFields
 runApplication decomposePar
 runParallel $application 4
diff --git a/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/constant/transportProperties b/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/constant/transportProperties
index 67e66cd27d..1803697ff7 100644
--- a/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/constant/transportProperties
+++ b/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/constant/transportProperties
@@ -15,22 +15,28 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-phase1
+phases (water air);
+
+water
 {
     transportModel  Newtonian;
     nu              nu [ 0 2 -1 0 0 0 0 ] 1e-06;
+    k               k         [1 1 -3 -1 0 0 0] 0; //0.613;
     rho             rho [ 1 -3 0 0 0 0 0 ] 1000;
     rho0            rho0 [ 1 -3 0 0 0 0 0 ] 1000;
-    psi             psi [ 0 -2 2 0 0 ] 1e-05;
+    R               R         [0 2 -2 -1 0] 3000;
+    Cv              Cv        [0 2 -2 -1 0] 4179;
 }
 
-phase2
+air
 {
     transportModel  Newtonian;
     nu              nu [ 0 2 -1 0 0 0 0 ] 1.589e-05;
+    k               k         [1 1 -3 -1 0 0 0] 0; //2.63e-2;
     rho             rho [ 1 -3 0 0 0 0 0 ] 1;
     rho0            rho0 [ 1 -3 0 0 0 0 0 ] 0;
-    psi             psi [ 0 -2 2 0 0 ] 1e-05;
+    R               R         [0 2 -2 -1 0] 287;
+    Cv              Cv        [0 2 -2 -1 0] 721;
 }
 
 pMin            pMin [ 1 -1 -2 0 0 0 0 ] 10000;
diff --git a/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/system/fvSchemes b/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/system/fvSchemes
index 5ab2bdc2fd..c35af6cc4f 100644
--- a/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/system/fvSchemes
+++ b/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/system/fvSchemes
@@ -30,7 +30,9 @@ divSchemes
     div(rho*phi,U)  Gauss upwind;
     div(phi,alpha)  Gauss vanLeer;
     div(phirb,alpha) Gauss interfaceCompression 1;
-    div(phi,p_rgh)  Gauss upwind;
+    div(phid1,p_rgh) Gauss upwind;
+    div(phid2,p_rgh) Gauss upwind;
+    div(rho*phi,T)  Gauss upwind;
     div(phi,k)      Gauss vanLeer;
     div((nuEff*dev(T(grad(U))))) Gauss linear;
 }
@@ -55,7 +57,6 @@ fluxRequired
     default         no;
     p_rgh;
     pcorr;
-    gamma;
 }
 
 
diff --git a/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/system/fvSolution b/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/system/fvSolution
index 4a7f094cec..4618974546 100644
--- a/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/system/fvSolution
+++ b/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/system/fvSolution
@@ -91,7 +91,7 @@ solvers
         nSweeps         1;
     }
 
-    "(k|B|nuTilda)"
+    "(T|k|B|nuTilda).*"
     {
         solver          PBiCG;
         preconditioner  DILU;
diff --git a/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/system/setFieldsDict b/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/system/setFieldsDict
index 07f675b5de..ec31deae03 100644
--- a/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/system/setFieldsDict
+++ b/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/system/setFieldsDict
@@ -17,8 +17,9 @@ FoamFile
 
 defaultFieldValues
 (
-    volScalarFieldValue alpha1 1
+    volScalarFieldValue alphawater 1
     volScalarFieldValue p_rgh 1e5
+    volScalarFieldValue T 300
 );
 
 regions
@@ -29,8 +30,9 @@ regions
         radius 0.1;
         fieldValues
         (
-            volScalarFieldValue alpha1 0
+            volScalarFieldValue alphawater 0
             volScalarFieldValue p_rgh 1e6
+            volScalarFieldValue T 578
         );
     }
     boxToCell
@@ -38,7 +40,7 @@ regions
         box (-10 1 -1) (10 10 1);
         fieldValues
         (
-            volScalarFieldValue alpha1 0
+            volScalarFieldValue alphawater 0
         );
     }
 );

From 96f8104ae5fb46ef98181dd16795d25f102f69e4 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Mon, 16 Apr 2012 12:37:01 +0100
Subject: [PATCH 201/317] ENH: decomposePar: cache decomposeers if running with
 multiple times.

---
 .../decomposePar/decomposePar.C               | 319 +++++++++++++-----
 1 file changed, 227 insertions(+), 92 deletions(-)

diff --git a/applications/utilities/parallelProcessing/decomposePar/decomposePar.C b/applications/utilities/parallelProcessing/decomposePar/decomposePar.C
index c7b96b44b3..49304aadcd 100644
--- a/applications/utilities/parallelProcessing/decomposePar/decomposePar.C
+++ b/applications/utilities/parallelProcessing/decomposePar/decomposePar.C
@@ -322,6 +322,23 @@ int main(int argc, char *argv[])
     }
 
 
+
+    // Caches
+    // ~~~~~~
+    // Cached processor meshes and maps. These are only preserved if running
+    // with multiple times.
+    PtrList<Time> processorDbList(mesh.nProcs());
+    PtrList<fvMesh> procMeshList(mesh.nProcs());
+    PtrList<labelIOList> faceProcAddressingList(mesh.nProcs());
+    PtrList<labelIOList> cellProcAddressingList(mesh.nProcs());
+    PtrList<labelIOList> boundaryProcAddressingList(mesh.nProcs());
+    PtrList<fvFieldDecomposer> fieldDecomposerList(mesh.nProcs());
+    PtrList<dimFieldDecomposer> dimFieldDecomposerList(mesh.nProcs());
+    PtrList<labelIOList> pointProcAddressingList(mesh.nProcs());
+    PtrList<pointFieldDecomposer> pointFieldDecomposerList(mesh.nProcs());
+
+
+
     // Loop over all times
     forAll(times, timeI)
     {
@@ -674,13 +691,24 @@ int main(int argc, char *argv[])
         {
             Info<< "Processor " << procI << ": field transfer" << endl;
 
+
             // open the database
-            Time processorDb
-            (
-                Time::controlDictName,
-                args.rootPath(),
-                args.caseName()/fileName(word("processor") + name(procI))
-            );
+            if (!processorDbList.set(procI))
+            {
+                processorDbList.set
+                (
+                    procI,
+                    new Time
+                    (
+                        Time::controlDictName,
+                        args.rootPath(),
+                        args.caseName()
+                       /fileName(word("processor") + name(procI))
+                    )
+                );
+            }
+            Time& processorDb = processorDbList[procI];
+
 
             processorDb.setTime(runTime);
 
@@ -695,65 +723,113 @@ int main(int argc, char *argv[])
             }
 
             // read the mesh
-            fvMesh procMesh
-            (
-                IOobject
+            if (!procMeshList.set(procI))
+            {
+                procMeshList.set
                 (
-                    regionName,
-                    processorDb.timeName(),
-                    processorDb
-                )
-            );
+                    procI,
+                    new fvMesh
+                    (
+                        IOobject
+                        (
+                            regionName,
+                            processorDb.timeName(),
+                            processorDb
+                        )
+                    )
+                );
+            }
+            const fvMesh& procMesh = procMeshList[procI];
 
-            labelIOList faceProcAddressing
-            (
-                IOobject
-                (
-                    "faceProcAddressing",
-                    procMesh.facesInstance(),
-                    procMesh.meshSubDir,
-                    procMesh,
-                    IOobject::MUST_READ,
-                    IOobject::NO_WRITE
-                )
-            );
 
-            labelIOList cellProcAddressing
-            (
-                IOobject
+            if (!faceProcAddressingList.set(procI))
+            {
+                faceProcAddressingList.set
                 (
-                    "cellProcAddressing",
-                    procMesh.facesInstance(),
-                    procMesh.meshSubDir,
-                    procMesh,
-                    IOobject::MUST_READ,
-                    IOobject::NO_WRITE
-                )
-            );
+                    procI,
+                    new labelIOList
+                    (
+                        IOobject
+                        (
+                            "faceProcAddressing",
+                            procMesh.facesInstance(),
+                            procMesh.meshSubDir,
+                            procMesh,
+                            IOobject::MUST_READ,
+                            IOobject::NO_WRITE
+                        )
+                    )
+                );
+            }
+            const labelIOList& faceProcAddressing =
+                faceProcAddressingList[procI];
 
-            labelIOList boundaryProcAddressing
-            (
-                IOobject
+
+            if (!cellProcAddressingList.set(procI))
+            {
+                cellProcAddressingList.set
                 (
-                    "boundaryProcAddressing",
-                    procMesh.facesInstance(),
-                    procMesh.meshSubDir,
-                    procMesh,
-                    IOobject::MUST_READ,
-                    IOobject::NO_WRITE
-                )
-            );
+                    procI,
+                    new labelIOList
+                    (
+                        IOobject
+                        (
+                            "cellProcAddressing",
+                            procMesh.facesInstance(),
+                            procMesh.meshSubDir,
+                            procMesh,
+                            IOobject::MUST_READ,
+                            IOobject::NO_WRITE
+                        )
+                    )
+                );
+            }
+            const labelIOList& cellProcAddressing =
+                cellProcAddressingList[procI];
+
+
+            if (!boundaryProcAddressingList.set(procI))
+            {
+                boundaryProcAddressingList.set
+                (
+                    procI,
+                    new labelIOList
+                    (
+                        IOobject
+                        (
+                            "boundaryProcAddressing",
+                            procMesh.facesInstance(),
+                            procMesh.meshSubDir,
+                            procMesh,
+                            IOobject::MUST_READ,
+                            IOobject::NO_WRITE
+                        )
+                    )
+                );
+            }
+            const labelIOList& boundaryProcAddressing =
+                boundaryProcAddressingList[procI];
+
 
             // FV fields
             {
-                fvFieldDecomposer fieldDecomposer
-                (
-                    mesh,
-                    procMesh,
-                    faceProcAddressing,
-                    cellProcAddressing,
-                    boundaryProcAddressing
-                );
+                if (!fieldDecomposerList.set(procI))
+                {
+                    fieldDecomposerList.set
+                    (
+                        procI,
+                        new fvFieldDecomposer
+                        (
+                            mesh,
+                            procMesh,
+                            faceProcAddressing,
+                            cellProcAddressing,
+                            boundaryProcAddressing
+                        )
+                    );
+                }
+                const fvFieldDecomposer& fieldDecomposer =
+                    fieldDecomposerList[procI];
 
                 fieldDecomposer.decomposeFields(volScalarFields);
                 fieldDecomposer.decomposeFields(volVectorFields);
@@ -766,23 +842,43 @@ int main(int argc, char *argv[])
                 fieldDecomposer.decomposeFields(surfaceSphericalTensorFields);
                 fieldDecomposer.decomposeFields(surfaceSymmTensorFields);
                 fieldDecomposer.decomposeFields(surfaceTensorFields);
+
+                if (times.size() == 1)
+                {
+                    // Clear cached decomposer
+                    fieldDecomposerList.set(procI, NULL);
+                }
             }
 
             // Dimensioned fields
             {
-                dimFieldDecomposer fieldDecomposer
-                (
-                    mesh,
-                    procMesh,
-                    faceProcAddressing,
-                    cellProcAddressing
-                );
+                if (!dimFieldDecomposerList.set(procI))
+                {
+                    dimFieldDecomposerList.set
+                    (
+                        procI,
+                        new dimFieldDecomposer
+                        (
+                            mesh,
+                            procMesh,
+                            faceProcAddressing,
+                            cellProcAddressing
+                        )
+                    );
+                }
+                const dimFieldDecomposer& dimDecomposer =
+                    dimFieldDecomposerList[procI];
 
-                fieldDecomposer.decomposeFields(dimScalarFields);
-                fieldDecomposer.decomposeFields(dimVectorFields);
-                fieldDecomposer.decomposeFields(dimSphericalTensorFields);
-                fieldDecomposer.decomposeFields(dimSymmTensorFields);
-                fieldDecomposer.decomposeFields(dimTensorFields);
+                dimDecomposer.decomposeFields(dimScalarFields);
+                dimDecomposer.decomposeFields(dimVectorFields);
+                dimDecomposer.decomposeFields(dimSphericalTensorFields);
+                dimDecomposer.decomposeFields(dimSymmTensorFields);
+                dimDecomposer.decomposeFields(dimTensorFields);
+
+                if (times.size() == 1)
+                {
+                    dimFieldDecomposerList.set(procI, NULL);
+                }
             }
 
 
@@ -796,34 +892,59 @@ int main(int argc, char *argv[])
              || pointTensorFields.size()
             )
             {
-                labelIOList pointProcAddressing
-                (
-                    IOobject
+                if (!pointProcAddressingList.set(procI))
+                {
+                    pointProcAddressingList.set
                     (
-                        "pointProcAddressing",
-                        procMesh.facesInstance(),
-                        procMesh.meshSubDir,
-                        procMesh,
-                        IOobject::MUST_READ,
-                        IOobject::NO_WRITE
-                    )
-                );
+                        procI,
+                        new labelIOList
+                        (
+                            IOobject
+                            (
+                                "pointProcAddressing",
+                                procMesh.facesInstance(),
+                                procMesh.meshSubDir,
+                                procMesh,
+                                IOobject::MUST_READ,
+                                IOobject::NO_WRITE
+                            )
+                        )
+                    );
+                }
+                const labelIOList& pointProcAddressing =
+                    pointProcAddressingList[procI];
 
-                pointMesh procPMesh(procMesh);
+                const pointMesh& procPMesh = pointMesh::New(procMesh);
 
-                pointFieldDecomposer fieldDecomposer
-                (
-                    pMesh,
-                    procPMesh,
-                    pointProcAddressing,
-                    boundaryProcAddressing
-                );
+                if (!pointFieldDecomposerList.set(procI))
+                {
+                    pointFieldDecomposerList.set
+                    (
+                        procI,
+                        new pointFieldDecomposer
+                        (
+                            pMesh,
+                            procPMesh,
+                            pointProcAddressing,
+                            boundaryProcAddressing
+                        )
+                    );
+                }
+                const pointFieldDecomposer& pointDecomposer =
+                    pointFieldDecomposerList[procI];
 
-                fieldDecomposer.decomposeFields(pointScalarFields);
-                fieldDecomposer.decomposeFields(pointVectorFields);
-                fieldDecomposer.decomposeFields(pointSphericalTensorFields);
-                fieldDecomposer.decomposeFields(pointSymmTensorFields);
-                fieldDecomposer.decomposeFields(pointTensorFields);
+                pointDecomposer.decomposeFields(pointScalarFields);
+                pointDecomposer.decomposeFields(pointVectorFields);
+                pointDecomposer.decomposeFields(pointSphericalTensorFields);
+                pointDecomposer.decomposeFields(pointSymmTensorFields);
+                pointDecomposer.decomposeFields(pointTensorFields);
+
+
+                if (times.size() == 1)
+                {
+                    pointProcAddressingList.set(procI, NULL);
+                    pointFieldDecomposerList.set(procI, NULL);
+                }
             }
 
 
@@ -938,6 +1059,20 @@ int main(int argc, char *argv[])
                     chDir(currentDir);
                 }
             }
+
+
+
+            // We have cached all the constant mesh data for the current
+            // processor. This is only important if running with multiple
+            // times, otherwise it is just extra storage.
+            if (times.size() == 1)
+            {
+                boundaryProcAddressingList.set(procI, NULL);
+                cellProcAddressingList.set(procI, NULL);
+                faceProcAddressingList.set(procI, NULL);
+                procMeshList.set(procI, NULL);
+                processorDbList.set(procI, NULL);
+            }
         }
     }
 

From 15ce7dcf0ae228f0d8ed7e7f21ce53d3b0a4fdfe Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Mon, 16 Apr 2012 15:51:20 +0100
Subject: [PATCH 202/317] dimensionedType: Add support for optional read and
 re-read of name and dimensions Supports

rho   1;
rho   [1 -3 0 0 0] 1;
rho   rho [1 -3 0 0 0] 1;
---
 .../dimensionedType/dimensionedType.C         | 32 +++++++++++++++++--
 1 file changed, 30 insertions(+), 2 deletions(-)

diff --git a/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.C b/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.C
index cf841919b8..4e96c3012a 100644
--- a/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.C
+++ b/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.C
@@ -131,6 +131,16 @@ dimensioned<Type>::dimensioned
     token nextToken(is);
     is.putBack(nextToken);
 
+    // Check if the original format is used in which the name is provided
+    // and reset the name to that read
+    if (nextToken.isWord())
+    {
+        is >> name_;
+        is >> nextToken;
+        is.putBack(nextToken);
+    }
+
+    // If the dimensions are provided compare with the argument
     if (nextToken == token::BEGIN_SQR)
     {
         dimensionSet dims(is);
@@ -391,8 +401,26 @@ dimensioned<Type> min
 template <class Type>
 Istream& operator>>(Istream& is, dimensioned<Type>& dt)
 {
-    // do a stream read op for a Type and a dimensions()et
-    is >> dt.name_ >> dt.dimensions_ >> dt.value_;
+    token nextToken(is);
+    is.putBack(nextToken);
+
+    // Check if the original format is used in which the name is provided
+    // and reset the name to that read
+    if (nextToken.isWord())
+    {
+        is >> dt.name_;
+        is >> nextToken;
+        is.putBack(nextToken);
+    }
+
+    // If the dimensions are provided reset the dimensions to those read
+    if (nextToken == token::BEGIN_SQR)
+    {
+        is >> dt.dimensions_;
+    }
+
+    // Read the value
+    is >> dt.value_;
 
     // Check state of Istream
     is.check("Istream& operator>>(Istream&, dimensioned<Type>&)");

From 5c478bba4308549eac5d428a1e40ce312ddf30ae Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Mon, 16 Apr 2012 15:52:13 +0100
Subject: [PATCH 203/317] twoPhaseMixture: Allow construction without providing
 name and dimensions for rho and nu

---
 .../incompressibleTwoPhaseMixture/twoPhaseMixture.C           | 4 ++--
 .../incompressible/viscosityModels/Newtonian/Newtonian.C      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/transportModels/incompressible/incompressibleTwoPhaseMixture/twoPhaseMixture.C b/src/transportModels/incompressible/incompressibleTwoPhaseMixture/twoPhaseMixture.C
index 392704b940..4ec3ce72f8 100644
--- a/src/transportModels/incompressible/incompressibleTwoPhaseMixture/twoPhaseMixture.C
+++ b/src/transportModels/incompressible/incompressibleTwoPhaseMixture/twoPhaseMixture.C
@@ -83,8 +83,8 @@ Foam::twoPhaseMixture::twoPhaseMixture
         )
     ),
 
-    rho1_(nuModel1_->viscosityProperties().lookup("rho")),
-    rho2_(nuModel2_->viscosityProperties().lookup("rho")),
+    rho1_("rho", dimDensity, nuModel1_->viscosityProperties().lookup("rho")),
+    rho2_("rho", dimDensity, nuModel2_->viscosityProperties().lookup("rho")),
 
     U_(U),
     phi_(phi),
diff --git a/src/transportModels/incompressible/viscosityModels/Newtonian/Newtonian.C b/src/transportModels/incompressible/viscosityModels/Newtonian/Newtonian.C
index bb00ae0dcc..7c531cd865 100644
--- a/src/transportModels/incompressible/viscosityModels/Newtonian/Newtonian.C
+++ b/src/transportModels/incompressible/viscosityModels/Newtonian/Newtonian.C
@@ -50,7 +50,7 @@ Foam::viscosityModels::Newtonian::Newtonian
 )
 :
     viscosityModel(name, viscosityProperties, U, phi),
-    nu0_(viscosityProperties_.lookup("nu")),
+    nu0_("nu", dimensionSet(0, 2, -1, 0, 0), viscosityProperties_.lookup("nu")),
     nu_
     (
         IOobject

From 1d167418e93eee4c1c5750a5b1396e469c80539c Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Mon, 16 Apr 2012 15:52:38 +0100
Subject: [PATCH 204/317] Update header

---
 .../incompressible/viscosityModels/Newtonian/Newtonian.C        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/transportModels/incompressible/viscosityModels/Newtonian/Newtonian.C b/src/transportModels/incompressible/viscosityModels/Newtonian/Newtonian.C
index 7c531cd865..1d1fc36244 100644
--- a/src/transportModels/incompressible/viscosityModels/Newtonian/Newtonian.C
+++ b/src/transportModels/incompressible/viscosityModels/Newtonian/Newtonian.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

From 629bca4de9ba8947fdae523b719bbaf9b4e2efe9 Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Mon, 16 Apr 2012 15:54:08 +0100
Subject: [PATCH 205/317] compressibleInterFoam: Add support for run-time
 selectable equation of state

---
 .../compressibleInterFoam/Allwclean           |   1 +
 .../multiphase/compressibleInterFoam/Allwmake |   1 +
 .../compressibleInterFoam/Make/options        |   2 +
 .../multiphase/compressibleInterFoam/TEqn.H   |   4 +-
 .../compressibleInterDyMFoam/Make/options     |   2 +
 .../compressibleInterDyMFoam.C                |   1 +
 .../compressibleInterFoam.C                   |   1 +
 .../compressibleInterFoam/createFields.H      | 193 +++++++++---------
 .../multiphase/compressibleInterFoam/pEqn.H   |  15 +-
 .../phaseEquationsOfState/Make/files          |   7 +
 .../phaseEquationsOfState/Make/options        |   6 +
 .../phaseEquationsOfState/constant/constant.C | 114 +++++++++++
 .../phaseEquationsOfState/constant/constant.H | 106 ++++++++++
 .../phaseEquationsOfState/linear/linear.C     | 114 +++++++++++
 .../phaseEquationsOfState/linear/linear.H     | 109 ++++++++++
 .../perfectFluid/perfectFluid.C               | 113 ++++++++++
 .../perfectFluid/perfectFluid.H               | 109 ++++++++++
 .../newPhaseEquationOfState.C                 |  60 ++++++
 .../phaseEquationOfState.C                    |  54 +++++
 .../phaseEquationOfState.H                    | 127 ++++++++++++
 .../constant/transportProperties              |  36 ++--
 .../constant/transportProperties              |  36 ++--
 22 files changed, 1076 insertions(+), 135 deletions(-)
 create mode 100644 applications/solvers/multiphase/compressibleInterFoam/phaseEquationsOfState/Make/files
 create mode 100644 applications/solvers/multiphase/compressibleInterFoam/phaseEquationsOfState/Make/options
 create mode 100644 applications/solvers/multiphase/compressibleInterFoam/phaseEquationsOfState/constant/constant.C
 create mode 100644 applications/solvers/multiphase/compressibleInterFoam/phaseEquationsOfState/constant/constant.H
 create mode 100644 applications/solvers/multiphase/compressibleInterFoam/phaseEquationsOfState/linear/linear.C
 create mode 100644 applications/solvers/multiphase/compressibleInterFoam/phaseEquationsOfState/linear/linear.H
 create mode 100644 applications/solvers/multiphase/compressibleInterFoam/phaseEquationsOfState/perfectFluid/perfectFluid.C
 create mode 100644 applications/solvers/multiphase/compressibleInterFoam/phaseEquationsOfState/perfectFluid/perfectFluid.H
 create mode 100644 applications/solvers/multiphase/compressibleInterFoam/phaseEquationsOfState/phaseEquationOfState/newPhaseEquationOfState.C
 create mode 100644 applications/solvers/multiphase/compressibleInterFoam/phaseEquationsOfState/phaseEquationOfState/phaseEquationOfState.C
 create mode 100644 applications/solvers/multiphase/compressibleInterFoam/phaseEquationsOfState/phaseEquationOfState/phaseEquationOfState.H

diff --git a/applications/solvers/multiphase/compressibleInterFoam/Allwclean b/applications/solvers/multiphase/compressibleInterFoam/Allwclean
index 2b936f934b..2f4544cb4c 100755
--- a/applications/solvers/multiphase/compressibleInterFoam/Allwclean
+++ b/applications/solvers/multiphase/compressibleInterFoam/Allwclean
@@ -2,6 +2,7 @@
 cd ${0%/*} || exit 1    # run from this directory
 set -x
 
+wclean libso phaseEquationsOfState
 wclean
 wclean compressibleInterDyMFoam
 
diff --git a/applications/solvers/multiphase/compressibleInterFoam/Allwmake b/applications/solvers/multiphase/compressibleInterFoam/Allwmake
index 644094d070..b4b7f6ffa7 100755
--- a/applications/solvers/multiphase/compressibleInterFoam/Allwmake
+++ b/applications/solvers/multiphase/compressibleInterFoam/Allwmake
@@ -2,6 +2,7 @@
 cd ${0%/*} || exit 1    # run from this directory
 set -x
 
+wmake libso phaseEquationsOfState
 wmake
 wmake compressibleInterDyMFoam
 
diff --git a/applications/solvers/multiphase/compressibleInterFoam/Make/options b/applications/solvers/multiphase/compressibleInterFoam/Make/options
index c8ce69c074..ca9a90cf77 100644
--- a/applications/solvers/multiphase/compressibleInterFoam/Make/options
+++ b/applications/solvers/multiphase/compressibleInterFoam/Make/options
@@ -2,12 +2,14 @@ EXE_INC = \
     -I$(LIB_SRC)/transportModels \
     -I$(LIB_SRC)/transportModels/incompressible/lnInclude \
     -I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \
+    -IphaseEquationsOfState/lnInclude \
     -I$(LIB_SRC)/turbulenceModels/incompressible/turbulenceModel \
     -I$(LIB_SRC)/finiteVolume/lnInclude
 
 EXE_LIBS = \
     -ltwoPhaseInterfaceProperties \
     -lincompressibleTransportModels \
+    -lphaseEquationsOfState \
     -lincompressibleTurbulenceModel \
     -lincompressibleRASModels \
     -lincompressibleLESModels \
diff --git a/applications/solvers/multiphase/compressibleInterFoam/TEqn.H b/applications/solvers/multiphase/compressibleInterFoam/TEqn.H
index 34b6bd35dd..2605ce345a 100644
--- a/applications/solvers/multiphase/compressibleInterFoam/TEqn.H
+++ b/applications/solvers/multiphase/compressibleInterFoam/TEqn.H
@@ -15,6 +15,6 @@
     );
 
     // Update compressibilities
-    psi1 = 1.0/(R1*T);
-    psi2 = 1.0/(R2*T);
+    psi1 = eos1->psi(p, T);
+    psi2 = eos2->psi(p, T);
 }
diff --git a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/Make/options b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/Make/options
index b9b0ec54da..db259cfbc0 100644
--- a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/Make/options
+++ b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/Make/options
@@ -3,6 +3,7 @@ EXE_INC = \
     -I$(LIB_SRC)/transportModels \
     -I$(LIB_SRC)/transportModels/incompressible/lnInclude \
     -I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \
+    -I../phaseEquationsOfState/lnInclude \
     -I$(LIB_SRC)/turbulenceModels/incompressible/turbulenceModel \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/dynamicMesh/lnInclude \
@@ -12,6 +13,7 @@ EXE_INC = \
 EXE_LIBS = \
     -ltwoPhaseInterfaceProperties \
     -lincompressibleTransportModels \
+    -lphaseEquationsOfState \
     -lincompressibleTurbulenceModel \
     -lincompressibleRASModels \
     -lincompressibleLESModels \
diff --git a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/compressibleInterDyMFoam.C b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/compressibleInterDyMFoam.C
index a4cfc215fc..b9f52944e8 100644
--- a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/compressibleInterDyMFoam.C
+++ b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/compressibleInterDyMFoam.C
@@ -43,6 +43,7 @@ Description
 #include "subCycle.H"
 #include "interfaceProperties.H"
 #include "twoPhaseMixture.H"
+#include "phaseEquationOfState.H"
 #include "turbulenceModel.H"
 #include "pimpleControl.H"
 
diff --git a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFoam.C b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFoam.C
index 58dd7e6866..7c24e05a1a 100644
--- a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFoam.C
+++ b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFoam.C
@@ -40,6 +40,7 @@ Description
 #include "subCycle.H"
 #include "interfaceProperties.H"
 #include "twoPhaseMixture.H"
+#include "phaseEquationOfState.H"
 #include "turbulenceModel.H"
 #include "pimpleControl.H"
 
diff --git a/applications/solvers/multiphase/compressibleInterFoam/createFields.H b/applications/solvers/multiphase/compressibleInterFoam/createFields.H
index 4930743887..9a67dc5da5 100644
--- a/applications/solvers/multiphase/compressibleInterFoam/createFields.H
+++ b/applications/solvers/multiphase/compressibleInterFoam/createFields.H
@@ -28,83 +28,6 @@
 
     #include "createPhi.H"
 
-    Info<< "Reading transportProperties\n" << endl;
-    twoPhaseMixture twoPhaseProperties(U, phi);
-
-    volScalarField& alpha1(twoPhaseProperties.alpha1());
-
-    Info<< "Calculating phase-fraction alpha" << twoPhaseProperties.phase2Name()
-        << nl << endl;
-    volScalarField alpha2
-    (
-        "alpha" + twoPhaseProperties.phase2Name(),
-        scalar(1) - alpha1
-    );
-
-    dimensionedScalar rho10
-    (
-        twoPhaseProperties.subDict
-        (
-            twoPhaseProperties.phase1Name()
-        ).lookup("rho0")
-    );
-
-    dimensionedScalar rho20
-    (
-        twoPhaseProperties.subDict
-        (
-            twoPhaseProperties.phase2Name()
-        ).lookup("rho0")
-    );
-
-    dimensionedScalar k1
-    (
-        twoPhaseProperties.subDict
-        (
-            twoPhaseProperties.phase1Name()
-        ).lookup("k")
-    );
-
-    dimensionedScalar k2
-    (
-        twoPhaseProperties.subDict
-        (
-            twoPhaseProperties.phase2Name()
-        ).lookup("k")
-    );
-
-    dimensionedScalar Cv1
-    (
-        twoPhaseProperties.subDict
-        (
-            twoPhaseProperties.phase1Name()
-        ).lookup("Cv")
-    );
-
-    dimensionedScalar Cv2
-    (
-        twoPhaseProperties.subDict
-        (
-            twoPhaseProperties.phase2Name()
-        ).lookup("Cv")
-    );
-
-    dimensionedScalar R1
-    (
-        twoPhaseProperties.subDict
-        (
-            twoPhaseProperties.phase1Name()
-        ).lookup("R")
-    );
-
-    dimensionedScalar R2
-    (
-        twoPhaseProperties.subDict
-        (
-            twoPhaseProperties.phase2Name()
-        ).lookup("R")
-    );
-
     Info<< "Reading field T\n" << endl;
     volScalarField T
     (
@@ -119,6 +42,95 @@
         mesh
     );
 
+    volScalarField p
+    (
+        IOobject
+        (
+            "p",
+            runTime.timeName(),
+            mesh,
+            IOobject::READ_IF_PRESENT,
+            IOobject::AUTO_WRITE
+        ),
+        p_rgh
+    );
+
+
+    Info<< "Reading transportProperties\n" << endl;
+    twoPhaseMixture twoPhaseProperties(U, phi);
+
+    volScalarField& alpha1(twoPhaseProperties.alpha1());
+
+    Info<< "Calculating phase-fraction alpha" << twoPhaseProperties.phase2Name()
+        << nl << endl;
+    volScalarField alpha2
+    (
+        "alpha" + twoPhaseProperties.phase2Name(),
+        scalar(1) - alpha1
+    );
+
+    dimensionedScalar k1
+    (
+        "k",
+        dimensionSet(1, 1, -3, -1, 0),
+        twoPhaseProperties.subDict
+        (
+            twoPhaseProperties.phase1Name()
+        ).lookup("k")
+    );
+
+    dimensionedScalar k2
+    (
+        "k",
+        dimensionSet(1, 1, -3, -1, 0),
+        twoPhaseProperties.subDict
+        (
+            twoPhaseProperties.phase2Name()
+        ).lookup("k")
+    );
+
+    dimensionedScalar Cv1
+    (
+        "Cv",
+        dimensionSet(0, 2, -2, -1, 0),
+        twoPhaseProperties.subDict
+        (
+            twoPhaseProperties.phase1Name()
+        ).lookup("Cv")
+    );
+
+    dimensionedScalar Cv2
+    (
+        "Cv",
+        dimensionSet(0, 2, -2, -1, 0),
+        twoPhaseProperties.subDict
+        (
+            twoPhaseProperties.phase2Name()
+        ).lookup("Cv")
+    );
+
+    autoPtr<phaseEquationOfState> eos1
+    (
+        phaseEquationOfState::New
+        (
+            twoPhaseProperties.subDict
+            (
+                twoPhaseProperties.phase1Name()
+            )
+        )
+    );
+
+    autoPtr<phaseEquationOfState> eos2
+    (
+        phaseEquationOfState::New
+        (
+            twoPhaseProperties.subDict
+            (
+                twoPhaseProperties.phase2Name()
+            )
+        )
+    );
+
     volScalarField psi1
     (
         IOobject
@@ -127,8 +139,9 @@
             runTime.timeName(),
             mesh
         ),
-        1.0/(R1*T)
+        eos1->psi(p, T)
     );
+    psi1.oldTime();
 
     volScalarField psi2
     (
@@ -138,7 +151,7 @@
             runTime.timeName(),
             mesh
         ),
-        1.0/(R2*T)
+        eos2->psi(p, T)
     );
     psi2.oldTime();
 
@@ -148,26 +161,8 @@
     volScalarField gh("gh", g & mesh.C());
     surfaceScalarField ghf("ghf", g & mesh.Cf());
 
-    volScalarField p
-    (
-        IOobject
-        (
-            "p",
-            runTime.timeName(),
-            mesh,
-            IOobject::NO_READ,
-            IOobject::AUTO_WRITE
-        ),
-        max
-        (
-            (p_rgh + gh*(alpha1*rho10 + alpha2*rho20))
-           /(1.0 - gh*(alpha1*psi1 + alpha2*psi2)),
-            pMin
-        )
-    );
-
-    volScalarField rho1(rho10 + psi1*p);
-    volScalarField rho2(rho20 + psi2*p);
+    volScalarField rho1(eos1->rho(p, T));
+    volScalarField rho2(eos2->rho(p, T));
 
     volScalarField rho
     (
diff --git a/applications/solvers/multiphase/compressibleInterFoam/pEqn.H b/applications/solvers/multiphase/compressibleInterFoam/pEqn.H
index b803b1ac18..fc700f81fa 100644
--- a/applications/solvers/multiphase/compressibleInterFoam/pEqn.H
+++ b/applications/solvers/multiphase/compressibleInterFoam/pEqn.H
@@ -1,6 +1,6 @@
 {
-    rho1 = rho10 + psi1*p;
-    rho2 = rho20 + psi2*p;
+    rho1 = eos1->rho(p, T);
+    rho2 = eos2->rho(p, T);
 
     volScalarField rAU = 1.0/UEqn.A();
     surfaceScalarField rAUf = fvc::interpolate(rAU);
@@ -81,15 +81,10 @@
     U += rAU*fvc::reconstruct((phi - phiU)/rAUf);
     U.correctBoundaryConditions();
 
-    p = max
-    (
-        (p_rgh + gh*(alpha1*rho10 + alpha2*rho20))
-       /(1.0 - gh*(alpha1*psi1 + alpha2*psi2)),
-        pMin
-    );
+    p = max(p_rgh + (alpha1*rho1 + alpha2*rho2)*gh, pMin);
 
-    rho1 = rho10 + psi1*p;
-    rho2 = rho20 + psi2*p;
+    rho1 = eos1->rho(p, T);
+    rho2 = eos2->rho(p, T);
 
     Info<< "max(U) " << max(mag(U)).value() << endl;
     Info<< "min(p_rgh) " << min(p_rgh).value() << endl;
diff --git a/applications/solvers/multiphase/compressibleInterFoam/phaseEquationsOfState/Make/files b/applications/solvers/multiphase/compressibleInterFoam/phaseEquationsOfState/Make/files
new file mode 100644
index 0000000000..4984fb848c
--- /dev/null
+++ b/applications/solvers/multiphase/compressibleInterFoam/phaseEquationsOfState/Make/files
@@ -0,0 +1,7 @@
+phaseEquationOfState/phaseEquationOfState.C
+phaseEquationOfState/newPhaseEquationOfState.C
+constant/constant.C
+linear/linear.C
+perfectFluid/perfectFluid.C
+
+LIB = $(FOAM_LIBBIN)/libphaseEquationsOfState
diff --git a/applications/solvers/multiphase/compressibleInterFoam/phaseEquationsOfState/Make/options b/applications/solvers/multiphase/compressibleInterFoam/phaseEquationsOfState/Make/options
new file mode 100644
index 0000000000..0ec1139209
--- /dev/null
+++ b/applications/solvers/multiphase/compressibleInterFoam/phaseEquationsOfState/Make/options
@@ -0,0 +1,6 @@
+EXE_INC = \
+    -I$(LIB_SRC)/finiteVolume/lnInclude \
+    -I$(LIB_SRC)/transportModels/incompressible/lnInclude
+
+LIB_LIBS = \
+    -lincompressibleTransportModels
diff --git a/applications/solvers/multiphase/compressibleInterFoam/phaseEquationsOfState/constant/constant.C b/applications/solvers/multiphase/compressibleInterFoam/phaseEquationsOfState/constant/constant.C
new file mode 100644
index 0000000000..ba17170b56
--- /dev/null
+++ b/applications/solvers/multiphase/compressibleInterFoam/phaseEquationsOfState/constant/constant.C
@@ -0,0 +1,114 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "constant.H"
+#include "volFields.H"
+#include "addToRunTimeSelectionTable.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace phaseEquationsOfState
+{
+    defineTypeNameAndDebug(constant, 0);
+
+    addToRunTimeSelectionTable
+    (
+        phaseEquationOfState,
+        constant,
+        dictionary
+    );
+}
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::phaseEquationsOfState::constant::constant
+(
+    const dictionary& dict
+)
+:
+    phaseEquationOfState(dict),
+    rho_("rho", dimDensity, dict.lookup("rho"))
+{}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::phaseEquationsOfState::constant::~constant()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+Foam::tmp<Foam::volScalarField> Foam::phaseEquationsOfState::constant::rho
+(
+    const volScalarField& p,
+    const volScalarField& T
+) const
+{
+    return tmp<Foam::volScalarField>
+    (
+        new volScalarField
+        (
+            IOobject
+            (
+                "rho",
+                p.time().timeName(),
+                p.mesh()
+            ),
+            p.mesh(),
+            rho_
+        )
+    );
+}
+
+
+Foam::tmp<Foam::volScalarField> Foam::phaseEquationsOfState::constant::psi
+(
+    const volScalarField& p,
+    const volScalarField& T
+) const
+{
+    return tmp<Foam::volScalarField>
+    (
+        new volScalarField
+        (
+            IOobject
+            (
+                "psi",
+                p.time().timeName(),
+                p.mesh()
+            ),
+            p.mesh(),
+            dimensionedScalar("psi", dimDensity/dimPressure, 0)
+        )
+    );
+}
+
+
+// ************************************************************************* //
diff --git a/applications/solvers/multiphase/compressibleInterFoam/phaseEquationsOfState/constant/constant.H b/applications/solvers/multiphase/compressibleInterFoam/phaseEquationsOfState/constant/constant.H
new file mode 100644
index 0000000000..cb39b8ee6d
--- /dev/null
+++ b/applications/solvers/multiphase/compressibleInterFoam/phaseEquationsOfState/constant/constant.H
@@ -0,0 +1,106 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::phaseEquationsOfState::constant
+
+Description
+    Constant phase density model.
+
+SourceFiles
+    constant.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef constant_H
+#define constant_H
+
+#include "phaseEquationOfState.H"
+#include "dimensionedTypes.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace phaseEquationsOfState
+{
+
+/*---------------------------------------------------------------------------*\
+                           Class constant Declaration
+\*---------------------------------------------------------------------------*/
+
+class constant
+:
+    public phaseEquationOfState
+{
+    // Private data
+
+        //- The constant density of the phase
+        dimensionedScalar rho_;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("constant");
+
+
+    // Constructors
+
+        //- Construct from components
+        constant
+        (
+            const dictionary& dict
+        );
+
+
+    //- Destructor
+    virtual ~constant();
+
+
+    // Member Functions
+
+        tmp<volScalarField> rho
+        (
+            const volScalarField& p,
+            const volScalarField& T
+        ) const;
+
+        tmp<volScalarField> psi
+        (
+            const volScalarField& p,
+            const volScalarField& T
+        ) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace phaseEquationsOfState
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/applications/solvers/multiphase/compressibleInterFoam/phaseEquationsOfState/linear/linear.C b/applications/solvers/multiphase/compressibleInterFoam/phaseEquationsOfState/linear/linear.C
new file mode 100644
index 0000000000..6f27a878de
--- /dev/null
+++ b/applications/solvers/multiphase/compressibleInterFoam/phaseEquationsOfState/linear/linear.C
@@ -0,0 +1,114 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "linear.H"
+#include "volFields.H"
+#include "addToRunTimeSelectionTable.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace phaseEquationsOfState
+{
+    defineTypeNameAndDebug(linear, 0);
+
+    addToRunTimeSelectionTable
+    (
+        phaseEquationOfState,
+        linear,
+        dictionary
+    );
+}
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::phaseEquationsOfState::linear::linear
+(
+    const dictionary& dict
+)
+:
+    phaseEquationOfState(dict),
+    rho0_("rho0", dimDensity, dict.lookup("rho0")),
+    psi_("psi", dimDensity/dimPressure, dict.lookup("psi"))
+{}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::phaseEquationsOfState::linear::~linear()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+Foam::tmp<Foam::volScalarField> Foam::phaseEquationsOfState::linear::rho
+(
+    const volScalarField& p,
+    const volScalarField& T
+) const
+{
+    return tmp<Foam::volScalarField>
+    (
+        new volScalarField
+        (
+            IOobject
+            (
+                "rho",
+                p.time().timeName(),
+                p.mesh()
+            ),
+            rho0_ + psi_*p
+        )
+    );
+}
+
+
+Foam::tmp<Foam::volScalarField> Foam::phaseEquationsOfState::linear::psi
+(
+    const volScalarField& p,
+    const volScalarField& T
+) const
+{
+    return tmp<Foam::volScalarField>
+    (
+        new volScalarField
+        (
+            IOobject
+            (
+                "psi",
+                p.time().timeName(),
+                p.mesh()
+            ),
+            p.mesh(),
+            psi_
+        )
+    );
+}
+
+
+// ************************************************************************* //
diff --git a/applications/solvers/multiphase/compressibleInterFoam/phaseEquationsOfState/linear/linear.H b/applications/solvers/multiphase/compressibleInterFoam/phaseEquationsOfState/linear/linear.H
new file mode 100644
index 0000000000..d357bb3ec0
--- /dev/null
+++ b/applications/solvers/multiphase/compressibleInterFoam/phaseEquationsOfState/linear/linear.H
@@ -0,0 +1,109 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::phaseEquationsOfState::linear
+
+Description
+    Linear phase density model.
+
+SourceFiles
+    linear.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef linear_H
+#define linear_H
+
+#include "phaseEquationOfState.H"
+#include "dimensionedTypes.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace phaseEquationsOfState
+{
+
+/*---------------------------------------------------------------------------*\
+                           Class linear Declaration
+\*---------------------------------------------------------------------------*/
+
+class linear
+:
+    public phaseEquationOfState
+{
+    // Private data
+
+        //- The reference density of the phase
+        dimensionedScalar rho0_;
+
+        //- The constant compressibility of the phase
+        dimensionedScalar psi_;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("linear");
+
+
+    // Constructors
+
+        //- Construct from components
+        linear
+        (
+            const dictionary& dict
+        );
+
+
+    //- Destructor
+    virtual ~linear();
+
+
+    // Member Functions
+
+        tmp<volScalarField> rho
+        (
+            const volScalarField& p,
+            const volScalarField& T
+        ) const;
+
+        tmp<volScalarField> psi
+        (
+            const volScalarField& p,
+            const volScalarField& T
+        ) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace phaseEquationsOfState
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/applications/solvers/multiphase/compressibleInterFoam/phaseEquationsOfState/perfectFluid/perfectFluid.C b/applications/solvers/multiphase/compressibleInterFoam/phaseEquationsOfState/perfectFluid/perfectFluid.C
new file mode 100644
index 0000000000..32327a5ffc
--- /dev/null
+++ b/applications/solvers/multiphase/compressibleInterFoam/phaseEquationsOfState/perfectFluid/perfectFluid.C
@@ -0,0 +1,113 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "perfectFluid.H"
+#include "volFields.H"
+#include "addToRunTimeSelectionTable.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace phaseEquationsOfState
+{
+    defineTypeNameAndDebug(perfectFluid, 0);
+
+    addToRunTimeSelectionTable
+    (
+        phaseEquationOfState,
+        perfectFluid,
+        dictionary
+    );
+}
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::phaseEquationsOfState::perfectFluid::perfectFluid
+(
+    const dictionary& dict
+)
+:
+    phaseEquationOfState(dict),
+    rho0_("rho0", dimDensity, dict.lookup("rho0")),
+    R_("R", dimensionSet(0, 2, -2, -1, 0), dict.lookup("R"))
+{}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::phaseEquationsOfState::perfectFluid::~perfectFluid()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+Foam::tmp<Foam::volScalarField> Foam::phaseEquationsOfState::perfectFluid::rho
+(
+    const volScalarField& p,
+    const volScalarField& T
+) const
+{
+    return tmp<Foam::volScalarField>
+    (
+        new volScalarField
+        (
+            IOobject
+            (
+                "rho",
+                p.time().timeName(),
+                p.mesh()
+            ),
+            rho0_ + psi(p, T)*p
+        )
+    );
+}
+
+
+Foam::tmp<Foam::volScalarField> Foam::phaseEquationsOfState::perfectFluid::psi
+(
+    const volScalarField& p,
+    const volScalarField& T
+) const
+{
+    return tmp<Foam::volScalarField>
+    (
+        new volScalarField
+        (
+            IOobject
+            (
+                "psi",
+                p.time().timeName(),
+                p.mesh()
+            ),
+            1.0/(R_*T)
+        )
+    );
+}
+
+
+// ************************************************************************* //
diff --git a/applications/solvers/multiphase/compressibleInterFoam/phaseEquationsOfState/perfectFluid/perfectFluid.H b/applications/solvers/multiphase/compressibleInterFoam/phaseEquationsOfState/perfectFluid/perfectFluid.H
new file mode 100644
index 0000000000..b854f1d84f
--- /dev/null
+++ b/applications/solvers/multiphase/compressibleInterFoam/phaseEquationsOfState/perfectFluid/perfectFluid.H
@@ -0,0 +1,109 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::phaseEquationsOfState::perfectFluid
+
+Description
+    PerfectFluid phase density model.
+
+SourceFiles
+    perfectFluid.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef perfectFluid_H
+#define perfectFluid_H
+
+#include "phaseEquationOfState.H"
+#include "dimensionedTypes.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace phaseEquationsOfState
+{
+
+/*---------------------------------------------------------------------------*\
+                           Class perfectFluid Declaration
+\*---------------------------------------------------------------------------*/
+
+class perfectFluid
+:
+    public phaseEquationOfState
+{
+    // Private data
+
+        //- The reference density of the phase
+        dimensionedScalar rho0_;
+
+        //- The fluid constant of the phase
+        dimensionedScalar R_;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("perfectFluid");
+
+
+    // Constructors
+
+        //- Construct from components
+        perfectFluid
+        (
+            const dictionary& dict
+        );
+
+
+    //- Destructor
+    virtual ~perfectFluid();
+
+
+    // Member Functions
+
+        tmp<volScalarField> rho
+        (
+            const volScalarField& p,
+            const volScalarField& T
+        ) const;
+
+        tmp<volScalarField> psi
+        (
+            const volScalarField& p,
+            const volScalarField& T
+        ) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace phaseEquationsOfState
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/applications/solvers/multiphase/compressibleInterFoam/phaseEquationsOfState/phaseEquationOfState/newPhaseEquationOfState.C b/applications/solvers/multiphase/compressibleInterFoam/phaseEquationsOfState/phaseEquationOfState/newPhaseEquationOfState.C
new file mode 100644
index 0000000000..3d9a842a9f
--- /dev/null
+++ b/applications/solvers/multiphase/compressibleInterFoam/phaseEquationsOfState/phaseEquationOfState/newPhaseEquationOfState.C
@@ -0,0 +1,60 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "phaseEquationOfState.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+Foam::autoPtr<Foam::phaseEquationOfState> Foam::phaseEquationOfState::New
+(
+    const dictionary& dict
+)
+{
+    word phaseEquationOfStateType
+    (
+        dict.subDict("equationOfState").lookup("type")
+    );
+
+    Info<< "Selecting phaseEquationOfState "
+        << phaseEquationOfStateType << endl;
+
+    dictionaryConstructorTable::iterator cstrIter =
+        dictionaryConstructorTablePtr_->find(phaseEquationOfStateType);
+
+    if (cstrIter == dictionaryConstructorTablePtr_->end())
+    {
+        FatalErrorIn("phaseEquationOfState::New")
+           << "Unknown phaseEquationOfStateType type "
+           << phaseEquationOfStateType << endl << endl
+           << "Valid phaseEquationOfState types are : " << endl
+           << dictionaryConstructorTablePtr_->sortedToc()
+           << exit(FatalError);
+    }
+
+    return cstrIter()(dict.subDict("equationOfState"));
+}
+
+
+// ************************************************************************* //
diff --git a/applications/solvers/multiphase/compressibleInterFoam/phaseEquationsOfState/phaseEquationOfState/phaseEquationOfState.C b/applications/solvers/multiphase/compressibleInterFoam/phaseEquationsOfState/phaseEquationOfState/phaseEquationOfState.C
new file mode 100644
index 0000000000..41ed49322b
--- /dev/null
+++ b/applications/solvers/multiphase/compressibleInterFoam/phaseEquationsOfState/phaseEquationOfState/phaseEquationOfState.C
@@ -0,0 +1,54 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "phaseEquationOfState.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    defineTypeNameAndDebug(phaseEquationOfState, 0);
+    defineRunTimeSelectionTable(phaseEquationOfState, dictionary);
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::phaseEquationOfState::phaseEquationOfState
+(
+    const dictionary& dict
+)
+:
+    dict_(dict)
+{}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::phaseEquationOfState::~phaseEquationOfState()
+{}
+
+
+// ************************************************************************* //
diff --git a/applications/solvers/multiphase/compressibleInterFoam/phaseEquationsOfState/phaseEquationOfState/phaseEquationOfState.H b/applications/solvers/multiphase/compressibleInterFoam/phaseEquationsOfState/phaseEquationOfState/phaseEquationOfState.H
new file mode 100644
index 0000000000..45a5079d0d
--- /dev/null
+++ b/applications/solvers/multiphase/compressibleInterFoam/phaseEquationsOfState/phaseEquationOfState/phaseEquationOfState.H
@@ -0,0 +1,127 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::phaseEquationOfState
+
+Description
+    A2stract base-class for dispersed-phase particle diameter models.
+
+SourceFiles
+    phaseEquationOfState.C
+    newDiameterModel.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef phaseEquationOfState_H
+#define phaseEquationOfState_H
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#include "dictionary.H"
+#include "volFieldsFwd.H"
+#include "runTimeSelectionTables.H"
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                           Class phaseEquationOfState Declaration
+\*---------------------------------------------------------------------------*/
+
+class phaseEquationOfState
+{
+protected:
+
+    // Protected data
+
+        const dictionary& dict_;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("phaseEquationOfState");
+
+
+    // Declare runtime construction
+
+        declareRunTimeSelectionTable
+        (
+            autoPtr,
+            phaseEquationOfState,
+            dictionary,
+            (
+                const dictionary& dict
+            ),
+            (dict)
+        );
+
+
+    // Constructors
+
+        phaseEquationOfState
+        (
+            const dictionary& dict
+        );
+
+
+    //- Destructor
+    virtual ~phaseEquationOfState();
+
+
+    // Selectors
+
+        static autoPtr<phaseEquationOfState> New
+        (
+            const dictionary& dict
+        );
+
+
+    // Member Functions
+
+        //- Return the phase density
+        virtual tmp<volScalarField> rho
+        (
+            const volScalarField& p,
+            const volScalarField& T
+        ) const = 0;
+
+        //- Return the phase compressibility
+        virtual tmp<volScalarField> psi
+        (
+            const volScalarField& p,
+            const volScalarField& T
+        ) const = 0;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/constant/transportProperties b/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/constant/transportProperties
index 1803697ff7..564df56f20 100644
--- a/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/constant/transportProperties
+++ b/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/constant/transportProperties
@@ -20,23 +20,35 @@ phases (water air);
 water
 {
     transportModel  Newtonian;
-    nu              nu [ 0 2 -1 0 0 0 0 ] 1e-06;
-    k               k         [1 1 -3 -1 0 0 0] 0; //0.613;
-    rho             rho [ 1 -3 0 0 0 0 0 ] 1000;
-    rho0            rho0 [ 1 -3 0 0 0 0 0 ] 1000;
-    R               R         [0 2 -2 -1 0] 3000;
-    Cv              Cv        [0 2 -2 -1 0] 4179;
+    nu              1e-06;
+    rho             1000;
+    k               0; // 0.613;
+    Cv              4179;
+
+    equationOfState
+    {
+        type            perfectFluid;
+
+        rho0            1000;
+        R               3000;
+    }
 }
 
 air
 {
     transportModel  Newtonian;
-    nu              nu [ 0 2 -1 0 0 0 0 ] 1.589e-05;
-    k               k         [1 1 -3 -1 0 0 0] 0; //2.63e-2;
-    rho             rho [ 1 -3 0 0 0 0 0 ] 1;
-    rho0            rho0 [ 1 -3 0 0 0 0 0 ] 0;
-    R               R         [0 2 -2 -1 0] 287;
-    Cv              Cv        [0 2 -2 -1 0] 721;
+    nu              1.589e-05;
+    rho             1;
+    k               0; // 2.63e-2;
+    Cv              721;
+
+    equationOfState
+    {
+        type            perfectFluid;
+
+        rho0            0;
+        R               287;
+    }
 }
 
 pMin            pMin [ 1 -1 -2 0 0 0 0 ] 10000;
diff --git a/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/constant/transportProperties b/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/constant/transportProperties
index 1803697ff7..564df56f20 100644
--- a/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/constant/transportProperties
+++ b/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/constant/transportProperties
@@ -20,23 +20,35 @@ phases (water air);
 water
 {
     transportModel  Newtonian;
-    nu              nu [ 0 2 -1 0 0 0 0 ] 1e-06;
-    k               k         [1 1 -3 -1 0 0 0] 0; //0.613;
-    rho             rho [ 1 -3 0 0 0 0 0 ] 1000;
-    rho0            rho0 [ 1 -3 0 0 0 0 0 ] 1000;
-    R               R         [0 2 -2 -1 0] 3000;
-    Cv              Cv        [0 2 -2 -1 0] 4179;
+    nu              1e-06;
+    rho             1000;
+    k               0; // 0.613;
+    Cv              4179;
+
+    equationOfState
+    {
+        type            perfectFluid;
+
+        rho0            1000;
+        R               3000;
+    }
 }
 
 air
 {
     transportModel  Newtonian;
-    nu              nu [ 0 2 -1 0 0 0 0 ] 1.589e-05;
-    k               k         [1 1 -3 -1 0 0 0] 0; //2.63e-2;
-    rho             rho [ 1 -3 0 0 0 0 0 ] 1;
-    rho0            rho0 [ 1 -3 0 0 0 0 0 ] 0;
-    R               R         [0 2 -2 -1 0] 287;
-    Cv              Cv        [0 2 -2 -1 0] 721;
+    nu              1.589e-05;
+    rho             1;
+    k               0; // 2.63e-2;
+    Cv              721;
+
+    equationOfState
+    {
+        type            perfectFluid;
+
+        rho0            0;
+        R               287;
+    }
 }
 
 pMin            pMin [ 1 -1 -2 0 0 0 0 ] 10000;

From e514d0a79cbb7376a36178107c0a86f14afa82f9 Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Mon, 16 Apr 2012 15:55:00 +0100
Subject: [PATCH 206/317] Updated headers

---
 .../phaseEquationsOfState/constant/constant.C                   | 2 +-
 .../phaseEquationsOfState/constant/constant.H                   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/applications/solvers/multiphase/compressibleInterFoam/phaseEquationsOfState/constant/constant.C b/applications/solvers/multiphase/compressibleInterFoam/phaseEquationsOfState/constant/constant.C
index ba17170b56..a51d88233e 100644
--- a/applications/solvers/multiphase/compressibleInterFoam/phaseEquationsOfState/constant/constant.C
+++ b/applications/solvers/multiphase/compressibleInterFoam/phaseEquationsOfState/constant/constant.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/solvers/multiphase/compressibleInterFoam/phaseEquationsOfState/constant/constant.H b/applications/solvers/multiphase/compressibleInterFoam/phaseEquationsOfState/constant/constant.H
index cb39b8ee6d..5cfe44c26e 100644
--- a/applications/solvers/multiphase/compressibleInterFoam/phaseEquationsOfState/constant/constant.H
+++ b/applications/solvers/multiphase/compressibleInterFoam/phaseEquationsOfState/constant/constant.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

From 03c739f09e2a794936930ac9cc4230d0e5bcc4b1 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Mon, 16 Apr 2012 17:52:45 +0100
Subject: [PATCH 207/317] BUG: geompack.C: indexing error

---
 src/meshTools/triSurface/triSurfaceTools/geompack/geompack.C | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/meshTools/triSurface/triSurfaceTools/geompack/geompack.C b/src/meshTools/triSurface/triSurfaceTools/geompack/geompack.C
index 1bcc5fd7b3..7298db6060 100644
--- a/src/meshTools/triSurface/triSurfaceTools/geompack/geompack.C
+++ b/src/meshTools/triSurface/triSurfaceTools/geompack/geompack.C
@@ -1130,8 +1130,8 @@ int dtris2 ( int point_num, double point_xy[], int *tri_num,
       tri_vert[3*(i-1)+0] = m1;
       tri_vert[3*(i-1)+1] = m2;
       tri_vert[3*(i-1)+2] = m;
-      tri_nabe[3*(i-1)+0] = -3 * i;
-      tri_nabe[3*(i-1)+1] = i;
+      tri_nabe[3*(i-2)+0] = -3 * i;
+      tri_nabe[3*(i-2)+1] = i;
       tri_nabe[3*(i-1)+2] = i - 1;
 
     }

From b4fe2268a3d50767a6d477f8a79995a15a99573a Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Tue, 17 Apr 2012 09:31:57 +0100
Subject: [PATCH 208/317] BUG: changeDictionary: fixed commandline override of
 time

---
 .../changeDictionary/changeDictionary.C       | 31 +++++++++++--------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/applications/utilities/preProcessing/changeDictionary/changeDictionary.C b/applications/utilities/preProcessing/changeDictionary/changeDictionary.C
index 85ce0db890..937e88d10e 100644
--- a/applications/utilities/preProcessing/changeDictionary/changeDictionary.C
+++ b/applications/utilities/preProcessing/changeDictionary/changeDictionary.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -70,6 +70,7 @@ Usage
 #include "IOPtrList.H"
 #include "volFields.H"
 #include "stringListOps.H"
+#include "timeSelector.H"
 
 using namespace Foam;
 
@@ -252,12 +253,10 @@ int main(int argc, char *argv[])
         "file",
         "specify an alternative to system/changeDictionaryDict"
     );
-    argList::addOption
-    (
-        "instance",
-        "name",
-        "specify alternate time instance - default is latest time"
-    );
+
+    // Add explicit time option
+    timeSelector::addOptions();
+
     argList::addBoolOption
     (
         "literalRE",
@@ -272,6 +271,17 @@ int main(int argc, char *argv[])
 
     #include "setRootCase.H"
     #include "createTime.H"
+
+    // Optionally override controlDict time with -time options
+    instantList times = timeSelector::selectIfPresent(runTime, args);
+    if (times.size() < 1)
+    {
+        FatalErrorIn(args.executable())
+            << "No times selected." << exit(FatalError);
+    }
+    runTime.setTime(times[0], 0);
+
+
     #include "createNamedMesh.H"
 
     const word dictName("changeDictionaryDict");
@@ -317,11 +327,6 @@ int main(int argc, char *argv[])
         regionPrefix = regionName;
     }
 
-    word instance = runTime.timeName();
-    if (args.options().found("instance"))
-    {
-        instance = args.options()["instance"];
-    }
 
     // Make sure we do not use the master-only reading since we read
     // fields (different per processor) as dictionaries.
@@ -460,7 +465,7 @@ int main(int argc, char *argv[])
                 IOobject
                 (
                     fieldName,
-                    instance,
+                    runTime.timeName(),
                     mesh,
                     IOobject::MUST_READ_IF_MODIFIED,
                     IOobject::NO_WRITE,

From 430095b0d7895e54c0a824384de3647f79646964 Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Tue, 17 Apr 2012 12:27:39 +0100
Subject: [PATCH 209/317] BUG: Corrected particle number scaling in cloud
 *OfSystem functions - resolves bug #503

---
 .../clouds/Templates/KinematicCloud/KinematicCloudI.H     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H
index ab0e7ed940..c7db066187 100644
--- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H
+++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H
@@ -241,7 +241,7 @@ inline Foam::scalar Foam::KinematicCloud<CloudType>::massInSystem() const
     forAllConstIter(typename KinematicCloud<CloudType>, *this, iter)
     {
          const parcelType& p = iter();
-         sysMass += p.mass()*p.nParticle();
+         sysMass += p.nParticle()*p.mass();
     }
 
     return sysMass;
@@ -258,7 +258,7 @@ Foam::KinematicCloud<CloudType>::linearMomentumOfSystem() const
     {
         const parcelType& p = iter();
 
-        linearMomentum += p.mass()*p.U();
+        linearMomentum += p.nParticle()*p.mass()*p.U();
     }
 
     return linearMomentum;
@@ -275,7 +275,7 @@ Foam::KinematicCloud<CloudType>::linearKineticEnergyOfSystem() const
     {
         const parcelType& p = iter();
 
-        linearKineticEnergy += 0.5*p.mass()*(p.U() & p.U());
+        linearKineticEnergy += p.nParticle()*0.5*p.mass()*(p.U() & p.U());
     }
 
     return linearKineticEnergy;
@@ -293,7 +293,7 @@ Foam::KinematicCloud<CloudType>::rotationalKineticEnergyOfSystem() const
         const parcelType& p = iter();
 
         rotationalKineticEnergy +=
-            0.5*p.momentOfInertia()*(p.omega() & p.omega());
+            p.nParticle()*0.5*p.momentOfInertia()*(p.omega() & p.omega());
     }
 
     return rotationalKineticEnergy;

From cd51a5eea3d48fac5c30e961859b5067067c5e8e Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Tue, 17 Apr 2012 16:48:27 +0100
Subject: [PATCH 210/317] Consistency: Changed exponent FORTRAN style 'E' to C
 style 'e'

---
 .../multiphase/compressibleInterFoam/createFields.H    |  4 ++--
 .../phaseEquationsOfState/Make/files                   |  1 +
 .../phaseEquationsOfState/constant/constant.C          | 10 ++++++++--
 .../phaseEquationsOfState/linear/linear.C              | 10 ++++++++--
 .../phaseEquationsOfState/perfectFluid/perfectFluid.C  | 10 ++++++++--
 applications/test/syncTools/Test-syncTools.C           |  4 ++--
 .../mesh/advanced/autoRefineMesh/autoRefineMesh.C      |  2 +-
 .../mesh/advanced/collapseEdges/collapseEdges.C        |  2 +-
 .../utilities/mesh/advanced/selectCells/edgeStats.C    |  2 +-
 .../utilities/mesh/generation/cv2DMesh/cv2DMesh.C      |  2 +-
 .../conformalVoronoiMeshCalcDualMesh.C                 |  2 +-
 .../cvMesh/cvMeshBackgroundMesh/cvMeshBackgroundMesh.C |  4 ++--
 .../mesh/generation/extrude/extrudeMesh/extrudeMesh.C  |  2 +-
 .../mesh/generation/extrude2DMesh/extrude2DMeshApp.C   |  2 +-
 .../mesh/manipulation/checkMesh/checkGeometry.C        |  6 +++---
 .../mesh/manipulation/polyDualMesh/meshDualiser.C      |  4 ++--
 .../mesh/manipulation/refineMesh/refineMesh.C          |  6 +++---
 .../reconstructParMesh/reconstructParMesh.C            |  4 ++--
 .../redistributePar/redistributePar.C                  |  4 ++--
 .../utilities/preProcessing/mapFields/mapLagrangian.C  |  2 +-
 .../preProcessing/viewFactorsGen/searchingEngine.H     |  2 +-
 .../utilities/surface/surfaceCheck/surfaceCheck.C      |  6 +++---
 .../surfaceRedistributePar/surfaceRedistributePar.C    |  2 +-
 .../utilities/surface/surfaceSubset/surfaceSubset.C    |  2 +-
 src/OSspecific/POSIX/clockTime/clockTime.C             |  2 +-
 .../meshes/polyMesh/globalMeshData/globalMeshData.C    |  2 +-
 src/OpenFOAM/meshes/polyMesh/polyMesh.C                |  2 +-
 .../polyPatches/basic/coupled/coupledPolyPatch.C       |  2 +-
 src/combustionModels/FSD/FSD.H                         |  2 +-
 src/dynamicMesh/boundaryMesh/boundaryMesh.C            |  8 ++++----
 src/dynamicMesh/meshCut/cellLooper/geomCellLooper.C    |  2 +-
 src/dynamicMesh/meshCut/directions/directions.C        |  2 +-
 src/dynamicMesh/motionSmoother/motionSmoother.C        |  4 ++--
 src/dynamicMesh/perfectInterface/perfectInterface.C    |  2 +-
 src/dynamicMesh/polyMeshAdder/faceCoupleInfo.C         |  4 ++--
 .../polyTopoChange/polyTopoChange/faceCollapser.C      |  4 ++--
 .../polyTopoChange/polyTopoChange/hexRef8.C            |  2 +-
 .../extendedFeatureEdgeMesh/extendedFeatureEdgeMesh.C  |  6 +++---
 .../timeVaryingMappedFixedValueFvPatchField.C          |  2 +-
 .../timeVaryingMappedFixedValueFvPatchField.H          |  2 +-
 .../timeVaryingMappedFixedValuePointPatchField.C       |  2 +-
 .../autoHexMesh/meshRefinement/meshRefinement.C        |  2 +-
 .../autoHexMesh/meshRefinement/meshRefinementBaffles.C |  4 ++--
 .../refinementFeatures/refinementFeatures.C            |  2 +-
 src/meshTools/cellClassification/cellClassification.C  |  4 ++--
 src/meshTools/indexedOctree/treeDataFace.C             |  2 +-
 src/meshTools/indexedOctree/treeDataPrimitivePatch.C   |  2 +-
 .../mappedPatches/mappedPolyPatch/mappedPatchBase.C    |  2 +-
 src/meshTools/meshSearch/meshSearch.C                  |  6 +++---
 src/meshTools/searchableSurface/searchablePlate.C      |  4 ++--
 .../searchableSurface/searchableSurfaceWithGaps.C      |  4 ++--
 src/meshTools/searchableSurface/triSurfaceMesh.C       |  4 ++--
 .../surfaceIntersection/surfaceIntersection.C          |  2 +-
 .../triSurface/triSurfaceSearch/triSurfaceSearch.C     |  2 +-
 .../triSurface/triSurfaceTools/triSurfaceTools.C       |  2 +-
 .../hierarchGeomDecomp/hierarchGeomDecomp.C            |  4 ++--
 .../field/wallBoundedStreamLine/wallBoundedParticle.C  |  2 +-
 src/sampling/probes/patchProbes.C                      |  2 +-
 src/sampling/sampledSet/patchCloud/patchCloudSet.C     |  2 +-
 src/sampling/sampledSet/patchSeed/patchSeedSet.C       |  2 +-
 src/sampling/sampledSurface/isoSurface/isoSurface.H    |  2 +-
 .../sampledSurface/isoSurface/isoSurfaceCell.H         |  2 +-
 .../sampledSurface/isoSurface/sampledIsoSurface.C      |  2 +-
 .../sampledCuttingPlane/sampledCuttingPlane.C          |  2 +-
 .../sampledTriSurfaceMesh/sampledTriSurfaceMesh.C      |  2 +-
 src/triSurface/faceTriangulation/faceTriangulation.C   |  2 +-
 66 files changed, 115 insertions(+), 96 deletions(-)

diff --git a/applications/solvers/multiphase/compressibleInterFoam/createFields.H b/applications/solvers/multiphase/compressibleInterFoam/createFields.H
index 9a67dc5da5..1c22600170 100644
--- a/applications/solvers/multiphase/compressibleInterFoam/createFields.H
+++ b/applications/solvers/multiphase/compressibleInterFoam/createFields.H
@@ -161,8 +161,8 @@
     volScalarField gh("gh", g & mesh.C());
     surfaceScalarField ghf("ghf", g & mesh.Cf());
 
-    volScalarField rho1(eos1->rho(p, T));
-    volScalarField rho2(eos2->rho(p, T));
+    volScalarField rho1("rho1", eos1->rho(p, T));
+    volScalarField rho2("rho2", eos2->rho(p, T));
 
     volScalarField rho
     (
diff --git a/applications/solvers/multiphase/compressibleInterFoam/phaseEquationsOfState/Make/files b/applications/solvers/multiphase/compressibleInterFoam/phaseEquationsOfState/Make/files
index 4984fb848c..e6e260c74a 100644
--- a/applications/solvers/multiphase/compressibleInterFoam/phaseEquationsOfState/Make/files
+++ b/applications/solvers/multiphase/compressibleInterFoam/phaseEquationsOfState/Make/files
@@ -3,5 +3,6 @@ phaseEquationOfState/newPhaseEquationOfState.C
 constant/constant.C
 linear/linear.C
 perfectFluid/perfectFluid.C
+adiabaticPerfectFluid/adiabaticPerfectFluid.C
 
 LIB = $(FOAM_LIBBIN)/libphaseEquationsOfState
diff --git a/applications/solvers/multiphase/compressibleInterFoam/phaseEquationsOfState/constant/constant.C b/applications/solvers/multiphase/compressibleInterFoam/phaseEquationsOfState/constant/constant.C
index a51d88233e..54b6705dd9 100644
--- a/applications/solvers/multiphase/compressibleInterFoam/phaseEquationsOfState/constant/constant.C
+++ b/applications/solvers/multiphase/compressibleInterFoam/phaseEquationsOfState/constant/constant.C
@@ -79,7 +79,10 @@ Foam::tmp<Foam::volScalarField> Foam::phaseEquationsOfState::constant::rho
             (
                 "rho",
                 p.time().timeName(),
-                p.mesh()
+                p.mesh(),
+                IOobject::NO_READ,
+                IOobject::NO_WRITE,
+                false
             ),
             p.mesh(),
             rho_
@@ -102,7 +105,10 @@ Foam::tmp<Foam::volScalarField> Foam::phaseEquationsOfState::constant::psi
             (
                 "psi",
                 p.time().timeName(),
-                p.mesh()
+                p.mesh(),
+                IOobject::NO_READ,
+                IOobject::NO_WRITE,
+                false
             ),
             p.mesh(),
             dimensionedScalar("psi", dimDensity/dimPressure, 0)
diff --git a/applications/solvers/multiphase/compressibleInterFoam/phaseEquationsOfState/linear/linear.C b/applications/solvers/multiphase/compressibleInterFoam/phaseEquationsOfState/linear/linear.C
index 6f27a878de..3680735a1b 100644
--- a/applications/solvers/multiphase/compressibleInterFoam/phaseEquationsOfState/linear/linear.C
+++ b/applications/solvers/multiphase/compressibleInterFoam/phaseEquationsOfState/linear/linear.C
@@ -80,7 +80,10 @@ Foam::tmp<Foam::volScalarField> Foam::phaseEquationsOfState::linear::rho
             (
                 "rho",
                 p.time().timeName(),
-                p.mesh()
+                p.mesh(),
+                IOobject::NO_READ,
+                IOobject::NO_WRITE,
+                false
             ),
             rho0_ + psi_*p
         )
@@ -102,7 +105,10 @@ Foam::tmp<Foam::volScalarField> Foam::phaseEquationsOfState::linear::psi
             (
                 "psi",
                 p.time().timeName(),
-                p.mesh()
+                p.mesh(),
+                IOobject::NO_READ,
+                IOobject::NO_WRITE,
+                false
             ),
             p.mesh(),
             psi_
diff --git a/applications/solvers/multiphase/compressibleInterFoam/phaseEquationsOfState/perfectFluid/perfectFluid.C b/applications/solvers/multiphase/compressibleInterFoam/phaseEquationsOfState/perfectFluid/perfectFluid.C
index 32327a5ffc..6a148d8d68 100644
--- a/applications/solvers/multiphase/compressibleInterFoam/phaseEquationsOfState/perfectFluid/perfectFluid.C
+++ b/applications/solvers/multiphase/compressibleInterFoam/phaseEquationsOfState/perfectFluid/perfectFluid.C
@@ -80,7 +80,10 @@ Foam::tmp<Foam::volScalarField> Foam::phaseEquationsOfState::perfectFluid::rho
             (
                 "rho",
                 p.time().timeName(),
-                p.mesh()
+                p.mesh(),
+                IOobject::NO_READ,
+                IOobject::NO_WRITE,
+                false
             ),
             rho0_ + psi(p, T)*p
         )
@@ -102,7 +105,10 @@ Foam::tmp<Foam::volScalarField> Foam::phaseEquationsOfState::perfectFluid::psi
             (
                 "psi",
                 p.time().timeName(),
-                p.mesh()
+                p.mesh(),
+                IOobject::NO_READ,
+                IOobject::NO_WRITE,
+                false
             ),
             1.0/(R_*T)
         )
diff --git a/applications/test/syncTools/Test-syncTools.C b/applications/test/syncTools/Test-syncTools.C
index 83970e9ef2..32d55e73b9 100644
--- a/applications/test/syncTools/Test-syncTools.C
+++ b/applications/test/syncTools/Test-syncTools.C
@@ -214,7 +214,7 @@ void testSparseData(const polyMesh& mesh, Random& rndGen)
 
         forAll(localPoints, i)
         {
-            const point pt = localPoints[i] + 1E-4*rndGen.vector01();
+            const point pt = localPoints[i] + 1e-4*rndGen.vector01();
 
             label meshPointI = allBoundary.meshPoints()[i];
 
@@ -299,7 +299,7 @@ void testSparseData(const polyMesh& mesh, Random& rndGen)
         {
             const edge& e = edges[i];
 
-            const point pt = e.centre(localPoints) + 1E-4*rndGen.vector01();
+            const point pt = e.centre(localPoints) + 1e-4*rndGen.vector01();
 
             label meshEdgeI = meshEdges[i];
 
diff --git a/applications/utilities/mesh/advanced/autoRefineMesh/autoRefineMesh.C b/applications/utilities/mesh/advanced/autoRefineMesh/autoRefineMesh.C
index 2f99404f9a..52412a816f 100644
--- a/applications/utilities/mesh/advanced/autoRefineMesh/autoRefineMesh.C
+++ b/applications/utilities/mesh/advanced/autoRefineMesh/autoRefineMesh.C
@@ -58,7 +58,7 @@ using namespace Foam;
 
 
 // Max cos angle for edges to be considered aligned with axis.
-static const scalar edgeTol = 1E-3;
+static const scalar edgeTol = 1e-3;
 
 
 void writeSet(const cellSet& cells, const string& msg)
diff --git a/applications/utilities/mesh/advanced/collapseEdges/collapseEdges.C b/applications/utilities/mesh/advanced/collapseEdges/collapseEdges.C
index 0f32935fae..28acdde141 100644
--- a/applications/utilities/mesh/advanced/collapseEdges/collapseEdges.C
+++ b/applications/utilities/mesh/advanced/collapseEdges/collapseEdges.C
@@ -528,7 +528,7 @@ int main(int argc, char *argv[])
                 (
                     mesh,
                     boundaryPoint,
-                    1E-9,       // factor of largest face area
+                    1e-9,       // factor of largest face area
                     5,          // factor between smallest and largest edge on
                                 // face
                     collapser
diff --git a/applications/utilities/mesh/advanced/selectCells/edgeStats.C b/applications/utilities/mesh/advanced/selectCells/edgeStats.C
index 42627e7b6c..2311e72e2b 100644
--- a/applications/utilities/mesh/advanced/selectCells/edgeStats.C
+++ b/applications/utilities/mesh/advanced/selectCells/edgeStats.C
@@ -31,7 +31,7 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-const Foam::scalar Foam::edgeStats::edgeTol_ = 1E-3;
+const Foam::scalar Foam::edgeStats::edgeTol_ = 1e-3;
 
 
 
diff --git a/applications/utilities/mesh/generation/cv2DMesh/cv2DMesh.C b/applications/utilities/mesh/generation/cv2DMesh/cv2DMesh.C
index 6233edcab3..f1e0724cf4 100644
--- a/applications/utilities/mesh/generation/cv2DMesh/cv2DMesh.C
+++ b/applications/utilities/mesh/generation/cv2DMesh/cv2DMesh.C
@@ -209,7 +209,7 @@ int main(int argc, char *argv[])
             const pointField& points = pMesh.points();
 
             const boundBox& bb = pMesh.bounds();
-            const scalar mergeDim = 1E-4 * bb.minDim();
+            const scalar mergeDim = 1e-4 * bb.minDim();
 
             forAll(edges, edgeI)
             {
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshCalcDualMesh.C b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshCalcDualMesh.C
index e0fe697e88..ec81b1e944 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshCalcDualMesh.C
+++ b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshCalcDualMesh.C
@@ -561,7 +561,7 @@ Foam::label Foam::conformalVoronoiMesh::mergeCloseDualVertices
     scalar closenessTolerance = cvMeshControls().mergeClosenessCoeff();
 
     // Absolute distance for points to be considered coincident. Bit adhoc
-    // but points were seen with distSqr ~ 1E-30 which is SMALL^2. Add a few
+    // but points were seen with distSqr ~ 1e-30 which is SMALL^2. Add a few
     // digits to account for truncation errors.
     scalar coincidentDistanceSqr = sqr
     (
diff --git a/applications/utilities/mesh/generation/cvMesh/cvMeshBackgroundMesh/cvMeshBackgroundMesh.C b/applications/utilities/mesh/generation/cvMesh/cvMeshBackgroundMesh/cvMeshBackgroundMesh.C
index 72d05293b9..485c5568b4 100644
--- a/applications/utilities/mesh/generation/cvMesh/cvMeshBackgroundMesh/cvMeshBackgroundMesh.C
+++ b/applications/utilities/mesh/generation/cvMesh/cvMeshBackgroundMesh/cvMeshBackgroundMesh.C
@@ -51,7 +51,7 @@ using namespace Foam;
 
 // Tolerance (as fraction of the bounding box). Needs to be fairly lax since
 // usually meshes get written with limited precision (6 digits)
-static const scalar defaultMergeTol = 1E-6;
+static const scalar defaultMergeTol = 1e-6;
 
 // Get merging distance when matching face centres
 scalar getMergeDistance
@@ -397,7 +397,7 @@ int main(int argc, char *argv[])
         "mergeTol",
         "scalar",
         "specify the merge distance relative to the bounding box size "
-        "(default 1E-6)"
+        "(default 1e-6)"
     );
 
     #include "setRootCase.H"
diff --git a/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMesh.C b/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMesh.C
index 38a2430376..32981e901e 100644
--- a/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMesh.C
+++ b/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMesh.C
@@ -666,7 +666,7 @@ int main(int argc, char *argv[])
 
     const boundBox& bb = mesh.bounds();
     const vector span = bb.span();
-    const scalar mergeDim = 1E-4 * bb.minDim();
+    const scalar mergeDim = 1e-4 * bb.minDim();
 
     Info<< "Mesh bounding box : " << bb << nl
         << "        with span : " << span << nl
diff --git a/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMeshApp.C b/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMeshApp.C
index 5381c0b57a..667b0a9b2b 100644
--- a/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMeshApp.C
+++ b/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMeshApp.C
@@ -257,7 +257,7 @@ int main(int argc, char *argv[])
         const pointField& points = mesh().points();
 
         const boundBox& bb = mesh().bounds();
-        const scalar mergeDim = 1E-4 * bb.minDim();
+        const scalar mergeDim = 1e-4 * bb.minDim();
 
         forAll(edges, edgeI)
         {
diff --git a/applications/utilities/mesh/manipulation/checkMesh/checkGeometry.C b/applications/utilities/mesh/manipulation/checkMesh/checkGeometry.C
index a2f6a84d17..443576601d 100644
--- a/applications/utilities/mesh/manipulation/checkMesh/checkGeometry.C
+++ b/applications/utilities/mesh/manipulation/checkMesh/checkGeometry.C
@@ -41,8 +41,8 @@ Foam::label Foam::findOppositeWedge
             if
             (
                 pp.size() == wpp.size()
-             && mag(pp.axis() & wpp.axis()) >= (1-1E-3)
-             && mag(ppCosAngle - wppCosAngle) >= 1E-3
+             && mag(pp.axis() & wpp.axis()) >= (1-1e-3)
+             && mag(ppCosAngle - wppCosAngle) >= 1e-3
             )
             {
                 return patchI;
@@ -106,7 +106,7 @@ bool Foam::checkWedges
             );
 
 
-            if (mag(opp.axis() & pp.axis()) < (1-1E-3))
+            if (mag(opp.axis() & pp.axis()) < (1-1e-3))
             {
                 if (report)
                 {
diff --git a/applications/utilities/mesh/manipulation/polyDualMesh/meshDualiser.C b/applications/utilities/mesh/manipulation/polyDualMesh/meshDualiser.C
index 9ef58b47e4..81d3b31908 100644
--- a/applications/utilities/mesh/manipulation/polyDualMesh/meshDualiser.C
+++ b/applications/utilities/mesh/manipulation/polyDualMesh/meshDualiser.C
@@ -52,7 +52,7 @@ void Foam::meshDualiser::checkPolyTopoChange(const polyTopoChange& meshMod)
     label nUnique = mergePoints
     (
         points,
-        1E-6,
+        1e-6,
         false,
         oldToNew
     );
@@ -226,7 +226,7 @@ Foam::label Foam::meshDualiser::addInternalFace
         label nUnique = mergePoints
         (
             facePoints,
-            1E-6,
+            1e-6,
             false,
             oldToNew
         );
diff --git a/applications/utilities/mesh/manipulation/refineMesh/refineMesh.C b/applications/utilities/mesh/manipulation/refineMesh/refineMesh.C
index f10fbde116..1212b3b5ad 100644
--- a/applications/utilities/mesh/manipulation/refineMesh/refineMesh.C
+++ b/applications/utilities/mesh/manipulation/refineMesh/refineMesh.C
@@ -52,7 +52,7 @@ using namespace Foam;
 
 
 // Max cos angle for edges to be considered aligned with axis.
-static const scalar edgeTol = 1E-3;
+static const scalar edgeTol = 1e-3;
 
 
 // Calculate some edge statistics on mesh.
@@ -206,7 +206,7 @@ label twoDNess(const polyMesh& mesh)
             minLen = min(minLen, mesh.edges()[cEdges[i]].mag(mesh.points()));
         }
 
-        if (cellPlane.distance(ctrs[cellI]) > 1E-6*minLen)
+        if (cellPlane.distance(ctrs[cellI]) > 1e-6*minLen)
         {
             // Centres not in plane
             return  -1;
@@ -274,7 +274,7 @@ label twoDNess(const polyMesh& mesh)
 
             const scalarField cosAngle(mag(n/mag(n) & cellPlane.normal()));
 
-            if (mag(min(cosAngle) - max(cosAngle)) > 1E-6)
+            if (mag(min(cosAngle) - max(cosAngle)) > 1e-6)
             {
                 // cosAngle should be either ~1 over all faces (2D front and
                 // back) or ~0 (all other patches perp to 2D)
diff --git a/applications/utilities/parallelProcessing/reconstructParMesh/reconstructParMesh.C b/applications/utilities/parallelProcessing/reconstructParMesh/reconstructParMesh.C
index 4526e79e08..de40e93bad 100644
--- a/applications/utilities/parallelProcessing/reconstructParMesh/reconstructParMesh.C
+++ b/applications/utilities/parallelProcessing/reconstructParMesh/reconstructParMesh.C
@@ -55,7 +55,7 @@ using namespace Foam;
 
 // Tolerance (as fraction of the bounding box). Needs to be fairly lax since
 // usually meshes get written with limited precision (6 digits)
-static const scalar defaultMergeTol = 1E-7;
+static const scalar defaultMergeTol = 1e-7;
 
 
 static void renumber
@@ -290,7 +290,7 @@ int main(int argc, char *argv[])
         "mergeTol",
         "scalar",
         "specify the merge distance relative to the bounding box size "
-        "(default 1E-7)"
+        "(default 1e-7)"
     );
     argList::addBoolOption
     (
diff --git a/applications/utilities/parallelProcessing/redistributePar/redistributePar.C b/applications/utilities/parallelProcessing/redistributePar/redistributePar.C
index 4d02655955..9a337d7573 100644
--- a/applications/utilities/parallelProcessing/redistributePar/redistributePar.C
+++ b/applications/utilities/parallelProcessing/redistributePar/redistributePar.C
@@ -60,7 +60,7 @@ Description
 
 // Tolerance (as fraction of the bounding box). Needs to be fairly lax since
 // usually meshes get written with limited precision (6 digits)
-static const scalar defaultMergeTol = 1E-6;
+static const scalar defaultMergeTol = 1e-6;
 
 
 //// Read mesh if available. Otherwise create empty mesh with same non-proc
@@ -721,7 +721,7 @@ int main(int argc, char *argv[])
         "mergeTol",
         "scalar",
         "specify the merge distance relative to the bounding box size "
-        "(default 1E-6)"
+        "(default 1e-6)"
     );
 #   include "setRootCase.H"
 
diff --git a/applications/utilities/preProcessing/mapFields/mapLagrangian.C b/applications/utilities/preProcessing/mapFields/mapLagrangian.C
index f73029529e..6f9545dc7b 100644
--- a/applications/utilities/preProcessing/mapFields/mapLagrangian.C
+++ b/applications/utilities/preProcessing/mapFields/mapLagrangian.C
@@ -32,7 +32,7 @@ License
 namespace Foam
 {
 
-static const scalar perturbFactor = 1E-6;
+static const scalar perturbFactor = 1e-6;
 
 
 // Special version of findCell that generates a cell guaranteed to be
diff --git a/applications/utilities/preProcessing/viewFactorsGen/searchingEngine.H b/applications/utilities/preProcessing/viewFactorsGen/searchingEngine.H
index fad039b3b2..a48fd193f1 100644
--- a/applications/utilities/preProcessing/viewFactorsGen/searchingEngine.H
+++ b/applications/utilities/preProcessing/viewFactorsGen/searchingEngine.H
@@ -7,7 +7,7 @@ List<treeBoundBox> meshBb
     treeBoundBox
     (
         boundBox(coarseMesh.points(), false)
-    ).extend(rndGen, 1E-3)
+    ).extend(rndGen, 1e-3)
 );
 
 // Dummy bounds dictionary
diff --git a/applications/utilities/surface/surfaceCheck/surfaceCheck.C b/applications/utilities/surface/surfaceCheck/surfaceCheck.C
index 09a030d77b..f29f05169a 100644
--- a/applications/utilities/surface/surfaceCheck/surfaceCheck.C
+++ b/applications/utilities/surface/surfaceCheck/surfaceCheck.C
@@ -367,7 +367,7 @@ int main(int argc, char *argv[])
 
             forAll(triQ, faceI)
             {
-                if (triQ[faceI] < 1E-11)
+                if (triQ[faceI] < 1e-11)
                 {
                     problemFaces.append(faceI);
                 }
@@ -427,9 +427,9 @@ int main(int argc, char *argv[])
         const pointField& localPoints = surf.localPoints();
 
         const boundBox bb(localPoints);
-        scalar smallDim = 1E-6 * bb.mag();
+        scalar smallDim = 1e-6 * bb.mag();
 
-        Info<< "Checking for points less than 1E-6 of bounding box ("
+        Info<< "Checking for points less than 1e-6 of bounding box ("
             << bb.span() << " meter) apart."
             << endl;
 
diff --git a/applications/utilities/surface/surfaceRedistributePar/surfaceRedistributePar.C b/applications/utilities/surface/surfaceRedistributePar/surfaceRedistributePar.C
index 98c56dabd6..7d943df644 100644
--- a/applications/utilities/surface/surfaceRedistributePar/surfaceRedistributePar.C
+++ b/applications/utilities/surface/surfaceRedistributePar/surfaceRedistributePar.C
@@ -159,7 +159,7 @@ int main(int argc, char *argv[])
             treeBoundBox
             (
                 boundBox(mesh.points(), false)
-            ).extend(rndGen, 1E-3)
+            ).extend(rndGen, 1e-3)
         );
         Pstream::gatherList(meshBb);
         Pstream::scatterList(meshBb);
diff --git a/applications/utilities/surface/surfaceSubset/surfaceSubset.C b/applications/utilities/surface/surfaceSubset/surfaceSubset.C
index 89f200283f..fcc77e9005 100644
--- a/applications/utilities/surface/surfaceSubset/surfaceSubset.C
+++ b/applications/utilities/surface/surfaceSubset/surfaceSubset.C
@@ -254,7 +254,7 @@ int main(int argc, char *argv[])
                 selectSurf,
                 indexedOctree<treeDataTriSurface>::perturbTol()
             ),
-            bb.extend(rndGen, 1E-4),    // slightly randomize bb
+            bb.extend(rndGen, 1e-4),    // slightly randomize bb
             8,      // maxLevel
             10,     // leafsize
             3.0     // duplicity
diff --git a/src/OSspecific/POSIX/clockTime/clockTime.C b/src/OSspecific/POSIX/clockTime/clockTime.C
index 1081019c4f..ca55e92f08 100644
--- a/src/OSspecific/POSIX/clockTime/clockTime.C
+++ b/src/OSspecific/POSIX/clockTime/clockTime.C
@@ -36,7 +36,7 @@ void Foam::clockTime::getTime(timeType& t)
 
 double Foam::clockTime::timeDifference(const timeType& beg, const timeType& end)
 {
-    return end.tv_sec - beg.tv_sec + 1E-6*(end.tv_usec - beg.tv_usec);
+    return end.tv_sec - beg.tv_sec + 1e-6*(end.tv_usec - beg.tv_usec);
 }
 
 
diff --git a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C
index 3ccbdd4043..2122b282d7 100644
--- a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C
+++ b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C
@@ -44,7 +44,7 @@ License
 defineTypeNameAndDebug(Foam::globalMeshData, 0);
 
 // Geometric matching tolerance. Factor of mesh bounding box.
-const Foam::scalar Foam::globalMeshData::matchTol_ = 1E-8;
+const Foam::scalar Foam::globalMeshData::matchTol_ = 1e-8;
 
 namespace Foam
 {
diff --git a/src/OpenFOAM/meshes/polyMesh/polyMesh.C b/src/OpenFOAM/meshes/polyMesh/polyMesh.C
index 8877cdafcf..cd4493c90c 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyMesh.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyMesh.C
@@ -893,7 +893,7 @@ Foam::polyMesh::cellTree() const
 
         Random rndGen(261782);
 
-        overallBb = overallBb.extend(rndGen, 1E-4);
+        overallBb = overallBb.extend(rndGen, 1e-4);
         overallBb.min() -= point(ROOTVSMALL, ROOTVSMALL, ROOTVSMALL);
         overallBb.max() += point(ROOTVSMALL, ROOTVSMALL, ROOTVSMALL);
 
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/coupled/coupledPolyPatch.C b/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/coupled/coupledPolyPatch.C
index ca7155704d..6625f022cb 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/coupled/coupledPolyPatch.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/coupled/coupledPolyPatch.C
@@ -34,7 +34,7 @@ namespace Foam
 {
     defineTypeNameAndDebug(coupledPolyPatch, 0);
 
-    const scalar coupledPolyPatch::defaultMatchTol_ = 1E-4;
+    const scalar coupledPolyPatch::defaultMatchTol_ = 1e-4;
 
     template<>
     const char* NamedEnum<coupledPolyPatch::transformType, 4>::names[] =
diff --git a/src/combustionModels/FSD/FSD.H b/src/combustionModels/FSD/FSD.H
index 0a132d04fe..ce1a64cab7 100644
--- a/src/combustionModels/FSD/FSD.H
+++ b/src/combustionModels/FSD/FSD.H
@@ -48,7 +48,7 @@ Description
     release.
 
     If the turbulent fluctuation of the mixture fraction at the sub-grid level
-    is large (>1E-04) then a beta pdf is used for filtering.
+    is large (>1e-04) then a beta pdf is used for filtering.
 
     At the moment the flame area combustion model is only fit to work in a LES
     frame work. In RAS the subgrid fluctiuation has to be solved by an extra
diff --git a/src/dynamicMesh/boundaryMesh/boundaryMesh.C b/src/dynamicMesh/boundaryMesh/boundaryMesh.C
index 96906926cb..e133b5f491 100644
--- a/src/dynamicMesh/boundaryMesh/boundaryMesh.C
+++ b/src/dynamicMesh/boundaryMesh/boundaryMesh.C
@@ -43,7 +43,7 @@ defineTypeNameAndDebug(Foam::boundaryMesh, 0);
 const Foam::vector Foam::boundaryMesh::splitNormal_(3, 2, 1);
 
 // Distance to face tolerance for getNearest
-const Foam::scalar Foam::boundaryMesh::distanceTol_ = 1E-2;
+const Foam::scalar Foam::boundaryMesh::distanceTol_ = 1e-2;
 
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
@@ -871,11 +871,11 @@ Foam::labelList Foam::boundaryMesh::getNearest
     {
         scalar sign = mesh().faceNormals()[bFaceI] & splitNormal_;
 
-        if (sign > -1E-5)
+        if (sign > -1e-5)
         {
             rightFaces.append(bFaceI);
         }
-        if (sign < 1E-5)
+        if (sign < 1e-5)
         {
             leftFaces.append(bFaceI);
         }
@@ -909,7 +909,7 @@ Foam::labelList Foam::boundaryMesh::getNearest
 
     // Extend domain slightly (also makes it 3D if was 2D)
     // Note asymmetry to avoid having faces align with octree cubes.
-    scalar tol = 1E-6 * overallBb.avgDim();
+    scalar tol = 1e-6 * overallBb.avgDim();
 
     point& bbMin = overallBb.min();
     bbMin.x() -= tol;
diff --git a/src/dynamicMesh/meshCut/cellLooper/geomCellLooper.C b/src/dynamicMesh/meshCut/cellLooper/geomCellLooper.C
index 394ca197ed..b659f5b515 100644
--- a/src/dynamicMesh/meshCut/cellLooper/geomCellLooper.C
+++ b/src/dynamicMesh/meshCut/cellLooper/geomCellLooper.C
@@ -39,7 +39,7 @@ License
 
 // Extension factor of edges to make sure we catch intersections through
 // edge endpoints
-const Foam::scalar Foam::geomCellLooper::pointEqualTol_ = 1E-3;
+const Foam::scalar Foam::geomCellLooper::pointEqualTol_ = 1e-3;
 
 
 // Snap cuts through edges onto edge endpoints. Fraction of edge length.
diff --git a/src/dynamicMesh/meshCut/directions/directions.C b/src/dynamicMesh/meshCut/directions/directions.C
index e35a8c0efd..6872057283 100644
--- a/src/dynamicMesh/meshCut/directions/directions.C
+++ b/src/dynamicMesh/meshCut/directions/directions.C
@@ -125,7 +125,7 @@ void Foam::directions::check2D
 {
     if (correct2DPtr)
     {
-        if (mag(correct2DPtr->planeNormal() & vec) > 1E-6)
+        if (mag(correct2DPtr->planeNormal() & vec) > 1e-6)
         {
             FatalErrorIn("check2D") << "Specified vector " << vec
                 << "is not normal to plane defined in dynamicMeshDict."
diff --git a/src/dynamicMesh/motionSmoother/motionSmoother.C b/src/dynamicMesh/motionSmoother/motionSmoother.C
index 6542432aea..cf686b7dd8 100644
--- a/src/dynamicMesh/motionSmoother/motionSmoother.C
+++ b/src/dynamicMesh/motionSmoother/motionSmoother.C
@@ -900,7 +900,7 @@ Foam::tmp<Foam::scalarField> Foam::motionSmoother::movePoints
     {
         Pout<< "motionSmoother::movePoints : testing sync of newPoints."
             << endl;
-        testSyncPositions(newPoints, 1E-6*mesh_.bounds().mag());
+        testSyncPositions(newPoints, 1e-6*mesh_.bounds().mag());
     }
 
     // Move actual mesh points. Make sure to delete tetBasePtIs so it
@@ -1051,7 +1051,7 @@ bool Foam::motionSmoother::scaleMesh
                 totalDisplacement,
                 maxMagEqOp(),
                 vector::zero,   // null value
-                1E-6*mesh_.bounds().mag()
+                1e-6*mesh_.bounds().mag()
             );
         }
 
diff --git a/src/dynamicMesh/perfectInterface/perfectInterface.C b/src/dynamicMesh/perfectInterface/perfectInterface.C
index bbc9b6199a..8ea1abde59 100644
--- a/src/dynamicMesh/perfectInterface/perfectInterface.C
+++ b/src/dynamicMesh/perfectInterface/perfectInterface.C
@@ -54,7 +54,7 @@ namespace Foam
 
 
 // Tolerance used as fraction of minimum edge length.
-const Foam::scalar Foam::perfectInterface::tol_ = 1E-3;
+const Foam::scalar Foam::perfectInterface::tol_ = 1e-3;
 
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
diff --git a/src/dynamicMesh/polyMeshAdder/faceCoupleInfo.C b/src/dynamicMesh/polyMeshAdder/faceCoupleInfo.C
index 01d0103a64..2af617ff8c 100644
--- a/src/dynamicMesh/polyMeshAdder/faceCoupleInfo.C
+++ b/src/dynamicMesh/polyMeshAdder/faceCoupleInfo.C
@@ -36,7 +36,7 @@ License
 
 defineTypeNameAndDebug(Foam::faceCoupleInfo, 0);
 
-const Foam::scalar Foam::faceCoupleInfo::angleTol_ = 1E-3;
+const Foam::scalar Foam::faceCoupleInfo::angleTol_ = 1e-3;
 
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
@@ -1014,7 +1014,7 @@ void Foam::faceCoupleInfo::findSlavesCoveringMaster
             mesh0,
             bndFaces                    // boundary faces only
         ),
-        overallBb.extend(rndGen, 1E-4), // overall search domain
+        overallBb.extend(rndGen, 1e-4), // overall search domain
         8,                              // maxLevel
         10,                             // leafsize
         3.0                             // duplicity
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/faceCollapser.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/faceCollapser.C
index b1e928e96b..ec7053bd67 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/faceCollapser.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/faceCollapser.C
@@ -277,7 +277,7 @@ void Foam::faceCollapser::setRefinement
             if (w <= dist[fpMin1])
             {
                 // Offset.
-                w = dist[fpMin1] + 1E-6*(dist[fpB] - dist[fpA]);
+                w = dist[fpMin1] + 1e-6*(dist[fpB] - dist[fpA]);
 
                 point newPoint
                 (
@@ -330,7 +330,7 @@ void Foam::faceCollapser::setRefinement
             if (w <= dist[fpMin1])
             {
                 // Offset.
-                w = dist[fpMin1] + 1E-6*(dist[fpB] - dist[fpA]);
+                w = dist[fpMin1] + 1e-6*(dist[fpB] - dist[fpA]);
 
                 point newPoint
                 (
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8.C
index b577a17177..827913a1c1 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8.C
@@ -4452,7 +4452,7 @@ void Foam::hexRef8::distribute(const mapDistributePolyMesh& map)
 
 void Foam::hexRef8::checkMesh() const
 {
-    const scalar smallDim = 1E-6 * mesh_.bounds().mag();
+    const scalar smallDim = 1e-6 * mesh_.bounds().mag();
 
     if (debug)
     {
diff --git a/src/edgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMesh.C b/src/edgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMesh.C
index cd0ac4fc94..b708a81428 100644
--- a/src/edgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMesh.C
+++ b/src/edgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMesh.C
@@ -923,7 +923,7 @@ Foam::extendedFeatureEdgeMesh::pointTree() const
         // geometry there are less face/edge aligned items.
         treeBoundBox bb
         (
-            treeBoundBox(points()).extend(rndGen, 1E-4)
+            treeBoundBox(points()).extend(rndGen, 1e-4)
         );
 
         bb.min() -= point(ROOTVSMALL, ROOTVSMALL, ROOTVSMALL);
@@ -963,7 +963,7 @@ Foam::extendedFeatureEdgeMesh::edgeTree() const
         // geometry there are less face/edge aligned items.
         treeBoundBox bb
         (
-            treeBoundBox(points()).extend(rndGen, 1E-4)
+            treeBoundBox(points()).extend(rndGen, 1e-4)
         );
 
         bb.min() -= point(ROOTVSMALL, ROOTVSMALL, ROOTVSMALL);
@@ -1007,7 +1007,7 @@ Foam::extendedFeatureEdgeMesh::edgeTreesByType() const
         // geometry there are less face/edge aligned items.
         treeBoundBox bb
         (
-            treeBoundBox(points()).extend(rndGen, 1E-4)
+            treeBoundBox(points()).extend(rndGen, 1e-4)
         );
 
         bb.min() -= point(ROOTVSMALL, ROOTVSMALL, ROOTVSMALL);
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.C
index 1831bd903d..16704d4adc 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.C
@@ -93,7 +93,7 @@ timeVaryingMappedFixedValueFvPatchField
     fixedValueFvPatchField<Type>(p, iF),
     fieldTableName_(iF.name()),
     setAverage_(readBool(dict.lookup("setAverage"))),
-    perturb_(dict.lookupOrDefault("perturb", 1E-5)),
+    perturb_(dict.lookupOrDefault("perturb", 1e-5)),
     mapperPtr_(NULL),
     sampleTimes_(0),
     startSampleTime_(-1),
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.H
index 1494efec35..82525ec49a 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.H
@@ -45,7 +45,7 @@ Description
             // Maintain average to that of the supplied values
             setAverage      false;
 
-            // Optional: change perturbation (default 1E-5) to avoid any ties
+            // Optional: change perturbation (default 1e-5) to avoid any ties
             // in triangulating regular geometries.
             //perturb       0.0;
 
diff --git a/src/fvMotionSolver/pointPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValuePointPatchField.C b/src/fvMotionSolver/pointPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValuePointPatchField.C
index e1bdfc0910..1fa44b5d64 100644
--- a/src/fvMotionSolver/pointPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValuePointPatchField.C
+++ b/src/fvMotionSolver/pointPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValuePointPatchField.C
@@ -92,7 +92,7 @@ timeVaryingMappedFixedValuePointPatchField
     fixedValuePointPatchField<Type>(p, iF),
     fieldTableName_(iF.name()),
     setAverage_(readBool(dict.lookup("setAverage"))),
-    perturb_(dict.lookupOrDefault("perturb", 1E-5)),
+    perturb_(dict.lookupOrDefault("perturb", 1e-5)),
     mapperPtr_(NULL),
     sampleTimes_(0),
     startSampleTime_(-1),
diff --git a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinement.C b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinement.C
index e12394624b..2890577c24 100644
--- a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinement.C
+++ b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinement.C
@@ -1881,7 +1881,7 @@ void Foam::meshRefinement::distribute(const mapDistributePolyMesh& map)
         List<treeBoundBox> meshBb(1);
         treeBoundBox& bb = meshBb[0];
         bb = treeBoundBox(mesh_.points());
-        bb = bb.extend(rndGen, 1E-4);
+        bb = bb.extend(rndGen, 1e-4);
 
         // Distribute all geometry (so refinementSurfaces and shellSurfaces)
         searchableSurfaces& geometry =
diff --git a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementBaffles.C b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementBaffles.C
index 076fd11e2f..977f75dbd4 100644
--- a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementBaffles.C
+++ b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementBaffles.C
@@ -1073,7 +1073,7 @@ void Foam::meshRefinement::findCellZoneGeometric
                 label nei = faceNeighbour[faceI];
                 const point& neiCc = cellCentres[nei];
                 // Perturbed cc
-                const vector d = 1E-4*(neiCc - ownCc);
+                const vector d = 1e-4*(neiCc - ownCc);
                 candidatePoints[nCandidates++] = ownCc-d;
                 candidatePoints[nCandidates++] = neiCc+d;
             }
@@ -1081,7 +1081,7 @@ void Foam::meshRefinement::findCellZoneGeometric
             {
                 const point& neiFc = mesh_.faceCentres()[faceI];
                 // Perturbed cc
-                const vector d = 1E-4*(neiFc - ownCc);
+                const vector d = 1e-4*(neiFc - ownCc);
                 candidatePoints[nCandidates++] = ownCc-d;
             }
         }
diff --git a/src/mesh/autoMesh/autoHexMesh/refinementFeatures/refinementFeatures.C b/src/mesh/autoMesh/autoHexMesh/refinementFeatures/refinementFeatures.C
index 1c88348f99..f832f96ce9 100644
--- a/src/mesh/autoMesh/autoHexMesh/refinementFeatures/refinementFeatures.C
+++ b/src/mesh/autoMesh/autoHexMesh/refinementFeatures/refinementFeatures.C
@@ -93,7 +93,7 @@ Foam::refinementFeatures::refinementFeatures
 
         // Slightly extended bb. Slightly off-centred just so on symmetric
         // geometry there are less face/edge aligned items.
-        bb = bb.extend(rndGen, 1E-4);
+        bb = bb.extend(rndGen, 1e-4);
         bb.min() -= point(ROOTVSMALL, ROOTVSMALL, ROOTVSMALL);
         bb.max() += point(ROOTVSMALL, ROOTVSMALL, ROOTVSMALL);
 
diff --git a/src/meshTools/cellClassification/cellClassification.C b/src/meshTools/cellClassification/cellClassification.C
index 4a33b4321e..32baa1710a 100644
--- a/src/meshTools/cellClassification/cellClassification.C
+++ b/src/meshTools/cellClassification/cellClassification.C
@@ -146,7 +146,7 @@ Foam::boolList Foam::cellClassification::markFaces
     treeBoundBox allBb(mesh_.points());
 
     // Extend domain slightly (also makes it 3D if was 2D)
-    scalar tol = 1E-6 * allBb.avgDim();
+    scalar tol = 1e-6 * allBb.avgDim();
 
     point& bbMin = allBb.min();
     bbMin.x() -= tol;
@@ -187,7 +187,7 @@ Foam::boolList Foam::cellClassification::markFaces
 
         vector edgeNormal(end - start);
         const scalar edgeMag = mag(edgeNormal);
-        const vector smallVec = 1E-9*edgeNormal;
+        const vector smallVec = 1e-9*edgeNormal;
 
         edgeNormal /= edgeMag+VSMALL;
 
diff --git a/src/meshTools/indexedOctree/treeDataFace.C b/src/meshTools/indexedOctree/treeDataFace.C
index daa968fd5c..9e64e28d33 100644
--- a/src/meshTools/indexedOctree/treeDataFace.C
+++ b/src/meshTools/indexedOctree/treeDataFace.C
@@ -31,7 +31,7 @@ License
 
 defineTypeNameAndDebug(Foam::treeDataFace, 0);
 
-Foam::scalar Foam::treeDataFace::tolSqr = sqr(1E-6);
+Foam::scalar Foam::treeDataFace::tolSqr = sqr(1e-6);
 
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
diff --git a/src/meshTools/indexedOctree/treeDataPrimitivePatch.C b/src/meshTools/indexedOctree/treeDataPrimitivePatch.C
index bc9c0d4287..d477c96a95 100644
--- a/src/meshTools/indexedOctree/treeDataPrimitivePatch.C
+++ b/src/meshTools/indexedOctree/treeDataPrimitivePatch.C
@@ -38,7 +38,7 @@ template
 >
 Foam::scalar
 Foam::treeDataPrimitivePatch<Face, FaceList, PointField, PointType>::
-tolSqr = sqr(1E-6);
+tolSqr = sqr(1e-6);
 
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
diff --git a/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBase.C b/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBase.C
index 79db701887..73d64b40f3 100644
--- a/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBase.C
+++ b/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBase.C
@@ -265,7 +265,7 @@ void Foam::mappedPatchBase::findSamples
                     treeBoundBox(pp.points(), pp.meshPoints()).extend
                     (
                         rndGen,
-                        1E-4
+                        1e-4
                     )
                 );
                 patchBb.min() -= point(ROOTVSMALL, ROOTVSMALL, ROOTVSMALL);
diff --git a/src/meshTools/meshSearch/meshSearch.C b/src/meshTools/meshSearch/meshSearch.C
index ab0975a43c..9524515531 100644
--- a/src/meshTools/meshSearch/meshSearch.C
+++ b/src/meshTools/meshSearch/meshSearch.C
@@ -35,7 +35,7 @@ License
 
 defineTypeNameAndDebug(Foam::meshSearch, 0);
 
-Foam::scalar Foam::meshSearch::tol_ = 1E-3;
+Foam::scalar Foam::meshSearch::tol_ = 1e-3;
 
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
@@ -567,7 +567,7 @@ const Foam::indexedOctree<Foam::treeDataFace>& Foam::meshSearch::boundaryTree()
 
             treeBoundBox& overallBb = overallBbPtr_();
             // Extend slightly and make 3D
-            overallBb = overallBb.extend(rndGen, 1E-4);
+            overallBb = overallBb.extend(rndGen, 1e-4);
             overallBb.min() -= point(ROOTVSMALL, ROOTVSMALL, ROOTVSMALL);
             overallBb.max() += point(ROOTVSMALL, ROOTVSMALL, ROOTVSMALL);
         }
@@ -620,7 +620,7 @@ const
 
             treeBoundBox& overallBb = overallBbPtr_();
             // Extend slightly and make 3D
-            overallBb = overallBb.extend(rndGen, 1E-4);
+            overallBb = overallBb.extend(rndGen, 1e-4);
             overallBb.min() -= point(ROOTVSMALL, ROOTVSMALL, ROOTVSMALL);
             overallBb.max() += point(ROOTVSMALL, ROOTVSMALL, ROOTVSMALL);
         }
diff --git a/src/meshTools/searchableSurface/searchablePlate.C b/src/meshTools/searchableSurface/searchablePlate.C
index 604afc6f28..28287c2612 100644
--- a/src/meshTools/searchableSurface/searchablePlate.C
+++ b/src/meshTools/searchableSurface/searchablePlate.C
@@ -185,8 +185,8 @@ Foam::pointIndexHit Foam::searchablePlate::findLine
     if (info.hit())
     {
         treeBoundBox bb(origin_, origin_+span_);
-        bb.min()[normalDir_] -= 1E-6;
-        bb.max()[normalDir_] += 1E-6;
+        bb.min()[normalDir_] -= 1e-6;
+        bb.max()[normalDir_] += 1e-6;
 
         if (!bb.contains(info.hitPoint()))
         {
diff --git a/src/meshTools/searchableSurface/searchableSurfaceWithGaps.C b/src/meshTools/searchableSurface/searchableSurfaceWithGaps.C
index dd74c17135..9509065eaa 100644
--- a/src/meshTools/searchableSurface/searchableSurfaceWithGaps.C
+++ b/src/meshTools/searchableSurface/searchableSurfaceWithGaps.C
@@ -242,7 +242,7 @@ void Foam::searchableSurfaceWithGaps::findLine
         // test in pairs: only if both perturbations hit something
         // do we accept the hit.
 
-        const vectorField smallVec(1E-6*(compactEnd-compactStart));
+        const vectorField smallVec(1e-6*(compactEnd-compactStart));
 
         List<pointIndexHit> plusInfo;
         surface().findLine
@@ -296,7 +296,7 @@ void Foam::searchableSurfaceWithGaps::findLine
             offset0.setSize(plusMissMap.size());
             offset1.setSize(plusMissMap.size());
 
-            const vectorField smallVec(1E-6*(compactEnd-compactStart));
+            const vectorField smallVec(1e-6*(compactEnd-compactStart));
 
             surface().findLine
             (
diff --git a/src/meshTools/searchableSurface/triSurfaceMesh.C b/src/meshTools/searchableSurface/triSurfaceMesh.C
index 703d8153d1..67ee03364b 100644
--- a/src/meshTools/searchableSurface/triSurfaceMesh.C
+++ b/src/meshTools/searchableSurface/triSurfaceMesh.C
@@ -542,7 +542,7 @@ Foam::triSurfaceMesh::tree() const
 
         // Slightly extended bb. Slightly off-centred just so on symmetric
         // geometry there are less face/edge aligned items.
-        bb = bb.extend(rndGen, 1E-4);
+        bb = bb.extend(rndGen, 1e-4);
         bb.min() -= point(ROOTVSMALL, ROOTVSMALL, ROOTVSMALL);
         bb.max() += point(ROOTVSMALL, ROOTVSMALL, ROOTVSMALL);
 
@@ -594,7 +594,7 @@ Foam::triSurfaceMesh::edgeTree() const
         // Slightly extended bb. Slightly off-centred just so on symmetric
         // geometry there are less face/edge aligned items.
 
-        bb = bb.extend(rndGen, 1E-4);
+        bb = bb.extend(rndGen, 1e-4);
         bb.min() -= point(ROOTVSMALL, ROOTVSMALL, ROOTVSMALL);
         bb.max() += point(ROOTVSMALL, ROOTVSMALL, ROOTVSMALL);
 
diff --git a/src/meshTools/triSurface/booleanOps/surfaceIntersection/surfaceIntersection.C b/src/meshTools/triSurface/booleanOps/surfaceIntersection/surfaceIntersection.C
index 9830bd4e6f..41350cec64 100644
--- a/src/meshTools/triSurface/booleanOps/surfaceIntersection/surfaceIntersection.C
+++ b/src/meshTools/triSurface/booleanOps/surfaceIntersection/surfaceIntersection.C
@@ -569,7 +569,7 @@ void Foam::surfaceIntersection::doCutEdges
     List<DynamicList<label> >& surfEdgeCuts
 )
 {
-    scalar oldTol = intersection::setPlanarTol(1E-3);
+    scalar oldTol = intersection::setPlanarTol(1e-3);
 
     const pointField& surf1Pts = surf1.localPoints();
 
diff --git a/src/meshTools/triSurface/triSurfaceSearch/triSurfaceSearch.C b/src/meshTools/triSurface/triSurfaceSearch/triSurfaceSearch.C
index e72ed09c8d..0a65133531 100644
--- a/src/meshTools/triSurface/triSurfaceSearch/triSurfaceSearch.C
+++ b/src/meshTools/triSurface/triSurfaceSearch/triSurfaceSearch.C
@@ -54,7 +54,7 @@ Foam::triSurfaceSearch::triSurfaceSearch(const triSurface& surface)
         treeBoundBox(surface_.points(), surface_.meshPoints()).extend
         (
             rndGen,
-            1E-4
+            1e-4
         )
     );
     treeBb.min() -= point(ROOTVSMALL, ROOTVSMALL, ROOTVSMALL);
diff --git a/src/meshTools/triSurface/triSurfaceTools/triSurfaceTools.C b/src/meshTools/triSurface/triSurfaceTools/triSurfaceTools.C
index 022d6fb821..e8bb749027 100644
--- a/src/meshTools/triSurface/triSurfaceTools/triSurfaceTools.C
+++ b/src/meshTools/triSurface/triSurfaceTools/triSurfaceTools.C
@@ -870,7 +870,7 @@ Foam::surfaceLocation Foam::triSurfaceTools::cutEdge
     {
         d[i] /= norm;
 
-        if (mag(d[i]) < 1E-6)
+        if (mag(d[i]) < 1e-6)
         {
             d[i] = 0.0;
         }
diff --git a/src/parallel/decompose/decompositionMethods/hierarchGeomDecomp/hierarchGeomDecomp.C b/src/parallel/decompose/decompositionMethods/hierarchGeomDecomp/hierarchGeomDecomp.C
index 5380ad40bd..929b7bf1c3 100644
--- a/src/parallel/decompose/decompositionMethods/hierarchGeomDecomp/hierarchGeomDecomp.C
+++ b/src/parallel/decompose/decompositionMethods/hierarchGeomDecomp/hierarchGeomDecomp.C
@@ -701,7 +701,7 @@ Foam::labelList Foam::hierarchGeomDecomp::decompose
     label allSize = points.size();
     reduce(allSize, sumOp<label>());
 
-    const label sizeTol = max(1, label(1E-3*allSize/nProcessors_));
+    const label sizeTol = max(1, label(1e-3*allSize/nProcessors_));
 
     // Sort recursive
     sortComponent
@@ -742,7 +742,7 @@ Foam::labelList Foam::hierarchGeomDecomp::decompose
     label allSize = points.size();
     reduce(allSize, sumOp<label>());
 
-    const label sizeTol = max(1, label(1E-3*allSize/nProcessors_));
+    const label sizeTol = max(1, label(1e-3*allSize/nProcessors_));
 
     // Sort recursive
     sortComponent
diff --git a/src/postProcessing/functionObjects/field/wallBoundedStreamLine/wallBoundedParticle.C b/src/postProcessing/functionObjects/field/wallBoundedStreamLine/wallBoundedParticle.C
index 99e9eb4a08..b89cf0e650 100644
--- a/src/postProcessing/functionObjects/field/wallBoundedStreamLine/wallBoundedParticle.C
+++ b/src/postProcessing/functionObjects/field/wallBoundedStreamLine/wallBoundedParticle.C
@@ -62,7 +62,7 @@ namespace Foam
 //
 //    pointHit ph(ln.nearestDist(position()));
 //
-//    if (ph.distance() > 1E-6)
+//    if (ph.distance() > 1e-6)
 //    {
 //        FatalErrorIn
 //        (
diff --git a/src/sampling/probes/patchProbes.C b/src/sampling/probes/patchProbes.C
index 4d81b9a661..6d6ab0b0b8 100644
--- a/src/sampling/probes/patchProbes.C
+++ b/src/sampling/probes/patchProbes.C
@@ -73,7 +73,7 @@ void Foam::patchProbes::findElements(const fvMesh& mesh)
 
         treeBoundBox overallBb(pp.points());
         Random rndGen(123456);
-        overallBb = overallBb.extend(rndGen, 1E-4);
+        overallBb = overallBb.extend(rndGen, 1e-4);
         overallBb.min() -= point(ROOTVSMALL, ROOTVSMALL, ROOTVSMALL);
         overallBb.max() += point(ROOTVSMALL, ROOTVSMALL, ROOTVSMALL);
 
diff --git a/src/sampling/sampledSet/patchCloud/patchCloudSet.C b/src/sampling/sampledSet/patchCloud/patchCloudSet.C
index 2d2317a087..f955769ca3 100644
--- a/src/sampling/sampledSet/patchCloud/patchCloudSet.C
+++ b/src/sampling/sampledSet/patchCloud/patchCloudSet.C
@@ -94,7 +94,7 @@ void Foam::patchCloudSet::calcSamples
     // Not very random
     Random rndGen(123456);
     // Make bb asymetric just to avoid problems on symmetric meshes
-    bb = bb.extend(rndGen, 1E-4);
+    bb = bb.extend(rndGen, 1e-4);
 
     // Make sure bb is 3D.
     bb.min() -= point(ROOTVSMALL, ROOTVSMALL, ROOTVSMALL);
diff --git a/src/sampling/sampledSet/patchSeed/patchSeedSet.C b/src/sampling/sampledSet/patchSeed/patchSeedSet.C
index 0393b5a85a..d06dd95f4b 100644
--- a/src/sampling/sampledSet/patchSeed/patchSeedSet.C
+++ b/src/sampling/sampledSet/patchSeed/patchSeedSet.C
@@ -149,7 +149,7 @@ void Foam::patchSeedSet::calcSamples
             const point& cc = mesh().cellCentres()[cellI];
             samplingPts.append
             (
-                info.hitPoint() + 1E-1*(cc-info.hitPoint())
+                info.hitPoint() + 1e-1*(cc-info.hitPoint())
             );
         }
         else
diff --git a/src/sampling/sampledSurface/isoSurface/isoSurface.H b/src/sampling/sampledSurface/isoSurface/isoSurface.H
index 4f8741c394..7e52bd26ed 100644
--- a/src/sampling/sampledSurface/isoSurface/isoSurface.H
+++ b/src/sampling/sampledSurface/isoSurface/isoSurface.H
@@ -407,7 +407,7 @@ public:
             const scalarField& pointIsoVals,
             const scalar iso,
             const bool regularise,
-            const scalar mergeTol = 1E-6    // fraction of bounding box
+            const scalar mergeTol = 1e-6    // fraction of bounding box
         );
 
 
diff --git a/src/sampling/sampledSurface/isoSurface/isoSurfaceCell.H b/src/sampling/sampledSurface/isoSurface/isoSurfaceCell.H
index 9c3c2990c8..67f68d81c7 100644
--- a/src/sampling/sampledSurface/isoSurface/isoSurfaceCell.H
+++ b/src/sampling/sampledSurface/isoSurface/isoSurfaceCell.H
@@ -336,7 +336,7 @@ public:
             const scalarField& pointValues,
             const scalar iso,
             const bool regularise,
-            const scalar mergeTol = 1E-6    // fraction of bounding box
+            const scalar mergeTol = 1e-6    // fraction of bounding box
         );
 
 
diff --git a/src/sampling/sampledSurface/isoSurface/sampledIsoSurface.C b/src/sampling/sampledSurface/isoSurface/sampledIsoSurface.C
index a970fb7c5f..92a588ce50 100644
--- a/src/sampling/sampledSurface/isoSurface/sampledIsoSurface.C
+++ b/src/sampling/sampledSurface/isoSurface/sampledIsoSurface.C
@@ -401,7 +401,7 @@ Foam::sampledIsoSurface::sampledIsoSurface
     sampledSurface(name, mesh, dict),
     isoField_(dict.lookup("isoField")),
     isoVal_(readScalar(dict.lookup("isoValue"))),
-    mergeTol_(dict.lookupOrDefault("mergeTol", 1E-6)),
+    mergeTol_(dict.lookupOrDefault("mergeTol", 1e-6)),
     regularise_(dict.lookupOrDefault("regularise", true)),
     average_(dict.lookupOrDefault("average", false)),
     zoneID_(dict.lookupOrDefault("zone", word::null), mesh.cellZones()),
diff --git a/src/sampling/sampledSurface/sampledCuttingPlane/sampledCuttingPlane.C b/src/sampling/sampledSurface/sampledCuttingPlane/sampledCuttingPlane.C
index f7681fc996..b90ce56536 100644
--- a/src/sampling/sampledSurface/sampledCuttingPlane/sampledCuttingPlane.C
+++ b/src/sampling/sampledSurface/sampledCuttingPlane/sampledCuttingPlane.C
@@ -262,7 +262,7 @@ Foam::sampledCuttingPlane::sampledCuttingPlane
 :
     sampledSurface(name, mesh, dict),
     plane_(dict),
-    mergeTol_(dict.lookupOrDefault("mergeTol", 1E-6)),
+    mergeTol_(dict.lookupOrDefault("mergeTol", 1e-6)),
     regularise_(dict.lookupOrDefault("regularise", true)),
     average_(dict.lookupOrDefault("average", false)),
     zoneID_(dict.lookupOrDefault("zone", word::null), mesh.cellZones()),
diff --git a/src/sampling/sampledSurface/sampledTriSurfaceMesh/sampledTriSurfaceMesh.C b/src/sampling/sampledSurface/sampledTriSurfaceMesh/sampledTriSurfaceMesh.C
index 4c050ff485..7b1ca38576 100644
--- a/src/sampling/sampledSurface/sampledTriSurfaceMesh/sampledTriSurfaceMesh.C
+++ b/src/sampling/sampledSurface/sampledTriSurfaceMesh/sampledTriSurfaceMesh.C
@@ -109,7 +109,7 @@ Foam::sampledTriSurfaceMesh::nonCoupledboundaryTree() const
 
         treeBoundBox overallBb(mesh().points());
         Random rndGen(123456);
-        overallBb = overallBb.extend(rndGen, 1E-4);
+        overallBb = overallBb.extend(rndGen, 1e-4);
         overallBb.min() -= point(ROOTVSMALL, ROOTVSMALL, ROOTVSMALL);
         overallBb.max() += point(ROOTVSMALL, ROOTVSMALL, ROOTVSMALL);
 
diff --git a/src/triSurface/faceTriangulation/faceTriangulation.C b/src/triSurface/faceTriangulation/faceTriangulation.C
index 3b9916562e..6a73d6f2a9 100644
--- a/src/triSurface/faceTriangulation/faceTriangulation.C
+++ b/src/triSurface/faceTriangulation/faceTriangulation.C
@@ -29,7 +29,7 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-const Foam::scalar Foam::faceTriangulation::edgeRelTol = 1E-6;
+const Foam::scalar Foam::faceTriangulation::edgeRelTol = 1e-6;
 
 
 // Edge to the right of face vertex i

From df636c4082f3da88eb4af54b7fe53257a070cfad Mon Sep 17 00:00:00 2001
From: laurence <laurence>
Date: Tue, 17 Apr 2012 16:48:44 +0100
Subject: [PATCH 211/317] ENH: collapseEdges: WIP to extend to work in parallel

---
 .../mesh/advanced/collapseEdges/Make/options  |   3 +-
 .../advanced/collapseEdges/collapseEdges.C    | 679 ++++++++++++------
 .../polyTopoChange/edgeCollapser.C            | 138 +++-
 .../polyTopoChange/edgeCollapser.H            |   5 +
 4 files changed, 587 insertions(+), 238 deletions(-)

diff --git a/applications/utilities/mesh/advanced/collapseEdges/Make/options b/applications/utilities/mesh/advanced/collapseEdges/Make/options
index 21b17b14c9..73f34b0f85 100644
--- a/applications/utilities/mesh/advanced/collapseEdges/Make/options
+++ b/applications/utilities/mesh/advanced/collapseEdges/Make/options
@@ -1,5 +1,6 @@
 EXE_INC = \
-    -I$(LIB_SRC)/dynamicMesh/lnInclude
+    -I$(LIB_SRC)/dynamicMesh/lnInclude \
+    -I$(LIB_SRC)/meshTools/lnInclude
 
 EXE_LIBS = \
     -ldynamicMesh \
diff --git a/applications/utilities/mesh/advanced/collapseEdges/collapseEdges.C b/applications/utilities/mesh/advanced/collapseEdges/collapseEdges.C
index f1eb28e594..400191275c 100644
--- a/applications/utilities/mesh/advanced/collapseEdges/collapseEdges.C
+++ b/applications/utilities/mesh/advanced/collapseEdges/collapseEdges.C
@@ -50,6 +50,11 @@ Description
 #include "PackedBoolList.H"
 #include "SortableList.H"
 #include "unitConversion.H"
+#include "globalMeshData.H"
+#include "globalIndex.H"
+
+#include "OFstream.H"
+#include "meshTools.H"
 
 using namespace Foam;
 
@@ -174,37 +179,74 @@ label mergeEdges
 
 
 // Return master point edge needs to be collapsed to (or -1)
-label edgeMaster(const PackedBoolList& boundaryPoint, const edge& e)
+label edgeMaster
+(
+    const labelList& boundaryPoint,
+    const bool flipEdge,
+    const edge& e
+)
 {
     label masterPoint = -1;
 
-    // Collapse edge to boundary point.
-    if (boundaryPoint.get(e[0]))
+    label e0 = e[0];
+    label e1 = e[1];
+
+    if (flipEdge)
     {
-        if (boundaryPoint.get(e[1]))
+        e0 = e[1];
+        e1 = e[0];
+    }
+
+    // Check if one of the points is on a processor
+    if
+    (
+        boundaryPoint[e0] > 0
+     && boundaryPoint[e1] > 0
+    )
+    {
+        if (boundaryPoint[e0] != boundaryPoint[e1])
+        {
+            return -1;
+        }
+    }
+
+    if (boundaryPoint[e0] > 0)
+    {
+        return e0;
+    }
+    else if (boundaryPoint[e1] > 0)
+    {
+        return e1;
+    }
+
+    // Collapse edge to boundary point.
+    if (boundaryPoint[e0] == 0)
+    {
+        if (boundaryPoint[e1] == 0)
         {
             // Both points on boundary. Choose one to collapse to.
             // Note: should look at feature edges/points!
-            masterPoint = e[0];
+            masterPoint = e0;
         }
         else
         {
-            masterPoint = e[0];
+            masterPoint = e0;
         }
     }
     else
     {
-        if (boundaryPoint.get(e[1]))
+        if (boundaryPoint[e1] == 0)
         {
-            masterPoint = e[1];
+            masterPoint = e1;
         }
         else
         {
             // None on boundary. Choose arbitrary.
             // Note: should look at geometry?
-            masterPoint = e[0];
+            masterPoint = e0;
         }
     }
+
     return masterPoint;
 }
 
@@ -212,7 +254,7 @@ label edgeMaster(const PackedBoolList& boundaryPoint, const edge& e)
 label collapseSmallEdges
 (
     const polyMesh& mesh,
-    const PackedBoolList& boundaryPoint,
+    const labelList& boundaryPoint,
     const scalar minLen,
     edgeCollapser& collapser
 )
@@ -223,7 +265,17 @@ label collapseSmallEdges
     // Collapse all edges that are too small. Choose intelligently which
     // point to collapse edge to.
 
-    label nCollapsed = 0;
+    const globalMeshData& globalData = mesh.globalData();
+    const mapDistribute& map = globalData.globalEdgeSlavesMap();
+    const labelList& coupledMeshEdges = globalData.coupledPatchMeshEdges();
+    const indirectPrimitivePatch& coupledPatch = globalData.coupledPatch();
+    const PackedBoolList& cppOrientation = globalData.globalEdgeOrientation();
+
+    // Store collapse direction in collapseEdge
+    //   -1 -> Do not collapse
+    //    0 -> Collapse to start point
+    //    1 -> Collapse to end point
+    labelList collapseEdge(edges.size(), -1);
 
     forAll(edges, edgeI)
     {
@@ -231,15 +283,121 @@ label collapseSmallEdges
 
         if (e.mag(points) < minLen)
         {
-            label master = edgeMaster(boundaryPoint, e);
+            collapseEdge[edgeI] = 0;
+        }
+    }
 
-            if (master != -1) // && collapser.unaffectedEdge(edgeI))
+    // Check whether edge point order is reversed from mesh to coupledPatch
+    PackedBoolList meshToPatchSameOrientation(coupledMeshEdges.size(), true);
+
+    forAll(coupledMeshEdges, eI)
+    {
+        const label meshEdgeIndex = coupledMeshEdges[eI];
+
+        if (collapseEdge[meshEdgeIndex] != -1)
+        {
+            const edge& meshEdge = edges[meshEdgeIndex];
+            const edge& coupledPatchEdge = coupledPatch.edges()[eI];
+
+            if
+            (
+                meshEdge[0] == coupledPatch.meshPoints()[coupledPatchEdge[1]]
+             && meshEdge[1] == coupledPatch.meshPoints()[coupledPatchEdge[0]]
+            )
+            {
+                meshToPatchSameOrientation[eI] = false;
+            }
+        }
+    }
+
+
+    labelList cppEdgeData(coupledMeshEdges.size(), -1);
+
+    forAll(coupledMeshEdges, eI)
+    {
+        const label meshEdgeIndex = coupledMeshEdges[eI];
+
+        if (collapseEdge[meshEdgeIndex] != -1)
+        {
+            if (meshToPatchSameOrientation[eI] == cppOrientation[eI])
+            {
+                cppEdgeData[eI] = 0;
+            }
+            else
+            {
+                cppEdgeData[eI] = 1;
+            }
+        }
+    }
+
+
+    // Synchronise cppEdgeData
+    // Use minEqOp reduction, so that edge will only be collapsed on processor
+    // boundary if both processors agree to collapse it
+    globalData.syncData
+    (
+        cppEdgeData,
+        globalData.globalEdgeSlaves(),
+        globalData.globalEdgeTransformedSlaves(),
+        map,
+        minEqOp<label>()
+    );
+
+
+    forAll(coupledMeshEdges, eI)
+    {
+        const label meshEdgeIndex = coupledMeshEdges[eI];
+
+        if (collapseEdge[meshEdgeIndex] != -1)
+        {
+            if (meshToPatchSameOrientation[eI] == cppOrientation[eI])
+            {
+                collapseEdge[meshEdgeIndex] = 0;
+            }
+            else
+            {
+                collapseEdge[meshEdgeIndex] = 1;
+            }
+        }
+    }
+
+
+    OFstream str1("collapsedPoints_" + name(Pstream::myProcNo()) + ".obj");
+
+    label nCollapsed = 0;
+
+    forAll(edges, edgeI)
+    {
+        if (collapseEdge[edgeI] != -1)
+        {
+            const edge& e = edges[edgeI];
+
+            const label master =
+                edgeMaster
+                (
+                    boundaryPoint,
+                    collapseEdge[edgeI],
+                    e
+                );
+
+            if (e[0] == master)
+            {
+                meshTools::writeOBJ(str1, points[e[1]], points[e[0]]);
+            }
+            else if (e[1] == master)
+            {
+                meshTools::writeOBJ(str1, points[e[0]], points[e[1]]);
+            }
+
+            if (master != -1)
             {
                 collapser.collapseEdge(edgeI, master);
+
                 nCollapsed++;
             }
         }
     }
+
     return nCollapsed;
 }
 
@@ -248,86 +406,88 @@ label collapseSmallEdges
 // are very small. This one tries to collapse them if it can be done with
 // edge collapse. For faces where a face gets replace by two edges use
 // collapseFaces
-label collapseHighAspectFaces
-(
-    const polyMesh& mesh,
-    const PackedBoolList& boundaryPoint,
-    const scalar areaFac,
-    const scalar edgeRatio,
-    edgeCollapser& collapser
-)
-{
-    const pointField& points = mesh.points();
-    const edgeList& edges = mesh.edges();
-    const faceList& faces = mesh.faces();
-    const labelListList& faceEdges = mesh.faceEdges();
-
-    scalarField magArea(mag(mesh.faceAreas()));
-
-    label maxIndex = findMax(magArea);
-
-    scalar minArea = areaFac * magArea[maxIndex];
-
-    Info<< "Max face area:" << magArea[maxIndex] << endl
-        << "Collapse area factor:" << areaFac << endl
-        << "Collapse area:" << minArea << endl;
-
-    label nCollapsed = 0;
-
-    forAll(faces, faceI)
-    {
-        if (magArea[faceI] < minArea)
-        {
-            const face& f = faces[faceI];
-
-            // Get the edges in face point order
-            labelList fEdges(getSortedEdges(edges, f, faceEdges[faceI]));
-
-            SortableList<scalar> lengths(fEdges.size());
-            forAll(fEdges, i)
-            {
-                lengths[i] = edges[fEdges[i]].mag(points);
-            }
-            lengths.sort();
-
-
-            label edgeI = -1;
-
-            if (f.size() == 4)
-            {
-                // Compare second largest to smallest
-                if (lengths[2] > edgeRatio*lengths[0])
-                {
-                    // Collapse smallest only. Triangle should be cleared
-                    // next time around.
-                    edgeI = fEdges[lengths.indices()[0]];
-                }
-            }
-            else if (f.size() == 3)
-            {
-                // Compare second largest to smallest
-                if (lengths[1] > edgeRatio*lengths[0])
-                {
-                    edgeI = fEdges[lengths.indices()[0]];
-                }
-            }
-
-
-            if (edgeI != -1)
-            {
-                label master = edgeMaster(boundaryPoint, edges[edgeI]);
-
-                if (master != -1)// && collapser.unaffectedEdge(edgeI))
-                {
-                    collapser.collapseEdge(edgeI, master);
-                    nCollapsed++;
-                }
-            }
-        }
-    }
-
-    return nCollapsed;
-}
+//label collapseHighAspectFaces
+//(
+//    const polyMesh& mesh,
+//    const PackedBoolList& boundaryPoint,
+//    const Map<label>& processorPoints,
+//    const scalar areaFac,
+//    const scalar edgeRatio,
+//    edgeCollapser& collapser
+//)
+//{
+//    const pointField& points = mesh.points();
+//    const edgeList& edges = mesh.edges();
+//    const faceList& faces = mesh.faces();
+//    const labelListList& faceEdges = mesh.faceEdges();
+//
+//    scalarField magArea(mag(mesh.faceAreas()));
+//
+//    label maxIndex = findMax(magArea);
+//
+//    scalar minArea = areaFac * magArea[maxIndex];
+//
+//    Info<< "Max face area:" << magArea[maxIndex] << endl
+//        << "Collapse area factor:" << areaFac << endl
+//        << "Collapse area:" << minArea << endl;
+//
+//    label nCollapsed = 0;
+//
+//    forAll(faces, faceI)
+//    {
+//        if (magArea[faceI] < minArea)
+//        {
+//            const face& f = faces[faceI];
+//
+//            // Get the edges in face point order
+//            labelList fEdges(getSortedEdges(edges, f, faceEdges[faceI]));
+//
+//            SortableList<scalar> lengths(fEdges.size());
+//            forAll(fEdges, i)
+//            {
+//                lengths[i] = edges[fEdges[i]].mag(points);
+//            }
+//            lengths.sort();
+//
+//
+//            label edgeI = -1;
+//
+//            if (f.size() == 4)
+//            {
+//                // Compare second largest to smallest
+//                if (lengths[2] > edgeRatio*lengths[0])
+//                {
+//                    // Collapse smallest only. Triangle should be cleared
+//                    // next time around.
+//                    edgeI = fEdges[lengths.indices()[0]];
+//                }
+//            }
+//            else if (f.size() == 3)
+//            {
+//                // Compare second largest to smallest
+//                if (lengths[1] > edgeRatio*lengths[0])
+//                {
+//                    edgeI = fEdges[lengths.indices()[0]];
+//                }
+//            }
+//
+//
+//            if (edgeI != -1)
+//            {
+//                label master =
+//                    edgeMaster(boundaryPoint, processorPoints, false, edges[edgeI]);
+//
+//                if (master != -1)// && collapser.unaffectedEdge(edgeI))
+//                {
+//                    collapser.collapseEdge(edgeI, master);
+//                    nCollapsed++;
+//                }
+//            }
+//        }
+//    }
+//
+//    return nCollapsed;
+//}
 
 
 void set(const labelList& elems, const bool val, boolList& status)
@@ -340,112 +500,113 @@ void set(const labelList& elems, const bool val, boolList& status)
 
 
 // Tries to simplify polygons to face of minSize (4=quad, 3=triangle)
-label simplifyFaces
-(
-    const polyMesh& mesh,
-    const PackedBoolList& boundaryPoint,
-    const label minSize,
-    const scalar lenGap,
-    edgeCollapser& collapser
-)
-{
-    const pointField& points = mesh.points();
-    const edgeList& edges = mesh.edges();
-    const faceList& faces = mesh.faces();
-    const cellList& cells = mesh.cells();
-    const labelListList& faceEdges = mesh.faceEdges();
-    const labelList& faceOwner = mesh.faceOwner();
-    const labelList& faceNeighbour = mesh.faceNeighbour();
-    const labelListList& pointCells = mesh.pointCells();
-    const labelListList& cellEdges = mesh.cellEdges();
-
-    label nCollapsed = 0;
-
-    boolList protectedEdge(mesh.nEdges(), false);
-
-    forAll(faces, faceI)
-    {
-        const face& f = faces[faceI];
-
-        if
-        (
-            f.size() > minSize
-         && cells[faceOwner[faceI]].size() >= 6
-         && (
-                mesh.isInternalFace(faceI)
-             && cells[faceNeighbour[faceI]].size() >= 6
-            )
-        )
-        {
-            // Get the edges in face point order
-            labelList fEdges(getSortedEdges(edges, f, faceEdges[faceI]));
-
-            SortableList<scalar> lengths(fEdges.size());
-            forAll(fEdges, i)
-            {
-                lengths[i] = edges[fEdges[i]].mag(points);
-            }
-            lengths.sort();
-
-
-            // Now find a gap in length between consecutive elements greater
-            // than lenGap.
-
-            label gapPos = -1;
-
-            for (label i = f.size()-1-minSize; i >= 0; --i)
-            {
-                if (lengths[i+1] > lenGap*lengths[i])
-                {
-                    gapPos = i;
-
-                    break;
-                }
-            }
-
-            if (gapPos != -1)
-            {
-                //for (label i = gapPos; i >= 0; --i)
-                label i = 0;  // Hack: collapse smallest edge only.
-                {
-                    label edgeI = fEdges[lengths.indices()[i]];
-
-                    if (!protectedEdge[edgeI])
-                    {
-                        const edge& e = edges[edgeI];
-
-                        label master = edgeMaster(boundaryPoint, e);
-
-                        if (master != -1)
-                        {
-                            collapser.collapseEdge(edgeI, master);
-
-                            // Protect all other edges on all cells using edge
-                            // points.
-
-                            const labelList& pCells0 = pointCells[e[0]];
-
-                            forAll(pCells0, i)
-                            {
-                                set(cellEdges[pCells0[i]], true, protectedEdge);
-                            }
-                            const labelList& pCells1 = pointCells[e[1]];
-
-                            forAll(pCells1, i)
-                            {
-                                set(cellEdges[pCells1[i]], true, protectedEdge);
-                            }
-
-                            nCollapsed++;
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    return nCollapsed;
-}
+//label simplifyFaces
+//(
+//    const polyMesh& mesh,
+//    const PackedBoolList& boundaryPoint,
+//    const Map<label>& processorPoints,
+//    const label minSize,
+//    const scalar lenGap,
+//    edgeCollapser& collapser
+//)
+//{
+//    const pointField& points = mesh.points();
+//    const edgeList& edges = mesh.edges();
+//    const faceList& faces = mesh.faces();
+//    const cellList& cells = mesh.cells();
+//    const labelListList& faceEdges = mesh.faceEdges();
+//    const labelList& faceOwner = mesh.faceOwner();
+//    const labelList& faceNeighbour = mesh.faceNeighbour();
+//    const labelListList& pointCells = mesh.pointCells();
+//    const labelListList& cellEdges = mesh.cellEdges();
+//
+//    label nCollapsed = 0;
+//
+//    boolList protectedEdge(mesh.nEdges(), false);
+//
+//    forAll(faces, faceI)
+//    {
+//        const face& f = faces[faceI];
+//
+//        if
+//        (
+//            f.size() > minSize
+//         && cells[faceOwner[faceI]].size() >= 6
+//         && (
+//                mesh.isInternalFace(faceI)
+//             && cells[faceNeighbour[faceI]].size() >= 6
+//            )
+//        )
+//        {
+//            // Get the edges in face point order
+//            labelList fEdges(getSortedEdges(edges, f, faceEdges[faceI]));
+//
+//            SortableList<scalar> lengths(fEdges.size());
+//            forAll(fEdges, i)
+//            {
+//                lengths[i] = edges[fEdges[i]].mag(points);
+//            }
+//            lengths.sort();
+//
+//
+//            // Now find a gap in length between consecutive elements greater
+//            // than lenGap.
+//
+//            label gapPos = -1;
+//
+//            for (label i = f.size()-1-minSize; i >= 0; --i)
+//            {
+//                if (lengths[i+1] > lenGap*lengths[i])
+//                {
+//                    gapPos = i;
+//
+//                    break;
+//                }
+//            }
+//
+//            if (gapPos != -1)
+//            {
+//                //for (label i = gapPos; i >= 0; --i)
+//                label i = 0;  // Hack: collapse smallest edge only.
+//                {
+//                    label edgeI = fEdges[lengths.indices()[i]];
+//
+//                    if (!protectedEdge[edgeI])
+//                    {
+//                        const edge& e = edges[edgeI];
+//
+//                        label master = edgeMaster(boundaryPoint, processorPoints, false, e);
+//
+//                        if (master != -1)
+//                        {
+//                            collapser.collapseEdge(edgeI, master);
+//
+//                            // Protect all other edges on all cells using edge
+//                            // points.
+//
+//                            const labelList& pCells0 = pointCells[e[0]];
+//
+//                            forAll(pCells0, i)
+//                            {
+//                                set(cellEdges[pCells0[i]], true, protectedEdge);
+//                            }
+//                            const labelList& pCells1 = pointCells[e[1]];
+//
+//                            forAll(pCells1, i)
+//                            {
+//                                set(cellEdges[pCells1[i]], true, protectedEdge);
+//                            }
+//
+//                            nCollapsed++;
+//                        }
+//                    }
+//                }
+//            }
+//        }
+//    }
+//
+//    return nCollapsed;
+//}
 
 
 // Main program:
@@ -453,7 +614,7 @@ label simplifyFaces
 int main(int argc, char *argv[])
 {
 #   include "addOverwriteOption.H"
-    argList::noParallel();
+
     argList::validArgs.append("edge length [m]");
     argList::validArgs.append("merge angle (degrees)");
 
@@ -475,16 +636,26 @@ int main(int argc, char *argv[])
         << " degrees" << nl
         << endl;
 
-
     bool meshChanged = false;
 
+    // Edge collapsing engine
+    edgeCollapser collapser(mesh);
+
+    label nIterations = 0;
+
     while (true)
     {
+        Info<< "Iteration " << nIterations << incrIndent << endl;
+
         const faceList& faces = mesh.faces();
 
-        // Get all points on the boundary
-        PackedBoolList boundaryPoint(mesh.nPoints());
+        // boundaryPoint:
+        // + -1 : point not on boundary
+        // +  0 : point on a real boundary
+        // + >0 : point on a processor patch with that ID
+        labelList boundaryPoint(mesh.nPoints(), -1);
 
+        // Get all points on a boundary
         label nIntFaces = mesh.nInternalFaces();
         for (label faceI = nIntFaces; faceI < mesh.nFaces(); faceI++)
         {
@@ -492,16 +663,37 @@ int main(int argc, char *argv[])
 
             forAll(f, fp)
             {
-                boundaryPoint.set(f[fp], 1);
+                boundaryPoint[f[fp]] = 0;
             }
         }
 
-        // Edge collapsing engine
-        edgeCollapser collapser(mesh);
+        // Get all processor boundary points and the processor patch label that
+        // they are on.
+        const polyBoundaryMesh& bMesh = mesh.boundaryMesh();
 
+        forAll(bMesh, patchI)
+        {
+            const polyPatch& patch = bMesh[patchI];
+
+            if (isA<processorPolyPatch>(patch))
+            {
+                const processorPolyPatch& pPatch =
+                    refCast<const processorPolyPatch>(patch);
+
+                forAll(pPatch, fI)
+                {
+                    const face& f = pPatch[fI];
+
+                    forAll(f, fp)
+                    {
+                        boundaryPoint[f[fp]] = patchI;
+                    }
+                }
+            }
+        }
 
         // Collapse all edges that are too small.
-        label nCollapsed =
+        label nSmallCollapsed =
             collapseSmallEdges
             (
                 mesh,
@@ -509,34 +701,57 @@ int main(int argc, char *argv[])
                 minLen,
                 collapser
             );
-        Info<< "Collapsing " << nCollapsed << " small edges" << endl;
 
+        reduce(nSmallCollapsed, sumOp<label>());
+
+        Info<< indent << "Collapsing " << nSmallCollapsed
+            << " small edges" << endl;
+
+
+
+
+
+        label nMerged = 0;
 
         // Remove midpoints on straight edges.
-        if (nCollapsed == 0)
+        if (nSmallCollapsed == 0)
         {
-            nCollapsed = mergeEdges(mesh, maxCos, collapser);
-            Info<< "Collapsing " << nCollapsed << " in line edges" << endl;
+            //nMerged = mergeEdges(mesh, maxCos, collapser);
         }
 
+        reduce(nMerged, sumOp<label>());
+
+        Info<< indent << "Collapsing " << nMerged << " in line edges" << endl;
+
+
+
+
+
+
+        label nSliversCollapsed = 0;
 
         // Remove small sliver faces that can be collapsed to single edge
-        if (nCollapsed == 0)
+        if (nSmallCollapsed == 0 && nMerged == 0)
         {
-            nCollapsed =
-                collapseHighAspectFaces
-                (
-                    mesh,
-                    boundaryPoint,
-                    1e-9,       // factor of largest face area
-                    5,          // factor between smallest and largest edge on
-                                // face
-                    collapser
-                );
-            Info<< "Collapsing " << nCollapsed
-                << " small high aspect ratio faces" << endl;
+//            nSliversCollapsed =
+//                collapseHighAspectFaces
+//                (
+//                    mesh,
+//                    boundaryPoint,
+//                    processorPoints,
+//                    1E-9,       // factor of largest face area
+//                    5,          // factor between smallest and largest edge on
+//                                // face
+//                    collapser
+//                );
         }
 
+        reduce(nSliversCollapsed, sumOp<label>());
+
+        Info<< indent << "Collapsing " << nSliversCollapsed
+            << " small high aspect ratio faces" << endl;
+
+
         // Simplify faces to quads wherever possible
         //if (nCollapsed == 0)
         //{
@@ -553,7 +768,12 @@ int main(int argc, char *argv[])
         //}
 
 
-        if (nCollapsed == 0)
+        label totalCollapsed =
+            nSmallCollapsed
+          + nMerged
+          + nSliversCollapsed;
+
+        if (totalCollapsed == 0)
         {
             break;
         }
@@ -564,7 +784,7 @@ int main(int argc, char *argv[])
         collapser.setRefinement(meshMod);
 
         // Do all changes
-        Info<< "Morphing ..." << endl;
+        Info<< indent << "Applying changes to the mesh" << nl << endl;
 
         autoPtr<mapPolyMesh> morphMap = meshMod.changeMesh(mesh, false);
 
@@ -576,6 +796,10 @@ int main(int argc, char *argv[])
         }
 
         meshChanged = true;
+
+        Info<< decrIndent;
+
+        nIterations++;
     }
 
     if (meshChanged)
@@ -590,7 +814,8 @@ int main(int argc, char *argv[])
             mesh.setInstance(oldInstance);
         }
 
-        Info<< "Writing collapsed mesh to time " << runTime.timeName() << endl;
+        Info<< nl << "Writing collapsed mesh to time "
+            << runTime.timeName() << nl << endl;
 
         mesh.write();
     }
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/edgeCollapser.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/edgeCollapser.C
index 415c6facdc..22872abf47 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/edgeCollapser.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/edgeCollapser.C
@@ -27,6 +27,10 @@ License
 #include "polyMesh.H"
 #include "polyTopoChange.H"
 #include "ListOps.H"
+#include "globalMeshData.H"
+#include "OFstream.H"
+#include "meshTools.H"
+#include "syncTools.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
@@ -121,6 +125,7 @@ void Foam::edgeCollapser::filterFace(const label faceI, face& f) const
         }
     }
 
+
     // Check for pinched face. Tries to correct
     // - consecutive duplicate vertex. Removes duplicate vertex.
     // - duplicate vertex with one other vertex in between (spike).
@@ -190,15 +195,15 @@ void Foam::edgeCollapser::printRegions() const
 
         if (master != -1)
         {
-            Info<< "Region:" << regionI << nl
+            Pout<< "Region:" << regionI << nl
                 << "    master:" << master
-                << ' ' << mesh_.points()[master] << nl;
+                << ' ' << pointRegionMasterLocation_[regionI] << nl;
 
             forAll(pointRegion_, pointI)
             {
                 if (pointRegion_[pointI] == regionI && pointI != master)
                 {
-                    Info<< "    slave:" << pointI
+                    Pout<< "    slave:" << pointI
                         << ' ' <<  mesh_.points()[pointI] << nl;
                 }
             }
@@ -272,6 +277,7 @@ Foam::edgeCollapser::edgeCollapser(const polyMesh& mesh)
 :
     mesh_(mesh),
     pointRegion_(mesh.nPoints(), -1),
+    pointRegionMasterLocation_(mesh.nPoints() / 100),
     pointRegionMaster_(mesh.nPoints() / 100),
     freeRegions_()
 {}
@@ -289,6 +295,8 @@ bool Foam::edgeCollapser::unaffectedEdge(const label edgeI) const
 
 bool Foam::edgeCollapser::collapseEdge(const label edgeI, const label master)
 {
+    const pointField& points = mesh_.points();
+
     const edge& e = mesh_.edges()[edgeI];
 
     label pointRegion0 = pointRegion_[e[0]];
@@ -310,7 +318,7 @@ bool Foam::edgeCollapser::collapseEdge(const label edgeI, const label master)
                 {
                     FatalErrorIn
                     ("edgeCollapser::collapseEdge(const label, const label)")
-                        << "Problem : freeed region :" << freeRegion
+                        << "Problem : freed region :" << freeRegion
                         << " has already master "
                         << pointRegionMaster_[freeRegion]
                         << abort(FatalError);
@@ -327,13 +335,22 @@ bool Foam::edgeCollapser::collapseEdge(const label edgeI, const label master)
             pointRegion_[e[1]] = freeRegion;
 
             pointRegionMaster_(freeRegion) = master;
+            pointRegionMasterLocation_(freeRegion) = points[master];
         }
         else
         {
             // e[1] is part of collapse network, e[0] not. Add e0 to e1 region.
             pointRegion_[e[0]] = pointRegion1;
 
-            pointRegionMaster_[pointRegion1] = master;
+            if
+            (
+                pointRegionMaster_[pointRegion1] == e[0]
+             || pointRegionMaster_[pointRegion1] == e[1]
+            )
+            {
+                pointRegionMaster_[pointRegion1] = master;
+                pointRegionMasterLocation_[pointRegion1] = points[master];
+            }
         }
     }
     else
@@ -343,7 +360,15 @@ bool Foam::edgeCollapser::collapseEdge(const label edgeI, const label master)
             // e[0] is part of collapse network. Add e1 to e0 region
             pointRegion_[e[1]] = pointRegion0;
 
-            pointRegionMaster_[pointRegion0] = master;
+            if
+            (
+                pointRegionMaster_[pointRegion0] == e[0]
+             || pointRegionMaster_[pointRegion0] == e[1]
+            )
+            {
+                pointRegionMaster_[pointRegion0] = master;
+                pointRegionMasterLocation_[pointRegion0] = points[master];
+            }
         }
         else if (pointRegion0 != pointRegion1)
         {
@@ -356,6 +381,9 @@ bool Foam::edgeCollapser::collapseEdge(const label edgeI, const label master)
             // Use minRegion as region for combined net, free maxRegion.
             pointRegionMaster_[minRegion] = master;
             pointRegionMaster_[maxRegion] = -1;
+            pointRegionMasterLocation_[minRegion] = points[master];
+            pointRegionMasterLocation_[maxRegion] = point(0, 0, 0);
+
             freeRegions_.insert(maxRegion);
 
             if (minRegion != pointRegion0)
@@ -380,12 +408,61 @@ bool Foam::edgeCollapser::setRefinement(polyTopoChange& meshMod)
     const labelList& faceNeighbour = mesh_.faceNeighbour();
     const labelListList& pointFaces = mesh_.pointFaces();
     const labelListList& cellEdges = mesh_.cellEdges();
+    const pointZoneMesh& pointZones = mesh_.pointZones();
+
 
-    // Print regions:
-    //printRegions()
 
     bool meshChanged = false;
 
+    // Synchronise pointRegionMasterLocation_
+    const globalMeshData& globalData = mesh_.globalData();
+    const mapDistribute& map = globalData.globalPointSlavesMap();
+    const indirectPrimitivePatch& coupledPatch = globalData.coupledPatch();
+    const labelList& meshPoints = coupledPatch.meshPoints();
+    const Map<label>& meshPointMap = coupledPatch.meshPointMap();
+
+
+    List<point> newPoints = coupledPatch.localPoints();
+
+    for (label pI = 0; pI < coupledPatch.nPoints(); ++pI)
+    {
+        const label pointRegionMaster = pointRegion_[meshPoints[pI]];
+
+        if (pointRegionMaster != -1)
+        {
+            newPoints[pI]
+                = pointRegionMasterLocation_[pointRegionMaster];
+        }
+    }
+
+    globalData.syncData
+    (
+        newPoints,
+        globalData.globalPointSlaves(),
+        globalData.globalPointTransformedSlaves(),
+        map,
+        minMagSqrEqOp<point>()
+    );
+
+        OFstream str1("newPoints_" + name(Pstream::myProcNo()) + ".obj");
+        forAll(pointRegion_, pI)
+        {
+            if (meshPointMap.found(pI))
+            {
+                meshTools::writeOBJ(str1, newPoints[meshPointMap[pI]]);
+            }
+        }
+
+    for (label pI = 0; pI < coupledPatch.nPoints(); ++pI)
+    {
+        const label pointRegionMaster = pointRegion_[meshPoints[pI]];
+
+        if (pointRegionMaster != -1)
+        {
+            pointRegionMasterLocation_[pointRegionMaster]
+                = newPoints[pI];
+        }
+    }
 
     // Current faces (is also collapseStatus: f.size() < 3)
     faceList newFaces(mesh_.faces());
@@ -393,7 +470,6 @@ bool Foam::edgeCollapser::setRefinement(polyTopoChange& meshMod)
     // Current cellCollapse status
     boolList cellRemoved(mesh_.nCells(), false);
 
-
     do
     {
         // Update face collapse from edge collapses
@@ -521,12 +597,49 @@ bool Foam::edgeCollapser::setRefinement(polyTopoChange& meshMod)
         }
     }
 
+    // Modify the point location of the remaining points
+    forAll(pointRegion_, pointI)
+    {
+        const label pointRegion = pointRegion_[pointI];
+
+        if
+        (
+            !pointRemoved(pointI)
+         && meshPointMap.found(pointI)
+        )
+        {
+            meshMod.modifyPoint
+            (
+                pointI,
+                newPoints[meshPointMap[pointI]],
+                pointZones.whichZone(pointI),
+                false
+            );
+        }
+        else if
+        (
+            pointRegion != -1
+         && !pointRemoved(pointI)
+         && !meshPointMap.found(pointI)
+        )
+        {
+            const point& collapsePoint
+                = pointRegionMasterLocation_[pointRegion];
+
+            meshMod.modifyPoint
+            (
+                pointI,
+                collapsePoint,
+                pointZones.whichZone(pointI),
+                false
+            );
+        }
+    }
 
 
     const polyBoundaryMesh& boundaryMesh = mesh_.boundaryMesh();
     const faceZoneMesh& faceZones = mesh_.faceZones();
 
-
     // Renumber faces that use points
     forAll(pointRegion_, pointI)
     {
@@ -585,6 +698,9 @@ bool Foam::edgeCollapser::setRefinement(polyTopoChange& meshMod)
         }
     }
 
+    // Print regions:
+//    printRegions();
+
     return meshChanged;
 }
 
@@ -593,8 +709,10 @@ void Foam::edgeCollapser::updateMesh(const mapPolyMesh& map)
 {
     pointRegion_.setSize(mesh_.nPoints());
     pointRegion_ = -1;
+
     // Reset count, do not remove underlying storage
     pointRegionMaster_.clear();
+    pointRegionMasterLocation_.clear();
     freeRegions_.clear();
 }
 
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/edgeCollapser.H b/src/dynamicMesh/polyTopoChange/polyTopoChange/edgeCollapser.H
index 98d8ef30d5..3a10a93197 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/edgeCollapser.H
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/edgeCollapser.H
@@ -39,6 +39,7 @@ SourceFiles
 
 #include "labelList.H"
 #include "DynamicList.H"
+#include "point.H"
 #include "typeInfo.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -66,6 +67,10 @@ class edgeCollapser
         //- For every point -1 or region number
         labelList pointRegion_;
 
+        //- Actual location of the point to collapse to for every region master
+        //  point. This will be forced to be consistent across processors
+        DynamicList<point> pointRegionMasterLocation_;
+
         //- -1 or master vertex for region number
         DynamicList<label> pointRegionMaster_;
 

From 5682987dc7f9ed504a3d7cd15384a0e0620a681c Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Tue, 17 Apr 2012 16:49:03 +0100
Subject: [PATCH 212/317] Updated headers

---
 applications/test/syncTools/Test-syncTools.C                    | 2 +-
 .../utilities/mesh/advanced/autoRefineMesh/autoRefineMesh.C     | 2 +-
 .../utilities/mesh/advanced/collapseEdges/collapseEdges.C       | 2 +-
 applications/utilities/mesh/advanced/selectCells/edgeStats.C    | 2 +-
 applications/utilities/mesh/generation/cv2DMesh/cv2DMesh.C      | 2 +-
 .../utilities/mesh/generation/extrude/extrudeMesh/extrudeMesh.C | 2 +-
 .../utilities/mesh/manipulation/polyDualMesh/meshDualiser.C     | 2 +-
 .../utilities/mesh/manipulation/refineMesh/refineMesh.C         | 2 +-
 .../parallelProcessing/reconstructParMesh/reconstructParMesh.C  | 2 +-
 applications/utilities/preProcessing/mapFields/mapLagrangian.C  | 2 +-
 applications/utilities/surface/surfaceCheck/surfaceCheck.C      | 2 +-
 .../surface/surfaceRedistributePar/surfaceRedistributePar.C     | 2 +-
 applications/utilities/surface/surfaceSubset/surfaceSubset.C    | 2 +-
 src/OSspecific/POSIX/clockTime/clockTime.C                      | 2 +-
 .../polyMesh/polyPatches/basic/coupled/coupledPolyPatch.C       | 2 +-
 src/combustionModels/FSD/FSD.H                                  | 2 +-
 src/dynamicMesh/boundaryMesh/boundaryMesh.C                     | 2 +-
 src/dynamicMesh/meshCut/cellLooper/geomCellLooper.C             | 2 +-
 src/dynamicMesh/meshCut/directions/directions.C                 | 2 +-
 src/dynamicMesh/perfectInterface/perfectInterface.C             | 2 +-
 src/dynamicMesh/polyMeshAdder/faceCoupleInfo.C                  | 2 +-
 src/dynamicMesh/polyTopoChange/polyTopoChange/faceCollapser.C   | 2 +-
 src/edgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMesh.C  | 2 +-
 .../autoHexMesh/refinementFeatures/refinementFeatures.C         | 2 +-
 src/meshTools/cellClassification/cellClassification.C           | 2 +-
 src/meshTools/indexedOctree/treeDataFace.C                      | 2 +-
 src/meshTools/indexedOctree/treeDataPrimitivePatch.C            | 2 +-
 src/meshTools/searchableSurface/searchablePlate.C               | 2 +-
 src/meshTools/searchableSurface/searchableSurfaceWithGaps.C     | 2 +-
 src/meshTools/searchableSurface/triSurfaceMesh.C                | 2 +-
 .../booleanOps/surfaceIntersection/surfaceIntersection.C        | 2 +-
 src/meshTools/triSurface/triSurfaceSearch/triSurfaceSearch.C    | 2 +-
 src/meshTools/triSurface/triSurfaceTools/triSurfaceTools.C      | 2 +-
 .../hierarchGeomDecomp/hierarchGeomDecomp.C                     | 2 +-
 src/sampling/probes/patchProbes.C                               | 2 +-
 src/sampling/sampledSurface/isoSurface/isoSurface.H             | 2 +-
 src/sampling/sampledSurface/isoSurface/isoSurfaceCell.H         | 2 +-
 src/sampling/sampledSurface/isoSurface/sampledIsoSurface.C      | 2 +-
 .../sampledSurface/sampledCuttingPlane/sampledCuttingPlane.C    | 2 +-
 .../sampledTriSurfaceMesh/sampledTriSurfaceMesh.C               | 2 +-
 src/triSurface/faceTriangulation/faceTriangulation.C            | 2 +-
 41 files changed, 41 insertions(+), 41 deletions(-)

diff --git a/applications/test/syncTools/Test-syncTools.C b/applications/test/syncTools/Test-syncTools.C
index 32d55e73b9..cf68380952 100644
--- a/applications/test/syncTools/Test-syncTools.C
+++ b/applications/test/syncTools/Test-syncTools.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/utilities/mesh/advanced/autoRefineMesh/autoRefineMesh.C b/applications/utilities/mesh/advanced/autoRefineMesh/autoRefineMesh.C
index 52412a816f..22b757e861 100644
--- a/applications/utilities/mesh/advanced/autoRefineMesh/autoRefineMesh.C
+++ b/applications/utilities/mesh/advanced/autoRefineMesh/autoRefineMesh.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/utilities/mesh/advanced/collapseEdges/collapseEdges.C b/applications/utilities/mesh/advanced/collapseEdges/collapseEdges.C
index 28acdde141..f1eb28e594 100644
--- a/applications/utilities/mesh/advanced/collapseEdges/collapseEdges.C
+++ b/applications/utilities/mesh/advanced/collapseEdges/collapseEdges.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/utilities/mesh/advanced/selectCells/edgeStats.C b/applications/utilities/mesh/advanced/selectCells/edgeStats.C
index 2311e72e2b..2affa40535 100644
--- a/applications/utilities/mesh/advanced/selectCells/edgeStats.C
+++ b/applications/utilities/mesh/advanced/selectCells/edgeStats.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/utilities/mesh/generation/cv2DMesh/cv2DMesh.C b/applications/utilities/mesh/generation/cv2DMesh/cv2DMesh.C
index f1e0724cf4..b868d5c83c 100644
--- a/applications/utilities/mesh/generation/cv2DMesh/cv2DMesh.C
+++ b/applications/utilities/mesh/generation/cv2DMesh/cv2DMesh.C
@@ -2,7 +2,7 @@
  =========                   |
  \\      /   F ield          | OpenFOAM: The Open Source CFD Toolbox
   \\    /    O peration      |
-   \\  /     A nd            | Copyright (C) 2011 OpenFOAM Foundation
+   \\  /     A nd            | Copyright (C) 2011-2012 OpenFOAM Foundation
     \\/      M anipulation   |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMesh.C b/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMesh.C
index 32981e901e..1c769a4346 100644
--- a/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMesh.C
+++ b/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMesh.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/utilities/mesh/manipulation/polyDualMesh/meshDualiser.C b/applications/utilities/mesh/manipulation/polyDualMesh/meshDualiser.C
index 81d3b31908..e0dabffedb 100644
--- a/applications/utilities/mesh/manipulation/polyDualMesh/meshDualiser.C
+++ b/applications/utilities/mesh/manipulation/polyDualMesh/meshDualiser.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/utilities/mesh/manipulation/refineMesh/refineMesh.C b/applications/utilities/mesh/manipulation/refineMesh/refineMesh.C
index 1212b3b5ad..f8a206e651 100644
--- a/applications/utilities/mesh/manipulation/refineMesh/refineMesh.C
+++ b/applications/utilities/mesh/manipulation/refineMesh/refineMesh.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/utilities/parallelProcessing/reconstructParMesh/reconstructParMesh.C b/applications/utilities/parallelProcessing/reconstructParMesh/reconstructParMesh.C
index de40e93bad..3085ff1897 100644
--- a/applications/utilities/parallelProcessing/reconstructParMesh/reconstructParMesh.C
+++ b/applications/utilities/parallelProcessing/reconstructParMesh/reconstructParMesh.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/utilities/preProcessing/mapFields/mapLagrangian.C b/applications/utilities/preProcessing/mapFields/mapLagrangian.C
index 6f9545dc7b..37ad7c26c2 100644
--- a/applications/utilities/preProcessing/mapFields/mapLagrangian.C
+++ b/applications/utilities/preProcessing/mapFields/mapLagrangian.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/utilities/surface/surfaceCheck/surfaceCheck.C b/applications/utilities/surface/surfaceCheck/surfaceCheck.C
index f29f05169a..1000f84514 100644
--- a/applications/utilities/surface/surfaceCheck/surfaceCheck.C
+++ b/applications/utilities/surface/surfaceCheck/surfaceCheck.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/utilities/surface/surfaceRedistributePar/surfaceRedistributePar.C b/applications/utilities/surface/surfaceRedistributePar/surfaceRedistributePar.C
index 7d943df644..76a385733e 100644
--- a/applications/utilities/surface/surfaceRedistributePar/surfaceRedistributePar.C
+++ b/applications/utilities/surface/surfaceRedistributePar/surfaceRedistributePar.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/utilities/surface/surfaceSubset/surfaceSubset.C b/applications/utilities/surface/surfaceSubset/surfaceSubset.C
index fcc77e9005..5ca325acba 100644
--- a/applications/utilities/surface/surfaceSubset/surfaceSubset.C
+++ b/applications/utilities/surface/surfaceSubset/surfaceSubset.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/OSspecific/POSIX/clockTime/clockTime.C b/src/OSspecific/POSIX/clockTime/clockTime.C
index ca55e92f08..56b80ad505 100644
--- a/src/OSspecific/POSIX/clockTime/clockTime.C
+++ b/src/OSspecific/POSIX/clockTime/clockTime.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/coupled/coupledPolyPatch.C b/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/coupled/coupledPolyPatch.C
index 6625f022cb..523cb99b0b 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/coupled/coupledPolyPatch.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/coupled/coupledPolyPatch.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/combustionModels/FSD/FSD.H b/src/combustionModels/FSD/FSD.H
index ce1a64cab7..e5c396329a 100644
--- a/src/combustionModels/FSD/FSD.H
+++ b/src/combustionModels/FSD/FSD.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/dynamicMesh/boundaryMesh/boundaryMesh.C b/src/dynamicMesh/boundaryMesh/boundaryMesh.C
index e133b5f491..51be127dd7 100644
--- a/src/dynamicMesh/boundaryMesh/boundaryMesh.C
+++ b/src/dynamicMesh/boundaryMesh/boundaryMesh.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/dynamicMesh/meshCut/cellLooper/geomCellLooper.C b/src/dynamicMesh/meshCut/cellLooper/geomCellLooper.C
index b659f5b515..2b1310ab91 100644
--- a/src/dynamicMesh/meshCut/cellLooper/geomCellLooper.C
+++ b/src/dynamicMesh/meshCut/cellLooper/geomCellLooper.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/dynamicMesh/meshCut/directions/directions.C b/src/dynamicMesh/meshCut/directions/directions.C
index 6872057283..35170e9007 100644
--- a/src/dynamicMesh/meshCut/directions/directions.C
+++ b/src/dynamicMesh/meshCut/directions/directions.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/dynamicMesh/perfectInterface/perfectInterface.C b/src/dynamicMesh/perfectInterface/perfectInterface.C
index 8ea1abde59..36df880891 100644
--- a/src/dynamicMesh/perfectInterface/perfectInterface.C
+++ b/src/dynamicMesh/perfectInterface/perfectInterface.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/dynamicMesh/polyMeshAdder/faceCoupleInfo.C b/src/dynamicMesh/polyMeshAdder/faceCoupleInfo.C
index 2af617ff8c..8de21e2f08 100644
--- a/src/dynamicMesh/polyMeshAdder/faceCoupleInfo.C
+++ b/src/dynamicMesh/polyMeshAdder/faceCoupleInfo.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/faceCollapser.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/faceCollapser.C
index ec7053bd67..8f579fc4f7 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/faceCollapser.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/faceCollapser.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/edgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMesh.C b/src/edgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMesh.C
index b708a81428..aa046d6ec6 100644
--- a/src/edgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMesh.C
+++ b/src/edgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMesh.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/mesh/autoMesh/autoHexMesh/refinementFeatures/refinementFeatures.C b/src/mesh/autoMesh/autoHexMesh/refinementFeatures/refinementFeatures.C
index f832f96ce9..56533c0b00 100644
--- a/src/mesh/autoMesh/autoHexMesh/refinementFeatures/refinementFeatures.C
+++ b/src/mesh/autoMesh/autoHexMesh/refinementFeatures/refinementFeatures.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/meshTools/cellClassification/cellClassification.C b/src/meshTools/cellClassification/cellClassification.C
index 32baa1710a..6fc2b15a97 100644
--- a/src/meshTools/cellClassification/cellClassification.C
+++ b/src/meshTools/cellClassification/cellClassification.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/meshTools/indexedOctree/treeDataFace.C b/src/meshTools/indexedOctree/treeDataFace.C
index 9e64e28d33..ca928ab1c7 100644
--- a/src/meshTools/indexedOctree/treeDataFace.C
+++ b/src/meshTools/indexedOctree/treeDataFace.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/meshTools/indexedOctree/treeDataPrimitivePatch.C b/src/meshTools/indexedOctree/treeDataPrimitivePatch.C
index d477c96a95..6927cbaa50 100644
--- a/src/meshTools/indexedOctree/treeDataPrimitivePatch.C
+++ b/src/meshTools/indexedOctree/treeDataPrimitivePatch.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/meshTools/searchableSurface/searchablePlate.C b/src/meshTools/searchableSurface/searchablePlate.C
index 28287c2612..37404db051 100644
--- a/src/meshTools/searchableSurface/searchablePlate.C
+++ b/src/meshTools/searchableSurface/searchablePlate.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/meshTools/searchableSurface/searchableSurfaceWithGaps.C b/src/meshTools/searchableSurface/searchableSurfaceWithGaps.C
index 9509065eaa..93c95778b8 100644
--- a/src/meshTools/searchableSurface/searchableSurfaceWithGaps.C
+++ b/src/meshTools/searchableSurface/searchableSurfaceWithGaps.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/meshTools/searchableSurface/triSurfaceMesh.C b/src/meshTools/searchableSurface/triSurfaceMesh.C
index 67ee03364b..6bbfd22960 100644
--- a/src/meshTools/searchableSurface/triSurfaceMesh.C
+++ b/src/meshTools/searchableSurface/triSurfaceMesh.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/meshTools/triSurface/booleanOps/surfaceIntersection/surfaceIntersection.C b/src/meshTools/triSurface/booleanOps/surfaceIntersection/surfaceIntersection.C
index 41350cec64..394f796aa3 100644
--- a/src/meshTools/triSurface/booleanOps/surfaceIntersection/surfaceIntersection.C
+++ b/src/meshTools/triSurface/booleanOps/surfaceIntersection/surfaceIntersection.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/meshTools/triSurface/triSurfaceSearch/triSurfaceSearch.C b/src/meshTools/triSurface/triSurfaceSearch/triSurfaceSearch.C
index 0a65133531..28f6393b2c 100644
--- a/src/meshTools/triSurface/triSurfaceSearch/triSurfaceSearch.C
+++ b/src/meshTools/triSurface/triSurfaceSearch/triSurfaceSearch.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/meshTools/triSurface/triSurfaceTools/triSurfaceTools.C b/src/meshTools/triSurface/triSurfaceTools/triSurfaceTools.C
index e8bb749027..96794adaac 100644
--- a/src/meshTools/triSurface/triSurfaceTools/triSurfaceTools.C
+++ b/src/meshTools/triSurface/triSurfaceTools/triSurfaceTools.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/parallel/decompose/decompositionMethods/hierarchGeomDecomp/hierarchGeomDecomp.C b/src/parallel/decompose/decompositionMethods/hierarchGeomDecomp/hierarchGeomDecomp.C
index 929b7bf1c3..1098dfd828 100644
--- a/src/parallel/decompose/decompositionMethods/hierarchGeomDecomp/hierarchGeomDecomp.C
+++ b/src/parallel/decompose/decompositionMethods/hierarchGeomDecomp/hierarchGeomDecomp.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/sampling/probes/patchProbes.C b/src/sampling/probes/patchProbes.C
index 6d6ab0b0b8..b6792ea08c 100644
--- a/src/sampling/probes/patchProbes.C
+++ b/src/sampling/probes/patchProbes.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/sampling/sampledSurface/isoSurface/isoSurface.H b/src/sampling/sampledSurface/isoSurface/isoSurface.H
index 7e52bd26ed..1406ede0e0 100644
--- a/src/sampling/sampledSurface/isoSurface/isoSurface.H
+++ b/src/sampling/sampledSurface/isoSurface/isoSurface.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/sampling/sampledSurface/isoSurface/isoSurfaceCell.H b/src/sampling/sampledSurface/isoSurface/isoSurfaceCell.H
index 67f68d81c7..8a0b75c1b0 100644
--- a/src/sampling/sampledSurface/isoSurface/isoSurfaceCell.H
+++ b/src/sampling/sampledSurface/isoSurface/isoSurfaceCell.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/sampling/sampledSurface/isoSurface/sampledIsoSurface.C b/src/sampling/sampledSurface/isoSurface/sampledIsoSurface.C
index 92a588ce50..dd2a280a51 100644
--- a/src/sampling/sampledSurface/isoSurface/sampledIsoSurface.C
+++ b/src/sampling/sampledSurface/isoSurface/sampledIsoSurface.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/sampling/sampledSurface/sampledCuttingPlane/sampledCuttingPlane.C b/src/sampling/sampledSurface/sampledCuttingPlane/sampledCuttingPlane.C
index b90ce56536..7da10d7a57 100644
--- a/src/sampling/sampledSurface/sampledCuttingPlane/sampledCuttingPlane.C
+++ b/src/sampling/sampledSurface/sampledCuttingPlane/sampledCuttingPlane.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/sampling/sampledSurface/sampledTriSurfaceMesh/sampledTriSurfaceMesh.C b/src/sampling/sampledSurface/sampledTriSurfaceMesh/sampledTriSurfaceMesh.C
index 7b1ca38576..60ec434b13 100644
--- a/src/sampling/sampledSurface/sampledTriSurfaceMesh/sampledTriSurfaceMesh.C
+++ b/src/sampling/sampledSurface/sampledTriSurfaceMesh/sampledTriSurfaceMesh.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/triSurface/faceTriangulation/faceTriangulation.C b/src/triSurface/faceTriangulation/faceTriangulation.C
index 6a73d6f2a9..ea4482a13c 100644
--- a/src/triSurface/faceTriangulation/faceTriangulation.C
+++ b/src/triSurface/faceTriangulation/faceTriangulation.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

From db0ba8d11c257d0375c7914729157faa6eabdb78 Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Tue, 17 Apr 2012 16:50:21 +0100
Subject: [PATCH 213/317] compressibleInterFoam: Added new equation of state
 adiabaticPerfectFluid

---
 .../adiabaticPerfectFluid.C                   | 124 ++++++++++++++++++
 .../adiabaticPerfectFluid.H                   | 115 ++++++++++++++++
 2 files changed, 239 insertions(+)
 create mode 100644 applications/solvers/multiphase/compressibleInterFoam/phaseEquationsOfState/adiabaticPerfectFluid/adiabaticPerfectFluid.C
 create mode 100644 applications/solvers/multiphase/compressibleInterFoam/phaseEquationsOfState/adiabaticPerfectFluid/adiabaticPerfectFluid.H

diff --git a/applications/solvers/multiphase/compressibleInterFoam/phaseEquationsOfState/adiabaticPerfectFluid/adiabaticPerfectFluid.C b/applications/solvers/multiphase/compressibleInterFoam/phaseEquationsOfState/adiabaticPerfectFluid/adiabaticPerfectFluid.C
new file mode 100644
index 0000000000..82a195dca9
--- /dev/null
+++ b/applications/solvers/multiphase/compressibleInterFoam/phaseEquationsOfState/adiabaticPerfectFluid/adiabaticPerfectFluid.C
@@ -0,0 +1,124 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "adiabaticPerfectFluid.H"
+#include "volFields.H"
+#include "addToRunTimeSelectionTable.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace phaseEquationsOfState
+{
+    defineTypeNameAndDebug(adiabaticPerfectFluid, 0);
+
+    addToRunTimeSelectionTable
+    (
+        phaseEquationOfState,
+        adiabaticPerfectFluid,
+        dictionary
+    );
+}
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::phaseEquationsOfState::adiabaticPerfectFluid::adiabaticPerfectFluid
+(
+    const dictionary& dict
+)
+:
+    phaseEquationOfState(dict),
+    p0_("p0", dimPressure, dict.lookup("p0")),
+    rho0_("rho0", dimDensity, dict.lookup("rho0")),
+    gamma_("gamma", dimless, dict.lookup("gamma")),
+    B_("B", dimPressure, dict.lookup("B"))
+{}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::phaseEquationsOfState::adiabaticPerfectFluid::~adiabaticPerfectFluid()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+Foam::tmp<Foam::volScalarField>
+Foam::phaseEquationsOfState::adiabaticPerfectFluid::rho
+(
+    const volScalarField& p,
+    const volScalarField& T
+) const
+{
+    return tmp<Foam::volScalarField>
+    (
+        new volScalarField
+        (
+            IOobject
+            (
+                "rho",
+                p.time().timeName(),
+                p.mesh(),
+                IOobject::NO_READ,
+                IOobject::NO_WRITE,
+                false
+            ),
+            rho0_*pow((p + B_)/(p0_ + B_), 1.0/gamma_)
+        )
+    );
+}
+
+
+Foam::tmp<Foam::volScalarField>
+Foam::phaseEquationsOfState::adiabaticPerfectFluid::psi
+(
+    const volScalarField& p,
+    const volScalarField& T
+) const
+{
+    return tmp<Foam::volScalarField>
+    (
+        new volScalarField
+        (
+            IOobject
+            (
+                "psi",
+                p.time().timeName(),
+                p.mesh(),
+                IOobject::NO_READ,
+                IOobject::NO_WRITE,
+                false
+            ),
+            (rho0_/(gamma_*(p0_ + B_)))
+           *pow((p + B_)/(p0_ + B_), 1.0/gamma_ - 1.0)
+        )
+    );
+}
+
+
+// ************************************************************************* //
diff --git a/applications/solvers/multiphase/compressibleInterFoam/phaseEquationsOfState/adiabaticPerfectFluid/adiabaticPerfectFluid.H b/applications/solvers/multiphase/compressibleInterFoam/phaseEquationsOfState/adiabaticPerfectFluid/adiabaticPerfectFluid.H
new file mode 100644
index 0000000000..49f5218e49
--- /dev/null
+++ b/applications/solvers/multiphase/compressibleInterFoam/phaseEquationsOfState/adiabaticPerfectFluid/adiabaticPerfectFluid.H
@@ -0,0 +1,115 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::phaseEquationsOfState::adiabaticPerfectFluid
+
+Description
+    AdiabaticPerfectFluid phase density model.
+
+SourceFiles
+    adiabaticPerfectFluid.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef adiabaticPerfectFluid_H
+#define adiabaticPerfectFluid_H
+
+#include "phaseEquationOfState.H"
+#include "dimensionedTypes.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace phaseEquationsOfState
+{
+
+/*---------------------------------------------------------------------------*\
+                           Class adiabaticPerfectFluid Declaration
+\*---------------------------------------------------------------------------*/
+
+class adiabaticPerfectFluid
+:
+    public phaseEquationOfState
+{
+    // Private data
+
+        //- Reference pressure
+        dimensionedScalar p0_;
+
+        //- Reference density
+        dimensionedScalar rho0_;
+
+        //- The isentropic exponent
+        dimensionedScalar gamma_;
+
+        //- Pressure offset for a stiffened gas
+        dimensionedScalar B_;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("adiabaticPerfectFluid");
+
+
+    // Constructors
+
+        //- Construct from components
+        adiabaticPerfectFluid
+        (
+            const dictionary& dict
+        );
+
+
+    //- Destructor
+    virtual ~adiabaticPerfectFluid();
+
+
+    // Member Functions
+
+        tmp<volScalarField> rho
+        (
+            const volScalarField& p,
+            const volScalarField& T
+        ) const;
+
+        tmp<volScalarField> psi
+        (
+            const volScalarField& p,
+            const volScalarField& T
+        ) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace phaseEquationsOfState
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //

From 336f84fd0eccdd4d85bebbc5ba4fc77619af40f5 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Tue, 17 Apr 2012 17:59:29 +0100
Subject: [PATCH 214/317] ENH: TableFile: improved error message

---
 .../primitives/functions/DataEntry/TableFile/TableFile.C | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/OpenFOAM/primitives/functions/DataEntry/TableFile/TableFile.C b/src/OpenFOAM/primitives/functions/DataEntry/TableFile/TableFile.C
index 5323ac6a85..15fe8b57a2 100644
--- a/src/OpenFOAM/primitives/functions/DataEntry/TableFile/TableFile.C
+++ b/src/OpenFOAM/primitives/functions/DataEntry/TableFile/TableFile.C
@@ -45,6 +45,15 @@ Foam::TableFile<Type>::TableFile(const word& entryName, const dictionary& dict)
     fileName expandedFile(fName_);
     IFstream is(expandedFile.expand());
 
+    if (!is.good())
+    {
+        FatalIOErrorIn
+        (
+            "TableFile<Type>::TableFile(const word&, const dictionary&)",
+            is
+        )   << "Cannot open file." << exit(FatalIOError);
+    }
+
     is  >> this->table_;
 
     TableBase<Type>::check();

From 5df52bc9e62165d6b7397d5904146c015ca560bf Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Tue, 17 Apr 2012 18:00:03 +0100
Subject: [PATCH 215/317] ENH: objectRegistry: subRegistry functionality
 extended

---
 .../db/objectRegistry/objectRegistry.C        | 20 +++++++++++++++++--
 .../db/objectRegistry/objectRegistry.H        | 11 +++++++---
 2 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/src/OpenFOAM/db/objectRegistry/objectRegistry.C b/src/OpenFOAM/db/objectRegistry/objectRegistry.C
index 6fcaed2e2e..09307c3a5c 100644
--- a/src/OpenFOAM/db/objectRegistry/objectRegistry.C
+++ b/src/OpenFOAM/db/objectRegistry/objectRegistry.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -151,9 +151,25 @@ Foam::wordList Foam::objectRegistry::sortedNames(const word& ClassName) const
 
 const Foam::objectRegistry& Foam::objectRegistry::subRegistry
 (
-    const word& name
+    const word& name,
+    const bool forceCreate
 ) const
 {
+    if (forceCreate && !foundObject<objectRegistry>(name))
+    {
+        objectRegistry* fieldsCachePtr = new objectRegistry
+        (
+            IOobject
+            (
+                name,
+                time().constant(),
+                *this,
+                IOobject::NO_READ,
+                IOobject::NO_WRITE
+            )
+        );
+        fieldsCachePtr->store();
+    }
     return lookupObject<objectRegistry>(name);
 }
 
diff --git a/src/OpenFOAM/db/objectRegistry/objectRegistry.H b/src/OpenFOAM/db/objectRegistry/objectRegistry.H
index 34ddc8fc34..48cabcc1cf 100644
--- a/src/OpenFOAM/db/objectRegistry/objectRegistry.H
+++ b/src/OpenFOAM/db/objectRegistry/objectRegistry.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -147,8 +147,13 @@ public:
             template<class Type>
             wordList names() const;
 
-            //- Lookup and return a const sub-objectRegistry
-            const objectRegistry& subRegistry(const word& name) const;
+            //- Lookup and return a const sub-objectRegistry. Optionally create
+            //  it if it does not exist.
+            const objectRegistry& subRegistry
+            (
+                const word& name,
+                const bool forceCreate = false
+            ) const;
 
             //- Lookup and return all objects of the given Type
             template<class Type>

From 4356070908b8e5d99829f61f10d5a65081a72286 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Tue, 17 Apr 2012 18:00:38 +0100
Subject: [PATCH 216/317] ENH: UIndirectList: value_type mapped through

---
 .../containers/Lists/UIndirectList/UIndirectList.H        | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/OpenFOAM/containers/Lists/UIndirectList/UIndirectList.H b/src/OpenFOAM/containers/Lists/UIndirectList/UIndirectList.H
index 33e929bacc..e33acfa464 100644
--- a/src/OpenFOAM/containers/Lists/UIndirectList/UIndirectList.H
+++ b/src/OpenFOAM/containers/Lists/UIndirectList/UIndirectList.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -119,6 +119,12 @@ public:
             inline void operator=(const T&);
 
 
+    // STL type definitions
+
+        //- Type of values the UList contains.
+        typedef T value_type;
+
+
     // Ostream operator
 
         //- Write UIndirectList to Ostream

From 7a4e6e86ba22ad5e72b6768bb7a53e25c196f9c7 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Tue, 17 Apr 2012 18:01:09 +0100
Subject: [PATCH 217/317] ENH: ReadFields: read into per-time objectRegistry

---
 src/OpenFOAM/fields/ReadFields/ReadFields.C | 132 +++++++++++++++++++-
 src/OpenFOAM/fields/ReadFields/ReadFields.H |  24 +++-
 2 files changed, 154 insertions(+), 2 deletions(-)

diff --git a/src/OpenFOAM/fields/ReadFields/ReadFields.C b/src/OpenFOAM/fields/ReadFields/ReadFields.C
index 7a17b362dc..a679082b41 100644
--- a/src/OpenFOAM/fields/ReadFields/ReadFields.C
+++ b/src/OpenFOAM/fields/ReadFields/ReadFields.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -127,4 +127,134 @@ Foam::wordList Foam::ReadFields
 }
 
 
+template<class GeoField>
+void Foam::ReadFields
+(
+    const word& fieldName,
+    const typename GeoField::Mesh& mesh,
+    const wordList& timeNames,
+    objectRegistry& fieldsCache
+)
+{
+    // Collect all times that are no longer used
+    {
+        HashSet<word> usedTimes(timeNames);
+
+        DynamicList<word> unusedTimes(fieldsCache.size());
+
+        forAllIter(objectRegistry, fieldsCache, timeIter)
+        {
+            const word& tm = timeIter.key();
+            if (!usedTimes.found(tm))
+            {
+                unusedTimes.append(tm);
+            }
+        }
+
+        //Info<< "Unloading times " << unusedTimes << endl;
+
+        forAll(unusedTimes, i)
+        {
+            objectRegistry& timeCache = const_cast<objectRegistry&>
+            (
+                fieldsCache.lookupObject<objectRegistry>(unusedTimes[i])
+            );
+            fieldsCache.checkOut(timeCache);
+        }
+    }
+
+
+    // Load any new fields
+    forAll(timeNames, i)
+    {
+        const word& tm = timeNames[i];
+
+        // Create if not found
+        if (!fieldsCache.found(tm))
+        {
+            //Info<< "Creating registry for time " << tm << endl;
+
+            // Create objectRegistry if not found
+            objectRegistry* timeCachePtr = new objectRegistry
+            (
+                IOobject
+                (
+                    tm,
+                    tm,
+                    fieldsCache,
+                    IOobject::NO_READ,
+                    IOobject::NO_WRITE
+                )
+            );
+            timeCachePtr->store();
+        }
+
+        // Obtain cache for current time
+        const objectRegistry& timeCache =
+            fieldsCache.lookupObject<objectRegistry>
+            (
+                tm
+            );
+
+        // Store field if not found
+        if (!timeCache.found(fieldName))
+        {
+            //Info<< "Loading field " << fieldName
+            //    << " for time " << tm << endl;
+
+            GeoField loadedFld
+            (
+                IOobject
+                (
+                    fieldName,
+                    tm,
+                    mesh.thisDb(),
+                    IOobject::MUST_READ,
+                    IOobject::NO_WRITE,
+                    false
+                ),
+                mesh
+            );
+
+            // Transfer to timeCache (new objectRegistry and store flag)
+            GeoField* fldPtr = new GeoField
+            (
+                IOobject
+                (
+                    fieldName,
+                    tm,
+                    timeCache,
+                    IOobject::NO_READ,
+                    IOobject::NO_WRITE
+                ),
+                loadedFld
+            );
+            fldPtr->store();
+        }
+    }
+}
+
+
+template<class GeoField>
+void Foam::ReadFields
+(
+    const word& fieldName,
+    const typename GeoField::Mesh& mesh,
+    const wordList& timeNames,
+    const word& registryName
+)
+{
+    ReadFields<GeoField>
+    (
+        fieldName,
+        mesh,
+        timeNames,
+        const_cast<objectRegistry&>
+        (
+            mesh.thisDb().subRegistry(registryName, true)
+        )
+    );
+}
+
+
 // ************************************************************************* //
diff --git a/src/OpenFOAM/fields/ReadFields/ReadFields.H b/src/OpenFOAM/fields/ReadFields/ReadFields.H
index 11ff547935..ac4bdb37c7 100644
--- a/src/OpenFOAM/fields/ReadFields/ReadFields.H
+++ b/src/OpenFOAM/fields/ReadFields/ReadFields.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -55,6 +55,28 @@ wordList ReadFields
     const bool syncPar = true
 );
 
+//- Helper routine to read GeometricFields. The fieldsCache is per time
+//  an objectRegistry of all stored fields
+template<class GeoField>
+static void ReadFields
+(
+    const word& fieldName,
+    const typename GeoField::Mesh& mesh,
+    const wordList& timeNames,
+    objectRegistry& fieldsCache
+);
+
+//- Helper routine to read GeometricFields. The fieldsCache is per time
+//  an objectRegistry of all stored fields
+template<class GeoField>
+static void ReadFields
+(
+    const word& fieldName,
+    const typename GeoField::Mesh& mesh,
+    const wordList& timeNames,
+    const word& registryName = "fieldsCache"
+);
+
 } // End namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

From 78bd261ce98b915c6b0673f646518ed7e27b60de Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Tue, 17 Apr 2012 18:02:25 +0100
Subject: [PATCH 218/317] ENH: interpolationWeights: run-time selectable
 interpolation

---
 src/OpenFOAM/Make/files                       |   7 +
 .../GeometricField/uniformInterpolate.C       | 142 ++++++++++
 .../GeometricField/uniformInterpolate.H       |  83 ++++++
 .../interpolationWeights.C                    | 121 +++++++++
 .../interpolationWeights.H                    | 144 ++++++++++
 .../interpolationWeightsTemplates.C           | 174 ++++++++++++
 .../linearInterpolationWeights.C              | 249 ++++++++++++++++++
 .../linearInterpolationWeights.H              | 120 +++++++++
 .../splineInterpolationWeights.C              | 228 ++++++++++++++++
 .../splineInterpolationWeights.H              | 121 +++++++++
 .../functions/DataEntry/Table/TableBase.C     | 189 ++++++++-----
 .../functions/DataEntry/Table/TableBase.H     |  23 +-
 12 files changed, 1529 insertions(+), 72 deletions(-)
 create mode 100644 src/OpenFOAM/fields/GeometricFields/GeometricField/uniformInterpolate.C
 create mode 100644 src/OpenFOAM/fields/GeometricFields/GeometricField/uniformInterpolate.H
 create mode 100644 src/OpenFOAM/interpolations/interpolationWeights/interpolationWeights/interpolationWeights.C
 create mode 100644 src/OpenFOAM/interpolations/interpolationWeights/interpolationWeights/interpolationWeights.H
 create mode 100644 src/OpenFOAM/interpolations/interpolationWeights/interpolationWeights/interpolationWeightsTemplates.C
 create mode 100644 src/OpenFOAM/interpolations/interpolationWeights/linearInterpolationWeights/linearInterpolationWeights.C
 create mode 100644 src/OpenFOAM/interpolations/interpolationWeights/linearInterpolationWeights/linearInterpolationWeights.H
 create mode 100644 src/OpenFOAM/interpolations/interpolationWeights/splineInterpolationWeights/splineInterpolationWeights.C
 create mode 100644 src/OpenFOAM/interpolations/interpolationWeights/splineInterpolationWeights/splineInterpolationWeights.H

diff --git a/src/OpenFOAM/Make/files b/src/OpenFOAM/Make/files
index c58cf1afc2..948ec4dbe7 100644
--- a/src/OpenFOAM/Make/files
+++ b/src/OpenFOAM/Make/files
@@ -576,6 +576,13 @@ $(interpolations)/interpolationTable/tableReaders/tableReaders.C
 $(interpolations)/interpolationTable/tableReaders/openFoam/openFoamTableReaders.C
 $(interpolations)/interpolationTable/tableReaders/csv/csvTableReaders.C
 
+interpolationWeights = $(interpolations)/interpolationWeights
+$(interpolationWeights)/interpolationWeights/interpolationWeights.C
+$(interpolationWeights)/linearInterpolationWeights/linearInterpolationWeights.C
+$(interpolationWeights)/splineInterpolationWeights/splineInterpolationWeights.C
+
+
+
 algorithms/indexedOctree/indexedOctreeName.C
 algorithms/indexedOctree/treeDataCell.C
 
diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricField/uniformInterpolate.C b/src/OpenFOAM/fields/GeometricFields/GeometricField/uniformInterpolate.C
new file mode 100644
index 0000000000..968f5f4c0f
--- /dev/null
+++ b/src/OpenFOAM/fields/GeometricFields/GeometricField/uniformInterpolate.C
@@ -0,0 +1,142 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class GeoField>
+Foam::tmp<GeoField> Foam::uniformInterpolate
+(
+    const HashPtrTable<GeoField, label, Hash<label> >& fields,
+    const labelList& indices,
+    const scalarField& weights
+)
+{
+    const GeoField& field0 = *(*fields.begin());
+
+    // Interpolate
+    tmp<GeoField> tfld
+    (
+        new GeoField
+        (
+            IOobject
+            (
+                "uniformInterpolate(" + field0.name() + ')',
+                field0.time().timeName(),
+                field0.db(),
+                IOobject::NO_READ,
+                IOobject::AUTO_WRITE
+            ),
+            weights[0]*(*fields[indices[0]])
+        )
+    );
+    GeoField& fld = tfld();
+
+    for (label i = 1; i < indices.size(); ++i)
+    {
+        fld += weights[i]*(*fields[indices[i]]);
+    }
+
+    return tfld;
+}
+
+
+template<class GeoField>
+Foam::tmp<GeoField> Foam::uniformInterpolate
+(
+    const IOobject& fieldIO,
+    const word& fieldName,
+    const wordList& times,
+    const scalarField& weights,
+    const objectRegistry& fieldsCache
+)
+{
+    // Look up the first field
+    const objectRegistry& time0Fields = fieldsCache.lookupObject
+    <
+        const objectRegistry
+    >
+    (
+        times[0]
+    );
+    const GeoField& field0 = time0Fields.lookupObject
+    <
+        const GeoField
+    >
+    (
+        fieldName
+    );
+
+
+    // Interpolate
+    tmp<GeoField> tfld(new GeoField(fieldIO, weights[0]*field0));
+    GeoField& fld = tfld();
+
+    for (label i = 1; i < times.size(); ++i)
+    {
+        const objectRegistry& timeIFields = fieldsCache.lookupObject
+        <
+            const objectRegistry
+        >
+        (
+            times[i]
+        );
+        const GeoField& fieldI = timeIFields.lookupObject
+        <
+            const GeoField
+        >
+        (
+            fieldName
+        );
+
+        fld += weights[i]*fieldI;
+    }
+
+    return tfld;
+}
+
+
+template<class GeoField>
+Foam::tmp<GeoField> Foam::uniformInterpolate
+(
+    const IOobject& fieldIO,
+    const word& fieldName,
+    const wordList& times,
+    const scalarField& weights,
+    const word& registryName
+)
+{
+    return uniformInterpolate<GeoField>
+    (
+        fieldIO,
+        fieldName,
+        times,
+        weights,
+        fieldIO.db().subRegistry(registryName, true)
+    );
+}
+
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricField/uniformInterpolate.H b/src/OpenFOAM/fields/GeometricFields/GeometricField/uniformInterpolate.H
new file mode 100644
index 0000000000..f196f71c19
--- /dev/null
+++ b/src/OpenFOAM/fields/GeometricFields/GeometricField/uniformInterpolate.H
@@ -0,0 +1,83 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "GeometricField.H"
+#include "HashPtrTable.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// * * * * * * * * * * * * * * * Global functions  * * * * * * * * * * * * * //
+
+//- Interpolate selected fields (given by indices and corresponding weights)
+//  (boundary type becomes calculated). Fields stored per index. Field gets name
+//  "uniformInterpolate(" + fld.name() + ')'.
+template<class GeoField>
+tmp<GeoField> uniformInterpolate
+(
+    const HashPtrTable<GeoField, label, Hash<label> >& fields,
+    const labelList& indices,
+    const scalarField& weights
+);
+
+//- Interpolate fields. fieldsCache contains per timeName all loaded fields.
+//  Resulting field gets properties according to fieldIO
+template<class GeoField>
+tmp<GeoField> uniformInterpolate
+(
+    const IOobject& fieldIO,
+    const word& fieldName,
+    const wordList& times,
+    const scalarField& weights,
+    const objectRegistry& fieldsCache
+);
+
+//- Interpolate fields. fieldsCache contains per timeName all loaded fields.
+//  Resulting field gets properties according to fieldIO
+template<class GeoField>
+tmp<GeoField> uniformInterpolate
+(
+    const IOobject& fieldIO,
+    const word& fieldName,
+    const wordList& times,
+    const scalarField& weights,
+    const word& registryName = "fieldsCache"
+);
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+#   include "uniformInterpolate.C"
+#endif
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/interpolations/interpolationWeights/interpolationWeights/interpolationWeights.C b/src/OpenFOAM/interpolations/interpolationWeights/interpolationWeights/interpolationWeights.C
new file mode 100644
index 0000000000..30fc2fc0f6
--- /dev/null
+++ b/src/OpenFOAM/interpolations/interpolationWeights/interpolationWeights/interpolationWeights.C
@@ -0,0 +1,121 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "interpolationWeights.H"
+#include "addToRunTimeSelectionTable.H"
+#include "Time.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+defineTypeNameAndDebug(interpolationWeights, 0);
+defineRunTimeSelectionTable(interpolationWeights, word);
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+interpolationWeights::interpolationWeights
+(
+    const scalarField& samples
+)
+:
+    samples_(samples)
+{}
+
+
+// * * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * //
+
+autoPtr<interpolationWeights> interpolationWeights::New
+(
+    const word& type,
+    const scalarField& samples
+)
+{
+    Info<< nl << "Selecting interpolationWeights "
+        << type << endl;
+
+    wordConstructorTable::iterator cstrIter =
+        wordConstructorTablePtr_->find(type);
+
+    if (cstrIter == wordConstructorTablePtr_->end())
+    {
+        FatalErrorIn
+        (
+            "interpolationWeights::New(const word&, "
+            "const scalarField&)"
+        )   << "Unknown interpolationWeights type "
+            << type
+            << endl << endl
+            << "Valid interpolationWeights types are :" << endl
+            << wordConstructorTablePtr_->sortedToc()
+            << exit(FatalError);
+    }
+
+    return autoPtr<interpolationWeights>(cstrIter()(samples));
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+interpolationWeights::~interpolationWeights()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+//objectRegistry& interpolationWeights::registry
+//(
+//    const objectRegistry& obr,
+//    const word& name
+//)
+//{
+//    if (!obr.foundObject<objectRegistry>(name))
+//    {
+//        objectRegistry* fieldsCachePtr = new objectRegistry
+//        (
+//            IOobject
+//            (
+//                name,
+//                obr.time().constant(),
+//                obr,
+//                IOobject::NO_READ,
+//                IOobject::NO_WRITE
+//            )
+//        );
+//        fieldsCachePtr->store();
+//    }
+//    return const_cast<objectRegistry&>(obr.subRegistry(name));
+//}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/interpolations/interpolationWeights/interpolationWeights/interpolationWeights.H b/src/OpenFOAM/interpolations/interpolationWeights/interpolationWeights/interpolationWeights.H
new file mode 100644
index 0000000000..889076a1ee
--- /dev/null
+++ b/src/OpenFOAM/interpolations/interpolationWeights/interpolationWeights/interpolationWeights.H
@@ -0,0 +1,144 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::interpolationWeights
+
+Description
+    Abstract base class for interpolating in 1D
+
+SourceFiles
+    interpolationWeights.C
+    interpolationWeightsTemplates.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef interpolationWeights_H
+#define interpolationWeights_H
+
+#include "scalarField.H"
+#include "autoPtr.H"
+#include "runTimeSelectionTables.H"
+#include "pointField.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+class fvMesh;
+class objectRegistry;
+
+/*---------------------------------------------------------------------------*\
+                       Class interpolationWeights Declaration
+\*---------------------------------------------------------------------------*/
+
+class interpolationWeights
+{
+
+private:
+
+    // Private Member Functions
+
+        //- Disallow default bitwise copy construct
+        interpolationWeights(const interpolationWeights&);
+
+        //- Disallow default bitwise assignment
+        void operator=(const interpolationWeights&);
+
+protected:
+
+        const scalarField& samples_;
+
+public:
+
+    //- Runtime type information
+    TypeName("interpolationWeights");
+
+
+    // Declare run-time constructor selection table
+
+        declareRunTimeSelectionTable
+        (
+            autoPtr,
+            interpolationWeights,
+            word,
+            (
+                const scalarField& samples
+            ),
+            (samples)
+        );
+
+
+    // Constructors
+
+        //- Construct from components
+        interpolationWeights(const scalarField& samples);
+
+
+    // Selectors
+
+        //- Return a reference to the selected interpolationWeights
+        static autoPtr<interpolationWeights> New
+        (
+            const word& type,
+            const scalarField& samples
+        );
+
+
+    //- Destructor
+    virtual ~interpolationWeights();
+
+
+    // Member Functions
+
+        //- Calculate weights and indices to calculate t from samples.
+        //  Returns true if indices changed.
+        virtual bool valueWeights
+        (
+            const scalar t,
+            labelList& indices,
+            scalarField& weights
+        ) const = 0;
+
+        //- Calculate weights and indices to calculate integrand of t1..t2
+        //  from samples. Returns true if indices changed.
+        virtual bool integrationWeights
+        (
+            const scalar t1,
+            const scalar t2,
+            labelList& indices,
+            scalarField& weights
+        ) const = 0;
+
+};
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/interpolations/interpolationWeights/interpolationWeights/interpolationWeightsTemplates.C b/src/OpenFOAM/interpolations/interpolationWeights/interpolationWeights/interpolationWeightsTemplates.C
new file mode 100644
index 0000000000..aac670138d
--- /dev/null
+++ b/src/OpenFOAM/interpolations/interpolationWeights/interpolationWeights/interpolationWeightsTemplates.C
@@ -0,0 +1,174 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "interpolationWeights.H"
+#include "ListOps.H"
+#include "IOobject.H"
+#include "HashSet.H"
+#include "objectRegistry.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+//template<class GeoField>
+//void interpolationWeights::readFields
+//(
+//    const word& fieldName,
+//    const typename GeoField::Mesh& mesh,
+//    const wordList& timeNames,
+//    objectRegistry& fieldsCache
+//)
+//{
+//    // Collect all times that are no longer used
+//    {
+//        HashSet<word> usedTimes(timeNames);
+//
+//        DynamicList<word> unusedTimes(fieldsCache.size());
+//
+//        forAllIter(objectRegistry, fieldsCache, timeIter)
+//        {
+//            const word& tm = timeIter.key();
+//            if (!usedTimes.found(tm))
+//            {
+//                unusedTimes.append(tm);
+//            }
+//        }
+//
+//        //Info<< "Unloading times " << unusedTimes << endl;
+//
+//        forAll(unusedTimes, i)
+//        {
+//            objectRegistry& timeCache = const_cast<objectRegistry&>
+//            (
+//                fieldsCache.lookupObject<objectRegistry>(unusedTimes[i])
+//            );
+//            fieldsCache.checkOut(timeCache);
+//        }
+//    }
+//
+//
+//    // Load any new fields
+//    forAll(timeNames, i)
+//    {
+//        const word& tm = timeNames[i];
+//
+//        // Create if not found
+//        if (!fieldsCache.found(tm))
+//        {
+//            //Info<< "Creating registry for time " << tm << endl;
+//
+//            // Create objectRegistry if not found
+//            objectRegistry* timeCachePtr = new objectRegistry
+//            (
+//                IOobject
+//                (
+//                    tm,
+//                    tm,
+//                    fieldsCache,
+//                    IOobject::NO_READ,
+//                    IOobject::NO_WRITE
+//                )
+//            );
+//            timeCachePtr->store();
+//        }
+//
+//        // Obtain cache for current time
+//        const objectRegistry& timeCache =
+//            fieldsCache.lookupObject<objectRegistry>
+//            (
+//                tm
+//            );
+//
+//        // Store field if not found
+//        if (!timeCache.found(fieldName))
+//        {
+//            //Info<< "Loading field " << fieldName
+//            //    << " for time " << tm << endl;
+//
+//            GeoField loadedFld
+//            (
+//                IOobject
+//                (
+//                    fieldName,
+//                    tm,
+//                    mesh.thisDb(),
+//                    IOobject::MUST_READ,
+//                    IOobject::NO_WRITE,
+//                    false
+//                ),
+//                mesh
+//            );
+//
+//            // Transfer to timeCache (new objectRegistry and store flag)
+//            GeoField* fldPtr = new GeoField
+//            (
+//                IOobject
+//                (
+//                    fieldName,
+//                    tm,
+//                    timeCache,
+//                    IOobject::NO_READ,
+//                    IOobject::NO_WRITE
+//                ),
+//                loadedFld
+//            );
+//            fldPtr->store();
+//        }
+//    }
+//}
+//
+//
+//template<class GeoField>
+//void interpolationWeights::readFields
+//(
+//    const word& fieldName,
+//    const typename GeoField::Mesh& mesh,
+//    const wordList& timeNames,
+//    const word& registryName
+//)
+//{
+//    readFields<GeoField>
+//    (
+//        fieldName,
+//        mesh,
+//        timeNames,
+//        //registry(mesh.thisDb(), registryName)
+//        const_cast<objectRegistry&>
+//        (
+//            mesh.thisDb().subRegistry(registryName, true)
+//        )
+//    );
+//}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/interpolations/interpolationWeights/linearInterpolationWeights/linearInterpolationWeights.C b/src/OpenFOAM/interpolations/interpolationWeights/linearInterpolationWeights/linearInterpolationWeights.C
new file mode 100644
index 0000000000..18233f1825
--- /dev/null
+++ b/src/OpenFOAM/interpolations/interpolationWeights/linearInterpolationWeights/linearInterpolationWeights.C
@@ -0,0 +1,249 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "linearInterpolationWeights.H"
+#include "addToRunTimeSelectionTable.H"
+#include "ListOps.H"
+#include "Pair.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+defineTypeNameAndDebug(linearInterpolationWeights, 0);
+addToRunTimeSelectionTable
+(
+    interpolationWeights,
+    linearInterpolationWeights,
+    word
+);
+
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+Foam::Pair<Foam::scalar> linearInterpolationWeights::integrationWeights
+(
+    const label i,
+    const scalar t
+) const
+{
+    // t is in range samples_[i] .. samples_[i+1]
+
+    scalar s = (t-samples_[i])/(samples_[i+1]-samples_[i]);
+
+    if (s < -SMALL || s > 1+SMALL)
+    {
+        FatalErrorIn("linearInterpolationWeights::integrationWeights(..)")
+            << "Value " << t << " outside range " << samples_[i]
+            << " .. " << samples_[i+1]
+            << exit(FatalError);
+    }
+
+    scalar d = samples_[i+1]-t;
+
+    return Pair<scalar>(d*0.5*(1-s), d*0.5*(1+s));
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+linearInterpolationWeights::linearInterpolationWeights
+(
+    const scalarField& samples
+)
+:
+    interpolationWeights(samples),
+    index_(-1)
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+bool linearInterpolationWeights::valueWeights
+(
+    const scalar t,
+    labelList& indices,
+    scalarField& weights
+) const
+{
+    bool indexChanged = false;
+
+    // Check if current timeIndex is still valid
+    if
+    (
+        index_ >= 0
+     && index_ < samples_.size()
+     && (
+            samples_[index_] <= t
+         && (index_ == samples_.size()-1 || t <= samples_[index_+1])
+        )
+    )
+    {
+        // index_ still at correct slot
+    }
+    else
+    {
+        // search for correct index
+        index_ = findLower(samples_, t);
+        indexChanged = true;
+    }
+
+
+    if (index_ == -1)
+    {
+        // Use first element only
+        indices.setSize(1);
+        weights.setSize(1);
+        indices[0] = 0;
+        weights[0] = 1.0;
+    }
+    else if (index_ == samples_.size()-1)
+    {
+        // Use last element only
+        indices.setSize(1);
+        weights.setSize(1);
+        indices[0] = samples_.size()-1;
+        weights[0] = 1.0;
+    }
+    else
+    {
+        // Interpolate
+        indices.setSize(2);
+        weights.setSize(2);
+
+        indices[0] = index_;
+        indices[1] = index_+1;
+
+        scalar t0 = samples_[indices[0]];
+        scalar t1 = samples_[indices[1]];
+        scalar deltaT = t1-t0;
+
+        weights[0] = (t1-t)/deltaT;
+        weights[1] = 1.0-weights[0];
+    }
+
+    return indexChanged;
+}
+
+
+bool linearInterpolationWeights::integrationWeights
+(
+    const scalar t1,
+    const scalar t2,
+    labelList& indices,
+    scalarField& weights
+) const
+{
+    if (t2 < t1-VSMALL)
+    {
+        FatalErrorIn("linearInterpolationWeights::integrationWeights(..)")
+            << "Integration should be in positive direction."
+            <<  " t1:" << t1 << " t2:" << t2
+            << exit(FatalError);
+    }
+
+    // Currently no fancy logic on cached index
+    label i1 = findLower(samples_, t1);
+    label i2 = findLower(samples_, t2);
+
+    // For now just fail if any outside table
+    if (i1 == -1 || i2 == samples_.size()-1)
+    {
+        FatalErrorIn("linearInterpolationWeights::integrationWeights(..)")
+            << "Integrating outside table " << samples_[0] << ".."
+            << samples_.last() << " not implemented."
+            << " t1:" << t1 << " t2:" << t2 << exit(FatalError);
+    }
+
+    label nIndices = i2-i1+2;
+
+
+    // Determine if indices already correct
+    bool anyChanged = false;
+
+    if (nIndices != indices.size())
+    {
+        anyChanged = true;
+    }
+    else
+    {
+        // Closer check
+
+        label index = i1;
+        forAll(indices, i)
+        {
+            if (indices[i] != index)
+            {
+                anyChanged = true;
+                break;
+            }
+            index++;
+        }
+    }
+
+    indices.setSize(nIndices);
+    weights.setSize(nIndices);
+    weights = 0.0;
+
+    // Sum from i1+1 to i2+1
+    for (label i = i1+1; i <= i2; i++)
+    {
+        scalar d = samples_[i+1]-samples_[i];
+        indices[i-i1] = i;
+        weights[i-i1] += 0.5*d;
+        indices[i+1-i1] = i+1;
+        weights[i+1-i1] += 0.5*d;
+    }
+
+    // Add from i1 to t1
+    {
+        Pair<scalar> i1Tot1 = integrationWeights(i1, t1);
+        indices[0] = i1;
+        weights[0] += i1Tot1.first();
+        indices[1] = i1+1;
+        weights[1] += i1Tot1.second();
+    }
+
+    // Subtract from t2 to i2+1
+    {
+        Pair<scalar> wghts = integrationWeights(i2, t2);
+        indices[i2-i1] = i2;
+        weights[i2-i1] += -wghts.first();
+        indices[i2-i1+1] = i2+1;
+        weights[i2-i1+1] += -wghts.second();
+    }
+
+    return anyChanged;
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/interpolations/interpolationWeights/linearInterpolationWeights/linearInterpolationWeights.H b/src/OpenFOAM/interpolations/interpolationWeights/linearInterpolationWeights/linearInterpolationWeights.H
new file mode 100644
index 0000000000..871eb30599
--- /dev/null
+++ b/src/OpenFOAM/interpolations/interpolationWeights/linearInterpolationWeights/linearInterpolationWeights.H
@@ -0,0 +1,120 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::linearInterpolationWeights
+
+Description
+
+SourceFiles
+    linearInterpolationWeights.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef linearInterpolationWeights_H
+#define linearInterpolationWeights_H
+
+#include "interpolationWeights.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                  Class linearInterpolationWeights Declaration
+\*---------------------------------------------------------------------------*/
+
+class linearInterpolationWeights
+:
+    public interpolationWeights
+{
+
+private:
+
+    // Private data
+
+        //- Cached index in samples from previous invocation
+        mutable label index_;
+
+    // Private Member Functions
+
+        //- Get weights of i and i+1 to calculate integration from t to
+        //  samples_[i+1]
+        Pair<scalar> integrationWeights
+        (
+            const label i,
+            const scalar t
+        ) const;
+
+public:
+
+    //- Runtime type information
+    TypeName("linear");
+
+    // Constructors
+
+        //- Construct from components
+        linearInterpolationWeights
+        (
+            const scalarField& samples
+        );
+
+
+    //- Destructor
+    virtual ~linearInterpolationWeights()
+    {}
+
+
+    // Member Functions
+
+        //- Calculate weights and indices to calculate t from samples.
+        //  Returns true if indices changed.
+        virtual bool valueWeights
+        (
+            const scalar t,
+            labelList& indices,
+            scalarField& weights
+        ) const;
+
+        //- Calculate weights and indices to calculate integrand of t1..t2
+        //  from samples. Returns true if indices changed.
+        virtual bool integrationWeights
+        (
+            const scalar t1,
+            const scalar t2,
+            labelList& indices,
+            scalarField& weights
+        ) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/interpolations/interpolationWeights/splineInterpolationWeights/splineInterpolationWeights.C b/src/OpenFOAM/interpolations/interpolationWeights/splineInterpolationWeights/splineInterpolationWeights.C
new file mode 100644
index 0000000000..854146cdff
--- /dev/null
+++ b/src/OpenFOAM/interpolations/interpolationWeights/splineInterpolationWeights/splineInterpolationWeights.C
@@ -0,0 +1,228 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "splineInterpolationWeights.H"
+#include "addToRunTimeSelectionTable.H"
+#include "ListOps.H"
+#include "linearInterpolationWeights.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+defineTypeNameAndDebug(splineInterpolationWeights, 0);
+addToRunTimeSelectionTable
+(
+    interpolationWeights,
+    splineInterpolationWeights,
+    word
+);
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+splineInterpolationWeights::splineInterpolationWeights
+(
+    const scalarField& samples,
+    const bool checkEqualDistance
+)
+:
+    interpolationWeights(samples),
+    index_(-1)
+{
+    if (checkEqualDistance && samples_.size() > 2)
+    {
+        const scalar interval = samples_[1]-samples[0];
+        for (label i = 2; i < samples_.size(); i++)
+        {
+            scalar d = samples_[i]-samples[i-1];
+
+            if (mag(d-interval) > SMALL)
+            {
+                WarningIn
+                (
+                    "splineInterpolationWeights::splineInterpolationWeights"
+                    "(const scalarField&)"
+                )   << "Spline interpolation only valid for constant intervals."
+                    << nl
+                    << "Interval 0-1 : " << interval << nl
+                    << "Interval " << i-1 << '-' << i << " : "
+                    << d << endl;
+            }
+        }
+    }
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+bool splineInterpolationWeights::valueWeights
+(
+    const scalar t,
+    labelList& indices,
+    scalarField& weights
+) const
+{
+    bool indexChanged = false;
+
+    // linear interpolation
+    if (samples_.size() <= 2)
+    {
+        return linearInterpolationWeights(samples_).valueWeights
+        (
+            t,
+            indices,
+            weights
+        );
+    }
+
+    // Check if current timeIndex is still valid
+    if
+    (
+        index_ >= 0
+     && index_ < samples_.size()
+     && (
+            samples_[index_] <= t
+         && (index_ == samples_.size()-1 || t <= samples_[index_+1])
+        )
+    )
+    {
+        // index_ still at correct slot
+    }
+    else
+    {
+        // search for correct index
+        index_ = findLower(samples_, t);
+        indexChanged = true;
+    }
+
+
+    // Clamp if outside table
+    if (index_ == -1)
+    {
+        indices.setSize(1);
+        weights.setSize(1);
+
+        indices[0] = 0;
+        weights[0] = 1;
+        return indexChanged;
+    }
+    else if (index_ == samples_.size()-1)
+    {
+        indices.setSize(1);
+        weights.setSize(1);
+
+        indices[0] = samples_.size()-1;
+        weights[0] = 1;
+        return indexChanged;
+    }
+
+
+
+    label lo = index_;
+    label hi = index_+1;
+
+    // weighting
+    scalar mu = (t - samples_[lo])/(samples_[hi] - samples_[lo]);
+
+    scalar w0 = 0.5*(mu*(-1+mu*(2-mu)));            // coeff of lo-1
+    scalar w1 = 0.5*(2+mu*(mu*(-5 + mu*(3))));      // coeff of lo
+    scalar w2 = 0.5*(mu*(1 + mu*(4 + mu*(-3))));    // coeff of hi
+    scalar w3 = 0.5*(mu*mu*(-1 + mu));              // coeff of hi+1
+
+    if (lo > 0)
+    {
+        if (hi < samples_.size()-1)
+        {
+            // Four points available
+            indices.setSize(4);
+            weights.setSize(4);
+
+            indices[0] = lo-1;
+            indices[1] = lo;
+            indices[2] = hi;
+            indices[3] = hi+1;
+
+            weights[0] = w0;
+            weights[1] = w1;
+            weights[2] = w2;
+            weights[3] = w3;
+        }
+        else
+        {
+            // No y3 available. Extrapolate: y3=3*y2-y1
+            indices.setSize(3);
+            weights.setSize(3);
+
+            indices[0] = lo-1;
+            indices[1] = lo;
+            indices[2] = hi;
+
+            weights[0] = w0;
+            weights[1] = w1 - w3;
+            weights[2] = w2 + 2*w3;
+        }
+    }
+    else
+    {
+        // No y0 available. Extrapolate: y0=2*y1-y2;
+        if (hi < samples_.size()-1)
+        {
+            indices.setSize(3);
+            weights.setSize(3);
+
+            indices[0] = lo;
+            indices[1] = hi;
+            indices[2] = hi+1;
+
+            weights[0] = w1 + 2*w0;
+            weights[1] = w2 - w0;
+            weights[2] = w3;
+        }
+        else
+        {
+            indices.setSize(2);
+            weights.setSize(2);
+
+            indices[0] = lo;
+            indices[1] = hi;
+
+            weights[0] = w1 + 2*w0 - w3;
+            weights[1] = w2 - w0 + 2*w3;
+        }
+    }
+
+    return indexChanged;
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/interpolations/interpolationWeights/splineInterpolationWeights/splineInterpolationWeights.H b/src/OpenFOAM/interpolations/interpolationWeights/splineInterpolationWeights/splineInterpolationWeights.H
new file mode 100644
index 0000000000..15660ff90c
--- /dev/null
+++ b/src/OpenFOAM/interpolations/interpolationWeights/splineInterpolationWeights/splineInterpolationWeights.H
@@ -0,0 +1,121 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::splineInterpolationWeights
+
+Description
+    Catmull-Rom spline interpolation.
+
+SourceFiles
+    splineInterpolationWeights.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef splineInterpolationWeights_H
+#define splineInterpolationWeights_H
+
+#include "interpolationWeights.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                  Class splineInterpolationWeights Declaration
+\*---------------------------------------------------------------------------*/
+
+class splineInterpolationWeights
+:
+    public interpolationWeights
+{
+
+private:
+
+    // Private data
+
+        //- Cached index in samples from previous invocation
+        mutable label index_;
+
+public:
+
+    //- Runtime type information
+    TypeName("spline");
+
+    // Constructors
+
+        //- Construct from components. By default make sure samples are
+        //  equidistant.
+        splineInterpolationWeights
+        (
+            const scalarField& samples,
+            const bool checkEqualDistance = true
+        );
+
+
+    //- Destructor
+    virtual ~splineInterpolationWeights()
+    {}
+
+
+    // Member Functions
+
+        //- Calculate weights and indices to calculate t from samples.
+        //  Returns true if indices changed.
+        virtual bool valueWeights
+        (
+            const scalar t,
+            labelList& indices,
+            scalarField& weights
+        ) const;
+
+        //- Calculate weights and indices to calculate integrand of t1..t2
+        //  from samples. Returns true if indices changed.
+        virtual bool integrationWeights
+        (
+            const scalar t1,
+            const scalar t2,
+            labelList& indices,
+            scalarField& weights
+        ) const
+        {
+            notImplemented
+            (
+                "splineInterpolationWeights::integrationWeights(..)"
+            );
+            return false;
+        }
+
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/functions/DataEntry/Table/TableBase.C b/src/OpenFOAM/primitives/functions/DataEntry/Table/TableBase.C
index c977618e2a..e59c5ec898 100644
--- a/src/OpenFOAM/primitives/functions/DataEntry/Table/TableBase.C
+++ b/src/OpenFOAM/primitives/functions/DataEntry/Table/TableBase.C
@@ -26,6 +26,29 @@ License
 #include "TableBase.H"
 #include "Time.H"
 
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+template<class Type>
+const Foam::interpolationWeights& Foam::TableBase<Type>::interpolator() const
+{
+    if (interpolatorPtr_.empty())
+    {
+        // Re-work table into linear list
+        tableSamples_.setSize(table_.size());
+        forAll(table_, i)
+        {
+            tableSamples_[i] = table_[i].first();
+        }
+        interpolatorPtr_ = interpolationWeights::New
+        (
+            interpolationScheme_,
+            tableSamples_
+        );
+    }
+    return interpolatorPtr_();
+}
+
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class Type>
@@ -39,6 +62,10 @@ Foam::TableBase<Type>::TableBase(const word& name, const dictionary& dict)
             dict.lookupOrDefault<word>("outOfBounds", "clamp")
         )
     ),
+    interpolationScheme_
+    (
+        dict.lookupOrDefault<word>("interpolationScheme", "linear")
+    ),
     table_(),
     dimensions_(dimless)
 {}
@@ -49,8 +76,11 @@ Foam::TableBase<Type>::TableBase(const TableBase<Type>& tbl)
 :
     name_(tbl.name_),
     boundsHandling_(tbl.boundsHandling_),
+    interpolationScheme_(tbl.interpolationScheme_),
     table_(tbl.table_),
-    dimensions_(tbl.dimensions_)
+    dimensions_(tbl.dimensions_),
+    tableSamples_(tbl.tableSamples_),
+    interpolatorPtr_(tbl.interpolatorPtr_)
 {}
 
 
@@ -307,6 +337,9 @@ void Foam::TableBase<Type>::convertTimeBase(const Time& t)
         scalar value = table_[i].first();
         table_[i].first() = t.userTimeToTime(value);
     }
+
+    tableSamples_.clear();
+    interpolatorPtr_.clear();
 }
 
 
@@ -325,88 +358,104 @@ Type Foam::TableBase<Type>::value(const scalar x) const
         return table_.last().second();
     }
 
-    // Find i such that x(i) < xDash < x(i+1)
-    label i = 0;
-    while ((table_[i+1].first() < xDash) && (i+1 < table_.size()))
+    // Use interpolator
+    interpolator().valueWeights(x, currentIndices_, currentWeights_);
+
+    Type t = currentWeights_[0]*table_[currentIndices_[0]].second();
+    for (label i = 1; i < currentIndices_.size(); i++)
     {
-        i++;
+        t += currentWeights_[i]*table_[currentIndices_[i]].second();
     }
+    return t;
 
-Info <<
-     (xDash - table_[i].first())/(table_[i+1].first() - table_[i].first())
-      * (table_[i+1].second() - table_[i].second())
-      + table_[i].second() << endl;
-
-    // Linear interpolation to find value
-    return Type
-    (
-        (xDash - table_[i].first())/(table_[i+1].first() - table_[i].first())
-      * (table_[i+1].second() - table_[i].second())
-      + table_[i].second()
-    );
+    //// Find i such that x(i) < xDash < x(i+1)
+    //label i = 0;
+    //while ((table_[i+1].first() < xDash) && (i+1 < table_.size()))
+    //{
+    //    i++;
+    //}
+    //
+    //// Linear interpolation to find value
+    //return Type
+    //(
+    //    (xDash - table_[i].first())/(table_[i+1].first() - table_[i].first())
+    //  * (table_[i+1].second() - table_[i].second())
+    //  + table_[i].second()
+    //);
 }
 
 
 template<class Type>
 Type Foam::TableBase<Type>::integrate(const scalar x1, const scalar x2) const
 {
-    // Initialise return value
-    Type sum = pTraits<Type>::zero;
+    // Use interpolator
+    interpolator().integrationWeights(x1, x2, currentIndices_, currentWeights_);
 
-    // Return zero if out of bounds
-    if ((x1 > table_.last().first()) || (x2 < table_[0].first()))
+    Type sum = currentWeights_[0]*table_[currentIndices_[0]].second();
+    for (label i = 1; i < currentIndices_.size(); i++)
     {
-        return sum;
+       sum += currentWeights_[i]*table_[currentIndices_[i]].second();
     }
-
-    // Find next index greater than x1
-    label id1 = 0;
-    while ((table_[id1].first() < x1) && (id1 < table_.size()))
-    {
-        id1++;
-    }
-
-    // Find next index less than x2
-    label id2 = table_.size() - 1;
-    while ((table_[id2].first() > x2) && (id2 >= 1))
-    {
-        id2--;
-    }
-
-    if ((id1 - id2) == 1)
-    {
-        // x1 and x2 lie within 1 interval
-        sum = 0.5*(value(x1) + value(x2))*(x2 - x1);
-    }
-    else
-    {
-        // x1 and x2 cross multiple intervals
-
-        // Integrate table body
-        for (label i=id1; i<id2; i++)
-        {
-            sum +=
-                (table_[i].second() + table_[i+1].second())
-              * (table_[i+1].first() - table_[i].first());
-        }
-        sum *= 0.5;
-
-        // Add table ends (partial segments)
-        if (id1 > 0)
-        {
-            sum += 0.5
-              * (value(x1) + table_[id1].second())
-              * (table_[id1].first() - x1);
-        }
-        if (id2 < table_.size() - 1)
-        {
-            sum += 0.5
-              * (table_[id2].second() + value(x2))
-              * (x2 - table_[id2].first());
-        }
-    }
-
     return sum;
+
+
+    //// Initialise return value
+    //Type sum = pTraits<Type>::zero;
+    //
+    //// Return zero if out of bounds
+    //if ((x1 > table_.last().first()) || (x2 < table_[0].first()))
+    //{
+    //    return sum;
+    //}
+    //
+    //// Find next index greater than x1
+    //label id1 = 0;
+    //while ((table_[id1].first() < x1) && (id1 < table_.size()))
+    //{
+    //    id1++;
+    //}
+    //
+    //// Find next index less than x2
+    //label id2 = table_.size() - 1;
+    //while ((table_[id2].first() > x2) && (id2 >= 1))
+    //{
+    //    id2--;
+    //}
+    //
+    //if ((id1 - id2) == 1)
+    //{
+    //    // x1 and x2 lie within 1 interval
+    //    sum = 0.5*(value(x1) + value(x2))*(x2 - x1);
+    //}
+    //else
+    //{
+    //    // x1 and x2 cross multiple intervals
+    //
+    //    // Integrate table body
+    //    for (label i=id1; i<id2; i++)
+    //    {
+    //        sum +=
+    //            (table_[i].second() + table_[i+1].second())
+    //          * (table_[i+1].first() - table_[i].first());
+    //    }
+    //    sum *= 0.5;
+    //
+    //    // Add table ends (partial segments)
+    //    if (id1 > 0)
+    //    {
+    //        sum += 0.5
+    //          * (value(x1) + table_[id1].second())
+    //          * (table_[id1].first() - x1);
+    //    }
+    //    if (id2 < table_.size() - 1)
+    //    {
+    //        sum += 0.5
+    //          * (table_[id2].second() + value(x2))
+    //          * (x2 - table_[id2].first());
+    //    }
+    //}
+    //
+    //return sum;
 }
 
 
diff --git a/src/OpenFOAM/primitives/functions/DataEntry/Table/TableBase.H b/src/OpenFOAM/primitives/functions/DataEntry/Table/TableBase.H
index 15164b3d90..ce4c3d2287 100644
--- a/src/OpenFOAM/primitives/functions/DataEntry/Table/TableBase.H
+++ b/src/OpenFOAM/primitives/functions/DataEntry/Table/TableBase.H
@@ -38,6 +38,7 @@ SourceFiles
 #include "DataEntry.H"
 #include "Tuple2.H"
 #include "dimensionSet.H"
+#include "interpolationWeights.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -80,10 +81,13 @@ protected:
     // Protected data
 
         //- Table name
-        word name_;
+        const word name_;
 
         //- Enumeration for handling out-of-bound values
-        boundsHandling boundsHandling_;
+        const boundsHandling boundsHandling_;
+
+        //- Interpolation type
+        const word interpolationScheme_;
 
         //- Table data
         List<Tuple2<scalar, Type> > table_;
@@ -91,9 +95,24 @@ protected:
         //- The dimension set
         dimensionSet dimensions_;
 
+        //- Extracted values
+        mutable scalarField tableSamples_;
+
+        //- Interpolator method
+        mutable autoPtr<interpolationWeights> interpolatorPtr_;
+
+        //- Cached indices and weights
+        mutable labelList currentIndices_;
+
+        mutable scalarField currentWeights_;
+
 
     // Protected Member Functions
 
+
+        //- Return (demand driven) interpolator
+        const interpolationWeights& interpolator() const;
+
         //- Disallow default bitwise assignment
         void operator=(const TableBase<Type>&);
 

From 5d850068baddb58589f67f6bf2b55e0f0c4ea8ab Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Tue, 17 Apr 2012 18:03:13 +0100
Subject: [PATCH 219/317] ENH: temporalInterpolate: run-time selectable
 interpolation

---
 .../temporalInterpolate/temporalInterpolate.C | 131 +++++++++++++-----
 1 file changed, 93 insertions(+), 38 deletions(-)

diff --git a/applications/utilities/postProcessing/miscellaneous/temporalInterpolate/temporalInterpolate.C b/applications/utilities/postProcessing/miscellaneous/temporalInterpolate/temporalInterpolate.C
index 14959901f7..98ead1f4bb 100644
--- a/applications/utilities/postProcessing/miscellaneous/temporalInterpolate/temporalInterpolate.C
+++ b/applications/utilities/postProcessing/miscellaneous/temporalInterpolate/temporalInterpolate.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -37,6 +37,8 @@ Description
 #include "surfaceFields.H"
 #include "pointFields.H"
 #include "ReadFields.H"
+#include "interpolationWeights.H"
+#include "uniformInterpolate.H"
 
 using namespace Foam;
 
@@ -48,6 +50,8 @@ class fieldInterpolator
     const HashSet<word>& selectedFields_;
     instant ti_;
     instant ti1_;
+    const interpolationWeights& interpolator_;
+    const wordList& timeNames_;
     int divisions_;
 
 public:
@@ -60,6 +64,8 @@ public:
         const HashSet<word>& selectedFields,
         const instant& ti,
         const instant& ti1,
+        const interpolationWeights& interpolator,
+        const wordList& timeNames,
         int divisions
     )
     :
@@ -69,6 +75,8 @@ public:
         selectedFields_(selectedFields),
         ti_(ti),
         ti1_(ti1),
+        interpolator_(interpolator),
+        timeNames_(timeNames),
         divisions_(divisions)
     {}
 
@@ -98,34 +106,6 @@ void fieldInterpolator::interpolate()
             {
                 Info<< " " << fieldIter()->name() << '(';
 
-                GeoFieldType fieldi
-                (
-                    IOobject
-                    (
-                        fieldIter()->name(),
-                        ti_.name(),
-                        fieldIter()->db(),
-                        IOobject::MUST_READ,
-                        IOobject::NO_WRITE,
-                        false
-                    ),
-                    mesh_
-                );
-
-                GeoFieldType fieldi1
-                (
-                    IOobject
-                    (
-                        fieldIter()->name(),
-                        ti1_.name(),
-                        fieldIter()->db(),
-                        IOobject::MUST_READ,
-                        IOobject::NO_WRITE,
-                        false
-                    ),
-                    mesh_
-                );
-
                 scalar deltaT = (ti1_.value() - ti_.value())/(divisions_ + 1);
 
                 for (int j=0; j<divisions_; j++)
@@ -141,20 +121,51 @@ void fieldInterpolator::interpolate()
                         Info<< " ";
                     }
 
-                    scalar lambda = scalar(j + 1)/scalar(divisions_ + 1);
+                    // Calculate times to read and weights
+                    labelList indices;
+                    scalarField weights;
+                    interpolator_.valueWeights
+                    (
+                        runTime_.value(),
+                        indices,
+                        weights
+                    );
+
+                    const wordList selectedTimeNames
+                    (
+                        UIndirectList<word>(timeNames_, indices)()
+                    );
+
+                    //Info<< "For time " << runTime_.value()
+                    //    << " need times " << selectedTimeNames
+                    //    << " need weights " << weights << endl;
+
+
+                    // Read on the objectRegistry all the required fields
+                    ReadFields<GeoFieldType>
+                    (
+                        fieldIter()->name(),
+                        mesh_,
+                        selectedTimeNames
+                    );
 
                     GeoFieldType fieldj
                     (
-                        IOobject
+                        uniformInterpolate<GeoFieldType>
                         (
+                            IOobject
+                            (
+                                fieldIter()->name(),
+                                runTime_.timeName(),
+                                fieldIter()->db(),
+                                IOobject::NO_READ,
+                                IOobject::NO_WRITE,
+                                false
+                            ),
                             fieldIter()->name(),
-                            timej.name(),
-                            fieldIter()->db(),
-                            IOobject::NO_READ,
-                            IOobject::NO_WRITE,
-                            false
-                        ),
-                        (1.0 - lambda)*fieldi + lambda*fieldi1
+                            selectedTimeNames,
+                            weights
+                        )
                     );
 
                     fieldj.write();
@@ -188,6 +199,12 @@ int main(int argc, char *argv[])
         "integer",
         "specify number of temporal sub-divisions to create (default = 1)."
     );
+    argList::addOption
+    (
+        "interpolationType",
+        "word",
+        "specify type of interpolation (linear or spline)"
+    );
 
     #include "setRootCase.H"
     #include "createTime.H"
@@ -198,15 +215,51 @@ int main(int argc, char *argv[])
     {
         args.optionLookup("fields")() >> selectedFields;
     }
+    if (selectedFields.size())
+    {
+        Info<< "Interpolating fields " << selectedFields << nl << endl;
+    }
+    else
+    {
+        Info<< "Interpolating all fields" << nl << endl;
+    }
+
 
     int divisions = 1;
     if (args.optionFound("divisions"))
     {
         args.optionLookup("divisions")() >> divisions;
     }
+    Info<< "Using " << divisions << " per time interval" << nl << endl;
+
+
+    const word interpolationType = args.optionLookupOrDefault<word>
+    (
+        "interpolationType",
+        "linear"
+    );
+    Info<< "Using interpolation " << interpolationType << nl << endl;
+
 
     instantList timeDirs = timeSelector::select0(runTime, args);
 
+    scalarField timeVals(timeDirs.size());
+    wordList timeNames(timeDirs.size());
+    forAll(timeDirs, i)
+    {
+        timeVals[i] = timeDirs[i].value();
+        timeNames[i] = timeDirs[i].name();
+    }
+    autoPtr<interpolationWeights> interpolatorPtr
+    (
+        interpolationWeights::New
+        (
+            interpolationType,
+            timeVals
+        )
+    );
+
+
     #include "createMesh.H"
 
     Info<< "Interpolating fields for times:" << endl;
@@ -226,6 +279,8 @@ int main(int argc, char *argv[])
             selectedFields,
             timeDirs[timei],
             timeDirs[timei+1],
+            interpolatorPtr(),
+            timeNames,
             divisions
         );
 

From 28d462b8ef2e73d0aecda7123f0b3ab6bd9d3a6f Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Tue, 17 Apr 2012 18:05:43 +0100
Subject: [PATCH 220/317] STYLE: TableFile: added to comment

---
 .../primitives/functions/DataEntry/TableFile/TableFile.H   | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/OpenFOAM/primitives/functions/DataEntry/TableFile/TableFile.H b/src/OpenFOAM/primitives/functions/DataEntry/TableFile/TableFile.H
index f167c21156..7948ac6ee6 100644
--- a/src/OpenFOAM/primitives/functions/DataEntry/TableFile/TableFile.H
+++ b/src/OpenFOAM/primitives/functions/DataEntry/TableFile/TableFile.H
@@ -31,9 +31,10 @@ Description
         <entryName>   tableFile;
         tableFileCoeffs
         {
-            dimensions      [0 0 1 0 0]; // optional dimensions
-            fileName        dataFile;    // name of data file
-            outOfBounds     clamp;       // optional out-of-bounds handling
+            dimensions          [0 0 1 0 0]; // optional dimensions
+            fileName            dataFile;    // name of data file
+            outOfBounds         clamp;       // optional out-of-bounds handling
+            interpolationScheme linear;      // optional interpolation method
         }
     \endverbatim
 

From 69ee818cb7ecf28a2f7f05c225ec05f1731a2957 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Wed, 18 Apr 2012 09:50:05 +0100
Subject: [PATCH 221/317] ENH: Test-extendedStencil2.C: more test for extended
 stencil

---
 .../extendedStencil/Test-ExtendedStencil2.C   | 206 ++++++++++++++++++
 1 file changed, 206 insertions(+)
 create mode 100644 applications/test/extendedStencil/Test-ExtendedStencil2.C

diff --git a/applications/test/extendedStencil/Test-ExtendedStencil2.C b/applications/test/extendedStencil/Test-ExtendedStencil2.C
new file mode 100644
index 0000000000..eda8f98679
--- /dev/null
+++ b/applications/test/extendedStencil/Test-ExtendedStencil2.C
@@ -0,0 +1,206 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Application
+    testExtendedStencil2
+
+Description
+    Test app for determining extended cell-to-cell stencil.
+
+\*---------------------------------------------------------------------------*/
+
+#include "argList.H"
+#include "fvMesh.H"
+#include "volFields.H"
+#include "surfaceFields.H"
+#include "Time.H"
+#include "OFstream.H"
+#include "meshTools.H"
+
+#include "CFCCellToCellStencil.H"
+
+
+using namespace Foam;
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+void writeStencilOBJ
+(
+    const fileName& fName,
+    const point& fc,
+    const List<point>& stencilCc
+)
+{
+    OFstream str(fName);
+    label vertI = 0;
+
+    meshTools::writeOBJ(str, fc);
+    vertI++;
+
+    forAll(stencilCc, i)
+    {
+        meshTools::writeOBJ(str, stencilCc[i]);
+        vertI++;
+        str << "l 1 " << vertI << nl;
+    }
+}
+
+
+// Stats
+void writeStencilStats(const labelListList& stencil)
+{
+    label sumSize = 0;
+    label nSum = 0;
+    label minSize = labelMax;
+    label maxSize = labelMin;
+
+    forAll(stencil, i)
+    {
+        const labelList& sCells = stencil[i];
+
+        if (sCells.size() > 0)
+        {
+            sumSize += sCells.size();
+            nSum++;
+            minSize = min(minSize, sCells.size());
+            maxSize = max(maxSize, sCells.size());
+        }
+    }
+    reduce(sumSize, sumOp<label>());
+    reduce(nSum, sumOp<label>());
+    sumSize /= nSum;
+
+    reduce(minSize, minOp<label>());
+    reduce(maxSize, maxOp<label>());
+
+    Info<< "Stencil size :" << nl
+        << "    average : " << sumSize << nl
+        << "    min     : " << minSize << nl
+        << "    max     : " << maxSize << nl
+        << endl;
+}
+
+
+// Main program:
+
+int main(int argc, char *argv[])
+{
+#   include "addTimeOptions.H"
+#   include "setRootCase.H"
+#   include "createTime.H"
+
+    // Get times list
+    instantList Times = runTime.times();
+#   include "checkTimeOptions.H"
+    runTime.setTime(Times[startTime], startTime);
+#   include "createMesh.H"
+
+
+    //---- CELL CENTRED STENCIL -----
+
+    // Centred, cell stencil
+    // ~~~~~~~~~~~~~~~~~~~~~
+
+    {
+        // Full stencil. This is per local cell a set of global indices, either
+        // into cells or also boundary faces.
+        CFCCellToCellStencil stencil(mesh);
+
+        // Construct exchange map and renumber stencil
+        List<Map<label> > compactMap(Pstream::nProcs());
+        mapDistribute map
+        (
+            stencil.globalNumbering(),
+            stencil,
+            compactMap
+        );
+
+
+        // Print some stats
+        Info<< "cellFaceCell:" << endl;
+        writeStencilStats(stencil);
+
+
+        // Collect the data in stencil form
+        List<List<vector> > stencilPoints;
+        {
+            const volVectorField& fld = mesh.C();
+
+            // 1. Construct cell data in compact addressing
+            List<point> compactFld(map.constructSize(), pTraits<point>::zero);
+
+            // Insert my internal values
+            forAll(fld, cellI)
+            {
+                compactFld[cellI] = fld[cellI];
+            }
+            // Insert my boundary values
+            label nCompact = fld.size();
+            forAll(fld.boundaryField(), patchI)
+            {
+                const fvPatchField<vector>& pfld = fld.boundaryField()[patchI];
+
+                forAll(pfld, i)
+                {
+                    compactFld[nCompact++] = pfld[i];
+                }
+            }
+
+            // Do all swapping
+            map.distribute(compactFld);
+
+            // 2. Pull to stencil
+            stencilPoints.setSize(stencil.size());
+
+            forAll(stencil, cellI)
+            {
+                const labelList& compactCells = stencil[cellI];
+
+                stencilPoints[cellI].setSize(compactCells.size());
+
+                forAll(compactCells, i)
+                {
+                    stencilPoints[cellI][i] = compactFld[compactCells[i]];
+                }
+            }
+        }
+
+
+        forAll(stencilPoints, cellI)
+        {
+            writeStencilOBJ
+            (
+                runTime.path()/"centredCell" + Foam::name(cellI) + ".obj",
+                mesh.cellCentres()[cellI],
+                stencilPoints[cellI]
+            );
+        }
+    }
+
+    Pout<< "End\n" << endl;
+
+    return 0;
+}
+
+
+// ************************************************************************* //

From 4c7c03e1169028d2139f0671919eec13bca88538 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Wed, 18 Apr 2012 10:44:17 +0100
Subject: [PATCH 222/317] ENH: interpolationWeights: added weightedSum helper

---
 .../interpolationWeights.H                    |  15 ++
 .../interpolationWeightsTemplates.C           | 161 ++++--------------
 2 files changed, 47 insertions(+), 129 deletions(-)

diff --git a/src/OpenFOAM/interpolations/interpolationWeights/interpolationWeights/interpolationWeights.H b/src/OpenFOAM/interpolations/interpolationWeights/interpolationWeights/interpolationWeights.H
index 889076a1ee..36e3472835 100644
--- a/src/OpenFOAM/interpolations/interpolationWeights/interpolationWeights/interpolationWeights.H
+++ b/src/OpenFOAM/interpolations/interpolationWeights/interpolationWeights/interpolationWeights.H
@@ -131,6 +131,15 @@ public:
             scalarField& weights
         ) const = 0;
 
+        //- Helper: weighted sum
+        template<class ListType1, class ListType2>
+        static typename outerProduct
+        <
+            typename ListType1::value_type,
+            typename ListType2::value_type
+        >::type
+        weightedSum(const ListType1& f1, const ListType2& f2);
+
 };
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -139,6 +148,12 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+#ifdef NoRepository
+#   include "interpolationWeightsTemplates.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
 #endif
 
 // ************************************************************************* //
diff --git a/src/OpenFOAM/interpolations/interpolationWeights/interpolationWeights/interpolationWeightsTemplates.C b/src/OpenFOAM/interpolations/interpolationWeights/interpolationWeights/interpolationWeightsTemplates.C
index aac670138d..9050921b9e 100644
--- a/src/OpenFOAM/interpolations/interpolationWeights/interpolationWeights/interpolationWeightsTemplates.C
+++ b/src/OpenFOAM/interpolations/interpolationWeights/interpolationWeights/interpolationWeightsTemplates.C
@@ -36,135 +36,38 @@ namespace Foam
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-//template<class GeoField>
-//void interpolationWeights::readFields
-//(
-//    const word& fieldName,
-//    const typename GeoField::Mesh& mesh,
-//    const wordList& timeNames,
-//    objectRegistry& fieldsCache
-//)
-//{
-//    // Collect all times that are no longer used
-//    {
-//        HashSet<word> usedTimes(timeNames);
-//
-//        DynamicList<word> unusedTimes(fieldsCache.size());
-//
-//        forAllIter(objectRegistry, fieldsCache, timeIter)
-//        {
-//            const word& tm = timeIter.key();
-//            if (!usedTimes.found(tm))
-//            {
-//                unusedTimes.append(tm);
-//            }
-//        }
-//
-//        //Info<< "Unloading times " << unusedTimes << endl;
-//
-//        forAll(unusedTimes, i)
-//        {
-//            objectRegistry& timeCache = const_cast<objectRegistry&>
-//            (
-//                fieldsCache.lookupObject<objectRegistry>(unusedTimes[i])
-//            );
-//            fieldsCache.checkOut(timeCache);
-//        }
-//    }
-//
-//
-//    // Load any new fields
-//    forAll(timeNames, i)
-//    {
-//        const word& tm = timeNames[i];
-//
-//        // Create if not found
-//        if (!fieldsCache.found(tm))
-//        {
-//            //Info<< "Creating registry for time " << tm << endl;
-//
-//            // Create objectRegistry if not found
-//            objectRegistry* timeCachePtr = new objectRegistry
-//            (
-//                IOobject
-//                (
-//                    tm,
-//                    tm,
-//                    fieldsCache,
-//                    IOobject::NO_READ,
-//                    IOobject::NO_WRITE
-//                )
-//            );
-//            timeCachePtr->store();
-//        }
-//
-//        // Obtain cache for current time
-//        const objectRegistry& timeCache =
-//            fieldsCache.lookupObject<objectRegistry>
-//            (
-//                tm
-//            );
-//
-//        // Store field if not found
-//        if (!timeCache.found(fieldName))
-//        {
-//            //Info<< "Loading field " << fieldName
-//            //    << " for time " << tm << endl;
-//
-//            GeoField loadedFld
-//            (
-//                IOobject
-//                (
-//                    fieldName,
-//                    tm,
-//                    mesh.thisDb(),
-//                    IOobject::MUST_READ,
-//                    IOobject::NO_WRITE,
-//                    false
-//                ),
-//                mesh
-//            );
-//
-//            // Transfer to timeCache (new objectRegistry and store flag)
-//            GeoField* fldPtr = new GeoField
-//            (
-//                IOobject
-//                (
-//                    fieldName,
-//                    tm,
-//                    timeCache,
-//                    IOobject::NO_READ,
-//                    IOobject::NO_WRITE
-//                ),
-//                loadedFld
-//            );
-//            fldPtr->store();
-//        }
-//    }
-//}
-//
-//
-//template<class GeoField>
-//void interpolationWeights::readFields
-//(
-//    const word& fieldName,
-//    const typename GeoField::Mesh& mesh,
-//    const wordList& timeNames,
-//    const word& registryName
-//)
-//{
-//    readFields<GeoField>
-//    (
-//        fieldName,
-//        mesh,
-//        timeNames,
-//        //registry(mesh.thisDb(), registryName)
-//        const_cast<objectRegistry&>
-//        (
-//            mesh.thisDb().subRegistry(registryName, true)
-//        )
-//    );
-//}
+template<class ListType1, class ListType2>
+typename Foam::outerProduct
+<
+    typename ListType1::value_type,
+    typename ListType2::value_type
+>::type
+Foam::interpolationWeights::weightedSum
+(
+    const ListType1& f1,
+    const ListType2& f2
+)
+{
+    typedef typename outerProduct
+    <
+        typename ListType1::value_type,
+        typename ListType2::value_type
+    >::type returnType;
+
+    if (f1.size())
+    {
+        returnType SumProd = f1[0]*f2[0];
+        for (label i = 1; i < f1.size(); ++i)
+        {
+            SumProd += f1[i]*f2[i];
+        }
+        return SumProd;
+    }
+    else
+    {
+        return pTraits<returnType>::zero;
+    }
+}
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

From c00e99a6ec6747f3f848ac14c963458019bc78b1 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Wed, 18 Apr 2012 10:52:03 +0100
Subject: [PATCH 223/317] ENH: uniformInterpolatedDisplacement: point boundary
 condition by interpolating existing motion

---
 src/fvMotionSolver/Make/files                 |   1 +
 ...polatedDisplacementPointPatchVectorField.C | 291 ++++++++++++++++++
 ...polatedDisplacementPointPatchVectorField.H | 183 +++++++++++
 3 files changed, 475 insertions(+)
 create mode 100644 src/fvMotionSolver/pointPatchFields/derived/uniformInterpolatedDisplacement/uniformInterpolatedDisplacementPointPatchVectorField.C
 create mode 100644 src/fvMotionSolver/pointPatchFields/derived/uniformInterpolatedDisplacement/uniformInterpolatedDisplacementPointPatchVectorField.H

diff --git a/src/fvMotionSolver/Make/files b/src/fvMotionSolver/Make/files
index 43dc7513e7..cdaf67e6af 100644
--- a/src/fvMotionSolver/Make/files
+++ b/src/fvMotionSolver/Make/files
@@ -38,6 +38,7 @@ $(derivedPoint)/surfaceDisplacement/surfaceDisplacementPointPatchVectorField.C
 $(derivedPoint)/waveDisplacement/waveDisplacementPointPatchVectorField.C
 
 $(derivedPoint)/timeVaryingMappedFixedValue/timeVaryingMappedFixedValuePointPatchFields.C
+$(derivedPoint)/uniformInterpolatedDisplacement/uniformInterpolatedDisplacementPointPatchVectorField.C
 
 
 
diff --git a/src/fvMotionSolver/pointPatchFields/derived/uniformInterpolatedDisplacement/uniformInterpolatedDisplacementPointPatchVectorField.C b/src/fvMotionSolver/pointPatchFields/derived/uniformInterpolatedDisplacement/uniformInterpolatedDisplacementPointPatchVectorField.C
new file mode 100644
index 0000000000..21b5e74224
--- /dev/null
+++ b/src/fvMotionSolver/pointPatchFields/derived/uniformInterpolatedDisplacement/uniformInterpolatedDisplacementPointPatchVectorField.C
@@ -0,0 +1,291 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "uniformInterpolatedDisplacementPointPatchVectorField.H"
+#include "pointPatchFields.H"
+#include "addToRunTimeSelectionTable.H"
+#include "Time.H"
+#include "polyMesh.H"
+#include "interpolationWeights.H"
+#include "uniformInterpolate.H"
+#include "ReadFields.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+uniformInterpolatedDisplacementPointPatchVectorField::
+uniformInterpolatedDisplacementPointPatchVectorField
+(
+    const pointPatch& p,
+    const DimensionedField<vector, pointMesh>& iF
+)
+:
+    fixedValuePointPatchField<vector>(p, iF)
+{}
+
+
+uniformInterpolatedDisplacementPointPatchVectorField::
+uniformInterpolatedDisplacementPointPatchVectorField
+(
+    const pointPatch& p,
+    const DimensionedField<vector, pointMesh>& iF,
+    const dictionary& dict
+)
+:
+    fixedValuePointPatchField<vector>(p, iF, dict),
+    fieldName_(dict.lookup("fieldName")),
+    interpolationScheme_(dict.lookup("interpolationScheme"))
+{
+    const pointMesh& pMesh = this->dimensionedInternalField().mesh();
+
+    // Read time values
+    instantList allTimes = Time::findTimes(pMesh().time().path());
+
+    // Only keep those that contain the field
+    DynamicList<word> names(allTimes.size());
+    DynamicList<scalar> values(allTimes.size());
+
+    forAll(allTimes, i)
+    {
+        IOobject io
+        (
+            fieldName_,
+            allTimes[i].name(),
+            pMesh(),
+            IOobject::MUST_READ,
+            IOobject::NO_WRITE,
+            false
+        );
+        if (io.headerOk())
+        {
+            names.append(allTimes[i].name());
+            values.append(allTimes[i].value());
+        }
+    }
+    timeNames_.transfer(names);
+    timeVals_.transfer(values);
+
+    Info<< type() << " : found " << fieldName_ << " for times "
+        << timeNames_ << endl;
+
+    if (timeNames_.size() < 1)
+    {
+        FatalErrorIn
+        (
+            "uniformInterpolatedDisplacementPointPatchVectorField::\n"
+            "uniformInterpolatedDisplacementPointPatchVectorField\n"
+            "(\n"
+            "    const pointPatch&,\n"
+            "    const DimensionedField<vector, pointMesh>&,\n"
+            "    const dictionary&\n"
+            ")\n"
+        )   << "Did not find any times with " << fieldName_
+            << exit(FatalError);
+    }
+
+
+    if (!dict.found("value"))
+    {
+        updateCoeffs();
+    }
+}
+
+
+uniformInterpolatedDisplacementPointPatchVectorField::
+uniformInterpolatedDisplacementPointPatchVectorField
+(
+    const uniformInterpolatedDisplacementPointPatchVectorField& ptf,
+    const pointPatch& p,
+    const DimensionedField<vector, pointMesh>& iF,
+    const pointPatchFieldMapper& mapper
+)
+:
+    fixedValuePointPatchField<vector>(ptf, p, iF, mapper),
+    fieldName_(ptf.fieldName_),
+    interpolationScheme_(ptf.interpolationScheme_),
+    timeNames_(ptf.timeNames_),
+    timeVals_(ptf.timeVals_),
+    interpolatorPtr_(ptf.interpolatorPtr_)
+{}
+
+
+uniformInterpolatedDisplacementPointPatchVectorField::
+uniformInterpolatedDisplacementPointPatchVectorField
+(
+    const uniformInterpolatedDisplacementPointPatchVectorField& ptf,
+    const DimensionedField<vector, pointMesh>& iF
+)
+:
+    fixedValuePointPatchField<vector>(ptf, iF),
+    fieldName_(ptf.fieldName_),
+    interpolationScheme_(ptf.interpolationScheme_),
+    timeNames_(ptf.timeNames_),
+    timeVals_(ptf.timeVals_),
+    interpolatorPtr_(ptf.interpolatorPtr_)
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void uniformInterpolatedDisplacementPointPatchVectorField::updateCoeffs()
+{
+    if (this->updated())
+    {
+        return;
+    }
+
+    if (!interpolatorPtr_.valid())
+    {
+        interpolatorPtr_ = interpolationWeights::New
+        (
+            interpolationScheme_,
+            timeVals_
+        );
+    }
+
+    const pointMesh& pMesh = this->dimensionedInternalField().mesh();
+    const Time& t = pMesh().time();
+
+    // Update indices of times and weights
+    bool timesChanged = interpolatorPtr_->valueWeights
+    (
+        t.timeOutputValue(),
+        currentIndices_,
+        currentWeights_
+    );
+
+    const wordList currentTimeNames
+    (
+        UIndirectList<word>(timeNames_, currentIndices_)
+    );
+
+
+    // Load if necessary fields for this interpolation
+    if (timesChanged)
+    {
+        objectRegistry& fieldsCache = const_cast<objectRegistry&>
+        (
+            pMesh.thisDb().subRegistry("fieldsCache", true)
+        );
+        // Save old times so we now which ones have been loaded and need
+        // 'correctBoundaryConditions'. Bit messy.
+        HashSet<word> oldTimes(fieldsCache.toc());
+
+        ReadFields<pointVectorField>
+        (
+            fieldName_,
+            pMesh,
+            currentTimeNames
+        );
+
+        forAllConstIter(objectRegistry, fieldsCache, fieldsCacheIter)
+        {
+            if (!oldTimes.found(fieldsCacheIter.key()))
+            {
+                // Newly loaded fields. Make sure the internal
+                // values are consistent with the boundary conditions.
+                // This is quite often not the case since these
+                // fields typically are constructed 'by hand'
+
+                const objectRegistry& timeCache = dynamic_cast
+                <
+                    const objectRegistry&
+                >(*fieldsCacheIter());
+
+
+                pointVectorField& d = const_cast<pointVectorField&>
+                (
+                    timeCache.lookupObject<pointVectorField>
+                    (
+                        fieldName_
+                    )
+                );
+                d.correctBoundaryConditions();
+            }
+        }
+    }
+
+
+    // Interpolate the whole field
+    pointVectorField result
+    (
+        uniformInterpolate<pointVectorField>
+        (
+            IOobject
+            (
+                word("uniformInterpolate(")
+              + this->dimensionedInternalField().name()
+              + ')',
+                pMesh.time().timeName(),
+                pMesh.thisDb(),
+                IOobject::NO_READ,
+                IOobject::AUTO_WRITE
+            ),
+            fieldName_,
+            currentTimeNames,
+            currentWeights_
+        )
+    );
+
+
+    // Extract back from the internal field
+    this->operator==
+    (
+        this->patchInternalField(result.dimensionedInternalField())
+    );
+
+    fixedValuePointPatchField<vector>::updateCoeffs();
+}
+
+
+void uniformInterpolatedDisplacementPointPatchVectorField::write(Ostream& os)
+const
+{
+    pointPatchField<vector>::write(os);
+    os.writeKeyword("fieldName")
+        << fieldName_ << token::END_STATEMENT << nl;
+    os.writeKeyword("interpolationScheme")
+        << interpolationScheme_ << token::END_STATEMENT << nl;
+    writeEntry("value", os);
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+makePointPatchTypeField
+(
+    pointPatchVectorField,
+    uniformInterpolatedDisplacementPointPatchVectorField
+);
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// ************************************************************************* //
diff --git a/src/fvMotionSolver/pointPatchFields/derived/uniformInterpolatedDisplacement/uniformInterpolatedDisplacementPointPatchVectorField.H b/src/fvMotionSolver/pointPatchFields/derived/uniformInterpolatedDisplacement/uniformInterpolatedDisplacementPointPatchVectorField.H
new file mode 100644
index 0000000000..bd1beb36ff
--- /dev/null
+++ b/src/fvMotionSolver/pointPatchFields/derived/uniformInterpolatedDisplacement/uniformInterpolatedDisplacementPointPatchVectorField.H
@@ -0,0 +1,183 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::uniformInterpolatedDisplacementPointPatchVectorField
+
+Description
+    Interpolates pre-specified motion.
+
+    Motion specified as pointVectorFields. E.g.
+
+    walls
+    {
+        type                uniformInterpolatedDisplacement;
+        value               uniform (0 0 0);
+        fieldName           wantedDisplacement;
+        interpolationScheme linear;
+    }
+
+    This will scan the case for 'wantedDisplacement' pointVectorFields
+    and interpolate those in time (using 'linear' interpolation) to
+    obtain the current displacement.
+    The advantage of specifying displacement in this way is that it
+    automatically works through decomposePar.
+
+SourceFiles
+    uniformInterpolatedDisplacementPointPatchVectorField.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef uniformInterpolatedDisplacementPointPatchVectorField_H
+#define uniformInterpolatedDisplacementPointPatchVectorField_H
+
+#include "fixedValuePointPatchField.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+class interpolationWeights;
+
+/*---------------------------------------------------------------------------*\
+    Class uniformInterpolatedDisplacementPointPatchVectorField Declaration
+\*---------------------------------------------------------------------------*/
+
+class uniformInterpolatedDisplacementPointPatchVectorField
+:
+    public fixedValuePointPatchField<vector>
+{
+    // Private data
+
+        //- Name of displacement field
+        const word fieldName_;
+
+        const word interpolationScheme_;
+
+        //- Times with pre-specified displacement
+        wordList timeNames_;
+
+        //- Times with pre-specified displacement
+        scalarField timeVals_;
+
+        //- User-specified interpolator
+        autoPtr<interpolationWeights> interpolatorPtr_;
+
+
+        //- Cached interpolation times
+        labelList currentIndices_;
+
+        //- Cached interpolation weights
+        scalarField currentWeights_;
+
+public:
+
+    //- Runtime type information
+    TypeName("uniformInterpolatedDisplacement");
+
+
+    // Constructors
+
+        //- Construct from patch and internal field
+        uniformInterpolatedDisplacementPointPatchVectorField
+        (
+            const pointPatch&,
+            const DimensionedField<vector, pointMesh>&
+        );
+
+        //- Construct from patch, internal field and dictionary
+        uniformInterpolatedDisplacementPointPatchVectorField
+        (
+            const pointPatch&,
+            const DimensionedField<vector, pointMesh>&,
+            const dictionary&
+        );
+
+        //- Construct by mapping given patchField<vector> onto a new patch
+        uniformInterpolatedDisplacementPointPatchVectorField
+        (
+            const uniformInterpolatedDisplacementPointPatchVectorField&,
+            const pointPatch&,
+            const DimensionedField<vector, pointMesh>&,
+            const pointPatchFieldMapper&
+        );
+
+        //- Construct and return a clone
+        virtual autoPtr<pointPatchField<vector> > clone() const
+        {
+            return autoPtr<pointPatchField<vector> >
+            (
+                new uniformInterpolatedDisplacementPointPatchVectorField
+                (
+                    *this
+                )
+            );
+        }
+
+        //- Construct as copy setting internal field reference
+        uniformInterpolatedDisplacementPointPatchVectorField
+        (
+            const uniformInterpolatedDisplacementPointPatchVectorField&,
+            const DimensionedField<vector, pointMesh>&
+        );
+
+        //- Construct and return a clone setting internal field reference
+        virtual autoPtr<pointPatchField<vector> > clone
+        (
+            const DimensionedField<vector, pointMesh>& iF
+        ) const
+        {
+            return autoPtr<pointPatchField<vector> >
+            (
+                new uniformInterpolatedDisplacementPointPatchVectorField
+                (
+                    *this,
+                    iF
+                )
+            );
+        }
+
+
+    // Member functions
+
+        // Evaluation functions
+
+            //- Update the coefficients associated with the patch field
+            virtual void updateCoeffs();
+
+
+        //- Write
+        virtual void write(Ostream&) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //

From f87a730ba5a50eed876ba14091d5112473e7be0b Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Wed, 18 Apr 2012 12:04:49 +0100
Subject: [PATCH 224/317] BUG: timeVaryingMappedFixedValueFvPatchField:
 re-calculate interpolations

---
 .../timeVaryingMappedFixedValueFvPatchField.C                   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.C
index 16704d4adc..2d31d3802f 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.C
@@ -209,7 +209,7 @@ template<class Type>
 void timeVaryingMappedFixedValueFvPatchField<Type>::checkTable()
 {
     // Initialise
-    if (startSampleTime_ == -1 && endSampleTime_ == -1)
+    if (mapperPtr_.empty())
     {
         pointIOField samplePoints
         (

From 4da7f7a43a3614ad08627c738e70830a1ad40270 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Wed, 18 Apr 2012 15:41:48 +0100
Subject: [PATCH 225/317] BUG: MeshedSurface: stitchFaces did not truncate
 faceMap

---
 src/surfMesh/MeshedSurface/MeshedSurface.C | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/surfMesh/MeshedSurface/MeshedSurface.C b/src/surfMesh/MeshedSurface/MeshedSurface.C
index ccf2b0c382..aedaec8bce 100644
--- a/src/surfMesh/MeshedSurface/MeshedSurface.C
+++ b/src/surfMesh/MeshedSurface/MeshedSurface.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -656,6 +656,7 @@ bool Foam::MeshedSurface<Face>::stitchFaces
                 << " faces" << endl;
         }
         faceLst.setSize(newFaceI);
+        faceMap.setSize(newFaceI);
         remapFaces(faceMap);
     }
     faceMap.clear();

From 88d6efca276d03c8ad6545b2a8c701900eb1f01a Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Wed, 18 Apr 2012 16:33:02 +0100
Subject: [PATCH 226/317] buoyantBoussinesqPimpleFoam: Changed the sign of phig

---
 .../solvers/heatTransfer/buoyantBoussinesqPimpleFoam/pEqn.H | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/pEqn.H b/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/pEqn.H
index 9db0897efa..ce822ff21b 100644
--- a/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/pEqn.H
+++ b/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/pEqn.H
@@ -5,14 +5,14 @@
     volVectorField HbyA("HbyA", U);
     HbyA = rAU*UEqn.H();
 
-    surfaceScalarField phig(rAUf*ghf*fvc::snGrad(rhok)*mesh.magSf());
+    surfaceScalarField phig(-rAUf*ghf*fvc::snGrad(rhok)*mesh.magSf());
 
     surfaceScalarField phiHbyA
     (
         "phiHbyA",
         (fvc::interpolate(HbyA) & mesh.Sf())
       + fvc::ddtPhiCorr(rAU, U, phi)
-      - phig
+      + phig
     );
 
     while (pimple.correctNonOrthogonal())
@@ -36,7 +36,7 @@
 
             // Correct the momentum source with the pressure gradient flux
             // calculated from the relaxed pressure
-            U = HbyA - rAU*fvc::reconstruct((phig + p_rghEqn.flux())/rAUf);
+            U = HbyA + rAU*fvc::reconstruct((phig - p_rghEqn.flux())/rAUf);
             U.correctBoundaryConditions();
         }
     }

From 6ce4484918d03d8360aba5fb3c9a7c4ab70e1b88 Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Wed, 18 Apr 2012 16:33:59 +0100
Subject: [PATCH 227/317] interFoam et. al.: Changed phiU to phiHbyA and cache
 HbyA rather than changing U

---
 .../multiphase/interFoam/MRFInterFoam/pEqn.H  | 41 ++++++++++--------
 .../multiphase/interFoam/interDyMFoam/pEqn.H  | 43 +++++++++++--------
 .../solvers/multiphase/interFoam/pEqn.H       | 38 +++++++++-------
 .../fixedFluxPressureFvPatchScalarField.C     | 31 +++++++------
 .../fixedFluxPressureFvPatchScalarField.H     | 15 +++++--
 ...phaseFixedFluxPressureFvPatchScalarField.H |  9 +++-
 .../interFoam/laminar/capillaryRise/0/p_rgh   |  1 -
 .../laminar/capillaryRise/system/controlDict  |  4 +-
 8 files changed, 109 insertions(+), 73 deletions(-)

diff --git a/applications/solvers/multiphase/interFoam/MRFInterFoam/pEqn.H b/applications/solvers/multiphase/interFoam/MRFInterFoam/pEqn.H
index 6fc51c7cee..13d6b60662 100644
--- a/applications/solvers/multiphase/interFoam/MRFInterFoam/pEqn.H
+++ b/applications/solvers/multiphase/interFoam/MRFInterFoam/pEqn.H
@@ -1,29 +1,36 @@
 {
-    volScalarField rAU(1.0/UEqn.A());
-    surfaceScalarField rAUf(fvc::interpolate(rAU));
+    volScalarField rAU("Dp", 1.0/UEqn.A());
+    surfaceScalarField rAUf("Dpf", fvc::interpolate(rAU));
 
-    U = rAU*UEqn.H();
-    surfaceScalarField phiU
+    volVectorField HbyA("HbyA", U);
+    HbyA = rAU*UEqn.H();
+
+    surfaceScalarField phiHbyA
     (
-        "phiU",
-        (fvc::interpolate(U) & mesh.Sf())
+        "phiHbyA",
+        (fvc::interpolate(HbyA) & mesh.Sf())
       + fvc::ddtPhiCorr(rAU, rho, U, phi)
     );
-    mrfZones.relativeFlux(phiU);
 
-    adjustPhi(phiU, U, p_rgh);
+    mrfZones.relativeFlux(phiHbyA);
 
-    phi = phiU +
+    adjustPhi(phiHbyA, U, p_rgh);
+
+    surfaceScalarField phig
     (
-        fvc::interpolate(interface.sigmaK())*fvc::snGrad(alpha1)
-      - ghf*fvc::snGrad(rho)
-    )*rAUf*mesh.magSf();
+        (
+            fvc::interpolate(interface.sigmaK())*fvc::snGrad(alpha1)
+          - ghf*fvc::snGrad(rho)
+        )*rAUf*mesh.magSf()
+    );
+
+    phiHbyA += phig;
 
     while (pimple.correctNonOrthogonal())
     {
         fvScalarMatrix p_rghEqn
         (
-            fvm::laplacian(rAUf, p_rgh) == fvc::div(phi)
+            fvm::laplacian(rAUf, p_rgh) == fvc::div(phiHbyA)
         );
 
         p_rghEqn.setReference(pRefCell, getRefCellValue(p_rgh, pRefCell));
@@ -32,13 +39,13 @@
 
         if (pimple.finalNonOrthogonalIter())
         {
-            phi -= p_rghEqn.flux();
+            phi = phiHbyA - p_rghEqn.flux();
+
+            U = HbyA + rAU*fvc::reconstruct((phig - p_rghEqn.flux())/rAUf);
+            U.correctBoundaryConditions();
         }
     }
 
-    U += rAU*fvc::reconstruct((phi - phiU)/rAUf);
-    U.correctBoundaryConditions();
-
     #include "continuityErrs.H"
 
     p == p_rgh + rho*gh;
diff --git a/applications/solvers/multiphase/interFoam/interDyMFoam/pEqn.H b/applications/solvers/multiphase/interFoam/interDyMFoam/pEqn.H
index d94e075424..c18d5aba41 100644
--- a/applications/solvers/multiphase/interFoam/interDyMFoam/pEqn.H
+++ b/applications/solvers/multiphase/interFoam/interDyMFoam/pEqn.H
@@ -1,31 +1,38 @@
 {
-    volScalarField rAU(1.0/UEqn.A());
-    surfaceScalarField rAUf(fvc::interpolate(rAU));
+    volScalarField rAU("Dp", 1.0/UEqn.A());
+    surfaceScalarField rAUf("Dpf", fvc::interpolate(rAU));
 
-    U = rAU*UEqn.H();
+    volVectorField HbyA("HbyA", U);
+    HbyA = rAU*UEqn.H();
 
-    phiAbs =
-        (fvc::interpolate(U) & mesh.Sf())
-      + fvc::ddtPhiCorr(rAU, rho, U, phiAbs);
+    surfaceScalarField phiHbyA
+    (
+        (fvc::interpolate(HbyA) & mesh.Sf())
+      + fvc::ddtPhiCorr(rAU, rho, U, phiAbs)
+    );
 
     if (p_rgh.needReference())
     {
-        fvc::makeRelative(phiAbs, U);
-        adjustPhi(phiAbs, U, p_rgh);
-        fvc::makeAbsolute(phiAbs, U);
+        fvc::makeRelative(phiHbyA, U);
+        adjustPhi(phiHbyA, U, p_rgh);
+        fvc::makeAbsolute(phiHbyA, U);
     }
 
-    phi = phiAbs +
+    surfaceScalarField phig
     (
-        fvc::interpolate(interface.sigmaK())*fvc::snGrad(alpha1)
-      - ghf*fvc::snGrad(rho)
-    )*rAUf*mesh.magSf();
+        (
+            fvc::interpolate(interface.sigmaK())*fvc::snGrad(alpha1)
+          - ghf*fvc::snGrad(rho)
+        )*rAUf*mesh.magSf()
+    );
+
+    phiHbyA += phig;
 
     while (pimple.correctNonOrthogonal())
     {
         fvScalarMatrix p_rghEqn
         (
-            fvm::laplacian(rAUf, p_rgh) == fvc::div(phi)
+            fvm::laplacian(rAUf, p_rgh) == fvc::div(phiHbyA)
         );
 
         p_rghEqn.setReference(pRefCell, getRefCellValue(p_rgh, pRefCell));
@@ -34,13 +41,13 @@
 
         if (pimple.finalNonOrthogonalIter())
         {
-            phi -= p_rghEqn.flux();
+            phi = phiHbyA - p_rghEqn.flux();
+
+            U = HbyA + rAU*fvc::reconstruct((phig - p_rghEqn.flux())/rAUf);
+            U.correctBoundaryConditions();
         }
     }
 
-    U += rAU*fvc::reconstruct((phi - phiAbs)/rAUf);
-    U.correctBoundaryConditions();
-
     #include "continuityErrs.H"
 
     phiAbs = phi;
diff --git a/applications/solvers/multiphase/interFoam/pEqn.H b/applications/solvers/multiphase/interFoam/pEqn.H
index a88b5627e2..935ed02c15 100644
--- a/applications/solvers/multiphase/interFoam/pEqn.H
+++ b/applications/solvers/multiphase/interFoam/pEqn.H
@@ -1,28 +1,34 @@
 {
-    volScalarField rAU(1.0/UEqn.A());
-    surfaceScalarField rAUf(fvc::interpolate(rAU));
+    volScalarField rAU("Dp", 1.0/UEqn.A());
+    surfaceScalarField rAUf("Dpf", fvc::interpolate(rAU));
 
-    U = rAU*UEqn.H();
-    surfaceScalarField phiU
+    volVectorField HbyA("HbyA", U);
+    HbyA = rAU*UEqn.H();
+
+    surfaceScalarField phiHbyA
     (
-        "phiU",
-        (fvc::interpolate(U) & mesh.Sf())
+        "phiHbyA",
+        (fvc::interpolate(HbyA) & mesh.Sf())
       + fvc::ddtPhiCorr(rAU, rho, U, phi)
     );
 
-    adjustPhi(phiU, U, p_rgh);
+    adjustPhi(phiHbyA, U, p_rgh);
 
-    phi = phiU +
+    surfaceScalarField phig
     (
-        fvc::interpolate(interface.sigmaK())*fvc::snGrad(alpha1)
-      - ghf*fvc::snGrad(rho)
-    )*rAUf*mesh.magSf();
+        (
+            fvc::interpolate(interface.sigmaK())*fvc::snGrad(alpha1)
+          - ghf*fvc::snGrad(rho)
+        )*rAUf*mesh.magSf()
+    );
+
+    phiHbyA += phig;
 
     while (pimple.correctNonOrthogonal())
     {
         fvScalarMatrix p_rghEqn
         (
-            fvm::laplacian(rAUf, p_rgh) == fvc::div(phi)
+            fvm::laplacian(rAUf, p_rgh) == fvc::div(phiHbyA)
         );
 
         p_rghEqn.setReference(pRefCell, getRefCellValue(p_rgh, pRefCell));
@@ -31,13 +37,13 @@
 
         if (pimple.finalNonOrthogonalIter())
         {
-            phi -= p_rghEqn.flux();
+            phi = phiHbyA - p_rghEqn.flux();
+
+            U = HbyA + rAU*fvc::reconstruct((phig - p_rghEqn.flux())/rAUf);
+            U.correctBoundaryConditions();
         }
     }
 
-    U += rAU*fvc::reconstruct((phi - phiU)/rAUf);
-    U.correctBoundaryConditions();
-
     #include "continuityErrs.H"
 
     p == p_rgh + rho*gh;
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedFluxPressure/fixedFluxPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/fixedFluxPressure/fixedFluxPressureFvPatchScalarField.C
index beeeb36446..aaa6ff8bde 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fixedFluxPressure/fixedFluxPressureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedFluxPressure/fixedFluxPressureFvPatchScalarField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -38,7 +38,7 @@ Foam::fixedFluxPressureFvPatchScalarField::fixedFluxPressureFvPatchScalarField
 )
 :
     fixedGradientFvPatchScalarField(p, iF),
-    UName_("U"),
+    phiHbyAName_("phiHbyA"),
     phiName_("phi"),
     rhoName_("rho"),
     adjoint_(false)
@@ -54,7 +54,7 @@ Foam::fixedFluxPressureFvPatchScalarField::fixedFluxPressureFvPatchScalarField
 )
 :
     fixedGradientFvPatchScalarField(ptf, p, iF, mapper),
-    UName_(ptf.UName_),
+    phiHbyAName_(ptf.phiHbyAName_),
     phiName_(ptf.phiName_),
     rhoName_(ptf.rhoName_),
     adjoint_(ptf.adjoint_)
@@ -69,10 +69,10 @@ Foam::fixedFluxPressureFvPatchScalarField::fixedFluxPressureFvPatchScalarField
 )
 :
     fixedGradientFvPatchScalarField(p, iF),
-    UName_(dict.lookupOrDefault<word>("U", "U")),
+    phiHbyAName_(dict.lookupOrDefault<word>("phiHbyA", "phiHbyA")),
     phiName_(dict.lookupOrDefault<word>("phi", "phi")),
     rhoName_(dict.lookupOrDefault<word>("rho", "rho")),
-    adjoint_(dict.lookup("adjoint"))
+    adjoint_(dict.lookupOrDefault<Switch>("adjoint", false))
 {
     if (dict.found("gradient"))
     {
@@ -94,7 +94,7 @@ Foam::fixedFluxPressureFvPatchScalarField::fixedFluxPressureFvPatchScalarField
 )
 :
     fixedGradientFvPatchScalarField(wbppsf),
-    UName_(wbppsf.UName_),
+    phiHbyAName_(wbppsf.phiHbyAName_),
     phiName_(wbppsf.phiName_),
     rhoName_(wbppsf.rhoName_),
     adjoint_(wbppsf.adjoint_)
@@ -108,7 +108,7 @@ Foam::fixedFluxPressureFvPatchScalarField::fixedFluxPressureFvPatchScalarField
 )
 :
     fixedGradientFvPatchScalarField(wbppsf, iF),
-    UName_(wbppsf.UName_),
+    phiHbyAName_(wbppsf.phiHbyAName_),
     phiName_(wbppsf.phiName_),
     rhoName_(wbppsf.rhoName_),
     adjoint_(wbppsf.adjoint_)
@@ -124,12 +124,15 @@ void Foam::fixedFluxPressureFvPatchScalarField::updateCoeffs()
         return;
     }
 
-    const fvPatchField<vector>& Up =
-        patch().lookupPatchField<volVectorField, vector>(UName_);
+    const surfaceScalarField& phiHbyA =
+        db().lookupObject<surfaceScalarField>(phiHbyAName_);
 
     const surfaceScalarField& phi =
         db().lookupObject<surfaceScalarField>(phiName_);
 
+    fvsPatchField<scalar> phiHbyAp =
+        patch().patchField<surfaceScalarField, scalar>(phiHbyA);
+
     fvsPatchField<scalar> phip =
         patch().patchField<surfaceScalarField, scalar>(phi);
 
@@ -141,16 +144,16 @@ void Foam::fixedFluxPressureFvPatchScalarField::updateCoeffs()
         phip /= rhop;
     }
 
-    const fvPatchField<scalar>& rAp =
-        patch().lookupPatchField<volScalarField, scalar>("(1|A("+UName_+"))");
+    const fvPatchField<scalar>& Dpp =
+        patch().lookupPatchField<volScalarField, scalar>("Dp");
 
     if (adjoint_)
     {
-        gradient() = ((patch().Sf() & Up) - phip)/patch().magSf()/rAp;
+        gradient() = (phip - phiHbyAp)/patch().magSf()/Dpp;
     }
     else
     {
-        gradient() = (phip - (patch().Sf() & Up))/patch().magSf()/rAp;
+        gradient() = (phiHbyAp - phip)/patch().magSf()/Dpp;
     }
 
     fixedGradientFvPatchScalarField::updateCoeffs();
@@ -160,7 +163,7 @@ void Foam::fixedFluxPressureFvPatchScalarField::updateCoeffs()
 void Foam::fixedFluxPressureFvPatchScalarField::write(Ostream& os) const
 {
     fvPatchScalarField::write(os);
-    writeEntryIfDifferent<word>(os, "U", "U", UName_);
+    writeEntryIfDifferent<word>(os, "phiHbyA", "phiHbyA", phiHbyAName_);
     writeEntryIfDifferent<word>(os, "phi", "phi", phiName_);
     writeEntryIfDifferent<word>(os, "rho", "rho", rhoName_);
     os.writeKeyword("adjoint") << adjoint_ << token::END_STATEMENT << nl;
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedFluxPressure/fixedFluxPressureFvPatchScalarField.H b/src/finiteVolume/fields/fvPatchFields/derived/fixedFluxPressure/fixedFluxPressureFvPatchScalarField.H
index bc0c4f9fb9..82a7f8a6b4 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fixedFluxPressure/fixedFluxPressureFvPatchScalarField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedFluxPressure/fixedFluxPressureFvPatchScalarField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -25,7 +25,14 @@ Class
     Foam::fixedFluxPressureFvPatchScalarField
 
 Description
-    Foam::fixedFluxPressureFvPatchScalarField
+    Adjusts the pressure gradient such that the flux on the boundary is that
+    specified by the velocity boundary condition.
+
+    The predicted flux to be compensated by the pressure gradient is evaluated
+    as (phi - phiHbyA), both of which are looked-up from the database as is
+    the pressure diffusivity Dp used to calculate the gradient.
+
+    The names of the phi, phiHbyA and Dp fields may be optionally specified.
 
 SourceFiles
     fixedFluxPressureFvPatchScalarField.C
@@ -54,8 +61,8 @@ class fixedFluxPressureFvPatchScalarField
 {
     // Private data
 
-        //- Name of the velocity field
-        word UName_;
+        //- Name of the predicted flux transporting the field
+        word phiHbyAName_;
 
         //- Name of the flux transporting the field
         word phiName_;
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/multiphaseFixedFluxPressure/multiphaseFixedFluxPressureFvPatchScalarField.H b/src/finiteVolume/fields/fvPatchFields/derived/multiphaseFixedFluxPressure/multiphaseFixedFluxPressureFvPatchScalarField.H
index a6e0d7df45..57f01d78e6 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/multiphaseFixedFluxPressure/multiphaseFixedFluxPressureFvPatchScalarField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/multiphaseFixedFluxPressure/multiphaseFixedFluxPressureFvPatchScalarField.H
@@ -25,7 +25,14 @@ Class
     Foam::multiphaseFixedFluxPressureFvPatchScalarField
 
 Description
-    Foam::multiphaseFixedFluxPressureFvPatchScalarField
+    Adjusts the pressure gradient such that the flux on the boundary is that
+    specified by the velocity boundary condition.
+
+    The predicted flux to be compensated by the pressure gradient is evaluated
+    as (phi - phiHbyA), both of which are looked-up from the database as is
+    the pressure diffusivity Dp used to calculate the gradient.
+
+    The names of the phi, phiHbyA and Dp fields may be optionally specified.
 
 SourceFiles
     multiphaseFixedFluxPressureFvPatchScalarField.C
diff --git a/tutorials/multiphase/interFoam/laminar/capillaryRise/0/p_rgh b/tutorials/multiphase/interFoam/laminar/capillaryRise/0/p_rgh
index 6914780a05..e574d0ac74 100644
--- a/tutorials/multiphase/interFoam/laminar/capillaryRise/0/p_rgh
+++ b/tutorials/multiphase/interFoam/laminar/capillaryRise/0/p_rgh
@@ -35,7 +35,6 @@ boundaryField
     walls
     {
         type            fixedFluxPressure;
-        adjoint         no;
     }
 
     defaultFaces
diff --git a/tutorials/multiphase/interFoam/laminar/capillaryRise/system/controlDict b/tutorials/multiphase/interFoam/laminar/capillaryRise/system/controlDict
index 02e7599942..64536780d0 100644
--- a/tutorials/multiphase/interFoam/laminar/capillaryRise/system/controlDict
+++ b/tutorials/multiphase/interFoam/laminar/capillaryRise/system/controlDict
@@ -17,7 +17,7 @@ FoamFile
 
 application     interFoam;
 
-startFrom       latestTime;
+startFrom       startTime;
 
 startTime       0;
 
@@ -25,7 +25,7 @@ stopAt          endTime;
 
 endTime         0.5;
 
-deltaT          0.001;
+deltaT          1e-5;
 
 writeControl    adjustableRunTime;
 

From 59f63768d68da09ba6655dcf8c38889fa413e835 Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Thu, 19 Apr 2012 09:39:56 +0100
Subject: [PATCH 228/317] multiphase: Changed phiU to phiHbyA and cache HbyA
 rather than store the velocity predictor in U

---
 .../multiphase/compressibleInterFoam/pEqn.H   | 33 ++++---
 .../multiphase/interFoam/MRFInterFoam/pEqn.H  |  5 +-
 .../multiphase/interFoam/interDyMFoam/pEqn.H  |  4 +-
 .../solvers/multiphase/interFoam/pEqn.H       |  4 +-
 .../multiphase/interPhaseChangeFoam/pEqn.H    | 36 +++----
 .../MRFMultiphaseInterFoam/pEqn.H             | 41 ++++----
 .../multiphase/multiphaseInterFoam/pEqn.H     | 37 +++----
 .../solvers/multiphase/settlingFoam/pEqn.H    | 96 ++++++++++---------
 .../multiphase/twoLiquidMixingFoam/pEqn.H     | 33 ++++---
 .../fixedFluxPressureFvPatchScalarField.C     | 37 ++++++-
 .../fixedFluxPressureFvPatchScalarField.H     |  3 +
 ...phaseFixedFluxPressureFvPatchScalarField.C | 10 ++
 .../settlingFoam/ras/dahl/system/fvSchemes    |  2 +-
 .../settlingFoam/ras/tank3D/system/fvSchemes  |  2 +-
 14 files changed, 207 insertions(+), 136 deletions(-)

diff --git a/applications/solvers/multiphase/compressibleInterFoam/pEqn.H b/applications/solvers/multiphase/compressibleInterFoam/pEqn.H
index fc700f81fa..9e67a47c4f 100644
--- a/applications/solvers/multiphase/compressibleInterFoam/pEqn.H
+++ b/applications/solvers/multiphase/compressibleInterFoam/pEqn.H
@@ -2,8 +2,8 @@
     rho1 = eos1->rho(p, T);
     rho2 = eos2->rho(p, T);
 
-    volScalarField rAU = 1.0/UEqn.A();
-    surfaceScalarField rAUf = fvc::interpolate(rAU);
+    volScalarField rAU("rAU", 1.0/UEqn.A());
+    surfaceScalarField rAUf("Dp", fvc::interpolate(rAU));
 
     tmp<fvScalarMatrix> p_rghEqnComp1;
     tmp<fvScalarMatrix> p_rghEqnComp2;
@@ -27,20 +27,25 @@
           - fvc::Sp(fvc::div(phid2), p_rgh);
     }
 
-    U = rAU*UEqn.H();
+    volVectorField HbyA("HbyA", U);
+    HbyA = rAU*UEqn.H();
 
-    surfaceScalarField phiU
+    surfaceScalarField phiHbyA
     (
-        "phiU",
-        (fvc::interpolate(U) & mesh.Sf())
+        "phiHbyA",
+        (fvc::interpolate(HbyA) & mesh.Sf())
       + fvc::ddtPhiCorr(rAU, rho, U, phi)
     );
 
-    phi = phiU +
+    surfaceScalarField phig
+    (
         (
             fvc::interpolate(interface.sigmaK())*fvc::snGrad(alpha1)
           - ghf*fvc::snGrad(rho)
-        )*rAUf*mesh.magSf();
+        )*rAUf*mesh.magSf()
+    );
+
+    phiHbyA += phig;
 
     // Thermodynamic density needs to be updated by psi*d(p) after the
     // pressure solution - done in 2 parts. Part 1:
@@ -50,7 +55,7 @@
     {
         fvScalarMatrix p_rghEqnIncomp
         (
-            fvc::div(phi)
+            fvc::div(phiHbyA)
           - fvm::laplacian(rAUf, p_rgh)
         );
 
@@ -74,13 +79,15 @@
                 pos(alpha2)*(p_rghEqnComp2 & p_rgh)/rho2
               - pos(alpha1)*(p_rghEqnComp1 & p_rgh)/rho1
             );
-            phi += p_rghEqnIncomp.flux();
+
+            phi = phiHbyA + p_rghEqnIncomp.flux();
+
+            U = HbyA
+              + rAU*fvc::reconstruct((phig + p_rghEqnIncomp.flux())/rAUf);
+            U.correctBoundaryConditions();
         }
     }
 
-    U += rAU*fvc::reconstruct((phi - phiU)/rAUf);
-    U.correctBoundaryConditions();
-
     p = max(p_rgh + (alpha1*rho1 + alpha2*rho2)*gh, pMin);
 
     rho1 = eos1->rho(p, T);
diff --git a/applications/solvers/multiphase/interFoam/MRFInterFoam/pEqn.H b/applications/solvers/multiphase/interFoam/MRFInterFoam/pEqn.H
index 13d6b60662..9c56c4d26f 100644
--- a/applications/solvers/multiphase/interFoam/MRFInterFoam/pEqn.H
+++ b/applications/solvers/multiphase/interFoam/MRFInterFoam/pEqn.H
@@ -1,6 +1,6 @@
 {
-    volScalarField rAU("Dp", 1.0/UEqn.A());
-    surfaceScalarField rAUf("Dpf", fvc::interpolate(rAU));
+    volScalarField rAU("rAU", 1.0/UEqn.A());
+    surfaceScalarField rAUf("Dp", fvc::interpolate(rAU));
 
     volVectorField HbyA("HbyA", U);
     HbyA = rAU*UEqn.H();
@@ -11,7 +11,6 @@
         (fvc::interpolate(HbyA) & mesh.Sf())
       + fvc::ddtPhiCorr(rAU, rho, U, phi)
     );
-
     mrfZones.relativeFlux(phiHbyA);
 
     adjustPhi(phiHbyA, U, p_rgh);
diff --git a/applications/solvers/multiphase/interFoam/interDyMFoam/pEqn.H b/applications/solvers/multiphase/interFoam/interDyMFoam/pEqn.H
index c18d5aba41..f6681086d0 100644
--- a/applications/solvers/multiphase/interFoam/interDyMFoam/pEqn.H
+++ b/applications/solvers/multiphase/interFoam/interDyMFoam/pEqn.H
@@ -1,6 +1,6 @@
 {
-    volScalarField rAU("Dp", 1.0/UEqn.A());
-    surfaceScalarField rAUf("Dpf", fvc::interpolate(rAU));
+    volScalarField rAU("rAU", 1.0/UEqn.A());
+    surfaceScalarField rAUf("Dp", fvc::interpolate(rAU));
 
     volVectorField HbyA("HbyA", U);
     HbyA = rAU*UEqn.H();
diff --git a/applications/solvers/multiphase/interFoam/pEqn.H b/applications/solvers/multiphase/interFoam/pEqn.H
index 935ed02c15..d1bc7bf1ed 100644
--- a/applications/solvers/multiphase/interFoam/pEqn.H
+++ b/applications/solvers/multiphase/interFoam/pEqn.H
@@ -1,6 +1,6 @@
 {
-    volScalarField rAU("Dp", 1.0/UEqn.A());
-    surfaceScalarField rAUf("Dpf", fvc::interpolate(rAU));
+    volScalarField rAU("rAU", 1.0/UEqn.A());
+    surfaceScalarField rAUf("Dp", fvc::interpolate(rAU));
 
     volVectorField HbyA("HbyA", U);
     HbyA = rAU*UEqn.H();
diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/pEqn.H b/applications/solvers/multiphase/interPhaseChangeFoam/pEqn.H
index c9b65eb9d5..e3ef0dc9ef 100644
--- a/applications/solvers/multiphase/interPhaseChangeFoam/pEqn.H
+++ b/applications/solvers/multiphase/interPhaseChangeFoam/pEqn.H
@@ -1,24 +1,28 @@
 {
-    volScalarField rAU(1.0/UEqn.A());
-    surfaceScalarField rAUf(fvc::interpolate(rAU));
+    volScalarField rAU("rAU", 1.0/UEqn.A());
+    surfaceScalarField rAUf("Dp", fvc::interpolate(rAU));
 
-    U = rAU*UEqn.H();
+    volVectorField HbyA("HbyA", U);
+    HbyA = rAU*UEqn.H();
 
-    surfaceScalarField phiU
+    surfaceScalarField phiHbyA
     (
-        "phiU",
-        (fvc::interpolate(U) & mesh.Sf())
+        "phiHbyA",
+        (fvc::interpolate(HbyA) & mesh.Sf())
       + fvc::ddtPhiCorr(rAU, rho, U, phi)
     );
 
-    adjustPhi(phiU, U, p_rgh);
+    adjustPhi(phiHbyA, U, p_rgh);
 
-    phi =
-        phiU
-      + (
+    surfaceScalarField phig
+    (
+        (
             fvc::interpolate(interface.sigmaK())*fvc::snGrad(alpha1)
           - ghf*fvc::snGrad(rho)
-        )*rAUf*mesh.magSf();
+        )*rAUf*mesh.magSf()
+    );
+
+    phiHbyA += phig;
 
     Pair<tmp<volScalarField> > vDotP = twoPhaseProperties->vDotP();
     const volScalarField& vDotcP = vDotP[0]();
@@ -28,7 +32,7 @@
     {
         fvScalarMatrix p_rghEqn
         (
-            fvc::div(phi) - fvm::laplacian(rAUf, p_rgh)
+            fvc::div(phiHbyA) - fvm::laplacian(rAUf, p_rgh)
           - (vDotvP - vDotcP)*(pSat - rho*gh) + fvm::Sp(vDotvP - vDotcP, p_rgh)
         );
 
@@ -38,13 +42,13 @@
 
         if (pimple.finalNonOrthogonalIter())
         {
-            phi += p_rghEqn.flux();
+            phi = phiHbyA + p_rghEqn.flux();
+
+            U = HbyA + rAU*fvc::reconstruct((phig + p_rghEqn.flux())/rAUf);
+            U.correctBoundaryConditions();
         }
     }
 
-    U += rAU*fvc::reconstruct((phi - phiU)/rAUf);
-    U.correctBoundaryConditions();
-
     #include "continuityErrs.H"
 
     p == p_rgh + rho*gh;
diff --git a/applications/solvers/multiphase/multiphaseInterFoam/MRFMultiphaseInterFoam/pEqn.H b/applications/solvers/multiphase/multiphaseInterFoam/MRFMultiphaseInterFoam/pEqn.H
index efb181f3f2..7bc1eeb12c 100644
--- a/applications/solvers/multiphase/multiphaseInterFoam/MRFMultiphaseInterFoam/pEqn.H
+++ b/applications/solvers/multiphase/multiphaseInterFoam/MRFMultiphaseInterFoam/pEqn.H
@@ -1,31 +1,32 @@
 {
-    volScalarField rAU(1.0/UEqn.A());
-    surfaceScalarField rAUf(fvc::interpolate(rAU));
+    volScalarField rAU("rAU", 1.0/UEqn.A());
+    surfaceScalarField rAUf("Dp", fvc::interpolate(rAU));
 
-    U = rAU*UEqn.H();
+    volVectorField HbyA("HbyA", U);
+    HbyA = rAU*UEqn.H();
 
-    surfaceScalarField phiU
+    surfaceScalarField phiHbyA
     (
-        "phiU",
-        (fvc::interpolate(U) & mesh.Sf())
-      //+ fvc::ddtPhiCorr(rAU, rho, U, phi)
+        "phiHbyA",
+        (fvc::interpolate(HbyA) & mesh.Sf())
+      + fvc::ddtPhiCorr(rAU, rho, U, phi)
     );
-    mrfZones.relativeFlux(phiU);
+    mrfZones.relativeFlux(phiHbyA);
 
-    adjustPhi(phiU, U, p_rgh);
+    adjustPhi(phiHbyA, U, p_rgh);
 
-    phi =
-        phiU
-      + (
-            mixture.surfaceTensionForce()
-          - ghf*fvc::snGrad(rho)
-        )*rAUf*mesh.magSf();
+    surfaceScalarField phig
+    (
+        - ghf*fvc::snGrad(rho)*rAUf*mesh.magSf()
+    );
+
+    phiHbyA += phig;
 
     while (pimple.correctNonOrthogonal())
     {
         fvScalarMatrix p_rghEqn
         (
-            fvm::laplacian(rAUf, p_rgh) == fvc::div(phi)
+            fvm::laplacian(rAUf, p_rgh) == fvc::div(phiHbyA)
         );
 
         p_rghEqn.setReference(pRefCell, getRefCellValue(p_rgh, pRefCell));
@@ -34,13 +35,13 @@
 
         if (pimple.finalNonOrthogonalIter())
         {
-            phi -= p_rghEqn.flux();
+            phi = phiHbyA - p_rghEqn.flux();
+
+            U = HbyA + rAU*fvc::reconstruct((phig - p_rghEqn.flux())/rAUf);
+            U.correctBoundaryConditions();
         }
     }
 
-    U += rAU*fvc::reconstruct((phi - phiU)/rAUf);
-    U.correctBoundaryConditions();
-
     #include "continuityErrs.H"
 
     p == p_rgh + rho*gh;
diff --git a/applications/solvers/multiphase/multiphaseInterFoam/pEqn.H b/applications/solvers/multiphase/multiphaseInterFoam/pEqn.H
index e7e5bc14cf..c1e346ce43 100644
--- a/applications/solvers/multiphase/multiphaseInterFoam/pEqn.H
+++ b/applications/solvers/multiphase/multiphaseInterFoam/pEqn.H
@@ -1,29 +1,34 @@
 {
-    volScalarField rAU(1.0/UEqn.A());
-    surfaceScalarField rAUf(fvc::interpolate(rAU));
+    volScalarField rAU("rAU", 1.0/UEqn.A());
+    surfaceScalarField rAUf("Dp", fvc::interpolate(rAU));
 
-    U = rAU*UEqn.H();
+    volVectorField HbyA("HbyA", U);
+    HbyA = rAU*UEqn.H();
 
-    surfaceScalarField phiU
+    surfaceScalarField phiHbyA
     (
-        "phiU",
-        (fvc::interpolate(U) & mesh.Sf())
+        "phiHbyA",
+        (fvc::interpolate(HbyA) & mesh.Sf())
       + fvc::ddtPhiCorr(rAU, rho, U, phi)
     );
 
-    adjustPhi(phiU, U, p_rgh);
+    adjustPhi(phiHbyA, U, p_rgh);
 
-    phi = phiU +
+    surfaceScalarField phig
     (
-        mixture.surfaceTensionForce()
-      - ghf*fvc::snGrad(rho)
-    )*rAUf*mesh.magSf();
+        (
+            mixture.surfaceTensionForce()
+          - ghf*fvc::snGrad(rho)
+        )*rAUf*mesh.magSf()
+    );
+
+    phiHbyA += phig;
 
     while (pimple.correctNonOrthogonal())
     {
         fvScalarMatrix p_rghEqn
         (
-            fvm::laplacian(rAUf, p_rgh) == fvc::div(phi)
+            fvm::laplacian(rAUf, p_rgh) == fvc::div(phiHbyA)
         );
 
         p_rghEqn.setReference(pRefCell, getRefCellValue(p_rgh, pRefCell));
@@ -32,13 +37,13 @@
 
         if (pimple.finalNonOrthogonalIter())
         {
-            phi -= p_rghEqn.flux();
+            phi = phiHbyA - p_rghEqn.flux();
+
+            U = HbyA + rAU*fvc::reconstruct((phig - p_rghEqn.flux())/rAUf);
+            U.correctBoundaryConditions();
         }
     }
 
-    U += rAU*fvc::reconstruct((phi - phiU)/rAUf);
-    U.correctBoundaryConditions();
-
     #include "continuityErrs.H"
 
     p == p_rgh + rho*gh;
diff --git a/applications/solvers/multiphase/settlingFoam/pEqn.H b/applications/solvers/multiphase/settlingFoam/pEqn.H
index d89fd3ef4e..bf632adb4d 100644
--- a/applications/solvers/multiphase/settlingFoam/pEqn.H
+++ b/applications/solvers/multiphase/settlingFoam/pEqn.H
@@ -1,54 +1,60 @@
-volScalarField rAU(1.0/UEqn.A());
-
-surfaceScalarField rAUf
-(
-    "(rho*(1|A(U)))",
-    fvc::interpolate(rho)*fvc::interpolate(rAU)
-);
-
-U = rAU*UEqn.H();
-phi =
-    fvc::interpolate(rho)
-   *(
-       (fvc::interpolate(U) & mesh.Sf())
-     + fvc::ddtPhiCorr(rAU, rho, U, phi)
-    );
-
-surfaceScalarField phiU("phiU", phi);
-phi -= ghf*fvc::snGrad(rho)*rAUf*mesh.magSf();
-
-while (pimple.correctNonOrthogonal())
 {
-    fvScalarMatrix p_rghEqn
+    volScalarField rAU("rAU", 1.0/UEqn.A());
+
+    surfaceScalarField rAUf("Dp", fvc::interpolate(rho*rAU));
+
+    volVectorField HbyA("HbyA", U);
+    HbyA = rAU*UEqn.H();
+
+    surfaceScalarField phiHbyA
     (
-        fvm::laplacian(rAUf, p_rgh) == fvc::ddt(rho) + fvc::div(phi)
+        fvc::interpolate(rho)
+       *(
+           (fvc::interpolate(HbyA) & mesh.Sf())
+         + fvc::ddtPhiCorr(rAU, rho, U, phi)
+        )
     );
 
-    p_rghEqn.setReference(pRefCell, getRefCellValue(p_rgh, pRefCell));
+    surfaceScalarField phig
+    (
+        - ghf*fvc::snGrad(rho)*rAUf*mesh.magSf()
+    );
 
-    p_rghEqn.solve(mesh.solver(p_rgh.select(pimple.finalInnerIter())));
+    phiHbyA += phig;
 
-    if (pimple.finalNonOrthogonalIter())
+    while (pimple.correctNonOrthogonal())
     {
-        phi -= p_rghEqn.flux();
+        fvScalarMatrix p_rghEqn
+        (
+            fvm::laplacian(rAUf, p_rgh) == fvc::ddt(rho) + fvc::div(phiHbyA)
+        );
+
+        p_rghEqn.setReference(pRefCell, getRefCellValue(p_rgh, pRefCell));
+
+        p_rghEqn.solve(mesh.solver(p_rgh.select(pimple.finalInnerIter())));
+
+        if (pimple.finalNonOrthogonalIter())
+        {
+            phi = phiHbyA - p_rghEqn.flux();
+
+            U = HbyA + rAU*fvc::reconstruct((phig - p_rghEqn.flux())/rAUf);
+            U.correctBoundaryConditions();
+        }
     }
+
+    p == p_rgh + rho*gh;
+
+    if (p_rgh.needReference())
+    {
+        p += dimensionedScalar
+        (
+            "p",
+            p.dimensions(),
+            pRefValue - getRefCellValue(p, pRefCell)
+        );
+        p_rgh = p - rho*gh;
+    }
+
+    #include "rhoEqn.H"
+    #include "compressibleContinuityErrs.H"
 }
-
-p == p_rgh + rho*gh;
-
-if (p_rgh.needReference())
-{
-    p += dimensionedScalar
-    (
-        "p",
-        p.dimensions(),
-        pRefValue - getRefCellValue(p, pRefCell)
-    );
-    p_rgh = p - rho*gh;
-}
-
-#include "rhoEqn.H"
-#include "compressibleContinuityErrs.H"
-
-U += rAU*fvc::reconstruct((phi - phiU)/rAUf);
-U.correctBoundaryConditions();
diff --git a/applications/solvers/multiphase/twoLiquidMixingFoam/pEqn.H b/applications/solvers/multiphase/twoLiquidMixingFoam/pEqn.H
index ac7fc35f68..ddfca4e3ea 100644
--- a/applications/solvers/multiphase/twoLiquidMixingFoam/pEqn.H
+++ b/applications/solvers/multiphase/twoLiquidMixingFoam/pEqn.H
@@ -1,24 +1,31 @@
 {
-    volScalarField rAU(1.0/UEqn.A());
-    surfaceScalarField rAUf(fvc::interpolate(rAU));
+    volScalarField rAU("rAU", 1.0/UEqn.A());
+    surfaceScalarField rAUf("Dp", fvc::interpolate(rAU));
 
-    U = rAU*UEqn.H();
-    surfaceScalarField phiU
+    volVectorField HbyA("HbyA", U);
+    HbyA = rAU*UEqn.H();
+
+    surfaceScalarField phiHbyA
     (
-        "phiU",
-        (fvc::interpolate(U) & mesh.Sf())
+        "phiHbyA",
+        (fvc::interpolate(HbyA) & mesh.Sf())
       + fvc::ddtPhiCorr(rAU, rho, U, phi)
     );
 
-    adjustPhi(phiU, U, p_rgh);
+    adjustPhi(phiHbyA, U, p_rgh);
 
-    phi = phiU - ghf*fvc::snGrad(rho)*rAUf*mesh.magSf();
+    surfaceScalarField phig
+    (
+        - ghf*fvc::snGrad(rho)*rAUf*mesh.magSf()
+    );
+
+    phiHbyA += phig;
 
     while (pimple.correctNonOrthogonal())
     {
         fvScalarMatrix p_rghEqn
         (
-            fvm::laplacian(rAUf, p_rgh) == fvc::div(phi)
+            fvm::laplacian(rAUf, p_rgh) == fvc::div(phiHbyA)
         );
 
         p_rghEqn.setReference(pRefCell, getRefCellValue(p_rgh, pRefCell));
@@ -27,13 +34,13 @@
 
         if (pimple.finalNonOrthogonalIter())
         {
-            phi -= p_rghEqn.flux();
+            phi = phiHbyA - p_rghEqn.flux();
+
+            U = HbyA + rAU*fvc::reconstruct((phig - p_rghEqn.flux())/rAUf);
+            U.correctBoundaryConditions();
         }
     }
 
-    U += rAU*fvc::reconstruct((phi - phiU)/rAUf);
-    U.correctBoundaryConditions();
-
     #include "continuityErrs.H"
 
     p == p_rgh + rho*gh;
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedFluxPressure/fixedFluxPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/fixedFluxPressure/fixedFluxPressureFvPatchScalarField.C
index aaa6ff8bde..ebfc0a8386 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fixedFluxPressure/fixedFluxPressureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedFluxPressure/fixedFluxPressureFvPatchScalarField.C
@@ -41,6 +41,7 @@ Foam::fixedFluxPressureFvPatchScalarField::fixedFluxPressureFvPatchScalarField
     phiHbyAName_("phiHbyA"),
     phiName_("phi"),
     rhoName_("rho"),
+    DpName_("Dp"),
     adjoint_(false)
 {}
 
@@ -57,6 +58,7 @@ Foam::fixedFluxPressureFvPatchScalarField::fixedFluxPressureFvPatchScalarField
     phiHbyAName_(ptf.phiHbyAName_),
     phiName_(ptf.phiName_),
     rhoName_(ptf.rhoName_),
+    DpName_(ptf.rhoName_),
     adjoint_(ptf.adjoint_)
 {}
 
@@ -72,6 +74,7 @@ Foam::fixedFluxPressureFvPatchScalarField::fixedFluxPressureFvPatchScalarField
     phiHbyAName_(dict.lookupOrDefault<word>("phiHbyA", "phiHbyA")),
     phiName_(dict.lookupOrDefault<word>("phi", "phi")),
     rhoName_(dict.lookupOrDefault<word>("rho", "rho")),
+    DpName_(dict.lookupOrDefault<word>("Dp", "Dp")),
     adjoint_(dict.lookupOrDefault<Switch>("adjoint", false))
 {
     if (dict.found("gradient"))
@@ -97,6 +100,7 @@ Foam::fixedFluxPressureFvPatchScalarField::fixedFluxPressureFvPatchScalarField
     phiHbyAName_(wbppsf.phiHbyAName_),
     phiName_(wbppsf.phiName_),
     rhoName_(wbppsf.rhoName_),
+    DpName_(wbppsf.DpName_),
     adjoint_(wbppsf.adjoint_)
 {}
 
@@ -111,6 +115,7 @@ Foam::fixedFluxPressureFvPatchScalarField::fixedFluxPressureFvPatchScalarField
     phiHbyAName_(wbppsf.phiHbyAName_),
     phiName_(wbppsf.phiName_),
     rhoName_(wbppsf.rhoName_),
+    DpName_(wbppsf.DpName_),
     adjoint_(wbppsf.adjoint_)
 {}
 
@@ -136,6 +141,7 @@ void Foam::fixedFluxPressureFvPatchScalarField::updateCoeffs()
     fvsPatchField<scalar> phip =
         patch().patchField<surfaceScalarField, scalar>(phi);
 
+    /*
     if (phi.dimensions() == dimDensity*dimVelocity*dimArea)
     {
         const fvPatchField<scalar>& rhop =
@@ -144,16 +150,38 @@ void Foam::fixedFluxPressureFvPatchScalarField::updateCoeffs()
         phip /= rhop;
     }
 
-    const fvPatchField<scalar>& Dpp =
-        patch().lookupPatchField<volScalarField, scalar>("Dp");
+    if (phiHbyA.dimensions() == dimDensity*dimVelocity*dimArea)
+    {
+        const fvPatchField<scalar>& rhop =
+            patch().lookupPatchField<volScalarField, scalar>(rhoName_);
+
+        phiHbyAp /= rhop;
+    }
+    */
+
+    const scalarField *DppPtr = NULL;
+
+    if (db().foundObject<volScalarField>(DpName_))
+    {
+        DppPtr =
+            &patch().lookupPatchField<volScalarField, scalar>(DpName_);
+    }
+    else if (db().foundObject<surfaceScalarField>(DpName_))
+    {
+        const surfaceScalarField& Dp =
+            db().lookupObject<surfaceScalarField>(DpName_);
+
+        DppPtr =
+            &patch().patchField<surfaceScalarField, scalar>(Dp);
+    }
 
     if (adjoint_)
     {
-        gradient() = (phip - phiHbyAp)/patch().magSf()/Dpp;
+        gradient() = (phip - phiHbyAp)/patch().magSf()/(*DppPtr);
     }
     else
     {
-        gradient() = (phiHbyAp - phip)/patch().magSf()/Dpp;
+        gradient() = (phiHbyAp - phip)/patch().magSf()/(*DppPtr);
     }
 
     fixedGradientFvPatchScalarField::updateCoeffs();
@@ -166,6 +194,7 @@ void Foam::fixedFluxPressureFvPatchScalarField::write(Ostream& os) const
     writeEntryIfDifferent<word>(os, "phiHbyA", "phiHbyA", phiHbyAName_);
     writeEntryIfDifferent<word>(os, "phi", "phi", phiName_);
     writeEntryIfDifferent<word>(os, "rho", "rho", rhoName_);
+    writeEntryIfDifferent<word>(os, "Dp", "Dp", rhoName_);
     os.writeKeyword("adjoint") << adjoint_ << token::END_STATEMENT << nl;
     gradient().writeEntry("gradient", os);
 }
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedFluxPressure/fixedFluxPressureFvPatchScalarField.H b/src/finiteVolume/fields/fvPatchFields/derived/fixedFluxPressure/fixedFluxPressureFvPatchScalarField.H
index 82a7f8a6b4..de8f837abd 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fixedFluxPressure/fixedFluxPressureFvPatchScalarField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedFluxPressure/fixedFluxPressureFvPatchScalarField.H
@@ -71,6 +71,9 @@ class fixedFluxPressureFvPatchScalarField
         //  if neccessary
         word rhoName_;
 
+        //- Name of the pressure diffusivity field
+        word DpName_;
+
         //- Is the pressure adjoint, i.e. has the opposite sign
         Switch adjoint_;
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/multiphaseFixedFluxPressure/multiphaseFixedFluxPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/multiphaseFixedFluxPressure/multiphaseFixedFluxPressureFvPatchScalarField.C
index aa84755155..644c8b161c 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/multiphaseFixedFluxPressure/multiphaseFixedFluxPressureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/multiphaseFixedFluxPressure/multiphaseFixedFluxPressureFvPatchScalarField.C
@@ -136,6 +136,7 @@ void Foam::multiphaseFixedFluxPressureFvPatchScalarField::updateCoeffs()
     fvsPatchField<scalar> phip =
         patch().patchField<surfaceScalarField, scalar>(phi);
 
+    /*
     if (phi.dimensions() == dimDensity*dimVelocity*dimArea)
     {
         const fvPatchField<scalar>& rhop =
@@ -144,6 +145,15 @@ void Foam::multiphaseFixedFluxPressureFvPatchScalarField::updateCoeffs()
         phip /= rhop;
     }
 
+    if (phiHbyA.dimensions() == dimDensity*dimVelocity*dimArea)
+    {
+        const fvPatchField<scalar>& rhop =
+            patch().lookupPatchField<volScalarField, scalar>(rhoName_);
+
+        phiHbyAp /= rhop;
+    }
+    */
+
     const fvsPatchField<scalar>& Dpp =
         patch().lookupPatchField<surfaceScalarField, scalar>("Dp");
 
diff --git a/tutorials/multiphase/settlingFoam/ras/dahl/system/fvSchemes b/tutorials/multiphase/settlingFoam/ras/dahl/system/fvSchemes
index bfdc69ada0..026c549f6c 100644
--- a/tutorials/multiphase/settlingFoam/ras/dahl/system/fvSchemes
+++ b/tutorials/multiphase/settlingFoam/ras/dahl/system/fvSchemes
@@ -39,7 +39,7 @@ laplacianSchemes
 {
     default         none;
     laplacian(muEff,U) Gauss linear corrected;
-    laplacian((rho*(1|A(U))),p_rgh) Gauss linear corrected;
+    laplacian(Dp,p_rgh) Gauss linear corrected;
     laplacian(DkEff,k) Gauss linear corrected;
     laplacian(DepsilonEff,epsilon) Gauss linear corrected;
     laplacian(mut,Alpha) Gauss linear corrected;
diff --git a/tutorials/multiphase/settlingFoam/ras/tank3D/system/fvSchemes b/tutorials/multiphase/settlingFoam/ras/tank3D/system/fvSchemes
index 65b5f239ef..ffdb15771e 100644
--- a/tutorials/multiphase/settlingFoam/ras/tank3D/system/fvSchemes
+++ b/tutorials/multiphase/settlingFoam/ras/tank3D/system/fvSchemes
@@ -39,7 +39,7 @@ laplacianSchemes
 {
     default         none;
     laplacian(muEff,U) Gauss linear corrected;
-    laplacian((rho*(1|A(U))),p_rgh) Gauss linear corrected;
+    laplacian(Dp,p_rgh) Gauss linear corrected;
     laplacian(DkEff,k) Gauss linear corrected;
     laplacian(DepsilonEff,epsilon) Gauss linear corrected;
     laplacian(mut,Alpha) Gauss linear corrected;

From 70595a9a6136b1a93ba26c89c6e2fa9e2672525d Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Thu, 19 Apr 2012 10:08:59 +0100
Subject: [PATCH 229/317] Buoyant solvers: changed the sign of phig to be
 consistent with the sign of the buoyancy force on the RHS of UEqn

---
 applications/solvers/combustion/fireFoam/pEqn.H             | 6 +++---
 .../solvers/heatTransfer/buoyantBoussinesqSimpleFoam/pEqn.H | 6 +++---
 applications/solvers/heatTransfer/buoyantSimpleFoam/pEqn.H  | 6 +++---
 .../solvers/lagrangian/reactingParcelFilmFoam/pEqn.H        | 6 +++---
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/applications/solvers/combustion/fireFoam/pEqn.H b/applications/solvers/combustion/fireFoam/pEqn.H
index f5364ae314..b6f5ef47b1 100644
--- a/applications/solvers/combustion/fireFoam/pEqn.H
+++ b/applications/solvers/combustion/fireFoam/pEqn.H
@@ -5,7 +5,7 @@ surfaceScalarField rhorAUf(rAU.name() + 'f', fvc::interpolate(rho*rAU));
 volVectorField HbyA("HbyA", U);
 HbyA = rAU*UEqn.H();
 
-surfaceScalarField phig(rhorAUf*ghf*fvc::snGrad(rho)*mesh.magSf());
+surfaceScalarField phig(-rhorAUf*ghf*fvc::snGrad(rho)*mesh.magSf());
 
 surfaceScalarField phiHbyA
 (
@@ -15,7 +15,7 @@ surfaceScalarField phiHbyA
         (fvc::interpolate(HbyA) & mesh.Sf())
       + fvc::ddtPhiCorr(rAU, rho, U, phi)
     )
-  - phig
+  + phig
 );
 
 
@@ -37,7 +37,7 @@ while (pimple.correctNonOrthogonal())
     if (pimple.finalNonOrthogonalIter())
     {
         phi = phiHbyA + p_rghEqn.flux();
-        U = HbyA + rAU*fvc::reconstruct((p_rghEqn.flux() - phig)/rhorAUf);
+        U = HbyA + rAU*fvc::reconstruct((p_rghEqn.flux() + phig)/rhorAUf);
         U.correctBoundaryConditions();
     }
 }
diff --git a/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/pEqn.H b/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/pEqn.H
index 61d4358a8a..32076b4dd1 100644
--- a/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/pEqn.H
+++ b/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/pEqn.H
@@ -6,7 +6,7 @@
     HbyA = rAU*UEqn().H();
     UEqn.clear();
 
-    surfaceScalarField phig(rAUf*ghf*fvc::snGrad(rhok)*mesh.magSf());
+    surfaceScalarField phig(-rAUf*ghf*fvc::snGrad(rhok)*mesh.magSf());
 
     surfaceScalarField phiHbyA
     (
@@ -16,7 +16,7 @@
 
     adjustPhi(phiHbyA, U, p_rgh);
 
-    phiHbyA -= phig;
+    phiHbyA += phig;
 
     while (simple.correctNonOrthogonal())
     {
@@ -39,7 +39,7 @@
 
             // Correct the momentum source with the pressure gradient flux
             // calculated from the relaxed pressure
-            U = HbyA - rAU*fvc::reconstruct((phig + p_rghEqn.flux())/rAUf);
+            U = HbyA + rAU*fvc::reconstruct((phig - p_rghEqn.flux())/rAUf);
             U.correctBoundaryConditions();
         }
     }
diff --git a/applications/solvers/heatTransfer/buoyantSimpleFoam/pEqn.H b/applications/solvers/heatTransfer/buoyantSimpleFoam/pEqn.H
index d558f6c217..a7f873c2f1 100644
--- a/applications/solvers/heatTransfer/buoyantSimpleFoam/pEqn.H
+++ b/applications/solvers/heatTransfer/buoyantSimpleFoam/pEqn.H
@@ -9,7 +9,7 @@
     HbyA = rAU*UEqn().H();
     UEqn.clear();
 
-    surfaceScalarField phig(rhorAUf*ghf*fvc::snGrad(rho)*mesh.magSf());
+    surfaceScalarField phig(-rhorAUf*ghf*fvc::snGrad(rho)*mesh.magSf());
 
     surfaceScalarField phiHbyA
     (
@@ -19,7 +19,7 @@
 
     bool closedVolume = adjustPhi(phiHbyA, U, p_rgh);
 
-    phiHbyA -= phig;
+    phiHbyA += phig;
 
     while (simple.correctNonOrthogonal())
     {
@@ -41,7 +41,7 @@
 
             // Correct the momentum source with the pressure gradient flux
             // calculated from the relaxed pressure
-            U = HbyA - rAU*fvc::reconstruct((phig + p_rghEqn.flux())/rhorAUf);
+            U = HbyA + rAU*fvc::reconstruct((phig - p_rghEqn.flux())/rhorAUf);
             U.correctBoundaryConditions();
         }
     }
diff --git a/applications/solvers/lagrangian/reactingParcelFilmFoam/pEqn.H b/applications/solvers/lagrangian/reactingParcelFilmFoam/pEqn.H
index f5364ae314..b6f5ef47b1 100644
--- a/applications/solvers/lagrangian/reactingParcelFilmFoam/pEqn.H
+++ b/applications/solvers/lagrangian/reactingParcelFilmFoam/pEqn.H
@@ -5,7 +5,7 @@ surfaceScalarField rhorAUf(rAU.name() + 'f', fvc::interpolate(rho*rAU));
 volVectorField HbyA("HbyA", U);
 HbyA = rAU*UEqn.H();
 
-surfaceScalarField phig(rhorAUf*ghf*fvc::snGrad(rho)*mesh.magSf());
+surfaceScalarField phig(-rhorAUf*ghf*fvc::snGrad(rho)*mesh.magSf());
 
 surfaceScalarField phiHbyA
 (
@@ -15,7 +15,7 @@ surfaceScalarField phiHbyA
         (fvc::interpolate(HbyA) & mesh.Sf())
       + fvc::ddtPhiCorr(rAU, rho, U, phi)
     )
-  - phig
+  + phig
 );
 
 
@@ -37,7 +37,7 @@ while (pimple.correctNonOrthogonal())
     if (pimple.finalNonOrthogonalIter())
     {
         phi = phiHbyA + p_rghEqn.flux();
-        U = HbyA + rAU*fvc::reconstruct((p_rghEqn.flux() - phig)/rhorAUf);
+        U = HbyA + rAU*fvc::reconstruct((p_rghEqn.flux() + phig)/rhorAUf);
         U.correctBoundaryConditions();
     }
 }

From 76f0eb0253565225a86914674d9522b6624e1a50 Mon Sep 17 00:00:00 2001
From: laurence <laurence>
Date: Thu, 19 Apr 2012 12:55:44 +0100
Subject: [PATCH 230/317] ENH: Update the surfaceFeatureExtract default
 dictionary

---
 .../surface/surfaceFeatureExtract/surfaceFeatureExtractDict    | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtractDict b/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtractDict
index b5084ec103..e9741543bd 100644
--- a/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtractDict
+++ b/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtractDict
@@ -30,9 +30,6 @@ surface1.stl
 
     // Write options
 
-        // Write .eMesh file (for snappyHexMesh)
-        writeFeatureEdgeMesh    yes;
-
         // Write features to obj format for postprocessing
         writeObj                yes;
 }

From 9d6def688fc2a97e86ae98728bdf7d2bb4e01d82 Mon Sep 17 00:00:00 2001
From: sergio <sergio>
Date: Thu, 19 Apr 2012 14:07:51 +0100
Subject: [PATCH 231/317] ENH: Adding extrudePatchMesh, re-location of
 extrudeModel and createShellMesh and introducing io::READ_IF_PRESENT option
 in polyMesh constructor from components

---
 .../mesh/generation/cv2DMesh/Make/options     |   2 +-
 .../mesh/generation/extrude/Allwclean         |   1 -
 .../mesh/generation/extrude/Allwmake          |   3 -
 .../extrude/extrudeMesh/Make/options          |   4 +-
 .../extrude/extrudeToRegionMesh/Make/options  |  10 +-
 .../generation/extrude2DMesh/Make/options     |   2 +-
 .../extrude2DMesh/extrude2DMesh/Make/options  |   2 +-
 src/Allwmake                                  |   2 +
 src/OpenFOAM/matrices/solution/solution.C     |   2 +
 .../polyBoundaryMesh/polyBoundaryMesh.C       |  78 +++++
 .../polyBoundaryMesh/polyBoundaryMesh.H       |   8 +
 src/OpenFOAM/meshes/polyMesh/polyMesh.C       |  24 +-
 .../meshes/polyMesh/zones/ZoneMesh/ZoneMesh.C |  26 ++
 .../meshes/polyMesh/zones/ZoneMesh/ZoneMesh.H |   9 +
 src/dynamicMesh/Make/files                    |   5 +
 src/dynamicMesh/Make/options                  |   6 +-
 .../dynamicMesh}/createShellMesh/Make/files   |   0
 .../dynamicMesh}/createShellMesh/Make/options |   0
 .../createShellMesh/createShellMesh.C         |   0
 .../createShellMesh/createShellMesh.H         |   0
 .../extrudePatchMesh/extrudePatchMesh.C       | 283 ++++++++++++++++++
 .../extrudePatchMesh/extrudePatchMesh.H       | 177 +++++++++++
 .../finiteVolume/fvSchemes/fvSchemes.C        |   2 +
 src/finiteVolume/fvMesh/fvMesh.C              |   2 +-
 src/mesh/Allwmake                             |   1 +
 .../mesh}/extrudeModel/Make/files             |   0
 .../mesh}/extrudeModel/Make/options           |   3 +-
 .../extrudeModel/extrudeModel/extrudeModel.C  |   0
 .../extrudeModel/extrudeModel/extrudeModel.H  |   0
 .../extrudeModel/extrudeModelNew.C            |   0
 .../linearDirection/linearDirection.C         |   0
 .../linearDirection/linearDirection.H         |   0
 .../extrudeModel/linearNormal/linearNormal.C  |   0
 .../extrudeModel/linearNormal/linearNormal.H  |   0
 .../extrudeModel/linearRadial/linearRadial.C  |   0
 .../extrudeModel/linearRadial/linearRadial.H  |   0
 .../extrudeModel/sigmaRadial/sigmaRadial.C    |   0
 .../extrudeModel/sigmaRadial/sigmaRadial.H    |   0
 .../mesh}/extrudeModel/wedge/wedge.C          |   0
 .../mesh}/extrudeModel/wedge/wedge.H          |   0
 40 files changed, 620 insertions(+), 32 deletions(-)
 rename {applications/utilities/mesh/generation/extrude/extrudeToRegionMesh => src/dynamicMesh}/createShellMesh/Make/files (100%)
 rename {applications/utilities/mesh/generation/extrude/extrudeToRegionMesh => src/dynamicMesh}/createShellMesh/Make/options (100%)
 rename {applications/utilities/mesh/generation/extrude/extrudeToRegionMesh => src/dynamicMesh}/createShellMesh/createShellMesh.C (100%)
 rename {applications/utilities/mesh/generation/extrude/extrudeToRegionMesh => src/dynamicMesh}/createShellMesh/createShellMesh.H (100%)
 create mode 100644 src/dynamicMesh/extrudePatchMesh/extrudePatchMesh.C
 create mode 100644 src/dynamicMesh/extrudePatchMesh/extrudePatchMesh.H
 rename {applications/utilities/mesh/generation/extrude => src/mesh}/extrudeModel/Make/files (100%)
 rename {applications/utilities/mesh/generation/extrude => src/mesh}/extrudeModel/Make/options (74%)
 rename {applications/utilities/mesh/generation/extrude => src/mesh}/extrudeModel/extrudeModel/extrudeModel.C (100%)
 rename {applications/utilities/mesh/generation/extrude => src/mesh}/extrudeModel/extrudeModel/extrudeModel.H (100%)
 rename {applications/utilities/mesh/generation/extrude => src/mesh}/extrudeModel/extrudeModel/extrudeModelNew.C (100%)
 rename {applications/utilities/mesh/generation/extrude => src/mesh}/extrudeModel/linearDirection/linearDirection.C (100%)
 rename {applications/utilities/mesh/generation/extrude => src/mesh}/extrudeModel/linearDirection/linearDirection.H (100%)
 rename {applications/utilities/mesh/generation/extrude => src/mesh}/extrudeModel/linearNormal/linearNormal.C (100%)
 rename {applications/utilities/mesh/generation/extrude => src/mesh}/extrudeModel/linearNormal/linearNormal.H (100%)
 rename {applications/utilities/mesh/generation/extrude => src/mesh}/extrudeModel/linearRadial/linearRadial.C (100%)
 rename {applications/utilities/mesh/generation/extrude => src/mesh}/extrudeModel/linearRadial/linearRadial.H (100%)
 rename {applications/utilities/mesh/generation/extrude => src/mesh}/extrudeModel/sigmaRadial/sigmaRadial.C (100%)
 rename {applications/utilities/mesh/generation/extrude => src/mesh}/extrudeModel/sigmaRadial/sigmaRadial.H (100%)
 rename {applications/utilities/mesh/generation/extrude => src/mesh}/extrudeModel/wedge/wedge.C (100%)
 rename {applications/utilities/mesh/generation/extrude => src/mesh}/extrudeModel/wedge/wedge.H (100%)

diff --git a/applications/utilities/mesh/generation/cv2DMesh/Make/options b/applications/utilities/mesh/generation/cv2DMesh/Make/options
index 82659091b6..cd2a9a5107 100755
--- a/applications/utilities/mesh/generation/cv2DMesh/Make/options
+++ b/applications/utilities/mesh/generation/cv2DMesh/Make/options
@@ -10,7 +10,6 @@ EXE_INC = \
     ${EXE_NDEBUG} \
     ${CGAL_INC} \
     -I$(FOAM_APP)/utilities/mesh/generation/extrude2DMesh/extrude2DMesh/lnInclude \
-    -I$(FOAM_APP)/utilities/mesh/generation/extrude/extrudeModel/lnInclude \
     -IconformalVoronoi2DMesh/lnInclude \
     -I$(FOAM_APP)/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
@@ -18,6 +17,7 @@ EXE_INC = \
     -I$(LIB_SRC)/surfMesh/lnInclude \
     -I$(LIB_SRC)/edgeMesh/lnInclude \
     -I$(LIB_SRC)/dynamicMesh/lnInclude \
+    -I$(LIB_SRC)/mesh/extrudeModel/lnInclude \
     -I$(LIB_SRC)/triSurface/lnInclude
 
 EXE_LIBS = \
diff --git a/applications/utilities/mesh/generation/extrude/Allwclean b/applications/utilities/mesh/generation/extrude/Allwclean
index c1c94a806b..253b4b4d6d 100755
--- a/applications/utilities/mesh/generation/extrude/Allwclean
+++ b/applications/utilities/mesh/generation/extrude/Allwclean
@@ -2,7 +2,6 @@
 cd ${0%/*} || exit 1    # run from this directory
 set -x
 
-wclean libso extrudeModel
 wclean extrudeMesh
 wclean extrudeToRegionMesh
 
diff --git a/applications/utilities/mesh/generation/extrude/Allwmake b/applications/utilities/mesh/generation/extrude/Allwmake
index 5f09893321..3fd3d2314a 100755
--- a/applications/utilities/mesh/generation/extrude/Allwmake
+++ b/applications/utilities/mesh/generation/extrude/Allwmake
@@ -2,10 +2,7 @@
 cd ${0%/*} || exit 1    # run from this directory
 set -x
 
-wmake libso extrudeModel
 wmake extrudeMesh
-
-wmake libso extrudeToRegionMesh/createShellMesh
 wmake extrudeToRegionMesh
 
 
diff --git a/applications/utilities/mesh/generation/extrude/extrudeMesh/Make/options b/applications/utilities/mesh/generation/extrude/extrudeMesh/Make/options
index 3445b811ea..94b355be3c 100644
--- a/applications/utilities/mesh/generation/extrude/extrudeMesh/Make/options
+++ b/applications/utilities/mesh/generation/extrude/extrudeMesh/Make/options
@@ -1,10 +1,10 @@
 EXE_INC = \
     -IextrudedMesh \
-    -I../extrudeModel/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/surfMesh/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
-    -I$(LIB_SRC)/dynamicMesh/lnInclude
+    -I$(LIB_SRC)/dynamicMesh/lnInclude \
+    -I$(LIB_SRC)/mesh/extrudeModel/lnInclude
 
 EXE_LIBS = \
     -lfiniteVolume \
diff --git a/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/Make/options b/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/Make/options
index 5732f9761d..9a1bd9942c 100644
--- a/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/Make/options
+++ b/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/Make/options
@@ -1,13 +1,11 @@
 EXE_INC = \
-    -I../extrudeModel/lnInclude \
-    -IcreateShellMesh/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
-    -I$(LIB_SRC)/dynamicMesh/lnInclude
+    -I$(LIB_SRC)/dynamicMesh/lnInclude \
+    -I$(LIB_SRC)/mesh/extrudeModel/lnInclude
 
 EXE_LIBS = \
-    -lextrudeModel \
-    -lcreateShellMesh \
     -lfiniteVolume \
     -lmeshTools \
-    -ldynamicMesh
+    -ldynamicMesh \
+    -lextrudeModel
diff --git a/applications/utilities/mesh/generation/extrude2DMesh/Make/options b/applications/utilities/mesh/generation/extrude2DMesh/Make/options
index 8adfe67b36..3be2f34c18 100644
--- a/applications/utilities/mesh/generation/extrude2DMesh/Make/options
+++ b/applications/utilities/mesh/generation/extrude2DMesh/Make/options
@@ -3,7 +3,7 @@ EXE_INC = \
     -I$(LIB_SRC)/surfMesh/lnInclude \
     -I$(LIB_SRC)/dynamicMesh/lnInclude \
     -Iextrude2DMesh/lnInclude \
-    -I../extrude/extrudeModel/lnInclude
+    -I$(LIB_SRC)/mesh/extrudeModel/lnInclude
 
 EXE_LIBS = \
     -lsurfMesh \
diff --git a/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMesh/Make/options b/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMesh/Make/options
index 8ace7c50da..f1db60d53f 100644
--- a/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMesh/Make/options
+++ b/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMesh/Make/options
@@ -4,7 +4,7 @@ EXE_INC = \
     -I$(LIB_SRC)/dynamicMesh/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/surfMesh/lnInclude \
-    -I$(FOAM_APP)/utilities/mesh/generation/extrude/extrudeModel/lnInclude
+    -I$(LIB_SRC)/mesh/extrudeModel/lnInclude
 
 LIB_LIBS = \
     -lmeshTools \
diff --git a/src/Allwmake b/src/Allwmake
index c4cbe16c95..a61c7a2e3e 100755
--- a/src/Allwmake
+++ b/src/Allwmake
@@ -52,6 +52,8 @@ wmake $makeType conversion
 
 wmake $makeType sampling
 
+wmake $makeType mesh/extrudeModel
+
 wmake $makeType dynamicMesh
 wmake $makeType dynamicFvMesh
 wmake $makeType topoChangerFvMesh
diff --git a/src/OpenFOAM/matrices/solution/solution.C b/src/OpenFOAM/matrices/solution/solution.C
index 50eb2fb96c..0b770b7daa 100644
--- a/src/OpenFOAM/matrices/solution/solution.C
+++ b/src/OpenFOAM/matrices/solution/solution.C
@@ -130,6 +130,7 @@ Foam::solution::solution
             obr,
             (
                 obr.readOpt() == IOobject::MUST_READ
+             || obr.readOpt() == IOobject::READ_IF_PRESENT
               ? IOobject::MUST_READ_IF_MODIFIED
               : obr.readOpt()
             ),
@@ -148,6 +149,7 @@ Foam::solution::solution
     (
         readOpt() == IOobject::MUST_READ
      || readOpt() == IOobject::MUST_READ_IF_MODIFIED
+     || (readOpt() == IOobject::READ_IF_PRESENT && headerOk())
     )
     {
         read(solutionDict());
diff --git a/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C b/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C
index ab13b34444..d5670fa331 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C
@@ -132,6 +132,84 @@ Foam::polyBoundaryMesh::polyBoundaryMesh
 {}
 
 
+Foam::polyBoundaryMesh::polyBoundaryMesh
+(
+    const IOobject& io,
+    const polyMesh& pm,
+    const polyPatchList& ppl
+)
+:
+    polyPatchList(),
+    regIOobject(io),
+    mesh_(pm)
+{
+    if
+    (
+        (this->readOpt() == IOobject::READ_IF_PRESENT && this->headerOk())
+     || this->readOpt() == IOobject::MUST_READ
+     || this->readOpt() == IOobject::MUST_READ_IF_MODIFIED
+    )
+    {
+
+        if (readOpt() == IOobject::MUST_READ_IF_MODIFIED)
+        {
+            WarningIn
+            (
+                "polyBoundaryMesh::polyBoundaryMesh\n"
+                "(\n"
+                "    const IOobject&,\n"
+                "    const polyMesh&\n"
+                "    const polyPatchList&\n"
+                ")"
+            )   << "Specified IOobject::MUST_READ_IF_MODIFIED but class"
+                << " does not support automatic rereading."
+                << endl;
+        }
+
+        polyPatchList& patches = *this;
+
+        // Read polyPatchList
+        Istream& is = readStream(typeName);
+
+        PtrList<entry> patchEntries(is);
+        patches.setSize(patchEntries.size());
+
+        forAll(patches, patchI)
+        {
+            patches.set
+            (
+                patchI,
+                polyPatch::New
+                (
+                    patchEntries[patchI].keyword(),
+                    patchEntries[patchI].dict(),
+                    patchI,
+                    *this
+                )
+            );
+        }
+
+        // Check state of IOstream
+        is.check
+        (
+            "polyBoundaryMesh::polyBoundaryMesh"
+            "(const IOobject&, const polyMesh&, const polyPatchList&)"
+        );
+
+        close();
+    }
+    else
+    {
+        polyPatchList& patches = *this;
+        patches.setSize(ppl.size());
+        forAll (patches, patchI)
+        {
+            patches.set(patchI, ppl[patchI].clone(*this).ptr());
+        }
+    }
+}
+
+
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
 Foam::polyBoundaryMesh::~polyBoundaryMesh()
diff --git a/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.H b/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.H
index 62d6f4a5e1..999b3815bf 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.H
+++ b/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.H
@@ -119,6 +119,14 @@ public:
             const label size
         );
 
+        //- Construct given polyPatchList
+        polyBoundaryMesh
+        (
+            const IOobject&,
+            const polyMesh&,
+            const polyPatchList&
+        );
+
 
     //- Destructor
     ~polyBoundaryMesh();
diff --git a/src/OpenFOAM/meshes/polyMesh/polyMesh.C b/src/OpenFOAM/meshes/polyMesh/polyMesh.C
index 8877cdafcf..7a470bc9ff 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyMesh.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyMesh.C
@@ -338,7 +338,7 @@ Foam::polyMesh::polyMesh
             instance(),
             meshSubDir,
             *this,
-            IOobject::NO_READ,
+            io.readOpt(),
             IOobject::AUTO_WRITE
         ),
         points
@@ -351,7 +351,7 @@ Foam::polyMesh::polyMesh
             instance(),
             meshSubDir,
             *this,
-            IOobject::NO_READ,
+            io.readOpt(),
             IOobject::AUTO_WRITE
         ),
         faces
@@ -364,7 +364,7 @@ Foam::polyMesh::polyMesh
             instance(),
             meshSubDir,
             *this,
-            IOobject::NO_READ,
+            io.readOpt(),
             IOobject::AUTO_WRITE
         ),
         owner
@@ -377,7 +377,7 @@ Foam::polyMesh::polyMesh
             instance(),
             meshSubDir,
             *this,
-            IOobject::NO_READ,
+            io.readOpt(),
             IOobject::AUTO_WRITE
         ),
         neighbour
@@ -391,11 +391,11 @@ Foam::polyMesh::polyMesh
             instance(),
             meshSubDir,
             *this,
-            IOobject::NO_READ,
+            io.readOpt(),
             IOobject::AUTO_WRITE
         ),
         *this,
-        0
+        polyPatchList()
     ),
     bounds_(points_, syncPar),
     geometricD_(Vector<label>::zero),
@@ -410,11 +410,11 @@ Foam::polyMesh::polyMesh
             instance(),
             meshSubDir,
             *this,
-            IOobject::NO_READ,
+            io.readOpt(),
             IOobject::NO_WRITE
         ),
         *this,
-        0
+        PtrList<pointZone>()
     ),
     faceZones_
     (
@@ -424,11 +424,11 @@ Foam::polyMesh::polyMesh
             instance(),
             meshSubDir,
             *this,
-            IOobject::NO_READ,
+            io.readOpt(),
             IOobject::NO_WRITE
         ),
         *this,
-        0
+        PtrList<faceZone>()
     ),
     cellZones_
     (
@@ -438,11 +438,11 @@ Foam::polyMesh::polyMesh
             instance(),
             meshSubDir,
             *this,
-            IOobject::NO_READ,
+            io.readOpt(),
             IOobject::NO_WRITE
         ),
         *this,
-        0
+        PtrList<cellZone>()
     ),
     globalMeshDataPtr_(NULL),
     moving_(false),
diff --git a/src/OpenFOAM/meshes/polyMesh/zones/ZoneMesh/ZoneMesh.C b/src/OpenFOAM/meshes/polyMesh/zones/ZoneMesh/ZoneMesh.C
index 2497592ee8..33e17117c4 100644
--- a/src/OpenFOAM/meshes/polyMesh/zones/ZoneMesh/ZoneMesh.C
+++ b/src/OpenFOAM/meshes/polyMesh/zones/ZoneMesh/ZoneMesh.C
@@ -162,6 +162,32 @@ Foam::ZoneMesh<ZoneType, MeshType>::ZoneMesh
 {}
 
 
+template<class ZoneType, class MeshType>
+Foam::ZoneMesh<ZoneType, MeshType>::ZoneMesh
+(
+    const IOobject& io ,
+    const MeshType& mesh,
+    const PtrList<ZoneType>& pzm
+)
+:
+    PtrList<ZoneType>(),
+    regIOobject(io),
+    mesh_(mesh),
+    zoneMapPtr_(NULL)
+{
+    ZoneMesh<ZoneType, MeshType>(io, mesh);
+
+    if (this->size() == 0)
+    {
+        PtrList<ZoneType>& zones = *this;
+        zones.setSize(pzm.size());
+        forAll (zones, zoneI)
+        {
+            zones.set(zoneI, pzm[zoneI].clone(*this).ptr());
+        }
+    }
+}
+
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
 template<class ZoneType, class MeshType>
diff --git a/src/OpenFOAM/meshes/polyMesh/zones/ZoneMesh/ZoneMesh.H b/src/OpenFOAM/meshes/polyMesh/zones/ZoneMesh/ZoneMesh.H
index 08ef19b4fc..96868c359a 100644
--- a/src/OpenFOAM/meshes/polyMesh/zones/ZoneMesh/ZoneMesh.H
+++ b/src/OpenFOAM/meshes/polyMesh/zones/ZoneMesh/ZoneMesh.H
@@ -106,6 +106,15 @@ public:
             const label size
         );
 
+         //- Construct given a PtrList
+        ZoneMesh
+        (
+            const IOobject&,
+            const MeshType&,
+            const PtrList<ZoneType>&
+        );
+
+
     //- Destructor
     ~ZoneMesh();
 
diff --git a/src/dynamicMesh/Make/files b/src/dynamicMesh/Make/files
index 02e9ad7ce4..a7f72ef9fa 100644
--- a/src/dynamicMesh/Make/files
+++ b/src/dynamicMesh/Make/files
@@ -86,4 +86,9 @@ motionSmoother/polyMeshGeometry/polyMeshGeometry.C
 
 motionSolver/motionSolver.C
 
+createShellMesh/createShellMesh.C
+
+extrudePatchMesh/extrudePatchMesh.C
+
+
 LIB = $(FOAM_LIBBIN)/libdynamicMesh
diff --git a/src/dynamicMesh/Make/options b/src/dynamicMesh/Make/options
index f168589ead..0757c29678 100644
--- a/src/dynamicMesh/Make/options
+++ b/src/dynamicMesh/Make/options
@@ -1,8 +1,10 @@
 EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
-    -I$(LIB_SRC)/triSurface/lnInclude
+    -I$(LIB_SRC)/triSurface/lnInclude \
+    -I$(LIB_SRC)/mesh/extrudeModel/lnInclude
 
 LIB_LIBS = \
     -lfiniteVolume \
-    -ltriSurface
+    -ltriSurface \
+    -lextrudeModel
diff --git a/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/createShellMesh/Make/files b/src/dynamicMesh/createShellMesh/Make/files
similarity index 100%
rename from applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/createShellMesh/Make/files
rename to src/dynamicMesh/createShellMesh/Make/files
diff --git a/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/createShellMesh/Make/options b/src/dynamicMesh/createShellMesh/Make/options
similarity index 100%
rename from applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/createShellMesh/Make/options
rename to src/dynamicMesh/createShellMesh/Make/options
diff --git a/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/createShellMesh/createShellMesh.C b/src/dynamicMesh/createShellMesh/createShellMesh.C
similarity index 100%
rename from applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/createShellMesh/createShellMesh.C
rename to src/dynamicMesh/createShellMesh/createShellMesh.C
diff --git a/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/createShellMesh/createShellMesh.H b/src/dynamicMesh/createShellMesh/createShellMesh.H
similarity index 100%
rename from applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/createShellMesh/createShellMesh.H
rename to src/dynamicMesh/createShellMesh/createShellMesh.H
diff --git a/src/dynamicMesh/extrudePatchMesh/extrudePatchMesh.C b/src/dynamicMesh/extrudePatchMesh/extrudePatchMesh.C
new file mode 100644
index 0000000000..860536ea30
--- /dev/null
+++ b/src/dynamicMesh/extrudePatchMesh/extrudePatchMesh.C
@@ -0,0 +1,283 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2012-2012 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "extrudePatchMesh.H"
+
+#include "createShellMesh.H"
+#include "polyTopoChange.H"
+#include "wallPolyPatch.H"
+#include "emptyPolyPatch.H"
+#include "wedgePolyPatch.H"
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+defineTypeNameAndDebug(extrudePatchMesh, 0);
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+extrudePatchMesh::extrudePatchMesh
+(
+    const fvMesh& mesh,
+    const fvPatch& patch,
+    const dictionary& dict
+)
+:
+    fvMesh
+    (
+        IOobject
+        (
+            dict.lookup("region"),
+            mesh.facesInstance(),
+            mesh,
+            IOobject::READ_IF_PRESENT,
+            IOobject::NO_WRITE,
+            true
+        ),
+        xferCopy(pointField()),
+        xferCopy(faceList()),
+        xferCopy(labelList()),
+        xferCopy(labelList()),
+        false
+    ),
+    extrudedPatch_(patch.patch())
+{
+    if (this->boundaryMesh().size() == 0)
+    {
+        bool columnCells = readBool(dict.lookup("columnCells"));
+
+        PackedBoolList nonManifoldEdge(extrudedPatch_.nEdges());
+        for (label edgeI = 0; edgeI < extrudedPatch_.nInternalEdges(); edgeI++)
+        {
+            if (columnCells)
+            {
+                nonManifoldEdge[edgeI] = true;
+            }
+        }
+
+        autoPtr<extrudeModel> model_(extrudeModel::New(dict));
+
+        faceList pointGlobalRegions;
+        faceList pointLocalRegions;
+        labelList localToGlobalRegion;
+
+        const primitiveFacePatch pp
+        (
+            extrudedPatch_, extrudedPatch_.points()
+        );
+
+        createShellMesh::calcPointRegions
+        (
+            this->globalData(),
+            pp,
+            nonManifoldEdge,
+            false,
+
+            pointGlobalRegions,
+            pointLocalRegions,
+            localToGlobalRegion
+        );
+
+
+        // Per local region an originating point
+        labelList localRegionPoints(localToGlobalRegion.size());
+        forAll(pointLocalRegions, faceI)
+        {
+            const face& f = extrudedPatch_.localFaces()[faceI];
+            const face& pRegions = pointLocalRegions[faceI];
+            forAll(pRegions, fp)
+            {
+                localRegionPoints[pRegions[fp]] = f[fp];
+            }
+        }
+
+        // Calculate region normals by reducing local region normals
+        pointField localRegionNormals(localToGlobalRegion.size());
+        {
+            pointField localSum(localToGlobalRegion.size(), vector::zero);
+
+            forAll(pointLocalRegions, faceI)
+            {
+                const face& pRegions = pointLocalRegions[faceI];
+                forAll(pRegions, fp)
+                {
+                    label localRegionI = pRegions[fp];
+                    localSum[localRegionI] +=
+                        extrudedPatch_.faceNormals()[faceI];
+                }
+            }
+
+            Map<point> globalSum(2*localToGlobalRegion.size());
+
+            forAll(localSum, localRegionI)
+            {
+                label globalRegionI = localToGlobalRegion[localRegionI];
+                globalSum.insert(globalRegionI, localSum[localRegionI]);
+            }
+
+            // Reduce
+            Pstream::mapCombineGather(globalSum, plusEqOp<point>());
+            Pstream::mapCombineScatter(globalSum);
+
+            forAll(localToGlobalRegion, localRegionI)
+            {
+                label globalRegionI = localToGlobalRegion[localRegionI];
+                localRegionNormals[localRegionI] = globalSum[globalRegionI];
+            }
+            localRegionNormals /= mag(localRegionNormals);
+        }
+
+
+        // Per local region an extrusion direction
+        vectorField firstDisp(localToGlobalRegion.size());
+        forAll(firstDisp, regionI)
+        {
+            //const point& regionPt = regionCentres[regionI];
+            const point& regionPt = extrudedPatch_.points()
+            [
+                extrudedPatch_.meshPoints()
+                [
+                    localRegionPoints[regionI]
+                ]
+            ];
+            const vector& n = localRegionNormals[regionI];
+            firstDisp[regionI] = model_()(regionPt, n, 1) - regionPt;
+        }
+
+
+        // Extrude engine
+        createShellMesh extruder
+        (
+            pp,
+            pointLocalRegions,
+            localRegionPoints
+        );
+
+        List<polyPatch*> regionPatches(3);
+        List<word> patchNames(regionPatches.size());
+        List<word> patchTypes(regionPatches.size());
+        PtrList<dictionary> dicts(regionPatches.size());
+
+        forAll (dicts, patchI)
+        {
+            if (!dicts.set(patchI))
+            {
+                dicts.set(patchI, new dictionary());
+            }
+        }
+
+        dicts[bottomPatchID] = dict.subDict("bottomCoeffs");
+        dicts[sidePatchID] = dict.subDict("sideCoeffs");
+        dicts[topPatchID] = dict.subDict("topCoeffs");
+
+        forAll (dicts, patchI)
+        {
+            dicts[patchI].lookup("name") >> patchNames[patchI];
+            dicts[patchI].lookup("type") >> patchTypes[patchI];
+        }
+
+        forAll (regionPatches, patchI)
+        {
+            dictionary&  patchDict = dicts[patchI];
+            patchDict.set("nFaces", 0);
+            patchDict.set("startFace", 0);
+
+            regionPatches[patchI] = polyPatch::New
+                (
+                    patchNames[patchI],
+                    patchDict,
+                    patchI,
+                    mesh.boundaryMesh()
+                ).ptr();
+
+        }
+
+        this->clearOut();
+        this->removeFvBoundary();
+        this->addFvPatches(regionPatches, true);
+
+
+        // At this point we have a valid mesh with 3 patches and zero cells.
+        // Determine:
+        // - per face the top and bottom patch (topPatchID, bottomPatchID)
+        // - per edge, per face on edge the side patch (edgePatches)
+        labelListList edgePatches(extrudedPatch_.nEdges());
+        forAll(edgePatches, edgeI)
+        {
+            const labelList& eFaces = extrudedPatch_.edgeFaces()[edgeI];
+
+            if (eFaces.size() != 2 || nonManifoldEdge[edgeI])
+            {
+                edgePatches[edgeI].setSize(eFaces.size(), sidePatchID);
+            }
+        }
+
+        polyTopoChange meshMod(regionPatches.size());
+
+        extruder.setRefinement
+        (
+            firstDisp,                              // first displacement
+            model_().expansionRatio(),
+            model_().nLayers(),                       // nLayers
+            labelList(extrudedPatch_.size(), topPatchID),
+            labelList(extrudedPatch_.size(), bottomPatchID),
+            edgePatches,
+            meshMod
+        );
+
+        autoPtr<mapPolyMesh> map = meshMod.changeMesh
+        (
+            *this,              // mesh to change
+            false               // inflate
+        );
+
+        // Update numbering on extruder.
+        extruder.updateMesh(map);
+
+        this->setInstance(this->thisDb().time().constant());
+        this->write();
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+extrudePatchMesh::~extrudePatchMesh()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/dynamicMesh/extrudePatchMesh/extrudePatchMesh.H b/src/dynamicMesh/extrudePatchMesh/extrudePatchMesh.H
new file mode 100644
index 0000000000..b13d957c5d
--- /dev/null
+++ b/src/dynamicMesh/extrudePatchMesh/extrudePatchMesh.H
@@ -0,0 +1,177 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2012-2012 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    extrudePatchMesh
+
+Description
+    Mesh at a patch created on the fly. The following entried should be used
+    on the field boundary dictionary:
+
+        // New Shell mesh data
+
+        region          "regionMesh";
+        extrudeModel    linearNormal;
+        linearNormalCoeffs
+        {
+            thickness       40e-6;
+        }
+        nLayers         50;
+        expansionRatio  1;
+        columnCells      true;
+
+        // Patch information
+        bottomCoeffs
+        {
+            name        "bottom";
+            type        mappedWall;
+            sampleMode  nearestPatchFace;
+            samplePatch fixedWalls;
+            offsetMode  uniform;
+            offset      (0 0 0);
+        }
+
+        topCoeffs
+        {
+            name        "top";
+            type        patch;
+        }
+
+        sideCoeffs
+        {
+            name        "side";
+            type        empty;
+        }
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef extrudePatchMesh_H
+#define extrudePatchMesh_H
+
+#include "extrudeModel.H"
+#include "autoPtr.H"
+
+#include "fvMesh.H"
+#include "Time.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+
+/*---------------------------------------------------------------------------*\
+                        Class extrudePatchMesh Declaration
+\*---------------------------------------------------------------------------*/
+
+class extrudePatchMesh
+:
+    public fvMesh
+{
+
+private:
+
+    // Private data
+
+        //- Enumeration of patch IDs
+        enum patchID
+        {
+            bottomPatchID,
+            topPatchID,
+            sidePatchID
+        };
+
+        //- Const reference to the patch from which this mesh is extruded
+        const polyPatch& extrudedPatch_;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("extrudePatchMesh");
+
+
+    // Constructors
+
+        //- Construct from mesh, patch and dictionary
+        extrudePatchMesh
+        (
+            const fvMesh&,
+            const fvPatch&,
+            const dictionary&
+        );
+
+
+    //- Destructor
+    virtual ~extrudePatchMesh();
+
+
+    // Member functions
+
+
+        // Access functions
+
+            //- Return region mesh
+            const fvMesh& regionMesh() const
+            {
+                return *this;
+            }
+
+            //- Return bottom patch
+            const polyPatch& bottomPatch() const
+            {
+                return this->boundaryMesh()[bottomPatchID];
+            }
+
+            //- Return top patch
+            const polyPatch& topPatch() const
+            {
+                 return this->boundaryMesh()[topPatchID];
+            }
+
+            //- Return sides patch
+            const polyPatch& sidesPatch() const
+            {
+                 return this->boundaryMesh()[sidePatchID];
+            }
+
+            //- Return extruded patch
+            const polyPatch& extrudedPatch() const
+            {
+                return extrudedPatch_;
+            }
+
+};
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
+
diff --git a/src/finiteVolume/finiteVolume/fvSchemes/fvSchemes.C b/src/finiteVolume/finiteVolume/fvSchemes/fvSchemes.C
index 303eb42b80..bdbe5db092 100644
--- a/src/finiteVolume/finiteVolume/fvSchemes/fvSchemes.C
+++ b/src/finiteVolume/finiteVolume/fvSchemes/fvSchemes.C
@@ -258,6 +258,7 @@ Foam::fvSchemes::fvSchemes(const objectRegistry& obr)
             obr,
             (
                 obr.readOpt() == IOobject::MUST_READ
+             || obr.readOpt() == IOobject::READ_IF_PRESENT
               ? IOobject::MUST_READ_IF_MODIFIED
               : obr.readOpt()
             ),
@@ -372,6 +373,7 @@ Foam::fvSchemes::fvSchemes(const objectRegistry& obr)
     (
         readOpt() == IOobject::MUST_READ
      || readOpt() == IOobject::MUST_READ_IF_MODIFIED
+     || (readOpt() == IOobject::READ_IF_PRESENT && headerOk())
     )
     {
         read(schemesDict());
diff --git a/src/finiteVolume/fvMesh/fvMesh.C b/src/finiteVolume/fvMesh/fvMesh.C
index 98346e4c77..0889270894 100644
--- a/src/finiteVolume/fvMesh/fvMesh.C
+++ b/src/finiteVolume/fvMesh/fvMesh.C
@@ -295,7 +295,7 @@ Foam::fvMesh::fvMesh
     fvSchemes(static_cast<const objectRegistry&>(*this)),
     fvSolution(static_cast<const objectRegistry&>(*this)),
     data(static_cast<const objectRegistry&>(*this)),
-    boundary_(*this),
+    boundary_(*this, boundaryMesh()),
     lduPtr_(NULL),
     curTimeIndex_(time().timeIndex()),
     VPtr_(NULL),
diff --git a/src/mesh/Allwmake b/src/mesh/Allwmake
index 712094055c..4653b1d3c4 100755
--- a/src/mesh/Allwmake
+++ b/src/mesh/Allwmake
@@ -5,5 +5,6 @@ set -x
 
 wmake $makeType autoMesh
 wmake $makeType blockMesh
+wmake $makeType extrudeModel
 
 # ----------------------------------------------------------------- end-of-file
diff --git a/applications/utilities/mesh/generation/extrude/extrudeModel/Make/files b/src/mesh/extrudeModel/Make/files
similarity index 100%
rename from applications/utilities/mesh/generation/extrude/extrudeModel/Make/files
rename to src/mesh/extrudeModel/Make/files
diff --git a/applications/utilities/mesh/generation/extrude/extrudeModel/Make/options b/src/mesh/extrudeModel/Make/options
similarity index 74%
rename from applications/utilities/mesh/generation/extrude/extrudeModel/Make/options
rename to src/mesh/extrudeModel/Make/options
index 1618ab57ec..eabd0b53a8 100644
--- a/applications/utilities/mesh/generation/extrude/extrudeModel/Make/options
+++ b/src/mesh/extrudeModel/Make/options
@@ -3,5 +3,4 @@ EXE_INC = \
     -I$(LIB_SRC)/dynamicMesh/lnInclude
 
 LIB_LIBS = \
-    -lmeshTools \
-    -ldynamicMesh
+    -lmeshTools
diff --git a/applications/utilities/mesh/generation/extrude/extrudeModel/extrudeModel/extrudeModel.C b/src/mesh/extrudeModel/extrudeModel/extrudeModel.C
similarity index 100%
rename from applications/utilities/mesh/generation/extrude/extrudeModel/extrudeModel/extrudeModel.C
rename to src/mesh/extrudeModel/extrudeModel/extrudeModel.C
diff --git a/applications/utilities/mesh/generation/extrude/extrudeModel/extrudeModel/extrudeModel.H b/src/mesh/extrudeModel/extrudeModel/extrudeModel.H
similarity index 100%
rename from applications/utilities/mesh/generation/extrude/extrudeModel/extrudeModel/extrudeModel.H
rename to src/mesh/extrudeModel/extrudeModel/extrudeModel.H
diff --git a/applications/utilities/mesh/generation/extrude/extrudeModel/extrudeModel/extrudeModelNew.C b/src/mesh/extrudeModel/extrudeModel/extrudeModelNew.C
similarity index 100%
rename from applications/utilities/mesh/generation/extrude/extrudeModel/extrudeModel/extrudeModelNew.C
rename to src/mesh/extrudeModel/extrudeModel/extrudeModelNew.C
diff --git a/applications/utilities/mesh/generation/extrude/extrudeModel/linearDirection/linearDirection.C b/src/mesh/extrudeModel/linearDirection/linearDirection.C
similarity index 100%
rename from applications/utilities/mesh/generation/extrude/extrudeModel/linearDirection/linearDirection.C
rename to src/mesh/extrudeModel/linearDirection/linearDirection.C
diff --git a/applications/utilities/mesh/generation/extrude/extrudeModel/linearDirection/linearDirection.H b/src/mesh/extrudeModel/linearDirection/linearDirection.H
similarity index 100%
rename from applications/utilities/mesh/generation/extrude/extrudeModel/linearDirection/linearDirection.H
rename to src/mesh/extrudeModel/linearDirection/linearDirection.H
diff --git a/applications/utilities/mesh/generation/extrude/extrudeModel/linearNormal/linearNormal.C b/src/mesh/extrudeModel/linearNormal/linearNormal.C
similarity index 100%
rename from applications/utilities/mesh/generation/extrude/extrudeModel/linearNormal/linearNormal.C
rename to src/mesh/extrudeModel/linearNormal/linearNormal.C
diff --git a/applications/utilities/mesh/generation/extrude/extrudeModel/linearNormal/linearNormal.H b/src/mesh/extrudeModel/linearNormal/linearNormal.H
similarity index 100%
rename from applications/utilities/mesh/generation/extrude/extrudeModel/linearNormal/linearNormal.H
rename to src/mesh/extrudeModel/linearNormal/linearNormal.H
diff --git a/applications/utilities/mesh/generation/extrude/extrudeModel/linearRadial/linearRadial.C b/src/mesh/extrudeModel/linearRadial/linearRadial.C
similarity index 100%
rename from applications/utilities/mesh/generation/extrude/extrudeModel/linearRadial/linearRadial.C
rename to src/mesh/extrudeModel/linearRadial/linearRadial.C
diff --git a/applications/utilities/mesh/generation/extrude/extrudeModel/linearRadial/linearRadial.H b/src/mesh/extrudeModel/linearRadial/linearRadial.H
similarity index 100%
rename from applications/utilities/mesh/generation/extrude/extrudeModel/linearRadial/linearRadial.H
rename to src/mesh/extrudeModel/linearRadial/linearRadial.H
diff --git a/applications/utilities/mesh/generation/extrude/extrudeModel/sigmaRadial/sigmaRadial.C b/src/mesh/extrudeModel/sigmaRadial/sigmaRadial.C
similarity index 100%
rename from applications/utilities/mesh/generation/extrude/extrudeModel/sigmaRadial/sigmaRadial.C
rename to src/mesh/extrudeModel/sigmaRadial/sigmaRadial.C
diff --git a/applications/utilities/mesh/generation/extrude/extrudeModel/sigmaRadial/sigmaRadial.H b/src/mesh/extrudeModel/sigmaRadial/sigmaRadial.H
similarity index 100%
rename from applications/utilities/mesh/generation/extrude/extrudeModel/sigmaRadial/sigmaRadial.H
rename to src/mesh/extrudeModel/sigmaRadial/sigmaRadial.H
diff --git a/applications/utilities/mesh/generation/extrude/extrudeModel/wedge/wedge.C b/src/mesh/extrudeModel/wedge/wedge.C
similarity index 100%
rename from applications/utilities/mesh/generation/extrude/extrudeModel/wedge/wedge.C
rename to src/mesh/extrudeModel/wedge/wedge.C
diff --git a/applications/utilities/mesh/generation/extrude/extrudeModel/wedge/wedge.H b/src/mesh/extrudeModel/wedge/wedge.H
similarity index 100%
rename from applications/utilities/mesh/generation/extrude/extrudeModel/wedge/wedge.H
rename to src/mesh/extrudeModel/wedge/wedge.H

From 28762dc468d0680c2108b165c6ffbb2ac4a0bbe9 Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Thu, 19 Apr 2012 14:17:30 +0100
Subject: [PATCH 232/317] Removed trailing whitespace

---
 applications/solvers/DNS/dnsFoam/dnsFoam.C    |  4 +-
 .../solvers/combustion/fireFoam/pEqn.H        |  2 +-
 .../buoyantBoussinesqPimpleFoam/pEqn.H        |  2 +-
 .../buoyantBoussinesqSimpleFoam/pEqn.H        |  2 +-
 .../heatTransfer/buoyantPimpleFoam/pEqn.H     |  2 +-
 .../heatTransfer/buoyantSimpleFoam/pEqn.H     |  2 +-
 .../chtMultiRegionSimpleFoam/fluid/pEqn.H     |  8 ++--
 .../chtMultiRegionFoam/fluid/pEqn.H           |  2 +-
 .../potentialFreeSurfaceFoam/pEqn.H           |  2 +-
 .../lagrangian/reactingParcelFilmFoam/pEqn.H  |  2 +-
 .../solvers/multiphase/bubbleFoam/pEqn.H      | 46 ++++++++++++-------
 .../solvers/multiphase/cavitatingFoam/pEqn.H  |  2 +-
 .../DNS/dnsFoam/boxTurb16/system/fvSchemes    |  2 +-
 .../constant/thermophysicalProperties         |  1 +
 .../constant/thermophysicalProperties         |  3 +-
 .../hotRoom/system/fvSchemes                  |  2 +-
 .../hotRoom/system/fvSchemes                  |  2 +-
 .../iglooWithFridges/system/fvSchemes         |  2 +-
 .../hotRoom/system/fvSchemes                  |  2 +-
 .../buoyantCavity/system/fvSchemes            |  2 +-
 .../circuitBoardCooling/system/fvSchemes      |  2 +-
 .../hotRoom/system/fvSchemes                  |  2 +-
 .../hotRadiationRoom/system/fvSchemes         |  2 +-
 .../hotRadiationRoomFvDOM/system/fvSchemes    |  2 +-
 .../system/bottomAir/fvSchemes                |  2 +-
 .../multiRegionHeater/system/topAir/fvSchemes |  2 +-
 .../system/bottomWater/fvSchemes              |  2 +-
 .../system/topAir/fvSchemes                   |  2 +-
 .../system/bottomAir/fvSchemes                |  2 +-
 .../system/topAir/fvSchemes                   |  2 +-
 .../system/bottomAir/fvSchemes                |  2 +-
 .../multiRegionHeater/system/topAir/fvSchemes |  2 +-
 .../system/bottomAir/fvSchemes                |  2 +-
 .../system/topAir/fvSchemes                   |  2 +-
 .../pimpleFoam/TJunctionFan/0/epsilon         | 14 +++---
 .../pimpleFoam/TJunctionFan/0/k               | 14 +++---
 .../pimpleFoam/TJunctionFan/0/p               | 21 ++++++---
 .../elipsekkLOmega/constant/polyMesh/boundary | 16 +++++--
 .../bubbleFoam/bubbleColumn/0.org/p           |  5 +-
 .../multiphase/bubbleFoam/bubbleColumn/0/p    |  5 +-
 .../bubbleFoam/bubbleColumn/system/fvSchemes  |  2 +-
 .../les/throttle/system/fvSchemes             |  2 +-
 .../les/throttle3D/system/fvSchemes           |  2 +-
 .../ras/throttle/system/fvSchemes             |  2 +-
 44 files changed, 116 insertions(+), 87 deletions(-)

diff --git a/applications/solvers/DNS/dnsFoam/dnsFoam.C b/applications/solvers/DNS/dnsFoam/dnsFoam.C
index 0733802b08..08073398a7 100644
--- a/applications/solvers/DNS/dnsFoam/dnsFoam.C
+++ b/applications/solvers/DNS/dnsFoam/dnsFoam.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -85,7 +85,7 @@ int main(int argc, char *argv[])
 
         for (int corr=1; corr<=1; corr++)
         {
-            volScalarField rAU(1.0/UEqn.A());
+            volScalarField rAU("Dp", 1.0/UEqn.A());
             volVectorField HbyA("HbyA", U);
             HbyA = rAU*UEqn.H();
 
diff --git a/applications/solvers/combustion/fireFoam/pEqn.H b/applications/solvers/combustion/fireFoam/pEqn.H
index b6f5ef47b1..3f4f485cf6 100644
--- a/applications/solvers/combustion/fireFoam/pEqn.H
+++ b/applications/solvers/combustion/fireFoam/pEqn.H
@@ -1,7 +1,7 @@
 rho = thermo.rho();
 
 volScalarField rAU(1.0/UEqn.A());
-surfaceScalarField rhorAUf(rAU.name() + 'f', fvc::interpolate(rho*rAU));
+surfaceScalarField rhorAUf("Dp", fvc::interpolate(rho*rAU));
 volVectorField HbyA("HbyA", U);
 HbyA = rAU*UEqn.H();
 
diff --git a/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/pEqn.H b/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/pEqn.H
index ce822ff21b..06997e52ec 100644
--- a/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/pEqn.H
+++ b/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/pEqn.H
@@ -1,6 +1,6 @@
 {
     volScalarField rAU("rAU", 1.0/UEqn.A());
-    surfaceScalarField rAUf("(1|A(U))", fvc::interpolate(rAU));
+    surfaceScalarField rAUf("Dp", fvc::interpolate(rAU));
 
     volVectorField HbyA("HbyA", U);
     HbyA = rAU*UEqn.H();
diff --git a/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/pEqn.H b/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/pEqn.H
index 32076b4dd1..c07a344017 100644
--- a/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/pEqn.H
+++ b/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/pEqn.H
@@ -1,6 +1,6 @@
 {
     volScalarField rAU("rAU", 1.0/UEqn().A());
-    surfaceScalarField rAUf("(1|A(U))", fvc::interpolate(rAU));
+    surfaceScalarField rAUf("Dp", fvc::interpolate(rAU));
 
     volVectorField HbyA("HbyA", U);
     HbyA = rAU*UEqn().H();
diff --git a/applications/solvers/heatTransfer/buoyantPimpleFoam/pEqn.H b/applications/solvers/heatTransfer/buoyantPimpleFoam/pEqn.H
index 462b96b17d..96389fee7b 100644
--- a/applications/solvers/heatTransfer/buoyantPimpleFoam/pEqn.H
+++ b/applications/solvers/heatTransfer/buoyantPimpleFoam/pEqn.H
@@ -6,7 +6,7 @@
     thermo.rho() -= psi*p_rgh;
 
     volScalarField rAU(1.0/UEqn.A());
-    surfaceScalarField rhorAUf("(rho*(1|A(U)))", fvc::interpolate(rho*rAU));
+    surfaceScalarField rhorAUf("Dp", fvc::interpolate(rho*rAU));
 
     volVectorField HbyA("HbyA", U);
     HbyA = rAU*UEqn.H();
diff --git a/applications/solvers/heatTransfer/buoyantSimpleFoam/pEqn.H b/applications/solvers/heatTransfer/buoyantSimpleFoam/pEqn.H
index a7f873c2f1..f63e12f363 100644
--- a/applications/solvers/heatTransfer/buoyantSimpleFoam/pEqn.H
+++ b/applications/solvers/heatTransfer/buoyantSimpleFoam/pEqn.H
@@ -3,7 +3,7 @@
     rho.relax();
 
     volScalarField rAU(1.0/UEqn().A());
-    surfaceScalarField rhorAUf("(rho*(1|A(U)))", fvc::interpolate(rho*rAU));
+    surfaceScalarField rhorAUf("Dp", fvc::interpolate(rho*rAU));
 
     volVectorField HbyA("HbyA", U);
     HbyA = rAU*UEqn().H();
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/pEqn.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/pEqn.H
index 73b72af316..d23390edeb 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/pEqn.H
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/pEqn.H
@@ -5,7 +5,7 @@
     rho.relax();
 
     volScalarField rAU(1.0/UEqn().A());
-    surfaceScalarField rhorAUf("(rho*(1|A(U)))", fvc::interpolate(rho*rAU));
+    surfaceScalarField rhorAUf("Dp", fvc::interpolate(rho*rAU));
 
     U = rAU*UEqn().H();
     UEqn.clear();
@@ -15,8 +15,8 @@
     dimensionedScalar compressibility = fvc::domainIntegrate(psi);
     bool compressible = (compressibility.value() > SMALL);
 
-    surfaceScalarField buoyancyPhi(rhorAUf*ghf*fvc::snGrad(rho)*mesh.magSf());
-    phi -= buoyancyPhi;
+    surfaceScalarField phig(-rhorAUf*ghf*fvc::snGrad(rho)*mesh.magSf());
+    phi += phig;
 
     // Solve pressure
     for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
@@ -44,7 +44,7 @@
 
             // Correct the momentum source with the pressure gradient flux
             // calculated from the relaxed pressure
-            U -= rAU*fvc::reconstruct((buoyancyPhi + p_rghEqn.flux())/rhorAUf);
+            U += rAU*fvc::reconstruct((phig - p_rghEqn.flux())/rhorAUf);
             U.correctBoundaryConditions();
         }
     }
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/pEqn.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/pEqn.H
index 76f6f8e30e..f260acc514 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/pEqn.H
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/pEqn.H
@@ -6,7 +6,7 @@
     rho = thermo.rho();
 
     volScalarField rAU(1.0/UEqn().A());
-    surfaceScalarField rhorAUf("(rho*(1|A(U)))", fvc::interpolate(rho*rAU));
+    surfaceScalarField rhorAUf("Dp", fvc::interpolate(rho*rAU));
 
     volVectorField HbyA("HbyA", U);
     HbyA = rAU*UEqn().H();
diff --git a/applications/solvers/incompressible/potentialFreeSurfaceFoam/pEqn.H b/applications/solvers/incompressible/potentialFreeSurfaceFoam/pEqn.H
index 2271e85d9b..5a521a04ff 100644
--- a/applications/solvers/incompressible/potentialFreeSurfaceFoam/pEqn.H
+++ b/applications/solvers/incompressible/potentialFreeSurfaceFoam/pEqn.H
@@ -1,5 +1,5 @@
 volScalarField rAU(1.0/UEqn().A());
-surfaceScalarField rAUf(rAU.name() + 'f', fvc::interpolate(rAU));
+surfaceScalarField rAUf("Dp", fvc::interpolate(rAU));
 
 volVectorField HbyA("HbyA", U);
 HbyA = rAU*(UEqn() == sources(U))().H();
diff --git a/applications/solvers/lagrangian/reactingParcelFilmFoam/pEqn.H b/applications/solvers/lagrangian/reactingParcelFilmFoam/pEqn.H
index b6f5ef47b1..3f4f485cf6 100644
--- a/applications/solvers/lagrangian/reactingParcelFilmFoam/pEqn.H
+++ b/applications/solvers/lagrangian/reactingParcelFilmFoam/pEqn.H
@@ -1,7 +1,7 @@
 rho = thermo.rho();
 
 volScalarField rAU(1.0/UEqn.A());
-surfaceScalarField rhorAUf(rAU.name() + 'f', fvc::interpolate(rho*rAU));
+surfaceScalarField rhorAUf("Dp", fvc::interpolate(rho*rAU));
 volVectorField HbyA("HbyA", U);
 HbyA = rAU*UEqn.H();
 
diff --git a/applications/solvers/multiphase/bubbleFoam/pEqn.H b/applications/solvers/multiphase/bubbleFoam/pEqn.H
index 5f868f3da9..631c9cbba6 100644
--- a/applications/solvers/multiphase/bubbleFoam/pEqn.H
+++ b/applications/solvers/multiphase/bubbleFoam/pEqn.H
@@ -8,16 +8,21 @@
     surfaceScalarField rAU1f(fvc::interpolate(rAU1));
     surfaceScalarField rAU2f(fvc::interpolate(rAU2));
 
-    U1 = rAU1*U1Eqn.H();
-    U2 = rAU2*U2Eqn.H();
+    volVectorField HbyA1("HbyA1", U1);
+    HbyA1 = rAU1*U1Eqn.H();
+
+    volVectorField HbyA2("HbyA2", U2);
+    HbyA2 = rAU2*U2Eqn.H();
 
     surfaceScalarField phiDrag1
     (
-        fvc::interpolate(alpha2/rho1*dragCoef*rAU1)*phi2 + rAU1f*(g & mesh.Sf())
+        fvc::interpolate(alpha2/rho1*dragCoef*rAU1)*phi2
+      + rAU1f*(g & mesh.Sf())
     );
     surfaceScalarField phiDrag2
     (
-        fvc::interpolate(alpha1/rho2*dragCoef*rAU2)*phi1 + rAU2f*(g & mesh.Sf())
+        fvc::interpolate(alpha1/rho2*dragCoef*rAU2)*phi1
+      + rAU2f*(g & mesh.Sf())
     );
 
     forAll(p.boundaryField(), patchi)
@@ -29,16 +34,25 @@
         }
     }
 
-    phi1 = (fvc::interpolate(U1) & mesh.Sf()) + fvc::ddtPhiCorr(rAU1, U1, phi1)
-        + phiDrag1;
-    phi2 = (fvc::interpolate(U2) & mesh.Sf()) + fvc::ddtPhiCorr(rAU2, U2, phi2)
-        + phiDrag2;
+    surfaceScalarField phiHbyA1
+    (
+        (fvc::interpolate(HbyA1) & mesh.Sf())
+      + fvc::ddtPhiCorr(rAU1, U1, phi1)
+      + phiDrag1
+    );
 
-    phi = alpha1f*phi1 + alpha2f*phi2;
+    surfaceScalarField phiHbyA2
+    (
+        (fvc::interpolate(HbyA2) & mesh.Sf())
+      + fvc::ddtPhiCorr(rAU2, U2, phi2)
+      + phiDrag2
+    );
+
+    surfaceScalarField phiHbyA("phiHbyA", alpha1f*phiHbyA1 + alpha2f*phiHbyA2);
 
     surfaceScalarField Dp
     (
-        "(rho*(1|A(U)))",
+        "Dp",
         alpha1f*rAU1f/rho1 + alpha2f*rAU2f/rho2
     );
 
@@ -46,7 +60,7 @@
     {
         fvScalarMatrix pEqn
         (
-            fvm::laplacian(Dp, p) == fvc::div(phi)
+            fvm::laplacian(Dp, p) == fvc::div(phiHbyA)
         );
 
         pEqn.setReference(pRefCell, pRefValue);
@@ -57,19 +71,17 @@
         {
             surfaceScalarField SfGradp(pEqn.flux()/Dp);
 
-            phi1 -= rAU1f*SfGradp/rho1;
-            phi2 -= rAU2f*SfGradp/rho2;
+            phi1 = phiHbyA1 - rAU1f*SfGradp/rho1;
+            phi2 = phiHbyA2 - rAU2f*SfGradp/rho2;
             phi = alpha1f*phi1 + alpha2f*phi2;
 
             p.relax();
             SfGradp = pEqn.flux()/Dp;
 
-            U1 += (fvc::reconstruct(phiDrag1 - rAU1f*SfGradp/rho1));
-            //U1 += rAU1*(fvc::reconstruct(phiDrag1/rAU1f - SfGradp/rho1));
+            U1 = HbyA1 + (fvc::reconstruct(phiDrag1 - rAU1f*SfGradp/rho1));
             U1.correctBoundaryConditions();
 
-            U2 += (fvc::reconstruct(phiDrag2 - rAU2f*SfGradp/rho2));
-            //U2 += rAU2*(fvc::reconstruct(phiDrag2/rAU2f - SfGradp/rho2));
+            U2 = HbyA2 + (fvc::reconstruct(phiDrag2 - rAU2f*SfGradp/rho2));
             U2.correctBoundaryConditions();
 
             U = alpha1*U1 + alpha2*U2;
diff --git a/applications/solvers/multiphase/cavitatingFoam/pEqn.H b/applications/solvers/multiphase/cavitatingFoam/pEqn.H
index 34898172ce..ea35f79fa1 100644
--- a/applications/solvers/multiphase/cavitatingFoam/pEqn.H
+++ b/applications/solvers/multiphase/cavitatingFoam/pEqn.H
@@ -12,7 +12,7 @@
     surfaceScalarField rhof("rhof", fvc::interpolate(rho));
 
     volScalarField rAU(1.0/UEqn.A());
-    surfaceScalarField rAUf("rAUf", rhof*fvc::interpolate(rAU));
+    surfaceScalarField rAUf("Dp", rhof*fvc::interpolate(rAU));
 
     volVectorField HbyA("HbyA", U);
     HbyA = rAU*UEqn.H();
diff --git a/tutorials/DNS/dnsFoam/boxTurb16/system/fvSchemes b/tutorials/DNS/dnsFoam/boxTurb16/system/fvSchemes
index 1f665c977f..21be868783 100644
--- a/tutorials/DNS/dnsFoam/boxTurb16/system/fvSchemes
+++ b/tutorials/DNS/dnsFoam/boxTurb16/system/fvSchemes
@@ -37,7 +37,7 @@ laplacianSchemes
 {
     default         none;
     laplacian(nu,U) Gauss linear corrected;
-    laplacian((1|A(U)),p) Gauss linear corrected;
+    laplacian(Dp,p) Gauss linear corrected;
 }
 
 interpolationSchemes
diff --git a/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/constant/thermophysicalProperties b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/constant/thermophysicalProperties
index e6838dcf7a..2ff1fabbda 100644
--- a/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/constant/thermophysicalProperties
+++ b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/constant/thermophysicalProperties
@@ -33,6 +33,7 @@ mixture
     {
         As              1.458e-06;
         Ts              110.4;
+        Pr              1;
     }
 }
 
diff --git a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/constant/thermophysicalProperties b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/constant/thermophysicalProperties
index a3c1437dc0..1e8492f320 100644
--- a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/constant/thermophysicalProperties
+++ b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/constant/thermophysicalProperties
@@ -15,8 +15,6 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-Pr              0.72;
-
 thermoType      ePsiThermo<pureMixture<sutherlandTransport<specieThermo<janafThermo<perfectGas>>>>>;
 
 mixture
@@ -38,6 +36,7 @@ mixture
     {
         As              1.458e-06;
         Ts              110;
+        Pr              0.72;
     }
 }
 
diff --git a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/system/fvSchemes b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/system/fvSchemes
index ceb6aa0497..b7ff9739c1 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/system/fvSchemes
+++ b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/system/fvSchemes
@@ -41,7 +41,7 @@ laplacianSchemes
 {
     default         none;
     laplacian(nuEff,U) Gauss linear uncorrected;
-    laplacian((1|A(U)),p_rgh) Gauss linear uncorrected;
+    laplacian(Dp,p_rgh) Gauss linear uncorrected;
     laplacian(kappaEff,T) Gauss linear uncorrected;
     laplacian(DkEff,k) Gauss linear uncorrected;
     laplacian(DepsilonEff,epsilon) Gauss linear uncorrected;
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/system/fvSchemes b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/system/fvSchemes
index 3fa205e5e3..6fc42b1ca7 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/system/fvSchemes
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/system/fvSchemes
@@ -39,7 +39,7 @@ laplacianSchemes
 {
     default         none;
     laplacian(nuEff,U) Gauss linear corrected;
-    laplacian((1|A(U)),p_rgh) Gauss linear corrected;
+    laplacian(Dp,p_rgh) Gauss linear corrected;
     laplacian(kappaEff,T) Gauss linear corrected;
     laplacian(DkEff,k) Gauss linear corrected;
     laplacian(DepsilonEff,epsilon) Gauss linear corrected;
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/fvSchemes b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/fvSchemes
index 364987d87f..b36bd5f8fc 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/fvSchemes
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/fvSchemes
@@ -41,7 +41,7 @@ laplacianSchemes
 {
     default         none;
     laplacian(nuEff,U) Gauss linear limited 0.333;
-    laplacian((1|A(U)),p_rgh) Gauss linear limited 0.333;
+    laplacian(Dp,p_rgh) Gauss linear limited 0.333;
     laplacian(kappaEff,T) Gauss linear limited 0.333;
     laplacian(DkEff,k) Gauss linear limited 0.333;
     laplacian(DepsilonEff,epsilon) Gauss linear limited 0.333;
diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/system/fvSchemes b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/system/fvSchemes
index 3a7b6154e5..a6897b72d5 100644
--- a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/system/fvSchemes
+++ b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/system/fvSchemes
@@ -42,7 +42,7 @@ laplacianSchemes
 {
     default         none;
     laplacian(muEff,U) Gauss linear corrected;
-    laplacian((rho*(1|A(U))),p_rgh) Gauss linear corrected;
+    laplacian(Dp,p_rgh) Gauss linear corrected;
     laplacian(alphaEff,h) Gauss linear corrected;
     laplacian(DkEff,k) Gauss linear corrected;
     laplacian(DepsilonEff,epsilon) Gauss linear corrected;
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/fvSchemes b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/fvSchemes
index cdaadf4c30..599b1530bc 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/fvSchemes
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/fvSchemes
@@ -40,7 +40,7 @@ laplacianSchemes
 {
     default         none;
     laplacian(muEff,U) Gauss linear orthogonal;
-    laplacian((rho*(1|A(U))),p_rgh) Gauss linear orthogonal;
+    laplacian(Dp,p_rgh) Gauss linear orthogonal;
     laplacian(alphaEff,h) Gauss linear orthogonal;
     laplacian(DkEff,k) Gauss linear orthogonal;
     laplacian(DepsilonEff,epsilon) Gauss linear orthogonal;
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/fvSchemes b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/fvSchemes
index 02edc9816b..46f978cc82 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/fvSchemes
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/fvSchemes
@@ -40,7 +40,7 @@ laplacianSchemes
 {
     default         none;
     laplacian(muEff,U) Gauss linear uncorrected;
-    laplacian((rho*(1|A(U))),p_rgh) Gauss linear uncorrected;
+    laplacian(Dp,p_rgh) Gauss linear uncorrected;
     laplacian(alphaEff,h) Gauss linear uncorrected;
     laplacian(DkEff,k) Gauss linear uncorrected;
     laplacian(DepsilonEff,epsilon) Gauss linear uncorrected;
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/system/fvSchemes b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/system/fvSchemes
index f0019f6690..991a5277f6 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/system/fvSchemes
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/system/fvSchemes
@@ -42,7 +42,7 @@ laplacianSchemes
 {
     default         none;
     laplacian(muEff,U) Gauss linear uncorrected;
-    laplacian((rho*(1|A(U))),p_rgh) Gauss linear uncorrected;
+    laplacian(Dp,p_rgh) Gauss linear uncorrected;
     laplacian(alphaEff,h) Gauss linear uncorrected;
     laplacian(DkEff,k) Gauss linear uncorrected;
     laplacian(DepsilonEff,epsilon) Gauss linear uncorrected;
diff --git a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/system/fvSchemes b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/system/fvSchemes
index 572a6207d2..3b6deefb69 100644
--- a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/system/fvSchemes
+++ b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/system/fvSchemes
@@ -42,7 +42,7 @@ laplacianSchemes
 {
     default         none;
     laplacian(muEff,U) Gauss linear corrected;
-    laplacian((rho*(1|A(U))),p_rgh) Gauss linear corrected;
+    laplacian(Dp,p_rgh) Gauss linear corrected;
     laplacian(alphaEff,h) Gauss linear corrected;
     laplacian(DkEff,k) Gauss linear corrected;
     laplacian(DepsilonEff,epsilon) Gauss linear corrected;
diff --git a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/system/fvSchemes b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/system/fvSchemes
index 3cbd118408..817fe7274b 100644
--- a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/system/fvSchemes
+++ b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/system/fvSchemes
@@ -43,7 +43,7 @@ laplacianSchemes
 {
     default         none;
     laplacian(muEff,U) Gauss linear corrected;
-    laplacian((rho*(1|A(U))),p_rgh) Gauss linear corrected;
+    laplacian(Dp,p_rgh) Gauss linear corrected;
     laplacian(alphaEff,h) Gauss linear corrected;
     laplacian(DkEff,k) Gauss linear corrected;
     laplacian(DepsilonEff,epsilon) Gauss linear corrected;
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomAir/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomAir/fvSchemes
index e4be18c50c..148fdb45eb 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomAir/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomAir/fvSchemes
@@ -41,7 +41,7 @@ laplacianSchemes
 {
     default         none;
     laplacian(muEff,U) Gauss linear limited 0.333;
-    laplacian((rho*(1|A(U))),p_rgh) Gauss linear limited 0.333;
+    laplacian(Dp,p_rgh) Gauss linear limited 0.333;
     laplacian(alphaEff,h) Gauss linear limited 0.333;
     laplacian(DkEff,k) Gauss linear limited 0.333;
     laplacian(DepsilonEff,epsilon) Gauss linear limited 0.333;
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/fvSchemes
index 865dfd9f99..5694ac1f59 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/fvSchemes
@@ -41,7 +41,7 @@ laplacianSchemes
 {
     default         none;
     laplacian(muEff,U) Gauss linear limited 0.333;
-    laplacian((rho*(1|A(U))),p_rgh) Gauss linear limited 0.333;
+    laplacian(Dp,p_rgh) Gauss linear limited 0.333;
     laplacian(alphaEff,h) Gauss linear limited 0.333;
     laplacian(DkEff,k) Gauss linear limited 0.333;
     laplacian(DepsilonEff,epsilon) Gauss linear limited 0.333;
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/bottomWater/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/bottomWater/fvSchemes
index 865dfd9f99..5694ac1f59 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/bottomWater/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/bottomWater/fvSchemes
@@ -41,7 +41,7 @@ laplacianSchemes
 {
     default         none;
     laplacian(muEff,U) Gauss linear limited 0.333;
-    laplacian((rho*(1|A(U))),p_rgh) Gauss linear limited 0.333;
+    laplacian(Dp,p_rgh) Gauss linear limited 0.333;
     laplacian(alphaEff,h) Gauss linear limited 0.333;
     laplacian(DkEff,k) Gauss linear limited 0.333;
     laplacian(DepsilonEff,epsilon) Gauss linear limited 0.333;
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/topAir/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/topAir/fvSchemes
index 865dfd9f99..5694ac1f59 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/topAir/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/topAir/fvSchemes
@@ -41,7 +41,7 @@ laplacianSchemes
 {
     default         none;
     laplacian(muEff,U) Gauss linear limited 0.333;
-    laplacian((rho*(1|A(U))),p_rgh) Gauss linear limited 0.333;
+    laplacian(Dp,p_rgh) Gauss linear limited 0.333;
     laplacian(alphaEff,h) Gauss linear limited 0.333;
     laplacian(DkEff,k) Gauss linear limited 0.333;
     laplacian(DepsilonEff,epsilon) Gauss linear limited 0.333;
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/fvSchemes
index 865dfd9f99..5694ac1f59 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/fvSchemes
@@ -41,7 +41,7 @@ laplacianSchemes
 {
     default         none;
     laplacian(muEff,U) Gauss linear limited 0.333;
-    laplacian((rho*(1|A(U))),p_rgh) Gauss linear limited 0.333;
+    laplacian(Dp,p_rgh) Gauss linear limited 0.333;
     laplacian(alphaEff,h) Gauss linear limited 0.333;
     laplacian(DkEff,k) Gauss linear limited 0.333;
     laplacian(DepsilonEff,epsilon) Gauss linear limited 0.333;
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/topAir/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/topAir/fvSchemes
index 865dfd9f99..5694ac1f59 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/topAir/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/topAir/fvSchemes
@@ -41,7 +41,7 @@ laplacianSchemes
 {
     default         none;
     laplacian(muEff,U) Gauss linear limited 0.333;
-    laplacian((rho*(1|A(U))),p_rgh) Gauss linear limited 0.333;
+    laplacian(Dp,p_rgh) Gauss linear limited 0.333;
     laplacian(alphaEff,h) Gauss linear limited 0.333;
     laplacian(DkEff,k) Gauss linear limited 0.333;
     laplacian(DepsilonEff,epsilon) Gauss linear limited 0.333;
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/bottomAir/fvSchemes b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/bottomAir/fvSchemes
index 17ab97ec96..09a66a2658 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/bottomAir/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/bottomAir/fvSchemes
@@ -42,7 +42,7 @@ laplacianSchemes
 {
     default         none;
     laplacian(muEff,U) Gauss linear uncorrected;
-    laplacian((rho*(1|A(U))),p_rgh) Gauss linear uncorrected;
+    laplacian(Dp,p_rgh) Gauss linear uncorrected;
     laplacian(alphaEff,h) Gauss linear uncorrected;
     laplacian(DkEff,k) Gauss linear uncorrected;
     laplacian(DepsilonEff,epsilon) Gauss linear uncorrected;
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/topAir/fvSchemes b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/topAir/fvSchemes
index cf4192a4de..9b8eac50b5 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/topAir/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/topAir/fvSchemes
@@ -42,7 +42,7 @@ laplacianSchemes
 {
     default         none;
     laplacian(muEff,U) Gauss linear uncorrected;
-    laplacian((rho*(1|A(U))),p_rgh) Gauss linear uncorrected;
+    laplacian(Dp,p_rgh) Gauss linear uncorrected;
     laplacian(alphaEff,h) Gauss linear uncorrected;
     laplacian(DkEff,k) Gauss linear uncorrected;
     laplacian(DepsilonEff,epsilon) Gauss linear uncorrected;
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/bottomAir/fvSchemes b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/bottomAir/fvSchemes
index 7f3767d179..ca25b1d27c 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/bottomAir/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/bottomAir/fvSchemes
@@ -43,7 +43,7 @@ laplacianSchemes
 {
     default         none;
     laplacian(muEff,U) Gauss linear uncorrected;
-    laplacian((rho*(1|A(U))),p_rgh) Gauss linear uncorrected;
+    laplacian(Dp,p_rgh) Gauss linear uncorrected;
     laplacian(alphaEff,h) Gauss linear uncorrected;
     laplacian(DkEff,k) Gauss linear uncorrected;
     laplacian(DepsilonEff,epsilon) Gauss linear uncorrected;
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/topAir/fvSchemes b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/topAir/fvSchemes
index 7f3767d179..ca25b1d27c 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/topAir/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/topAir/fvSchemes
@@ -43,7 +43,7 @@ laplacianSchemes
 {
     default         none;
     laplacian(muEff,U) Gauss linear uncorrected;
-    laplacian((rho*(1|A(U))),p_rgh) Gauss linear uncorrected;
+    laplacian(Dp,p_rgh) Gauss linear uncorrected;
     laplacian(alphaEff,h) Gauss linear uncorrected;
     laplacian(DkEff,k) Gauss linear uncorrected;
     laplacian(DepsilonEff,epsilon) Gauss linear uncorrected;
diff --git a/tutorials/incompressible/pimpleFoam/TJunctionFan/0/epsilon b/tutorials/incompressible/pimpleFoam/TJunctionFan/0/epsilon
index 7448f8e544..b972d9f1d2 100644
--- a/tutorials/incompressible/pimpleFoam/TJunctionFan/0/epsilon
+++ b/tutorials/incompressible/pimpleFoam/TJunctionFan/0/epsilon
@@ -27,19 +27,19 @@ boundaryField
         mixingLength    0.01;
         phi             phi;
         k               k;
-        value           $internalField;
+        value           uniform 200;
     }
     outlet1
     {
         type            inletOutlet;
-        inletValue      $internalField;
-        value           $internalField;
+        inletValue      uniform 200;
+        value           uniform 200;
     }
     outlet2
     {
         type            inletOutlet;
-        inletValue      $internalField;
-        value           $internalField;
+        inletValue      uniform 200;
+        value           uniform 200;
     }
     baffles
     {
@@ -47,7 +47,7 @@ boundaryField
         Cmu             0.09;
         kappa           0.41;
         E               9.8;
-        value           $internalField;
+        value           uniform 0;
     }
     fan_half0
     {
@@ -63,7 +63,7 @@ boundaryField
         Cmu             0.09;
         kappa           0.41;
         E               9.8;
-        value           $internalField;
+        value           uniform 200;
     }
 }
 
diff --git a/tutorials/incompressible/pimpleFoam/TJunctionFan/0/k b/tutorials/incompressible/pimpleFoam/TJunctionFan/0/k
index 9684d73a55..a58acefeab 100644
--- a/tutorials/incompressible/pimpleFoam/TJunctionFan/0/k
+++ b/tutorials/incompressible/pimpleFoam/TJunctionFan/0/k
@@ -27,24 +27,24 @@ boundaryField
         intensity       0.05;
         U               U;
         phi             phi;
-        value           $internalField;
+        value           uniform 0.375;
     }
     outlet1
     {
         type            inletOutlet;
-        inletValue      $internalField;
-        value           $internalField;
+        inletValue      uniform 0.375;
+        value           uniform 0.375;
     }
     outlet2
     {
         type            inletOutlet;
-        inletValue      $internalField;
-        value           $internalField;
+        inletValue      uniform 0.375;
+        value           uniform 0.375;
     }
     baffles
     {
         type            kqRWallFunction;
-        value           $internalField;
+        value           uniform 0;
     }
     fan_half0
     {
@@ -57,7 +57,7 @@ boundaryField
     defaultFaces
     {
         type            kqRWallFunction;
-        value           $internalField;
+        value           uniform 0.375;
     }
 }
 
diff --git a/tutorials/incompressible/pimpleFoam/TJunctionFan/0/p b/tutorials/incompressible/pimpleFoam/TJunctionFan/0/p
index dd968b84c5..16a8bb50ed 100644
--- a/tutorials/incompressible/pimpleFoam/TJunctionFan/0/p
+++ b/tutorials/incompressible/pimpleFoam/TJunctionFan/0/p
@@ -29,10 +29,13 @@ boundaryField
         gamma           1;
         p0              40;
         pressure        table
-        (
-            (0 10)
-            (1 40)
-        );
+
+2
+(
+(0 10)
+(1 40)
+)
+;
         value           uniform 40;
     }
     outlet1
@@ -54,7 +57,14 @@ boundaryField
         type            fan;
         patchType       cyclic;
         jump            uniform 0;
-        f               2(100 -0.1);
+        jumpTable       polynomial
+
+2
+(
+(100 0)
+(-0.1 1)
+)
+;
         value           uniform 0;
     }
     fan_half1
@@ -62,7 +72,6 @@ boundaryField
         type            fan;
         patchType       cyclic;
         jump            uniform 0;
-        f               2(100 -0.1);
         value           uniform 0;
     }
     defaultFaces
diff --git a/tutorials/incompressible/pimpleFoam/elipsekkLOmega/constant/polyMesh/boundary b/tutorials/incompressible/pimpleFoam/elipsekkLOmega/constant/polyMesh/boundary
index ff3254a0cb..5370728b89 100644
--- a/tutorials/incompressible/pimpleFoam/elipsekkLOmega/constant/polyMesh/boundary
+++ b/tutorials/incompressible/pimpleFoam/elipsekkLOmega/constant/polyMesh/boundary
@@ -15,31 +15,37 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-4
+5
 (
+    left
+    {
+        type            symmetryPlane;
+        nFaces          320;
+        startFace       99210;
+    }
     outlet
     {
         type            patch;
         nFaces          320;
-        startFace       99370;
+        startFace       99530;
     }
     up
     {
         type            symmetryPlane;
         nFaces          380;
-        startFace       99690;
+        startFace       99850;
     }
     hole
     {
         type            wall;
         nFaces          560;
-        startFace       100070;
+        startFace       100230;
     }
     frontAndBack
     {
         type            empty;
         nFaces          100000;
-        startFace       100630;
+        startFace       100790;
     }
 )
 
diff --git a/tutorials/multiphase/bubbleFoam/bubbleColumn/0.org/p b/tutorials/multiphase/bubbleFoam/bubbleColumn/0.org/p
index 07744fc101..536747ce3f 100644
--- a/tutorials/multiphase/bubbleFoam/bubbleColumn/0.org/p
+++ b/tutorials/multiphase/bubbleFoam/bubbleColumn/0.org/p
@@ -22,7 +22,8 @@ boundaryField
 {
     inlet
     {
-        type            zeroGradient;
+        type            fixedFluxPressure;
+        value           uniform 0;
     }
 
     outlet
@@ -33,7 +34,7 @@ boundaryField
 
     walls
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 
diff --git a/tutorials/multiphase/bubbleFoam/bubbleColumn/0/p b/tutorials/multiphase/bubbleFoam/bubbleColumn/0/p
index 709bf07cef..5fffa73a19 100644
--- a/tutorials/multiphase/bubbleFoam/bubbleColumn/0/p
+++ b/tutorials/multiphase/bubbleFoam/bubbleColumn/0/p
@@ -1901,7 +1901,8 @@ boundaryField
 {
     inlet
     {
-        type            zeroGradient;
+        type            fixedFluxPressure;
+        value           uniform 0;
     }
 
     outlet
@@ -1912,7 +1913,7 @@ boundaryField
 
     walls
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 
diff --git a/tutorials/multiphase/bubbleFoam/bubbleColumn/system/fvSchemes b/tutorials/multiphase/bubbleFoam/bubbleColumn/system/fvSchemes
index 9e465b4262..0779f1ea22 100644
--- a/tutorials/multiphase/bubbleFoam/bubbleColumn/system/fvSchemes
+++ b/tutorials/multiphase/bubbleFoam/bubbleColumn/system/fvSchemes
@@ -42,7 +42,7 @@ laplacianSchemes
     default         none;
     laplacian(nuEff1,U1) Gauss linear corrected;
     laplacian(nuEff2,U2) Gauss linear corrected;
-    laplacian((rho*(1|A(U))),p) Gauss linear corrected;
+    laplacian(Dp,p) Gauss linear corrected;
 }
 
 interpolationSchemes
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/system/fvSchemes b/tutorials/multiphase/cavitatingFoam/les/throttle/system/fvSchemes
index 4dd3e2bcc8..0c8bf54bb5 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle/system/fvSchemes
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle/system/fvSchemes
@@ -43,7 +43,7 @@ laplacianSchemes
     default         none;
     laplacian(nuf,rhoU) Gauss linear corrected;
     laplacian(muEff,U) Gauss linear corrected;
-    laplacian(rAUf,p) Gauss linear corrected;
+    laplacian(Dp,p) Gauss linear corrected;
     laplacian(DkEff,k) Gauss linear corrected;
     laplacian(1,p)  Gauss linear corrected;
 }
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/fvSchemes b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/fvSchemes
index 4dd3e2bcc8..0c8bf54bb5 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/fvSchemes
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/fvSchemes
@@ -43,7 +43,7 @@ laplacianSchemes
     default         none;
     laplacian(nuf,rhoU) Gauss linear corrected;
     laplacian(muEff,U) Gauss linear corrected;
-    laplacian(rAUf,p) Gauss linear corrected;
+    laplacian(Dp,p) Gauss linear corrected;
     laplacian(DkEff,k) Gauss linear corrected;
     laplacian(1,p)  Gauss linear corrected;
 }
diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/system/fvSchemes b/tutorials/multiphase/cavitatingFoam/ras/throttle/system/fvSchemes
index 7134b5cb39..633e4a749e 100644
--- a/tutorials/multiphase/cavitatingFoam/ras/throttle/system/fvSchemes
+++ b/tutorials/multiphase/cavitatingFoam/ras/throttle/system/fvSchemes
@@ -44,7 +44,7 @@ laplacianSchemes
     default         none;
     laplacian(nuf,rhoU) Gauss linear corrected;
     laplacian(muEff,U) Gauss linear corrected;
-    laplacian(rAUf,p) Gauss linear corrected;
+    laplacian(Dp,p) Gauss linear corrected;
     laplacian(DomegaEff,omega) Gauss linear corrected;
     laplacian(DkEff,k) Gauss linear corrected;
     laplacian(1,p)  Gauss linear corrected;

From 12d560aa035f2ce002fb53203bfb0e98409a85bf Mon Sep 17 00:00:00 2001
From: laurence <laurence>
Date: Thu, 19 Apr 2012 14:37:31 +0100
Subject: [PATCH 233/317] BUG: Add surfaceFeatureExtract dictionaries to the
 tutorials

---
 .../pimpleDyMFoam/propeller/Allrun.pre        | 16 +----
 .../system/surfaceFeatureExtractDict          | 59 +++++++++++++++++++
 tutorials/mesh/cvMesh/flange/Allrun           |  2 +-
 .../flange/system/surfaceFeatureExtractDict   |  3 -
 tutorials/mesh/cvMesh/simpleShapes/Allrun     |  8 +--
 .../system/surfaceFeatureExtractDict          | 57 ++++++++++++++++++
 tutorials/mesh/snappyHexMesh/flange/Allrun    |  2 +-
 .../flange/system/surfaceFeatureExtractDict   | 38 ++++++++++++
 8 files changed, 159 insertions(+), 26 deletions(-)
 create mode 100644 tutorials/incompressible/pimpleDyMFoam/propeller/system/surfaceFeatureExtractDict
 create mode 100644 tutorials/mesh/cvMesh/simpleShapes/system/surfaceFeatureExtractDict
 create mode 100644 tutorials/mesh/snappyHexMesh/flange/system/surfaceFeatureExtractDict

diff --git a/tutorials/incompressible/pimpleDyMFoam/propeller/Allrun.pre b/tutorials/incompressible/pimpleDyMFoam/propeller/Allrun.pre
index 917bec1fac..472c03a6f7 100755
--- a/tutorials/incompressible/pimpleDyMFoam/propeller/Allrun.pre
+++ b/tutorials/incompressible/pimpleDyMFoam/propeller/Allrun.pre
@@ -12,21 +12,7 @@ cp $FOAM_TUTORIALS/resources/geometry/propellerTip.obj.gz constant/triSurface/
 
 runApplication blockMesh
 
-surfaces="
-    innerCylinder
-    innerCylinderSmall
-    outerCylinder
-    propellerTip
-    propellerStem1
-    propellerStem2
-    propellerStem3
-"
-
-for s in $surfaces; do
-    runApplication surfaceFeatureExtract -includedAngle 150 -minElem 10        \
-        constant/triSurface/$s.obj $s
-    mv log.surfaceFeatureExtract log.surfaceFeatureExtract.$s
-done
+runApplication surfaceFeatureExtract
 
 runApplication snappyHexMesh -overwrite
 # force removal of fields generated by snappy
diff --git a/tutorials/incompressible/pimpleDyMFoam/propeller/system/surfaceFeatureExtractDict b/tutorials/incompressible/pimpleDyMFoam/propeller/system/surfaceFeatureExtractDict
new file mode 100644
index 0000000000..b6333ec29b
--- /dev/null
+++ b/tutorials/incompressible/pimpleDyMFoam/propeller/system/surfaceFeatureExtractDict
@@ -0,0 +1,59 @@
+/*--------------------------------*- 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;
+    object      surfaceFeatureExtractDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+innerCylinder.obj
+{
+    #include "surfaceFeatureExtractDictDefaults"
+}
+
+
+innerCylinderSmall.obj
+{
+    #include "surfaceFeatureExtractDictDefaults"
+}
+
+
+outerCylinder.obj
+{
+    #include "surfaceFeatureExtractDictDefaults"
+}
+
+
+propellerStem1.obj
+{
+    #include "surfaceFeatureExtractDictDefaults"
+}
+
+
+propellerStem2.obj
+{
+    #include "surfaceFeatureExtractDictDefaults"
+}
+
+
+propellerStem3.obj
+{
+    #include "surfaceFeatureExtractDictDefaults"
+}
+
+
+propellerTip.obj
+{
+    #include "surfaceFeatureExtractDictDefaults"
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/mesh/cvMesh/flange/Allrun b/tutorials/mesh/cvMesh/flange/Allrun
index d4e853bb3f..dcbbfb47d4 100755
--- a/tutorials/mesh/cvMesh/flange/Allrun
+++ b/tutorials/mesh/cvMesh/flange/Allrun
@@ -8,7 +8,7 @@ cd ${0%/*} || exit 1    # run from this directory
 nProc=`grep numberOfSubdomains system/decomposeParDict \
      | sed s/"numberOfSubdomains *\(.*\);"/"\1"/`
 
-runApplication surfaceFeatureExtract constant/triSurface/flange.obj flange -includedAngle 155
+runApplication surfaceFeatureExtract
 
 # Create tight-fitting background mesh
 runApplication blockMesh
diff --git a/tutorials/mesh/cvMesh/flange/system/surfaceFeatureExtractDict b/tutorials/mesh/cvMesh/flange/system/surfaceFeatureExtractDict
index a4c24aa610..ca6dfb9e7c 100644
--- a/tutorials/mesh/cvMesh/flange/system/surfaceFeatureExtractDict
+++ b/tutorials/mesh/cvMesh/flange/system/surfaceFeatureExtractDict
@@ -30,9 +30,6 @@ flange.obj
 
     // Write options
 
-        // Write .eMesh file (for snappyHexMesh)
-        writeFeatureEdgeMesh    no;
-
         // Write features to obj format for postprocessing
         writeObj                yes;
 }
diff --git a/tutorials/mesh/cvMesh/simpleShapes/Allrun b/tutorials/mesh/cvMesh/simpleShapes/Allrun
index 5de37ba569..f1259d32d2 100755
--- a/tutorials/mesh/cvMesh/simpleShapes/Allrun
+++ b/tutorials/mesh/cvMesh/simpleShapes/Allrun
@@ -30,15 +30,11 @@ surfaceOrient \
     constant/triSurface/domain_clean_orient.stl
     > log.surfaceOrient.domain 2>&1
 
-runApplication surfaceFeatureExtract \
-    constant/triSurface/coneAndSphere_clean_orient.obj \
-    coneAndSphere -includedAngle 125
+runApplication surfaceFeatureExtract
 mv log.surfaceFeatureExtract log.surfaceFeatureExtract.coneAndSphere_clean
 
 unset FOAM_SIGFPE
-runApplication surfaceFeatureExtract \
-    constant/triSurface/domain_clean_orient.stl \
-    domain -includedAngle 125
+runApplication surfaceFeatureExtract
 mv log.surfaceFeatureExtract log.surfaceFeatureExtract.domain
 
 # Generate aligned points (in constant/internalDelaunayVertices) and a
diff --git a/tutorials/mesh/cvMesh/simpleShapes/system/surfaceFeatureExtractDict b/tutorials/mesh/cvMesh/simpleShapes/system/surfaceFeatureExtractDict
new file mode 100644
index 0000000000..850a4ea41f
--- /dev/null
+++ b/tutorials/mesh/cvMesh/simpleShapes/system/surfaceFeatureExtractDict
@@ -0,0 +1,57 @@
+/*--------------------------------*- 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;
+    object      surfaceFeatureExtractDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+coneAndSphere_clean_orient.obj
+{
+    extractionMethod    extractFromSurface;
+
+    extractFromSurfaceCoeffs
+    {
+        // Mark edges whose adjacent surface normals are at an angle less
+        // than includedAngle as features
+        // - 0  : selects no edges
+        // - 180: selects all edges
+        includedAngle   125;
+    }
+
+    // Write options
+
+        // Write features to obj format for postprocessing
+        writeObj                no;
+}
+
+
+domain_clean_orient.stl
+{
+    extractionMethod    extractFromSurface;
+
+    extractFromSurfaceCoeffs
+    {
+        // Mark edges whose adjacent surface normals are at an angle less
+        // than includedAngle as features
+        // - 0  : selects no edges
+        // - 180: selects all edges
+        includedAngle   125;
+    }
+
+    // Write options
+
+        // Write features to obj format for postprocessing
+        writeObj                no;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/mesh/snappyHexMesh/flange/Allrun b/tutorials/mesh/snappyHexMesh/flange/Allrun
index 5d808c1f55..365020d19d 100755
--- a/tutorials/mesh/snappyHexMesh/flange/Allrun
+++ b/tutorials/mesh/snappyHexMesh/flange/Allrun
@@ -6,5 +6,5 @@
 cp $FOAM_TUTORIALS/resources/geometry/flange.stl.gz constant/triSurface/
 
 runApplication blockMesh
-runApplication surfaceFeatureExtract -includedAngle 150 -writeObj constant/triSurface/flange.stl flange
+runApplication surfaceFeatureExtract
 runApplication snappyHexMesh -overwrite
diff --git a/tutorials/mesh/snappyHexMesh/flange/system/surfaceFeatureExtractDict b/tutorials/mesh/snappyHexMesh/flange/system/surfaceFeatureExtractDict
new file mode 100644
index 0000000000..21384ba40c
--- /dev/null
+++ b/tutorials/mesh/snappyHexMesh/flange/system/surfaceFeatureExtractDict
@@ -0,0 +1,38 @@
+/*--------------------------------*- 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;
+    object      surfaceFeatureExtractDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+flange.stl
+{
+    // How to obtain raw features (extractFromFile || extractFromSurface)
+    extractionMethod    extractFromSurface;
+
+    extractFromSurfaceCoeffs
+    {
+        // Mark edges whose adjacent surface normals are at an angle less
+        // than includedAngle as features
+        // - 0  : selects no edges
+        // - 180: selects all edges
+        includedAngle   150;
+    }
+
+    // Write options
+
+        // Write features to obj format for postprocessing
+        writeObj                yes;
+}
+
+
+// ************************************************************************* //

From dfac320401dab7d638a5fcd17f24a27744306a4c Mon Sep 17 00:00:00 2001
From: laurence <laurence>
Date: Thu, 19 Apr 2012 15:04:51 +0100
Subject: [PATCH 234/317] BUG: Add surfaceFeatureExtract dictionary defaults

---
 .../system/surfaceFeatureExtractDictDefaults    | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 tutorials/incompressible/pimpleDyMFoam/propeller/system/surfaceFeatureExtractDictDefaults

diff --git a/tutorials/incompressible/pimpleDyMFoam/propeller/system/surfaceFeatureExtractDictDefaults b/tutorials/incompressible/pimpleDyMFoam/propeller/system/surfaceFeatureExtractDictDefaults
new file mode 100644
index 0000000000..52258ae692
--- /dev/null
+++ b/tutorials/incompressible/pimpleDyMFoam/propeller/system/surfaceFeatureExtractDictDefaults
@@ -0,0 +1,17 @@
+// How to obtain raw features (extractFromFile || extractFromSurface)
+extractionMethod    extractFromSurface;
+
+extractFromSurfaceCoeffs
+{
+    // Mark edges whose adjacent surface normals are at an angle less
+    // than includedAngle as features
+    // - 0  : selects no edges
+    // - 180: selects all edges
+    includedAngle   150;
+}
+
+trimFeatures
+{
+    // Remove features with fewer than the specified number of edges
+    minElem         10;
+}

From 58edeb51140751a0c54f95e41b2e3e175cd36cf7 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Thu, 19 Apr 2012 16:15:18 +0100
Subject: [PATCH 235/317] ENH: changeDictionary: re-added instance option

---
 .../preProcessing/changeDictionary/changeDictionary.C    | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/applications/utilities/preProcessing/changeDictionary/changeDictionary.C b/applications/utilities/preProcessing/changeDictionary/changeDictionary.C
index 937e88d10e..ac3b733b03 100644
--- a/applications/utilities/preProcessing/changeDictionary/changeDictionary.C
+++ b/applications/utilities/preProcessing/changeDictionary/changeDictionary.C
@@ -253,6 +253,12 @@ int main(int argc, char *argv[])
         "file",
         "specify an alternative to system/changeDictionaryDict"
     );
+    argList::addOption
+    (
+        "instance",
+        "name",
+        "override instance setting (default is the time name)"
+    );
 
     // Add explicit time option
     timeSelector::addOptions();
@@ -280,6 +286,7 @@ int main(int argc, char *argv[])
             << "No times selected." << exit(FatalError);
     }
     runTime.setTime(times[0], 0);
+    word instance = args.optionLookupOrDefault("instance", runTime.timeName());
 
 
     #include "createNamedMesh.H"
@@ -465,7 +472,7 @@ int main(int argc, char *argv[])
                 IOobject
                 (
                     fieldName,
-                    runTime.timeName(),
+                    instance,
                     mesh,
                     IOobject::MUST_READ_IF_MODIFIED,
                     IOobject::NO_WRITE,

From ccf1499eef099729fb9aca0987acc21a42b456ad Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Thu, 19 Apr 2012 16:16:57 +0100
Subject: [PATCH 236/317] ENH: elipsekkLOmega: Allrun script cleanup

---
 tutorials/incompressible/pimpleFoam/elipsekkLOmega/Allrun | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tutorials/incompressible/pimpleFoam/elipsekkLOmega/Allrun b/tutorials/incompressible/pimpleFoam/elipsekkLOmega/Allrun
index 84cff2e934..612446c68e 100755
--- a/tutorials/incompressible/pimpleFoam/elipsekkLOmega/Allrun
+++ b/tutorials/incompressible/pimpleFoam/elipsekkLOmega/Allrun
@@ -10,14 +10,14 @@ application=`getApplication`
 runApplication blockMesh
 transformPoints -scale '(1.6666 1 1)'
 
-cp system/changeDictionaryDict.X system/changeDictionaryDict
-runApplication changeDictionary -instance system
+#cp system/changeDictionaryDict.X system/changeDictionaryDict
+runApplication changeDictionary -instance system -dict system/changeDictionaryDict.X
 runApplication mirrorMesh
 rm log.mirrorMesh
 
 rm log.changeDictionary
-cp system/changeDictionaryDict.Y system/changeDictionaryDict
-runApplication changeDictionary -instance system
+#cp system/changeDictionaryDict.Y system/changeDictionaryDict
+runApplication changeDictionary -instance system -dict  system/changeDictionaryDict.Y
 
 runApplication mirrorMesh
 cp -rf 0/polyMesh constant/

From ea1706fe9452938161b0dbff379f64179055667e Mon Sep 17 00:00:00 2001
From: sergio <sergio>
Date: Thu, 19 Apr 2012 16:36:58 +0100
Subject: [PATCH 237/317] BUG: Changed createSingleCellMesh to READ_IF_PRESENT
 Io read option

---
 applications/solvers/combustion/chemFoam/createSingleCellMesh.H | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/applications/solvers/combustion/chemFoam/createSingleCellMesh.H b/applications/solvers/combustion/chemFoam/createSingleCellMesh.H
index b5a9d283ac..c125a7f31f 100644
--- a/applications/solvers/combustion/chemFoam/createSingleCellMesh.H
+++ b/applications/solvers/combustion/chemFoam/createSingleCellMesh.H
@@ -23,7 +23,7 @@ fvMesh mesh
         fvMesh::defaultRegion,
         runTime.timeName(),
         runTime,
-        IOobject::MUST_READ
+        IOobject::READ_IF_PRESENT
     ),
     xferMove<Field<vector> >(points),
     faces.xfer(),

From c786a02cb99d66872558013afabcc6984c8d7345 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Thu, 19 Apr 2012 16:45:30 +0100
Subject: [PATCH 238/317] STYLE: argList.H: corrected comment

---
 src/OpenFOAM/global/argList/argList.H | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/OpenFOAM/global/argList/argList.H b/src/OpenFOAM/global/argList/argList.H
index edf94f3848..4ec3bd4075 100644
--- a/src/OpenFOAM/global/argList/argList.H
+++ b/src/OpenFOAM/global/argList/argList.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -270,7 +270,7 @@ public:
             ) const;
 
             //- Read a value from the named option if present.
-            //  Return true if the named option was found.
+            //  Return supplied default otherwise.
             template<class T>
             inline T optionLookupOrDefault
             (

From 2a17ac0f8af5f3f7dac0780756a73dc3392d264e Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Thu, 19 Apr 2012 16:46:14 +0100
Subject: [PATCH 239/317] ENH: findLower: have user-defined < operator

---
 .../containers/Lists/ListOps/ListOps.H        | 15 ++++++++++-
 .../Lists/ListOps/ListOpsTemplates.C          | 25 ++++++++++++++-----
 src/OpenFOAM/primitives/ops/ops.H             |  6 ++++-
 3 files changed, 38 insertions(+), 8 deletions(-)

diff --git a/src/OpenFOAM/containers/Lists/ListOps/ListOps.H b/src/OpenFOAM/containers/Lists/ListOps/ListOps.H
index 90d70cc26b..d0689b0eb1 100644
--- a/src/OpenFOAM/containers/Lists/ListOps/ListOps.H
+++ b/src/OpenFOAM/containers/Lists/ListOps/ListOps.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -37,6 +37,7 @@ SourceFiles
 #define ListOps_H
 
 #include "labelList.H"
+#include "ops.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -209,6 +210,18 @@ label findSortedIndex
 );
 
 
+//- Find last element < given value in sorted list and return index,
+//  return -1 if not found. Binary search.
+template<class ListType, class BinaryOp>
+label findLower
+(
+    const ListType&,
+    typename ListType::const_reference,
+    const label stary,
+    const BinaryOp& bop
+);
+
+
 //- Find last element < given value in sorted list and return index,
 //  return -1 if not found. Binary search.
 template<class ListType>
diff --git a/src/OpenFOAM/containers/Lists/ListOps/ListOpsTemplates.C b/src/OpenFOAM/containers/Lists/ListOps/ListOpsTemplates.C
index 41e28c3f64..be6337a428 100644
--- a/src/OpenFOAM/containers/Lists/ListOps/ListOpsTemplates.C
+++ b/src/OpenFOAM/containers/Lists/ListOps/ListOpsTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -592,12 +592,13 @@ Foam::label Foam::findSortedIndex
 }
 
 
-template<class ListType>
+template<class ListType, class BinaryOp>
 Foam::label Foam::findLower
 (
     const ListType& l,
     typename ListType::const_reference t,
-    const label start
+    const label start,
+    const BinaryOp& bop
 )
 {
     if (start >= l.size())
@@ -612,7 +613,7 @@ Foam::label Foam::findLower
     {
         label mid = (low + high)/2;
 
-        if (l[mid] < t)
+        if (bop(l[mid], t))
         {
             low = mid;
         }
@@ -622,13 +623,13 @@ Foam::label Foam::findLower
         }
     }
 
-    if (l[high] < t)
+    if (bop(l[high], t))
     {
         return high;
     }
     else
     {
-        if (l[low] < t)
+        if (bop(l[low], t))
         {
             return low;
         }
@@ -640,6 +641,18 @@ Foam::label Foam::findLower
 }
 
 
+template<class ListType>
+Foam::label Foam::findLower
+(
+    const ListType& l,
+    typename ListType::const_reference t,
+    const label start
+)
+{
+    return findLower(l, t, start, lessOp<typename ListType::value_type>());
+}
+
+
 template<class Container, class T, int nRows>
 Foam::List<Container> Foam::initList(const T elems[nRows])
 {
diff --git a/src/OpenFOAM/primitives/ops/ops.H b/src/OpenFOAM/primitives/ops/ops.H
index c68face927..66d7930849 100644
--- a/src/OpenFOAM/primitives/ops/ops.H
+++ b/src/OpenFOAM/primitives/ops/ops.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -142,6 +142,10 @@ Op(minMod, minMod(x, y))
 Op(and, x && y)
 Op(or, x || y)
 Op(eqEq, x == y)
+Op(less, x < y)
+Op(lessEq, x <= y)
+Op(greater, x > y)
+Op(greaterEq, x >= y)
 
 #undef Op
 

From af91ab5b91bf35ac43f98e4e313654117775fdd3 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Thu, 19 Apr 2012 16:47:09 +0100
Subject: [PATCH 240/317] BUG: TableBaseIO: write interpolationscheme; update
 comment

---
 .../primitives/functions/DataEntry/CSV/CSV.H        | 13 +++++++------
 .../functions/DataEntry/Table/TableBaseIO.C         |  5 +++++
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/OpenFOAM/primitives/functions/DataEntry/CSV/CSV.H b/src/OpenFOAM/primitives/functions/DataEntry/CSV/CSV.H
index 14e6eb1fb5..bcc3aee956 100644
--- a/src/OpenFOAM/primitives/functions/DataEntry/CSV/CSV.H
+++ b/src/OpenFOAM/primitives/functions/DataEntry/CSV/CSV.H
@@ -32,12 +32,13 @@ Description
         <entryName>   csvFile;
         csvFileCoeffs
         {
-            hasHeaderLine   true;
-            refColumn       0;          // reference column index
-            componentColumns (1 2 3);   // component column indices
-            separator       ",";        // optional (defaults to ",")
-            fileName        "fileXYZ";  // name of csv data file
-            outOfBounds     clamp;      // optional out-of-bounds handling
+            hasHeaderLine       true;
+            refColumn           0;          // reference column index
+            componentColumns    (1 2 3);    // component column indices
+            separator           ",";        // optional (defaults to ",")
+            fileName            "fileXYZ";  // name of csv data file
+            outOfBounds         clamp;      // optional out-of-bounds handling
+            interpolationScheme linear;     // optional interpolation scheme
         }
     \endverbatim
 
diff --git a/src/OpenFOAM/primitives/functions/DataEntry/Table/TableBaseIO.C b/src/OpenFOAM/primitives/functions/DataEntry/Table/TableBaseIO.C
index 667ac72be2..10d79420f7 100644
--- a/src/OpenFOAM/primitives/functions/DataEntry/Table/TableBaseIO.C
+++ b/src/OpenFOAM/primitives/functions/DataEntry/Table/TableBaseIO.C
@@ -73,6 +73,11 @@ void Foam::TableBase<Type>::writeEntries(Ostream& os) const
         os.writeKeyword("outOfBounds") << boundsHandlingToWord(boundsHandling_)
             << token::END_STATEMENT << nl;
     }
+    if (interpolationScheme_ != "linear")
+    {
+        os.writeKeyword("interpolationScheme") << interpolationScheme_
+            << token::END_STATEMENT << nl;
+    }
 }
 
 

From 9301cc4f64a755630f28ac9cd138cb1c9e4e3cfe Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Thu, 19 Apr 2012 16:47:59 +0100
Subject: [PATCH 241/317] ENH: linearInterpolationWeights: handle values equal
 to table range

---
 .../linearInterpolationWeights.C                           | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/OpenFOAM/interpolations/interpolationWeights/linearInterpolationWeights/linearInterpolationWeights.C b/src/OpenFOAM/interpolations/interpolationWeights/linearInterpolationWeights/linearInterpolationWeights.C
index 18233f1825..89497fba37 100644
--- a/src/OpenFOAM/interpolations/interpolationWeights/linearInterpolationWeights/linearInterpolationWeights.C
+++ b/src/OpenFOAM/interpolations/interpolationWeights/linearInterpolationWeights/linearInterpolationWeights.C
@@ -167,8 +167,11 @@ bool linearInterpolationWeights::integrationWeights
             << exit(FatalError);
     }
 
-    // Currently no fancy logic on cached index
-    label i1 = findLower(samples_, t1);
+    // Currently no fancy logic on cached index like in value
+
+    //- Find lower or equal index
+    label i1 = findLower(samples_, t1, 0, lessEqOp<scalar>());
+    //- Find lower index
     label i2 = findLower(samples_, t2);
 
     // For now just fail if any outside table

From 8980559ecda427fde973237e4170e473124f2ea2 Mon Sep 17 00:00:00 2001
From: laurence <laurence>
Date: Fri, 20 Apr 2012 09:18:46 +0100
Subject: [PATCH 242/317] ENH: meshTools: Add functions to write lines and
 vectors to .obj files

---
 src/meshTools/meshTools/meshTools.C | 33 +++++++++++++++++++++++++++++
 src/meshTools/meshTools/meshTools.H | 18 ++++++++++++++++
 2 files changed, 51 insertions(+)

diff --git a/src/meshTools/meshTools/meshTools.C b/src/meshTools/meshTools/meshTools.C
index 03edfc3825..2d03a0c969 100644
--- a/src/meshTools/meshTools/meshTools.C
+++ b/src/meshTools/meshTools/meshTools.C
@@ -215,6 +215,39 @@ void Foam::meshTools::writeOBJ
 }
 
 
+void Foam::meshTools::writeOBJ
+(
+    Ostream& os,
+    const point& p1,
+    const point& p2,
+    label& count
+)
+{
+    os << "v" << ' ' << p1.x() << ' ' << p1.y() << ' ' << p1.z() << endl;
+    os << "v" << ' ' << p2.x() << ' ' << p2.y() << ' ' << p2.z() << endl;
+
+    os << "l" << " " << (count + 1) << " " << (count + 2) << endl;
+    
+    count += 2;
+}
+
+
+void Foam::meshTools::writeOBJ
+(
+    Ostream& os,
+    const point& p1,
+    const point& p2
+)
+{
+    os << "v" << ' ' << p1.x() << ' ' << p1.y() << ' ' << p1.z() << endl;
+
+    os << "vn"
+        << ' ' << p2.x() - p1.x()
+        << ' ' << p2.y() - p1.y()
+        << ' ' << p2.z() - p1.z() << endl;
+}
+
+
 void Foam::meshTools::writeOBJ
 (
     Ostream& os,
diff --git a/src/meshTools/meshTools/meshTools.H b/src/meshTools/meshTools/meshTools.H
index 65dff1f3b6..3db94a8e5a 100644
--- a/src/meshTools/meshTools/meshTools.H
+++ b/src/meshTools/meshTools/meshTools.H
@@ -107,6 +107,24 @@ namespace meshTools
             const point& pt
         );
 
+        //- Write obj representation of a line connecting two points
+        //  Need to keep track of points that have been added. count starts at 0
+        void writeOBJ
+        (
+            Ostream& os,
+            const point& p1,
+            const point& p2,
+            label& count
+        );
+
+        //- Write obj representation of a point p1 with a vector from p1 to p2
+        void writeOBJ
+        (
+            Ostream& os,
+            const point& p1,
+            const point& p2
+        );
+
         //- Write obj representation of faces subset
         void writeOBJ
         (

From ef8efc27ba3c5462043fe4da4743e47030183a9c Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Fri, 20 Apr 2012 09:49:58 +0100
Subject: [PATCH 243/317] Solvers and tutorials: changed use of buoyantPressure
 BC to fixedFluxPressure

---
 .../multiphase/interFoam/interDyMFoam/pEqn.H  |  1 +
 .../solvers/multiphase/settlingFoam/pEqn.H    |  1 +
 .../les/oppositeBurningPanels/0/p_rgh         |  6 +--
 .../fireFoam/les/smallPoolFire2D/0/p_rgh      |  6 +--
 .../fireFoam/les/smallPoolFire3D/0/p_rgh      |  6 +--
 .../hotRoom/0/p_rgh                           |  6 +--
 .../hotRoom/0/p_rgh                           |  6 +--
 .../iglooWithFridges/0/p_rgh                  |  8 ++--
 .../buoyantPimpleFoam/hotRoom/0/p_rgh         |  6 +--
 .../buoyantSimpleFoam/buoyantCavity/0/p_rgh   |  8 ++--
 .../circuitBoardCooling/0.org/p_rgh           |  8 ++--
 .../buoyantSimpleFoam/hotRoom/0/p_rgh         |  6 +--
 .../hotRadiationRoom/0/p_rgh                  |  8 ++--
 .../hotRadiationRoomFvDOM/0/p_rgh             |  8 ++--
 .../elipsekkLOmega/constant/polyMesh/boundary | 16 +++-----
 .../cylinder/0.org/p_rgh                      |  4 +-
 .../hotBoxes/0.org/p_rgh                      |  4 +-
 .../rivuletPanel/0.org/p_rgh                  |  8 ++--
 .../splashPanel/0.org/p_rgh                   |  4 +-
 .../LTSInterFoam/wigleyHull/0/p_rgh           |  4 +-
 .../bubbleColumn/0/p                          |  4 +-
 .../mixerVessel2D/0/p                         |  4 +-
 .../ras/damBreakWithObstacle/0.org/p_rgh      |  4 +-
 .../ras/floatingObject/0.org/p_rgh            |  4 +-
 .../interDyMFoam/ras/sloshingTank2D/0/p_rgh   |  2 +-
 .../ras/sloshingTank2D3DoF/0/p_rgh            |  2 +-
 .../interDyMFoam/ras/sloshingTank3D/0/p_rgh   |  2 +-
 .../ras/sloshingTank3D3DoF/0/p_rgh            |  2 +-
 .../ras/sloshingTank3D6DoF/0/p_rgh            |  2 +-
 .../interDyMFoam/ras/testTubeMixer/0/p_rgh    |  2 +-
 .../interFoam/laminar/damBreak/0/p_rgh        |  6 +--
 .../multiphase/interFoam/ras/damBreak/0/p_rgh |  6 +--
 .../ras/damBreakPorousBaffle/0/p_rgh          |  6 +--
 .../interMixingFoam/laminar/damBreak/0/p_rgh  |  6 +--
 .../cavitatingBullet/0/p_rgh                  |  2 +-
 .../multiphaseEulerFoam/bubbleColumn/0/p      |  2 +-
 .../damBreak4phase/0.org/p                    |  6 +--
 .../damBreak4phaseFine/0.org/p                |  6 +--
 .../multiphaseEulerFoam/mixerVessel2D/0/p     |  4 +-
 .../laminar/damBreak4phase/0.org/p_rgh        |  6 +--
 .../laminar/damBreak4phaseFine/0.org/p_rgh    |  6 +--
 .../multiphase/settlingFoam/ras/dahl/0/p_rgh  |  8 ++--
 .../settlingFoam/ras/tank3D/0/p_rgh           | 38 +++++++++----------
 .../lockExchange/0.org/p_rgh                  |  8 ++--
 .../multiphase/twoPhaseEulerFoam/bed/0/p      |  4 +-
 .../multiphase/twoPhaseEulerFoam/bed2/0/p     |  4 +-
 .../twoPhaseEulerFoam/bubbleColumn/0/p        |  4 +-
 .../twoPhaseEulerFoam/mixerVessel2D/0/p       |  4 +-
 48 files changed, 137 insertions(+), 141 deletions(-)

diff --git a/applications/solvers/multiphase/interFoam/interDyMFoam/pEqn.H b/applications/solvers/multiphase/interFoam/interDyMFoam/pEqn.H
index f6681086d0..d942f2c501 100644
--- a/applications/solvers/multiphase/interFoam/interDyMFoam/pEqn.H
+++ b/applications/solvers/multiphase/interFoam/interDyMFoam/pEqn.H
@@ -7,6 +7,7 @@
 
     surfaceScalarField phiHbyA
     (
+        "phiHbyA",
         (fvc::interpolate(HbyA) & mesh.Sf())
       + fvc::ddtPhiCorr(rAU, rho, U, phiAbs)
     );
diff --git a/applications/solvers/multiphase/settlingFoam/pEqn.H b/applications/solvers/multiphase/settlingFoam/pEqn.H
index bf632adb4d..9f27e992a8 100644
--- a/applications/solvers/multiphase/settlingFoam/pEqn.H
+++ b/applications/solvers/multiphase/settlingFoam/pEqn.H
@@ -8,6 +8,7 @@
 
     surfaceScalarField phiHbyA
     (
+        "phiHbyA",
         fvc::interpolate(rho)
        *(
            (fvc::interpolate(HbyA) & mesh.Sf())
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/p_rgh b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/p_rgh
index 1e34387a33..f0770e8bd9 100644
--- a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/p_rgh
+++ b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/p_rgh
@@ -23,7 +23,7 @@ boundaryField
 {
     ground
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           $internalField;
     }
 
@@ -35,7 +35,7 @@ boundaryField
 
     burner
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           $internalField;
     }
 
@@ -53,7 +53,7 @@ boundaryField
 
     "(region0_to.*)"
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           $internalField;
     }
 }
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/p_rgh b/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/p_rgh
index 54e8cbeb29..d941becc55 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/p_rgh
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/p_rgh
@@ -23,7 +23,7 @@ boundaryField
 {
     outlet
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           $internalField;
     }
 
@@ -41,13 +41,13 @@ boundaryField
 
     base
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           $internalField;
     }
 
     inlet
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           $internalField;
     }
 
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/p_rgh b/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/p_rgh
index 7a8d6054f8..420c10de47 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/p_rgh
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/p_rgh
@@ -23,7 +23,7 @@ boundaryField
 {
     outlet
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           $internalField;
     }
     sides
@@ -39,12 +39,12 @@ boundaryField
     }
     base
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           $internalField;
     }
     inlet
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           $internalField;
     }
 }
diff --git a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/0/p_rgh b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/0/p_rgh
index 7dc56a6289..b2d94f6866 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/0/p_rgh
+++ b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/0/p_rgh
@@ -22,21 +22,21 @@ boundaryField
 {
     floor
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         rho             rhok;
         value           uniform 0;
     }
 
     ceiling
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         rho             rhok;
         value           uniform 0;
     }
 
     fixedWalls
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         rho             rhok;
         value           uniform 0;
     }
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0/p_rgh b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0/p_rgh
index 7dc56a6289..b2d94f6866 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0/p_rgh
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0/p_rgh
@@ -22,21 +22,21 @@ boundaryField
 {
     floor
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         rho             rhok;
         value           uniform 0;
     }
 
     ceiling
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         rho             rhok;
         value           uniform 0;
     }
 
     fixedWalls
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         rho             rhok;
         value           uniform 0;
     }
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/p_rgh b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/p_rgh
index 0ce8d85c2b..eb39e94eab 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/p_rgh
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/p_rgh
@@ -22,28 +22,28 @@ boundaryField
 {
     ground
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         rho             rhok;
         value           uniform 0;
     }
 
     igloo_region0
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         rho             rhok;
         value           uniform 0;
     }
 
     twoFridgeFreezers_seal_0
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         rho             rhok;
         value           uniform 0;
     }
 
     twoFridgeFreezers_herring_1
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         rho             rhok;
         value           uniform 0;
     }
diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0/p_rgh b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0/p_rgh
index c851c9391a..8602946911 100644
--- a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0/p_rgh
+++ b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0/p_rgh
@@ -22,19 +22,19 @@ boundaryField
 {
     floor
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 1e5;
     }
 
     ceiling
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 1e5;
     }
 
     fixedWalls
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 1e5;
     }
 }
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0/p_rgh b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0/p_rgh
index fcf8d57e51..15979d020e 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0/p_rgh
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0/p_rgh
@@ -23,25 +23,25 @@ boundaryField
 {
     frontAndBack
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 1e5;
     }
 
     topAndBottom
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 1e5;
     }
 
     hot
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 1e5;
     }
 
     cold
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 1e5;
     }
 }
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/p_rgh b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/p_rgh
index 94fc0bd9f3..8cb7d58cdf 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/p_rgh
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/p_rgh
@@ -23,22 +23,22 @@ boundaryField
 {
     floor
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           $internalField;
     }
     ceiling
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           $internalField;
     }
     inlet
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           $internalField;
     }
     outlet
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           $internalField;
     }
     fixedWalls
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/0/p_rgh b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/0/p_rgh
index c851c9391a..8602946911 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/0/p_rgh
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/0/p_rgh
@@ -22,19 +22,19 @@ boundaryField
 {
     floor
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 1e5;
     }
 
     ceiling
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 1e5;
     }
 
     fixedWalls
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 1e5;
     }
 }
diff --git a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/p_rgh b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/p_rgh
index 5b0b64b976..b8deb5e595 100644
--- a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/p_rgh
+++ b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/p_rgh
@@ -22,25 +22,25 @@ boundaryField
 {
     floor
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 100000;
     }
 
     ceiling
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 100000;
     }
 
     fixedWalls
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 100000;
     }
 
     box
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 100000;
     }
 }
diff --git a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/0/p_rgh b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/0/p_rgh
index 5b0b64b976..b8deb5e595 100644
--- a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/0/p_rgh
+++ b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/0/p_rgh
@@ -22,25 +22,25 @@ boundaryField
 {
     floor
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 100000;
     }
 
     ceiling
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 100000;
     }
 
     fixedWalls
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 100000;
     }
 
     box
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 100000;
     }
 }
diff --git a/tutorials/incompressible/pimpleFoam/elipsekkLOmega/constant/polyMesh/boundary b/tutorials/incompressible/pimpleFoam/elipsekkLOmega/constant/polyMesh/boundary
index 5370728b89..ff3254a0cb 100644
--- a/tutorials/incompressible/pimpleFoam/elipsekkLOmega/constant/polyMesh/boundary
+++ b/tutorials/incompressible/pimpleFoam/elipsekkLOmega/constant/polyMesh/boundary
@@ -15,37 +15,31 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-5
+4
 (
-    left
-    {
-        type            symmetryPlane;
-        nFaces          320;
-        startFace       99210;
-    }
     outlet
     {
         type            patch;
         nFaces          320;
-        startFace       99530;
+        startFace       99370;
     }
     up
     {
         type            symmetryPlane;
         nFaces          380;
-        startFace       99850;
+        startFace       99690;
     }
     hole
     {
         type            wall;
         nFaces          560;
-        startFace       100230;
+        startFace       100070;
     }
     frontAndBack
     {
         type            empty;
         nFaces          100000;
-        startFace       100790;
+        startFace       100630;
     }
 )
 
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/0.org/p_rgh b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/0.org/p_rgh
index 61d9570ec5..99be8758e2 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/0.org/p_rgh
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/0.org/p_rgh
@@ -23,11 +23,11 @@ boundaryField
 {
     "(sides|frontAndBack)"
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
     }
     region0_to_wallFilmRegion_wallFilmFaces
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
     }
 }
 
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0.org/p_rgh b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0.org/p_rgh
index 5ab863aecc..df06f47fd0 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0.org/p_rgh
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0.org/p_rgh
@@ -23,12 +23,12 @@ boundaryField
 {
     walls
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 100000;
     }
     wallFilm
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 100000;
     }
 }
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/0.org/p_rgh b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/0.org/p_rgh
index 09857d6805..7333dfae9b 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/0.org/p_rgh
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/0.org/p_rgh
@@ -23,19 +23,19 @@ boundaryField
 {
     inlet
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
     }
     outlet
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
     }
     sides
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
     }
     region0_to_wallFilmRegion_wallFilmFaces
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
     }
 }
 
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/0.org/p_rgh b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/0.org/p_rgh
index f30165dfb7..840f0d21be 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/0.org/p_rgh
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/0.org/p_rgh
@@ -23,11 +23,11 @@ boundaryField
 {
     sides
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
     }
     region0_to_wallFilmRegion_wallFilmFaces
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
     }
 }
 
diff --git a/tutorials/multiphase/LTSInterFoam/wigleyHull/0/p_rgh b/tutorials/multiphase/LTSInterFoam/wigleyHull/0/p_rgh
index 54e73a08ae..2b4915fe5c 100644
--- a/tutorials/multiphase/LTSInterFoam/wigleyHull/0/p_rgh
+++ b/tutorials/multiphase/LTSInterFoam/wigleyHull/0/p_rgh
@@ -22,7 +22,7 @@ boundaryField
 {
     inlet
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 
@@ -50,7 +50,7 @@ boundaryField
 
     hull_wall
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 }
diff --git a/tutorials/multiphase/compressibleTwoPhaseEulerFoam/bubbleColumn/0/p b/tutorials/multiphase/compressibleTwoPhaseEulerFoam/bubbleColumn/0/p
index 8f2ec50ff3..ae2c14b746 100644
--- a/tutorials/multiphase/compressibleTwoPhaseEulerFoam/bubbleColumn/0/p
+++ b/tutorials/multiphase/compressibleTwoPhaseEulerFoam/bubbleColumn/0/p
@@ -22,7 +22,7 @@ boundaryField
 {
     inlet
     {
-        type               multiphaseFixedFluxPressure;
+        type               fixedFluxPressure;
         value              $internalField;
     }
     outlet
@@ -32,7 +32,7 @@ boundaryField
     }
     walls
     {
-        type               multiphaseFixedFluxPressure;
+        type               fixedFluxPressure;
         value              $internalField;
     }
 }
diff --git a/tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/0/p b/tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/0/p
index 9c4de0da51..72f221208d 100644
--- a/tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/0/p
+++ b/tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/0/p
@@ -22,13 +22,13 @@ boundaryField
 {
     rotor
     {
-        type            multiphaseFixedFluxPressure;
+        type            fixedFluxPressure;
         value           $internalField;
     }
 
     stator
     {
-        type            multiphaseFixedFluxPressure;
+        type            fixedFluxPressure;
         value           $internalField;
     }
 
diff --git a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0.org/p_rgh b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0.org/p_rgh
index e3f442956d..5c911a0345 100644
--- a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0.org/p_rgh
+++ b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0.org/p_rgh
@@ -22,13 +22,13 @@ boundaryField
 {
     walls
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 
     obstacle
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 
diff --git a/tutorials/multiphase/interDyMFoam/ras/floatingObject/0.org/p_rgh b/tutorials/multiphase/interDyMFoam/ras/floatingObject/0.org/p_rgh
index 03c2b46b04..825a15d6dc 100644
--- a/tutorials/multiphase/interDyMFoam/ras/floatingObject/0.org/p_rgh
+++ b/tutorials/multiphase/interDyMFoam/ras/floatingObject/0.org/p_rgh
@@ -22,7 +22,7 @@ boundaryField
 {
     stationaryWalls
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
     atmosphere
@@ -38,7 +38,7 @@ boundaryField
     }
     floatingObject
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 }
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/0/p_rgh b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/0/p_rgh
index 6fd77ea86a..5c0b4be6fd 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/0/p_rgh
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/0/p_rgh
@@ -30,7 +30,7 @@ boundaryField
     }
     walls
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 }
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/0/p_rgh b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/0/p_rgh
index 6fd77ea86a..5c0b4be6fd 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/0/p_rgh
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/0/p_rgh
@@ -30,7 +30,7 @@ boundaryField
     }
     walls
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 }
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/0/p_rgh b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/0/p_rgh
index 1f97b19664..29202adadb 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/0/p_rgh
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/0/p_rgh
@@ -22,7 +22,7 @@ boundaryField
 {
     walls
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 }
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/0/p_rgh b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/0/p_rgh
index 1f97b19664..29202adadb 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/0/p_rgh
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/0/p_rgh
@@ -22,7 +22,7 @@ boundaryField
 {
     walls
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 }
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/0/p_rgh b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/0/p_rgh
index 1f97b19664..29202adadb 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/0/p_rgh
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/0/p_rgh
@@ -22,7 +22,7 @@ boundaryField
 {
     walls
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 }
diff --git a/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/0/p_rgh b/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/0/p_rgh
index 1f97b19664..29202adadb 100644
--- a/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/0/p_rgh
+++ b/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/0/p_rgh
@@ -22,7 +22,7 @@ boundaryField
 {
     walls
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 }
diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/0/p_rgh b/tutorials/multiphase/interFoam/laminar/damBreak/0/p_rgh
index 7ef84e282b..cfabea4db1 100644
--- a/tutorials/multiphase/interFoam/laminar/damBreak/0/p_rgh
+++ b/tutorials/multiphase/interFoam/laminar/damBreak/0/p_rgh
@@ -22,19 +22,19 @@ boundaryField
 {
     leftWall
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 
     rightWall
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 
     lowerWall
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 
diff --git a/tutorials/multiphase/interFoam/ras/damBreak/0/p_rgh b/tutorials/multiphase/interFoam/ras/damBreak/0/p_rgh
index 7ef84e282b..cfabea4db1 100644
--- a/tutorials/multiphase/interFoam/ras/damBreak/0/p_rgh
+++ b/tutorials/multiphase/interFoam/ras/damBreak/0/p_rgh
@@ -22,19 +22,19 @@ boundaryField
 {
     leftWall
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 
     rightWall
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 
     lowerWall
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 
diff --git a/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/0/p_rgh b/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/0/p_rgh
index 2b5d9fde97..c085da2cb6 100644
--- a/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/0/p_rgh
+++ b/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/0/p_rgh
@@ -23,19 +23,19 @@ boundaryField
 {
     leftWall
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         gradient        uniform 0;
         value           uniform 0;
     }
     rightWall
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         gradient        uniform 0;
         value           uniform 0;
     }
     lowerWall
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         gradient        uniform 0;
         value           uniform 0;
     }
diff --git a/tutorials/multiphase/interMixingFoam/laminar/damBreak/0/p_rgh b/tutorials/multiphase/interMixingFoam/laminar/damBreak/0/p_rgh
index 7ef84e282b..cfabea4db1 100644
--- a/tutorials/multiphase/interMixingFoam/laminar/damBreak/0/p_rgh
+++ b/tutorials/multiphase/interMixingFoam/laminar/damBreak/0/p_rgh
@@ -22,19 +22,19 @@ boundaryField
 {
     leftWall
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 
     rightWall
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 
     lowerWall
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 
diff --git a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/0/p_rgh b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/0/p_rgh
index f32544b279..f2ef63d0be 100644
--- a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/0/p_rgh
+++ b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/0/p_rgh
@@ -39,7 +39,7 @@ boundaryField
 
     bullet
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
     }
 }
 
diff --git a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0/p b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0/p
index 6fe844d27a..278db348b8 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0/p
+++ b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0/p
@@ -22,7 +22,7 @@ boundaryField
 {
     inlet
     {
-        type            multiphaseFixedFluxPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
     outlet
diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.org/p b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.org/p
index 7d12a33956..037f82d0b0 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.org/p
+++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.org/p
@@ -22,19 +22,19 @@ boundaryField
 {
     leftWall
     {
-        type            multiphaseFixedFluxPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 
     rightWall
     {
-        type            multiphaseFixedFluxPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 
     lowerWall
     {
-        type            multiphaseFixedFluxPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 
diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.org/p b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.org/p
index 7d12a33956..037f82d0b0 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.org/p
+++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.org/p
@@ -22,19 +22,19 @@ boundaryField
 {
     leftWall
     {
-        type            multiphaseFixedFluxPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 
     rightWall
     {
-        type            multiphaseFixedFluxPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 
     lowerWall
     {
-        type            multiphaseFixedFluxPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 
diff --git a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/p b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/p
index 75717ab275..32d92ebc36 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/p
+++ b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/p
@@ -22,13 +22,13 @@ boundaryField
 {
     rotor
     {
-        type            multiphaseFixedFluxPressure;
+        type            fixedFluxPressure;
         value           $internalField;
     }
 
     stator
     {
-        type            multiphaseFixedFluxPressure;
+        type            fixedFluxPressure;
         value           $internalField;
     }
 
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0.org/p_rgh b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0.org/p_rgh
index 7ef84e282b..cfabea4db1 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0.org/p_rgh
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0.org/p_rgh
@@ -22,19 +22,19 @@ boundaryField
 {
     leftWall
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 
     rightWall
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 
     lowerWall
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0.org/p_rgh b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0.org/p_rgh
index 7ef84e282b..cfabea4db1 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0.org/p_rgh
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0.org/p_rgh
@@ -22,19 +22,19 @@ boundaryField
 {
     leftWall
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 
     rightWall
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 
     lowerWall
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 
diff --git a/tutorials/multiphase/settlingFoam/ras/dahl/0/p_rgh b/tutorials/multiphase/settlingFoam/ras/dahl/0/p_rgh
index f289b34b7c..81c72d7f7a 100644
--- a/tutorials/multiphase/settlingFoam/ras/dahl/0/p_rgh
+++ b/tutorials/multiphase/settlingFoam/ras/dahl/0/p_rgh
@@ -22,7 +22,7 @@ boundaryField
 {
     inlet
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 
@@ -34,19 +34,19 @@ boundaryField
 
     bottomWall
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 
     endWall
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 
     top
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 
diff --git a/tutorials/multiphase/settlingFoam/ras/tank3D/0/p_rgh b/tutorials/multiphase/settlingFoam/ras/tank3D/0/p_rgh
index 75d1cda22d..0e6a2c640f 100644
--- a/tutorials/multiphase/settlingFoam/ras/tank3D/0/p_rgh
+++ b/tutorials/multiphase/settlingFoam/ras/tank3D/0/p_rgh
@@ -22,115 +22,115 @@ boundaryField
 {
     SYMP3
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 
     INLE1
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 
     OUTL9
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 
     OUTL10
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 
     OUTL11
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 
     OUTL12
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 
     WALL6
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 
     WALL8
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 
     WALL61
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 
     WALL62
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 
     WALL63
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 
     WALL64
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 
     WALL65
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 
     WALL66
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 
     WALL67
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 
     WALL68
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 
     WALL69
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 
     WALL7
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 
     WALL70
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 
diff --git a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/0.org/p_rgh b/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/0.org/p_rgh
index a9156248a7..b61e0277ec 100644
--- a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/0.org/p_rgh
+++ b/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/0.org/p_rgh
@@ -23,19 +23,19 @@ boundaryField
 {
     left
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
     }
     right
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
     }
     bottom
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
     }
     top
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
     }
     frontBack
     {
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed/0/p b/tutorials/multiphase/twoPhaseEulerFoam/bed/0/p
index 63e3f73b31..e5e362d958 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/bed/0/p
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bed/0/p
@@ -22,7 +22,7 @@ boundaryField
 {
     bottom
     {
-        type               multiphaseFixedFluxPressure;
+        type               fixedFluxPressure;
         value              $internalField;
     }
 
@@ -34,7 +34,7 @@ boundaryField
 
     walls
     {
-        type               multiphaseFixedFluxPressure;
+        type               fixedFluxPressure;
         value              $internalField;
     }
 
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed2/0/p b/tutorials/multiphase/twoPhaseEulerFoam/bed2/0/p
index d8384de3d5..5b2c9cfa86 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/bed2/0/p
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bed2/0/p
@@ -22,7 +22,7 @@ boundaryField
 {
     walls
     {
-        type               multiphaseFixedFluxPressure;
+        type               fixedFluxPressure;
         value              $internalField;
     }
     outlet
@@ -32,7 +32,7 @@ boundaryField
     }
     inlet
     {
-        type               multiphaseFixedFluxPressure;
+        type               fixedFluxPressure;
         value              $internalField;
     }
     frontAndBackPlanes
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/0/p b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/0/p
index db1aca2e2a..5fffa73a19 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/0/p
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/0/p
@@ -1901,7 +1901,7 @@ boundaryField
 {
     inlet
     {
-        type            multiphaseFixedFluxPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 
@@ -1913,7 +1913,7 @@ boundaryField
 
     walls
     {
-        type            multiphaseFixedFluxPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/mixerVessel2D/0/p b/tutorials/multiphase/twoPhaseEulerFoam/mixerVessel2D/0/p
index 75717ab275..32d92ebc36 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/mixerVessel2D/0/p
+++ b/tutorials/multiphase/twoPhaseEulerFoam/mixerVessel2D/0/p
@@ -22,13 +22,13 @@ boundaryField
 {
     rotor
     {
-        type            multiphaseFixedFluxPressure;
+        type            fixedFluxPressure;
         value           $internalField;
     }
 
     stator
     {
-        type            multiphaseFixedFluxPressure;
+        type            fixedFluxPressure;
         value           $internalField;
     }
 

From cd82a0f5f45c0a4a0f6c423836f617a90057dea7 Mon Sep 17 00:00:00 2001
From: laurence <laurence>
Date: Fri, 20 Apr 2012 10:20:46 +0100
Subject: [PATCH 244/317] Remove trailing whitespace

---
 src/meshTools/meshTools/meshTools.C | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/meshTools/meshTools/meshTools.C b/src/meshTools/meshTools/meshTools.C
index 2d03a0c969..2cb27c39c7 100644
--- a/src/meshTools/meshTools/meshTools.C
+++ b/src/meshTools/meshTools/meshTools.C
@@ -227,7 +227,7 @@ void Foam::meshTools::writeOBJ
     os << "v" << ' ' << p2.x() << ' ' << p2.y() << ' ' << p2.z() << endl;
 
     os << "l" << " " << (count + 1) << " " << (count + 2) << endl;
-    
+
     count += 2;
 }
 

From 13ef974effc10b5e4fb1d116c87daf38f4e42458 Mon Sep 17 00:00:00 2001
From: sergio <sergio>
Date: Fri, 20 Apr 2012 12:16:50 +0100
Subject: [PATCH 245/317] ENH: Adding -overwrite option to mirrorMesh and
 update tutorial

---
 .../mesh/manipulation/mirrorMesh/mirrorMesh.C | 11 +++-
 .../pimpleFoam/elipsekkLOmega/Allclean        |  1 -
 .../pimpleFoam/elipsekkLOmega/Allrun          |  7 +--
 .../elipsekkLOmega/constant/polyMesh/boundary | 52 -------------------
 4 files changed, 12 insertions(+), 59 deletions(-)
 delete mode 100644 tutorials/incompressible/pimpleFoam/elipsekkLOmega/constant/polyMesh/boundary

diff --git a/applications/utilities/mesh/manipulation/mirrorMesh/mirrorMesh.C b/applications/utilities/mesh/manipulation/mirrorMesh/mirrorMesh.C
index f050d82a79..e607080a66 100644
--- a/applications/utilities/mesh/manipulation/mirrorMesh/mirrorMesh.C
+++ b/applications/utilities/mesh/manipulation/mirrorMesh/mirrorMesh.C
@@ -37,15 +37,24 @@ using namespace Foam;
 
 int main(int argc, char *argv[])
 {
+
+#   include "addOverwriteOption.H"
 #   include "setRootCase.H"
 #   include "createTime.H"
 
+    const bool overwrite = args.optionFound("overwrite");
+
+    if (!overwrite)
+    {
+        runTime++;
+    }
+
     mirrorFvMesh mesh
     (
         IOobject
         (
             mirrorFvMesh::defaultRegion,
-            runTime.timeName(),
+            runTime.constant(),
             runTime
         )
     );
diff --git a/tutorials/incompressible/pimpleFoam/elipsekkLOmega/Allclean b/tutorials/incompressible/pimpleFoam/elipsekkLOmega/Allclean
index 213da0de10..a25fd5e1c4 100755
--- a/tutorials/incompressible/pimpleFoam/elipsekkLOmega/Allclean
+++ b/tutorials/incompressible/pimpleFoam/elipsekkLOmega/Allclean
@@ -5,6 +5,5 @@ cd ${0%/*} || exit 1    # run from this directory
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
 cleanCase
-rm -rf 0/polyMesh
 
 # ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/incompressible/pimpleFoam/elipsekkLOmega/Allrun b/tutorials/incompressible/pimpleFoam/elipsekkLOmega/Allrun
index 612446c68e..fd85f49a95 100755
--- a/tutorials/incompressible/pimpleFoam/elipsekkLOmega/Allrun
+++ b/tutorials/incompressible/pimpleFoam/elipsekkLOmega/Allrun
@@ -10,17 +10,14 @@ application=`getApplication`
 runApplication blockMesh
 transformPoints -scale '(1.6666 1 1)'
 
-#cp system/changeDictionaryDict.X system/changeDictionaryDict
 runApplication changeDictionary -instance system -dict system/changeDictionaryDict.X
-runApplication mirrorMesh
+runApplication mirrorMesh -overwrite
 rm log.mirrorMesh
 
 rm log.changeDictionary
-#cp system/changeDictionaryDict.Y system/changeDictionaryDict
 runApplication changeDictionary -instance system -dict  system/changeDictionaryDict.Y
 
-runApplication mirrorMesh
-cp -rf 0/polyMesh constant/
+runApplication mirrorMesh -overwrite
 
 runApplication topoSet
 runApplication createPatch -overwrite
diff --git a/tutorials/incompressible/pimpleFoam/elipsekkLOmega/constant/polyMesh/boundary b/tutorials/incompressible/pimpleFoam/elipsekkLOmega/constant/polyMesh/boundary
deleted file mode 100644
index 5370728b89..0000000000
--- a/tutorials/incompressible/pimpleFoam/elipsekkLOmega/constant/polyMesh/boundary
+++ /dev/null
@@ -1,52 +0,0 @@
-/*--------------------------------*- 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    "0/polyMesh";
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-5
-(
-    left
-    {
-        type            symmetryPlane;
-        nFaces          320;
-        startFace       99210;
-    }
-    outlet
-    {
-        type            patch;
-        nFaces          320;
-        startFace       99530;
-    }
-    up
-    {
-        type            symmetryPlane;
-        nFaces          380;
-        startFace       99850;
-    }
-    hole
-    {
-        type            wall;
-        nFaces          560;
-        startFace       100230;
-    }
-    frontAndBack
-    {
-        type            empty;
-        nFaces          100000;
-        startFace       100790;
-    }
-)
-
-// ************************************************************************* //

From ca9aa409bce682bbb0754f5cbe75895147db72d3 Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Fri, 20 Apr 2012 14:00:46 +0100
Subject: [PATCH 246/317] LduMatrix: Updated and re-committed

---
 src/OpenFOAM/meshes/primitiveShapes/tetrahedron/tetPoints.H | 2 +-
 src/dynamicMesh/extrudePatchMesh/extrudePatchMesh.C         | 2 +-
 src/dynamicMesh/extrudePatchMesh/extrudePatchMesh.H         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/OpenFOAM/meshes/primitiveShapes/tetrahedron/tetPoints.H b/src/OpenFOAM/meshes/primitiveShapes/tetrahedron/tetPoints.H
index 2e1ecf288d..cb42d33d4b 100644
--- a/src/OpenFOAM/meshes/primitiveShapes/tetrahedron/tetPoints.H
+++ b/src/OpenFOAM/meshes/primitiveShapes/tetrahedron/tetPoints.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2012 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/dynamicMesh/extrudePatchMesh/extrudePatchMesh.C b/src/dynamicMesh/extrudePatchMesh/extrudePatchMesh.C
index 860536ea30..4730621e08 100644
--- a/src/dynamicMesh/extrudePatchMesh/extrudePatchMesh.C
+++ b/src/dynamicMesh/extrudePatchMesh/extrudePatchMesh.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2012 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/dynamicMesh/extrudePatchMesh/extrudePatchMesh.H b/src/dynamicMesh/extrudePatchMesh/extrudePatchMesh.H
index b13d957c5d..b960988e20 100644
--- a/src/dynamicMesh/extrudePatchMesh/extrudePatchMesh.H
+++ b/src/dynamicMesh/extrudePatchMesh/extrudePatchMesh.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2012 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

From a3807c9dbbff815938cb9d534901ff9114da6af5 Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Fri, 20 Apr 2012 14:01:59 +0100
Subject: [PATCH 247/317] LduMatrix: Updated and re-committed

---
 applications/test/LduMatrix/LduMatrixTest.C   | 162 +++
 applications/test/LduMatrix/LduMatrixTest2.C  | 162 +++
 applications/test/LduMatrix/LduMatrixTest3.C  | 147 +++
 applications/test/LduMatrix/Make/files        |   3 +
 applications/test/LduMatrix/Make/options      |   4 +
 applications/test/LduMatrix/createFields.H    |  55 ++
 src/OpenFOAM/Make/files                       |   6 +
 .../CyclicLduInterfaceField.C                 |  65 ++
 .../CyclicLduInterfaceField.H                 | 102 ++
 .../LduInterfaceField/LduInterfaceField.C     |  47 +
 .../LduInterfaceField/LduInterfaceField.H     | 149 +++
 .../LduInterfaceFieldPtrsList.H               |  69 ++
 .../ProcessorLduInterfaceField.C              |  66 ++
 .../ProcessorLduInterfaceField.H              | 105 ++
 .../matrices/LduMatrix/LduMatrix/LduMatrix.C  | 390 ++++++++
 .../matrices/LduMatrix/LduMatrix/LduMatrix.H  | 934 ++++++++++++++++++
 .../LduMatrix/LduMatrix/LduMatrixATmul.C      | 293 ++++++
 .../matrices/LduMatrix/LduMatrix/LduMatrixI.H |  44 +
 .../LduMatrix/LduMatrix/LduMatrixOperations.C | 480 +++++++++
 .../LduMatrix/LduMatrixPreconditioner.C       | 115 +++
 .../LduMatrix/LduMatrix/LduMatrixSmoother.C   | 120 +++
 .../LduMatrix/LduMatrix/LduMatrixSolver.C     | 190 ++++
 .../LduMatrix/LduMatrix/LduMatrixTests.C      | 118 +++
 .../LduMatrixUpdateMatrixInterfaces.C         | 194 ++++
 .../LduMatrix/LduMatrix/lduMatrices.C         |  39 +
 .../DILUPreconditioner/TDILUPreconditioner.C  | 179 ++++
 .../DILUPreconditioner/TDILUPreconditioner.H  | 126 +++
 .../DiagonalPreconditioner.C                  |  80 ++
 .../DiagonalPreconditioner.H                  | 134 +++
 .../NoPreconditioner/NoPreconditioner.C       |  59 ++
 .../NoPreconditioner/NoPreconditioner.H       | 125 +++
 .../Preconditioners/lduPreconditioners.C      |  54 +
 .../GaussSeidel/TGaussSeidelSmoother.C        | 167 ++++
 .../GaussSeidel/TGaussSeidelSmoother.H        | 112 +++
 .../LduMatrix/Smoothers/lduSmoothers.C        |  45 +
 .../Solvers/DiagonalSolver/DiagonalSolver.C   |  79 ++
 .../Solvers/DiagonalSolver/DiagonalSolver.H   | 107 ++
 .../matrices/LduMatrix/Solvers/PBiCG/TPBiCG.C | 194 ++++
 .../matrices/LduMatrix/Solvers/PBiCG/TPBiCG.H | 111 +++
 .../PBiCGScalarAlpha/PBiCGScalarAlpha.C       | 190 ++++
 .../PBiCGScalarAlpha/PBiCGScalarAlpha.H       | 111 +++
 .../matrices/LduMatrix/Solvers/PCG/TPCG.C     | 180 ++++
 .../matrices/LduMatrix/Solvers/PCG/TPCG.H     | 111 +++
 .../Solvers/SmoothSolver/SmoothSolver.C       | 153 +++
 .../Solvers/SmoothSolver/SmoothSolver.H       | 110 +++
 .../matrices/LduMatrix/Solvers/lduSolvers.C   |  57 ++
 .../fvMatrices/fvMatrix/fvMatrix.H            |   3 +-
 47 files changed, 6545 insertions(+), 1 deletion(-)
 create mode 100644 applications/test/LduMatrix/LduMatrixTest.C
 create mode 100644 applications/test/LduMatrix/LduMatrixTest2.C
 create mode 100644 applications/test/LduMatrix/LduMatrixTest3.C
 create mode 100644 applications/test/LduMatrix/Make/files
 create mode 100644 applications/test/LduMatrix/Make/options
 create mode 100644 applications/test/LduMatrix/createFields.H
 create mode 100644 src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduInterfaceField/CyclicLduInterfaceField.C
 create mode 100644 src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduInterfaceField/CyclicLduInterfaceField.H
 create mode 100644 src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduInterfaceField/LduInterfaceField.C
 create mode 100644 src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduInterfaceField/LduInterfaceField.H
 create mode 100644 src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduInterfaceField/LduInterfaceFieldPtrsList.H
 create mode 100644 src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduInterfaceField/ProcessorLduInterfaceField.C
 create mode 100644 src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduInterfaceField/ProcessorLduInterfaceField.H
 create mode 100644 src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrix.C
 create mode 100644 src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrix.H
 create mode 100644 src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixATmul.C
 create mode 100644 src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixI.H
 create mode 100644 src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixOperations.C
 create mode 100644 src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixPreconditioner.C
 create mode 100644 src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixSmoother.C
 create mode 100644 src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixSolver.C
 create mode 100644 src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixTests.C
 create mode 100644 src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixUpdateMatrixInterfaces.C
 create mode 100644 src/OpenFOAM/matrices/LduMatrix/LduMatrix/lduMatrices.C
 create mode 100644 src/OpenFOAM/matrices/LduMatrix/Preconditioners/DILUPreconditioner/TDILUPreconditioner.C
 create mode 100644 src/OpenFOAM/matrices/LduMatrix/Preconditioners/DILUPreconditioner/TDILUPreconditioner.H
 create mode 100644 src/OpenFOAM/matrices/LduMatrix/Preconditioners/DiagonalPreconditioner/DiagonalPreconditioner.C
 create mode 100644 src/OpenFOAM/matrices/LduMatrix/Preconditioners/DiagonalPreconditioner/DiagonalPreconditioner.H
 create mode 100644 src/OpenFOAM/matrices/LduMatrix/Preconditioners/NoPreconditioner/NoPreconditioner.C
 create mode 100644 src/OpenFOAM/matrices/LduMatrix/Preconditioners/NoPreconditioner/NoPreconditioner.H
 create mode 100644 src/OpenFOAM/matrices/LduMatrix/Preconditioners/lduPreconditioners.C
 create mode 100644 src/OpenFOAM/matrices/LduMatrix/Smoothers/GaussSeidel/TGaussSeidelSmoother.C
 create mode 100644 src/OpenFOAM/matrices/LduMatrix/Smoothers/GaussSeidel/TGaussSeidelSmoother.H
 create mode 100644 src/OpenFOAM/matrices/LduMatrix/Smoothers/lduSmoothers.C
 create mode 100644 src/OpenFOAM/matrices/LduMatrix/Solvers/DiagonalSolver/DiagonalSolver.C
 create mode 100644 src/OpenFOAM/matrices/LduMatrix/Solvers/DiagonalSolver/DiagonalSolver.H
 create mode 100644 src/OpenFOAM/matrices/LduMatrix/Solvers/PBiCG/TPBiCG.C
 create mode 100644 src/OpenFOAM/matrices/LduMatrix/Solvers/PBiCG/TPBiCG.H
 create mode 100644 src/OpenFOAM/matrices/LduMatrix/Solvers/PBiCGScalarAlpha/PBiCGScalarAlpha.C
 create mode 100644 src/OpenFOAM/matrices/LduMatrix/Solvers/PBiCGScalarAlpha/PBiCGScalarAlpha.H
 create mode 100644 src/OpenFOAM/matrices/LduMatrix/Solvers/PCG/TPCG.C
 create mode 100644 src/OpenFOAM/matrices/LduMatrix/Solvers/PCG/TPCG.H
 create mode 100644 src/OpenFOAM/matrices/LduMatrix/Solvers/SmoothSolver/SmoothSolver.C
 create mode 100644 src/OpenFOAM/matrices/LduMatrix/Solvers/SmoothSolver/SmoothSolver.H
 create mode 100644 src/OpenFOAM/matrices/LduMatrix/Solvers/lduSolvers.C

diff --git a/applications/test/LduMatrix/LduMatrixTest.C b/applications/test/LduMatrix/LduMatrixTest.C
new file mode 100644
index 0000000000..13038bef45
--- /dev/null
+++ b/applications/test/LduMatrix/LduMatrixTest.C
@@ -0,0 +1,162 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "argList.H"
+#include "Time.H"
+#include "fvMesh.H"
+#include "volFields.H"
+#include "LduMatrix.H"
+#include "diagTensorField.H"
+#include "TPCG.H"
+#include "TPBiCG.H"
+#include "NoPreconditioner.H"
+
+using namespace Foam;
+
+typedef Foam::LduMatrix<vector, diagTensor, scalar>
+    lduVectorMatrix;
+defineNamedTemplateTypeNameAndDebug(lduVectorMatrix, 0);
+
+typedef Foam::DiagonalSolver<vector, diagTensor, scalar>
+    lduVectorDiagonalSolver;
+defineNamedTemplateTypeNameAndDebug(lduVectorDiagonalSolver, 0);
+
+template<>
+const vector lduVectorMatrix::great_(1e15, 1e15, 1e15);
+
+template<>
+const vector lduVectorMatrix::small_(1e-15, 1e-15, 1e-15);
+
+namespace Foam
+{
+    typedef LduMatrix<vector, diagTensor, scalar>::preconditioner
+        lduVectorPreconditioner;
+    defineTemplateRunTimeSelectionTable(lduVectorPreconditioner, symMatrix);
+    defineTemplateRunTimeSelectionTable(lduVectorPreconditioner, asymMatrix);
+
+    typedef LduMatrix<vector, diagTensor, scalar>::smoother
+        lduVectorSmoother;
+    defineTemplateRunTimeSelectionTable(lduVectorSmoother, symMatrix);
+    defineTemplateRunTimeSelectionTable(lduVectorSmoother, asymMatrix);
+
+    typedef LduMatrix<vector, diagTensor, scalar>::solver
+        lduVectorSolver;
+    defineTemplateRunTimeSelectionTable(lduVectorSolver, symMatrix);
+    defineTemplateRunTimeSelectionTable(lduVectorSolver, asymMatrix);
+
+    typedef TPCG<vector, diagTensor, scalar> TPCGVector;
+    defineNamedTemplateTypeNameAndDebug(TPCGVector, 0);
+
+    LduMatrix<vector, diagTensor, scalar>::solver::
+        addsymMatrixConstructorToTable<TPCGVector>
+        addTPCGSymMatrixConstructorToTable_;
+
+    typedef TPBiCG<vector, diagTensor, scalar> TPBiCGVector;
+    defineNamedTemplateTypeNameAndDebug(TPBiCGVector, 0);
+
+    LduMatrix<vector, diagTensor, scalar>::solver::
+        addasymMatrixConstructorToTable<TPBiCGVector>
+        addTPBiCGSymMatrixConstructorToTable_;
+
+    typedef NoPreconditioner<vector, diagTensor, scalar> NoPreconditionerVector;
+    defineNamedTemplateTypeNameAndDebug(NoPreconditionerVector, 0);
+
+    LduMatrix<vector, diagTensor, scalar>::preconditioner::
+        addsymMatrixConstructorToTable<NoPreconditionerVector>
+        addNoPreconditionerSymMatrixConstructorToTable_;
+
+    LduMatrix<vector, diagTensor, scalar>::preconditioner::
+        addasymMatrixConstructorToTable<NoPreconditionerVector>
+        addNoPreconditionerAsymMatrixConstructorToTable_;
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// Main program:
+
+int main(int argc, char *argv[])
+{
+    #include "setRootCase.H"
+
+    #include "createTime.H"
+    #include "createMesh.H"
+
+    volVectorField psi
+    (
+        IOobject
+        (
+            "U",
+            runTime.timeName(),
+            mesh,
+            IOobject::MUST_READ,
+            IOobject::AUTO_WRITE
+        ),
+        mesh
+    );
+
+    lduVectorMatrix testMatrix(mesh);
+    testMatrix.diag() = 2*pTraits<diagTensor>::one;
+    testMatrix.source() = pTraits<vector>::one;
+    testMatrix.upper() = 0.1;
+    testMatrix.lower() = -0.1;
+
+    Info<< testMatrix << endl;
+
+    FieldField<Field, scalar> boundaryCoeffs(0);
+    FieldField<Field, scalar> internalCoeffs(0);
+
+    autoPtr<lduVectorMatrix::solver> testMatrixSolver =
+    lduVectorMatrix::solver::New
+    (
+        psi.name(),
+        testMatrix,
+        boundaryCoeffs,
+        internalCoeffs,
+        psi.boundaryField().interfaces(),
+        IStringStream
+        (
+            "PBiCG"
+            "{"
+            "    preconditioner   none;"
+            "    tolerance        (1e-05 1e-05 1e-05);"
+            "    relTol           (0 0 0);"
+            "}"
+        )()
+    );
+
+    lduVectorMatrix::solverPerformance solverPerf =
+        testMatrixSolver->solve(psi);
+
+    solverPerf.print();
+
+    Info<< psi << endl;
+
+    Info<< "End\n" << endl;
+
+    return 0;
+}
+
+
+// ************************************************************************* //
diff --git a/applications/test/LduMatrix/LduMatrixTest2.C b/applications/test/LduMatrix/LduMatrixTest2.C
new file mode 100644
index 0000000000..f8694eb481
--- /dev/null
+++ b/applications/test/LduMatrix/LduMatrixTest2.C
@@ -0,0 +1,162 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "argList.H"
+#include "Time.H"
+#include "fvMesh.H"
+#include "volFields.H"
+#include "LduMatrix.H"
+#include "tensorField.H"
+#include "TPCG.H"
+#include "TPBiCG.H"
+#include "NoPreconditioner.H"
+
+using namespace Foam;
+
+typedef Foam::LduMatrix<vector, tensor, scalar>
+    lduVectorMatrix;
+defineNamedTemplateTypeNameAndDebug(lduVectorMatrix, 0);
+
+typedef Foam::DiagonalSolver<vector, tensor, scalar>
+    lduVectorDiagonalSolver;
+defineNamedTemplateTypeNameAndDebug(lduVectorDiagonalSolver, 0);
+
+template<>
+const vector lduVectorMatrix::great_(1e15, 1e15, 1e15);
+
+template<>
+const vector lduVectorMatrix::small_(1e-15, 1e-15, 1e-15);
+
+namespace Foam
+{
+    typedef LduMatrix<vector, tensor, scalar>::preconditioner
+        lduVectorPreconditioner;
+    defineTemplateRunTimeSelectionTable(lduVectorPreconditioner, symMatrix);
+    defineTemplateRunTimeSelectionTable(lduVectorPreconditioner, asymMatrix);
+
+    typedef LduMatrix<vector, tensor, scalar>::smoother
+        lduVectorSmoother;
+    defineTemplateRunTimeSelectionTable(lduVectorSmoother, symMatrix);
+    defineTemplateRunTimeSelectionTable(lduVectorSmoother, asymMatrix);
+
+    typedef LduMatrix<vector, tensor, scalar>::solver
+        lduVectorSolver;
+    defineTemplateRunTimeSelectionTable(lduVectorSolver, symMatrix);
+    defineTemplateRunTimeSelectionTable(lduVectorSolver, asymMatrix);
+
+    typedef TPCG<vector, tensor, scalar> TPCGVector;
+    defineNamedTemplateTypeNameAndDebug(TPCGVector, 0);
+
+    LduMatrix<vector, tensor, scalar>::solver::
+        addsymMatrixConstructorToTable<TPCGVector>
+        addTPCGSymMatrixConstructorToTable_;
+
+    typedef TPBiCG<vector, tensor, scalar> TPBiCGVector;
+    defineNamedTemplateTypeNameAndDebug(TPBiCGVector, 0);
+
+    LduMatrix<vector, tensor, scalar>::solver::
+        addasymMatrixConstructorToTable<TPBiCGVector>
+        addTPBiCGSymMatrixConstructorToTable_;
+
+    typedef NoPreconditioner<vector, tensor, scalar> NoPreconditionerVector;
+    defineNamedTemplateTypeNameAndDebug(NoPreconditionerVector, 0);
+
+    LduMatrix<vector, tensor, scalar>::preconditioner::
+        addsymMatrixConstructorToTable<NoPreconditionerVector>
+        addNoPreconditionerSymMatrixConstructorToTable_;
+
+    LduMatrix<vector, tensor, scalar>::preconditioner::
+        addasymMatrixConstructorToTable<NoPreconditionerVector>
+        addNoPreconditionerAsymMatrixConstructorToTable_;
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// Main program:
+
+int main(int argc, char *argv[])
+{
+    #include "setRootCase.H"
+
+    #include "createTime.H"
+    #include "createMesh.H"
+
+    volVectorField psi
+    (
+        IOobject
+        (
+            "U",
+            runTime.timeName(),
+            mesh,
+            IOobject::MUST_READ,
+            IOobject::AUTO_WRITE
+        ),
+        mesh
+    );
+
+    lduVectorMatrix testMatrix(mesh);
+    testMatrix.diag() = 2*I;
+    testMatrix.source() = pTraits<vector>::one;
+    testMatrix.upper() = 0.1;
+    testMatrix.lower() = -0.1;
+
+    Info<< testMatrix << endl;
+
+    FieldField<Field, scalar> boundaryCoeffs(0);
+    FieldField<Field, scalar> internalCoeffs(0);
+
+    autoPtr<lduVectorMatrix::solver> testMatrixSolver =
+    lduVectorMatrix::solver::New
+    (
+        psi.name(),
+        testMatrix,
+        //boundaryCoeffs,
+        //internalCoeffs,
+        //psi.boundaryField().interfaces(),
+        IStringStream
+        (
+            "PBiCG"
+            "{"
+            "    preconditioner   none;"
+            "    tolerance        (1e-05 1e-05 1e-05);"
+            "    relTol           (0 0 0);"
+            "}"
+        )()
+    );
+
+    lduVectorMatrix::solverPerformance solverPerf =
+        testMatrixSolver->solve(psi);
+
+    solverPerf.print();
+
+    Info<< psi << endl;
+
+    Info<< "End\n" << endl;
+
+    return 0;
+}
+
+
+// ************************************************************************* //
diff --git a/applications/test/LduMatrix/LduMatrixTest3.C b/applications/test/LduMatrix/LduMatrixTest3.C
new file mode 100644
index 0000000000..22d44bd2d0
--- /dev/null
+++ b/applications/test/LduMatrix/LduMatrixTest3.C
@@ -0,0 +1,147 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Application
+    icoFoam
+
+Description
+    Transient solver for incompressible, laminar flow of Newtonian fluids.
+
+\*---------------------------------------------------------------------------*/
+
+#include "fvCFD.H"
+#include "LduMatrix.H"
+#include "diagTensorField.H"
+
+typedef LduMatrix<vector, scalar, scalar> lduVectorMatrix;
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+int main(int argc, char *argv[])
+{
+    #include "setRootCase.H"
+
+    #include "createTime.H"
+    #include "createMesh.H"
+    #include "createFields.H"
+    #include "initContinuityErrs.H"
+
+    // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+    Info<< "\nStarting time loop\n" << endl;
+
+    while (runTime.loop())
+    {
+        Info<< "Time = " << runTime.timeName() << nl << endl;
+
+        #include "readPISOControls.H"
+        #include "CourantNo.H"
+
+        fvVectorMatrix UEqn
+        (
+            fvm::ddt(U)
+          + fvm::div(phi, U)
+          - fvm::laplacian(nu, U)
+        );
+
+        fvVectorMatrix UEqnp(UEqn == -fvc::grad(p));
+
+        lduVectorMatrix U3Eqnp(mesh);
+        U3Eqnp.diag() = UEqnp.diag();
+        U3Eqnp.upper() = UEqnp.upper();
+        U3Eqnp.lower() = UEqnp.lower();
+        U3Eqnp.source() = UEqnp.source();
+
+        UEqnp.addBoundaryDiag(U3Eqnp.diag(), 0);
+        UEqnp.addBoundarySource(U3Eqnp.source(), false);
+
+        autoPtr<lduVectorMatrix::solver> U3EqnpSolver =
+            lduVectorMatrix::solver::New
+            (
+                U.name(),
+                U3Eqnp,
+                dictionary
+                (
+                    IStringStream
+                    (
+                        "{"
+                        "    solver           PBiCG;"
+                        "    preconditioner   DILU;"
+                        "    tolerance        (1e-13 1e-13 1e-13);"
+                        "    relTol           (0 0 0);"
+                        "}"
+                    )()
+                )
+            );
+
+        U3EqnpSolver->solve(U).print(Info);
+
+        // --- PISO loop
+
+        for (int corr=0; corr<nCorr; corr++)
+        {
+            volScalarField rAU = 1.0/UEqn.A();
+
+            U = rAU*UEqn.H();
+            phi = (fvc::interpolate(U) & mesh.Sf())
+                + fvc::ddtPhiCorr(rAU, U, phi);
+
+            adjustPhi(phi, U, p);
+
+            for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
+            {
+                fvScalarMatrix pEqn
+                (
+                    fvm::laplacian(rAU, p) == fvc::div(phi)
+                );
+
+                pEqn.setReference(pRefCell, pRefValue);
+                pEqn.solve();
+
+                if (nonOrth == nNonOrthCorr)
+                {
+                    phi -= pEqn.flux();
+                }
+            }
+
+            #include "continuityErrs.H"
+
+            U -= rAU*fvc::grad(p);
+            U.correctBoundaryConditions();
+        }
+
+        runTime.write();
+
+        Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
+            << "  ClockTime = " << runTime.elapsedClockTime() << " s"
+            << nl << endl;
+    }
+
+    Info<< "End\n" << endl;
+
+    return 0;
+}
+
+
+// ************************************************************************* //
diff --git a/applications/test/LduMatrix/Make/files b/applications/test/LduMatrix/Make/files
new file mode 100644
index 0000000000..99fa29929c
--- /dev/null
+++ b/applications/test/LduMatrix/Make/files
@@ -0,0 +1,3 @@
+LduMatrixTest3.C
+
+EXE = $(FOAM_USER_APPBIN)/LduMatrixTest
diff --git a/applications/test/LduMatrix/Make/options b/applications/test/LduMatrix/Make/options
new file mode 100644
index 0000000000..725122ea1d
--- /dev/null
+++ b/applications/test/LduMatrix/Make/options
@@ -0,0 +1,4 @@
+EXE_INC = \
+    -I$(LIB_SRC)/finiteVolume/lnInclude
+
+EXE_LIBS = -lfiniteVolume
diff --git a/applications/test/LduMatrix/createFields.H b/applications/test/LduMatrix/createFields.H
new file mode 100644
index 0000000000..02093c3938
--- /dev/null
+++ b/applications/test/LduMatrix/createFields.H
@@ -0,0 +1,55 @@
+    Info<< "Reading transportProperties\n" << endl;
+
+    IOdictionary transportProperties
+    (
+        IOobject
+        (
+            "transportProperties",
+            runTime.constant(),
+            mesh,
+            IOobject::MUST_READ_IF_MODIFIED,
+            IOobject::NO_WRITE
+        )
+    );
+
+    dimensionedScalar nu
+    (
+        transportProperties.lookup("nu")
+    );
+
+    Info<< "Reading field p\n" << endl;
+    volScalarField p
+    (
+        IOobject
+        (
+            "p",
+            runTime.timeName(),
+            mesh,
+            IOobject::MUST_READ,
+            IOobject::AUTO_WRITE
+        ),
+        mesh
+    );
+
+
+    Info<< "Reading field U\n" << endl;
+    volVectorField U
+    (
+        IOobject
+        (
+            "U",
+            runTime.timeName(),
+            mesh,
+            IOobject::MUST_READ,
+            IOobject::AUTO_WRITE
+        ),
+        mesh
+    );
+
+
+#   include "createPhi.H"
+
+
+    label pRefCell = 0;
+    scalar pRefValue = 0.0;
+    setRefCell(p, mesh.solutionDict().subDict("PISO"), pRefCell, pRefValue);
diff --git a/src/OpenFOAM/Make/files b/src/OpenFOAM/Make/files
index 948ec4dbe7..d32d9c82e0 100644
--- a/src/OpenFOAM/Make/files
+++ b/src/OpenFOAM/Make/files
@@ -314,6 +314,12 @@ $(algebraicPairGAMGAgglomeration)/algebraicPairGAMGAgglomeration.C
 
 meshes/lduMesh/lduMesh.C
 
+LduMatrix = matrices/LduMatrix
+$(LduMatrix)/LduMatrix/lduMatrices.C
+$(LduMatrix)/Smoothers/lduSmoothers.C
+$(LduMatrix)/Preconditioners/lduPreconditioners.C
+$(LduMatrix)/Solvers/lduSolvers.C
+
 primitiveShapes = meshes/primitiveShapes
 
 $(primitiveShapes)/line/line.C
diff --git a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduInterfaceField/CyclicLduInterfaceField.C b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduInterfaceField/CyclicLduInterfaceField.C
new file mode 100644
index 0000000000..445a654a1c
--- /dev/null
+++ b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduInterfaceField/CyclicLduInterfaceField.C
@@ -0,0 +1,65 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "CyclicLduInterfaceField.H"
+#include "diagTensorField.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    //defineTypeNameAndDebug(CyclicLduInterfaceField, 0);
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+template<class Type>
+Foam::CyclicLduInterfaceField<Type>::~CyclicLduInterfaceField()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class Type>
+void Foam::CyclicLduInterfaceField<Type>::transformCoupleField
+(
+    Field<Type>& f
+) const
+{
+    if (doTransform())
+    {
+        label sizeby2 = f.size()/2;
+
+        for (label facei=0; facei<sizeby2; facei++)
+        {
+            f[facei] = transform(f[facei], forwardT()[0]);
+            f[facei + sizeby2] = transform(f[facei + sizeby2], forwardT()[0]);
+        }
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduInterfaceField/CyclicLduInterfaceField.H b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduInterfaceField/CyclicLduInterfaceField.H
new file mode 100644
index 0000000000..e19a0dcb8d
--- /dev/null
+++ b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduInterfaceField/CyclicLduInterfaceField.H
@@ -0,0 +1,102 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::CyclicLduInterfaceField
+
+Description
+    Abstract base class for cyclic coupled interfaces.
+
+SourceFiles
+    CyclicLduInterfaceField.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef CyclicLduInterfaceField_H
+#define CyclicLduInterfaceField_H
+
+#include "primitiveFieldsFwd.H"
+#include "typeInfo.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                  Class CyclicLduInterfaceField Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class Type>
+class CyclicLduInterfaceField
+{
+
+public:
+
+    //- Runtime type information
+    TypeName("CyclicLduInterfaceField");
+
+
+    // Constructors
+
+        //- Construct given coupled patch
+        CyclicLduInterfaceField()
+        {}
+
+
+    // Destructor
+
+        virtual ~CyclicLduInterfaceField();
+
+
+    // Member Functions
+
+        // Access
+
+            //- Is the transform required
+            virtual bool doTransform() const = 0;
+
+            //- Return face transformation tensor
+            virtual const tensorField& forwardT() const = 0;
+
+            //- Return neighbour-cell transformation tensor
+            virtual const tensorField& reverseT() const = 0;
+
+            //- Return rank of component for transform
+            virtual int rank() const = 0;
+
+
+        //- Transform given patch internal field
+        void transformCoupleField(Field<Type>& f) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduInterfaceField/LduInterfaceField.C b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduInterfaceField/LduInterfaceField.C
new file mode 100644
index 0000000000..5f50f7eb53
--- /dev/null
+++ b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduInterfaceField/LduInterfaceField.C
@@ -0,0 +1,47 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "lduInterfaceField.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+defineTypeNameAndDebug(lduInterfaceField, 0);
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+lduInterfaceField::~lduInterfaceField()
+{}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduInterfaceField/LduInterfaceField.H b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduInterfaceField/LduInterfaceField.H
new file mode 100644
index 0000000000..0cae1a925d
--- /dev/null
+++ b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduInterfaceField/LduInterfaceField.H
@@ -0,0 +1,149 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::LduInterfaceField
+
+Description
+    An abstract base class for implicitly-coupled interface fields
+    e.g. processor and cyclic patch fields.
+
+SourceFiles
+    LduInterfaceField.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef LduInterfaceField_H
+#define LduInterfaceField_H
+
+#include "lduInterface.H"
+#include "Field.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                     Class LduInterfaceField Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class Type>
+class LduInterfaceField
+{
+    // Private data
+
+        //- Reference to the coupled patch this field is defined for
+        const lduInterface& interface_;
+
+
+    // Private Member Functions
+
+        //- Disallow default bitwise copy construct
+        LduInterfaceField(const LduInterfaceField&);
+
+        //- Disallow default bitwise assignment
+        void operator=(const LduInterfaceField&);
+
+
+public:
+
+        class Amultiplier
+        {
+        public:
+
+            Amultiplier()
+            {}
+
+            virtual ~Amultiplier()
+            {}
+
+            virtual void addAmul
+            (
+                Field<Type>& Apsi,
+                const Field<Type>& psi
+            ) const = 0;
+        };
+
+
+    //- Runtime type information
+    TypeName("LduInterfaceField");
+
+
+    // Constructors
+
+        //- Construct given interface
+        LduInterfaceField(const lduInterface& interface)
+        :
+            interface_(interface)
+        {}
+
+
+    // Destructor
+
+        virtual ~LduInterfaceField();
+
+
+    // Member Functions
+
+        // Access
+
+            //- Return the interface
+            const lduInterface& interface() const
+            {
+                return interface_;
+            }
+
+
+        // Coupled interface matrix update
+
+            //- Initialise neighbour matrix update
+            virtual void initInterfaceMatrixUpdate
+            (
+                Field<Type>& Apsi,
+                const Field<Type>& psi,
+                const Amultiplier&,
+                const Pstream::commsTypes commsType
+            ) const
+            {}
+
+            //- Update result field based on interface functionality
+            virtual void updateInterfaceMatrix
+            (
+                Field<Type>& Apsi,
+                const Field<Type>& psi,
+                const Amultiplier&,
+                const Pstream::commsTypes commsType
+            ) const = 0;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduInterfaceField/LduInterfaceFieldPtrsList.H b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduInterfaceField/LduInterfaceFieldPtrsList.H
new file mode 100644
index 0000000000..b669a565d9
--- /dev/null
+++ b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduInterfaceField/LduInterfaceFieldPtrsList.H
@@ -0,0 +1,69 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Type
+    lduInterfaceFieldPtrsList
+
+Description
+    List of coupled interface fields to be used in coupling.
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef LduInterfaceFieldPtrsList_H
+#define LduInterfaceFieldPtrsList_H
+
+#include "LduInterfaceField.H"
+#include "UPtrList.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                   Class LduInterfaceFieldPtrsList Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class Type>
+class LduInterfaceFieldPtrsList
+:
+    public UPtrList<const LduInterfaceField<Type> >
+{
+public:
+
+    LduInterfaceFieldPtrsList(label size)
+    :
+        UPtrList<const LduInterfaceField<Type> >(size)
+    {}
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduInterfaceField/ProcessorLduInterfaceField.C b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduInterfaceField/ProcessorLduInterfaceField.C
new file mode 100644
index 0000000000..0bbe441612
--- /dev/null
+++ b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduInterfaceField/ProcessorLduInterfaceField.C
@@ -0,0 +1,66 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "processorLduInterfaceField.H"
+#include "diagTensorField.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    //defineTypeNameAndDebug(processorLduInterfaceField, 0);
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+template<class Type>
+Foam::processorLduInterfaceField<Type>::~processorLduInterfaceField()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class Type>
+void Foam::processorLduInterfaceField<Type>::transformCoupleField
+(
+    Field<Type>& f
+) const
+{
+    if (doTransform())
+    {
+        if (forwardT().size() == 1)
+        {
+            transform(f, forwardT()[0], f);
+        }
+        else
+        {
+            transform(f, forwardT(), f);
+        }
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduInterfaceField/ProcessorLduInterfaceField.H b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduInterfaceField/ProcessorLduInterfaceField.H
new file mode 100644
index 0000000000..f794de01d4
--- /dev/null
+++ b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduInterfaceField/ProcessorLduInterfaceField.H
@@ -0,0 +1,105 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::ProcessorLduInterfaceField
+
+Description
+    Abstract base class for processor coupled interfaces.
+
+SourceFiles
+    ProcessorLduInterfaceField.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef ProcessorLduInterfaceField_H
+#define ProcessorLduInterfaceField_H
+
+#include "primitiveFieldsFwd.H"
+#include "typeInfo.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                  Class ProcessorLduInterfaceField Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class Type>
+class ProcessorLduInterfaceField
+{
+
+public:
+
+    //- Runtime type information
+    TypeName("ProcessorLduInterfaceField");
+
+
+    // Constructors
+
+        //- Construct given coupled patch
+        ProcessorLduInterfaceField()
+        {}
+
+
+    // Destructor
+
+        virtual ~ProcessorLduInterfaceField();
+
+
+    // Member Functions
+
+        // Access
+
+            //- Return processor number
+            virtual int myProcNo() const = 0;
+
+            //- Return neigbour processor number
+            virtual int neighbProcNo() const = 0;
+
+            //- Is the transform required
+            virtual bool doTransform() const = 0;
+
+            //- Return face transformation tensor
+            virtual const tensorField& forwardT() const = 0;
+
+            //- Return rank of component for transform
+            virtual int rank() const = 0;
+
+
+        //- Transform given patch component field
+        void transformCoupleField(Field<Type>& f) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrix.C b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrix.C
new file mode 100644
index 0000000000..97b2b2f40e
--- /dev/null
+++ b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrix.C
@@ -0,0 +1,390 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "lduMatrix.H"
+#include "IOstreams.H"
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template<class Type, class DType, class LUType>
+Foam::LduMatrix<Type, DType, LUType>::LduMatrix(const lduMesh& mesh)
+:
+    lduMesh_(mesh),
+    diagPtr_(NULL),
+    upperPtr_(NULL),
+    lowerPtr_(NULL),
+    sourcePtr_(NULL),
+    interfaces_(0),
+    interfacesUpper_(0),
+    interfacesLower_(0)
+{}
+
+
+template<class Type, class DType, class LUType>
+Foam::LduMatrix<Type, DType, LUType>::LduMatrix(const LduMatrix& A)
+:
+    lduMesh_(A.lduMesh_),
+    diagPtr_(NULL),
+    upperPtr_(NULL),
+    lowerPtr_(NULL),
+    sourcePtr_(NULL),
+    interfaces_(0),
+    interfacesUpper_(0),
+    interfacesLower_(0)
+{
+    if (A.diagPtr_)
+    {
+        diagPtr_ = new Field<DType>(*(A.diagPtr_));
+    }
+
+    if (A.upperPtr_)
+    {
+        upperPtr_ = new Field<LUType>(*(A.upperPtr_));
+    }
+
+    if (A.lowerPtr_)
+    {
+        lowerPtr_ = new Field<LUType>(*(A.lowerPtr_));
+    }
+
+    if (A.sourcePtr_)
+    {
+        sourcePtr_ = new Field<Type>(*(A.sourcePtr_));
+    }
+}
+
+
+template<class Type, class DType, class LUType>
+Foam::LduMatrix<Type, DType, LUType>::LduMatrix(LduMatrix& A, bool reUse)
+:
+    lduMesh_(A.lduMesh_),
+    diagPtr_(NULL),
+    upperPtr_(NULL),
+    lowerPtr_(NULL),
+    sourcePtr_(NULL),
+    interfaces_(0),
+    interfacesUpper_(0),
+    interfacesLower_(0)
+{
+    if (reUse)
+    {
+        if (A.diagPtr_)
+        {
+            diagPtr_ = A.diagPtr_;
+            A.diagPtr_ = NULL;
+        }
+
+        if (A.upperPtr_)
+        {
+            upperPtr_ = A.upperPtr_;
+            A.upperPtr_ = NULL;
+        }
+
+        if (A.lowerPtr_)
+        {
+            lowerPtr_ = A.lowerPtr_;
+            A.lowerPtr_ = NULL;
+        }
+
+        if (A.sourcePtr_)
+        {
+            sourcePtr_ = A.sourcePtr_;
+            A.sourcePtr_ = NULL;
+        }
+    }
+    else
+    {
+        if (A.diagPtr_)
+        {
+            diagPtr_ = new Field<DType>(*(A.diagPtr_));
+        }
+
+        if (A.upperPtr_)
+        {
+            upperPtr_ = new Field<LUType>(*(A.upperPtr_));
+        }
+
+        if (A.lowerPtr_)
+        {
+            lowerPtr_ = new Field<LUType>(*(A.lowerPtr_));
+        }
+
+        if (A.sourcePtr_)
+        {
+            sourcePtr_ = new Field<Type>(*(A.sourcePtr_));
+        }
+    }
+}
+
+
+template<class Type, class DType, class LUType>
+Foam::LduMatrix<Type, DType, LUType>::LduMatrix
+(
+    const lduMesh& mesh,
+    Istream& is
+)
+:
+    lduMesh_(mesh),
+    diagPtr_(new Field<DType>(is)),
+    upperPtr_(new Field<LUType>(is)),
+    lowerPtr_(new Field<LUType>(is)),
+    sourcePtr_(new Field<Type>(is)),
+    interfaces_(0),
+    interfacesUpper_(0),
+    interfacesLower_(0)
+{}
+
+
+// * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * * //
+
+template<class Type, class DType, class LUType>
+Foam::LduMatrix<Type, DType, LUType>::~LduMatrix()
+{
+    if (diagPtr_)
+    {
+        delete diagPtr_;
+    }
+
+    if (upperPtr_)
+    {
+        delete upperPtr_;
+    }
+
+    if (lowerPtr_)
+    {
+        delete lowerPtr_;
+    }
+
+    if (sourcePtr_)
+    {
+        delete sourcePtr_;
+    }
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class Type, class DType, class LUType>
+Foam::Field<DType>& Foam::LduMatrix<Type, DType, LUType>::diag()
+{
+    if (!diagPtr_)
+    {
+        diagPtr_ = new Field<DType>(lduAddr().size(), pTraits<DType>::zero);
+    }
+
+    return *diagPtr_;
+}
+
+
+template<class Type, class DType, class LUType>
+Foam::Field<LUType>& Foam::LduMatrix<Type, DType, LUType>::upper()
+{
+    if (!upperPtr_)
+    {
+        if (lowerPtr_)
+        {
+            upperPtr_ = new Field<LUType>(*lowerPtr_);
+        }
+        else
+        {
+            upperPtr_ = new Field<LUType>
+            (
+                lduAddr().lowerAddr().size(),
+                pTraits<LUType>::zero
+            );
+        }
+    }
+
+    return *upperPtr_;
+}
+
+
+template<class Type, class DType, class LUType>
+Foam::Field<LUType>& Foam::LduMatrix<Type, DType, LUType>::lower()
+{
+    if (!lowerPtr_)
+    {
+        if (upperPtr_)
+        {
+            lowerPtr_ = new Field<LUType>(*upperPtr_);
+        }
+        else
+        {
+            lowerPtr_ = new Field<LUType>
+            (
+                lduAddr().lowerAddr().size(),
+                pTraits<LUType>::zero
+            );
+        }
+    }
+
+    return *lowerPtr_;
+}
+
+
+template<class Type, class DType, class LUType>
+Foam::Field<Type>& Foam::LduMatrix<Type, DType, LUType>::source()
+{
+    if (!sourcePtr_)
+    {
+        sourcePtr_ = new Field<Type>(lduAddr().size(), pTraits<Type>::zero);
+    }
+
+    return *sourcePtr_;
+}
+
+
+template<class Type, class DType, class LUType>
+const Foam::Field<DType>& Foam::LduMatrix<Type, DType, LUType>::diag() const
+{
+    if (!diagPtr_)
+    {
+        FatalErrorIn
+        (
+            "const Field<DType>& LduMatrix<Type, DType, LUType>::diag() const"
+        )   << "diagPtr_ unallocated"
+            << abort(FatalError);
+    }
+
+    return *diagPtr_;
+}
+
+
+template<class Type, class DType, class LUType>
+const Foam::Field<LUType>& Foam::LduMatrix<Type, DType, LUType>::upper() const
+{
+    if (!lowerPtr_ && !upperPtr_)
+    {
+        FatalErrorIn
+        (
+            "const Field<LUType>& LduMatrix<Type, DType, LUType>::upper() const"
+        )   << "lowerPtr_ or upperPtr_ unallocated"
+            << abort(FatalError);
+    }
+
+    if (upperPtr_)
+    {
+        return *upperPtr_;
+    }
+    else
+    {
+        return *lowerPtr_;
+    }
+}
+
+
+template<class Type, class DType, class LUType>
+const Foam::Field<LUType>& Foam::LduMatrix<Type, DType, LUType>::lower() const
+{
+    if (!lowerPtr_ && !upperPtr_)
+    {
+        FatalErrorIn
+        (
+            "const Field<LUType>& LduMatrix<Type, DType, LUType>::lower() const"
+        )   << "lowerPtr_ or upperPtr_ unallocated"
+            << abort(FatalError);
+    }
+
+    if (lowerPtr_)
+    {
+        return *lowerPtr_;
+    }
+    else
+    {
+        return *upperPtr_;
+    }
+}
+
+
+template<class Type, class DType, class LUType>
+const Foam::Field<Type>& Foam::LduMatrix<Type, DType, LUType>::source() const
+{
+    if (!sourcePtr_)
+    {
+        FatalErrorIn
+        (
+            "const Field<Type>& LduMatrix<Type, DType, LUType>::source() const"
+        )   << "sourcePtr_ unallocated"
+            << abort(FatalError);
+    }
+
+    return *sourcePtr_;
+}
+
+
+// * * * * * * * * * * * * * * * Friend Operators  * * * * * * * * * * * * * //
+
+template<class Type, class DType, class LUType>
+Foam::Ostream& Foam::operator<<
+(
+    Ostream& os,
+    const LduMatrix<Type, DType, LUType>& ldum
+)
+{
+    if (ldum.diagPtr_)
+    {
+        os  << "Diagonal = "
+            << *ldum.diagPtr_
+            << endl << endl;
+    }
+
+    if (ldum.upperPtr_)
+    {
+        os  << "Upper triangle = "
+            << *ldum.upperPtr_
+            << endl << endl;
+    }
+
+    if (ldum.lowerPtr_)
+    {
+        os  << "Lower triangle = "
+            << *ldum.lowerPtr_
+            << endl << endl;
+    }
+
+    if (ldum.sourcePtr_)
+    {
+        os  << "Source = "
+            << *ldum.sourcePtr_
+            << endl << endl;
+    }
+
+    os.check("Ostream& operator<<(Ostream&, const LduMatrix&");
+
+    return os;
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#include "LduMatrixOperations.C"
+#include "LduMatrixATmul.C"
+#include "LduMatrixUpdateMatrixInterfaces.C"
+#include "LduMatrixTests.C"
+#include "LduMatrixPreconditioner.C"
+#include "LduMatrixSmoother.C"
+#include "LduMatrixSolver.C"
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrix.H b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrix.H
new file mode 100644
index 0000000000..892e1a0ae5
--- /dev/null
+++ b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrix.H
@@ -0,0 +1,934 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::LduMatrix
+
+Description
+    LduMatrix is a general matrix class in which the coefficients are
+    stored as three arrays, one for the upper triangle, one for the
+    lower triangle and a third for the diagonal.
+
+    Addressing arrays must be supplied for the upper and lower triangles.
+
+Note
+    It might be better if this class were organised as a hierachy starting
+    from an empty matrix, then deriving diagonal, symmetric and asymmetric
+    matrices.
+
+SourceFiles
+    LduMatrixATmul.C
+    LduMatrix.C
+    LduMatrixOperations.C
+    LduMatrixSolver.C
+    LduMatrixPreconditioner.C
+    LduMatrixTests.C
+    LduMatrixUpdateMatrixInterfaces.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef LduMatrix_H
+#define LduMatrix_H
+
+#include "lduMesh.H"
+#include "Field.H"
+#include "FieldField.H"
+#include "LduInterfaceFieldPtrsList.H"
+#include "typeInfo.H"
+#include "autoPtr.H"
+#include "runTimeSelectionTables.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// Forward declaration of friend functions and operators
+
+template<class Type, class DType, class LUType>
+class LduMatrix;
+
+template<class Type, class DType, class LUType>
+Ostream& operator<<
+(
+    Ostream&,
+    const LduMatrix<Type, DType, LUType>&
+);
+
+
+/*---------------------------------------------------------------------------*\
+                           Class LduMatrix Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class Type, class DType, class LUType>
+class LduMatrix
+{
+    // private data
+
+        //- LDU mesh reference
+        const lduMesh& lduMesh_;
+
+        //- Diagonal coefficients
+        Field<DType> *diagPtr_;
+
+        //- Off-diagonal coefficients
+        Field<LUType> *upperPtr_, *lowerPtr_;
+
+        //- Source
+        Field<Type> *sourcePtr_;
+
+        //- Field interfaces (processor patches etc.)
+        LduInterfaceFieldPtrsList<Type> interfaces_;
+
+        //- Off-diagonal coefficients for interfaces
+        FieldField<Field, LUType> interfacesUpper_, interfacesLower_;
+
+
+public:
+
+    //- Class returned by the solver
+    //  containing performance statistics
+    class solverPerformance
+    {
+        word   solverName_;
+        word   fieldName_;
+        Type   initialResidual_;
+        Type   finalResidual_;
+        label  noIterations_;
+        bool   converged_;
+        FixedList<bool, pTraits<Type>::nComponents> singular_;
+
+
+    public:
+
+        // Constructors
+
+            solverPerformance()
+            :
+                initialResidual_(pTraits<Type>::zero),
+                finalResidual_(pTraits<Type>::zero),
+                noIterations_(0),
+                converged_(false),
+                singular_(false)
+            {}
+
+
+            solverPerformance
+            (
+                const word&  solverName,
+                const word&  fieldName,
+                const Type&  iRes = pTraits<Type>::zero,
+                const Type&  fRes = pTraits<Type>::zero,
+                const label  nIter = 0,
+                const bool   converged = false,
+                const bool   singular = false
+            )
+            :
+                solverName_(solverName),
+                fieldName_(fieldName),
+                initialResidual_(iRes),
+                finalResidual_(fRes),
+                noIterations_(nIter),
+                converged_(converged),
+                singular_(singular)
+            {}
+
+
+        // Member functions
+
+            //- Return solver name
+            const word& solverName() const
+            {
+                return solverName_;
+            }
+
+            //- Return initial residual
+            const Type& initialResidual() const
+            {
+                return initialResidual_;
+            }
+
+            //- Return initial residual
+            Type& initialResidual()
+            {
+                return initialResidual_;
+            }
+
+
+            //- Return final residual
+            const Type& finalResidual() const
+            {
+                return finalResidual_;
+            }
+
+            //- Return final residual
+            Type& finalResidual()
+            {
+                return finalResidual_;
+            }
+
+
+            //- Return number of iterations
+            label nIterations() const
+            {
+                return noIterations_;
+            }
+
+            //- Return number of iterations
+            label& nIterations()
+            {
+                return noIterations_;
+            }
+
+            //- Check, store and return singularity
+            bool singular(const Type& wApA);
+
+            //- Is the matrix singular?
+            bool singular() const;
+
+            //- Check, store and return convergence
+            bool converged
+            (
+                const Type& tolerance,
+                const Type& relTolerance
+            );
+
+            //- Has the solver converged?
+            bool converged() const
+            {
+                return converged_;
+            }
+
+            //- Print summary of solver performance to the given stream
+            void print(Ostream& os) const;
+    };
+
+
+    //- Abstract base-class for LduMatrix solvers
+    class solver
+    {
+    protected:
+
+        // Protected data
+
+            word fieldName_;
+            const LduMatrix<Type, DType, LUType>& matrix_;
+
+            //- dictionary of controls
+            dictionary controlDict_;
+
+            //- Maximum number of iterations in the solver
+            label maxIter_;
+
+            //- Final convergence tolerance
+            Type tolerance_;
+
+            //- Convergence tolerance relative to the initial
+            Type relTol_;
+
+
+        // Protected Member Functions
+
+            //- Read a control parameter from controlDict
+            template<class T>
+            inline void readControl
+            (
+                const dictionary& controlDict,
+                T& control,
+                const word& controlName
+            );
+
+
+            //- Read the control parameters from the controlDict_
+            virtual void readControls();
+
+
+    public:
+
+        //- Runtime type information
+        virtual const word& type() const = 0;
+
+
+        // Declare run-time constructor selection tables
+
+            declareRunTimeSelectionTable
+            (
+                autoPtr,
+                solver,
+                symMatrix,
+                (
+                    const word& fieldName,
+                    const LduMatrix<Type, DType, LUType>& matrix,
+                    const dictionary& solverDict
+                ),
+                (
+                    fieldName,
+                    matrix,
+                    solverDict
+                )
+            );
+
+            declareRunTimeSelectionTable
+            (
+                autoPtr,
+                solver,
+                asymMatrix,
+                (
+                    const word& fieldName,
+                    const LduMatrix<Type, DType, LUType>& matrix,
+                    const dictionary& solverDict
+                ),
+                (
+                    fieldName,
+                    matrix,
+                    solverDict
+                )
+            );
+
+
+        // Constructors
+
+            solver
+            (
+                const word& fieldName,
+                const LduMatrix<Type, DType, LUType>& matrix,
+                const dictionary& solverDict
+            );
+
+
+        // Selectors
+
+            //- Return a new solver
+            static autoPtr<solver> New
+            (
+                const word& fieldName,
+                const LduMatrix<Type, DType, LUType>& matrix,
+                const dictionary& solverDict
+            );
+
+
+        // Destructor
+
+            virtual ~solver()
+            {}
+
+
+        // Member functions
+
+            // Access
+
+                const word& fieldName() const
+                {
+                    return fieldName_;
+                }
+
+                const LduMatrix<Type, DType, LUType>& matrix() const
+                {
+                    return matrix_;
+                }
+
+
+            //- Read and reset the solver parameters from the given dictionary
+            virtual void read(const dictionary& solverDict);
+
+            virtual solverPerformance solve
+            (
+                Field<Type>& psi
+            ) const = 0;
+
+            //- Return the matrix norm used to normalise the residual for the
+            //  stopping criterion
+            Type normFactor
+            (
+                const Field<Type>& psi,
+                const Field<Type>& Apsi,
+                Field<Type>& tmpField
+            ) const;
+    };
+
+
+    //- Abstract base-class for LduMatrix smoothers
+    class smoother
+    {
+    protected:
+
+        // Protected data
+
+            word fieldName_;
+            const LduMatrix<Type, DType, LUType>& matrix_;
+
+
+    public:
+
+        //- Runtime type information
+        virtual const word& type() const = 0;
+
+
+        // Declare run-time constructor selection tables
+
+            declareRunTimeSelectionTable
+            (
+                autoPtr,
+                smoother,
+                symMatrix,
+                (
+                    const word& fieldName,
+                    const LduMatrix<Type, DType, LUType>& matrix
+                ),
+                (
+                    fieldName,
+                    matrix
+                )
+            );
+
+            declareRunTimeSelectionTable
+            (
+                autoPtr,
+                smoother,
+                asymMatrix,
+                (
+                    const word& fieldName,
+                    const LduMatrix<Type, DType, LUType>& matrix
+                ),
+                (
+                    fieldName,
+                    matrix
+                )
+            );
+
+
+        // Constructors
+
+            smoother
+            (
+                const word& fieldName,
+                const LduMatrix<Type, DType, LUType>& matrix
+            );
+
+
+        // Selectors
+
+            //- Return a new smoother
+            static autoPtr<smoother> New
+            (
+                const word& fieldName,
+                const LduMatrix<Type, DType, LUType>& matrix,
+                const dictionary& smootherDict
+            );
+
+
+        // Destructor
+
+            virtual ~smoother()
+            {}
+
+
+        // Member functions
+
+            // Access
+
+                const word& fieldName() const
+                {
+                    return fieldName_;
+                }
+
+                const LduMatrix<Type, DType, LUType>& matrix() const
+                {
+                    return matrix_;
+                }
+
+
+            //- Smooth the solution for a given number of sweeps
+            virtual void smooth
+            (
+                Field<Type>& psi,
+                const label nSweeps
+            ) const = 0;
+    };
+
+
+    //- Abstract base-class for LduMatrix preconditioners
+    class preconditioner
+    {
+    protected:
+
+        // Protected data
+
+            //- Reference to the base-solver this preconditioner is used with
+            const solver& solver_;
+
+
+    public:
+
+        //- Runtime type information
+        virtual const word& type() const = 0;
+
+
+        // Declare run-time constructor selection tables
+
+            declareRunTimeSelectionTable
+            (
+                autoPtr,
+                preconditioner,
+                symMatrix,
+                (
+                    const solver& sol,
+                    const dictionary& preconditionerDict
+                ),
+                (sol, preconditionerDict)
+            );
+
+            declareRunTimeSelectionTable
+            (
+                autoPtr,
+                preconditioner,
+                asymMatrix,
+                (
+                    const solver& sol,
+                    const dictionary& preconditionerDict
+                ),
+                (sol, preconditionerDict)
+            );
+
+
+        // Constructors
+
+            preconditioner
+            (
+                const solver& sol
+            )
+            :
+                solver_(sol)
+            {}
+
+
+        // Selectors
+
+            //- Return a new preconditioner
+            static autoPtr<preconditioner> New
+            (
+                const solver& sol,
+                const dictionary& preconditionerDict
+            );
+
+
+        // Destructor
+
+            virtual ~preconditioner()
+            {}
+
+
+        // Member functions
+
+            //- Read and reset the preconditioner parameters
+            //  from the given dictionary
+            virtual void read(const dictionary& preconditionerDict)
+            {}
+
+            //- Return wA the preconditioned form of residual rA
+            virtual void precondition
+            (
+                Field<Type>& wA,
+                const Field<Type>& rA
+            ) const = 0;
+
+            //- Return wT the transpose-matrix preconditioned form of
+            //  residual rT.
+            //  This is only required for preconditioning asymmetric matrices.
+            virtual void preconditionT
+            (
+                Field<Type>& wT,
+                const Field<Type>& rT
+            ) const
+            {
+                notImplemented
+                (
+                    type() +"::preconditionT"
+                    "(Field<Type>& wT, const Field<Type>& rT)"
+                );
+            }
+    };
+
+
+    // Static data
+
+        // Declare name of the class and its debug switch
+        ClassName("LduMatrix");
+
+        //- Large Type for the use in solvers
+        static const scalar great_;
+
+        //- Small Type for the use in solvers
+        static const scalar small_;
+
+        //- Very small Type for the use in solvers
+        static const scalar vsmall_;
+
+
+    // Constructors
+
+        //- Construct given an LDU addressed mesh.
+        //  The coefficients are initially empty for subsequent setting.
+        LduMatrix(const lduMesh&);
+
+        //- Construct as copy
+        LduMatrix(const LduMatrix<Type, DType, LUType>&);
+
+        //- Construct as copy or re-use as specified.
+        LduMatrix(LduMatrix<Type, DType, LUType>&, bool reUse);
+
+        //- Construct given an LDU addressed mesh and an Istream
+        //  from which the coefficients are read
+        LduMatrix(const lduMesh&, Istream&);
+
+
+    // Destructor
+
+        ~LduMatrix();
+
+
+    // Member functions
+
+        // Access to addressing
+
+            //- Return the LDU mesh from which the addressing is obtained
+            const lduMesh& mesh() const
+            {
+                return lduMesh_;
+            }
+
+            //- Return the LDU addressing
+            const lduAddressing& lduAddr() const
+            {
+                return lduMesh_.lduAddr();
+            }
+
+            //- Return the patch evaluation schedule
+            const lduSchedule& patchSchedule() const
+            {
+                return lduAddr().patchSchedule();
+            }
+
+            //- Return interfaces
+            const LduInterfaceFieldPtrsList<Type>& interfaces() const
+            {
+                return interfaces_;
+            }
+
+
+        // Access to coefficients
+
+            Field<DType>& diag();
+            Field<LUType>& upper();
+            Field<LUType>& lower();
+            Field<Type>& source();
+
+            FieldField<Field, LUType>& interfacesUpper()
+            {
+                return interfacesUpper_;
+            }
+
+            FieldField<Field, LUType>& interfacesLower()
+            {
+                return interfacesLower_;
+            }
+
+
+            const Field<DType>& diag() const;
+            const Field<LUType>& upper() const;
+            const Field<LUType>& lower() const;
+            const Field<Type>& source() const;
+
+            const FieldField<Field, LUType>& interfacesUpper() const
+            {
+                return interfacesUpper_;
+            }
+
+            const FieldField<Field, LUType>& interfacesLower() const
+            {
+                return interfacesLower_;
+            }
+
+
+            bool hasDiag() const
+            {
+                return (diagPtr_);
+            }
+
+            bool hasUpper() const
+            {
+                return (upperPtr_);
+            }
+
+            bool hasLower() const
+            {
+                return (lowerPtr_);
+            }
+
+            bool hasSource() const
+            {
+                return (sourcePtr_);
+            }
+
+            bool diagonal() const
+            {
+                return (diagPtr_ && !lowerPtr_ && !upperPtr_);
+            }
+
+            bool symmetric() const
+            {
+                return (diagPtr_ && (!lowerPtr_ && upperPtr_));
+            }
+
+            bool asymmetric() const
+            {
+                return (diagPtr_ && lowerPtr_ && upperPtr_);
+            }
+
+
+        // operations
+
+            void sumDiag();
+            void negSumDiag();
+
+            void sumMagOffDiag(Field<LUType>& sumOff) const;
+
+            //- Matrix multiplication
+            void Amul(Field<Type>&, const tmp<Field<Type> >&) const;
+
+            //- Matrix transpose multiplication
+            void Tmul(Field<Type>&, const tmp<Field<Type> >&) const;
+
+
+            //- Sum the coefficients on each row of the matrix
+            void sumA(Field<Type>&) const;
+
+
+            void residual(Field<Type>& rA, const Field<Type>& psi) const;
+
+            tmp<Field<Type> > residual(const Field<Type>& psi) const;
+
+
+            //- Initialise the update of interfaced interfaces
+            //  for matrix operations
+            void initMatrixInterfaces
+            (
+                const FieldField<Field, LUType>& interfaceCoeffs,
+                const Field<Type>& psiif,
+                Field<Type>& result
+            ) const;
+
+            //- Update interfaced interfaces for matrix operations
+            void updateMatrixInterfaces
+            (
+                const FieldField<Field, LUType>& interfaceCoeffs,
+                const Field<Type>& psiif,
+                Field<Type>& result
+            ) const;
+
+
+            tmp<Field<Type> > H(const Field<Type>&) const;
+            tmp<Field<Type> > H(const tmp<Field<Type> >&) const;
+
+            tmp<Field<Type> > faceH(const Field<Type>&) const;
+            tmp<Field<Type> > faceH(const tmp<Field<Type> >&) const;
+
+
+    // Member operators
+
+        void operator=(const LduMatrix<Type, DType, LUType>&);
+
+        void negate();
+
+        void operator+=(const LduMatrix<Type, DType, LUType>&);
+        void operator-=(const LduMatrix<Type, DType, LUType>&);
+
+        void operator*=(const scalarField&);
+        void operator*=(scalar);
+
+
+    // Ostream operator
+
+        friend Ostream& operator<< <Type, DType, LUType>
+        (
+            Ostream&,
+            const LduMatrix<Type, DType, LUType>&
+        );
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#define makeLduMatrix(Type, DType, LUType)                                    \
+                                                                              \
+typedef Foam::LduMatrix<Type, DType, LUType>                                  \
+    ldu##Type##DType##LUType##Matrix;                                         \
+                                                                              \
+defineNamedTemplateTypeNameAndDebug(ldu##Type##DType##LUType##Matrix, 0);     \
+                                                                              \
+                                                                              \
+template<>                                                                    \
+const scalar ldu##Type##DType##LUType##Matrix::great_(1e15);                  \
+                                                                              \
+template<>                                                                    \
+const scalar ldu##Type##DType##LUType##Matrix::small_(1e-15);                 \
+                                                                              \
+template<>                                                                    \
+const scalar ldu##Type##DType##LUType##Matrix::vsmall_(VSMALL);               \
+                                                                              \
+                                                                              \
+typedef LduMatrix<Type, DType, LUType>::smoother                              \
+    ldu##Type##DType##LUType##Smoother;                                       \
+                                                                              \
+defineTemplateRunTimeSelectionTable                                           \
+(                                                                             \
+    ldu##Type##DType##LUType##Smoother,                                       \
+    symMatrix                                                                 \
+);                                                                            \
+                                                                              \
+defineTemplateRunTimeSelectionTable                                           \
+(                                                                             \
+    ldu##Type##DType##LUType##Smoother,                                       \
+    asymMatrix                                                                \
+);                                                                            \
+                                                                              \
+                                                                              \
+typedef LduMatrix<Type, DType, LUType>::preconditioner                        \
+    ldu##Type##DType##LUType##Preconditioner;                                 \
+                                                                              \
+defineTemplateRunTimeSelectionTable                                           \
+(                                                                             \
+    ldu##Type##DType##LUType##Preconditioner,                                 \
+    symMatrix                                                                 \
+);                                                                            \
+                                                                              \
+defineTemplateRunTimeSelectionTable                                           \
+(                                                                             \
+    ldu##Type##DType##LUType##Preconditioner,                                 \
+    asymMatrix                                                                \
+);                                                                            \
+                                                                              \
+                                                                              \
+typedef LduMatrix<Type, DType, LUType>::solver                                \
+    ldu##Type##DType##LUType##Solver;                                         \
+                                                                              \
+defineTemplateRunTimeSelectionTable                                           \
+(                                                                             \
+    ldu##Type##DType##LUType##Solver,                                         \
+    symMatrix                                                                 \
+);                                                                            \
+                                                                              \
+defineTemplateRunTimeSelectionTable                                           \
+(                                                                             \
+    ldu##Type##DType##LUType##Solver,                                         \
+    asymMatrix                                                                \
+);
+
+
+#define makeLduPreconditioner(Precon, Type, DType, LUType)                    \
+                                                                              \
+typedef Precon<Type, DType, LUType>                                           \
+    Precon##Type##DType##LUType##Preconditioner;                              \
+defineNamedTemplateTypeNameAndDebug                                           \
+(                                                                             \
+    Precon##Type##DType##LUType##Preconditioner,                              \
+    0                                                                         \
+);
+
+#define makeLduSymPreconditioner(Precon, Type, DType, LUType)                 \
+                                                                              \
+LduMatrix<Type, DType, LUType>::preconditioner::                              \
+addsymMatrixConstructorToTable<Precon##Type##DType##LUType##Preconditioner>   \
+add##Precon##Type##DType##LUType##PreconditionerSymMatrixConstructorToTable_;
+
+#define makeLduAsymPreconditioner(Precon, Type, DType, LUType)                \
+                                                                              \
+LduMatrix<Type, DType, LUType>::preconditioner::                              \
+addasymMatrixConstructorToTable<Precon##Type##DType##LUType##Preconditioner>  \
+add##Precon##Type##DType##LUType##PreconditionerAsymMatrixConstructorToTable_;
+
+
+#define makeLduSmoother(Smoother, Type, DType, LUType)                        \
+                                                                              \
+typedef Smoother<Type, DType, LUType>                                         \
+    Smoother##Type##DType##LUType##Smoother;                                  \
+                                                                              \
+defineNamedTemplateTypeNameAndDebug                                           \
+(                                                                             \
+    Smoother##Type##DType##LUType##Smoother,                                  \
+    0                                                                         \
+);
+
+#define makeLduSymSmoother(Smoother, Type, DType, LUType)                     \
+                                                                              \
+LduMatrix<Type, DType, LUType>::smoother::                                    \
+    addsymMatrixConstructorToTable<Smoother##Type##DType##LUType##Smoother>   \
+    add##Smoother##Type##DType##LUType##SymMatrixConstructorToTable_;
+
+#define makeLduAsymSmoother(Smoother, Type, DType, LUType)                    \
+                                                                              \
+LduMatrix<Type, DType, LUType>::smoother::                                    \
+    addasymMatrixConstructorToTable<Smoother##Type##DType##LUType##Smoother>  \
+    add##Smoother##Type##DType##LUType##AsymMatrixConstructorToTable_;
+
+
+#define makeLduSolver(Solver, Type, DType, LUType)                            \
+                                                                              \
+typedef Solver<Type, DType, LUType>                                           \
+    Solver##Type##DType##LUType##Solver;                                      \
+                                                                              \
+defineNamedTemplateTypeNameAndDebug                                           \
+(                                                                             \
+    Solver##Type##DType##LUType##Solver,                                      \
+    0                                                                         \
+);
+
+#define makeLduSymSolver(Solver, Type, DType, LUType)                         \
+                                                                              \
+LduMatrix<Type, DType, LUType>::solver::                                      \
+    addsymMatrixConstructorToTable<Solver##Type##DType##LUType##Solver>       \
+    add##Solver##Type##DType##LUType##SymMatrixConstructorToTable_;
+
+#define makeLduAsymSolver(Solver, Type, DType, LUType)                        \
+                                                                              \
+LduMatrix<Type, DType, LUType>::solver::                                      \
+    addasymMatrixConstructorToTable<Solver##Type##DType##LUType##Solver>      \
+    add##Solver##Type##DType##LUType##AsymMatrixConstructorToTable_;
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+#   include "LduMatrixI.H"
+#   include "LduMatrix.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixATmul.C b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixATmul.C
new file mode 100644
index 0000000000..dc5b22e428
--- /dev/null
+++ b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixATmul.C
@@ -0,0 +1,293 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "LduMatrix.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+template<class Type, class LUType>
+class Amultiplier
+:
+    public LduInterfaceField<Type>::Amultiplier
+{
+    const Field<LUType>& A_;
+
+public:
+
+    Amultiplier(const Field<LUType>& A)
+    :
+        A_(A)
+    {}
+
+    virtual ~Amultiplier()
+    {}
+
+    virtual void addAmul(Field<Type>& Apsi, const Field<Type>& psi) const
+    {
+        Apsi += A_*psi;
+    }
+};
+
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+template<class Type, class DType, class LUType>
+void Foam::LduMatrix<Type, DType, LUType>::Amul
+(
+    Field<Type>& Apsi,
+    const tmp<Field<Type> >& tpsi
+) const
+{
+    Type* __restrict__ ApsiPtr = Apsi.begin();
+
+    const Field<Type>& psi = tpsi();
+    const Type* const __restrict__ psiPtr = psi.begin();
+
+    const DType* const __restrict__ diagPtr = diag().begin();
+
+    const label* const __restrict__ uPtr = lduAddr().upperAddr().begin();
+    const label* const __restrict__ lPtr = lduAddr().lowerAddr().begin();
+
+    const LUType* const __restrict__ upperPtr = upper().begin();
+    const LUType* const __restrict__ lowerPtr = lower().begin();
+
+    // Initialise the update of interfaced interfaces
+    initMatrixInterfaces
+    (
+        interfacesUpper_,
+        psi,
+        Apsi
+    );
+
+    register const label nCells = diag().size();
+    for (register label cell=0; cell<nCells; cell++)
+    {
+        ApsiPtr[cell] = dot(diagPtr[cell], psiPtr[cell]);
+    }
+
+
+    register const label nFaces = upper().size();
+    for (register label face=0; face<nFaces; face++)
+    {
+        ApsiPtr[uPtr[face]] += dot(lowerPtr[face], psiPtr[lPtr[face]]);
+        ApsiPtr[lPtr[face]] += dot(upperPtr[face], psiPtr[uPtr[face]]);
+    }
+
+    // Update interface interfaces
+    updateMatrixInterfaces
+    (
+        interfacesUpper_,
+        psi,
+        Apsi
+    );
+
+    tpsi.clear();
+}
+
+
+template<class Type, class DType, class LUType>
+void Foam::LduMatrix<Type, DType, LUType>::Tmul
+(
+    Field<Type>& Tpsi,
+    const tmp<Field<Type> >& tpsi
+) const
+{
+    Type* __restrict__ TpsiPtr = Tpsi.begin();
+
+    const Field<Type>& psi = tpsi();
+    const Type* const __restrict__ psiPtr = psi.begin();
+
+    const DType* const __restrict__ diagPtr = diag().begin();
+
+    const label* const __restrict__ uPtr = lduAddr().upperAddr().begin();
+    const label* const __restrict__ lPtr = lduAddr().lowerAddr().begin();
+
+    const LUType* const __restrict__ lowerPtr = lower().begin();
+    const LUType* const __restrict__ upperPtr = upper().begin();
+
+    // Initialise the update of interfaced interfaces
+    initMatrixInterfaces
+    (
+        interfacesLower_,
+        psi,
+        Tpsi
+    );
+
+    register const label nCells = diag().size();
+    for (register label cell=0; cell<nCells; cell++)
+    {
+        TpsiPtr[cell] = dot(diagPtr[cell], psiPtr[cell]);
+    }
+
+    register const label nFaces = upper().size();
+    for (register label face=0; face<nFaces; face++)
+    {
+        TpsiPtr[uPtr[face]] += dot(upperPtr[face], psiPtr[lPtr[face]]);
+        TpsiPtr[lPtr[face]] += dot(lowerPtr[face], psiPtr[uPtr[face]]);
+    }
+
+    // Update interface interfaces
+    updateMatrixInterfaces
+    (
+        interfacesLower_,
+        psi,
+        Tpsi
+    );
+
+    tpsi.clear();
+}
+
+
+template<class Type, class DType, class LUType>
+void Foam::LduMatrix<Type, DType, LUType>::sumA
+(
+    Field<Type>& sumA
+) const
+{
+    Type* __restrict__ sumAPtr = sumA.begin();
+
+    const DType* __restrict__ diagPtr = diag().begin();
+
+    const label* __restrict__ uPtr = lduAddr().upperAddr().begin();
+    const label* __restrict__ lPtr = lduAddr().lowerAddr().begin();
+
+    const LUType* __restrict__ lowerPtr = lower().begin();
+    const LUType* __restrict__ upperPtr = upper().begin();
+
+    register const label nCells = diag().size();
+    register const label nFaces = upper().size();
+
+    for (register label cell=0; cell<nCells; cell++)
+    {
+        sumAPtr[cell] = dot(diagPtr[cell], pTraits<Type>::one);
+    }
+
+    for (register label face=0; face<nFaces; face++)
+    {
+        sumAPtr[uPtr[face]] += dot(lowerPtr[face], pTraits<Type>::one);
+        sumAPtr[lPtr[face]] += dot(upperPtr[face], pTraits<Type>::one);
+    }
+
+    // Add the interface internal coefficients to diagonal
+    // and the interface boundary coefficients to the sum-off-diagonal
+    forAll(interfaces_, patchI)
+    {
+        if (interfaces_.set(patchI))
+        {
+            const unallocLabelList& pa = lduAddr().patchAddr(patchI);
+            const Field<LUType>& pCoeffs = interfacesUpper_[patchI];
+
+            forAll(pa, face)
+            {
+                sumAPtr[pa[face]] -= dot(pCoeffs[face], pTraits<Type>::one);
+            }
+        }
+    }
+}
+
+
+template<class Type, class DType, class LUType>
+void Foam::LduMatrix<Type, DType, LUType>::residual
+(
+    Field<Type>& rA,
+    const Field<Type>& psi
+) const
+{
+    Type* __restrict__ rAPtr = rA.begin();
+
+    const Type* const __restrict__ psiPtr = psi.begin();
+    const DType* const __restrict__ diagPtr = diag().begin();
+    const Type* const __restrict__ sourcePtr = source().begin();
+
+    const label* const __restrict__ uPtr = lduAddr().upperAddr().begin();
+    const label* const __restrict__ lPtr = lduAddr().lowerAddr().begin();
+
+    const LUType* const __restrict__ upperPtr = upper().begin();
+    const LUType* const __restrict__ lowerPtr = lower().begin();
+
+    // Parallel boundary initialisation.
+    // Note: there is a change of sign in the coupled
+    // interface update to add the contibution to the r.h.s.
+
+    FieldField<Field, LUType> mBouCoeffs(interfacesUpper_.size());
+
+    forAll(mBouCoeffs, patchi)
+    {
+        if (interfaces_.set(patchi))
+        {
+            mBouCoeffs.set(patchi, -interfacesUpper_[patchi]);
+        }
+    }
+
+    // Initialise the update of interfaced interfaces
+    initMatrixInterfaces
+    (
+        mBouCoeffs,
+        psi,
+        rA
+    );
+
+    register const label nCells = diag().size();
+    for (register label cell=0; cell<nCells; cell++)
+    {
+        rAPtr[cell] = sourcePtr[cell] - dot(diagPtr[cell], psiPtr[cell]);
+    }
+
+
+    register const label nFaces = upper().size();
+    for (register label face=0; face<nFaces; face++)
+    {
+        rAPtr[uPtr[face]] -= dot(lowerPtr[face], psiPtr[lPtr[face]]);
+        rAPtr[lPtr[face]] -= dot(upperPtr[face], psiPtr[uPtr[face]]);
+    }
+
+    // Update interface interfaces
+    updateMatrixInterfaces
+    (
+        mBouCoeffs,
+        psi,
+        rA
+    );
+}
+
+
+template<class Type, class DType, class LUType>
+Foam::tmp<Foam::Field<Type> > Foam::LduMatrix<Type, DType, LUType>::residual
+(
+    const Field<Type>& psi
+) const
+{
+    tmp<Field<Type> > trA(new Field<Type>(psi.size()));
+    residual(trA(), psi);
+    return trA;
+}
+
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixI.H b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixI.H
new file mode 100644
index 0000000000..f1ab9e773c
--- /dev/null
+++ b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixI.H
@@ -0,0 +1,44 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class Type, class DType, class LUType>
+template<class T>
+inline void Foam::LduMatrix<Type, DType, LUType>::solver::readControl
+(
+    const dictionary& controlDict,
+    T& control,
+    const word& controlName
+)
+{
+    if (controlDict.found(controlName))
+    {
+        controlDict.lookup(controlName) >> control;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixOperations.C b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixOperations.C
new file mode 100644
index 0000000000..d35c0c12d4
--- /dev/null
+++ b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixOperations.C
@@ -0,0 +1,480 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "lduMatrix.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+template<class Type, class DType, class LUType>
+void Foam::LduMatrix<Type, DType, LUType>::sumDiag()
+{
+    const Field<LUType>& Lower = const_cast<const LduMatrix&>(*this).lower();
+    const Field<LUType>& Upper = const_cast<const LduMatrix&>(*this).upper();
+    Field<DType>& Diag = diag();
+
+    const unallocLabelList& l = lduAddr().lowerAddr();
+    const unallocLabelList& u = lduAddr().upperAddr();
+
+    for (register label face=0; face<l.size(); face++)
+    {
+        Diag[l[face]] += Lower[face];
+        Diag[u[face]] += Upper[face];
+    }
+}
+
+
+template<class Type, class DType, class LUType>
+void Foam::LduMatrix<Type, DType, LUType>::negSumDiag()
+{
+    const Field<LUType>& Lower = const_cast<const LduMatrix&>(*this).lower();
+    const Field<LUType>& Upper = const_cast<const LduMatrix&>(*this).upper();
+    Field<DType>& Diag = diag();
+
+    const unallocLabelList& l = lduAddr().lowerAddr();
+    const unallocLabelList& u = lduAddr().upperAddr();
+
+    for (register label face=0; face<l.size(); face++)
+    {
+        Diag[l[face]] -= Lower[face];
+        Diag[u[face]] -= Upper[face];
+    }
+}
+
+
+template<class Type, class DType, class LUType>
+void Foam::LduMatrix<Type, DType, LUType>::sumMagOffDiag
+(
+    Field<LUType>& sumOff
+) const
+{
+    const Field<LUType>& Lower = const_cast<const LduMatrix&>(*this).lower();
+    const Field<LUType>& Upper = const_cast<const LduMatrix&>(*this).upper();
+
+    const unallocLabelList& l = lduAddr().lowerAddr();
+    const unallocLabelList& u = lduAddr().upperAddr();
+
+    for (register label face = 0; face < l.size(); face++)
+    {
+        sumOff[u[face]] += cmptMag(Lower[face]);
+        sumOff[l[face]] += cmptMag(Upper[face]);
+    }
+}
+
+
+template<class Type, class DType, class LUType>
+Foam::tmp<Foam::Field<Type> >
+Foam::LduMatrix<Type, DType, LUType>::H(const Field<Type>& psi) const
+{
+    tmp<Field<Type> > tHpsi
+    (
+        new Field<Type>(lduAddr().size(), pTraits<Type>::zero)
+    );
+
+    if (lowerPtr_ || upperPtr_)
+    {
+        Field<Type> & Hpsi = tHpsi();
+
+        Type* __restrict__ HpsiPtr = Hpsi.begin();
+
+        const Type* __restrict__ psiPtr = psi.begin();
+
+        const label* __restrict__ uPtr = lduAddr().upperAddr().begin();
+        const label* __restrict__ lPtr = lduAddr().lowerAddr().begin();
+
+        const LUType* __restrict__ lowerPtr = lower().begin();
+        const LUType* __restrict__ upperPtr = upper().begin();
+
+        register const label nFaces = upper().size();
+
+        for (register label face=0; face<nFaces; face++)
+        {
+            HpsiPtr[uPtr[face]] -= lowerPtr[face]*psiPtr[lPtr[face]];
+            HpsiPtr[lPtr[face]] -= upperPtr[face]*psiPtr[uPtr[face]];
+        }
+    }
+
+    return tHpsi;
+}
+
+template<class Type, class DType, class LUType>
+Foam::tmp<Foam::Field<Type> >
+Foam::LduMatrix<Type, DType, LUType>::H(const tmp<Field<Type> >& tpsi) const
+{
+    tmp<Field<Type> > tHpsi(H(tpsi()));
+    tpsi.clear();
+    return tHpsi;
+}
+
+
+template<class Type, class DType, class LUType>
+Foam::tmp<Foam::Field<Type> >
+Foam::LduMatrix<Type, DType, LUType>::faceH(const Field<Type>& psi) const
+{
+    const Field<LUType>& Lower = const_cast<const LduMatrix&>(*this).lower();
+    const Field<LUType>& Upper = const_cast<const LduMatrix&>(*this).upper();
+
+    // Take refereces to addressing
+    const unallocLabelList& l = lduAddr().lowerAddr();
+    const unallocLabelList& u = lduAddr().upperAddr();
+
+    tmp<Field<Type> > tfaceHpsi(new Field<Type> (Lower.size()));
+    Field<Type> & faceHpsi = tfaceHpsi();
+
+    for (register label face=0; face<l.size(); face++)
+    {
+        faceHpsi[face] = Upper[face]*psi[u[face]] - Lower[face]*psi[l[face]];
+    }
+
+    return tfaceHpsi;
+}
+
+
+template<class Type, class DType, class LUType>
+Foam::tmp<Foam::Field<Type> >
+Foam::LduMatrix<Type, DType, LUType>::faceH(const tmp<Field<Type> >& tpsi) const
+{
+    tmp<Field<Type> > tfaceHpsi(faceH(tpsi()));
+    tpsi.clear();
+    return tfaceHpsi;
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+template<class Type, class DType, class LUType>
+void Foam::LduMatrix<Type, DType, LUType>::operator=(const LduMatrix& A)
+{
+    if (this == &A)
+    {
+        FatalErrorIn
+        (
+            "LduMatrix<Type, DType, LUType>::operator=(const LduMatrix&)"
+        )   << "attempted assignment to self"
+            << abort(FatalError);
+    }
+
+    if (A.diagPtr_)
+    {
+        diag() = A.diag();
+    }
+
+    if (A.upperPtr_)
+    {
+        upper() = A.upper();
+    }
+    else if (upperPtr_)
+    {
+        delete upperPtr_;
+        upperPtr_ = NULL;
+    }
+
+    if (A.lowerPtr_)
+    {
+        lower() = A.lower();
+    }
+    else if (lowerPtr_)
+    {
+        delete lowerPtr_;
+        lowerPtr_ = NULL;
+    }
+
+    if (A.sourcePtr_)
+    {
+        source() = A.source();
+    }
+
+    interfacesUpper_ = A.interfacesUpper_;
+    interfacesLower_ = A.interfacesLower_;
+}
+
+
+template<class Type, class DType, class LUType>
+void Foam::LduMatrix<Type, DType, LUType>::negate()
+{
+    if (diagPtr_)
+    {
+        diagPtr_->negate();
+    }
+
+    if (upperPtr_)
+    {
+        upperPtr_->negate();
+    }
+
+    if (lowerPtr_)
+    {
+        lowerPtr_->negate();
+    }
+
+    if (sourcePtr_)
+    {
+        sourcePtr_->negate();
+    }
+
+    negate(interfacesUpper_);
+    negate(interfacesLower_);
+}
+
+
+template<class Type, class DType, class LUType>
+void Foam::LduMatrix<Type, DType, LUType>::operator+=(const LduMatrix& A)
+{
+    if (A.diagPtr_)
+    {
+        diag() += A.diag();
+    }
+
+    if (A.sourcePtr_)
+    {
+        source() += A.source();
+    }
+
+    if (symmetric() && A.symmetric())
+    {
+        upper() += A.upper();
+    }
+    else if (symmetric() && A.asymmetric())
+    {
+        if (upperPtr_)
+        {
+            lower();
+        }
+        else
+        {
+            upper();
+        }
+
+        upper() += A.upper();
+        lower() += A.lower();
+    }
+    else if (asymmetric() && A.symmetric())
+    {
+        if (A.upperPtr_)
+        {
+            lower() += A.upper();
+            upper() += A.upper();
+        }
+        else
+        {
+            lower() += A.lower();
+            upper() += A.lower();
+        }
+
+    }
+    else if (asymmetric() && A.asymmetric())
+    {
+        lower() += A.lower();
+        upper() += A.upper();
+    }
+    else if (diagonal())
+    {
+        if (A.upperPtr_)
+        {
+            upper() = A.upper();
+        }
+
+        if (A.lowerPtr_)
+        {
+            lower() = A.lower();
+        }
+    }
+    else if (A.diagonal())
+    {
+    }
+    else
+    {
+        FatalErrorIn
+        (
+            "LduMatrix<Type, DType, LUType>::operator+=(const LduMatrix& A)"
+        )   << "Unknown matrix type combination"
+            << abort(FatalError);
+    }
+
+    interfacesUpper_ += A.interfacesUpper_;
+    interfacesLower_ += A.interfacesLower_;
+}
+
+
+template<class Type, class DType, class LUType>
+void Foam::LduMatrix<Type, DType, LUType>::operator-=(const LduMatrix& A)
+{
+    if (A.diagPtr_)
+    {
+        diag() -= A.diag();
+    }
+
+    if (A.sourcePtr_)
+    {
+        source() -= A.source();
+    }
+
+    if (symmetric() && A.symmetric())
+    {
+        upper() -= A.upper();
+    }
+    else if (symmetric() && A.asymmetric())
+    {
+        if (upperPtr_)
+        {
+            lower();
+        }
+        else
+        {
+            upper();
+        }
+
+        upper() -= A.upper();
+        lower() -= A.lower();
+    }
+    else if (asymmetric() && A.symmetric())
+    {
+        if (A.upperPtr_)
+        {
+            lower() -= A.upper();
+            upper() -= A.upper();
+        }
+        else
+        {
+            lower() -= A.lower();
+            upper() -= A.lower();
+        }
+
+    }
+    else if (asymmetric() && A.asymmetric())
+    {
+        lower() -= A.lower();
+        upper() -= A.upper();
+    }
+    else if (diagonal())
+    {
+        if (A.upperPtr_)
+        {
+            upper() = -A.upper();
+        }
+
+        if (A.lowerPtr_)
+        {
+            lower() = -A.lower();
+        }
+    }
+    else if (A.diagonal())
+    {
+    }
+    else
+    {
+        FatalErrorIn
+        (
+            "LduMatrix<Type, DType, LUType>::operator-=(const LduMatrix& A)"
+        )   << "Unknown matrix type combination"
+            << abort(FatalError);
+    }
+
+    interfacesUpper_ -= A.interfacesUpper_;
+    interfacesLower_ -= A.interfacesLower_;
+}
+
+
+template<class Type, class DType, class LUType>
+void Foam::LduMatrix<Type, DType, LUType>::operator*=
+(
+    const scalarField& sf
+)
+{
+    if (diagPtr_)
+    {
+        *diagPtr_ *= sf;
+    }
+
+    if (sourcePtr_)
+    {
+        *sourcePtr_ *= sf;
+    }
+
+    if (upperPtr_)
+    {
+        Field<LUType>& upper = *upperPtr_;
+
+        const unallocLabelList& l = lduAddr().lowerAddr();
+
+        for (register label face=0; face<upper.size(); face++)
+        {
+            upper[face] *= sf[l[face]];
+        }
+    }
+
+    if (lowerPtr_)
+    {
+        Field<LUType>& lower = *lowerPtr_;
+
+        const unallocLabelList& u = lduAddr().upperAddr();
+
+        for (register label face=0; face<lower.size(); face++)
+        {
+            lower[face] *= sf[u[face]];
+        }
+    }
+
+    FatalErrorIn
+    (
+        "LduMatrix<Type, DType, LUType>::operator*=(const scalarField& sf)"
+    )   << "Scaling a matrix by scalarField is not currently supported\n"
+           "because scaling interfacesUpper_ and interfacesLower_ "
+           "require special transfers"
+        << abort(FatalError);
+
+    //interfacesUpper_ *= ;
+    //interfacesLower_ *= sf;
+}
+
+
+template<class Type, class DType, class LUType>
+void Foam::LduMatrix<Type, DType, LUType>::operator*=(scalar s)
+{
+    if (diagPtr_)
+    {
+        *diagPtr_ *= s;
+    }
+
+    if (sourcePtr_)
+    {
+        *sourcePtr_ *= s;
+    }
+
+    if (upperPtr_)
+    {
+        *upperPtr_ *= s;
+    }
+
+    if (lowerPtr_)
+    {
+        *lowerPtr_ *= s;
+    }
+
+    interfacesUpper_ *= s;
+    interfacesLower_ *= s;
+}
+
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixPreconditioner.C b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixPreconditioner.C
new file mode 100644
index 0000000000..230eb0d2b6
--- /dev/null
+++ b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixPreconditioner.C
@@ -0,0 +1,115 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "LduMatrix.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+template<class Type, class DType, class LUType>
+Foam::autoPtr<typename Foam::LduMatrix<Type, DType, LUType>::preconditioner>
+Foam::LduMatrix<Type, DType, LUType>::preconditioner::New
+(
+    const solver& sol,
+    const dictionary& preconditionerDict
+)
+{
+    word preconditionerName = preconditionerDict.lookup("preconditioner");
+
+    if (sol.matrix().symmetric())
+    {
+        typename symMatrixConstructorTable::iterator constructorIter =
+            symMatrixConstructorTablePtr_->find(preconditionerName);
+
+        if (constructorIter == symMatrixConstructorTablePtr_->end())
+        {
+            FatalIOErrorIn
+            (
+                "LduMatrix<Type, DType, LUType>::preconditioner::New"
+                "(const solver&, Istream&)",
+                preconditionerDict
+            )   << "Unknown symmetric matrix preconditioner "
+                << preconditionerName << endl << endl
+                << "Valid symmetric matrix preconditioners are :" << endl
+                << symMatrixConstructorTablePtr_->toc()
+                << exit(FatalIOError);
+        }
+
+        return autoPtr<typename LduMatrix<Type, DType, LUType>::preconditioner>
+        (
+            constructorIter()
+            (
+                sol,
+                preconditionerDict
+            )
+        );
+    }
+    else if (sol.matrix().asymmetric())
+    {
+        typename asymMatrixConstructorTable::iterator constructorIter =
+            asymMatrixConstructorTablePtr_->find(preconditionerName);
+
+        if (constructorIter == asymMatrixConstructorTablePtr_->end())
+        {
+            FatalIOErrorIn
+            (
+                "LduMatrix<Type, DType, LUType>::preconditioner::New"
+                "(const solver&, Istream&)",
+                preconditionerDict
+            )   << "Unknown asymmetric matrix preconditioner "
+                << preconditionerName << endl << endl
+                << "Valid asymmetric matrix preconditioners are :" << endl
+                << asymMatrixConstructorTablePtr_->toc()
+                << exit(FatalIOError);
+        }
+
+        return autoPtr<typename LduMatrix<Type, DType, LUType>::preconditioner>
+        (
+            constructorIter()
+            (
+                sol,
+                preconditionerDict
+            )
+        );
+    }
+    else
+    {
+        FatalIOErrorIn
+        (
+            "LduMatrix<Type, DType, LUType>::preconditioner::New"
+            "(const solver&, Istream&)",
+            preconditionerDict
+        )   << "cannot preconditione incomplete matrix, "
+               "no diagonal or off-diagonal coefficient"
+            << exit(FatalIOError);
+
+        return autoPtr<typename LduMatrix<Type, DType, LUType>::preconditioner>
+        (
+            NULL
+        );
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixSmoother.C b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixSmoother.C
new file mode 100644
index 0000000000..4377f6da94
--- /dev/null
+++ b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixSmoother.C
@@ -0,0 +1,120 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "LduMatrix.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+template<class Type, class DType, class LUType>
+Foam::autoPtr<typename Foam::LduMatrix<Type, DType, LUType>::smoother>
+Foam::LduMatrix<Type, DType, LUType>::smoother::New
+(
+    const word& fieldName,
+    const LduMatrix<Type, DType, LUType>& matrix,
+    const dictionary& smootherDict
+)
+{
+    word smootherName = smootherDict.lookup("smoother");
+
+    if (matrix.symmetric())
+    {
+        typename symMatrixConstructorTable::iterator constructorIter =
+            symMatrixConstructorTablePtr_->find(smootherName);
+
+        if (constructorIter == symMatrixConstructorTablePtr_->end())
+        {
+            FatalIOErrorIn
+            (
+                "LduMatrix<Type, DType, LUType>::smoother::New", smootherDict
+            )   << "Unknown symmetric matrix smoother " << smootherName
+                << endl << endl
+                << "Valid symmetric matrix smoothers are :" << endl
+                << symMatrixConstructorTablePtr_->toc()
+                << exit(FatalIOError);
+        }
+
+        return autoPtr<typename LduMatrix<Type, DType, LUType>::smoother>
+        (
+            constructorIter()
+            (
+                fieldName,
+                matrix
+            )
+        );
+    }
+    else if (matrix.asymmetric())
+    {
+        typename asymMatrixConstructorTable::iterator constructorIter =
+            asymMatrixConstructorTablePtr_->find(smootherName);
+
+        if (constructorIter == asymMatrixConstructorTablePtr_->end())
+        {
+            FatalIOErrorIn
+            (
+                "LduMatrix<Type, DType, LUType>::smoother::New", smootherDict
+            )   << "Unknown asymmetric matrix smoother " << smootherName
+                << endl << endl
+                << "Valid asymmetric matrix smoothers are :" << endl
+                << asymMatrixConstructorTablePtr_->toc()
+                << exit(FatalIOError);
+        }
+
+        return autoPtr<typename LduMatrix<Type, DType, LUType>::smoother>
+        (
+            constructorIter()
+            (
+                fieldName,
+                matrix
+            )
+        );
+    }
+    else
+    {
+        FatalIOErrorIn
+        (
+            "LduMatrix<Type, DType, LUType>::smoother::New", smootherDict
+        )   << "cannot solve incomplete matrix, no off-diagonal coefficients"
+            << exit(FatalIOError);
+
+        return autoPtr<typename LduMatrix<Type, DType, LUType>::smoother>(NULL);
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template<class Type, class DType, class LUType>
+Foam::LduMatrix<Type, DType, LUType>::smoother::smoother
+(
+    const word& fieldName,
+    const LduMatrix<Type, DType, LUType>& matrix
+)
+:
+    fieldName_(fieldName),
+    matrix_(matrix)
+{}
+
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixSolver.C b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixSolver.C
new file mode 100644
index 0000000000..c31af469f1
--- /dev/null
+++ b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixSolver.C
@@ -0,0 +1,190 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "LduMatrix.H"
+#include "DiagonalSolver.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+template<class Type, class DType, class LUType>
+Foam::autoPtr<typename Foam::LduMatrix<Type, DType, LUType>::solver>
+Foam::LduMatrix<Type, DType, LUType>::solver::New
+(
+    const word& fieldName,
+    const LduMatrix<Type, DType, LUType>& matrix,
+    const dictionary& solverDict
+)
+{
+    word solverName = solverDict.lookup("solver");
+
+    if (matrix.diagonal())
+    {
+        return autoPtr<typename LduMatrix<Type, DType, LUType>::solver>
+        (
+            new DiagonalSolver<Type, DType, LUType>
+            (
+                fieldName,
+                matrix,
+                solverDict
+            )
+        );
+    }
+    else if (matrix.symmetric())
+    {
+        typename symMatrixConstructorTable::iterator constructorIter =
+            symMatrixConstructorTablePtr_->find(solverName);
+
+        if (constructorIter == symMatrixConstructorTablePtr_->end())
+        {
+            FatalIOErrorIn
+            (
+                "LduMatrix<Type, DType, LUType>::solver::New", solverDict
+            )   << "Unknown symmetric matrix solver " << solverName
+                << endl << endl
+                << "Valid symmetric matrix solvers are :" << endl
+                << symMatrixConstructorTablePtr_->toc()
+                << exit(FatalIOError);
+        }
+
+        return autoPtr<typename LduMatrix<Type, DType, LUType>::solver>
+        (
+            constructorIter()
+            (
+                fieldName,
+                matrix,
+                solverDict
+            )
+        );
+    }
+    else if (matrix.asymmetric())
+    {
+        typename asymMatrixConstructorTable::iterator constructorIter =
+            asymMatrixConstructorTablePtr_->find(solverName);
+
+        if (constructorIter == asymMatrixConstructorTablePtr_->end())
+        {
+            FatalIOErrorIn
+            (
+                "LduMatrix<Type, DType, LUType>::solver::New", solverDict
+            )   << "Unknown asymmetric matrix solver " << solverName
+                << endl << endl
+                << "Valid asymmetric matrix solvers are :" << endl
+                << asymMatrixConstructorTablePtr_->toc()
+                << exit(FatalIOError);
+        }
+
+        return autoPtr<typename LduMatrix<Type, DType, LUType>::solver>
+        (
+            constructorIter()
+            (
+                fieldName,
+                matrix,
+                solverDict
+            )
+        );
+    }
+    else
+    {
+        FatalIOErrorIn
+        (
+            "LduMatrix<Type, DType, LUType>::solver::New", solverDict
+        )   << "cannot solve incomplete matrix, "
+               "no diagonal or off-diagonal coefficient"
+            << exit(FatalIOError);
+
+        return autoPtr<typename LduMatrix<Type, DType, LUType>::solver>(NULL);
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template<class Type, class DType, class LUType>
+Foam::LduMatrix<Type, DType, LUType>::solver::solver
+(
+    const word& fieldName,
+    const LduMatrix<Type, DType, LUType>& matrix,
+    const dictionary& solverDict
+)
+:
+    fieldName_(fieldName),
+    matrix_(matrix),
+
+    controlDict_(solverDict),
+
+    maxIter_(1000),
+    tolerance_(1e-6*pTraits<Type>::one),
+    relTol_(pTraits<Type>::zero)
+{
+    readControls();
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class Type, class DType, class LUType>
+void Foam::LduMatrix<Type, DType, LUType>::solver::readControls()
+{
+    readControl(controlDict_, maxIter_, "maxIter");
+    readControl(controlDict_, tolerance_, "tolerance");
+    readControl(controlDict_, relTol_, "relTol");
+}
+
+
+template<class Type, class DType, class LUType>
+void Foam::LduMatrix<Type, DType, LUType>::solver::read
+(
+    const dictionary& solverDict
+)
+{
+    controlDict_ = solverDict;
+    readControls();
+}
+
+
+template<class Type, class DType, class LUType>
+Type Foam::LduMatrix<Type, DType, LUType>::solver::normFactor
+(
+    const Field<Type>& psi,
+    const Field<Type>& Apsi,
+    Field<Type>& tmpField
+) const
+{
+    // --- Calculate A dot reference value of psi
+    matrix_.sumA(tmpField);
+    cmptMultiply(tmpField, tmpField, gAverage(psi));
+
+    return stabilise
+    (
+        gSum(cmptMag(Apsi - tmpField) + cmptMag(matrix_.source() - tmpField)),
+        matrix_.small_
+    );
+
+    // At convergence this simpler method is equivalent to the above
+    // return stabilise(2*gSumCmptMag(matrix_.source()), matrix_.small_);
+}
+
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixTests.C b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixTests.C
new file mode 100644
index 0000000000..c4dd85fd0e
--- /dev/null
+++ b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixTests.C
@@ -0,0 +1,118 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "LduMatrix.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+template<class Type, class DType, class LUType>
+bool Foam::LduMatrix<Type, DType, LUType>::solverPerformance::singular
+(
+    const Type& wApA
+)
+{
+    for(direction cmpt=0; cmpt<pTraits<Type>::nComponents; cmpt++)
+    {
+        singular_[cmpt] = component(wApA, cmpt) < vsmall_;
+    }
+
+    return singular();
+}
+
+
+template<class Type, class DType, class LUType>
+bool Foam::LduMatrix<Type, DType, LUType>::solverPerformance::singular() const
+{
+    for(direction cmpt=0; cmpt<pTraits<Type>::nComponents; cmpt++)
+    {
+        if (!singular_[cmpt]) return false;
+    }
+
+    return true;
+}
+
+
+template<class Type, class DType, class LUType>
+bool Foam::LduMatrix<Type, DType, LUType>::solverPerformance::converged
+(
+    const Type& Tolerance,
+    const Type& RelTolerance
+)
+{
+    if (debug >= 2)
+    {
+        Info<< solverName_
+            << ":  Iteration " << noIterations_
+            << " residual = " << finalResidual_
+            << endl;
+    }
+
+    if
+    (
+        finalResidual_ < Tolerance
+     || (
+            RelTolerance > small_*pTraits<Type>::one
+         && finalResidual_ < cmptMultiply(RelTolerance, initialResidual_)
+        )
+    )
+    {
+        converged_ = true;
+    }
+    else
+    {
+        converged_ = false;
+    }
+
+    return converged_;
+}
+
+
+template<class Type, class DType, class LUType>
+void Foam::LduMatrix<Type, DType, LUType>::solverPerformance::print
+(
+    Ostream& os
+) const
+{
+    for(direction cmpt=0; cmpt<pTraits<Type>::nComponents; cmpt++)
+    {
+        os  << solverName_ << ":  Solving for "
+            << word(fieldName_ + pTraits<Type>::componentNames[cmpt]);
+
+        if (singular_[cmpt])
+        {
+            os  << ":  solution singularity" << endl;
+        }
+        else
+        {
+            os  << ", Initial residual = " << component(initialResidual_, cmpt)
+                << ", Final residual = " << component(finalResidual_, cmpt)
+                << ", No Iterations " << noIterations_
+                << endl;
+        }
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixUpdateMatrixInterfaces.C b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixUpdateMatrixInterfaces.C
new file mode 100644
index 0000000000..fc8a9c8097
--- /dev/null
+++ b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixUpdateMatrixInterfaces.C
@@ -0,0 +1,194 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "LduMatrix.H"
+#include "LduInterfaceField.H"
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class Type, class DType, class LUType>
+void Foam::LduMatrix<Type, DType, LUType>::initMatrixInterfaces
+(
+    const FieldField<Field, LUType>& interfaceCoeffs,
+    const Field<Type>& psiif,
+    Field<Type>& result
+) const
+{
+    if
+    (
+        Pstream::defaultCommsType == Pstream::blocking
+     || Pstream::defaultCommsType == Pstream::nonBlocking
+    )
+    {
+        forAll (interfaces_, interfaceI)
+        {
+            if (interfaces_.set(interfaceI))
+            {
+                interfaces_[interfaceI].initInterfaceMatrixUpdate
+                (
+                    result,
+                    psiif,
+                    Amultiplier<Type, LUType>(interfaceCoeffs[interfaceI]),
+                    Pstream::defaultCommsType
+                );
+            }
+        }
+    }
+    else if (Pstream::defaultCommsType == Pstream::scheduled)
+    {
+        const lduSchedule& patchSchedule = this->patchSchedule();
+
+        // Loop over the "global" patches are on the list of interfaces but
+        // beyond the end of the schedule which only handles "normal" patches
+        for
+        (
+            label interfaceI=patchSchedule.size()/2;
+            interfaceI<interfaces_.size();
+            interfaceI++
+        )
+        {
+            if (interfaces_.set(interfaceI))
+            {
+                interfaces_[interfaceI].initInterfaceMatrixUpdate
+                (
+                    result,
+                    psiif,
+                    Amultiplier<Type, LUType>(interfaceCoeffs[interfaceI]),
+                    Pstream::blocking
+                );
+            }
+        }
+    }
+    else
+    {
+        FatalErrorIn("LduMatrix<Type, DType, LUType>::initMatrixInterfaces")
+            << "Unsuported communications type "
+            << Pstream::commsTypeNames[Pstream::defaultCommsType]
+            << exit(FatalError);
+    }
+}
+
+
+template<class Type, class DType, class LUType>
+void Foam::LduMatrix<Type, DType, LUType>::updateMatrixInterfaces
+(
+    const FieldField<Field, LUType>& interfaceCoeffs,
+    const Field<Type>& psiif,
+    Field<Type>& result
+) const
+{
+    if
+    (
+        Pstream::defaultCommsType == Pstream::blocking
+     || Pstream::defaultCommsType == Pstream::nonBlocking
+    )
+    {
+        // Block until all sends/receives have been finished
+        if (Pstream::defaultCommsType == Pstream::nonBlocking)
+        {
+            IPstream::waitRequests();
+            OPstream::waitRequests();
+        }
+
+        forAll (interfaces_, interfaceI)
+        {
+            if (interfaces_.set(interfaceI))
+            {
+                interfaces_[interfaceI].updateInterfaceMatrix
+                (
+                    result,
+                    psiif,
+                    Amultiplier<Type, LUType>(interfaceCoeffs[interfaceI]),
+                    Pstream::defaultCommsType
+                );
+            }
+        }
+    }
+    else if (Pstream::defaultCommsType == Pstream::scheduled)
+    {
+        const lduSchedule& patchSchedule = this->patchSchedule();
+
+        // Loop over all the "normal" interfaces relating to standard patches
+        forAll (patchSchedule, i)
+        {
+            label interfaceI = patchSchedule[i].patch;
+
+            if (interfaces_.set(interfaceI))
+            {
+                if (patchSchedule[i].init)
+                {
+                    interfaces_[interfaceI].initInterfaceMatrixUpdate
+                    (
+                        result,
+                        psiif,
+                        Amultiplier<Type, LUType>(interfaceCoeffs[interfaceI]),
+                        Pstream::scheduled
+                    );
+                }
+                else
+                {
+                    interfaces_[interfaceI].updateInterfaceMatrix
+                    (
+                        result,
+                        psiif,
+                        Amultiplier<Type, LUType>(interfaceCoeffs[interfaceI]),
+                        Pstream::scheduled
+                    );
+                }
+            }
+        }
+
+        // Loop over the "global" patches are on the list of interfaces but
+        // beyond the end of the schedule which only handles "normal" patches
+        for
+        (
+            label interfaceI=patchSchedule.size()/2;
+            interfaceI<interfaces_.size();
+            interfaceI++
+        )
+        {
+            if (interfaces_.set(interfaceI))
+            {
+                interfaces_[interfaceI].updateInterfaceMatrix
+                (
+                    result,
+                    psiif,
+                    Amultiplier<Type, LUType>(interfaceCoeffs[interfaceI]),
+                    Pstream::blocking
+                );
+            }
+        }
+    }
+    else
+    {
+        FatalErrorIn("LduMatrix<Type, DType, LUType>::updateMatrixInterfaces")
+            << "Unsuported communications type "
+            << Pstream::commsTypeNames[Pstream::defaultCommsType]
+            << exit(FatalError);
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/lduMatrices.C b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/lduMatrices.C
new file mode 100644
index 0000000000..3861c5698b
--- /dev/null
+++ b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/lduMatrices.C
@@ -0,0 +1,39 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "LduMatrix.H"
+#include "fieldTypes.H"
+
+namespace Foam
+{
+    makeLduMatrix(scalar, scalar, scalar);
+    makeLduMatrix(vector, scalar, scalar);
+    makeLduMatrix(sphericalTensor, scalar, scalar);
+    makeLduMatrix(symmTensor, scalar, scalar);
+    makeLduMatrix(tensor, scalar, scalar);
+};
+
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/matrices/LduMatrix/Preconditioners/DILUPreconditioner/TDILUPreconditioner.C b/src/OpenFOAM/matrices/LduMatrix/Preconditioners/DILUPreconditioner/TDILUPreconditioner.C
new file mode 100644
index 0000000000..99fdc9cb1f
--- /dev/null
+++ b/src/OpenFOAM/matrices/LduMatrix/Preconditioners/DILUPreconditioner/TDILUPreconditioner.C
@@ -0,0 +1,179 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "TDILUPreconditioner.H"
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template<class Type, class DType, class LUType>
+Foam::TDILUPreconditioner<Type, DType, LUType>::TDILUPreconditioner
+(
+    const typename LduMatrix<Type, DType, LUType>::solver& sol,
+    const dictionary&
+)
+:
+    LduMatrix<Type, DType, LUType>::preconditioner(sol),
+    rD_(sol.matrix().diag())
+{
+    calcInvD(rD_, sol.matrix());
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class Type, class DType, class LUType>
+void Foam::TDILUPreconditioner<Type, DType, LUType>::calcInvD
+(
+    Field<DType>& rD,
+    const LduMatrix<Type, DType, LUType>& matrix
+)
+{
+    DType* __restrict__ rDPtr = rD.begin();
+
+    const label* const __restrict__ uPtr = matrix.lduAddr().upperAddr().begin();
+    const label* const __restrict__ lPtr = matrix.lduAddr().lowerAddr().begin();
+
+    const LUType* const __restrict__ upperPtr = matrix.upper().begin();
+    const LUType* const __restrict__ lowerPtr = matrix.lower().begin();
+
+    register label nFaces = matrix.upper().size();
+    for (register label face=0; face<nFaces; face++)
+    {
+        rDPtr[uPtr[face]] -=
+            dot(dot(upperPtr[face], lowerPtr[face]), inv(rDPtr[lPtr[face]]));
+    }
+
+
+    // Calculate the reciprocal of the preconditioned diagonal
+    register label nCells = rD.size();
+
+    for (register label cell=0; cell<nCells; cell++)
+    {
+        rDPtr[cell] = inv(rDPtr[cell]);
+    }
+}
+
+
+template<class Type, class DType, class LUType>
+void Foam::TDILUPreconditioner<Type, DType, LUType>::precondition
+(
+    Field<Type>& wA,
+    const Field<Type>& rA
+) const
+{
+    Type* __restrict__ wAPtr = wA.begin();
+    const Type* __restrict__ rAPtr = rA.begin();
+    const DType* __restrict__ rDPtr = rD_.begin();
+
+    const label* const __restrict__ uPtr =
+        this->solver_.matrix().lduAddr().upperAddr().begin();
+    const label* const __restrict__ lPtr =
+        this->solver_.matrix().lduAddr().lowerAddr().begin();
+    const label* const __restrict__ losortPtr =
+        this->solver_.matrix().lduAddr().losortAddr().begin();
+
+    const LUType* const __restrict__ upperPtr =
+        this->solver_.matrix().upper().begin();
+    const LUType* const __restrict__ lowerPtr =
+        this->solver_.matrix().lower().begin();
+
+    register label nCells = wA.size();
+    register label nFaces = this->solver_.matrix().upper().size();
+    register label nFacesM1 = nFaces - 1;
+
+    for (register label cell=0; cell<nCells; cell++)
+    {
+        wAPtr[cell] = dot(rDPtr[cell], rAPtr[cell]);
+    }
+
+
+    register label sface;
+
+    for (register label face=0; face<nFaces; face++)
+    {
+        sface = losortPtr[face];
+        wAPtr[uPtr[sface]] -=
+            dot(rDPtr[uPtr[sface]], dot(lowerPtr[sface], wAPtr[lPtr[sface]]));
+    }
+
+    for (register label face=nFacesM1; face>=0; face--)
+    {
+        wAPtr[lPtr[face]] -=
+            dot(rDPtr[lPtr[face]], dot(upperPtr[face], wAPtr[uPtr[face]]));
+    }
+}
+
+
+template<class Type, class DType, class LUType>
+void Foam::TDILUPreconditioner<Type, DType, LUType>::preconditionT
+(
+    Field<Type>& wT,
+    const Field<Type>& rT
+) const
+{
+    Type* __restrict__ wTPtr = wT.begin();
+    const Type* __restrict__ rTPtr = rT.begin();
+    const DType* __restrict__ rDPtr = rD_.begin();
+
+    const label* const __restrict__ uPtr =
+        this->solver_.matrix().lduAddr().upperAddr().begin();
+    const label* const __restrict__ lPtr =
+        this->solver_.matrix().lduAddr().lowerAddr().begin();
+    const label* const __restrict__ losortPtr =
+        this->solver_.matrix().lduAddr().losortAddr().begin();
+
+    const LUType* const __restrict__ upperPtr =
+        this->solver_.matrix().upper().begin();
+    const LUType* const __restrict__ lowerPtr =
+        this->solver_.matrix().lower().begin();
+
+    register label nCells = wT.size();
+    register label nFaces = this->solver_.matrix().upper().size();
+    register label nFacesM1 = nFaces - 1;
+
+    for (register label cell=0; cell<nCells; cell++)
+    {
+        wTPtr[cell] = dot(rDPtr[cell], rTPtr[cell]);
+    }
+
+    for (register label face=0; face<nFaces; face++)
+    {
+        wTPtr[uPtr[face]] -=
+            dot(rDPtr[uPtr[face]], dot(upperPtr[face], wTPtr[lPtr[face]]));
+    }
+
+
+    register label sface;
+
+    for (register label face=nFacesM1; face>=0; face--)
+    {
+        sface = losortPtr[face];
+        wTPtr[lPtr[sface]] -=
+            dot(rDPtr[lPtr[sface]], dot(lowerPtr[sface], wTPtr[uPtr[sface]]));
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/matrices/LduMatrix/Preconditioners/DILUPreconditioner/TDILUPreconditioner.H b/src/OpenFOAM/matrices/LduMatrix/Preconditioners/DILUPreconditioner/TDILUPreconditioner.H
new file mode 100644
index 0000000000..da46f81858
--- /dev/null
+++ b/src/OpenFOAM/matrices/LduMatrix/Preconditioners/DILUPreconditioner/TDILUPreconditioner.H
@@ -0,0 +1,126 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::TDILUPreconditioner
+
+Description
+    Simplified diagonal-based incomplete LU preconditioner for asymmetric
+    matrices.
+
+    The inverse (reciprocal for scalar) of the preconditioned diagonal is
+    calculated and stored.
+
+SourceFiles
+    TDILUPreconditioner.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef TDILUPreconditioner_H
+#define TDILUPreconditioner_H
+
+#include "LduMatrix.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                           Class TDILUPreconditioner Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class Type, class DType, class LUType>
+class TDILUPreconditioner
+:
+    public LduMatrix<Type, DType, LUType>::preconditioner
+{
+    // Private data
+
+        //- The inverse (reciprocal for scalar) preconditioned diagonal
+        Field<DType> rD_;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("DILU");
+
+
+    // Constructors
+
+        //- Construct from matrix components and preconditioner data dictionary
+        TDILUPreconditioner
+        (
+            const typename LduMatrix<Type, DType, LUType>::solver& sol,
+            const dictionary& preconditionerDict
+        );
+
+
+    // Destructor
+
+        virtual ~TDILUPreconditioner()
+        {}
+
+
+    // Member Functions
+
+        //- Calculate the reciprocal of the preconditioned diagonal
+        static void calcInvD
+        (
+            Field<DType>& rD,
+            const LduMatrix<Type, DType, LUType>& matrix
+        );
+
+        //- Return wA the preconditioned form of residual rA
+        virtual void precondition
+        (
+            Field<Type>& wA,
+            const Field<Type>& rA
+        ) const;
+
+        //- Return wT the transpose-matrix preconditioned form of
+        //  residual rT.
+        virtual void preconditionT
+        (
+            Field<Type>& wT,
+            const Field<Type>& rT
+        ) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+#   include "TDILUPreconditioner.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/matrices/LduMatrix/Preconditioners/DiagonalPreconditioner/DiagonalPreconditioner.C b/src/OpenFOAM/matrices/LduMatrix/Preconditioners/DiagonalPreconditioner/DiagonalPreconditioner.C
new file mode 100644
index 0000000000..077704aee7
--- /dev/null
+++ b/src/OpenFOAM/matrices/LduMatrix/Preconditioners/DiagonalPreconditioner/DiagonalPreconditioner.C
@@ -0,0 +1,80 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "DiagonalPreconditioner.H"
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template<class Type, class DType, class LUType>
+Foam::DiagonalPreconditioner<Type, DType, LUType>::DiagonalPreconditioner
+(
+    const typename LduMatrix<Type, DType, LUType>::solver& sol,
+    const dictionary&
+)
+:
+    LduMatrix<Type, DType, LUType>::preconditioner(sol),
+    rD(sol.matrix().diag().size())
+{
+    DType* __restrict__ rDPtr = rD.begin();
+    const DType* __restrict__ DPtr = this->solver_.matrix().diag().begin();
+
+    register label nCells = rD.size();
+
+    // Generate inverse (reciprocal for scalar) diagonal
+    for (register label cell=0; cell<nCells; cell++)
+    {
+        rDPtr[cell] = inv(DPtr[cell]);
+    }
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class Type, class DType, class LUType>
+void Foam::DiagonalPreconditioner<Type, DType, LUType>::read(const dictionary&)
+{}
+
+
+template<class Type, class DType, class LUType>
+void Foam::DiagonalPreconditioner<Type, DType, LUType>::precondition
+(
+    Field<Type>& wA,
+    const Field<Type>& rA
+) const
+{
+    Type* __restrict__ wAPtr = wA.begin();
+    const Type* __restrict__ rAPtr = rA.begin();
+    const DType* __restrict__ rDPtr = rD.begin();
+
+    register label nCells = wA.size();
+
+    for (register label cell=0; cell<nCells; cell++)
+    {
+        wAPtr[cell] = dot(rDPtr[cell], rAPtr[cell]);
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/matrices/LduMatrix/Preconditioners/DiagonalPreconditioner/DiagonalPreconditioner.H b/src/OpenFOAM/matrices/LduMatrix/Preconditioners/DiagonalPreconditioner/DiagonalPreconditioner.H
new file mode 100644
index 0000000000..93eca754e0
--- /dev/null
+++ b/src/OpenFOAM/matrices/LduMatrix/Preconditioners/DiagonalPreconditioner/DiagonalPreconditioner.H
@@ -0,0 +1,134 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::DiagonalPreconditioner
+
+Description
+    Diagonal preconditioner for both symmetric and asymmetric matrices.
+
+    The inverse (reciprocal for scalar) of the diagonal is calculated and
+    stored.
+
+SourceFiles
+    DiagonalPreconditioner.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef DiagonalPreconditioner_H
+#define DiagonalPreconditioner_H
+
+#include "LduMatrix.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                           Class DiagonalPreconditioner Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class Type, class DType, class LUType>
+class DiagonalPreconditioner
+:
+    public LduMatrix<Type, DType, LUType>::preconditioner
+{
+    // Private data
+
+        //- The inverse (reciprocal for scalar) diagonal
+        Field<DType> rD;
+
+
+    // Private Member Functions
+
+        //- Disallow default bitwise copy construct
+        DiagonalPreconditioner(const DiagonalPreconditioner&);
+
+        //- Disallow default bitwise assignment
+        void operator=(const DiagonalPreconditioner&);
+
+
+public:
+
+    //- Runtime type information
+    TypeName("diagonal");
+
+
+    // Constructors
+
+        //- Construct from matrix components and preconditioner data dictionary
+        DiagonalPreconditioner
+        (
+            const typename LduMatrix<Type, DType, LUType>::solver& sol,
+            const dictionary& preconditionerDict
+        );
+
+
+    // Destructor
+
+        virtual ~DiagonalPreconditioner()
+        {}
+
+
+    // Member Functions
+
+        //- Read and reset the preconditioner parameters from the given
+        //  dictionary
+        virtual void read(const dictionary& preconditionerDict);
+
+        //- Return wA the preconditioned form of residual rA
+        virtual void precondition
+        (
+            Field<Type>& wA,
+            const Field<Type>& rA
+        ) const;
+
+        //- Return wT the transpose-matrix preconditioned form of
+        //  residual rT.
+        virtual void preconditionT
+        (
+            Field<Type>& wT,
+            const Field<Type>& rT
+        ) const
+        {
+            return(precondition(wT, rT));
+        }
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+#   include "DiagonalPreconditioner.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/matrices/LduMatrix/Preconditioners/NoPreconditioner/NoPreconditioner.C b/src/OpenFOAM/matrices/LduMatrix/Preconditioners/NoPreconditioner/NoPreconditioner.C
new file mode 100644
index 0000000000..160ad8f2fe
--- /dev/null
+++ b/src/OpenFOAM/matrices/LduMatrix/Preconditioners/NoPreconditioner/NoPreconditioner.C
@@ -0,0 +1,59 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "NoPreconditioner.H"
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template<class Type, class DType, class LUType>
+Foam::NoPreconditioner<Type, DType, LUType>::NoPreconditioner
+(
+    const typename LduMatrix<Type, DType, LUType>::solver& sol,
+    const dictionary&
+)
+:
+    LduMatrix<Type, DType, LUType>::preconditioner(sol)
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class Type, class DType, class LUType>
+void Foam::NoPreconditioner<Type, DType, LUType>::read(const dictionary&)
+{}
+
+
+template<class Type, class DType, class LUType>
+void Foam::NoPreconditioner<Type, DType, LUType>::precondition
+(
+    Field<Type>& wA,
+    const Field<Type>& rA
+) const
+{
+    wA = rA;
+}
+
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/matrices/LduMatrix/Preconditioners/NoPreconditioner/NoPreconditioner.H b/src/OpenFOAM/matrices/LduMatrix/Preconditioners/NoPreconditioner/NoPreconditioner.H
new file mode 100644
index 0000000000..bf8b10d24b
--- /dev/null
+++ b/src/OpenFOAM/matrices/LduMatrix/Preconditioners/NoPreconditioner/NoPreconditioner.H
@@ -0,0 +1,125 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::NoPreconditioner
+
+Description
+    Null preconditioner for both symmetric and asymmetric matrices.
+
+SourceFiles
+    NoPreconditioner.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef NoPreconditioner_H
+#define NoPreconditioner_H
+
+#include "LduMatrix.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                           Class NoPreconditioner Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class Type, class DType, class LUType>
+class NoPreconditioner
+:
+    public LduMatrix<Type, DType, LUType>::preconditioner
+{
+    // Private Member Functions
+
+        //- Disallow default bitwise copy construct
+        NoPreconditioner(const NoPreconditioner&);
+
+        //- Disallow default bitwise assignment
+        void operator=(const NoPreconditioner&);
+
+
+public:
+
+    //- Runtime type information
+    TypeName("none");
+
+
+    // Constructors
+
+        //- Construct from matrix components and preconditioner data dictionary
+        NoPreconditioner
+        (
+            const typename LduMatrix<Type, DType, LUType>::solver& sol,
+            const dictionary& preconditionerDict
+        );
+
+
+    // Destructor
+
+        virtual ~NoPreconditioner()
+        {}
+
+
+    // Member Functions
+
+        //- Read and reset the preconditioner parameters from the given
+        //  dictionary
+        virtual void read(const dictionary& preconditionerDict);
+
+        //- Return wA the preconditioned form of residual rA
+        virtual void precondition
+        (
+            Field<Type>& wA,
+            const Field<Type>& rA
+        ) const;
+
+        //- Return wT the transpose-matrix preconditioned form of
+        //  residual rT.
+        virtual void preconditionT
+        (
+            Field<Type>& wT,
+            const Field<Type>& rT
+        ) const
+        {
+            return(precondition(wT, rT));
+        }
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+#   include "NoPreconditioner.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/matrices/LduMatrix/Preconditioners/lduPreconditioners.C b/src/OpenFOAM/matrices/LduMatrix/Preconditioners/lduPreconditioners.C
new file mode 100644
index 0000000000..95f1483658
--- /dev/null
+++ b/src/OpenFOAM/matrices/LduMatrix/Preconditioners/lduPreconditioners.C
@@ -0,0 +1,54 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "NoPreconditioner.H"
+#include "DiagonalPreconditioner.H"
+#include "TDILUPreconditioner.H"
+#include "fieldTypes.H"
+
+#define makeLduPreconditioners(Type, DType, LUType)                           \
+                                                                              \
+    makeLduPreconditioner(NoPreconditioner, Type, DType, LUType);             \
+    makeLduSymPreconditioner(NoPreconditioner, Type, DType, LUType);          \
+    makeLduAsymPreconditioner(NoPreconditioner, Type, DType, LUType);         \
+                                                                              \
+    makeLduPreconditioner(DiagonalPreconditioner, Type, DType, LUType);       \
+    makeLduSymPreconditioner(DiagonalPreconditioner, Type, DType, LUType);    \
+    makeLduAsymPreconditioner(DiagonalPreconditioner, Type, DType, LUType);   \
+                                                                              \
+    makeLduPreconditioner(TDILUPreconditioner, Type, DType, LUType);          \
+    makeLduAsymPreconditioner(TDILUPreconditioner, Type, DType, LUType);
+
+namespace Foam
+{
+    makeLduPreconditioners(scalar, scalar, scalar);
+    makeLduPreconditioners(vector, scalar, scalar);
+    makeLduPreconditioners(sphericalTensor, scalar, scalar);
+    makeLduPreconditioners(symmTensor, scalar, scalar);
+    makeLduPreconditioners(tensor, scalar, scalar);
+};
+
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/matrices/LduMatrix/Smoothers/GaussSeidel/TGaussSeidelSmoother.C b/src/OpenFOAM/matrices/LduMatrix/Smoothers/GaussSeidel/TGaussSeidelSmoother.C
new file mode 100644
index 0000000000..6d945da0bb
--- /dev/null
+++ b/src/OpenFOAM/matrices/LduMatrix/Smoothers/GaussSeidel/TGaussSeidelSmoother.C
@@ -0,0 +1,167 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "TGaussSeidelSmoother.H"
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template<class Type, class DType, class LUType>
+Foam::TGaussSeidelSmoother<Type, DType, LUType>::TGaussSeidelSmoother
+(
+    const word& fieldName,
+    const LduMatrix<Type, DType, LUType>& matrix
+)
+:
+    LduMatrix<Type, DType, LUType>::smoother
+    (
+        fieldName,
+        matrix
+    ),
+    rD_(matrix.diag().size())
+{
+    register const label nCells = matrix.diag().size();
+    register const DType* const __restrict__ diagPtr = matrix.diag().begin();
+    register DType* __restrict__ rDPtr = rD_.begin();
+
+    for (register label cellI=0; cellI<nCells; cellI++)
+    {
+        rDPtr[cellI] = inv(diagPtr[cellI]);
+    }
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class Type, class DType, class LUType>
+void Foam::TGaussSeidelSmoother<Type, DType, LUType>::smooth
+(
+    const word& fieldName_,
+    Field<Type>& psi,
+    const LduMatrix<Type, DType, LUType>& matrix_,
+    const Field<DType>& rD_,
+    const label nSweeps
+)
+{
+    register Type* __restrict__ psiPtr = psi.begin();
+
+    register const label nCells = psi.size();
+
+    Field<Type> bPrime(nCells);
+    register Type* __restrict__ bPrimePtr = bPrime.begin();
+
+    register const DType* const __restrict__ rDPtr = rD_.begin();
+
+    register const LUType* const __restrict__ upperPtr =
+        matrix_.upper().begin();
+
+    register const LUType* const __restrict__ lowerPtr =
+        matrix_.lower().begin();
+
+    register const label* const __restrict__ uPtr =
+        matrix_.lduAddr().upperAddr().begin();
+
+    register const label* const __restrict__ ownStartPtr =
+        matrix_.lduAddr().ownerStartAddr().begin();
+
+
+    // Parallel boundary initialisation.  The parallel boundary is treated
+    // as an effective jacobi interface in the boundary.
+    // Note: there is a change of sign in the coupled
+    // interface update to add the contibution to the r.h.s.
+
+    FieldField<Field, LUType> mBouCoeffs(matrix_.interfacesUpper().size());
+
+    forAll(mBouCoeffs, patchi)
+    {
+        if (matrix_.interfaces().set(patchi))
+        {
+            mBouCoeffs.set(patchi, -matrix_.interfacesUpper()[patchi]);
+        }
+    }
+
+    for (label sweep=0; sweep<nSweeps; sweep++)
+    {
+        bPrime = matrix_.source();
+
+        matrix_.initMatrixInterfaces
+        (
+            mBouCoeffs,
+            psi,
+            bPrime
+        );
+
+        matrix_.updateMatrixInterfaces
+        (
+            mBouCoeffs,
+            psi,
+            bPrime
+        );
+
+        Type curPsi;
+        register label fStart;
+        register label fEnd = ownStartPtr[0];
+
+        for (register label cellI=0; cellI<nCells; cellI++)
+        {
+            // Start and end of this row
+            fStart = fEnd;
+            fEnd = ownStartPtr[cellI + 1];
+
+            // Get the accumulated neighbour side
+            curPsi = bPrimePtr[cellI];
+
+            // Accumulate the owner product side
+            for (register label curFace=fStart; curFace<fEnd; curFace++)
+            {
+                curPsi -= dot(upperPtr[curFace], psiPtr[uPtr[curFace]]);
+            }
+
+            // Finish current psi
+            curPsi = dot(rDPtr[cellI], curPsi);
+
+            // Distribute the neighbour side using current psi
+            for (register label curFace=fStart; curFace<fEnd; curFace++)
+            {
+                bPrimePtr[uPtr[curFace]] -= dot(lowerPtr[curFace], curPsi);
+            }
+
+            psiPtr[cellI] = curPsi;
+        }
+    }
+}
+
+
+template<class Type, class DType, class LUType>
+void Foam::TGaussSeidelSmoother<Type, DType, LUType>::smooth
+(
+    Field<Type>& psi,
+    const label nSweeps
+) const
+{
+    smooth(this->fieldName_, psi, this->matrix_, rD_, nSweeps);
+}
+
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/matrices/LduMatrix/Smoothers/GaussSeidel/TGaussSeidelSmoother.H b/src/OpenFOAM/matrices/LduMatrix/Smoothers/GaussSeidel/TGaussSeidelSmoother.H
new file mode 100644
index 0000000000..2627592989
--- /dev/null
+++ b/src/OpenFOAM/matrices/LduMatrix/Smoothers/GaussSeidel/TGaussSeidelSmoother.H
@@ -0,0 +1,112 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::TGaussSeidelSmoother
+
+Description
+    Foam::TGaussSeidelSmoother
+
+SourceFiles
+    TGaussSeidelSmoother.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef TGaussSeidelSmoother_H
+#define TGaussSeidelSmoother_H
+
+#include "LduMatrix.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                           Class TGaussSeidelSmoother Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class Type, class DType, class LUType>
+class TGaussSeidelSmoother
+:
+    public LduMatrix<Type, DType, LUType>::smoother
+{
+    // Private data
+
+        //- The inverse (reciprocal for scalars) diagonal
+        Field<DType> rD_;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("GaussSeidel");
+
+
+    // Constructors
+
+        //- Construct from components
+        TGaussSeidelSmoother
+        (
+            const word& fieldName,
+            const LduMatrix<Type, DType, LUType>& matrix
+        );
+
+
+    // Member Functions
+
+        //- Smooth for the given number of sweeps
+        static void smooth
+        (
+            const word& fieldName,
+            Field<Type>& psi,
+            const LduMatrix<Type, DType, LUType>& matrix,
+            const Field<DType>& rD,
+            const label nSweeps
+        );
+
+
+        //- Smooth the solution for a given number of sweeps
+        virtual void smooth
+        (
+            Field<Type>& psi,
+            const label nSweeps
+        ) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+#   include "TGaussSeidelSmoother.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/matrices/LduMatrix/Smoothers/lduSmoothers.C b/src/OpenFOAM/matrices/LduMatrix/Smoothers/lduSmoothers.C
new file mode 100644
index 0000000000..c40b0673f8
--- /dev/null
+++ b/src/OpenFOAM/matrices/LduMatrix/Smoothers/lduSmoothers.C
@@ -0,0 +1,45 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "TGaussSeidelSmoother.H"
+#include "fieldTypes.H"
+
+#define makeLduSmoothers(Type, DType, LUType)                                 \
+                                                                              \
+    makeLduSmoother(TGaussSeidelSmoother, Type, DType, LUType);               \
+    makeLduSymSmoother(TGaussSeidelSmoother, Type, DType, LUType);            \
+    makeLduAsymSmoother(TGaussSeidelSmoother, Type, DType, LUType);
+
+namespace Foam
+{
+    makeLduSmoothers(scalar, scalar, scalar);
+    makeLduSmoothers(vector, scalar, scalar);
+    makeLduSmoothers(sphericalTensor, scalar, scalar);
+    makeLduSmoothers(symmTensor, scalar, scalar);
+    makeLduSmoothers(tensor, scalar, scalar);
+};
+
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/matrices/LduMatrix/Solvers/DiagonalSolver/DiagonalSolver.C b/src/OpenFOAM/matrices/LduMatrix/Solvers/DiagonalSolver/DiagonalSolver.C
new file mode 100644
index 0000000000..af128d249a
--- /dev/null
+++ b/src/OpenFOAM/matrices/LduMatrix/Solvers/DiagonalSolver/DiagonalSolver.C
@@ -0,0 +1,79 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "DiagonalSolver.H"
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template<class Type, class DType, class LUType>
+Foam::DiagonalSolver<Type, DType, LUType>::DiagonalSolver
+(
+    const word& fieldName,
+    const LduMatrix<Type, DType, LUType>& matrix,
+    const dictionary& solverDict
+)
+:
+    LduMatrix<Type, DType, LUType>::solver
+    (
+        fieldName,
+        matrix,
+        solverDict
+    )
+{}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+template<class Type, class DType, class LUType>
+void Foam::DiagonalSolver<Type, DType, LUType>::read
+(
+    const dictionary&
+)
+{}
+
+
+template<class Type, class DType, class LUType>
+typename Foam::LduMatrix<Type, DType, LUType>::solverPerformance
+Foam::DiagonalSolver<Type, DType, LUType>::solve
+(
+    Field<Type>& psi
+) const
+{
+    psi = this->matrix_.source()/this->matrix_.diag();
+
+    return typename LduMatrix<Type, DType, LUType>::solverPerformance
+    (
+        typeName,
+        this->fieldName_,
+        pTraits<Type>::zero,
+        pTraits<Type>::zero,
+        0,
+        true,
+        false
+    );
+}
+
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/matrices/LduMatrix/Solvers/DiagonalSolver/DiagonalSolver.H b/src/OpenFOAM/matrices/LduMatrix/Solvers/DiagonalSolver/DiagonalSolver.H
new file mode 100644
index 0000000000..400891b977
--- /dev/null
+++ b/src/OpenFOAM/matrices/LduMatrix/Solvers/DiagonalSolver/DiagonalSolver.H
@@ -0,0 +1,107 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::DiagonalSolver
+
+Description
+    Foam::DiagonalSolver
+
+SourceFiles
+    DiagonalSolver.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef DiagonalSolver_H
+#define DiagonalSolver_H
+
+#include "LduMatrix.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                           Class DiagonalSolver Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class Type, class DType, class LUType>
+class DiagonalSolver
+:
+    public LduMatrix<Type, DType, LUType>::solver
+{
+    // Private Member Functions
+
+        //- Disallow default bitwise copy construct
+        DiagonalSolver(const DiagonalSolver&);
+
+        //- Disallow default bitwise assignment
+        void operator=(const DiagonalSolver&);
+
+
+public:
+
+    //- Runtime type information
+    TypeName("diagonal");
+
+
+    // Constructors
+
+        //- Construct from matrix
+        DiagonalSolver
+        (
+            const word& fieldName,
+            const LduMatrix<Type, DType, LUType>& matrix,
+            const dictionary& solverDict
+        );
+
+
+    // Member Functions
+
+        //- Read and reset the solver parameters from the given dictionary
+        void read(const dictionary& solverDict);
+
+        //- Solve the matrix with this solver
+        typename LduMatrix<Type, DType, LUType>::solverPerformance solve
+        (
+            Field<Type>& psi
+        ) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+#   include "DiagonalSolver.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/matrices/LduMatrix/Solvers/PBiCG/TPBiCG.C b/src/OpenFOAM/matrices/LduMatrix/Solvers/PBiCG/TPBiCG.C
new file mode 100644
index 0000000000..6221fe3b9c
--- /dev/null
+++ b/src/OpenFOAM/matrices/LduMatrix/Solvers/PBiCG/TPBiCG.C
@@ -0,0 +1,194 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "TPBiCG.H"
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template<class Type, class DType, class LUType>
+Foam::TPBiCG<Type, DType, LUType>::TPBiCG
+(
+    const word& fieldName,
+    const LduMatrix<Type, DType, LUType>& matrix,
+    const dictionary& solverDict
+)
+:
+    LduMatrix<Type, DType, LUType>::solver
+    (
+        fieldName,
+        matrix,
+        solverDict
+    )
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class Type, class DType, class LUType>
+typename Foam::LduMatrix<Type, DType, LUType>::solverPerformance
+Foam::TPBiCG<Type, DType, LUType>::solve(Field<Type>& psi) const
+{
+    word preconditionerName(this->controlDict_.lookup("preconditioner"));
+
+    // --- Setup class containing solver performance data
+    typename LduMatrix<Type, DType, LUType>::solverPerformance solverPerf
+    (
+        preconditionerName + typeName,
+        this->fieldName_
+    );
+
+    register label nCells = psi.size();
+
+    Type* __restrict__ psiPtr = psi.begin();
+
+    Field<Type> pA(nCells);
+    Type* __restrict__ pAPtr = pA.begin();
+
+    Field<Type> pT(nCells, pTraits<Type>::zero);
+    Type* __restrict__ pTPtr = pT.begin();
+
+    Field<Type> wA(nCells);
+    Type* __restrict__ wAPtr = wA.begin();
+
+    Field<Type> wT(nCells);
+    Type* __restrict__ wTPtr = wT.begin();
+
+    Type wArT = this->matrix_.great_*pTraits<Type>::one;
+    Type wArTold = wArT;
+
+    // --- Calculate A.psi and T.psi
+    this->matrix_.Amul(wA, psi);
+    this->matrix_.Tmul(wT, psi);
+
+    // --- Calculate initial residual and transpose residual fields
+    Field<Type> rA(this->matrix_.source() - wA);
+    Field<Type> rT(this->matrix_.source() - wT);
+    Type* __restrict__ rAPtr = rA.begin();
+    Type* __restrict__ rTPtr = rT.begin();
+
+    // --- Calculate normalisation factor
+    Type normFactor = this->normFactor(psi, wA, pA);
+
+    if (LduMatrix<Type, DType, LUType>::debug >= 2)
+    {
+        Info<< "   Normalisation factor = " << normFactor << endl;
+    }
+
+    // --- Calculate normalised residual norm
+    solverPerf.initialResidual() = cmptDivide(gSumCmptMag(rA), normFactor);
+    solverPerf.finalResidual() = solverPerf.initialResidual();
+
+    // --- Check convergence, solve if not converged
+    if (!solverPerf.converged(this->tolerance_, this->relTol_))
+    {
+        // --- Select and construct the preconditioner
+        autoPtr<typename LduMatrix<Type, DType, LUType>::preconditioner>
+        preconPtr = LduMatrix<Type, DType, LUType>::preconditioner::New
+        (
+            *this,
+            this->controlDict_
+        );
+
+        // --- Solver iteration
+        do
+        {
+            // --- Store previous wArT
+            wArTold = wArT;
+
+            // --- Precondition residuals
+            preconPtr->precondition(wA, rA);
+            preconPtr->preconditionT(wT, rT);
+
+            // --- Update search directions:
+            wArT = gSumCmptProd(wA, rT);
+
+            if (solverPerf.nIterations() == 0)
+            {
+                for (register label cell=0; cell<nCells; cell++)
+                {
+                    pAPtr[cell] = wAPtr[cell];
+                    pTPtr[cell] = wTPtr[cell];
+                }
+            }
+            else
+            {
+                Type beta = cmptDivide
+                (
+                    wArT,
+                    stabilise(wArTold, this->matrix_.vsmall_)
+                );
+
+                for (register label cell=0; cell<nCells; cell++)
+                {
+                    pAPtr[cell] = wAPtr[cell] + cmptMultiply(beta, pAPtr[cell]);
+                    pTPtr[cell] = wTPtr[cell] + cmptMultiply(beta, pTPtr[cell]);
+                }
+            }
+
+
+            // --- Update preconditioned residuals
+            this->matrix_.Amul(wA, pA);
+
+            this->matrix_.Tmul(wT, pT);
+
+            Type wApT = gSumCmptProd(wA, pT);
+
+            // --- Test for singularity
+            if (solverPerf.singular(cmptDivide(cmptMag(wApT), normFactor)))
+            {
+                break;
+            }
+
+
+            // --- Update solution and residual:
+
+            Type alpha = cmptDivide
+            (
+                wArT,
+                stabilise(wApT, this->matrix_.vsmall_)
+            );
+
+            for (register label cell=0; cell<nCells; cell++)
+            {
+                psiPtr[cell] += cmptMultiply(alpha, pAPtr[cell]);
+                rAPtr[cell] -= cmptMultiply(alpha, wAPtr[cell]);
+                rTPtr[cell] -= cmptMultiply(alpha, wTPtr[cell]);
+            }
+
+            solverPerf.finalResidual() =
+                cmptDivide(gSumCmptMag(rA), normFactor);
+
+        } while
+        (
+            solverPerf.nIterations()++ < this->maxIter_
+        && !(solverPerf.converged(this->tolerance_, this->relTol_))
+        );
+    }
+
+    return solverPerf;
+}
+
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/matrices/LduMatrix/Solvers/PBiCG/TPBiCG.H b/src/OpenFOAM/matrices/LduMatrix/Solvers/PBiCG/TPBiCG.H
new file mode 100644
index 0000000000..736654cbeb
--- /dev/null
+++ b/src/OpenFOAM/matrices/LduMatrix/Solvers/PBiCG/TPBiCG.H
@@ -0,0 +1,111 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::TPBiCG
+
+Description
+    Preconditioned bi-conjugate gradient solver for asymmetric lduMatrices
+    using a run-time selectable preconditiioner.
+
+SourceFiles
+    TPBiCG.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef TPBiCG_H
+#define TPBiCG_H
+
+#include "LduMatrix.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                           Class TPBiCG Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class Type, class DType, class LUType>
+class TPBiCG
+:
+    public LduMatrix<Type, DType, LUType>::solver
+{
+    // Private Member Functions
+
+        //- Disallow default bitwise copy construct
+        TPBiCG(const TPBiCG&);
+
+        //- Disallow default bitwise assignment
+        void operator=(const TPBiCG&);
+
+
+public:
+
+    //- Runtime type information
+    TypeName("PBiCG");
+
+
+    // Constructors
+
+        //- Construct from matrix components and solver data dictionary
+        TPBiCG
+        (
+            const word& fieldName,
+            const LduMatrix<Type, DType, LUType>& matrix,
+            const dictionary& solverDict
+        );
+
+
+    // Destructor
+
+        virtual ~TPBiCG()
+        {}
+
+
+    // Member Functions
+
+        //- Solve the matrix with this solver
+        virtual typename LduMatrix<Type, DType, LUType>::solverPerformance solve
+        (
+            Field<Type>& psi
+        ) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+#   include "TPBiCG.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/matrices/LduMatrix/Solvers/PBiCGScalarAlpha/PBiCGScalarAlpha.C b/src/OpenFOAM/matrices/LduMatrix/Solvers/PBiCGScalarAlpha/PBiCGScalarAlpha.C
new file mode 100644
index 0000000000..c540a2c746
--- /dev/null
+++ b/src/OpenFOAM/matrices/LduMatrix/Solvers/PBiCGScalarAlpha/PBiCGScalarAlpha.C
@@ -0,0 +1,190 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "TPBiCG.H"
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template<class Type, class DType, class LUType>
+Foam::TPBiCG<Type, DType, LUType>::TPBiCG
+(
+    const word& fieldName,
+    const LduMatrix<Type, DType, LUType>& matrix,
+    const dictionary& solverDict
+)
+:
+    LduMatrix<Type, DType, LUType>::solver
+    (
+        fieldName,
+        matrix,
+        solverDict
+    )
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class Type, class DType, class LUType>
+typename Foam::LduMatrix<Type, DType, LUType>::solverPerformance
+Foam::TPBiCG<Type, DType, LUType>::solve
+(
+    Field<Type>& psi
+) const
+{
+    word preconditionerName(this->controlDict_.lookup("preconditioner"));
+
+    // --- Setup class containing solver performance data
+    typename LduMatrix<Type, DType, LUType>::solverPerformance solverPerf
+    (
+        preconditionerName + typeName,
+        this->fieldName_
+    );
+
+    register label nCells = psi.size();
+
+    Type* __restrict__ psiPtr = psi.begin();
+
+    Field<Type> pA(nCells);
+    Type* __restrict__ pAPtr = pA.begin();
+
+    Field<Type> pT(nCells, pTraits<Type>::zero);
+    Type* __restrict__ pTPtr = pT.begin();
+
+    Field<Type> wA(nCells);
+    Type* __restrict__ wAPtr = wA.begin();
+
+    Field<Type> wT(nCells);
+    Type* __restrict__ wTPtr = wT.begin();
+
+    scalar wArT = 1e15; //this->matrix_.great_;
+    scalar wArTold = wArT;
+
+    // --- Calculate A.psi and T.psi
+    this->matrix_.Amul(wA, psi);
+    this->matrix_.Tmul(wT, psi);
+
+    // --- Calculate initial residual and transpose residual fields
+    Field<Type> rA(this->matrix_.source() - wA);
+    Field<Type> rT(this->matrix_.source() - wT);
+    Type* __restrict__ rAPtr = rA.begin();
+    Type* __restrict__ rTPtr = rT.begin();
+
+    // --- Calculate normalisation factor
+    Type normFactor = this->normFactor(psi, wA, pA);
+
+    if (LduMatrix<Type, DType, LUType>::debug >= 2)
+    {
+        Info<< "   Normalisation factor = " << normFactor << endl;
+    }
+
+    // --- Calculate normalised residual norm
+    solverPerf.initialResidual() = cmptDivide(gSumCmptMag(rA), normFactor);
+    solverPerf.finalResidual() = solverPerf.initialResidual();
+
+    // --- Check convergence, solve if not converged
+    if (!solverPerf.converged(this->tolerance_, this->relTol_))
+    {
+        // --- Select and construct the preconditioner
+        autoPtr<typename LduMatrix<Type, DType, LUType>::preconditioner>
+        preconPtr = LduMatrix<Type, DType, LUType>::preconditioner::New
+        (
+            *this,
+            this->controlDict_
+        );
+
+        // --- Solver iteration
+        do
+        {
+            // --- Store previous wArT
+            wArTold = wArT;
+
+            // --- Precondition residuals
+            preconPtr->precondition(wA, rA);
+            preconPtr->preconditionT(wT, rT);
+
+            // --- Update search directions:
+            //wArT = gSumProd(wA, rT);
+            wArT = sum(wA & rT);
+
+            if (solverPerf.nIterations() == 0)
+            {
+                for (register label cell=0; cell<nCells; cell++)
+                {
+                    pAPtr[cell] = wAPtr[cell];
+                    pTPtr[cell] = wTPtr[cell];
+                }
+            }
+            else
+            {
+                scalar beta = cmptDivide(wArT, wArTold);
+
+                for (register label cell=0; cell<nCells; cell++)
+                {
+                    pAPtr[cell] = wAPtr[cell] + (beta* pAPtr[cell]);
+                    pTPtr[cell] = wTPtr[cell] + (beta* pTPtr[cell]);
+                }
+            }
+
+
+            // --- Update preconditioned residuals
+            this->matrix_.Amul(wA, pA);
+            this->matrix_.Tmul(wT, pT);
+
+            scalar wApT = sum(wA & pT);
+
+
+            // --- Test for singularity
+            //if
+            //(
+            //    solverPerf.checkSingularity(ratio(mag(wApT)normFactor))
+            //) break;
+
+
+            // --- Update solution and residual:
+
+            scalar alpha = cmptDivide(wArT, wApT);
+
+            for (register label cell=0; cell<nCells; cell++)
+            {
+                psiPtr[cell] += (alpha* pAPtr[cell]);
+                rAPtr[cell] -= (alpha* wAPtr[cell]);
+                rTPtr[cell] -= (alpha* wTPtr[cell]);
+            }
+
+            solverPerf.finalResidual() =
+                cmptDivide(gSumCmptMag(rA), normFactor);
+
+        } while
+        (
+            solverPerf.nIterations()++ < this->maxIter_
+        && !(solverPerf.converged(this->tolerance_, this->relTol_))
+        );
+    }
+
+    return solverPerf;
+}
+
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/matrices/LduMatrix/Solvers/PBiCGScalarAlpha/PBiCGScalarAlpha.H b/src/OpenFOAM/matrices/LduMatrix/Solvers/PBiCGScalarAlpha/PBiCGScalarAlpha.H
new file mode 100644
index 0000000000..dee183e10b
--- /dev/null
+++ b/src/OpenFOAM/matrices/LduMatrix/Solvers/PBiCGScalarAlpha/PBiCGScalarAlpha.H
@@ -0,0 +1,111 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::TPBiCG
+
+Description
+    Preconditioned bi-conjugate gradient solver for asymmetric lduMatrices
+    using a run-time selectable preconditiioner.
+
+SourceFiles
+    TPBiCG.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef TPBiCG_H
+#define TPBiCG_H
+
+#include "LduMatrix.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                           Class TPBiCG Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class Type, class DType, class LUType>
+class TPBiCG
+:
+    public LduMatrix<Type, DType, LUType>::solver
+{
+    // Private Member Functions
+
+        //- Disallow default bitwise copy construct
+        TPBiCG(const TPBiCG&);
+
+        //- Disallow default bitwise assignment
+        void operator=(const TPBiCG&);
+
+
+public:
+
+    //- Runtime type information
+    TypeName("PBiCG");
+
+
+    // Constructors
+
+        //- Construct from matrix components and solver data dictionary
+        TPBiCG
+        (
+            const word& fieldName,
+            const LduMatrix<Type, DType, LUType>& matrix,
+            const dictionary& solverDict
+        );
+
+
+    // Destructor
+
+        virtual ~TPBiCG()
+        {}
+
+
+    // Member Functions
+
+        //- Solve the matrix with this solver
+        virtual typename LduMatrix<Type, DType, LUType>::solverPerformance solve
+        (
+            Field<Type>& psi
+        ) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+#   include "PBiCGScalarAlpha.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/matrices/LduMatrix/Solvers/PCG/TPCG.C b/src/OpenFOAM/matrices/LduMatrix/Solvers/PCG/TPCG.C
new file mode 100644
index 0000000000..d48dfb6fe2
--- /dev/null
+++ b/src/OpenFOAM/matrices/LduMatrix/Solvers/PCG/TPCG.C
@@ -0,0 +1,180 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "TPCG.H"
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template<class Type, class DType, class LUType>
+Foam::TPCG<Type, DType, LUType>::TPCG
+(
+    const word& fieldName,
+    const LduMatrix<Type, DType, LUType>& matrix,
+    const dictionary& solverDict
+)
+:
+    LduMatrix<Type, DType, LUType>::solver
+    (
+        fieldName,
+        matrix,
+        solverDict
+    )
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class Type, class DType, class LUType>
+typename Foam::LduMatrix<Type, DType, LUType>::solverPerformance
+Foam::TPCG<Type, DType, LUType>::solve(Field<Type>& psi) const
+{
+    word preconditionerName(this->controlDict_.lookup("preconditioner"));
+
+    // --- Setup class containing solver performance data
+    typename LduMatrix<Type, DType, LUType>::solverPerformance solverPerf
+    (
+        preconditionerName + typeName,
+        this->fieldName_
+    );
+
+    register label nCells = psi.size();
+
+    Type* __restrict__ psiPtr = psi.begin();
+
+    Field<Type> pA(nCells);
+    Type* __restrict__ pAPtr = pA.begin();
+
+    Field<Type> wA(nCells);
+    Type* __restrict__ wAPtr = wA.begin();
+
+    Type wArA = this->matrix_.great_*pTraits<Type>::one;
+    Type wArAold = wArA;
+
+    // --- Calculate A.psi
+    this->matrix_.Amul(wA, psi);
+
+    // --- Calculate initial residual field
+    Field<Type> rA(this->matrix_.source() - wA);
+    Type* __restrict__ rAPtr = rA.begin();
+
+    // --- Calculate normalisation factor
+    Type normFactor = this->normFactor(psi, wA, pA);
+
+    if (LduMatrix<Type, DType, LUType>::debug >= 2)
+    {
+        Info<< "   Normalisation factor = " << normFactor << endl;
+    }
+
+    // --- Calculate normalised residual norm
+    solverPerf.initialResidual() = cmptDivide(gSumCmptMag(rA), normFactor);
+    solverPerf.finalResidual() = solverPerf.initialResidual();
+
+    // --- Check convergence, solve if not converged
+    if (!solverPerf.converged(this->tolerance_, this->relTol_))
+    {
+        // --- Select and construct the preconditioner
+        autoPtr<typename LduMatrix<Type, DType, LUType>::preconditioner>
+        preconPtr = LduMatrix<Type, DType, LUType>::preconditioner::New
+        (
+            *this,
+            this->controlDict_
+        );
+
+        // --- Solver iteration
+        do
+        {
+            // --- Store previous wArA
+            wArAold = wArA;
+
+            // --- Precondition residual
+            preconPtr->precondition(wA, rA);
+
+            // --- Update search directions:
+            wArA = gSumCmptProd(wA, rA);
+
+            if (solverPerf.nIterations() == 0)
+            {
+                for (register label cell=0; cell<nCells; cell++)
+                {
+                    pAPtr[cell] = wAPtr[cell];
+                }
+            }
+            else
+            {
+                Type beta = cmptDivide
+                (
+                    wArA,
+                    stabilise(wArAold, this->matrix_.vsmall_)
+                );
+
+                for (register label cell=0; cell<nCells; cell++)
+                {
+                    pAPtr[cell] = wAPtr[cell] + cmptMultiply(beta, pAPtr[cell]);
+                }
+            }
+
+
+            // --- Update preconditioned residual
+            this->matrix_.Amul(wA, pA);
+
+            Type wApA = gSumCmptProd(wA, pA);
+
+
+            // --- Test for singularity
+            if (solverPerf.singular(cmptDivide(cmptMag(wApA), normFactor)))
+            {
+                break;
+            }
+
+
+            // --- Update solution and residual:
+
+            Type alpha = cmptDivide
+            (
+                wArA,
+                stabilise(wApA, this->matrix_.vsmall_)
+            );
+
+            for (register label cell=0; cell<nCells; cell++)
+            {
+                psiPtr[cell] += cmptMultiply(alpha, pAPtr[cell]);
+                rAPtr[cell] -= cmptMultiply(alpha, wAPtr[cell]);
+            }
+
+            solverPerf.finalResidual() =
+                cmptDivide(gSumCmptMag(rA), normFactor);
+
+        } while
+        (
+            solverPerf.nIterations()++ < this->maxIter_
+        && !(solverPerf.converged(this->tolerance_, this->relTol_))
+        );
+    }
+
+    return solverPerf;
+}
+
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/matrices/LduMatrix/Solvers/PCG/TPCG.H b/src/OpenFOAM/matrices/LduMatrix/Solvers/PCG/TPCG.H
new file mode 100644
index 0000000000..779de7ec5e
--- /dev/null
+++ b/src/OpenFOAM/matrices/LduMatrix/Solvers/PCG/TPCG.H
@@ -0,0 +1,111 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::TPCG
+
+Description
+    Preconditioned conjugate gradient solver for symmetric lduMatrices
+    using a run-time selectable preconditiioner.
+
+SourceFiles
+    TPCG.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef TPCG_H
+#define TPCG_H
+
+#include "LduMatrix.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                           Class TPCG Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class Type, class DType, class LUType>
+class TPCG
+:
+    public LduMatrix<Type, DType, LUType>::solver
+{
+    // Private Member Functions
+
+        //- Disallow default bitwise copy construct
+        TPCG(const TPCG&);
+
+        //- Disallow default bitwise assignment
+        void operator=(const TPCG&);
+
+
+public:
+
+    //- Runtime type information
+    TypeName("PCG");
+
+
+    // Constructors
+
+        //- Construct from matrix components and solver data dictionary
+        TPCG
+        (
+            const word& fieldName,
+            const LduMatrix<Type, DType, LUType>& matrix,
+            const dictionary& solverDict
+        );
+
+
+    // Destructor
+
+        virtual ~TPCG()
+        {}
+
+
+    // Member Functions
+
+        //- Solve the matrix with this solver
+        virtual typename LduMatrix<Type, DType, LUType>::solverPerformance solve
+        (
+            Field<Type>& psi
+        ) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+#   include "TPCG.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/matrices/LduMatrix/Solvers/SmoothSolver/SmoothSolver.C b/src/OpenFOAM/matrices/LduMatrix/Solvers/SmoothSolver/SmoothSolver.C
new file mode 100644
index 0000000000..e6f0241308
--- /dev/null
+++ b/src/OpenFOAM/matrices/LduMatrix/Solvers/SmoothSolver/SmoothSolver.C
@@ -0,0 +1,153 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "SmoothSolver.H"
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template<class Type, class DType, class LUType>
+Foam::SmoothSolver<Type, DType, LUType>::SmoothSolver
+(
+    const word& fieldName,
+    const LduMatrix<Type, DType, LUType>& matrix,
+    const dictionary& solverDict
+)
+:
+    LduMatrix<Type, DType, LUType>::solver
+    (
+        fieldName,
+        matrix,
+        solverDict
+    ),
+    nSweeps_(1)
+{
+    readControls();
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class Type, class DType, class LUType>
+void Foam::SmoothSolver<Type, DType, LUType>::readControls()
+{
+    LduMatrix<Type, DType, LUType>::solver::readControls();
+    readControl(this->controlDict_, nSweeps_, "nSweeps");
+}
+
+
+template<class Type, class DType, class LUType>
+typename Foam::LduMatrix<Type, DType, LUType>::solverPerformance
+Foam::SmoothSolver<Type, DType, LUType>::solve(Field<Type>& psi) const
+{
+    // --- Setup class containing solver performance data
+    typename LduMatrix<Type, DType, LUType>::solverPerformance solverPerf
+    (
+        typeName,
+        this->fieldName_
+    );
+
+    // If the nSweeps_ is negative do a fixed number of sweeps
+    if (nSweeps_ < 0)
+    {
+        autoPtr<typename LduMatrix<Type, DType, LUType>::smoother>
+        smootherPtr = LduMatrix<Type, DType, LUType>::smoother::New
+        (
+            this->fieldName_,
+            this->matrix_,
+            this->controlDict_
+        );
+
+        smootherPtr->smooth(psi, -nSweeps_);
+
+        solverPerf.nIterations() -= nSweeps_;
+    }
+    else
+    {
+        Type normFactor = pTraits<Type>::zero;
+
+        {
+            Field<Type> Apsi(psi.size());
+            Field<Type> temp(psi.size());
+
+            // Calculate A.psi
+            this->matrix_.Amul(Apsi, psi);
+
+            // Calculate normalisation factor
+            normFactor = this->normFactor(psi, Apsi, temp);
+
+            // Calculate residual magnitude
+            solverPerf.initialResidual() = cmptDivide
+            (
+                gSumCmptMag(this->matrix_.source() - Apsi),
+                normFactor
+            );
+            solverPerf.finalResidual() = solverPerf.initialResidual();
+        }
+
+        if (LduMatrix<Type, DType, LUType>::debug >= 2)
+        {
+            Info<< "   Normalisation factor = " << normFactor << endl;
+        }
+
+
+        // Check convergence, solve if not converged
+        if (!solverPerf.converged(this->tolerance_, this->relTol_))
+        {
+            autoPtr<typename LduMatrix<Type, DType, LUType>::smoother>
+            smootherPtr = LduMatrix<Type, DType, LUType>::smoother::New
+            (
+                this->fieldName_,
+                this->matrix_,
+                this->controlDict_
+            );
+
+            // Smoothing loop
+            do
+            {
+                smootherPtr->smooth
+                (
+                    psi,
+                    nSweeps_
+                );
+
+                // Calculate the residual to check convergence
+                solverPerf.finalResidual() = cmptDivide
+                (
+                    gSumCmptMag(this->matrix_.residual(psi)),
+                    normFactor
+                );
+            } while
+            (
+                (solverPerf.nIterations() += nSweeps_) < this->maxIter_
+             && !(solverPerf.converged(this->tolerance_, this->relTol_))
+            );
+        }
+    }
+
+    return solverPerf;
+}
+
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/matrices/LduMatrix/Solvers/SmoothSolver/SmoothSolver.H b/src/OpenFOAM/matrices/LduMatrix/Solvers/SmoothSolver/SmoothSolver.H
new file mode 100644
index 0000000000..3d789420b3
--- /dev/null
+++ b/src/OpenFOAM/matrices/LduMatrix/Solvers/SmoothSolver/SmoothSolver.H
@@ -0,0 +1,110 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::SmoothSolver
+
+Description
+    Iterative solver for symmetric and assymetric matrices which uses a
+    run-time selected smoother e.g. GaussSeidel to converge the solution to
+    the required tolerance.  To improve efficiency, the residual is evaluated
+    after every nSweeps smoothing iterations.
+
+SourceFiles
+    SmoothSolver.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef SmoothSolver_H
+#define SmoothSolver_H
+
+#include "lduMatrix.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                           Class SmoothSolver Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class Type, class DType, class LUType>
+class SmoothSolver
+:
+    public LduMatrix<Type, DType, LUType>::solver
+{
+
+protected:
+
+    // Protected data
+
+        //- Number of sweeps before the evaluation of residual
+        label nSweeps_;
+
+        //- Read the control parameters from the controlDict_
+        virtual void readControls();
+
+
+public:
+
+    //- Runtime type information
+    TypeName("SmoothSolver");
+
+
+    // Constructors
+
+        //- Construct from matrix components and solver data dictionary
+        SmoothSolver
+        (
+            const word& fieldName,
+            const LduMatrix<Type, DType, LUType>& matrix,
+            const dictionary& solverDict
+        );
+
+
+    // Member Functions
+
+        //- Solve the matrix with this solver
+        virtual typename LduMatrix<Type, DType, LUType>::solverPerformance solve
+        (
+            Field<Type>& psi
+        ) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+#   include "SmoothSolver.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/matrices/LduMatrix/Solvers/lduSolvers.C b/src/OpenFOAM/matrices/LduMatrix/Solvers/lduSolvers.C
new file mode 100644
index 0000000000..0029abc632
--- /dev/null
+++ b/src/OpenFOAM/matrices/LduMatrix/Solvers/lduSolvers.C
@@ -0,0 +1,57 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "TPCG.H"
+#include "TPBiCG.H"
+#include "SmoothSolver.H"
+#include "fieldTypes.H"
+
+#define makeLduSolvers(Type, DType, LUType)                                   \
+                                                                              \
+    makeLduSolver(DiagonalSolver, Type, DType, LUType);                       \
+    makeLduSymSolver(DiagonalSolver, Type, DType, LUType);                    \
+    makeLduAsymSolver(DiagonalSolver, Type, DType, LUType);                   \
+                                                                              \
+    makeLduSolver(TPCG, Type, DType, LUType);                                 \
+    makeLduSymSolver(TPCG, Type, DType, LUType);                              \
+                                                                              \
+    makeLduSolver(TPBiCG, Type, DType, LUType);                               \
+    makeLduAsymSolver(TPBiCG, Type, DType, LUType);                           \
+                                                                              \
+    makeLduSolver(SmoothSolver, Type, DType, LUType);                         \
+    makeLduSymSolver(SmoothSolver, Type, DType, LUType);                      \
+    makeLduAsymSolver(SmoothSolver, Type, DType, LUType);
+
+namespace Foam
+{
+    makeLduSolvers(scalar, scalar, scalar);
+    makeLduSolvers(vector, scalar, scalar);
+    makeLduSolvers(sphericalTensor, scalar, scalar);
+    makeLduSolvers(symmTensor, scalar, scalar);
+    makeLduSolvers(tensor, scalar, scalar);
+};
+
+
+// ************************************************************************* //
diff --git a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.H b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.H
index 25021653f3..7cfbb0af12 100644
--- a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.H
+++ b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.H
@@ -142,7 +142,8 @@ class fvMatrix
         mutable GeometricField<Type, fvsPatchField, surfaceMesh>
             *faceFluxCorrectionPtr_;
 
-protected:
+// ***HGW for testing LduMatrix protected:
+public:
 
     //- Declare friendship with the fvSolver class
     friend class fvSolver;

From eed3ff360417f3c28a9ed298371edce9af4f219d Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Fri, 20 Apr 2012 14:02:17 +0100
Subject: [PATCH 248/317] Updated header

---
 src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.H | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.H b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.H
index 7cfbb0af12..f567254f86 100644
--- a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.H
+++ b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

From c0695e04faff3c54386780c0476a7e8c2630baf6 Mon Sep 17 00:00:00 2001
From: laurence <laurence>
Date: Fri, 20 Apr 2012 17:07:10 +0100
Subject: [PATCH 249/317] ENH: collapseEdges: Use PointEdgeWave to propagate
 collapse information

---
 .../mesh/advanced/collapseEdges/Make/files    |    1 +
 .../mesh/advanced/collapseEdges/Make/options  |    7 +-
 .../advanced/collapseEdges/collapseEdges.C    | 1293 ++++++++++++-----
 .../pointEdgeCollapse/pointEdgeCollapse.C     |   51 +
 .../pointEdgeCollapse/pointEdgeCollapse.H     |  227 +++
 .../pointEdgeCollapse/pointEdgeCollapseI.H    |  313 ++++
 6 files changed, 1549 insertions(+), 343 deletions(-)
 create mode 100644 applications/utilities/mesh/advanced/collapseEdges/pointEdgeCollapse/pointEdgeCollapse.C
 create mode 100644 applications/utilities/mesh/advanced/collapseEdges/pointEdgeCollapse/pointEdgeCollapse.H
 create mode 100644 applications/utilities/mesh/advanced/collapseEdges/pointEdgeCollapse/pointEdgeCollapseI.H

diff --git a/applications/utilities/mesh/advanced/collapseEdges/Make/files b/applications/utilities/mesh/advanced/collapseEdges/Make/files
index d89ca6e737..a15838abe8 100644
--- a/applications/utilities/mesh/advanced/collapseEdges/Make/files
+++ b/applications/utilities/mesh/advanced/collapseEdges/Make/files
@@ -1,3 +1,4 @@
 collapseEdges.C
+pointEdgeCollapse/pointEdgeCollapse.C
 
 EXE = $(FOAM_APPBIN)/collapseEdges
diff --git a/applications/utilities/mesh/advanced/collapseEdges/Make/options b/applications/utilities/mesh/advanced/collapseEdges/Make/options
index 73f34b0f85..d1efa61fd5 100644
--- a/applications/utilities/mesh/advanced/collapseEdges/Make/options
+++ b/applications/utilities/mesh/advanced/collapseEdges/Make/options
@@ -1,7 +1,10 @@
 EXE_INC = \
     -I$(LIB_SRC)/dynamicMesh/lnInclude \
-    -I$(LIB_SRC)/meshTools/lnInclude
+    -I$(LIB_SRC)/meshTools/lnInclude \
+    -I$(LIB_SRC)/finiteVolume/lnInclude \
+    -IpointEdgeCollapse
 
 EXE_LIBS = \
     -ldynamicMesh \
-    -lmeshTools
+    -lmeshTools \
+    -lfiniteVolume
diff --git a/applications/utilities/mesh/advanced/collapseEdges/collapseEdges.C b/applications/utilities/mesh/advanced/collapseEdges/collapseEdges.C
index 400191275c..899159b2a2 100644
--- a/applications/utilities/mesh/advanced/collapseEdges/collapseEdges.C
+++ b/applications/utilities/mesh/advanced/collapseEdges/collapseEdges.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -41,10 +41,10 @@ Description
 
 #include "argList.H"
 #include "Time.H"
-#include "edgeCollapser.H"
 #include "polyTopoChange.H"
 #include "polyTopoChanger.H"
 #include "polyMesh.H"
+#include "fvMesh.H"
 #include "mapPolyMesh.H"
 #include "mathematicalConstants.H"
 #include "PackedBoolList.H"
@@ -52,6 +52,9 @@ Description
 #include "unitConversion.H"
 #include "globalMeshData.H"
 #include "globalIndex.H"
+#include "PointEdgeWave.H"
+#include "pointEdgeCollapse.H"
+#include "motionSmoother.H"
 
 #include "OFstream.H"
 #include "meshTools.H"
@@ -60,6 +63,413 @@ using namespace Foam;
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+label findIndex
+(
+    const labelList& elems,
+    const label start,
+    const label size,
+    const label val
+)
+{
+    for (label i = start; i < size; i++)
+    {
+        if (elems[i] == val)
+        {
+            return i;
+        }
+    }
+    return -1;
+}
+
+
+void filterFace
+(
+    const label faceI,
+    face& f,
+    const List<pointEdgeCollapse>& allPointInfo,
+    const Map<DynamicList<label> >& collapseStrings
+)
+{
+    label newFp = 0;
+
+    face oldFace = f;
+
+    forAll(f, fp)
+    {
+        label pointI = f[fp];
+
+        label collapsePoint = allPointInfo[pointI].collapseIndex();
+
+        if (collapseStrings.found(collapsePoint))
+        {
+            collapsePoint = collapseStrings[collapsePoint][0];
+        }
+
+        if (collapsePoint == -1)
+        {
+            WarningIn
+                (
+                    "filterFace"
+                    "(const label, face&, const List<pointEdgeCollapse>&)"
+                )
+                << "Point " << pointI << " was not visited by PointEdgeWave"
+                << endl;
+        }
+        else if (collapsePoint == -2)
+        {
+            f[newFp++] = pointI;
+        }
+        else
+        {
+            if (findIndex(f, 0, newFp, collapsePoint) == -1)
+            {
+                f[newFp++] = collapsePoint;
+            }
+        }
+    }
+
+
+    // Check for pinched face. Tries to correct
+    // - consecutive duplicate vertex. Removes duplicate vertex.
+    // - duplicate vertex with one other vertex in between (spike).
+    // Both of these should not really occur! and should be checked before
+    // collapsing edges.
+
+    const label size = newFp;
+
+    newFp = 2;
+
+    for (label fp = 2; fp < size; fp++)
+    {
+        label fp1 = fp-1;
+        label fp2 = fp-2;
+
+        label pointI = f[fp];
+
+        // Search for previous occurrence.
+        label index = findIndex(f, 0, fp, pointI);
+
+        if (index == fp1)
+        {
+            WarningIn
+            (
+                "Foam::edgeCollapser::filterFace(const label faceI, "
+                "face& f) const"
+            )   << "Removing consecutive duplicate vertex in face "
+                << f << endl;
+            // Don't store current pointI
+        }
+        else if (index == fp2)
+        {
+            WarningIn
+            (
+                "Foam::edgeCollapser::filterFace(const label faceI, "
+                "face& f) const"
+            )   << "Removing non-consecutive duplicate vertex in face "
+                << f << endl;
+            // Don't store current pointI and remove previous
+            newFp--;
+        }
+        else if (index != -1)
+        {
+            WarningIn
+            (
+                "Foam::edgeCollapser::filterFace(const label faceI, "
+                "face& f) const"
+            )   << "Pinched face " << f << endl;
+            f[newFp++] = pointI;
+        }
+        else
+        {
+            f[newFp++] = pointI;
+        }
+    }
+
+    f.setSize(newFp);
+}
+
+
+bool setRefinement
+(
+    const polyMesh& mesh,
+    polyTopoChange& meshMod,
+    const List<pointEdgeCollapse>& allPointInfo
+)
+{
+    const cellList& cells = mesh.cells();
+    const labelList& faceOwner = mesh.faceOwner();
+    const labelList& faceNeighbour = mesh.faceNeighbour();
+    const labelListList& pointFaces = mesh.pointFaces();
+    const pointZoneMesh& pointZones = mesh.pointZones();
+
+    globalIndex globalStrings(mesh.nPoints());
+
+    boolList removedPoints(mesh.nPoints(), false);
+
+    // Create strings of edges
+    Map<DynamicList<label> > collapseStrings;
+
+    forAll(allPointInfo, pointI)
+    {
+        const label collapseIndex = allPointInfo[pointI].collapseIndex();
+
+        if (collapseIndex != -1 && collapseIndex != -2)
+        {
+            collapseStrings(collapseIndex).append(pointI);
+        }
+    }
+
+    bool meshChanged = false;
+
+    // Current faces (is also collapseStatus: f.size() < 3)
+    faceList newFaces(mesh.faces());
+
+    // Current cellCollapse status
+    boolList cellRemoved(mesh.nCells(), false);
+
+    label nUnvisited = 0;
+    label nUncollapsed = 0;
+    label nCollapsed = 0;
+
+    forAll(allPointInfo, pI)
+    {
+        const pointEdgeCollapse& pec = allPointInfo[pI];
+
+        if (pec.collapseIndex() == -1)
+        {
+            nUnvisited++;
+        }
+        else if (pec.collapseIndex() == -2)
+        {
+            nUncollapsed++;
+        }
+        else if (pec.collapseIndex() >= 0)
+        {
+            nCollapsed++;
+        }
+    }
+
+    label nPoints = allPointInfo.size();
+
+    reduce(nPoints, sumOp<label>());
+    reduce(nUnvisited, sumOp<label>());
+    reduce(nUncollapsed, sumOp<label>());
+    reduce(nCollapsed, sumOp<label>());
+
+    Info<< incrIndent;
+    Info<< indent << "Number of points : " << nPoints << nl
+        << indent << "Not visited      : " << nUnvisited << nl
+        << indent << "Not collapsed    : " << nUncollapsed << nl
+        << indent << "Collapsed        : " << nCollapsed << nl
+        << endl;
+    Info<< decrIndent;
+
+    do
+    {
+        // Update face collapse from edge collapses
+        forAll(newFaces, faceI)
+        {
+            filterFace(faceI, newFaces[faceI], allPointInfo, collapseStrings);
+        }
+
+        // Check if faces to be collapsed cause cells to become collapsed.
+        label nCellCollapsed = 0;
+
+        forAll(cells, cellI)
+        {
+            if (!cellRemoved[cellI])
+            {
+                const cell& cFaces = cells[cellI];
+
+                label nFaces = cFaces.size();
+
+                forAll(cFaces, i)
+                {
+                    label faceI = cFaces[i];
+
+                    if (newFaces[faceI].size() < 3)
+                    {
+                        --nFaces;
+
+                        if (nFaces < 4)
+                        {
+                            Info<< "Cell:" << cellI
+                                << " uses faces:" << cFaces
+                                << " of which too many are marked for removal:"
+                                << endl
+                                << "   ";
+                            forAll(cFaces, j)
+                            {
+                                if (newFaces[cFaces[j]].size() < 3)
+                                {
+                                    Info<< ' '<< cFaces[j];
+                                }
+                            }
+                            Info<< endl;
+
+                            cellRemoved[cellI] = true;
+
+                            // Collapse all edges of cell to nothing
+                            //collapseEdges(cellEdges[cellI]);
+
+                            nCellCollapsed++;
+
+                            break;
+                        }
+                    }
+                }
+            }
+        }
+
+        if (nCellCollapsed == 0)
+        {
+            break;
+        }
+    } while (true);
+
+
+    // Keep track of faces that have been done already.
+    boolList doneFace(mesh.nFaces(), false);
+
+    {
+        // Mark points used.
+        boolList usedPoint(mesh.nPoints(), false);
+
+        forAll(cellRemoved, cellI)
+        {
+            if (cellRemoved[cellI])
+            {
+                meshMod.removeCell(cellI, -1);
+            }
+        }
+
+        // Remove faces
+        forAll(newFaces, faceI)
+        {
+            const face& f = newFaces[faceI];
+
+            if (f.size() < 3)
+            {
+                meshMod.removeFace(faceI, -1);
+                meshChanged = true;
+
+                // Mark face as been done.
+                doneFace[faceI] = true;
+            }
+            else
+            {
+                // Kept face. Mark vertices
+                forAll(f, fp)
+                {
+                    usedPoint[f[fp]] = true;
+                }
+            }
+        }
+
+        // Remove unused vertices that have not been marked for removal already
+        forAll(usedPoint, pointI)
+        {
+            if (!usedPoint[pointI])
+            {
+                removedPoints[pointI] = true;
+                meshMod.removePoint(pointI, -1);
+                meshChanged = true;
+            }
+        }
+    }
+
+    // Modify the point location of the remaining points
+    forAll(allPointInfo, pointI)
+    {
+        const label collapseIndex = allPointInfo[pointI].collapseIndex();
+        const point& collapsePoint = allPointInfo[pointI].collapsePoint();
+
+        if
+        (
+            removedPoints[pointI] == false
+         && collapseIndex != -1
+         && collapseIndex != -2
+        )
+        {
+            meshMod.modifyPoint
+            (
+                pointI,
+                collapsePoint,
+                pointZones.whichZone(pointI),
+                false
+            );
+        }
+    }
+
+
+    const polyBoundaryMesh& boundaryMesh = mesh.boundaryMesh();
+    const faceZoneMesh& faceZones = mesh.faceZones();
+
+    // Renumber faces that use points
+    forAll(allPointInfo, pointI)
+    {
+        if (removedPoints[pointI] == true)
+        {
+            const labelList& changedFaces = pointFaces[pointI];
+
+            forAll(changedFaces, changedFaceI)
+            {
+                label faceI = changedFaces[changedFaceI];
+
+                if (!doneFace[faceI])
+                {
+                    doneFace[faceI] = true;
+
+                    // Get current zone info
+                    label zoneID = faceZones.whichZone(faceI);
+
+                    bool zoneFlip = false;
+
+                    if (zoneID >= 0)
+                    {
+                        const faceZone& fZone = faceZones[zoneID];
+
+                        zoneFlip = fZone.flipMap()[fZone.whichFace(faceI)];
+                    }
+
+                    // Get current connectivity
+                    label own = faceOwner[faceI];
+                    label nei = -1;
+                    label patchID = -1;
+
+                    if (mesh.isInternalFace(faceI))
+                    {
+                        nei = faceNeighbour[faceI];
+                    }
+                    else
+                    {
+                        patchID = boundaryMesh.whichPatch(faceI);
+                    }
+
+                    meshMod.modifyFace
+                    (
+                        newFaces[faceI],            // face
+                        faceI,                      // faceI to change
+                        own,                        // owner
+                        nei,                        // neighbour
+                        false,                      // flipFaceFlux
+                        patchID,                    // patch
+                        zoneID,
+                        zoneFlip
+                    );
+                    meshChanged = true;
+                }
+            }
+        }
+    }
+
+    // Print regions:
+//    printRegions();
+
+    return meshChanged;
+}
+
+
 // Get faceEdges in order of face points, i.e. faceEdges[0] is between
 // f[0] and f[1]
 labelList getSortedEdges
@@ -98,84 +508,96 @@ labelList getSortedEdges
 
 
 // Merges edges which are in straight line. I.e. edge split by point.
-label mergeEdges
-(
-    const polyMesh& mesh,
-    const scalar maxCos,
-    edgeCollapser& collapser
-)
-{
-    const pointField& points = mesh.points();
-    const edgeList& edges = mesh.edges();
-    const labelListList& pointEdges = mesh.pointEdges();
-    const labelList& region = collapser.pointRegion();
-    const labelList& master = collapser.pointRegionMaster();
-
-    label nCollapsed = 0;
-
-    forAll(pointEdges, pointI)
-    {
-        const labelList& pEdges = pointEdges[pointI];
-
-        if (pEdges.size() == 2)
-        {
-            const edge& leftE = edges[pEdges[0]];
-            const edge& rightE = edges[pEdges[1]];
-
-            // Get the two vertices on both sides of the point
-            label leftV = leftE.otherVertex(pointI);
-            label rightV = rightE.otherVertex(pointI);
-
-            // Collapse only if none of the points part of merge network
-            // or all of networks with different masters.
-            label midMaster = -1;
-            if (region[pointI] != -1)
-            {
-                midMaster = master[region[pointI]];
-            }
-
-            label leftMaster = -2;
-            if (region[leftV] != -1)
-            {
-                leftMaster = master[region[leftV]];
-            }
-
-            label rightMaster = -3;
-            if (region[rightV] != -1)
-            {
-                rightMaster = master[region[rightV]];
-            }
-
-            if
-            (
-                midMaster != leftMaster
-             && midMaster != rightMaster
-             && leftMaster != rightMaster
-            )
-            {
-                // Check if the two edge are in line
-                vector leftVec = points[pointI] - points[leftV];
-                leftVec /= mag(leftVec) + VSMALL;
-
-                vector rightVec = points[rightV] - points[pointI];
-                rightVec /= mag(rightVec) + VSMALL;
-
-                if ((leftVec & rightVec) > maxCos)
-                {
-                    // Collapse one (left) side of the edge. Make left vertex
-                    // the master.
-                    //if (collapser.unaffectedEdge(pEdges[0]))
-                    {
-                        collapser.collapseEdge(pEdges[0], leftV);
-                        nCollapsed++;
-                    }
-                }
-            }
-        }
-    }
-
-    return nCollapsed;
-}
+//label mergeEdges
+//(
+//    const polyMesh& mesh,
+//    const scalar maxCos,
+//    List<pointEdgeCollapse>& allPointInfo
+//)
+//{
+//    const pointField& points = mesh.points();
+//    const edgeList& edges = mesh.edges();
+//    const labelListList& pointEdges = mesh.pointEdges();
+//    const labelList& region = collapser.pointRegion();
+//    const labelList& master = collapser.pointRegionMaster();
+//
+//    label nCollapsed = 0;
+//
+//    forAll(pointEdges, pointI)
+//    {
+//        const labelList& pEdges = pointEdges[pointI];
+//
+//        if (pEdges.size() == 2)
+//        {
+//            const edge& leftE = edges[pEdges[0]];
+//            const edge& rightE = edges[pEdges[1]];
+//
+//            // Get the two vertices on both sides of the point
+//            label leftV = leftE.otherVertex(pointI);
+//            label rightV = rightE.otherVertex(pointI);
+//
+//            // Collapse only if none of the points part of merge network
+//            // or all of networks with different masters.
+//            label midMaster = -1;
+//            if (region[pointI] != -1)
+//            {
+//                midMaster = master[region[pointI]];
+//            }
+//
+//            label leftMaster = -2;
+//            if (region[leftV] != -1)
+//            {
+//                leftMaster = master[region[leftV]];
+//            }
+//
+//            label rightMaster = -3;
+//            if (region[rightV] != -1)
+//            {
+//                rightMaster = master[region[rightV]];
+//            }
+//
+//            if
+//            (
+//                midMaster != leftMaster
+//             && midMaster != rightMaster
+//             && leftMaster != rightMaster
+//            )
+//            {
+//                // Check if the two edge are in line
+//                vector leftVec = points[pointI] - points[leftV];
+//                leftVec /= mag(leftVec) + VSMALL;
+//
+//                vector rightVec = points[rightV] - points[pointI];
+//                rightVec /= mag(rightVec) + VSMALL;
+//
+//                if ((leftVec & rightVec) > maxCos)
+//                {
+//                    // Collapse one (left) side of the edge. Make left vertex
+//                    // the master.
+//                    //if (collapser.unaffectedEdge(pEdges[0]))
+//                    const edge& e = mesh.edges()[pEdges[0]];
+//
+//                    if
+//                    (
+//                        allPointInfo[e[0]].collapseIndex() < 0
+//                     && allPointInfo[e[1]].collapseIndex() < 0
+//                    )
+//                    {
+//                        //pointEdgeCollapse pec(mesh.points()[leftV], leftV);
+//
+//                        allPointInfo[e[0]] = pec;
+//                        allPointInfo[e[1]] = pec;
+//
+//                        //collapser.collapseEdge(pEdges[0], leftV);
+//                        nCollapsed++;
+//                    }
+//                }
+//            }
+//        }
+//    }
+//
+//    return nCollapsed;
+//}
 
 
 // Return master point edge needs to be collapsed to (or -1)
@@ -198,26 +620,26 @@ label edgeMaster
     }
 
     // Check if one of the points is on a processor
-    if
-    (
-        boundaryPoint[e0] > 0
-     && boundaryPoint[e1] > 0
-    )
-    {
-        if (boundaryPoint[e0] != boundaryPoint[e1])
-        {
-            return -1;
-        }
-    }
-
-    if (boundaryPoint[e0] > 0)
-    {
-        return e0;
-    }
-    else if (boundaryPoint[e1] > 0)
-    {
-        return e1;
-    }
+//    if
+//    (
+//        boundaryPoint[e0] > 0
+//     && boundaryPoint[e1] > 0
+//    )
+//    {
+//        if (boundaryPoint[e0] != boundaryPoint[e1])
+//        {
+//            return -1;
+//        }
+//    }
+//
+//    if (boundaryPoint[e0] > 0)
+//    {
+//        return e0;
+//    }
+//    else if (boundaryPoint[e1] > 0)
+//    {
+//        return e1;
+//    }
 
     // Collapse edge to boundary point.
     if (boundaryPoint[e0] == 0)
@@ -254,23 +676,15 @@ label edgeMaster
 label collapseSmallEdges
 (
     const polyMesh& mesh,
+    const scalarList& freezeEdges,
     const labelList& boundaryPoint,
     const scalar minLen,
-    edgeCollapser& collapser
+    List<pointEdgeCollapse>& allPointInfo
 )
 {
     const pointField& points = mesh.points();
     const edgeList& edges = mesh.edges();
 
-    // Collapse all edges that are too small. Choose intelligently which
-    // point to collapse edge to.
-
-    const globalMeshData& globalData = mesh.globalData();
-    const mapDistribute& map = globalData.globalEdgeSlavesMap();
-    const labelList& coupledMeshEdges = globalData.coupledPatchMeshEdges();
-    const indirectPrimitivePatch& coupledPatch = globalData.coupledPatch();
-    const PackedBoolList& cppOrientation = globalData.globalEdgeOrientation();
-
     // Store collapse direction in collapseEdge
     //   -1 -> Do not collapse
     //    0 -> Collapse to start point
@@ -281,97 +695,111 @@ label collapseSmallEdges
     {
         const edge& e = edges[edgeI];
 
-        if (e.mag(points) < minLen)
+        if (e.mag(points) < minLen*freezeEdges[edgeI])
         {
             collapseEdge[edgeI] = 0;
         }
     }
 
     // Check whether edge point order is reversed from mesh to coupledPatch
-    PackedBoolList meshToPatchSameOrientation(coupledMeshEdges.size(), true);
-
-    forAll(coupledMeshEdges, eI)
-    {
-        const label meshEdgeIndex = coupledMeshEdges[eI];
-
-        if (collapseEdge[meshEdgeIndex] != -1)
-        {
-            const edge& meshEdge = edges[meshEdgeIndex];
-            const edge& coupledPatchEdge = coupledPatch.edges()[eI];
-
-            if
-            (
-                meshEdge[0] == coupledPatch.meshPoints()[coupledPatchEdge[1]]
-             && meshEdge[1] == coupledPatch.meshPoints()[coupledPatchEdge[0]]
-            )
-            {
-                meshToPatchSameOrientation[eI] = false;
-            }
-        }
-    }
-
-
-    labelList cppEdgeData(coupledMeshEdges.size(), -1);
-
-    forAll(coupledMeshEdges, eI)
-    {
-        const label meshEdgeIndex = coupledMeshEdges[eI];
-
-        if (collapseEdge[meshEdgeIndex] != -1)
-        {
-            if (meshToPatchSameOrientation[eI] == cppOrientation[eI])
-            {
-                cppEdgeData[eI] = 0;
-            }
-            else
-            {
-                cppEdgeData[eI] = 1;
-            }
-        }
-    }
-
-
-    // Synchronise cppEdgeData
-    // Use minEqOp reduction, so that edge will only be collapsed on processor
-    // boundary if both processors agree to collapse it
-    globalData.syncData
-    (
-        cppEdgeData,
-        globalData.globalEdgeSlaves(),
-        globalData.globalEdgeTransformedSlaves(),
-        map,
-        minEqOp<label>()
-    );
-
-
-    forAll(coupledMeshEdges, eI)
-    {
-        const label meshEdgeIndex = coupledMeshEdges[eI];
-
-        if (collapseEdge[meshEdgeIndex] != -1)
-        {
-            if (meshToPatchSameOrientation[eI] == cppOrientation[eI])
-            {
-                collapseEdge[meshEdgeIndex] = 0;
-            }
-            else
-            {
-                collapseEdge[meshEdgeIndex] = 1;
-            }
-        }
-    }
-
-
-    OFstream str1("collapsedPoints_" + name(Pstream::myProcNo()) + ".obj");
+//    const globalMeshData& globalData = mesh.globalData();
+//    const mapDistribute& map = globalData.globalEdgeSlavesMap();
+//    const labelList& coupledMeshEdges = globalData.coupledPatchMeshEdges();
+//    const indirectPrimitivePatch& coupledPatch = globalData.coupledPatch();
+//    const PackedBoolList& cppOrientation = globalData.globalEdgeOrientation();
+//    PackedBoolList meshToPatchSameOrientation(coupledMeshEdges.size(), true);
+//
+//    forAll(coupledMeshEdges, eI)
+//    {
+//        const label meshEdgeIndex = coupledMeshEdges[eI];
+//
+//        if (collapseEdge[meshEdgeIndex] != -1)
+//        {
+//            const edge& meshEdge = edges[meshEdgeIndex];
+//            const edge& coupledPatchEdge = coupledPatch.edges()[eI];
+//
+//            if
+//            (
+//                meshEdge[0] == coupledPatch.meshPoints()[coupledPatchEdge[1]]
+//             && meshEdge[1] == coupledPatch.meshPoints()[coupledPatchEdge[0]]
+//            )
+//            {
+//                meshToPatchSameOrientation[eI] = false;
+//            }
+//        }
+//    }
+//
+//
+//    labelList cppEdgeData(coupledMeshEdges.size(), -1);
+//
+//    forAll(coupledMeshEdges, eI)
+//    {
+//        const label meshEdgeIndex = coupledMeshEdges[eI];
+//
+//        if (collapseEdge[meshEdgeIndex] != -1)
+//        {
+//            if (meshToPatchSameOrientation[eI] == cppOrientation[eI])
+//            {
+//                cppEdgeData[eI] = 0;
+//            }
+//            else
+//            {
+//                cppEdgeData[eI] = 1;
+//            }
+//        }
+//    }
+//
+//
+//    // Synchronise cppEdgeData
+//    // Use minEqOp reduction, so that edge will only be collapsed on processor
+//    // boundary if both processors agree to collapse it
+//    globalData.syncData
+//    (
+//        cppEdgeData,
+//        globalData.globalEdgeSlaves(),
+//        globalData.globalEdgeTransformedSlaves(),
+//        map,
+//        minEqOp<label>()
+//    );
+//
+//
+//    forAll(coupledMeshEdges, eI)
+//    {
+//        const label meshEdgeIndex = coupledMeshEdges[eI];
+//
+//        if (collapseEdge[meshEdgeIndex] != -1)
+//        {
+//            if (meshToPatchSameOrientation[eI] == cppOrientation[eI])
+//            {
+//                collapseEdge[meshEdgeIndex] = 0;
+//            }
+//            else
+//            {
+//                collapseEdge[meshEdgeIndex] = 1;
+//            }
+//        }
+//    }
 
     label nCollapsed = 0;
 
+    DynamicList<label> initPoints(mesh.nPoints());
+    DynamicList<pointEdgeCollapse> initPointInfo(mesh.nPoints());
+    allPointInfo.resize(mesh.nPoints());
+
+    globalIndex globalStrings(mesh.nPoints());
+
+    List<pointEdgeCollapse> allEdgeInfo(mesh.nEdges());
+    forAll(allEdgeInfo, edgeI)
+    {
+        allEdgeInfo[edgeI] = pointEdgeCollapse(vector::zero, -1);
+    }
+
     forAll(edges, edgeI)
     {
+        const edge& e = edges[edgeI];
+
         if (collapseEdge[edgeI] != -1)
         {
-            const edge& e = edges[edgeI];
-
             const label master =
                 edgeMaster
                 (
@@ -380,24 +808,37 @@ label collapseSmallEdges
                     e
                 );
 
-            if (e[0] == master)
+//            if (master != -1)
             {
-                meshTools::writeOBJ(str1, points[e[1]], points[e[0]]);
-            }
-            else if (e[1] == master)
-            {
-                meshTools::writeOBJ(str1, points[e[0]], points[e[1]]);
-            }
+                pointEdgeCollapse pec
+                (
+                    points[master],
+                    globalStrings.toGlobal(master)
+                );
 
-            if (master != -1)
-            {
-                collapser.collapseEdge(edgeI, master);
+                allEdgeInfo[edgeI] = pec;
+
+                initPointInfo.append(pec);
+                initPoints.append(e.start());
+
+                initPointInfo.append(pec);
+                initPoints.append(e.end());
 
                 nCollapsed++;
             }
         }
     }
 
+    PointEdgeWave<pointEdgeCollapse> collapsePropagator
+    (
+        mesh,
+        initPoints,
+        initPointInfo,
+        allPointInfo,
+        allEdgeInfo,
+        mesh.globalData().nTotalPoints()  // Maximum number of iterations
+    );
+
     return nCollapsed;
 }
 
@@ -474,8 +915,13 @@ label collapseSmallEdges
 //
 //            if (edgeI != -1)
 //            {
-//                label master =
-//                    edgeMaster(boundaryPoint, processorPoints, false, edges[edgeI]);
+//                label master = edgeMaster
+//                    (
+//                        boundaryPoint,
+//                        processorPoints,
+//                        false,
+//                        edges[edgeI]
+//                    );
 //
 //                if (master != -1)// && collapser.unaffectedEdge(edgeI))
 //                {
@@ -575,7 +1021,8 @@ void set(const labelList& elems, const bool val, boolList& status)
 //                    {
 //                        const edge& e = edges[edgeI];
 //
-//                        label master = edgeMaster(boundaryPoint, processorPoints, false, e);
+//                        label master
+//                       = edgeMaster(boundaryPoint, processorPoints, false, e);
 //
 //                        if (master != -1)
 //                        {
@@ -588,13 +1035,13 @@ void set(const labelList& elems, const bool val, boolList& status)
 //
 //                            forAll(pCells0, i)
 //                            {
-//                                set(cellEdges[pCells0[i]], true, protectedEdge);
+//                              set(cellEdges[pCells0[i]], true, protectedEdge);
 //                            }
 //                            const labelList& pCells1 = pointCells[e[1]];
 //
 //                            forAll(pCells1, i)
 //                            {
-//                                set(cellEdges[pCells1[i]], true, protectedEdge);
+//                              set(cellEdges[pCells1[i]], true, protectedEdge);
 //                            }
 //
 //                            nCollapsed++;
@@ -609,14 +1056,144 @@ void set(const labelList& elems, const bool val, boolList& status)
 //}
 
 
-// Main program:
+labelHashSet checkMeshQuality(const polyMesh& mesh)
+{
+    //mesh.checkMesh(true);
+    labelHashSet freezePoints;
 
+    IOdictionary meshQualityDict
+    (
+        IOobject
+        (
+            "meshQualityControls",
+            mesh.time().system(),
+            mesh.time(),
+            IOobject::MUST_READ,
+            IOobject::NO_WRITE
+        )
+    );
+
+    labelHashSet badFaces(mesh.nFaces()/100);
+    DynamicList<label> checkFaces(mesh.nFaces());
+
+    const vectorField& fAreas = mesh.faceAreas();
+
+    scalar faceAreaLimit = SMALL;
+
+    forAll(fAreas, fI)
+    {
+        if (mag(fAreas[fI]) > faceAreaLimit)
+        {
+            checkFaces.append(fI);
+        }
+    }
+
+    motionSmoother::checkMesh
+    (
+        false,
+        mesh,
+        meshQualityDict,
+        checkFaces,
+        badFaces
+    );
+
+    label nBadFaces = badFaces.size();
+    reduce(nBadFaces, sumOp<label>());
+
+    Info<< nl << "Number of bad faces          : " << nBadFaces << endl;
+
+    forAllConstIter(labelHashSet, badFaces, iter)
+    {
+        const face& f = mesh.faces()[iter.key()];
+
+        forAll(f, pI)
+        {
+            freezePoints.insert(f[pI]);
+        }
+    }
+
+//    const edgeList& edges = mesh.edges();
+//
+//    label nFrozenEdges = 0;
+//
+//    OFstream str("frozenEdges.obj");
+//
+//    label count = 0;
+//    forAll(edges, eI)
+//    {
+//        const edge& e = edges[eI];
+//
+//        if (freezePoints.found(e[0]) && freezePoints.found(e[1]))
+//        {
+//            freezeEdges[eI] = true;
+//            nFrozenEdges++;
+//        }
+//    }
+
+    return freezePoints;
+}
+
+
+// Mark boundary points
+// boundaryPoint:
+// + -1 : point not on boundary
+// +  0 : point on a real boundary
+// + >0 : point on a processor patch with that ID
+labelList findBoundaryPoints(const polyMesh& mesh)
+{
+    const faceList& faces = mesh.faces();
+    const polyBoundaryMesh& bMesh = mesh.boundaryMesh();
+
+
+    labelList boundaryPoint(mesh.nPoints(), -1);
+
+    // Get all points on a boundary
+    label nIntFaces = mesh.nInternalFaces();
+    for (label faceI = nIntFaces; faceI < mesh.nFaces(); faceI++)
+    {
+        const face& f = faces[faceI];
+
+        forAll(f, fp)
+        {
+           boundaryPoint[f[fp]] = 0;
+        }
+    }
+
+    // Get all processor boundary points and the processor patch label
+    // that they are on.
+    forAll(bMesh, patchI)
+    {
+        const polyPatch& patch = bMesh[patchI];
+
+        if (isA<processorPolyPatch>(patch))
+        {
+            const processorPolyPatch& pPatch =
+                refCast<const processorPolyPatch>(patch);
+
+            forAll(pPatch, fI)
+            {
+                const face& f = pPatch[fI];
+
+                forAll(f, fp)
+                {
+                    boundaryPoint[f[fp]] = patchI;
+                }
+            }
+        }
+    }
+
+    return boundaryPoint;
+}
+
+
+// Main program:
 int main(int argc, char *argv[])
 {
 #   include "addOverwriteOption.H"
 
     argList::validArgs.append("edge length [m]");
     argList::validArgs.append("merge angle (degrees)");
+    argList::addOption("minLenFactor", "scalar", "edge length factor");
 
 #   include "setRootCase.H"
 #   include "createTime.H"
@@ -624,8 +1201,11 @@ int main(int argc, char *argv[])
 #   include "createPolyMesh.H"
     const word oldInstance = mesh.pointsInstance();
 
-    const scalar minLen  = args.argRead<scalar>(1);
+    scalar minLen  = args.argRead<scalar>(1);
     const scalar angle   = args.argRead<scalar>(2);
+    const scalar minLenFactor
+        = args.optionLookupOrDefault<scalar>("minLenFactor", 0.5);
+
     const bool overwrite = args.optionFound("overwrite");
 
     scalar maxCos = Foam::cos(degToRad(angle));
@@ -636,171 +1216,196 @@ int main(int argc, char *argv[])
         << " degrees" << nl
         << endl;
 
+    Info<< "If an invalid mesh is generated then the edge length will be " << nl
+        << "multiplied by a factor of " << minLenFactor << " and collapsing "
+        << "will be reattempted" << nl << endl;
+
     bool meshChanged = false;
 
-    // Edge collapsing engine
-    edgeCollapser collapser(mesh);
+    checkMeshQuality(mesh);
 
-    label nIterations = 0;
+    autoPtr<fvMesh> fvMeshPtr;
 
-    while (true)
+    scalarList freezeEdges(mesh.nEdges(), 1.0);
+
+    do
     {
-        Info<< "Iteration " << nIterations << incrIndent << endl;
+        label nIterations = 0;
+        label nFrozenEdges = 0;
 
-        const faceList& faces = mesh.faces();
+        fvMeshPtr.reset(new fvMesh(mesh));
+        fvMesh& fvMeshRef = fvMeshPtr();
 
-        // boundaryPoint:
-        // + -1 : point not on boundary
-        // +  0 : point on a real boundary
-        // + >0 : point on a processor patch with that ID
-        labelList boundaryPoint(mesh.nPoints(), -1);
+        // Contains new point label for original points
+        labelList pointMap(identity(mesh.nPoints()));
 
-        // Get all points on a boundary
-        label nIntFaces = mesh.nInternalFaces();
-        for (label faceI = nIntFaces; faceI < mesh.nFaces(); faceI++)
+        scalarList tmpFreezeEdges = freezeEdges;
+
+        autoPtr<mapPolyMesh> morphMap;
+
+        while (true)
         {
-            const face& f = faces[faceI];
+            Info<< "Iteration " << nIterations << incrIndent << endl;
 
-            forAll(f, fp)
+            labelList boundaryPoint = findBoundaryPoints(fvMeshRef);
+
+            List<pointEdgeCollapse> allPointInfo;
+
+            // Collapse all edges that are too small.
+            label nSmallCollapsed =
+                collapseSmallEdges
+                (
+                    fvMeshRef,
+                    tmpFreezeEdges,
+                    boundaryPoint,
+                    minLen,
+                    allPointInfo
+                );
+
+            reduce(nSmallCollapsed, sumOp<label>());
+
+            Info<< indent << "Collapsing " << nSmallCollapsed
+                << " small edges" << endl;
+
+
+
+
+
+            label nMerged = 0;
+
+            // Remove midpoints on straight edges.
+            if (nSmallCollapsed == 0)
             {
-                boundaryPoint[f[fp]] = 0;
+                //nMerged = mergeEdges(fvMeshRef, maxCos, allPointInfo);
             }
-        }
 
-        // Get all processor boundary points and the processor patch label that
-        // they are on.
-        const polyBoundaryMesh& bMesh = mesh.boundaryMesh();
+            reduce(nMerged, sumOp<label>());
 
-        forAll(bMesh, patchI)
-        {
-            const polyPatch& patch = bMesh[patchI];
+            Info<< indent << "Collapsing " << nMerged << " in line edges"
+                << endl;
 
-            if (isA<processorPolyPatch>(patch))
+
+
+
+
+
+            label nSliversCollapsed = 0;
+
+            // Remove small sliver faces that can be collapsed to single edge
+//            if (nSmallCollapsed == 0 && nMerged == 0)
+//            {
+//                nSliversCollapsed =
+//                    collapseHighAspectFaces
+//                    (
+//                        mesh,
+//                        boundaryPoint,
+//                        processorPoints,
+//                        1E-9,
+//                        5,
+//                        collapser
+//                    );
+//            }
+
+            reduce(nSliversCollapsed, sumOp<label>());
+
+            Info<< indent << "Collapsing " << nSliversCollapsed
+                << " small high aspect ratio faces" << endl;
+
+
+            // Simplify faces to quads wherever possible
+            //if (nCollapsed == 0)
+            //{
+            //    nCollapsed =
+            //        simplifyFaces
+            //        (
+            //            mesh,
+            //            boundaryPoint,
+            //            4,              // minimum size of face
+            //            0.2,            // gap in edge lengths on face
+            //            collapser
+            //        );
+            //    Info<< "Collapsing " << nCollapsed << " polygonal faces"
+            //        << endl;
+            //}
+
+
+            label totalCollapsed =
+                nSmallCollapsed
+              + nMerged
+              + nSliversCollapsed;
+
+            polyTopoChange meshMod(fvMeshRef);
+
+            // Insert mesh refinement into polyTopoChange.
+            setRefinement(fvMeshRef, meshMod, allPointInfo);
+
+            // Do all changes
+            Info<< indent << "Applying changes to the mesh" << nl
+                << decrIndent << endl;
+
+            morphMap = meshMod.changeMesh(fvMeshRef, false);
+
+//            // Contains new point label for old points
+//            const labelList& reversePointMap = morphMap().reversePointMap();
+//
+//            forAll(pointMap, pI)
+//            {
+//                const label originalPoint = pI;
+//                const label currentPoint = pointMap[pI];
+//
+//                if (currentPoint < reversePointMap.size())
+//                {
+//                    const label newPoint = reversePointMap[currentPoint];
+//
+//                    if (newPoint != -1)
+//                    {
+//                        pointMap[originalPoint] = newPoint;
+//                    }
+//                }
+//            }
+
+            if (totalCollapsed == 0)
             {
-                const processorPolyPatch& pPatch =
-                    refCast<const processorPolyPatch>(patch);
+                labelHashSet freezePoints = checkMeshQuality(fvMeshRef);
 
-                forAll(pPatch, fI)
-                {
-                    const face& f = pPatch[fI];
+                label nFreezePoints = freezePoints.size();
+                reduce(nFreezePoints, sumOp<label>());
 
-                    forAll(f, fp)
-                    {
-                        boundaryPoint[f[fp]] = patchI;
-                    }
-                }
+                nFrozenEdges = nFreezePoints;
+
+                Info<< "Number of frozen points      : " << nFreezePoints
+                    << endl;
+
+                break;
             }
+
+            if (morphMap().hasMotionPoints())
+            {
+                fvMeshRef.movePoints(morphMap().preMotionPoints());
+            }
+
+            meshChanged = true;
+
+            nIterations++;
         }
 
-        // Collapse all edges that are too small.
-        label nSmallCollapsed =
-            collapseSmallEdges
-            (
-                mesh,
-                boundaryPoint,
-                minLen,
-                collapser
-            );
-
-        reduce(nSmallCollapsed, sumOp<label>());
-
-        Info<< indent << "Collapsing " << nSmallCollapsed
-            << " small edges" << endl;
-
-
-
-
-
-        label nMerged = 0;
-
-        // Remove midpoints on straight edges.
-        if (nSmallCollapsed == 0)
+        if (nFrozenEdges > 0)
         {
-            //nMerged = mergeEdges(mesh, maxCos, collapser);
+            minLen *= minLenFactor;
         }
 
-        reduce(nMerged, sumOp<label>());
+        reduce(nFrozenEdges, sumOp<label>());
 
-        Info<< indent << "Collapsing " << nMerged << " in line edges" << endl;
+        Info<< "Number of frozen edges       : " << nFrozenEdges << nl
+            << endl;
 
-
-
-
-
-
-        label nSliversCollapsed = 0;
-
-        // Remove small sliver faces that can be collapsed to single edge
-        if (nSmallCollapsed == 0 && nMerged == 0)
-        {
-//            nSliversCollapsed =
-//                collapseHighAspectFaces
-//                (
-//                    mesh,
-//                    boundaryPoint,
-//                    processorPoints,
-//                    1E-9,       // factor of largest face area
-//                    5,          // factor between smallest and largest edge on
-//                                // face
-//                    collapser
-//                );
-        }
-
-        reduce(nSliversCollapsed, sumOp<label>());
-
-        Info<< indent << "Collapsing " << nSliversCollapsed
-            << " small high aspect ratio faces" << endl;
-
-
-        // Simplify faces to quads wherever possible
-        //if (nCollapsed == 0)
-        //{
-        //    nCollapsed =
-        //        simplifyFaces
-        //        (
-        //            mesh,
-        //            boundaryPoint,
-        //            4,              // minimum size of face
-        //            0.2,            // gap in edge lengths on face
-        //            collapser
-        //        );
-        //    Info<< "Collapsing " << nCollapsed << " polygonal faces" << endl;
-        //}
-
-
-        label totalCollapsed =
-            nSmallCollapsed
-          + nMerged
-          + nSliversCollapsed;
-
-        if (totalCollapsed == 0)
+        if (nFrozenEdges == 0)
         {
             break;
         }
 
-        polyTopoChange meshMod(mesh);
+    } while (true);
 
-        // Insert mesh refinement into polyTopoChange.
-        collapser.setRefinement(meshMod);
-
-        // Do all changes
-        Info<< indent << "Applying changes to the mesh" << nl << endl;
-
-        autoPtr<mapPolyMesh> morphMap = meshMod.changeMesh(mesh, false);
-
-        collapser.updateMesh(morphMap());
-
-        if (morphMap().hasMotionPoints())
-        {
-            mesh.movePoints(morphMap().preMotionPoints());
-        }
-
-        meshChanged = true;
-
-        Info<< decrIndent;
-
-        nIterations++;
-    }
 
     if (meshChanged)
     {
@@ -811,15 +1416,21 @@ int main(int argc, char *argv[])
         }
         else
         {
-            mesh.setInstance(oldInstance);
+            fvMeshPtr().setInstance(oldInstance);
         }
 
         Info<< nl << "Writing collapsed mesh to time "
             << runTime.timeName() << nl << endl;
 
-        mesh.write();
+        fvMeshPtr().write();
     }
 
+    Info<< "Final minimum length : " << minLen << " m" << nl << endl;
+
+    Info<< nl << "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
+        << "  ClockTime = " << runTime.elapsedClockTime() << " s"
+        << nl << endl;
+
     Info<< "End\n" << endl;
 
     return 0;
diff --git a/applications/utilities/mesh/advanced/collapseEdges/pointEdgeCollapse/pointEdgeCollapse.C b/applications/utilities/mesh/advanced/collapseEdges/pointEdgeCollapse/pointEdgeCollapse.C
new file mode 100644
index 0000000000..6830e1c8f5
--- /dev/null
+++ b/applications/utilities/mesh/advanced/collapseEdges/pointEdgeCollapse/pointEdgeCollapse.C
@@ -0,0 +1,51 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "pointEdgeCollapse.H"
+
+// * * * * * * * * * * * * * * * Friend Operators  * * * * * * * * * * * * * //
+
+Foam::Ostream& Foam::operator<<
+(
+    Foam::Ostream& os,
+    const Foam::pointEdgeCollapse& wDist
+)
+{
+    return os
+        << wDist.collapsePoint_ << wDist.collapseIndex_;
+}
+
+Foam::Istream& Foam::operator>>
+(
+    Foam::Istream& is,
+    Foam::pointEdgeCollapse& wDist
+)
+{
+    return is
+        >> wDist.collapsePoint_ >> wDist.collapseIndex_;
+}
+
+
+// ************************************************************************* //
diff --git a/applications/utilities/mesh/advanced/collapseEdges/pointEdgeCollapse/pointEdgeCollapse.H b/applications/utilities/mesh/advanced/collapseEdges/pointEdgeCollapse/pointEdgeCollapse.H
new file mode 100644
index 0000000000..cd8383b8b3
--- /dev/null
+++ b/applications/utilities/mesh/advanced/collapseEdges/pointEdgeCollapse/pointEdgeCollapse.H
@@ -0,0 +1,227 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::pointEdgeCollapse
+
+Description
+    Determines length of string of edges walked to point.
+
+SourceFiles
+    pointEdgeCollapseI.H
+    pointEdgeCollapse.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef pointEdgeCollapse_H
+#define pointEdgeCollapse_H
+
+#include "point.H"
+#include "tensor.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// Forward declaration of classes
+class polyPatch;
+class polyMesh;
+
+/*---------------------------------------------------------------------------*\
+                           Class pointEdgeCollapse Declaration
+\*---------------------------------------------------------------------------*/
+
+class pointEdgeCollapse
+{
+    // Private data
+
+        //- Collapse location
+        point collapsePoint_;
+
+        //- Collapse string index
+        label collapseIndex_;
+
+
+    // Private Member Functions
+
+        //- Evaluate distance to point.
+        template<class TrackingData>
+        inline bool update
+        (
+            const pointEdgeCollapse& w2,
+            const scalar tol,
+            TrackingData& td
+        );
+
+
+        //- Check for same coordinate
+        inline bool samePoint(const point& pt) const;
+
+public:
+
+    // Constructors
+
+        //- Construct null
+        inline pointEdgeCollapse();
+
+        //- Construct from components
+        inline pointEdgeCollapse
+        (
+            const point& collapsePoint,
+            const label collapseIndex
+        );
+
+
+    // Member Functions
+
+        // Access
+
+            inline const point& collapsePoint() const;
+
+            inline label collapseIndex() const;
+
+
+        // Needed by meshWave
+
+            //- Check whether origin has been changed at all or
+            //  still contains original (invalid) value.
+            template<class TrackingData>
+            inline bool valid(TrackingData& td) const;
+
+            //- Convert origin to relative vector to leaving point
+            //  (= point coordinate)
+            template<class TrackingData>
+            inline void leaveDomain
+            (
+                const polyPatch& patch,
+                const label patchPointI,
+                const point& pos,
+                TrackingData& td
+            );
+
+            //- Convert relative origin to absolute by adding entering point
+            template<class TrackingData>
+            inline void enterDomain
+            (
+                const polyPatch& patch,
+                const label patchPointI,
+                const point& pos,
+                TrackingData& td
+            );
+
+            //- Apply rotation matrix to origin
+            template<class TrackingData>
+            inline void transform
+            (
+                const tensor& rotTensor,
+                TrackingData& td
+            );
+
+            //- Influence of edge on point
+            template<class TrackingData>
+            inline bool updatePoint
+            (
+                const polyMesh& mesh,
+                const label pointI,
+                const label edgeI,
+                const pointEdgeCollapse& edgeInfo,
+                const scalar tol,
+                TrackingData& td
+            );
+
+            //- Influence of different value on same point.
+            //  Merge new and old info.
+            template<class TrackingData>
+            inline bool updatePoint
+            (
+                const polyMesh& mesh,
+                const label pointI,
+                const pointEdgeCollapse& newPointInfo,
+                const scalar tol,
+                TrackingData& td
+            );
+
+            //- Influence of different value on same point.
+            //  No information about current position whatsoever.
+            template<class TrackingData>
+            inline bool updatePoint
+            (
+                const pointEdgeCollapse& newPointInfo,
+                const scalar tol,
+                TrackingData& td
+            );
+
+            //- Influence of point on edge.
+            template<class TrackingData>
+            inline bool updateEdge
+            (
+                const polyMesh& mesh,
+                const label edgeI,
+                const label pointI,
+                const pointEdgeCollapse& pointInfo,
+                const scalar tol,
+                TrackingData& td
+            );
+
+            //- Same (like operator==)
+            template<class TrackingData>
+            inline bool equal(const pointEdgeCollapse&, TrackingData&)
+            const;
+
+
+    // Member Operators
+
+        //Note: Used to determine whether to call update.
+        inline bool operator==(const pointEdgeCollapse&) const;
+        inline bool operator!=(const pointEdgeCollapse&) const;
+
+
+    // IOstream Operators
+
+        friend Ostream& operator<<(Ostream&, const pointEdgeCollapse&);
+        friend Istream& operator>>(Istream&, pointEdgeCollapse&);
+};
+
+
+//- Data associated with pointEdgeCollapse type are contiguous
+template<>
+inline bool contiguous<pointEdgeCollapse>()
+{
+    return true;
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#include "pointEdgeCollapseI.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/applications/utilities/mesh/advanced/collapseEdges/pointEdgeCollapse/pointEdgeCollapseI.H b/applications/utilities/mesh/advanced/collapseEdges/pointEdgeCollapse/pointEdgeCollapseI.H
new file mode 100644
index 0000000000..3fb1468a88
--- /dev/null
+++ b/applications/utilities/mesh/advanced/collapseEdges/pointEdgeCollapse/pointEdgeCollapseI.H
@@ -0,0 +1,313 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "polyMesh.H"
+#include "transform.H"
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+// Update this with w2.
+template<class TrackingData>
+inline bool Foam::pointEdgeCollapse::update
+(
+    const pointEdgeCollapse& w2,
+    const scalar tol,
+    TrackingData& td
+)
+{
+    if (!w2.valid(td))
+    {
+        FatalErrorIn("pointEdgeCollapse::update(..)")
+            << "problem." << abort(FatalError);
+    }
+
+    if (w2.collapseIndex_ == -1)
+    {
+        // Not marked for collapse; only happens on edges.
+        return false;
+    }
+
+    if (!valid(td))
+    {
+        operator=(w2);
+        return true;
+    }
+    else
+    {
+        // Same coordinate. Same string?
+        if (w2.collapseIndex_ < collapseIndex_)
+        {
+            // Take over string index from w2 (and also coordinate but this
+            // was same)
+            operator=(w2);
+            return true;
+        }
+        else if (w2.collapseIndex_ == collapseIndex_)
+        {
+            bool identicalPoint = samePoint(w2.collapsePoint_);
+            bool nearer = magSqr(w2.collapsePoint_) < magSqr(collapsePoint_);
+            if (nearer)
+            {
+                operator=(w2);
+            }
+            if (identicalPoint)
+            {
+                return false;
+            }
+            else
+            {
+                return nearer;
+            }
+        }
+        else
+        {
+            return false;
+        }
+
+//        if (samePoint(w2.collapsePoint_))
+//        {
+//            // Same coordinate. Same string?
+//            if (w2.collapseIndex_ < collapseIndex_)
+//            {
+//                // Take over string index from w2 (and also coordinate but this
+//                // was same)
+//                operator=(w2);
+//                return true;
+//            }
+//            else
+//            {
+//                return false;
+//            }
+//        }
+//        else
+//        {
+//            // Find nearest coordinate
+//            if (magSqr(w2.collapsePoint_) < magSqr(collapsePoint_))
+//            {
+//                operator=(w2);
+//                return true;
+//            }
+//            else
+//            {
+//                return false;
+//            }
+//        }
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+// Null constructor
+inline Foam::pointEdgeCollapse::pointEdgeCollapse()
+:
+    collapsePoint_(GREAT, GREAT, GREAT),
+    collapseIndex_(-2)
+{}
+
+
+// Construct from origin, distance
+inline Foam::pointEdgeCollapse::pointEdgeCollapse
+(
+    const point& collapsePoint,
+    const label collapseIndex
+)
+:
+    collapsePoint_(collapsePoint),
+    collapseIndex_(collapseIndex)
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+inline const Foam::point& Foam::pointEdgeCollapse::collapsePoint() const
+{
+    return collapsePoint_;
+}
+
+
+inline Foam::label Foam::pointEdgeCollapse::collapseIndex() const
+{
+    return collapseIndex_;
+}
+
+
+inline bool Foam::pointEdgeCollapse::samePoint(const point& pt) const
+{
+    bool isLegal1 = (cmptMin(collapsePoint_) < 0.5*GREAT);
+    bool isLegal2 = (cmptMin(pt) < 0.5*GREAT);
+
+    if (isLegal1 && isLegal2)
+    {
+        return mag(collapsePoint_ - pt) < 1e-9;//SMALL;
+    }
+    else
+    {
+        return isLegal1 == isLegal2;
+    }
+}
+
+
+template<class TrackingData>
+inline bool Foam::pointEdgeCollapse::valid(TrackingData& td) const
+{
+    return collapseIndex_ != -2;
+}
+
+
+template<class TrackingData>
+inline void Foam::pointEdgeCollapse::leaveDomain
+(
+    const polyPatch& patch,
+    const label patchPointI,
+    const point& coord,
+    TrackingData& td
+)
+{
+    collapsePoint_ -= coord;
+}
+
+
+template<class TrackingData>
+inline void Foam::pointEdgeCollapse::transform
+(
+    const tensor& rotTensor,
+    TrackingData& td
+)
+{
+    collapsePoint_ = Foam::transform(rotTensor, collapsePoint_);
+}
+
+
+// Update absolute geometric quantities. Note that distance (dist_)
+// is not affected by leaving/entering domain.
+template<class TrackingData>
+inline void Foam::pointEdgeCollapse::enterDomain
+(
+    const polyPatch& patch,
+    const label patchPointI,
+    const point& coord,
+    TrackingData& td
+)
+{
+    // back to absolute form
+    collapsePoint_ += coord;
+}
+
+
+// Update this with information from connected edge
+template<class TrackingData>
+inline bool Foam::pointEdgeCollapse::updatePoint
+(
+    const polyMesh& mesh,
+    const label pointI,
+    const label edgeI,
+    const pointEdgeCollapse& edgeInfo,
+    const scalar tol,
+    TrackingData& td
+)
+{
+    return update(edgeInfo, tol, td);
+}
+
+
+// Update this with new information on same point
+template<class TrackingData>
+inline bool Foam::pointEdgeCollapse::updatePoint
+(
+    const polyMesh& mesh,
+    const label pointI,
+    const pointEdgeCollapse& newPointInfo,
+    const scalar tol,
+    TrackingData& td
+)
+{
+    return update(newPointInfo, tol, td);
+}
+
+
+// Update this with new information on same point. No extra information.
+template<class TrackingData>
+inline bool Foam::pointEdgeCollapse::updatePoint
+(
+    const pointEdgeCollapse& newPointInfo,
+    const scalar tol,
+    TrackingData& td
+)
+{
+    return update(newPointInfo, tol, td);
+}
+
+
+// Update this with information from connected point
+template<class TrackingData>
+inline bool Foam::pointEdgeCollapse::updateEdge
+(
+    const polyMesh& mesh,
+    const label edgeI,
+    const label pointI,
+    const pointEdgeCollapse& pointInfo,
+    const scalar tol,
+    TrackingData& td
+)
+{
+    return update(pointInfo, tol, td);
+}
+
+
+template <class TrackingData>
+inline bool Foam::pointEdgeCollapse::equal
+(
+    const pointEdgeCollapse& rhs,
+    TrackingData& td
+) const
+{
+    return operator==(rhs);
+}
+
+
+// * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
+
+inline bool Foam::pointEdgeCollapse::operator==
+(
+    const Foam::pointEdgeCollapse& rhs
+) const
+{
+    return
+        collapseIndex_ == rhs.collapseIndex_
+     && samePoint(rhs.collapsePoint_);
+}
+
+
+inline bool Foam::pointEdgeCollapse::operator!=
+(
+    const Foam::pointEdgeCollapse& rhs
+) const
+{
+    return !(*this == rhs);
+}
+
+
+// ************************************************************************* //

From 08f30e224912e26776aae7c613652b286e852e8f Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Fri, 20 Apr 2012 17:23:45 +0100
Subject: [PATCH 250/317] ENH: triSurface.C: stlb forces binary reading #516

---
 src/triSurface/triSurface/triSurface.C | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/triSurface/triSurface/triSurface.C b/src/triSurface/triSurface/triSurface.C
index 6ae73266ee..1350653865 100644
--- a/src/triSurface/triSurface/triSurface.C
+++ b/src/triSurface/triSurface/triSurface.C
@@ -386,7 +386,7 @@ bool Foam::triSurface::read
     }
     else if (ext == "stlb")
     {
-        return readSTL(name);
+        return readSTLBINARY(name);
     }
     else if (ext == "gts")
     {

From 8a41c1538c63b903c9422fb217bdb8edc8e42bd4 Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Mon, 23 Apr 2012 15:36:33 +0100
Subject: [PATCH 251/317] lduInterfaceField: Simplified arguments to
 initInterfaceMatrix and updateInterfaceMatrix

---
 .../lduInterfaceField/lduInterfaceField.H     |  6 ++---
 .../lduMatrixUpdateMatrixInterfaces.C         | 24 +++++++------------
 .../cyclicGAMGInterfaceField.C                |  3 +--
 .../cyclicGAMGInterfaceField.H                |  3 +--
 .../processorCyclicGAMGInterfaceField.C       |  6 ++---
 .../processorCyclicGAMGInterfaceField.H       |  6 ++---
 .../processorGAMGInterfaceField.C             |  6 ++---
 .../processorGAMGInterfaceField.H             |  6 ++---
 .../basic/coupled/coupledFvPatchField.H       |  3 +--
 .../constraint/cyclic/cyclicFvPatchField.C    |  3 +--
 .../constraint/cyclic/cyclicFvPatchField.H    |  3 +--
 .../cyclicAMI/cyclicAMIFvPatchField.C         |  3 +--
 .../cyclicAMI/cyclicAMIFvPatchField.H         |  3 +--
 .../jumpCyclic/jumpCyclicFvPatchField.C       |  3 +--
 .../jumpCyclic/jumpCyclicFvPatchField.H       |  3 +--
 .../processor/processorFvPatchField.C         |  6 ++---
 .../processor/processorFvPatchField.H         |  6 ++---
 .../processor/processorFvPatchScalarField.C   |  6 ++---
 .../processor/processorFvPatchScalarField.H   |  6 ++---
 .../processorCyclicFvPatchField.C             |  6 ++---
 .../processorCyclicFvPatchScalarField.H       |  6 ++---
 .../cyclicAMIGAMGInterfaceField.C             |  3 +--
 .../cyclicAMIGAMGInterfaceField.H             |  3 +--
 23 files changed, 41 insertions(+), 82 deletions(-)

diff --git a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterfaceFields/lduInterfaceField/lduInterfaceField.H b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterfaceFields/lduInterfaceField/lduInterfaceField.H
index b8180a2b3e..e4aa7b1032 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterfaceFields/lduInterfaceField/lduInterfaceField.H
+++ b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterfaceFields/lduInterfaceField/lduInterfaceField.H
@@ -115,9 +115,8 @@ public:
             //- Initialise neighbour matrix update
             virtual void initInterfaceMatrixUpdate
             (
-                const scalarField&,
                 scalarField&,
-                const lduMatrix&,
+                const scalarField&,
                 const scalarField&,
                 const direction,
                 const Pstream::commsTypes commsType
@@ -145,9 +144,8 @@ public:
             //- Update result field based on interface functionality
             virtual void updateInterfaceMatrix
             (
-                const scalarField&,
                 scalarField&,
-                const lduMatrix&,
+                const scalarField&,
                 const scalarField&,
                 const direction,
                 const Pstream::commsTypes commsType
diff --git a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixUpdateMatrixInterfaces.C b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixUpdateMatrixInterfaces.C
index 62d00b7626..bf48d3852b 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixUpdateMatrixInterfaces.C
+++ b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixUpdateMatrixInterfaces.C
@@ -48,9 +48,8 @@ void Foam::lduMatrix::initMatrixInterfaces
             {
                 interfaces[interfaceI].initInterfaceMatrixUpdate
                 (
-                    psiif,
                     result,
-                    *this,
+                    psiif,
                     coupleCoeffs[interfaceI],
                     cmpt,
                     Pstream::defaultCommsType
@@ -75,9 +74,8 @@ void Foam::lduMatrix::initMatrixInterfaces
             {
                 interfaces[interfaceI].initInterfaceMatrixUpdate
                 (
-                    psiif,
                     result,
-                    *this,
+                    psiif,
                     coupleCoeffs[interfaceI],
                     cmpt,
                     Pstream::blocking
@@ -112,9 +110,8 @@ void Foam::lduMatrix::updateMatrixInterfaces
             {
                 interfaces[interfaceI].updateInterfaceMatrix
                 (
-                    psiif,
                     result,
-                    *this,
+                    psiif,
                     coupleCoeffs[interfaceI],
                     cmpt,
                     Pstream::defaultCommsType
@@ -141,9 +138,8 @@ void Foam::lduMatrix::updateMatrixInterfaces
                         {
                             interfaces[interfaceI].updateInterfaceMatrix
                             (
-                                psiif,
                                 result,
-                                *this,
+                                psiif,
                                 coupleCoeffs[interfaceI],
                                 cmpt,
                                 Pstream::defaultCommsType
@@ -193,9 +189,8 @@ void Foam::lduMatrix::updateMatrixInterfaces
             {
                 interfaces[interfaceI].updateInterfaceMatrix
                 (
-                    psiif,
                     result,
-                    *this,
+                    psiif,
                     coupleCoeffs[interfaceI],
                     cmpt,
                     Pstream::defaultCommsType
@@ -218,9 +213,8 @@ void Foam::lduMatrix::updateMatrixInterfaces
                 {
                     interfaces[interfaceI].initInterfaceMatrixUpdate
                     (
-                        psiif,
                         result,
-                        *this,
+                        psiif,
                         coupleCoeffs[interfaceI],
                         cmpt,
                         Pstream::scheduled
@@ -230,9 +224,8 @@ void Foam::lduMatrix::updateMatrixInterfaces
                 {
                     interfaces[interfaceI].updateInterfaceMatrix
                     (
-                        psiif,
                         result,
-                        *this,
+                        psiif,
                         coupleCoeffs[interfaceI],
                         cmpt,
                         Pstream::scheduled
@@ -254,9 +247,8 @@ void Foam::lduMatrix::updateMatrixInterfaces
             {
                 interfaces[interfaceI].updateInterfaceMatrix
                 (
-                    psiif,
                     result,
-                    *this,
+                    psiif,
                     coupleCoeffs[interfaceI],
                     cmpt,
                     Pstream::blocking
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/cyclicGAMGInterfaceField/cyclicGAMGInterfaceField.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/cyclicGAMGInterfaceField/cyclicGAMGInterfaceField.C
index eb7e39b3d4..0200de16ba 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/cyclicGAMGInterfaceField/cyclicGAMGInterfaceField.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/cyclicGAMGInterfaceField/cyclicGAMGInterfaceField.C
@@ -72,9 +72,8 @@ Foam::cyclicGAMGInterfaceField::~cyclicGAMGInterfaceField()
 
 void Foam::cyclicGAMGInterfaceField::updateInterfaceMatrix
 (
-    const scalarField& psiInternal,
     scalarField& result,
-    const lduMatrix&,
+    const scalarField& psiInternal,
     const scalarField& coeffs,
     const direction cmpt,
     const Pstream::commsTypes
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/cyclicGAMGInterfaceField/cyclicGAMGInterfaceField.H b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/cyclicGAMGInterfaceField/cyclicGAMGInterfaceField.H
index 5edb1a58af..b151579786 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/cyclicGAMGInterfaceField/cyclicGAMGInterfaceField.H
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/cyclicGAMGInterfaceField/cyclicGAMGInterfaceField.H
@@ -110,9 +110,8 @@ public:
             //- Update result field based on interface functionality
             virtual void updateInterfaceMatrix
             (
-                const scalarField& psiInternal,
                 scalarField& result,
-                const lduMatrix&,
+                const scalarField& psiInternal,
                 const scalarField& coeffs,
                 const direction cmpt,
                 const Pstream::commsTypes commsType
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/processorCyclicGAMGInterfaceField/processorCyclicGAMGInterfaceField.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/processorCyclicGAMGInterfaceField/processorCyclicGAMGInterfaceField.C
index d5e7cab4e2..2e7a81219f 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/processorCyclicGAMGInterfaceField/processorCyclicGAMGInterfaceField.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/processorCyclicGAMGInterfaceField/processorCyclicGAMGInterfaceField.C
@@ -63,9 +63,8 @@ Foam::processorCyclicGAMGInterfaceField::~processorCyclicGAMGInterfaceField()
 
 //void Foam::processorCyclicGAMGInterfaceField::initInterfaceMatrixUpdate
 //(
-//    const scalarField& psiInternal,
 //    scalarField&,
-//    const lduMatrix&,
+//    const scalarField&,
 //    const scalarField&,
 //    const direction,
 //    const Pstream::commsTypes commsType
@@ -81,9 +80,8 @@ Foam::processorCyclicGAMGInterfaceField::~processorCyclicGAMGInterfaceField()
 //
 //void Foam::processorCyclicGAMGInterfaceField::updateInterfaceMatrix
 //(
-//    const scalarField&,
 //    scalarField& result,
-//    const lduMatrix&,
+//    const scalarField&,
 //    const scalarField& coeffs,
 //    const direction cmpt,
 //    const Pstream::commsTypes commsType
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/processorCyclicGAMGInterfaceField/processorCyclicGAMGInterfaceField.H b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/processorCyclicGAMGInterfaceField/processorCyclicGAMGInterfaceField.H
index a9c48b5b4b..6e0f7cef7d 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/processorCyclicGAMGInterfaceField/processorCyclicGAMGInterfaceField.H
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/processorCyclicGAMGInterfaceField/processorCyclicGAMGInterfaceField.H
@@ -111,9 +111,8 @@ public:
 //            //- Initialise neighbour matrix update
 //            virtual void initInterfaceMatrixUpdate
 //            (
-//                const scalarField& psiInternal,
 //                scalarField& result,
-//                const lduMatrix& m,
+//                const scalarField& psiInternal,
 //                const scalarField& coeffs,
 //                const direction cmpt,
 //                const Pstream::commsTypes commsType
@@ -122,9 +121,8 @@ public:
 //            //- Update result field based on interface functionality
 //            virtual void updateInterfaceMatrix
 //            (
-//                const scalarField& psiInternal,
 //                scalarField& result,
-//                const lduMatrix&,
+//                const scalarField& psiInternal,
 //                const scalarField& coeffs,
 //                const direction cmpt,
 //                const Pstream::commsTypes commsType
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/processorGAMGInterfaceField/processorGAMGInterfaceField.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/processorGAMGInterfaceField/processorGAMGInterfaceField.C
index b8fa744ff6..184630bb49 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/processorGAMGInterfaceField/processorGAMGInterfaceField.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/processorGAMGInterfaceField/processorGAMGInterfaceField.C
@@ -72,9 +72,8 @@ Foam::processorGAMGInterfaceField::~processorGAMGInterfaceField()
 
 void Foam::processorGAMGInterfaceField::initInterfaceMatrixUpdate
 (
-    const scalarField& psiInternal,
     scalarField&,
-    const lduMatrix&,
+    const scalarField& psiInternal,
     const scalarField&,
     const direction,
     const Pstream::commsTypes commsType
@@ -117,9 +116,8 @@ void Foam::processorGAMGInterfaceField::initInterfaceMatrixUpdate
 
 void Foam::processorGAMGInterfaceField::updateInterfaceMatrix
 (
-    const scalarField&,
     scalarField& result,
-    const lduMatrix&,
+    const scalarField&,
     const scalarField& coeffs,
     const direction cmpt,
     const Pstream::commsTypes commsType
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/processorGAMGInterfaceField/processorGAMGInterfaceField.H b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/processorGAMGInterfaceField/processorGAMGInterfaceField.H
index 48d64baacf..c64f0738ee 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/processorGAMGInterfaceField/processorGAMGInterfaceField.H
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/processorGAMGInterfaceField/processorGAMGInterfaceField.H
@@ -126,9 +126,8 @@ public:
             //- Initialise neighbour matrix update
             virtual void initInterfaceMatrixUpdate
             (
-                const scalarField& psiInternal,
                 scalarField& result,
-                const lduMatrix& m,
+                const scalarField& psiInternal,
                 const scalarField& coeffs,
                 const direction cmpt,
                 const Pstream::commsTypes commsType
@@ -137,9 +136,8 @@ public:
             //- Update result field based on interface functionality
             virtual void updateInterfaceMatrix
             (
-                const scalarField& psiInternal,
                 scalarField& result,
-                const lduMatrix&,
+                const scalarField& psiInternal,
                 const scalarField& coeffs,
                 const direction cmpt,
                 const Pstream::commsTypes commsType
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/coupled/coupledFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/basic/coupled/coupledFvPatchField.H
index d5eb3baa2c..93477e698b 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/coupled/coupledFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/basic/coupled/coupledFvPatchField.H
@@ -178,9 +178,8 @@ public:
             //- Update result field based on interface functionality
             virtual void updateInterfaceMatrix
             (
-                const scalarField& psiInternal,
                 scalarField& result,
-                const lduMatrix&,
+                const scalarField& psiInternal,
                 const scalarField& coeffs,
                 const direction,
                 const Pstream::commsTypes commsType
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchField.C
index 8dac56c64f..2112a1b986 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchField.C
@@ -191,9 +191,8 @@ const
 template<class Type>
 void cyclicFvPatchField<Type>::updateInterfaceMatrix
 (
-    const scalarField& psiInternal,
     scalarField& result,
-    const lduMatrix&,
+    const scalarField& psiInternal,
     const scalarField& coeffs,
     const direction cmpt,
     const Pstream::commsTypes
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchField.H
index b2e82a9d43..f21acd154d 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchField.H
@@ -159,9 +159,8 @@ public:
             //- Update result field based on interface functionality
             virtual void updateInterfaceMatrix
             (
-                const scalarField& psiInternal,
                 scalarField& result,
-                const lduMatrix&,
+                const scalarField& psiInternal,
                 const scalarField& coeffs,
                 const direction cmpt,
                 const Pstream::commsTypes commsType
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/cyclicAMI/cyclicAMIFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/cyclicAMI/cyclicAMIFvPatchField.C
index 0eeb351cd4..8334b7c16c 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/cyclicAMI/cyclicAMIFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/cyclicAMI/cyclicAMIFvPatchField.C
@@ -202,9 +202,8 @@ Foam::cyclicAMIFvPatchField<Type>::neighbourPatchField() const
 template<class Type>
 void Foam::cyclicAMIFvPatchField<Type>::updateInterfaceMatrix
 (
-    const scalarField& psiInternal,
     scalarField& result,
-    const lduMatrix&,
+    const scalarField& psiInternal,
     const scalarField& coeffs,
     const direction cmpt,
     const Pstream::commsTypes
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/cyclicAMI/cyclicAMIFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/constraint/cyclicAMI/cyclicAMIFvPatchField.H
index 2e05111cb6..25bf8280b1 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/cyclicAMI/cyclicAMIFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/cyclicAMI/cyclicAMIFvPatchField.H
@@ -160,9 +160,8 @@ public:
             //- Update result field based on interface functionality
             virtual void updateInterfaceMatrix
             (
-                const scalarField& psiInternal,
                 scalarField& result,
-                const lduMatrix&,
+                const scalarField& psiInternal,
                 const scalarField& coeffs,
                 const direction cmpt,
                 const Pstream::commsTypes commsType
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/jumpCyclic/jumpCyclicFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/jumpCyclic/jumpCyclicFvPatchField.C
index fba9fb922d..6988a06584 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/jumpCyclic/jumpCyclicFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/jumpCyclic/jumpCyclicFvPatchField.C
@@ -137,9 +137,8 @@ tmp<Field<Type> > jumpCyclicFvPatchField<Type>::patchNeighbourField() const
 template<class Type>
 void jumpCyclicFvPatchField<Type>::updateInterfaceMatrix
 (
-    const scalarField& psiInternal,
     scalarField& result,
-    const lduMatrix&,
+    const scalarField& psiInternal,
     const scalarField& coeffs,
     const direction cmpt,
     const Pstream::commsTypes
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/jumpCyclic/jumpCyclicFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/constraint/jumpCyclic/jumpCyclicFvPatchField.H
index 867e07bede..a3f3d8be38 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/jumpCyclic/jumpCyclicFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/jumpCyclic/jumpCyclicFvPatchField.H
@@ -120,9 +120,8 @@ public:
             //- Update result field based on interface functionality
             virtual void updateInterfaceMatrix
             (
-                const scalarField& psiInternal,
                 scalarField& result,
-                const lduMatrix&,
+                const scalarField& psiInternal,
                 const scalarField& coeffs,
                 const direction cmpt,
                 const Pstream::commsTypes commsType
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.C
index a44ea4cc5c..d86c49e5c4 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.C
@@ -311,9 +311,8 @@ tmp<Field<Type> > processorFvPatchField<Type>::snGrad() const
 template<class Type>
 void processorFvPatchField<Type>::initInterfaceMatrixUpdate
 (
-    const scalarField& psiInternal,
     scalarField&,
-    const lduMatrix&,
+    const scalarField& psiInternal,
     const scalarField&,
     const direction,
     const Pstream::commsTypes commsType
@@ -368,9 +367,8 @@ void processorFvPatchField<Type>::initInterfaceMatrixUpdate
 template<class Type>
 void processorFvPatchField<Type>::updateInterfaceMatrix
 (
-    const scalarField&,
     scalarField& result,
-    const lduMatrix&,
+    const scalarField&,
     const scalarField& coeffs,
     const direction cmpt,
     const Pstream::commsTypes commsType
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.H
index 9541e80ea5..a085ae88e5 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.H
@@ -187,9 +187,8 @@ public:
             //- Initialise neighbour matrix update
             virtual void initInterfaceMatrixUpdate
             (
-                const scalarField& psiInternal,
                 scalarField& result,
-                const lduMatrix& m,
+                const scalarField& psiInternal,
                 const scalarField& coeffs,
                 const direction cmpt,
                 const Pstream::commsTypes commsType
@@ -201,9 +200,8 @@ public:
             //- Update result field based on interface functionality
             virtual void updateInterfaceMatrix
             (
-                const scalarField& psiInternal,
                 scalarField& result,
-                const lduMatrix& m,
+                const scalarField& psiInternal,
                 const scalarField& coeffs,
                 const direction cmpt,
                 const Pstream::commsTypes commsType
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchScalarField.C
index 6fbb215002..82dcf7ca36 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchScalarField.C
@@ -35,9 +35,8 @@ namespace Foam
 template<>
 void processorFvPatchField<scalar>::initInterfaceMatrixUpdate
 (
-    const scalarField& psiInternal,
     scalarField&,
-    const lduMatrix&,
+    const scalarField& psiInternal,
     const scalarField&,
     const direction,
     const Pstream::commsTypes commsType
@@ -92,9 +91,8 @@ void processorFvPatchField<scalar>::initInterfaceMatrixUpdate
 template<>
 void processorFvPatchField<scalar>::updateInterfaceMatrix
 (
-    const scalarField&,
     scalarField& result,
-    const lduMatrix&,
+    const scalarField&,
     const scalarField& coeffs,
     const direction,
     const Pstream::commsTypes commsType
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchScalarField.H b/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchScalarField.H
index 02443c511d..e06881ac5c 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchScalarField.H
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchScalarField.H
@@ -38,9 +38,8 @@ namespace Foam
 template<>
 void processorFvPatchField<scalar>::initInterfaceMatrixUpdate
 (
-    const scalarField&,
     scalarField&,
-    const lduMatrix&,
+    const scalarField&,
     const scalarField&,
     const direction,
     const Pstream::commsTypes commsType
@@ -50,9 +49,8 @@ void processorFvPatchField<scalar>::initInterfaceMatrixUpdate
 template<>
 void processorFvPatchField<scalar>::updateInterfaceMatrix
 (
-    const scalarField&,
     scalarField& result,
-    const lduMatrix&,
+    const scalarField&,
     const scalarField& coeffs,
     const direction,
     const Pstream::commsTypes commsType
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchField.C
index 7d049f6ad3..5aa9179b7e 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchField.C
@@ -227,9 +227,8 @@ processorCyclicFvPatchField<Type>::~processorCyclicFvPatchField()
 //template<class Type>
 //void processorCyclicFvPatchField<Type>::initInterfaceMatrixUpdate
 //(
-//    const scalarField& psiInternal,
 //    scalarField&,
-//    const lduMatrix&,
+//    const scalarField& psiInternal,
 //    const scalarField&,
 //    const direction,
 //    const Pstream::commsTypes commsType
@@ -246,9 +245,8 @@ processorCyclicFvPatchField<Type>::~processorCyclicFvPatchField()
 //template<class Type>
 //void processorCyclicFvPatchField<Type>::updateInterfaceMatrix
 //(
-//    const scalarField&,
 //    scalarField& result,
-//    const lduMatrix&,
+//    const scalarField&,
 //    const scalarField& coeffs,
 //    const direction cmpt,
 //    const Pstream::commsTypes commsType
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchScalarField.H b/src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchScalarField.H
index 6dbbb04559..cf20d1fd43 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchScalarField.H
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchScalarField.H
@@ -38,9 +38,8 @@ namespace Foam
 //template<>
 //void processorCyclicFvPatchField<scalar>::initInterfaceMatrixUpdate
 //(
-//    const scalarField&,
 //    scalarField&,
-//    const lduMatrix&,
+//    const scalarField&,
 //    const scalarField&,
 //    const direction,
 //    const Pstream::commsTypes commsType
@@ -50,9 +49,8 @@ namespace Foam
 //template<>
 //void processorCyclicFvPatchField<scalar>::updateInterfaceMatrix
 //(
-//    const scalarField&,
 //    scalarField& result,
-//    const lduMatrix&,
+//    const scalarField&,
 //    const scalarField& coeffs,
 //    const direction,
 //    const Pstream::commsTypes commsType
diff --git a/src/meshTools/AMIInterpolation/GAMG/interfaceFields/cyclicAMIGAMGInterfaceField/cyclicAMIGAMGInterfaceField.C b/src/meshTools/AMIInterpolation/GAMG/interfaceFields/cyclicAMIGAMGInterfaceField/cyclicAMIGAMGInterfaceField.C
index a5624af4be..eb0b88749e 100644
--- a/src/meshTools/AMIInterpolation/GAMG/interfaceFields/cyclicAMIGAMGInterfaceField/cyclicAMIGAMGInterfaceField.C
+++ b/src/meshTools/AMIInterpolation/GAMG/interfaceFields/cyclicAMIGAMGInterfaceField/cyclicAMIGAMGInterfaceField.C
@@ -72,9 +72,8 @@ Foam::cyclicAMIGAMGInterfaceField::~cyclicAMIGAMGInterfaceField()
 
 void Foam::cyclicAMIGAMGInterfaceField::updateInterfaceMatrix
 (
-    const scalarField& psiInternal,
     scalarField& result,
-    const lduMatrix&,
+    const scalarField& psiInternal,
     const scalarField& coeffs,
     const direction cmpt,
     const Pstream::commsTypes
diff --git a/src/meshTools/AMIInterpolation/GAMG/interfaceFields/cyclicAMIGAMGInterfaceField/cyclicAMIGAMGInterfaceField.H b/src/meshTools/AMIInterpolation/GAMG/interfaceFields/cyclicAMIGAMGInterfaceField/cyclicAMIGAMGInterfaceField.H
index ae4ede91e1..beeaaaadb7 100644
--- a/src/meshTools/AMIInterpolation/GAMG/interfaceFields/cyclicAMIGAMGInterfaceField/cyclicAMIGAMGInterfaceField.H
+++ b/src/meshTools/AMIInterpolation/GAMG/interfaceFields/cyclicAMIGAMGInterfaceField/cyclicAMIGAMGInterfaceField.H
@@ -110,9 +110,8 @@ public:
             //- Update result field based on interface functionality
             virtual void updateInterfaceMatrix
             (
-                const scalarField& psiInternal,
                 scalarField& result,
-                const lduMatrix&,
+                const scalarField& psiInternal,
                 const scalarField& coeffs,
                 const direction cmpt,
                 const Pstream::commsTypes commsType

From 2c9d42c9b0513e58959d0ba28a1e82b974ce39b8 Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Mon, 23 Apr 2012 15:36:58 +0100
Subject: [PATCH 252/317] Updated headers

---
 .../cyclicGAMGInterfaceField/cyclicGAMGInterfaceField.C         | 2 +-
 .../cyclicGAMGInterfaceField/cyclicGAMGInterfaceField.H         | 2 +-
 .../processorCyclicGAMGInterfaceField.C                         | 2 +-
 .../processorCyclicGAMGInterfaceField.H                         | 2 +-
 .../fields/fvPatchFields/basic/coupled/coupledFvPatchField.H    | 2 +-
 .../fields/fvPatchFields/constraint/cyclic/cyclicFvPatchField.C | 2 +-
 .../fields/fvPatchFields/constraint/cyclic/cyclicFvPatchField.H | 2 +-
 .../fvPatchFields/constraint/cyclicAMI/cyclicAMIFvPatchField.C  | 2 +-
 .../fvPatchFields/constraint/cyclicAMI/cyclicAMIFvPatchField.H  | 2 +-
 .../constraint/jumpCyclic/jumpCyclicFvPatchField.C              | 2 +-
 .../constraint/jumpCyclic/jumpCyclicFvPatchField.H              | 2 +-
 .../constraint/processor/processorFvPatchScalarField.H          | 2 +-
 .../constraint/processorCyclic/processorCyclicFvPatchField.C    | 2 +-
 .../processorCyclic/processorCyclicFvPatchScalarField.H         | 2 +-
 .../cyclicAMIGAMGInterfaceField/cyclicAMIGAMGInterfaceField.C   | 2 +-
 .../cyclicAMIGAMGInterfaceField/cyclicAMIGAMGInterfaceField.H   | 2 +-
 16 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/cyclicGAMGInterfaceField/cyclicGAMGInterfaceField.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/cyclicGAMGInterfaceField/cyclicGAMGInterfaceField.C
index 0200de16ba..c3a44bf160 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/cyclicGAMGInterfaceField/cyclicGAMGInterfaceField.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/cyclicGAMGInterfaceField/cyclicGAMGInterfaceField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/cyclicGAMGInterfaceField/cyclicGAMGInterfaceField.H b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/cyclicGAMGInterfaceField/cyclicGAMGInterfaceField.H
index b151579786..6224dc0ac6 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/cyclicGAMGInterfaceField/cyclicGAMGInterfaceField.H
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/cyclicGAMGInterfaceField/cyclicGAMGInterfaceField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/processorCyclicGAMGInterfaceField/processorCyclicGAMGInterfaceField.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/processorCyclicGAMGInterfaceField/processorCyclicGAMGInterfaceField.C
index 2e7a81219f..df3ae4b408 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/processorCyclicGAMGInterfaceField/processorCyclicGAMGInterfaceField.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/processorCyclicGAMGInterfaceField/processorCyclicGAMGInterfaceField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/processorCyclicGAMGInterfaceField/processorCyclicGAMGInterfaceField.H b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/processorCyclicGAMGInterfaceField/processorCyclicGAMGInterfaceField.H
index 6e0f7cef7d..3c842dac9c 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/processorCyclicGAMGInterfaceField/processorCyclicGAMGInterfaceField.H
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/processorCyclicGAMGInterfaceField/processorCyclicGAMGInterfaceField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/coupled/coupledFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/basic/coupled/coupledFvPatchField.H
index 93477e698b..5a271a763e 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/coupled/coupledFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/basic/coupled/coupledFvPatchField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchField.C
index 2112a1b986..520d4b23db 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchField.H
index f21acd154d..b08b0aa91a 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/cyclicAMI/cyclicAMIFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/cyclicAMI/cyclicAMIFvPatchField.C
index 8334b7c16c..287d036f5e 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/cyclicAMI/cyclicAMIFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/cyclicAMI/cyclicAMIFvPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/cyclicAMI/cyclicAMIFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/constraint/cyclicAMI/cyclicAMIFvPatchField.H
index 25bf8280b1..8814a7584a 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/cyclicAMI/cyclicAMIFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/cyclicAMI/cyclicAMIFvPatchField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/jumpCyclic/jumpCyclicFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/jumpCyclic/jumpCyclicFvPatchField.C
index 6988a06584..669ea108b4 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/jumpCyclic/jumpCyclicFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/jumpCyclic/jumpCyclicFvPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/jumpCyclic/jumpCyclicFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/constraint/jumpCyclic/jumpCyclicFvPatchField.H
index a3f3d8be38..72113a5626 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/jumpCyclic/jumpCyclicFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/jumpCyclic/jumpCyclicFvPatchField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchScalarField.H b/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchScalarField.H
index e06881ac5c..a8bbb24dcb 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchScalarField.H
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchScalarField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchField.C
index 5aa9179b7e..d36da92ef3 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchScalarField.H b/src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchScalarField.H
index cf20d1fd43..5a17b10fef 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchScalarField.H
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchScalarField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/meshTools/AMIInterpolation/GAMG/interfaceFields/cyclicAMIGAMGInterfaceField/cyclicAMIGAMGInterfaceField.C b/src/meshTools/AMIInterpolation/GAMG/interfaceFields/cyclicAMIGAMGInterfaceField/cyclicAMIGAMGInterfaceField.C
index eb0b88749e..abc7875db6 100644
--- a/src/meshTools/AMIInterpolation/GAMG/interfaceFields/cyclicAMIGAMGInterfaceField/cyclicAMIGAMGInterfaceField.C
+++ b/src/meshTools/AMIInterpolation/GAMG/interfaceFields/cyclicAMIGAMGInterfaceField/cyclicAMIGAMGInterfaceField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/meshTools/AMIInterpolation/GAMG/interfaceFields/cyclicAMIGAMGInterfaceField/cyclicAMIGAMGInterfaceField.H b/src/meshTools/AMIInterpolation/GAMG/interfaceFields/cyclicAMIGAMGInterfaceField/cyclicAMIGAMGInterfaceField.H
index beeaaaadb7..cb22cd61b6 100644
--- a/src/meshTools/AMIInterpolation/GAMG/interfaceFields/cyclicAMIGAMGInterfaceField/cyclicAMIGAMGInterfaceField.H
+++ b/src/meshTools/AMIInterpolation/GAMG/interfaceFields/cyclicAMIGAMGInterfaceField/cyclicAMIGAMGInterfaceField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

From 980027bd607b2c01205d3019ad7e296d7627e4e8 Mon Sep 17 00:00:00 2001
From: sergio <sergio>
Date: Tue, 24 Apr 2012 10:43:44 +0100
Subject: [PATCH 253/317] BUG: Delay the call to solidThermo in Radiation BC
 constructor in case the solid region has not being constructed yet

---
 .../greyDiffusiveRadiationMixedFvPatchScalarField.C           | 4 +++-
 .../system/bottomAir/changeDictionaryDict                     | 2 --
 .../system/topAir/changeDictionaryDict                        | 2 --
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/thermophysicalModels/radiationModels/derivedFvPatchFields/greyDiffusiveRadiation/greyDiffusiveRadiationMixedFvPatchScalarField.C b/src/thermophysicalModels/radiationModels/derivedFvPatchFields/greyDiffusiveRadiation/greyDiffusiveRadiationMixedFvPatchScalarField.C
index 57acb81533..02637c203a 100644
--- a/src/thermophysicalModels/radiationModels/derivedFvPatchFields/greyDiffusiveRadiation/greyDiffusiveRadiationMixedFvPatchScalarField.C
+++ b/src/thermophysicalModels/radiationModels/derivedFvPatchFields/greyDiffusiveRadiation/greyDiffusiveRadiationMixedFvPatchScalarField.C
@@ -102,8 +102,10 @@ greyDiffusiveRadiationMixedFvPatchScalarField
         const scalarField& Tp =
             patch().lookupPatchField<volScalarField, scalar>(TName_);
 
+        //NOTE: Assumes emissivity = 1 as the solidThermo might
+        // not be constructed yet
         refValue() =
-            4.0*physicoChemical::sigma.value()*pow4(Tp)*emissivity()/pi;
+            4.0*physicoChemical::sigma.value()*pow4(Tp)/pi;
         refGrad() = 0.0;
         valueFraction() = 1.0;
 
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/bottomAir/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/bottomAir/changeDictionaryDict
index 7fc53289cc..f08a1ebff8 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/bottomAir/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/bottomAir/changeDictionaryDict
@@ -174,7 +174,6 @@ dictionaryReplacement
                 type            greyDiffusiveRadiation;
                 T               T;
                 emissivityMode  lookup;
-                Qro             uniform 0;
                 emissivity      uniform 1.0;
                 value           uniform 0;
             }
@@ -184,7 +183,6 @@ dictionaryReplacement
                 type            greyDiffusiveRadiation;
                 T               T;
                 emissivityMode  solidThermo;
-                Qro             uniform 0;
                 value           uniform 0;
             }
         }
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/topAir/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/topAir/changeDictionaryDict
index 6647732e8f..4c78380972 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/topAir/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/topAir/changeDictionaryDict
@@ -221,7 +221,6 @@ dictionaryReplacement
                 type            greyDiffusiveRadiation;
                 T               T;
                 emissivityMode  lookup;
-                Qro             uniform 0;
                 emissivity      uniform 1.0;
                 value           uniform 0;
             }
@@ -231,7 +230,6 @@ dictionaryReplacement
                 type            greyDiffusiveRadiation;
                 T               T;
                 emissivityMode  solidThermo;
-                Qro             uniform 0;
                 value           uniform 0;
             }
         }

From 63eb7d4ae590fc1e5238399cd144c5abe75b8d2d Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Tue, 24 Apr 2012 14:10:33 +0100
Subject: [PATCH 254/317] ENH: consistently oriented nfaced cells for ensight
 conversion library (Mark Olesen)

---
 .../ensight/part/ensightPartCells.C           | 32 +++++++++++++++----
 1 file changed, 25 insertions(+), 7 deletions(-)

diff --git a/src/conversion/ensight/part/ensightPartCells.C b/src/conversion/ensight/part/ensightPartCells.C
index 4c44abedcb..80f0cdc4ce 100644
--- a/src/conversion/ensight/part/ensightPartCells.C
+++ b/src/conversion/ensight/part/ensightPartCells.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -313,6 +313,7 @@ void Foam::ensightPartCells::writeConnectivity
     if (key == "nfaced")
     {
         const faceList& meshFaces = mesh_.faces();
+        const labelUList& owner = mesh_.faceOwner();
 
         // write the number of faces per element
         forAll(idList, i)
@@ -345,16 +346,33 @@ void Foam::ensightPartCells::writeConnectivity
             const label id = idList[i] + offset_;
             const labelUList& cFace = mesh_.cells()[id];
 
-            forAll(cFace, faceI)
+            forAll(cFace, cFaceI)
             {
-                const face& cf = meshFaces[cFace[faceI]];
+                const label faceId = cFace[cFaceI];
+                const face& cf = meshFaces[faceId];
 
-                forAll(cf, ptI)
+                // convert global -> local index
+                // (note: Ensight indices start with 1)
+
+                // ensight >= 9 needs consistently oriented nfaced cells
+                if (id == owner[faceId])
                 {
-                    // convert global -> local index
-                    // (note: Ensight indices start with 1)
-                    os.write(pointMap[cf[ptI]] + 1);
+                    forAll(cf, ptI)
+                    {
+                        os.write(pointMap[cf[ptI]] + 1);
+                    }
                 }
+                else
+                {
+                    // as per face::reverseFace(), but without copying
+
+                    os.write(pointMap[cf[0]] + 1);
+                    for (label ptI = cf.size()-1; ptI > 0; --ptI)
+                    {
+                        os.write(pointMap[cf[ptI]] + 1);
+                    }
+                }
+
                 os.newline();
             }
         }

From 01444d4b61d22ce63abe195f31af6dd15dcc306f Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Tue, 24 Apr 2012 15:23:32 +0100
Subject: [PATCH 255/317] BUG: renumberMesh.C: update flip status for
 renumbered faces

---
 .../manipulation/renumberMesh/renumberMesh.C  | 26 ++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C b/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C
index 5f724095ca..395ee77cbe 100644
--- a/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C
+++ b/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C
@@ -1036,6 +1036,22 @@ int main(int argc, char *argv[])
         (
             UIndirectList<label>(faceProcAddressing, map().faceMap())
         );
+
+        // Detect any flips.
+        const labelHashSet& fff = map().flipFaceFlux();
+        forAllConstIter(labelHashSet, fff, iter)
+        {
+            label faceI = iter.key();
+            label masterFaceI = faceProcAddressing[faceI];
+
+            faceProcAddressing[faceI] = -masterFaceI;
+
+            if (masterFaceI == 0)
+            {
+                FatalErrorIn(args.executable()) << "problem faceI:" << faceI
+                    << " masterFaceI:" << masterFaceI << exit(FatalError);
+            }
+        }
     }
     if (pointProcAddressing.headerOk())
     {
@@ -1083,9 +1099,13 @@ int main(int argc, char *argv[])
         );
         Info<< "After renumbering :" << nl
             << "    band           : " << band << nl
-            << "    profile        : " << profile << nl
-            << "    rms frontwidth : " << rmsFrontwidth << nl
-            << endl;
+            << "    profile        : " << profile << nl;
+        if (doFrontWidth)
+        {
+
+            Info<< "    rms frontwidth : " << rmsFrontwidth << nl;
+        }
+        Info<< endl;
     }
 
     if (orderPoints)

From 4190e3e5a52d6622780d95252596eac65426b730 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Tue, 24 Apr 2012 16:10:51 +0100
Subject: [PATCH 256/317] ENH: fvFieldReconstructorReconstructFields.C: handle
 face flip of internal faces

---
 .../fvFieldReconstructorReconstructFields.C   | 24 ++++++++++++-------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/src/parallel/reconstruct/reconstruct/fvFieldReconstructorReconstructFields.C b/src/parallel/reconstruct/reconstruct/fvFieldReconstructorReconstructFields.C
index 33105892ce..58c74f4c4b 100644
--- a/src/parallel/reconstruct/reconstruct/fvFieldReconstructorReconstructFields.C
+++ b/src/parallel/reconstruct/reconstruct/fvFieldReconstructorReconstructFields.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -377,18 +377,24 @@ Foam::fvFieldReconstructor::reconstructFvSurfaceField
         // take care of the face direction offset trick.
         //
         {
-            labelList curAddr(faceProcAddressing_[procI]);
+            const labelList& faceMap = faceProcAddressing_[procI];
 
-            forAll(curAddr, addrI)
+            // Addressing into original field
+            labelList curAddr(faceMap.size());
+            // Correctly oriented copy of internal field
+            Field<Type> procInternalField(procField.internalField());
+
+            forAll(faceMap, addrI)
             {
-                curAddr[addrI] -= 1;
+                curAddr[addrI] = mag(faceMap[addrI])-1;
+                if (faceMap[addrI] < 0)
+                {
+                    procInternalField[addrI] = -procInternalField[addrI];
+                }
             }
 
-            internalField.rmap
-            (
-                procField.internalField(),
-                curAddr
-            );
+            // Map
+            internalField.rmap(procInternalField, curAddr);
         }
 
         // Set the boundary patch values in the reconstructed field

From 608c1ba244e46e14f7b58c62468e90570d9e8083 Mon Sep 17 00:00:00 2001
From: sergio <sergio>
Date: Wed, 25 Apr 2012 16:17:15 +0100
Subject: [PATCH 257/317] BUG : Correcting output of private members

---
 .../atmBoundaryLayerInletVelocityFvPatchVectorField.C           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/atmBoundaryLayerInletVelocity/atmBoundaryLayerInletVelocityFvPatchVectorField.C b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/atmBoundaryLayerInletVelocity/atmBoundaryLayerInletVelocityFvPatchVectorField.C
index ff459f8006..d5943dda5e 100644
--- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/atmBoundaryLayerInletVelocity/atmBoundaryLayerInletVelocityFvPatchVectorField.C
+++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/atmBoundaryLayerInletVelocity/atmBoundaryLayerInletVelocityFvPatchVectorField.C
@@ -174,7 +174,7 @@ void atmBoundaryLayerInletVelocityFvPatchVectorField::updateCoeffs()
 void atmBoundaryLayerInletVelocityFvPatchVectorField::write(Ostream& os) const
 {
     fvPatchVectorField::write(os);
-    zGround_.writeEntry("z0", os) ;
+    z0_.writeEntry("z0", os) ;
     os.writeKeyword("n")
         << n_ << token::END_STATEMENT << nl;
     os.writeKeyword("z")

From 8fb6aa88115e5db0fe9f33d9f8e1edc6c252a70d Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Wed, 25 Apr 2012 18:18:31 +0100
Subject: [PATCH 258/317] LduMatrix: Added support for non-parallel cyclic
 patches

---
 applications/test/LduMatrix/LduMatrixTest3.C  |   2 +-
 src/OpenFOAM/Make/files                       |   1 +
 .../GeometricField/GeometricBoundaryField.C   |  33 ++++-
 .../GeometricField/GeometricField.H           |   7 +-
 .../CyclicLduInterfaceField.C                 |  65 ---------
 .../CyclicLduInterfaceField.H                 | 102 --------------
 .../LduInterfaceField/LduInterfaceField.C     |  20 +--
 .../LduInterfaceField/LduInterfaceField.H     | 106 +++++++--------
 .../ProcessorLduInterfaceField.C              |  66 ----------
 .../ProcessorLduInterfaceField.H              | 105 ---------------
 .../matrices/LduMatrix/LduMatrix/LduMatrix.H  |  86 +++++++++++-
 .../LduMatrix/LduMatrix/LduMatrixATmul.C      |   1 +
 .../LduMatrix/LduMatrix/LduMatrixTests.C      |  83 +++++++++++-
 .../LduMatrixUpdateMatrixInterfaces.C         |  20 ++-
 .../matrices/LduMatrix/Solvers/PBiCG/TPBiCG.C |   9 +-
 .../PBiCGScalarAlpha/PBiCGScalarAlpha.C       |  23 ++--
 .../matrices/LduMatrix/Solvers/PCG/TPCG.C     |   8 +-
 .../matrices/LduMatrix/Solvers/lduSolvers.C   |   5 +-
 .../cyclicLduInterfaceField.H                 |  32 ++++-
 .../lduInterfaceField/lduInterfaceField.H     |  23 ++--
 .../processorLduInterfaceField.H              |  28 ++++
 .../matrices/lduMatrix/lduMatrix/lduMatrix.H  |   3 +-
 .../matrices/lduMatrix/solvers/PBiCG/PBiCG.C  |   6 +-
 .../basic/coupled/coupledFvPatchField.C       |  12 +-
 .../basic/coupled/coupledFvPatchField.H       |   4 +-
 .../constraint/cyclic/cyclicFvPatchField.C    |  32 +++++
 .../constraint/cyclic/cyclicFvPatchField.H    |   9 ++
 .../processor/processorFvPatchField.C         | 124 ++++++++++++++++++
 .../processor/processorFvPatchField.H         |  28 +++-
 .../fvMatrices/fvMatrix/fvMatrixSolve.C       |   4 +-
 .../fvScalarMatrix/fvScalarMatrix.C           |   6 +-
 31 files changed, 573 insertions(+), 480 deletions(-)
 delete mode 100644 src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduInterfaceField/CyclicLduInterfaceField.C
 delete mode 100644 src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduInterfaceField/CyclicLduInterfaceField.H
 delete mode 100644 src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduInterfaceField/ProcessorLduInterfaceField.C
 delete mode 100644 src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduInterfaceField/ProcessorLduInterfaceField.H

diff --git a/applications/test/LduMatrix/LduMatrixTest3.C b/applications/test/LduMatrix/LduMatrixTest3.C
index 22d44bd2d0..596559e6a7 100644
--- a/applications/test/LduMatrix/LduMatrixTest3.C
+++ b/applications/test/LduMatrix/LduMatrixTest3.C
@@ -88,7 +88,7 @@ int main(int argc, char *argv[])
                         "{"
                         "    solver           PBiCG;"
                         "    preconditioner   DILU;"
-                        "    tolerance        (1e-13 1e-13 1e-13);"
+                        "    tolerance        (1e-5 1e-5 1);"
                         "    relTol           (0 0 0);"
                         "}"
                     )()
diff --git a/src/OpenFOAM/Make/files b/src/OpenFOAM/Make/files
index d32d9c82e0..3c054e2bfd 100644
--- a/src/OpenFOAM/Make/files
+++ b/src/OpenFOAM/Make/files
@@ -316,6 +316,7 @@ meshes/lduMesh/lduMesh.C
 
 LduMatrix = matrices/LduMatrix
 $(LduMatrix)/LduMatrix/lduMatrices.C
+$(LduMatrix)/LduMatrix/LduInterfaceField/LduInterfaceFields.C
 $(LduMatrix)/Smoothers/lduSmoothers.C
 $(LduMatrix)/Preconditioners/lduPreconditioners.C
 $(LduMatrix)/Solvers/lduSolvers.C
diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricBoundaryField.C b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricBoundaryField.C
index 448a009cab..5117f8cb23 100644
--- a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricBoundaryField.C
+++ b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricBoundaryField.C
@@ -485,9 +485,35 @@ boundaryInternalField() const
 
 
 template<class Type, template<class> class PatchField, class GeoMesh>
-Foam::lduInterfaceFieldPtrsList
+Foam::LduInterfaceFieldPtrsList<Type>
 Foam::GeometricField<Type, PatchField, GeoMesh>::GeometricBoundaryField::
 interfaces() const
+{
+    LduInterfaceFieldPtrsList<Type> interfaces(this->size());
+
+    forAll(interfaces, patchi)
+    {
+        if (isA<LduInterfaceField<Type> >(this->operator[](patchi)))
+        {
+            interfaces.set
+            (
+                patchi,
+                &refCast<const LduInterfaceField<Type> >
+                (
+                    this->operator[](patchi)
+                )
+            );
+        }
+    }
+
+    return interfaces;
+}
+
+
+template<class Type, template<class> class PatchField, class GeoMesh>
+Foam::lduInterfaceFieldPtrsList
+Foam::GeometricField<Type, PatchField, GeoMesh>::GeometricBoundaryField::
+scalarInterfaces() const
 {
     lduInterfaceFieldPtrsList interfaces(this->size());
 
@@ -498,7 +524,10 @@ interfaces() const
             interfaces.set
             (
                 patchi,
-                &refCast<const lduInterfaceField>(this->operator[](patchi))
+                &refCast<const lduInterfaceField>
+                (
+                    this->operator[](patchi)
+                )
             );
         }
     }
diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.H b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.H
index 56b9beee49..ad14ad8c34 100644
--- a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.H
+++ b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.H
@@ -44,6 +44,7 @@ SourceFiles
 #include "DimensionedField.H"
 #include "FieldField.H"
 #include "lduInterfaceFieldPtrsList.H"
+#include "LduInterfaceFieldPtrsList.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -191,7 +192,11 @@ public:
 
             //- Return a list of pointers for each patch field with only those
             //  pointing to interfaces being set
-            lduInterfaceFieldPtrsList interfaces() const;
+            LduInterfaceFieldPtrsList<Type> interfaces() const;
+
+            //- Return a list of pointers for each patch field with only those
+            //  pointing to interfaces being set
+            lduInterfaceFieldPtrsList scalarInterfaces() const;
 
             //- Write boundary field as dictionary entry
             void writeEntry(const word& keyword, Ostream& os) const;
diff --git a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduInterfaceField/CyclicLduInterfaceField.C b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduInterfaceField/CyclicLduInterfaceField.C
deleted file mode 100644
index 445a654a1c..0000000000
--- a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduInterfaceField/CyclicLduInterfaceField.C
+++ /dev/null
@@ -1,65 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "CyclicLduInterfaceField.H"
-#include "diagTensorField.H"
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-namespace Foam
-{
-    //defineTypeNameAndDebug(CyclicLduInterfaceField, 0);
-}
-
-
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
-
-template<class Type>
-Foam::CyclicLduInterfaceField<Type>::~CyclicLduInterfaceField()
-{}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-template<class Type>
-void Foam::CyclicLduInterfaceField<Type>::transformCoupleField
-(
-    Field<Type>& f
-) const
-{
-    if (doTransform())
-    {
-        label sizeby2 = f.size()/2;
-
-        for (label facei=0; facei<sizeby2; facei++)
-        {
-            f[facei] = transform(f[facei], forwardT()[0]);
-            f[facei + sizeby2] = transform(f[facei + sizeby2], forwardT()[0]);
-        }
-    }
-}
-
-
-// ************************************************************************* //
diff --git a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduInterfaceField/CyclicLduInterfaceField.H b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduInterfaceField/CyclicLduInterfaceField.H
deleted file mode 100644
index e19a0dcb8d..0000000000
--- a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduInterfaceField/CyclicLduInterfaceField.H
+++ /dev/null
@@ -1,102 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-Class
-    Foam::CyclicLduInterfaceField
-
-Description
-    Abstract base class for cyclic coupled interfaces.
-
-SourceFiles
-    CyclicLduInterfaceField.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef CyclicLduInterfaceField_H
-#define CyclicLduInterfaceField_H
-
-#include "primitiveFieldsFwd.H"
-#include "typeInfo.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-/*---------------------------------------------------------------------------*\
-                  Class CyclicLduInterfaceField Declaration
-\*---------------------------------------------------------------------------*/
-
-template<class Type>
-class CyclicLduInterfaceField
-{
-
-public:
-
-    //- Runtime type information
-    TypeName("CyclicLduInterfaceField");
-
-
-    // Constructors
-
-        //- Construct given coupled patch
-        CyclicLduInterfaceField()
-        {}
-
-
-    // Destructor
-
-        virtual ~CyclicLduInterfaceField();
-
-
-    // Member Functions
-
-        // Access
-
-            //- Is the transform required
-            virtual bool doTransform() const = 0;
-
-            //- Return face transformation tensor
-            virtual const tensorField& forwardT() const = 0;
-
-            //- Return neighbour-cell transformation tensor
-            virtual const tensorField& reverseT() const = 0;
-
-            //- Return rank of component for transform
-            virtual int rank() const = 0;
-
-
-        //- Transform given patch internal field
-        void transformCoupleField(Field<Type>& f) const;
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduInterfaceField/LduInterfaceField.C b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduInterfaceField/LduInterfaceField.C
index 5f50f7eb53..85f42a949a 100644
--- a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduInterfaceField/LduInterfaceField.C
+++ b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduInterfaceField/LduInterfaceField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -23,25 +23,11 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "lduInterfaceField.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-defineTypeNameAndDebug(lduInterfaceField, 0);
-
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
-lduInterfaceField::~lduInterfaceField()
+template<class Type>
+Foam::LduInterfaceField<Type>::~LduInterfaceField()
 {}
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduInterfaceField/LduInterfaceField.H b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduInterfaceField/LduInterfaceField.H
index 0cae1a925d..adacc45ed2 100644
--- a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduInterfaceField/LduInterfaceField.H
+++ b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduInterfaceField/LduInterfaceField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -36,27 +36,28 @@ SourceFiles
 #ifndef LduInterfaceField_H
 #define LduInterfaceField_H
 
-#include "lduInterface.H"
-#include "Field.H"
+#include "lduInterfaceField.H"
+#include "primitiveFieldsFwd.H"
+#include "Pstream.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
 
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+class lduMatrix;
+
 /*---------------------------------------------------------------------------*\
                      Class LduInterfaceField Declaration
 \*---------------------------------------------------------------------------*/
 
 template<class Type>
 class LduInterfaceField
+:
+    public lduInterfaceField
 {
-    // Private data
-
-        //- Reference to the coupled patch this field is defined for
-        const lduInterface& interface_;
-
-
     // Private Member Functions
 
         //- Disallow default bitwise copy construct
@@ -68,73 +69,52 @@ class LduInterfaceField
 
 public:
 
-        class Amultiplier
-        {
-        public:
-
-            Amultiplier()
-            {}
-
-            virtual ~Amultiplier()
-            {}
-
-            virtual void addAmul
-            (
-                Field<Type>& Apsi,
-                const Field<Type>& psi
-            ) const = 0;
-        };
-
-
     //- Runtime type information
     TypeName("LduInterfaceField");
 
 
     // Constructors
 
-        //- Construct given interface
-        LduInterfaceField(const lduInterface& interface)
+        //- Construct given coupled patch
+        LduInterfaceField(const lduInterface& patch)
         :
-            interface_(interface)
+            lduInterfaceField(patch)
         {}
 
 
-    // Destructor
-
-        virtual ~LduInterfaceField();
+    //- Destructor
+    virtual ~LduInterfaceField();
 
 
     // Member Functions
 
-        // Access
+        //- Initialise neighbour matrix update
+        virtual void initInterfaceMatrixUpdate
+        (
+            Field<Type>&,
+            const Field<Type>&,
+            const scalarField&,
+            const Pstream::commsTypes commsType
+        ) const
+        {}
 
-            //- Return the interface
-            const lduInterface& interface() const
-            {
-                return interface_;
-            }
-
-
-        // Coupled interface matrix update
-
-            //- Initialise neighbour matrix update
-            virtual void initInterfaceMatrixUpdate
+        //- Update result field based on interface functionality
+        virtual void updateInterfaceMatrix
+        (
+            Field<Type>&,
+            const Field<Type>&,
+            const scalarField&,
+            const Pstream::commsTypes commsType
+        ) const // = 0;
+        {
+            notImplemented
             (
-                Field<Type>& Apsi,
-                const Field<Type>& psi,
-                const Amultiplier&,
-                const Pstream::commsTypes commsType
-            ) const
-            {}
-
-            //- Update result field based on interface functionality
-            virtual void updateInterfaceMatrix
-            (
-                Field<Type>& Apsi,
-                const Field<Type>& psi,
-                const Amultiplier&,
-                const Pstream::commsTypes commsType
-            ) const = 0;
+                "updateInterfaceMatrix"
+                "(Field<Type>&, const Field<Type>&,"
+                "const scalarField&,"
+                "const Pstream::commsTypes commsType) const"
+            );
+        }
 };
 
 
@@ -144,6 +124,12 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+#ifdef NoRepository
+#   include "LduInterfaceField.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
 #endif
 
 // ************************************************************************* //
diff --git a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduInterfaceField/ProcessorLduInterfaceField.C b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduInterfaceField/ProcessorLduInterfaceField.C
deleted file mode 100644
index 0bbe441612..0000000000
--- a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduInterfaceField/ProcessorLduInterfaceField.C
+++ /dev/null
@@ -1,66 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "processorLduInterfaceField.H"
-#include "diagTensorField.H"
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-namespace Foam
-{
-    //defineTypeNameAndDebug(processorLduInterfaceField, 0);
-}
-
-
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
-
-template<class Type>
-Foam::processorLduInterfaceField<Type>::~processorLduInterfaceField()
-{}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-template<class Type>
-void Foam::processorLduInterfaceField<Type>::transformCoupleField
-(
-    Field<Type>& f
-) const
-{
-    if (doTransform())
-    {
-        if (forwardT().size() == 1)
-        {
-            transform(f, forwardT()[0], f);
-        }
-        else
-        {
-            transform(f, forwardT(), f);
-        }
-    }
-}
-
-
-// ************************************************************************* //
diff --git a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduInterfaceField/ProcessorLduInterfaceField.H b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduInterfaceField/ProcessorLduInterfaceField.H
deleted file mode 100644
index f794de01d4..0000000000
--- a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduInterfaceField/ProcessorLduInterfaceField.H
+++ /dev/null
@@ -1,105 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-Class
-    Foam::ProcessorLduInterfaceField
-
-Description
-    Abstract base class for processor coupled interfaces.
-
-SourceFiles
-    ProcessorLduInterfaceField.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef ProcessorLduInterfaceField_H
-#define ProcessorLduInterfaceField_H
-
-#include "primitiveFieldsFwd.H"
-#include "typeInfo.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-/*---------------------------------------------------------------------------*\
-                  Class ProcessorLduInterfaceField Declaration
-\*---------------------------------------------------------------------------*/
-
-template<class Type>
-class ProcessorLduInterfaceField
-{
-
-public:
-
-    //- Runtime type information
-    TypeName("ProcessorLduInterfaceField");
-
-
-    // Constructors
-
-        //- Construct given coupled patch
-        ProcessorLduInterfaceField()
-        {}
-
-
-    // Destructor
-
-        virtual ~ProcessorLduInterfaceField();
-
-
-    // Member Functions
-
-        // Access
-
-            //- Return processor number
-            virtual int myProcNo() const = 0;
-
-            //- Return neigbour processor number
-            virtual int neighbProcNo() const = 0;
-
-            //- Is the transform required
-            virtual bool doTransform() const = 0;
-
-            //- Return face transformation tensor
-            virtual const tensorField& forwardT() const = 0;
-
-            //- Return rank of component for transform
-            virtual int rank() const = 0;
-
-
-        //- Transform given patch component field
-        void transformCoupleField(Field<Type>& f) const;
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrix.H b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrix.H
index 892e1a0ae5..e0ce6d28ba 100644
--- a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrix.H
+++ b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrix.H
@@ -75,6 +75,27 @@ Ostream& operator<<
     const LduMatrix<Type, DType, LUType>&
 );
 
+template<class Type, class DType, class LUType>
+typename LduMatrix<Type, DType, LUType>::solverPerformance max
+(
+    const typename LduMatrix<Type, DType, LUType>::solverPerformance&,
+    const typename LduMatrix<Type, DType, LUType>::solverPerformance&
+);
+
+template<class Type, class DType, class LUType>
+Istream& operator>>
+(
+    Istream&,
+    typename LduMatrix<Type, DType, LUType>::solverPerformance&
+);
+
+template<class Type, class DType, class LUType>
+Ostream& operator<<
+(
+    Ostream&,
+    const typename LduMatrix<Type, DType, LUType>::solverPerformance&
+);
+
 
 /*---------------------------------------------------------------------------*\
                            Class LduMatrix Declaration
@@ -162,6 +183,20 @@ public:
                 return solverName_;
             }
 
+            //- Return solver name
+            word& solverName()
+            {
+                return solverName_;
+            }
+
+
+            //- Return field name
+            const word& fieldName() const
+            {
+                return fieldName_;
+            }
+
+
             //- Return initial residual
             const Type& initialResidual() const
             {
@@ -200,8 +235,12 @@ public:
                 return noIterations_;
             }
 
-            //- Check, store and return singularity
-            bool singular(const Type& wApA);
+
+            //- Has the solver converged?
+            bool converged() const
+            {
+                return converged_;
+            }
 
             //- Is the matrix singular?
             bool singular() const;
@@ -213,14 +252,41 @@ public:
                 const Type& relTolerance
             );
 
-            //- Has the solver converged?
-            bool converged() const
-            {
-                return converged_;
-            }
+            //- Singularity test
+            bool checkSingularity(const Type& residual);
 
             //- Print summary of solver performance to the given stream
             void print(Ostream& os) const;
+
+
+        // Member Operators
+
+            bool operator!=(const solverPerformance&) const;
+
+
+        // Friend functions
+
+            //- Return the element-wise maximum of two solverPerformances
+            friend solverPerformance max <Type, DType, LUType>
+            (
+                const solverPerformance&,
+                const solverPerformance&
+            );
+
+
+        // Ostream Operator
+
+            friend Istream& operator>> <Type, DType, LUType>
+            (
+                Istream&,
+                solverPerformance&
+            );
+
+            friend Ostream& operator<< <Type, DType, LUType>
+            (
+                Ostream&,
+                const solverPerformance&
+            );
     };
 
 
@@ -635,6 +701,12 @@ public:
                 return interfaces_;
             }
 
+            //- Return interfaces
+            LduInterfaceFieldPtrsList<Type>& interfaces()
+            {
+                return interfaces_;
+            }
+
 
         // Access to coefficients
 
diff --git a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixATmul.C b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixATmul.C
index dc5b22e428..98d24f4e9b 100644
--- a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixATmul.C
+++ b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixATmul.C
@@ -24,6 +24,7 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "LduMatrix.H"
+#include "LduInterfaceFieldPtrsList.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixTests.C b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixTests.C
index c4dd85fd0e..f5a675f044 100644
--- a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixTests.C
+++ b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixTests.C
@@ -28,7 +28,7 @@ License
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 template<class Type, class DType, class LUType>
-bool Foam::LduMatrix<Type, DType, LUType>::solverPerformance::singular
+bool Foam::LduMatrix<Type, DType, LUType>::solverPerformance::checkSingularity
 (
     const Type& wApA
 )
@@ -115,4 +115,85 @@ void Foam::LduMatrix<Type, DType, LUType>::solverPerformance::print
 }
 
 
+template<class Type, class DType, class LUType>
+bool Foam::LduMatrix<Type, DType, LUType>::solverPerformance::operator!=
+(
+    const LduMatrix<Type, DType, LUType>::solverPerformance& sp
+) const
+{
+    return
+    (
+        solverName()      != sp.solverName()
+     || fieldName()       != sp.fieldName()
+     || initialResidual() != sp.initialResidual()
+     || finalResidual()   != sp.finalResidual()
+     || nIterations()     != sp.nIterations()
+     || converged()       != sp.converged()
+     || singular()        != sp.singular()
+    );
+}
+
+
+template<class Type, class DType, class LUType>
+typename Foam::LduMatrix<Type, DType, LUType>::solverPerformance Foam::max
+(
+    const typename Foam::LduMatrix<Type, DType, LUType>::solverPerformance& sp1,
+    const typename Foam::LduMatrix<Type, DType, LUType>::solverPerformance& sp2
+)
+{
+    return lduMatrix::solverPerformance
+    (
+        sp1.solverName(),
+        sp1.fieldName_,
+        max(sp1.initialResidual(), sp2.initialResidual()),
+        max(sp1.finalResidual(), sp2.finalResidual()),
+        max(sp1.nIterations(), sp2.nIterations()),
+        sp1.converged() && sp2.converged(),
+        sp1.singular() || sp2.singular()
+    );
+}
+
+
+template<class Type, class DType, class LUType>
+Foam::Istream& Foam::operator>>
+(
+    Istream& is,
+    typename Foam::LduMatrix<Type, DType, LUType>::solverPerformance& sp
+)
+{
+    is.readBeginList("LduMatrix<Type, DType, LUType>::solverPerformance");
+    is  >> sp.solverName_
+        >> sp.fieldName_
+        >> sp.initialResidual_
+        >> sp.finalResidual_
+        >> sp.noIterations_
+        >> sp.converged_
+        >> sp.singular_;
+    is.readEndList("LduMatrix<Type, DType, LUType>::solverPerformance");
+
+    return is;
+}
+
+
+template<class Type, class DType, class LUType>
+Foam::Ostream& Foam::operator<<
+(
+    Ostream& os,
+    const typename Foam::LduMatrix<Type, DType, LUType>::solverPerformance& sp
+)
+{
+    os  << token::BEGIN_LIST
+        << sp.solverName_ << token::SPACE
+        << sp.fieldName_ << token::SPACE
+        << sp.initialResidual_ << token::SPACE
+        << sp.finalResidual_ << token::SPACE
+        << sp.noIterations_ << token::SPACE
+        << sp.converged_ << token::SPACE
+        << sp.singular_ << token::SPACE
+        << token::END_LIST;
+
+    return os;
+}
+
+
 // ************************************************************************* //
diff --git a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixUpdateMatrixInterfaces.C b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixUpdateMatrixInterfaces.C
index fc8a9c8097..d3d8de20a0 100644
--- a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixUpdateMatrixInterfaces.C
+++ b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixUpdateMatrixInterfaces.C
@@ -24,7 +24,7 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "LduMatrix.H"
-#include "LduInterfaceField.H"
+#include "lduInterfaceField.H"
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
@@ -50,7 +50,8 @@ void Foam::LduMatrix<Type, DType, LUType>::initMatrixInterfaces
                 (
                     result,
                     psiif,
-                    Amultiplier<Type, LUType>(interfaceCoeffs[interfaceI]),
+                    interfaceCoeffs[interfaceI],
+                    //Amultiplier<Type, LUType>(interfaceCoeffs[interfaceI]),
                     Pstream::defaultCommsType
                 );
             }
@@ -75,7 +76,8 @@ void Foam::LduMatrix<Type, DType, LUType>::initMatrixInterfaces
                 (
                     result,
                     psiif,
-                    Amultiplier<Type, LUType>(interfaceCoeffs[interfaceI]),
+                    interfaceCoeffs[interfaceI],
+                    //Amultiplier<Type, LUType>(interfaceCoeffs[interfaceI]),
                     Pstream::blocking
                 );
             }
@@ -120,7 +122,8 @@ void Foam::LduMatrix<Type, DType, LUType>::updateMatrixInterfaces
                 (
                     result,
                     psiif,
-                    Amultiplier<Type, LUType>(interfaceCoeffs[interfaceI]),
+                    interfaceCoeffs[interfaceI],
+                    //Amultiplier<Type, LUType>(interfaceCoeffs[interfaceI]),
                     Pstream::defaultCommsType
                 );
             }
@@ -143,7 +146,8 @@ void Foam::LduMatrix<Type, DType, LUType>::updateMatrixInterfaces
                     (
                         result,
                         psiif,
-                        Amultiplier<Type, LUType>(interfaceCoeffs[interfaceI]),
+                        interfaceCoeffs[interfaceI],
+                      //Amultiplier<Type, LUType>(interfaceCoeffs[interfaceI]),
                         Pstream::scheduled
                     );
                 }
@@ -153,7 +157,8 @@ void Foam::LduMatrix<Type, DType, LUType>::updateMatrixInterfaces
                     (
                         result,
                         psiif,
-                        Amultiplier<Type, LUType>(interfaceCoeffs[interfaceI]),
+                        interfaceCoeffs[interfaceI],
+                      //Amultiplier<Type, LUType>(interfaceCoeffs[interfaceI]),
                         Pstream::scheduled
                     );
                 }
@@ -175,7 +180,8 @@ void Foam::LduMatrix<Type, DType, LUType>::updateMatrixInterfaces
                 (
                     result,
                     psiif,
-                    Amultiplier<Type, LUType>(interfaceCoeffs[interfaceI]),
+                    interfaceCoeffs[interfaceI],
+                    //Amultiplier<Type, LUType>(interfaceCoeffs[interfaceI]),
                     Pstream::blocking
                 );
             }
diff --git a/src/OpenFOAM/matrices/LduMatrix/Solvers/PBiCG/TPBiCG.C b/src/OpenFOAM/matrices/LduMatrix/Solvers/PBiCG/TPBiCG.C
index 6221fe3b9c..e36d1d6a37 100644
--- a/src/OpenFOAM/matrices/LduMatrix/Solvers/PBiCG/TPBiCG.C
+++ b/src/OpenFOAM/matrices/LduMatrix/Solvers/PBiCG/TPBiCG.C
@@ -150,13 +150,18 @@ Foam::TPBiCG<Type, DType, LUType>::solve(Field<Type>& psi) const
 
             // --- Update preconditioned residuals
             this->matrix_.Amul(wA, pA);
-
             this->matrix_.Tmul(wT, pT);
 
             Type wApT = gSumCmptProd(wA, pT);
 
             // --- Test for singularity
-            if (solverPerf.singular(cmptDivide(cmptMag(wApT), normFactor)))
+            if
+            (
+                solverPerf.checkSingularity
+                (
+                    cmptDivide(cmptMag(wApT), normFactor)
+                )
+            )
             {
                 break;
             }
diff --git a/src/OpenFOAM/matrices/LduMatrix/Solvers/PBiCGScalarAlpha/PBiCGScalarAlpha.C b/src/OpenFOAM/matrices/LduMatrix/Solvers/PBiCGScalarAlpha/PBiCGScalarAlpha.C
index c540a2c746..955e6be440 100644
--- a/src/OpenFOAM/matrices/LduMatrix/Solvers/PBiCGScalarAlpha/PBiCGScalarAlpha.C
+++ b/src/OpenFOAM/matrices/LduMatrix/Solvers/PBiCGScalarAlpha/PBiCGScalarAlpha.C
@@ -126,7 +126,7 @@ Foam::TPBiCG<Type, DType, LUType>::solve
 
             // --- Update search directions:
             //wArT = gSumProd(wA, rT);
-            wArT = sum(wA & rT);
+            wArT = gSum(wA && rT);
 
             if (solverPerf.nIterations() == 0)
             {
@@ -138,7 +138,7 @@ Foam::TPBiCG<Type, DType, LUType>::solve
             }
             else
             {
-                scalar beta = cmptDivide(wArT, wArTold);
+                scalar beta = wArT/wArTold;
 
                 for (register label cell=0; cell<nCells; cell++)
                 {
@@ -152,19 +152,24 @@ Foam::TPBiCG<Type, DType, LUType>::solve
             this->matrix_.Amul(wA, pA);
             this->matrix_.Tmul(wT, pT);
 
-            scalar wApT = sum(wA & pT);
-
+            scalar wApT = gSum(wA && pT);
 
             // --- Test for singularity
-            //if
-            //(
-            //    solverPerf.checkSingularity(ratio(mag(wApT)normFactor))
-            //) break;
+            if
+            (
+                solverPerf.checkSingularity
+                (
+                    cmptDivide(Type::one*mag(wApT), normFactor)
+                )
+            )
+            {
+                break;
+            }
 
 
             // --- Update solution and residual:
 
-            scalar alpha = cmptDivide(wArT, wApT);
+            scalar alpha = wArT/wApT;
 
             for (register label cell=0; cell<nCells; cell++)
             {
diff --git a/src/OpenFOAM/matrices/LduMatrix/Solvers/PCG/TPCG.C b/src/OpenFOAM/matrices/LduMatrix/Solvers/PCG/TPCG.C
index d48dfb6fe2..1226e65137 100644
--- a/src/OpenFOAM/matrices/LduMatrix/Solvers/PCG/TPCG.C
+++ b/src/OpenFOAM/matrices/LduMatrix/Solvers/PCG/TPCG.C
@@ -143,7 +143,13 @@ Foam::TPCG<Type, DType, LUType>::solve(Field<Type>& psi) const
 
 
             // --- Test for singularity
-            if (solverPerf.singular(cmptDivide(cmptMag(wApA), normFactor)))
+            if
+            (
+                solverPerf.checkSingularity
+                (
+                    cmptDivide(cmptMag(wApA), normFactor)
+                )
+            )
             {
                 break;
             }
diff --git a/src/OpenFOAM/matrices/LduMatrix/Solvers/lduSolvers.C b/src/OpenFOAM/matrices/LduMatrix/Solvers/lduSolvers.C
index 0029abc632..30159b4a48 100644
--- a/src/OpenFOAM/matrices/LduMatrix/Solvers/lduSolvers.C
+++ b/src/OpenFOAM/matrices/LduMatrix/Solvers/lduSolvers.C
@@ -24,7 +24,8 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "TPCG.H"
-#include "TPBiCG.H"
+//#include "TPBiCG.H"
+#include "PBiCGScalarAlpha.H"
 #include "SmoothSolver.H"
 #include "fieldTypes.H"
 
@@ -46,7 +47,7 @@ License
 
 namespace Foam
 {
-    makeLduSolvers(scalar, scalar, scalar);
+    //makeLduSolvers(scalar, scalar, scalar);
     makeLduSolvers(vector, scalar, scalar);
     makeLduSolvers(sphericalTensor, scalar, scalar);
     makeLduSolvers(symmTensor, scalar, scalar);
diff --git a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterfaceFields/cyclicLduInterfaceField/cyclicLduInterfaceField.H b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterfaceFields/cyclicLduInterfaceField/cyclicLduInterfaceField.H
index 86bdcd045e..7c54f36aed 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterfaceFields/cyclicLduInterfaceField/cyclicLduInterfaceField.H
+++ b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterfaceFields/cyclicLduInterfaceField/cyclicLduInterfaceField.H
@@ -84,10 +84,14 @@ public:
             virtual int rank() const = 0;
 
 
-        //- Transform given patch internal field
+        //- Transform given patch field
+        template<class Type>
+        void transformCoupleField(Field<Type>& f) const;
+
+        //- Transform given patch component field
         void transformCoupleField
         (
-            scalarField& psiInternal,
+            scalarField& f,
             const direction cmpt
         ) const;
 };
@@ -97,6 +101,30 @@ public:
 
 } // End namespace Foam
 
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#include "tensorField.H"
+
+template<class Type>
+void Foam::cyclicLduInterfaceField::transformCoupleField
+(
+    Field<Type>& f
+) const
+{
+    if (doTransform())
+    {
+        if (forwardT().size() == 1)
+        {
+            transform(f, forwardT()[0], f);
+        }
+        else
+        {
+            transform(f, forwardT(), f);
+        }
+    }
+}
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #endif
diff --git a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterfaceFields/lduInterfaceField/lduInterfaceField.H b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterfaceFields/lduInterfaceField/lduInterfaceField.H
index e4aa7b1032..45ad3f0dca 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterfaceFields/lduInterfaceField/lduInterfaceField.H
+++ b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterfaceFields/lduInterfaceField/lduInterfaceField.H
@@ -73,6 +73,7 @@ class lduInterfaceField
         //- Disallow default bitwise assignment
         void operator=(const lduInterfaceField&);
 
+
 public:
 
     //- Runtime type information
@@ -112,17 +113,6 @@ public:
 
         // Coupled interface matrix update
 
-            //- Initialise neighbour matrix update
-            virtual void initInterfaceMatrixUpdate
-            (
-                scalarField&,
-                const scalarField&,
-                const scalarField&,
-                const direction,
-                const Pstream::commsTypes commsType
-            ) const
-            {}
-
             //- Whether matrix has been updated
             bool updatedMatrix() const
             {
@@ -141,6 +131,17 @@ public:
                 return true;
             }
 
+            //- Initialise neighbour matrix update
+            virtual void initInterfaceMatrixUpdate
+            (
+                scalarField&,
+                const scalarField&,
+                const scalarField&,
+                const direction,
+                const Pstream::commsTypes commsType
+            ) const
+            {}
+
             //- Update result field based on interface functionality
             virtual void updateInterfaceMatrix
             (
diff --git a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterfaceFields/processorLduInterfaceField/processorLduInterfaceField.H b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterfaceFields/processorLduInterfaceField/processorLduInterfaceField.H
index b511193355..aed86320f7 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterfaceFields/processorLduInterfaceField/processorLduInterfaceField.H
+++ b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterfaceFields/processorLduInterfaceField/processorLduInterfaceField.H
@@ -87,6 +87,10 @@ public:
             virtual int rank() const = 0;
 
 
+        //- Transform given patch field
+        template<class Type>
+        void transformCoupleField(Field<Type>& f) const;
+
         //- Transform given patch component field
         void transformCoupleField
         (
@@ -100,6 +104,30 @@ public:
 
 } // End namespace Foam
 
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#include "tensorField.H"
+
+template<class Type>
+void Foam::processorLduInterfaceField::transformCoupleField
+(
+    Field<Type>& f
+) const
+{
+    if (doTransform())
+    {
+        if (forwardT().size() == 1)
+        {
+            transform(f, forwardT()[0], f);
+        }
+        else
+        {
+            transform(f, forwardT(), f);
+        }
+    }
+}
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #endif
diff --git a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrix.H b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrix.H
index dc9583fc0b..b96c01bc96 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrix.H
+++ b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrix.H
@@ -210,7 +210,7 @@ public:
                 return singular_;
             }
 
-            //- Convergence test
+            //- Check, store and return convergence
             bool checkConvergence
             (
                 const scalar tolerance,
@@ -223,6 +223,7 @@ public:
             //- Print summary of solver performance
             void print() const;
 
+
         // Member Operators
 
             bool operator!=(const solverPerformance&) const;
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/PBiCG/PBiCG.C b/src/OpenFOAM/matrices/lduMatrix/solvers/PBiCG/PBiCG.C
index b553bab048..fa5026a51b 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/PBiCG/PBiCG.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/PBiCG/PBiCG.C
@@ -167,9 +167,11 @@ Foam::lduMatrix::solverPerformance Foam::PBiCG::solve
 
             scalar wApT = gSumProd(wA, pT);
 
-
             // --- Test for singularity
-            if (solverPerf.checkSingularity(mag(wApT)/normFactor)) break;
+            if (solverPerf.checkSingularity(mag(wApT)/normFactor))
+            {
+                break;
+            }
 
 
             // --- Update solution and residual:
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/coupled/coupledFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/basic/coupled/coupledFvPatchField.C
index a5fa44e1d7..906edfb9ec 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/coupled/coupledFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/basic/coupled/coupledFvPatchField.C
@@ -39,7 +39,7 @@ coupledFvPatchField<Type>::coupledFvPatchField
     const DimensionedField<Type, volMesh>& iF
 )
 :
-    lduInterfaceField(refCast<const lduInterface>(p)),
+    LduInterfaceField<Type>(refCast<const lduInterface>(p)),
     fvPatchField<Type>(p, iF)
 {}
 
@@ -52,7 +52,7 @@ coupledFvPatchField<Type>::coupledFvPatchField
     const Field<Type>& f
 )
 :
-    lduInterfaceField(refCast<const lduInterface>(p)),
+    LduInterfaceField<Type>(refCast<const lduInterface>(p)),
     fvPatchField<Type>(p, iF, f)
 {}
 
@@ -66,7 +66,7 @@ coupledFvPatchField<Type>::coupledFvPatchField
     const fvPatchFieldMapper& mapper
 )
 :
-    lduInterfaceField(refCast<const lduInterface>(p)),
+    LduInterfaceField<Type>(refCast<const lduInterface>(p)),
     fvPatchField<Type>(ptf, p, iF, mapper)
 {}
 
@@ -79,7 +79,7 @@ coupledFvPatchField<Type>::coupledFvPatchField
     const dictionary& dict
 )
 :
-    lduInterfaceField(refCast<const lduInterface>(p)),
+    LduInterfaceField<Type>(refCast<const lduInterface>(p)),
     fvPatchField<Type>(p, iF, dict)
 {}
 
@@ -90,7 +90,7 @@ coupledFvPatchField<Type>::coupledFvPatchField
     const coupledFvPatchField<Type>& ptf
 )
 :
-    lduInterfaceField(refCast<const lduInterface>(ptf.patch())),
+    LduInterfaceField<Type>(refCast<const lduInterface>(ptf.patch())),
     fvPatchField<Type>(ptf)
 {}
 
@@ -102,7 +102,7 @@ coupledFvPatchField<Type>::coupledFvPatchField
     const DimensionedField<Type, volMesh>& iF
 )
 :
-    lduInterfaceField(refCast<const lduInterface>(ptf.patch())),
+    LduInterfaceField<Type>(refCast<const lduInterface>(ptf.patch())),
     fvPatchField<Type>(ptf, iF)
 {}
 
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/coupled/coupledFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/basic/coupled/coupledFvPatchField.H
index 5a271a763e..88f473829f 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/coupled/coupledFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/basic/coupled/coupledFvPatchField.H
@@ -35,7 +35,7 @@ SourceFiles
 #ifndef coupledFvPatchField_H
 #define coupledFvPatchField_H
 
-#include "lduInterfaceField.H"
+#include "LduInterfaceField.H"
 #include "fvPatchField.H"
 #include "coupledFvPatch.H"
 
@@ -51,7 +51,7 @@ namespace Foam
 template<class Type>
 class coupledFvPatchField
 :
-    public lduInterfaceField,
+    public LduInterfaceField<Type>,
     public fvPatchField<Type>
 {
 
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchField.C
index 520d4b23db..90638bf40c 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchField.C
@@ -221,6 +221,38 @@ void cyclicFvPatchField<Type>::updateInterfaceMatrix
 }
 
 
+template<class Type>
+void cyclicFvPatchField<Type>::updateInterfaceMatrix
+(
+    Field<Type>& result,
+    const Field<Type>& psiInternal,
+    const scalarField& coeffs,
+    const Pstream::commsTypes
+) const
+{
+    Field<Type> pnf(this->size());
+
+    const labelUList& nbrFaceCells =
+        cyclicPatch().cyclicPatch().neighbPatch().faceCells();
+
+    forAll(pnf, facei)
+    {
+        pnf[facei] = psiInternal[nbrFaceCells[facei]];
+    }
+
+    // Transform according to the transformation tensors
+    transformCoupleField(pnf);
+
+    // Multiply the field by coefficients and add into the result
+    const labelUList& faceCells = cyclicPatch_.faceCells();
+
+    forAll(faceCells, elemI)
+    {
+        result[faceCells[elemI]] -= coeffs[elemI]*pnf[elemI];
+    }
+}
+
+
 template<class Type>
 void cyclicFvPatchField<Type>::write(Ostream& os) const
 {
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchField.H
index b08b0aa91a..c3ba07477d 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchField.H
@@ -166,6 +166,15 @@ public:
                 const Pstream::commsTypes commsType
             ) const;
 
+            //- Update result field based on interface functionality
+            virtual void updateInterfaceMatrix
+            (
+                Field<Type>& result,
+                const Field<Type>& psiInternal,
+                const scalarField& coeffs,
+                const Pstream::commsTypes commsType
+            ) const;
+
 
         // Cyclic coupled interface functions
 
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.C
index d86c49e5c4..c9fb2563c1 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.C
@@ -45,6 +45,7 @@ processorFvPatchField<Type>::processorFvPatchField
     coupledFvPatchField<Type>(p, iF),
     procPatch_(refCast<const processorFvPatch>(p)),
     sendBuf_(0),
+    receiveBuf_(0),
     outstandingSendRequest_(-1),
     outstandingRecvRequest_(-1),
     scalarSendBuf_(0),
@@ -63,6 +64,7 @@ processorFvPatchField<Type>::processorFvPatchField
     coupledFvPatchField<Type>(p, iF, f),
     procPatch_(refCast<const processorFvPatch>(p)),
     sendBuf_(0),
+    receiveBuf_(0),
     outstandingSendRequest_(-1),
     outstandingRecvRequest_(-1),
     scalarSendBuf_(0),
@@ -83,6 +85,7 @@ processorFvPatchField<Type>::processorFvPatchField
     coupledFvPatchField<Type>(ptf, p, iF, mapper),
     procPatch_(refCast<const processorFvPatch>(p)),
     sendBuf_(0),
+    receiveBuf_(0),
     outstandingSendRequest_(-1),
     outstandingRecvRequest_(-1),
     scalarSendBuf_(0),
@@ -126,6 +129,7 @@ processorFvPatchField<Type>::processorFvPatchField
     coupledFvPatchField<Type>(p, iF, dict),
     procPatch_(refCast<const processorFvPatch>(p)),
     sendBuf_(0),
+    receiveBuf_(0),
     outstandingSendRequest_(-1),
     outstandingRecvRequest_(-1),
     scalarSendBuf_(0),
@@ -162,6 +166,7 @@ processorFvPatchField<Type>::processorFvPatchField
     coupledFvPatchField<Type>(ptf),
     procPatch_(refCast<const processorFvPatch>(ptf.patch())),
     sendBuf_(ptf.sendBuf_.xfer()),
+    receiveBuf_(ptf.receiveBuf_.xfer()),
     outstandingSendRequest_(-1),
     outstandingRecvRequest_(-1),
     scalarSendBuf_(ptf.scalarSendBuf_.xfer()),
@@ -186,6 +191,7 @@ processorFvPatchField<Type>::processorFvPatchField
     coupledFvPatchField<Type>(ptf, iF),
     procPatch_(refCast<const processorFvPatch>(ptf.patch())),
     sendBuf_(0),
+    receiveBuf_(0),
     outstandingSendRequest_(-1),
     outstandingRecvRequest_(-1),
     scalarSendBuf_(0),
@@ -428,6 +434,124 @@ void processorFvPatchField<Type>::updateInterfaceMatrix
 }
 
 
+template<class Type>
+void processorFvPatchField<Type>::initInterfaceMatrixUpdate
+(
+    Field<Type>&,
+    const Field<Type>& psiInternal,
+    const scalarField&,
+    const Pstream::commsTypes commsType
+) const
+{
+    this->patch().patchInternalField(psiInternal, sendBuf_);
+
+    if (commsType == Pstream::nonBlocking && !Pstream::floatTransfer)
+    {
+        // Fast path.
+        if (debug && !this->ready())
+        {
+            FatalErrorIn
+            (
+                "processorFvPatchField<Type>::initInterfaceMatrixUpdate(..)"
+            )   << "On patch " << procPatch_.name()
+                << " outstanding request."
+                << abort(FatalError);
+        }
+
+
+        receiveBuf_.setSize(sendBuf_.size());
+        outstandingRecvRequest_ = UPstream::nRequests();
+        IPstream::read
+        (
+            Pstream::nonBlocking,
+            procPatch_.neighbProcNo(),
+            reinterpret_cast<char*>(receiveBuf_.begin()),
+            receiveBuf_.byteSize(),
+            procPatch_.tag()
+        );
+
+        outstandingSendRequest_ = UPstream::nRequests();
+        OPstream::write
+        (
+            Pstream::nonBlocking,
+            procPatch_.neighbProcNo(),
+            reinterpret_cast<const char*>(sendBuf_.begin()),
+            sendBuf_.byteSize(),
+            procPatch_.tag()
+        );
+    }
+    else
+    {
+        procPatch_.compressedSend(commsType, sendBuf_);
+    }
+
+    const_cast<processorFvPatchField<Type>&>(*this).updatedMatrix() = false;
+}
+
+
+template<class Type>
+void processorFvPatchField<Type>::updateInterfaceMatrix
+(
+    Field<Type>& result,
+    const Field<Type>&,
+    const scalarField& coeffs,
+    const Pstream::commsTypes commsType
+) const
+{
+    if (this->updatedMatrix())
+    {
+        return;
+    }
+
+    const labelUList& faceCells = this->patch().faceCells();
+
+    if (commsType == Pstream::nonBlocking && !Pstream::floatTransfer)
+    {
+        // Fast path.
+        if
+        (
+            outstandingRecvRequest_ >= 0
+         && outstandingRecvRequest_ < Pstream::nRequests()
+        )
+        {
+            UPstream::waitRequest(outstandingRecvRequest_);
+        }
+        // Recv finished so assume sending finished as well.
+        outstandingSendRequest_ = -1;
+        outstandingRecvRequest_ = -1;
+
+        // Consume straight from receiveBuf_
+
+        // Transform according to the transformation tensor
+        transformCoupleField(receiveBuf_);
+
+        // Multiply the field by coefficients and add into the result
+        forAll(faceCells, elemI)
+        {
+            result[faceCells[elemI]] -= coeffs[elemI]*receiveBuf_[elemI];
+        }
+    }
+    else
+    {
+        Field<Type> pnf
+        (
+            procPatch_.compressedReceive<Type>(commsType, this->size())()
+        );
+
+        // Transform according to the transformation tensor
+        transformCoupleField(pnf);
+
+        // Multiply the field by coefficients and add into the result
+        forAll(faceCells, elemI)
+        {
+            result[faceCells[elemI]] -= coeffs[elemI]*pnf[elemI];
+        }
+    }
+
+    const_cast<processorFvPatchField<Type>&>(*this).updatedMatrix() = true;
+}
+
+
 template<class Type>
 bool processorFvPatchField<Type>::ready() const
 {
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.H
index a085ae88e5..690a9dbe4f 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.H
@@ -64,6 +64,9 @@ class processorFvPatchField
             //- Send buffer.
             mutable Field<Type> sendBuf_;
 
+            //- Receive buffer.
+            mutable Field<Type> receiveBuf_;
+
             //- Outstanding request
             mutable label outstandingSendRequest_;
 
@@ -184,6 +187,9 @@ public:
             //- Return patch-normal gradient
             virtual tmp<Field<Type> > snGrad() const;
 
+            //- Is all data available
+            virtual bool ready() const;
+
             //- Initialise neighbour matrix update
             virtual void initInterfaceMatrixUpdate
             (
@@ -194,9 +200,6 @@ public:
                 const Pstream::commsTypes commsType
             ) const;
 
-            //- Is all data available
-            virtual bool ready() const;
-
             //- Update result field based on interface functionality
             virtual void updateInterfaceMatrix
             (
@@ -207,6 +210,25 @@ public:
                 const Pstream::commsTypes commsType
             ) const;
 
+            //- Initialise neighbour matrix update
+            virtual void initInterfaceMatrixUpdate
+            (
+                Field<Type>& result,
+                const Field<Type>& psiInternal,
+                const scalarField& coeffs,
+                const Pstream::commsTypes commsType
+            ) const;
+
+            //- Update result field based on interface functionality
+            virtual void updateInterfaceMatrix
+            (
+                Field<Type>& result,
+                const Field<Type>& psiInternal,
+                const scalarField& coeffs,
+                const Pstream::commsTypes commsType
+            ) const;
+
+
         //- Processor coupled interface functions
 
             //- Return processor number
diff --git a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrixSolve.C b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrixSolve.C
index 675c794070..a1eb9bc369 100644
--- a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrixSolve.C
+++ b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrixSolve.C
@@ -111,7 +111,7 @@ Foam::lduMatrix::solverPerformance Foam::fvMatrix<Type>::solve
         );
 
         lduInterfaceFieldPtrsList interfaces =
-            psi.boundaryField().interfaces();
+            psi.boundaryField().scalarInterfaces();
 
         // Use the initMatrixInterfaces and updateMatrixInterfaces to correct
         // bouCoeffsCmpt for the explicit part of the coupled boundary
@@ -245,7 +245,7 @@ Foam::tmp<Foam::Field<Type> > Foam::fvMatrix<Type>::residual() const
                 psiCmpt,
                 res.component(cmpt) - boundaryDiagCmpt*psiCmpt,
                 bouCoeffsCmpt,
-                psi_.boundaryField().interfaces(),
+                psi_.boundaryField().scalarInterfaces(),
                 cmpt
             )
         );
diff --git a/src/finiteVolume/fvMatrices/fvScalarMatrix/fvScalarMatrix.C b/src/finiteVolume/fvMatrices/fvScalarMatrix/fvScalarMatrix.C
index 9b4b92af51..7782eac28a 100644
--- a/src/finiteVolume/fvMatrices/fvScalarMatrix/fvScalarMatrix.C
+++ b/src/finiteVolume/fvMatrices/fvScalarMatrix/fvScalarMatrix.C
@@ -80,7 +80,7 @@ Foam::fvMatrix<Foam::scalar>::solver
                 *this,
                 boundaryCoeffs_,
                 internalCoeffs_,
-                psi_.boundaryField().interfaces(),
+                psi_.boundaryField().scalarInterfaces(),
                 solverControls
             )
         )
@@ -158,7 +158,7 @@ Foam::lduMatrix::solverPerformance Foam::fvMatrix<Foam::scalar>::solve
         *this,
         boundaryCoeffs_,
         internalCoeffs_,
-        psi.boundaryField().interfaces(),
+        psi.boundaryField().scalarInterfaces(),
         solverControls
     )->solve(psi.internalField(), totalSource);
 
@@ -187,7 +187,7 @@ Foam::tmp<Foam::scalarField> Foam::fvMatrix<Foam::scalar>::residual() const
             psi_.internalField(),
             source_ - boundaryDiag*psi_.internalField(),
             boundaryCoeffs_,
-            psi_.boundaryField().interfaces(),
+            psi_.boundaryField().scalarInterfaces(),
             0
         )
     );

From 28fad4681ee2f224e05522a9466fbfe1c5c76faa Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Wed, 25 Apr 2012 18:18:46 +0100
Subject: [PATCH 259/317] Updated headers

---
 .../fields/GeometricFields/GeometricField/GeometricField.H      | 2 +-
 .../LduMatrix/LduMatrix/LduInterfaceField/LduInterfaceField.C   | 2 +-
 .../cyclicLduInterfaceField/cyclicLduInterfaceField.H           | 2 +-
 .../processorLduInterfaceField/processorLduInterfaceField.H     | 2 +-
 src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrix.H           | 2 +-
 src/OpenFOAM/matrices/lduMatrix/solvers/PBiCG/PBiCG.C           | 2 +-
 .../fields/fvPatchFields/basic/coupled/coupledFvPatchField.C    | 2 +-
 src/finiteVolume/fvMatrices/fvMatrix/fvMatrixSolve.C            | 2 +-
 src/finiteVolume/fvMatrices/fvScalarMatrix/fvScalarMatrix.C     | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.H b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.H
index ad14ad8c34..5aef9e0fb8 100644
--- a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.H
+++ b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduInterfaceField/LduInterfaceField.C b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduInterfaceField/LduInterfaceField.C
index 85f42a949a..6f8d95bafa 100644
--- a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduInterfaceField/LduInterfaceField.C
+++ b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduInterfaceField/LduInterfaceField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterfaceFields/cyclicLduInterfaceField/cyclicLduInterfaceField.H b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterfaceFields/cyclicLduInterfaceField/cyclicLduInterfaceField.H
index 7c54f36aed..5ff1f3eff8 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterfaceFields/cyclicLduInterfaceField/cyclicLduInterfaceField.H
+++ b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterfaceFields/cyclicLduInterfaceField/cyclicLduInterfaceField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterfaceFields/processorLduInterfaceField/processorLduInterfaceField.H b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterfaceFields/processorLduInterfaceField/processorLduInterfaceField.H
index aed86320f7..a5b9066b82 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterfaceFields/processorLduInterfaceField/processorLduInterfaceField.H
+++ b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterfaceFields/processorLduInterfaceField/processorLduInterfaceField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrix.H b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrix.H
index b96c01bc96..ae7438b937 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrix.H
+++ b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrix.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/PBiCG/PBiCG.C b/src/OpenFOAM/matrices/lduMatrix/solvers/PBiCG/PBiCG.C
index fa5026a51b..d47b606c24 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/PBiCG/PBiCG.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/PBiCG/PBiCG.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/coupled/coupledFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/basic/coupled/coupledFvPatchField.C
index 906edfb9ec..895f340479 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/coupled/coupledFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/basic/coupled/coupledFvPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrixSolve.C b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrixSolve.C
index a1eb9bc369..bc3fc66d01 100644
--- a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrixSolve.C
+++ b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrixSolve.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/finiteVolume/fvMatrices/fvScalarMatrix/fvScalarMatrix.C b/src/finiteVolume/fvMatrices/fvScalarMatrix/fvScalarMatrix.C
index 7782eac28a..23a259d574 100644
--- a/src/finiteVolume/fvMatrices/fvScalarMatrix/fvScalarMatrix.C
+++ b/src/finiteVolume/fvMatrices/fvScalarMatrix/fvScalarMatrix.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

From 154d7fafaba32e3328ef03a1216d26e46a04f527 Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Wed, 25 Apr 2012 18:19:18 +0100
Subject: [PATCH 260/317] LduMatrix: Added missing file

---
 .../LduInterfaceField/LduInterfaceFields.C    | 41 +++++++++++++++++++
 1 file changed, 41 insertions(+)
 create mode 100644 src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduInterfaceField/LduInterfaceFields.C

diff --git a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduInterfaceField/LduInterfaceFields.C b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduInterfaceField/LduInterfaceFields.C
new file mode 100644
index 0000000000..7c06385a06
--- /dev/null
+++ b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduInterfaceField/LduInterfaceFields.C
@@ -0,0 +1,41 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "LduInterfaceField.H"
+#include "fieldTypes.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+defineTemplateTypeNameAndDebug(Foam::LduInterfaceField<Foam::scalar>, 0);
+defineTemplateTypeNameAndDebug(Foam::LduInterfaceField<Foam::vector>, 0);
+defineTemplateTypeNameAndDebug
+(
+    Foam::LduInterfaceField<Foam::sphericalTensor>,
+    0
+);
+defineTemplateTypeNameAndDebug(Foam::LduInterfaceField<Foam::symmTensor>, 0);
+defineTemplateTypeNameAndDebug(Foam::LduInterfaceField<Foam::tensor>, 0);
+
+// ************************************************************************* //

From 30018443f8d5c17675f5e3cf3d4ac9958168b666 Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Wed, 25 Apr 2012 18:19:38 +0100
Subject: [PATCH 261/317] Updated headers

---
 .../LduMatrix/LduMatrix/LduInterfaceField/LduInterfaceFields.C  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduInterfaceField/LduInterfaceFields.C b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduInterfaceField/LduInterfaceFields.C
index 7c06385a06..002e3cf700 100644
--- a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduInterfaceField/LduInterfaceFields.C
+++ b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduInterfaceField/LduInterfaceFields.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

From 4305e7dd6b66fb626b58c75e48ef0d1ffe9421bc Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Wed, 25 Apr 2012 18:20:15 +0100
Subject: [PATCH 262/317] PisoFoam: block-coupled U test version of pisoFoam

---
 applications/test/PisoFoam/Make/files     |   3 +
 applications/test/PisoFoam/Make/options   |  13 ++
 applications/test/PisoFoam/PisoFoam.C     | 191 ++++++++++++++++++++++
 applications/test/PisoFoam/createFields.H |  42 +++++
 4 files changed, 249 insertions(+)
 create mode 100644 applications/test/PisoFoam/Make/files
 create mode 100644 applications/test/PisoFoam/Make/options
 create mode 100644 applications/test/PisoFoam/PisoFoam.C
 create mode 100644 applications/test/PisoFoam/createFields.H

diff --git a/applications/test/PisoFoam/Make/files b/applications/test/PisoFoam/Make/files
new file mode 100644
index 0000000000..340f8016c2
--- /dev/null
+++ b/applications/test/PisoFoam/Make/files
@@ -0,0 +1,3 @@
+PisoFoam.C
+
+EXE = $(FOAM_USER_APPBIN)/PisoFoam
diff --git a/applications/test/PisoFoam/Make/options b/applications/test/PisoFoam/Make/options
new file mode 100644
index 0000000000..259f95f7b9
--- /dev/null
+++ b/applications/test/PisoFoam/Make/options
@@ -0,0 +1,13 @@
+EXE_INC = \
+    -I$(LIB_SRC)/turbulenceModels/incompressible/turbulenceModel \
+    -I$(LIB_SRC)/transportModels \
+    -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \
+    -I$(LIB_SRC)/finiteVolume/lnInclude
+
+EXE_LIBS = \
+    -lincompressibleTurbulenceModel \
+    -lincompressibleRASModels \
+    -lincompressibleLESModels \
+    -lincompressibleTransportModels \
+    -lfiniteVolume \
+    -lmeshTools
diff --git a/applications/test/PisoFoam/PisoFoam.C b/applications/test/PisoFoam/PisoFoam.C
new file mode 100644
index 0000000000..a6a4d6c5b7
--- /dev/null
+++ b/applications/test/PisoFoam/PisoFoam.C
@@ -0,0 +1,191 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Application
+    pisoFoam
+
+Description
+    Transient solver for incompressible flow.
+
+    Turbulence modelling is generic, i.e. laminar, RAS or LES may be selected.
+
+\*---------------------------------------------------------------------------*/
+
+#include "fvCFD.H"
+#include "singlePhaseTransportModel.H"
+#include "turbulenceModel.H"
+
+#include "LduMatrix.H"
+#include "diagTensorField.H"
+
+typedef LduMatrix<vector, scalar, scalar> lduVectorMatrix;
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+int main(int argc, char *argv[])
+{
+    #include "setRootCase.H"
+
+    #include "createTime.H"
+    #include "createMesh.H"
+    #include "createFields.H"
+    #include "initContinuityErrs.H"
+
+    // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+    Info<< "\nStarting time loop\n" << endl;
+
+    while (runTime.loop())
+    {
+        Info<< "Time = " << runTime.timeName() << nl << endl;
+
+        #include "readPISOControls.H"
+        #include "CourantNo.H"
+
+        // Pressure-velocity PISO corrector
+        {
+            // Momentum predictor
+
+            fvVectorMatrix UEqn
+            (
+                fvm::ddt(U)
+              + fvm::div(phi, U)
+              + turbulence->divDevReff(U)
+            );
+
+            //UEqn.relax();
+
+            fvVectorMatrix UEqnp(UEqn == -fvc::grad(p));
+
+            lduVectorMatrix U3Eqnp(mesh);
+            U3Eqnp.diag() = UEqnp.diag();
+            U3Eqnp.upper() = UEqnp.upper();
+            U3Eqnp.lower() = UEqnp.lower();
+            U3Eqnp.source() = UEqnp.source();
+
+            UEqnp.addBoundaryDiag(U3Eqnp.diag(), 0);
+            UEqnp.addBoundarySource(U3Eqnp.source(), false);
+
+            U3Eqnp.interfaces() = U.boundaryField().interfaces();
+            U3Eqnp.interfacesUpper() = UEqnp.boundaryCoeffs().component(0);
+            U3Eqnp.interfacesLower() = UEqnp.internalCoeffs().component(0);
+
+            autoPtr<lduVectorMatrix::solver> U3EqnpSolver =
+            lduVectorMatrix::solver::New
+            (
+                U.name(),
+                U3Eqnp,
+                dictionary
+                (
+                    IStringStream
+                    (
+                        "{"
+                        "    /*solver          SmoothSolver;*/"
+                        "    smoother        GaussSeidel;"
+                        "    solver           PBiCG;"
+                        "    preconditioner   DILU;"
+                        "    tolerance        (1e-7 1e-7 1);"
+                        "    relTol           (0 0 0);"
+                        "}"
+                    )()
+                )
+            );
+
+            //for (int i=0; i<3; i++)
+            {
+                U3EqnpSolver->solve(U).print(Info);
+                U.correctBoundaryConditions();
+            }
+            //solve(UEqnp);
+
+            // --- PISO loop
+
+            for (int corr=0; corr<nCorr; corr++)
+            {
+                volScalarField rAU(1.0/UEqn.A());
+
+                volVectorField HbyA("HbyA", U);
+                HbyA = rAU*UEqn.H();
+                surfaceScalarField phiHbyA
+                (
+                    "phiHbyA",
+                    (fvc::interpolate(HbyA) & mesh.Sf())
+                  + fvc::ddtPhiCorr(rAU, U, phi)
+                );
+
+                adjustPhi(phiHbyA, U, p);
+
+                // Non-orthogonal pressure corrector loop
+                for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
+                {
+                    // Pressure corrector
+
+                    fvScalarMatrix pEqn
+                    (
+                        fvm::laplacian(rAU, p) == fvc::div(phiHbyA)
+                    );
+
+                    pEqn.setReference(pRefCell, pRefValue);
+
+                    if
+                    (
+                        corr == nCorr-1
+                     && nonOrth == nNonOrthCorr
+                    )
+                    {
+                        pEqn.solve(mesh.solver("pFinal"));
+                    }
+                    else
+                    {
+                        pEqn.solve();
+                    }
+
+                    if (nonOrth == nNonOrthCorr)
+                    {
+                        phi = phiHbyA - pEqn.flux();
+                    }
+                }
+
+                #include "continuityErrs.H"
+
+                U = HbyA - rAU*fvc::grad(p);
+                U.correctBoundaryConditions();
+            }
+        }
+
+        turbulence->correct();
+
+        runTime.write();
+
+        Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
+            << "  ClockTime = " << runTime.elapsedClockTime() << " s"
+            << nl << endl;
+    }
+
+    Info<< "End\n" << endl;
+
+    return 0;
+}
+
+
+// ************************************************************************* //
diff --git a/applications/test/PisoFoam/createFields.H b/applications/test/PisoFoam/createFields.H
new file mode 100644
index 0000000000..7cae304f6f
--- /dev/null
+++ b/applications/test/PisoFoam/createFields.H
@@ -0,0 +1,42 @@
+    Info<< "Reading field p\n" << endl;
+    volScalarField p
+    (
+        IOobject
+        (
+            "p",
+            runTime.timeName(),
+            mesh,
+            IOobject::MUST_READ,
+            IOobject::AUTO_WRITE
+        ),
+        mesh
+    );
+
+    Info<< "Reading field U\n" << endl;
+    volVectorField U
+    (
+        IOobject
+        (
+            "U",
+            runTime.timeName(),
+            mesh,
+            IOobject::MUST_READ,
+            IOobject::AUTO_WRITE
+        ),
+        mesh
+    );
+
+#   include "createPhi.H"
+
+
+    label pRefCell = 0;
+    scalar pRefValue = 0.0;
+    setRefCell(p, mesh.solutionDict().subDict("PISO"), pRefCell, pRefValue);
+
+
+    singlePhaseTransportModel laminarTransport(U, phi);
+
+    autoPtr<incompressible::turbulenceModel> turbulence
+    (
+        incompressible::turbulenceModel::New(U, phi, laminarTransport)
+    );

From 4ff7ac3efefc80eedc65c0562ef5c10c25141625 Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Thu, 26 Apr 2012 11:41:06 +0100
Subject: [PATCH 263/317] LduMatrix: Added support for both component-coupled
 and component-independent forms of PCG and PBiCG

---
 applications/test/PisoFoam/PisoFoam.C         |  2 +-
 .../fields/Fields/Field/FieldFunctions.C      |  4 ++--
 .../fields/Fields/Field/FieldFunctions.H      |  3 +--
 .../fields/Fields/scalarField/scalarField.C   | 18 ++++++++++++++
 .../fields/Fields/scalarField/scalarField.H   |  6 +++++
 .../PBiCGScalarAlpha.C => PBiCCCG/PBiCCCG.C}  | 13 +++++-----
 .../{PBiCG/TPBiCG.H => PBiCCCG/PBiCCCG.H}     | 24 +++++++++----------
 .../{PBiCG/TPBiCG.C => PBiCICG/PBiCICG.C}     |  6 ++---
 .../PBiCGScalarAlpha.H => PBiCICG/PBiCICG.H}  | 24 +++++++++----------
 .../Solvers/{PCG/TPCG.C => PCICG/PCICG.C}     |  6 ++---
 .../Solvers/{PCG/TPCG.H => PCICG/PCICG.H}     | 24 +++++++++----------
 .../matrices/LduMatrix/Solvers/lduSolvers.C   | 19 ++++++++-------
 12 files changed, 87 insertions(+), 62 deletions(-)
 rename src/OpenFOAM/matrices/LduMatrix/Solvers/{PBiCGScalarAlpha/PBiCGScalarAlpha.C => PBiCCCG/PBiCCCG.C} (95%)
 rename src/OpenFOAM/matrices/LduMatrix/Solvers/{PBiCG/TPBiCG.H => PBiCCCG/PBiCCCG.H} (90%)
 rename src/OpenFOAM/matrices/LduMatrix/Solvers/{PBiCG/TPBiCG.C => PBiCICG/PBiCICG.C} (97%)
 rename src/OpenFOAM/matrices/LduMatrix/Solvers/{PBiCGScalarAlpha/PBiCGScalarAlpha.H => PBiCICG/PBiCICG.H} (90%)
 rename src/OpenFOAM/matrices/LduMatrix/Solvers/{PCG/TPCG.C => PCICG/PCICG.C} (97%)
 rename src/OpenFOAM/matrices/LduMatrix/Solvers/{PCG/TPCG.H => PCICG/PCICG.H} (90%)

diff --git a/applications/test/PisoFoam/PisoFoam.C b/applications/test/PisoFoam/PisoFoam.C
index a6a4d6c5b7..a3ea54b568 100644
--- a/applications/test/PisoFoam/PisoFoam.C
+++ b/applications/test/PisoFoam/PisoFoam.C
@@ -102,7 +102,7 @@ int main(int argc, char *argv[])
                         "{"
                         "    /*solver          SmoothSolver;*/"
                         "    smoother        GaussSeidel;"
-                        "    solver           PBiCG;"
+                        "    solver           PBiCCCG;"
                         "    preconditioner   DILU;"
                         "    tolerance        (1e-7 1e-7 1);"
                         "    relTol           (0 0 0);"
diff --git a/src/OpenFOAM/fields/Fields/Field/FieldFunctions.C b/src/OpenFOAM/fields/Fields/Field/FieldFunctions.C
index 9397411ec4..c26227cd00 100644
--- a/src/OpenFOAM/fields/Fields/Field/FieldFunctions.C
+++ b/src/OpenFOAM/fields/Fields/Field/FieldFunctions.C
@@ -365,7 +365,7 @@ scalar sumProd(const UList<Type>& f1, const UList<Type>& f2)
     if (f1.size() && (f1.size() == f2.size()))
     {
         scalar SumProd = 0.0;
-        TFOR_ALL_S_OP_F_OP_F(scalar, SumProd, +=, Type, f1, *, Type, f2)
+        TFOR_ALL_S_OP_F_OP_F(scalar, SumProd, +=, Type, f1, &&, Type, f2)
         return SumProd;
     }
     else
@@ -498,7 +498,7 @@ template<class Type>
 scalar gSumProd(const UList<Type>& f1, const UList<Type>& f2)
 {
     scalar SumProd = sumProd(f1, f2);
-    reduce(SumProd, sumOp<Type>());
+    reduce(SumProd, sumOp<scalar>());
     return SumProd;
 }
 
diff --git a/src/OpenFOAM/fields/Fields/Field/FieldFunctions.H b/src/OpenFOAM/fields/Fields/Field/FieldFunctions.H
index e3fd66afaf..290fd07209 100644
--- a/src/OpenFOAM/fields/Fields/Field/FieldFunctions.H
+++ b/src/OpenFOAM/fields/Fields/Field/FieldFunctions.H
@@ -23,8 +23,6 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "scalarField.H"
-
 #define TEMPLATE template<class Type>
 #include "FieldFunctionsM.H"
 
@@ -332,5 +330,6 @@ PRODUCT_OPERATOR(scalarProduct, &&, dotdot)
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #include "undefFieldFunctionsM.H"
+#include "scalarField.H"
 
 // ************************************************************************* //
diff --git a/src/OpenFOAM/fields/Fields/scalarField/scalarField.C b/src/OpenFOAM/fields/Fields/scalarField/scalarField.C
index 9000bb533a..783eb15222 100644
--- a/src/OpenFOAM/fields/Fields/scalarField/scalarField.C
+++ b/src/OpenFOAM/fields/Fields/scalarField/scalarField.C
@@ -86,6 +86,24 @@ tmp<scalarField> stabilise(const tmp<scalarField>& tsf, const scalar s)
 }
 
 
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+template<>
+scalar sumProd(const UList<scalar>& f1, const UList<scalar>& f2)
+{
+    if (f1.size() && (f1.size() == f2.size()))
+    {
+        scalar SumProd = 0.0;
+        TFOR_ALL_S_OP_F_OP_F(scalar, SumProd, +=, scalar, f1, *, scalar, f2)
+        return SumProd;
+    }
+    else
+    {
+        return 0.0;
+    }
+}
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 BINARY_TYPE_OPERATOR(scalar, scalar, scalar, +, add)
diff --git a/src/OpenFOAM/fields/Fields/scalarField/scalarField.H b/src/OpenFOAM/fields/Fields/scalarField/scalarField.H
index 8d39528b9f..c18d1abfd1 100644
--- a/src/OpenFOAM/fields/Fields/scalarField/scalarField.H
+++ b/src/OpenFOAM/fields/Fields/scalarField/scalarField.H
@@ -72,6 +72,12 @@ tmp<scalarField> stabilise(const UList<scalar>&, const scalar s);
 tmp<scalarField> stabilise(const tmp<scalarField>&, const scalar s);
 
 
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+template<>
+scalar sumProd(const UList<scalar>& f1, const UList<scalar>& f2);
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 BINARY_TYPE_OPERATOR(scalar, scalar, scalar, +, add)
diff --git a/src/OpenFOAM/matrices/LduMatrix/Solvers/PBiCGScalarAlpha/PBiCGScalarAlpha.C b/src/OpenFOAM/matrices/LduMatrix/Solvers/PBiCCCG/PBiCCCG.C
similarity index 95%
rename from src/OpenFOAM/matrices/LduMatrix/Solvers/PBiCGScalarAlpha/PBiCGScalarAlpha.C
rename to src/OpenFOAM/matrices/LduMatrix/Solvers/PBiCCCG/PBiCCCG.C
index 955e6be440..45453ff1d0 100644
--- a/src/OpenFOAM/matrices/LduMatrix/Solvers/PBiCGScalarAlpha/PBiCGScalarAlpha.C
+++ b/src/OpenFOAM/matrices/LduMatrix/Solvers/PBiCCCG/PBiCCCG.C
@@ -23,12 +23,12 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "TPBiCG.H"
+#include "PBiCCCG.H"
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class Type, class DType, class LUType>
-Foam::TPBiCG<Type, DType, LUType>::TPBiCG
+Foam::PBiCCCG<Type, DType, LUType>::PBiCCCG
 (
     const word& fieldName,
     const LduMatrix<Type, DType, LUType>& matrix,
@@ -48,7 +48,7 @@ Foam::TPBiCG<Type, DType, LUType>::TPBiCG
 
 template<class Type, class DType, class LUType>
 typename Foam::LduMatrix<Type, DType, LUType>::solverPerformance
-Foam::TPBiCG<Type, DType, LUType>::solve
+Foam::PBiCCCG<Type, DType, LUType>::solve
 (
     Field<Type>& psi
 ) const
@@ -125,8 +125,7 @@ Foam::TPBiCG<Type, DType, LUType>::solve
             preconPtr->preconditionT(wT, rT);
 
             // --- Update search directions:
-            //wArT = gSumProd(wA, rT);
-            wArT = gSum(wA && rT);
+            wArT = gSumProd(wA, rT);
 
             if (solverPerf.nIterations() == 0)
             {
@@ -152,14 +151,14 @@ Foam::TPBiCG<Type, DType, LUType>::solve
             this->matrix_.Amul(wA, pA);
             this->matrix_.Tmul(wT, pT);
 
-            scalar wApT = gSum(wA && pT);
+            scalar wApT = gSumProd(wA, pT);
 
             // --- Test for singularity
             if
             (
                 solverPerf.checkSingularity
                 (
-                    cmptDivide(Type::one*mag(wApT), normFactor)
+                    cmptDivide(pTraits<Type>::one*mag(wApT), normFactor)
                 )
             )
             {
diff --git a/src/OpenFOAM/matrices/LduMatrix/Solvers/PBiCG/TPBiCG.H b/src/OpenFOAM/matrices/LduMatrix/Solvers/PBiCCCG/PBiCCCG.H
similarity index 90%
rename from src/OpenFOAM/matrices/LduMatrix/Solvers/PBiCG/TPBiCG.H
rename to src/OpenFOAM/matrices/LduMatrix/Solvers/PBiCCCG/PBiCCCG.H
index 736654cbeb..e5363dc651 100644
--- a/src/OpenFOAM/matrices/LduMatrix/Solvers/PBiCG/TPBiCG.H
+++ b/src/OpenFOAM/matrices/LduMatrix/Solvers/PBiCCCG/PBiCCCG.H
@@ -22,19 +22,19 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::TPBiCG
+    Foam::PBiCCCG
 
 Description
     Preconditioned bi-conjugate gradient solver for asymmetric lduMatrices
     using a run-time selectable preconditiioner.
 
 SourceFiles
-    TPBiCG.C
+    PBiCCCG.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef TPBiCG_H
-#define TPBiCG_H
+#ifndef PBiCCCG_H
+#define PBiCCCG_H
 
 #include "LduMatrix.H"
 
@@ -44,33 +44,33 @@ namespace Foam
 {
 
 /*---------------------------------------------------------------------------*\
-                           Class TPBiCG Declaration
+                           Class PBiCCCG Declaration
 \*---------------------------------------------------------------------------*/
 
 template<class Type, class DType, class LUType>
-class TPBiCG
+class PBiCCCG
 :
     public LduMatrix<Type, DType, LUType>::solver
 {
     // Private Member Functions
 
         //- Disallow default bitwise copy construct
-        TPBiCG(const TPBiCG&);
+        PBiCCCG(const PBiCCCG&);
 
         //- Disallow default bitwise assignment
-        void operator=(const TPBiCG&);
+        void operator=(const PBiCCCG&);
 
 
 public:
 
     //- Runtime type information
-    TypeName("PBiCG");
+    TypeName("PBiCCCG");
 
 
     // Constructors
 
         //- Construct from matrix components and solver data dictionary
-        TPBiCG
+        PBiCCCG
         (
             const word& fieldName,
             const LduMatrix<Type, DType, LUType>& matrix,
@@ -80,7 +80,7 @@ public:
 
     // Destructor
 
-        virtual ~TPBiCG()
+        virtual ~PBiCCCG()
         {}
 
 
@@ -101,7 +101,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "TPBiCG.C"
+#   include "PBiCCCG.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/matrices/LduMatrix/Solvers/PBiCG/TPBiCG.C b/src/OpenFOAM/matrices/LduMatrix/Solvers/PBiCICG/PBiCICG.C
similarity index 97%
rename from src/OpenFOAM/matrices/LduMatrix/Solvers/PBiCG/TPBiCG.C
rename to src/OpenFOAM/matrices/LduMatrix/Solvers/PBiCICG/PBiCICG.C
index e36d1d6a37..b3665f0617 100644
--- a/src/OpenFOAM/matrices/LduMatrix/Solvers/PBiCG/TPBiCG.C
+++ b/src/OpenFOAM/matrices/LduMatrix/Solvers/PBiCICG/PBiCICG.C
@@ -23,12 +23,12 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "TPBiCG.H"
+#include "PBiCICG.H"
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class Type, class DType, class LUType>
-Foam::TPBiCG<Type, DType, LUType>::TPBiCG
+Foam::PBiCICG<Type, DType, LUType>::PBiCICG
 (
     const word& fieldName,
     const LduMatrix<Type, DType, LUType>& matrix,
@@ -48,7 +48,7 @@ Foam::TPBiCG<Type, DType, LUType>::TPBiCG
 
 template<class Type, class DType, class LUType>
 typename Foam::LduMatrix<Type, DType, LUType>::solverPerformance
-Foam::TPBiCG<Type, DType, LUType>::solve(Field<Type>& psi) const
+Foam::PBiCICG<Type, DType, LUType>::solve(Field<Type>& psi) const
 {
     word preconditionerName(this->controlDict_.lookup("preconditioner"));
 
diff --git a/src/OpenFOAM/matrices/LduMatrix/Solvers/PBiCGScalarAlpha/PBiCGScalarAlpha.H b/src/OpenFOAM/matrices/LduMatrix/Solvers/PBiCICG/PBiCICG.H
similarity index 90%
rename from src/OpenFOAM/matrices/LduMatrix/Solvers/PBiCGScalarAlpha/PBiCGScalarAlpha.H
rename to src/OpenFOAM/matrices/LduMatrix/Solvers/PBiCICG/PBiCICG.H
index dee183e10b..340ae48667 100644
--- a/src/OpenFOAM/matrices/LduMatrix/Solvers/PBiCGScalarAlpha/PBiCGScalarAlpha.H
+++ b/src/OpenFOAM/matrices/LduMatrix/Solvers/PBiCICG/PBiCICG.H
@@ -22,19 +22,19 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::TPBiCG
+    Foam::PBiCICG
 
 Description
     Preconditioned bi-conjugate gradient solver for asymmetric lduMatrices
     using a run-time selectable preconditiioner.
 
 SourceFiles
-    TPBiCG.C
+    PBiCICG.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef TPBiCG_H
-#define TPBiCG_H
+#ifndef PBiCICG_H
+#define PBiCICG_H
 
 #include "LduMatrix.H"
 
@@ -44,33 +44,33 @@ namespace Foam
 {
 
 /*---------------------------------------------------------------------------*\
-                           Class TPBiCG Declaration
+                           Class PBiCICG Declaration
 \*---------------------------------------------------------------------------*/
 
 template<class Type, class DType, class LUType>
-class TPBiCG
+class PBiCICG
 :
     public LduMatrix<Type, DType, LUType>::solver
 {
     // Private Member Functions
 
         //- Disallow default bitwise copy construct
-        TPBiCG(const TPBiCG&);
+        PBiCICG(const PBiCICG&);
 
         //- Disallow default bitwise assignment
-        void operator=(const TPBiCG&);
+        void operator=(const PBiCICG&);
 
 
 public:
 
     //- Runtime type information
-    TypeName("PBiCG");
+    TypeName("PBiCICG");
 
 
     // Constructors
 
         //- Construct from matrix components and solver data dictionary
-        TPBiCG
+        PBiCICG
         (
             const word& fieldName,
             const LduMatrix<Type, DType, LUType>& matrix,
@@ -80,7 +80,7 @@ public:
 
     // Destructor
 
-        virtual ~TPBiCG()
+        virtual ~PBiCICG()
         {}
 
 
@@ -101,7 +101,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "PBiCGScalarAlpha.C"
+#   include "PBiCICG.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/matrices/LduMatrix/Solvers/PCG/TPCG.C b/src/OpenFOAM/matrices/LduMatrix/Solvers/PCICG/PCICG.C
similarity index 97%
rename from src/OpenFOAM/matrices/LduMatrix/Solvers/PCG/TPCG.C
rename to src/OpenFOAM/matrices/LduMatrix/Solvers/PCICG/PCICG.C
index 1226e65137..e6206e6116 100644
--- a/src/OpenFOAM/matrices/LduMatrix/Solvers/PCG/TPCG.C
+++ b/src/OpenFOAM/matrices/LduMatrix/Solvers/PCICG/PCICG.C
@@ -23,12 +23,12 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "TPCG.H"
+#include "PCICG.H"
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class Type, class DType, class LUType>
-Foam::TPCG<Type, DType, LUType>::TPCG
+Foam::PCICG<Type, DType, LUType>::PCICG
 (
     const word& fieldName,
     const LduMatrix<Type, DType, LUType>& matrix,
@@ -48,7 +48,7 @@ Foam::TPCG<Type, DType, LUType>::TPCG
 
 template<class Type, class DType, class LUType>
 typename Foam::LduMatrix<Type, DType, LUType>::solverPerformance
-Foam::TPCG<Type, DType, LUType>::solve(Field<Type>& psi) const
+Foam::PCICG<Type, DType, LUType>::solve(Field<Type>& psi) const
 {
     word preconditionerName(this->controlDict_.lookup("preconditioner"));
 
diff --git a/src/OpenFOAM/matrices/LduMatrix/Solvers/PCG/TPCG.H b/src/OpenFOAM/matrices/LduMatrix/Solvers/PCICG/PCICG.H
similarity index 90%
rename from src/OpenFOAM/matrices/LduMatrix/Solvers/PCG/TPCG.H
rename to src/OpenFOAM/matrices/LduMatrix/Solvers/PCICG/PCICG.H
index 779de7ec5e..250cc41b9a 100644
--- a/src/OpenFOAM/matrices/LduMatrix/Solvers/PCG/TPCG.H
+++ b/src/OpenFOAM/matrices/LduMatrix/Solvers/PCICG/PCICG.H
@@ -22,19 +22,19 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::TPCG
+    Foam::PCICG
 
 Description
     Preconditioned conjugate gradient solver for symmetric lduMatrices
     using a run-time selectable preconditiioner.
 
 SourceFiles
-    TPCG.C
+    PCICG.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef TPCG_H
-#define TPCG_H
+#ifndef PCICG_H
+#define PCICG_H
 
 #include "LduMatrix.H"
 
@@ -44,33 +44,33 @@ namespace Foam
 {
 
 /*---------------------------------------------------------------------------*\
-                           Class TPCG Declaration
+                           Class PCICG Declaration
 \*---------------------------------------------------------------------------*/
 
 template<class Type, class DType, class LUType>
-class TPCG
+class PCICG
 :
     public LduMatrix<Type, DType, LUType>::solver
 {
     // Private Member Functions
 
         //- Disallow default bitwise copy construct
-        TPCG(const TPCG&);
+        PCICG(const PCICG&);
 
         //- Disallow default bitwise assignment
-        void operator=(const TPCG&);
+        void operator=(const PCICG&);
 
 
 public:
 
     //- Runtime type information
-    TypeName("PCG");
+    TypeName("PCICG");
 
 
     // Constructors
 
         //- Construct from matrix components and solver data dictionary
-        TPCG
+        PCICG
         (
             const word& fieldName,
             const LduMatrix<Type, DType, LUType>& matrix,
@@ -80,7 +80,7 @@ public:
 
     // Destructor
 
-        virtual ~TPCG()
+        virtual ~PCICG()
         {}
 
 
@@ -101,7 +101,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "TPCG.C"
+#   include "PCICG.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/matrices/LduMatrix/Solvers/lduSolvers.C b/src/OpenFOAM/matrices/LduMatrix/Solvers/lduSolvers.C
index 30159b4a48..6e36e525b8 100644
--- a/src/OpenFOAM/matrices/LduMatrix/Solvers/lduSolvers.C
+++ b/src/OpenFOAM/matrices/LduMatrix/Solvers/lduSolvers.C
@@ -23,9 +23,9 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "TPCG.H"
-//#include "TPBiCG.H"
-#include "PBiCGScalarAlpha.H"
+#include "PCICG.H"
+#include "PBiCCCG.H"
+#include "PBiCICG.H"
 #include "SmoothSolver.H"
 #include "fieldTypes.H"
 
@@ -35,11 +35,14 @@ License
     makeLduSymSolver(DiagonalSolver, Type, DType, LUType);                    \
     makeLduAsymSolver(DiagonalSolver, Type, DType, LUType);                   \
                                                                               \
-    makeLduSolver(TPCG, Type, DType, LUType);                                 \
-    makeLduSymSolver(TPCG, Type, DType, LUType);                              \
+    makeLduSolver(PCICG, Type, DType, LUType);                                \
+    makeLduSymSolver(PCICG, Type, DType, LUType);                             \
                                                                               \
-    makeLduSolver(TPBiCG, Type, DType, LUType);                               \
-    makeLduAsymSolver(TPBiCG, Type, DType, LUType);                           \
+    makeLduSolver(PBiCCCG, Type, DType, LUType);                              \
+    makeLduAsymSolver(PBiCCCG, Type, DType, LUType);                          \
+                                                                              \
+    makeLduSolver(PBiCICG, Type, DType, LUType);                              \
+    makeLduAsymSolver(PBiCICG, Type, DType, LUType);                          \
                                                                               \
     makeLduSolver(SmoothSolver, Type, DType, LUType);                         \
     makeLduSymSolver(SmoothSolver, Type, DType, LUType);                      \
@@ -47,7 +50,7 @@ License
 
 namespace Foam
 {
-    //makeLduSolvers(scalar, scalar, scalar);
+    makeLduSolvers(scalar, scalar, scalar);
     makeLduSolvers(vector, scalar, scalar);
     makeLduSolvers(sphericalTensor, scalar, scalar);
     makeLduSolvers(symmTensor, scalar, scalar);

From fbe9105dabdfa89489ac76716e2127b44c6b515e Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Thu, 26 Apr 2012 11:41:23 +0100
Subject: [PATCH 264/317] Updated headers

---
 src/OpenFOAM/fields/Fields/Field/FieldFunctions.H    | 2 +-
 src/OpenFOAM/fields/Fields/scalarField/scalarField.C | 2 +-
 src/OpenFOAM/fields/Fields/scalarField/scalarField.H | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/OpenFOAM/fields/Fields/Field/FieldFunctions.H b/src/OpenFOAM/fields/Fields/Field/FieldFunctions.H
index 290fd07209..869346e29a 100644
--- a/src/OpenFOAM/fields/Fields/Field/FieldFunctions.H
+++ b/src/OpenFOAM/fields/Fields/Field/FieldFunctions.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/OpenFOAM/fields/Fields/scalarField/scalarField.C b/src/OpenFOAM/fields/Fields/scalarField/scalarField.C
index 783eb15222..cd18592265 100644
--- a/src/OpenFOAM/fields/Fields/scalarField/scalarField.C
+++ b/src/OpenFOAM/fields/Fields/scalarField/scalarField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/OpenFOAM/fields/Fields/scalarField/scalarField.H b/src/OpenFOAM/fields/Fields/scalarField/scalarField.H
index c18d1abfd1..d5a3b7659b 100644
--- a/src/OpenFOAM/fields/Fields/scalarField/scalarField.H
+++ b/src/OpenFOAM/fields/Fields/scalarField/scalarField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

From 6a3571b3e90eb33fb8160f1941d7fcf9ad6cd7a6 Mon Sep 17 00:00:00 2001
From: laurence <laurence>
Date: Thu, 26 Apr 2012 15:10:24 +0100
Subject: [PATCH 265/317] COMP: Move boost and mpfr library includes from
 wmake/rules/general/CGAL

This is so that surfaceFeatureExtract will compile without boost/mpfr
---
 applications/utilities/mesh/generation/cvMesh/Make/options    | 2 ++
 .../mesh/generation/cvMesh/cvMeshBackgroundMesh/Make/options  | 2 ++
 .../mesh/generation/cvMesh/cvMeshSurfaceSimplify/Make/options | 2 ++
 applications/utilities/surface/surfaceFeatureExtract/Allwmake | 4 +++-
 .../utilities/surface/surfaceFeatureExtract/Make/options      | 2 ++
 wmake/rules/General/CGAL                                      | 4 +---
 6 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/applications/utilities/mesh/generation/cvMesh/Make/options b/applications/utilities/mesh/generation/cvMesh/Make/options
index e7a3c9e0e3..2255a9a271 100644
--- a/applications/utilities/mesh/generation/cvMesh/Make/options
+++ b/applications/utilities/mesh/generation/cvMesh/Make/options
@@ -22,6 +22,8 @@ EXE_INC = \
 
 EXE_LIBS = \
     $(CGAL_LIBS) \
+    -lboost_thread \
+    -lmpfr \
     -lconformalVoronoiMesh \
     -lmeshTools \
     -ldecompositionMethods \
diff --git a/applications/utilities/mesh/generation/cvMesh/cvMeshBackgroundMesh/Make/options b/applications/utilities/mesh/generation/cvMesh/cvMeshBackgroundMesh/Make/options
index 3c9ef8cd4b..2d1ad7bfda 100644
--- a/applications/utilities/mesh/generation/cvMesh/cvMeshBackgroundMesh/Make/options
+++ b/applications/utilities/mesh/generation/cvMesh/cvMeshBackgroundMesh/Make/options
@@ -19,6 +19,8 @@ EXE_INC = \
 
 EXE_LIBS = \
     $(CGAL_LIBS) \
+    -lboost_thread \
+    -lmpfr \
     -lconformalVoronoiMesh \
     -ldecompositionMethods /* -L$(FOAM_LIBBIN)/dummy -lscotchDecomp */ \
     -ledgeMesh \
diff --git a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/Make/options b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/Make/options
index 3b9b222ba8..c7c073ab17 100644
--- a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/Make/options
+++ b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/Make/options
@@ -14,6 +14,8 @@ EXE_INC = \
 
 EXE_LIBS = \
     $(CGAL_LIBS) \
+    -lboost_thread \
+    -lmpfr \
     -L$(FASTDUALOCTREE_SRC_PATH) -lperf_main \
     -lGL \
     -lconformalVoronoiMesh \
diff --git a/applications/utilities/surface/surfaceFeatureExtract/Allwmake b/applications/utilities/surface/surfaceFeatureExtract/Allwmake
index 369428e171..2b9a927dc3 100755
--- a/applications/utilities/surface/surfaceFeatureExtract/Allwmake
+++ b/applications/utilities/surface/surfaceFeatureExtract/Allwmake
@@ -15,7 +15,9 @@ then
            CGAL_LIBDIR=-L$CGAL_ARCH_PATH/lib \
            LAPACK_LIB=-llapack \
            BLAS_LIB=-lblas \
-           CGAL_LIB=-lCGAL"
+           CGAL_LIB=-lCGAL \
+           CGAL_BOOST_LIB=-lboost_thread \
+           CGAL_MPFR_LIB=-lmpfr"
 else
     echo
     echo "Compiling surfaceFeatureExtract without CGAL curvature support"
diff --git a/applications/utilities/surface/surfaceFeatureExtract/Make/options b/applications/utilities/surface/surfaceFeatureExtract/Make/options
index b2e5dcf5f7..461cec9f81 100644
--- a/applications/utilities/surface/surfaceFeatureExtract/Make/options
+++ b/applications/utilities/surface/surfaceFeatureExtract/Make/options
@@ -15,6 +15,8 @@ EXE_INC = \
 
 EXE_LIBS = \
     $(CGAL_LIBS) \
+    ${CGAL_BOOST_LIB} \
+    ${CGAL_MPFR_LIB} \
     ${CGAL_LIBDIR} \
     ${LAPACK_LIB} \
     ${BLAS_LIB} \
diff --git a/wmake/rules/General/CGAL b/wmake/rules/General/CGAL
index 126640dc0c..cfb02d716a 100644
--- a/wmake/rules/General/CGAL
+++ b/wmake/rules/General/CGAL
@@ -7,6 +7,4 @@ CGAL_INC = \
 
 CGAL_LIBS = \
     -L$(MPFR_ARCH_PATH)/lib \
-    -L$(BOOST_ARCH_PATH)/lib \
-    -lmpfr \
-    -lboost_thread
+    -L$(BOOST_ARCH_PATH)/lib

From 87dc042618253e981c45df52e740acd12221a369 Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Thu, 26 Apr 2012 15:17:35 +0100
Subject: [PATCH 266/317] LduMatrix: Added support for AMI and jump conditions

---
 applications/test/PisoFoam/PisoFoam.C         |  4 +-
 .../LduInterfaceField/LduInterfaceField.H     | 43 ++++------
 .../cyclicGAMGInterfaceField.H                | 26 +++---
 .../processorCyclicGAMGInterfaceField.C       | 43 ----------
 .../processorCyclicGAMGInterfaceField.H       | 79 ------------------
 src/finiteVolume/Make/files                   |  1 -
 .../basic/coupled/coupledFvPatchField.H       | 10 +++
 .../constraint/cyclic/cyclicFvPatchField.C    | 14 +---
 .../cyclicAMI/cyclicAMIFvPatchField.C         | 29 +++++++
 .../cyclicAMI/cyclicAMIFvPatchField.H         |  9 ++
 .../jumpCyclic/jumpCyclicFvPatchField.C       | 50 ++++++++++-
 .../jumpCyclic/jumpCyclicFvPatchField.H       | 11 ++-
 .../processorCyclicFvPatchField.H             |  2 -
 .../processorCyclicFvPatchFields.H            |  2 +-
 .../processorCyclicFvPatchScalarField.C       | 83 -------------------
 .../processorCyclicFvPatchScalarField.H       | 69 ---------------
 .../cyclicAMILduInterfaceField.H              | 28 +++++++
 17 files changed, 171 insertions(+), 332 deletions(-)
 delete mode 100644 src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchScalarField.C
 delete mode 100644 src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchScalarField.H

diff --git a/applications/test/PisoFoam/PisoFoam.C b/applications/test/PisoFoam/PisoFoam.C
index a3ea54b568..67f0084e71 100644
--- a/applications/test/PisoFoam/PisoFoam.C
+++ b/applications/test/PisoFoam/PisoFoam.C
@@ -102,8 +102,8 @@ int main(int argc, char *argv[])
                         "{"
                         "    /*solver          SmoothSolver;*/"
                         "    smoother        GaussSeidel;"
-                        "    solver           PBiCCCG;"
-                        "    preconditioner   DILU;"
+                        "    solver           PBiCICG;"
+                        "    preconditioner   none;"
                         "    tolerance        (1e-7 1e-7 1);"
                         "    relTol           (0 0 0);"
                         "}"
diff --git a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduInterfaceField/LduInterfaceField.H b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduInterfaceField/LduInterfaceField.H
index adacc45ed2..06718d1c78 100644
--- a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduInterfaceField/LduInterfaceField.H
+++ b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduInterfaceField/LduInterfaceField.H
@@ -88,33 +88,26 @@ public:
 
     // Member Functions
 
-        //- Initialise neighbour matrix update
-        virtual void initInterfaceMatrixUpdate
-        (
-            Field<Type>&,
-            const Field<Type>&,
-            const scalarField&,
-            const Pstream::commsTypes commsType
-        ) const
-        {}
+        // Coupled interface functionality
 
-        //- Update result field based on interface functionality
-        virtual void updateInterfaceMatrix
-        (
-            Field<Type>&,
-            const Field<Type>&,
-            const scalarField&,
-            const Pstream::commsTypes commsType
-        ) const // = 0;
-        {
-            notImplemented
+            //- Initialise neighbour matrix update
+            virtual void initInterfaceMatrixUpdate
             (
-                "updateInterfaceMatrix"
-                "(Field<Type>&, const Field<Type>&,"
-                "const scalarField&,"
-                "const Pstream::commsTypes commsType) const"
-            );
-        }
+                Field<Type>&,
+                const Field<Type>&,
+                const scalarField&,
+                const Pstream::commsTypes commsType
+            ) const
+            {}
+
+            //- Update result field based on interface functionality
+            virtual void updateInterfaceMatrix
+            (
+                Field<Type>&,
+                const Field<Type>&,
+                const scalarField&,
+                const Pstream::commsTypes commsType
+            ) const = 0;
 };
 
 
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/cyclicGAMGInterfaceField/cyclicGAMGInterfaceField.H b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/cyclicGAMGInterfaceField/cyclicGAMGInterfaceField.H
index 6224dc0ac6..29677f0c50 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/cyclicGAMGInterfaceField/cyclicGAMGInterfaceField.H
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/cyclicGAMGInterfaceField/cyclicGAMGInterfaceField.H
@@ -105,19 +105,6 @@ public:
             }
 
 
-        // Interface matrix update
-
-            //- Update result field based on interface functionality
-            virtual void updateInterfaceMatrix
-            (
-                scalarField& result,
-                const scalarField& psiInternal,
-                const scalarField& coeffs,
-                const direction cmpt,
-                const Pstream::commsTypes commsType
-            ) const;
-
-
         //- Cyclic interface functions
 
             //- Does the interface field perform the transfromation
@@ -143,6 +130,19 @@ public:
             {
                 return rank_;
             }
+
+
+        // Interface matrix update
+
+            //- Update result field based on interface functionality
+            virtual void updateInterfaceMatrix
+            (
+                scalarField& result,
+                const scalarField& psiInternal,
+                const scalarField& coeffs,
+                const direction cmpt,
+                const Pstream::commsTypes commsType
+            ) const;
 };
 
 
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/processorCyclicGAMGInterfaceField/processorCyclicGAMGInterfaceField.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/processorCyclicGAMGInterfaceField/processorCyclicGAMGInterfaceField.C
index df3ae4b408..c0b1d8927d 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/processorCyclicGAMGInterfaceField/processorCyclicGAMGInterfaceField.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/processorCyclicGAMGInterfaceField/processorCyclicGAMGInterfaceField.C
@@ -59,47 +59,4 @@ Foam::processorCyclicGAMGInterfaceField::~processorCyclicGAMGInterfaceField()
 {}
 
 
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-//void Foam::processorCyclicGAMGInterfaceField::initInterfaceMatrixUpdate
-//(
-//    scalarField&,
-//    const scalarField&,
-//    const scalarField&,
-//    const direction,
-//    const Pstream::commsTypes commsType
-//) const
-//{
-//    procInterface_.compressedSend
-//    (
-//        commsType,
-//        procInterface_.interfaceInternalField(psiInternal)()
-//    );
-//}
-//
-//
-//void Foam::processorCyclicGAMGInterfaceField::updateInterfaceMatrix
-//(
-//    scalarField& result,
-//    const scalarField&,
-//    const scalarField& coeffs,
-//    const direction cmpt,
-//    const Pstream::commsTypes commsType
-//) const
-//{
-//    scalarField pnf
-//    (
-//        procInterface_.compressedReceive<scalar>(commsType, coeffs.size())
-//    );
-//    transformCoupleField(pnf, cmpt);
-//
-//    const labelUList& faceCells = procInterface_.faceCells();
-//
-//    forAll(faceCells, elemI)
-//    {
-//        result[faceCells[elemI]] -= coeffs[elemI]*pnf[elemI];
-//    }
-//}
-
-
 // ************************************************************************* //
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/processorCyclicGAMGInterfaceField/processorCyclicGAMGInterfaceField.H b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/processorCyclicGAMGInterfaceField/processorCyclicGAMGInterfaceField.H
index 3c842dac9c..55e6471b46 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/processorCyclicGAMGInterfaceField/processorCyclicGAMGInterfaceField.H
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/processorCyclicGAMGInterfaceField/processorCyclicGAMGInterfaceField.H
@@ -50,18 +50,6 @@ class processorCyclicGAMGInterfaceField
 :
     public processorGAMGInterfaceField
 {
-    // Private data
-
-//        //- Local reference cast into the processor interface
-//        const processorCyclicGAMGInterface& procInterface_;
-//
-//        //- Is the transform required
-//        bool doTransform_;
-//
-//        //- Rank of component for transformation
-//        int rank_;
-//
-
     // Private Member Functions
 
         //- Disallow default bitwise copy construct
@@ -93,73 +81,6 @@ public:
     // Destructor
 
         virtual ~processorCyclicGAMGInterfaceField();
-
-
-    // Member Functions
-
-//        // Access
-//
-//            //- Return size
-//            label size() const
-//            {
-//                return procInterface_.size();
-//            }
-//
-//
-//        // Interface matrix update
-//
-//            //- Initialise neighbour matrix update
-//            virtual void initInterfaceMatrixUpdate
-//            (
-//                scalarField& result,
-//                const scalarField& psiInternal,
-//                const scalarField& coeffs,
-//                const direction cmpt,
-//                const Pstream::commsTypes commsType
-//            ) const;
-//
-//            //- Update result field based on interface functionality
-//            virtual void updateInterfaceMatrix
-//            (
-//                scalarField& result,
-//                const scalarField& psiInternal,
-//                const scalarField& coeffs,
-//                const direction cmpt,
-//                const Pstream::commsTypes commsType
-//            ) const;
-//
-//
-//        //- Processor interface functions
-//
-//            //- Return processor number
-//            virtual int myProcNo() const
-//            {
-//                return procInterface_.myProcNo();
-//            }
-//
-//            //- Return neigbour processor number
-//            virtual int neighbProcNo() const
-//            {
-//                return procInterface_.neighbProcNo();
-//            }
-//
-//            //- Does the interface field perform the transfromation
-//            virtual bool doTransform() const
-//            {
-//                return doTransform_;
-//            }
-//
-//            //- Return face transformation tensor
-//            virtual const tensorField& forwardT() const
-//            {
-//                return procInterface_.forwardT();
-//            }
-//
-//            //- Return rank of component for transform
-//            virtual int rank() const
-//            {
-//                return rank_;
-//            }
 };
 
 
diff --git a/src/finiteVolume/Make/files b/src/finiteVolume/Make/files
index c7e7453b1f..3691354d0b 100644
--- a/src/finiteVolume/Make/files
+++ b/src/finiteVolume/Make/files
@@ -107,7 +107,6 @@ $(constraintFvPatchFields)/nonuniformTransformCyclic/nonuniformTransformCyclicFv
 $(constraintFvPatchFields)/processor/processorFvPatchFields.C
 $(constraintFvPatchFields)/processor/processorFvPatchScalarField.C
 $(constraintFvPatchFields)/processorCyclic/processorCyclicFvPatchFields.C
-$(constraintFvPatchFields)/processorCyclic/processorCyclicFvPatchScalarField.C
 $(constraintFvPatchFields)/symmetry/symmetryFvPatchFields.C
 $(constraintFvPatchFields)/wedge/wedgeFvPatchFields.C
 $(constraintFvPatchFields)/wedge/wedgeFvPatchScalarField.C
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/coupled/coupledFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/basic/coupled/coupledFvPatchField.H
index 88f473829f..8677c34ed3 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/coupled/coupledFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/basic/coupled/coupledFvPatchField.H
@@ -185,6 +185,16 @@ public:
                 const Pstream::commsTypes commsType
             ) const = 0;
 
+            //- Update result field based on interface functionality
+            virtual void updateInterfaceMatrix
+            (
+                Field<Type>&,
+                const Field<Type>&,
+                const scalarField&,
+                const Pstream::commsTypes commsType
+            ) const = 0;
+
+
         //- Write
         virtual void write(Ostream&) const;
 };
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchField.C
index 90638bf40c..0e23db6c3c 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchField.C
@@ -198,15 +198,10 @@ void cyclicFvPatchField<Type>::updateInterfaceMatrix
     const Pstream::commsTypes
 ) const
 {
-    scalarField pnf(this->size());
-
     const labelUList& nbrFaceCells =
         cyclicPatch().cyclicPatch().neighbPatch().faceCells();
 
-    forAll(pnf, facei)
-    {
-        pnf[facei] = psiInternal[nbrFaceCells[facei]];
-    }
+    scalarField pnf(psiInternal, nbrFaceCells);
 
     // Transform according to the transformation tensors
     transformCoupleField(pnf, cmpt);
@@ -230,15 +225,10 @@ void cyclicFvPatchField<Type>::updateInterfaceMatrix
     const Pstream::commsTypes
 ) const
 {
-    Field<Type> pnf(this->size());
-
     const labelUList& nbrFaceCells =
         cyclicPatch().cyclicPatch().neighbPatch().faceCells();
 
-    forAll(pnf, facei)
-    {
-        pnf[facei] = psiInternal[nbrFaceCells[facei]];
-    }
+    Field<Type> pnf(psiInternal, nbrFaceCells);
 
     // Transform according to the transformation tensors
     transformCoupleField(pnf);
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/cyclicAMI/cyclicAMIFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/cyclicAMI/cyclicAMIFvPatchField.C
index 287d036f5e..fc48848757 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/cyclicAMI/cyclicAMIFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/cyclicAMI/cyclicAMIFvPatchField.C
@@ -229,6 +229,35 @@ void Foam::cyclicAMIFvPatchField<Type>::updateInterfaceMatrix
 }
 
 
+template<class Type>
+void Foam::cyclicAMIFvPatchField<Type>::updateInterfaceMatrix
+(
+    Field<Type>& result,
+    const Field<Type>& psiInternal,
+    const scalarField& coeffs,
+    const Pstream::commsTypes
+) const
+{
+    const labelUList& nbrFaceCells =
+        cyclicAMIPatch_.cyclicAMIPatch().neighbPatch().faceCells();
+
+    Field<Type> pnf(psiInternal, nbrFaceCells);
+
+    // Transform according to the transformation tensors
+    transformCoupleField(pnf);
+
+    pnf = cyclicAMIPatch_.interpolate(pnf);
+
+    // Multiply the field by coefficients and add into the result
+    const labelUList& faceCells = cyclicAMIPatch_.faceCells();
+
+    forAll(faceCells, elemI)
+    {
+        result[faceCells[elemI]] -= coeffs[elemI]*pnf[elemI];
+    }
+}
+
+
 template<class Type>
 void Foam::cyclicAMIFvPatchField<Type>::write(Ostream& os) const
 {
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/cyclicAMI/cyclicAMIFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/constraint/cyclicAMI/cyclicAMIFvPatchField.H
index 8814a7584a..933a865f30 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/cyclicAMI/cyclicAMIFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/cyclicAMI/cyclicAMIFvPatchField.H
@@ -167,6 +167,15 @@ public:
                 const Pstream::commsTypes commsType
             ) const;
 
+            //- Update result field based on interface functionality
+            virtual void updateInterfaceMatrix
+            (
+                Field<Type>&,
+                const Field<Type>&,
+                const scalarField&,
+                const Pstream::commsTypes commsType
+            ) const;
+
 
         // Cyclic AMI coupled interface functions
 
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/jumpCyclic/jumpCyclicFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/jumpCyclic/jumpCyclicFvPatchField.C
index 669ea108b4..193008daff 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/jumpCyclic/jumpCyclicFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/jumpCyclic/jumpCyclicFvPatchField.C
@@ -151,7 +151,7 @@ void jumpCyclicFvPatchField<Type>::updateInterfaceMatrix
 
     if (&psiInternal == &this->internalField())
     {
-        tmp<Field<scalar> > tjf = jump();
+        tmp<Field<scalar> > tjf = jump()().component(cmpt);
         if (!this->cyclicPatch().owner())
         {
             tjf = -tjf;
@@ -183,6 +183,54 @@ void jumpCyclicFvPatchField<Type>::updateInterfaceMatrix
 }
 
 
+template<class Type>
+void jumpCyclicFvPatchField<Type>::updateInterfaceMatrix
+(
+    Field<Type>& result,
+    const Field<Type>& psiInternal,
+    const scalarField& coeffs,
+    const Pstream::commsTypes
+) const
+{
+    Field<Type> pnf(this->size());
+
+    const labelUList& nbrFaceCells =
+        this->cyclicPatch().neighbFvPatch().faceCells();
+
+    if (&psiInternal == &this->internalField())
+    {
+        tmp<Field<Type> > tjf = jump();
+        if (!this->cyclicPatch().owner())
+        {
+            tjf = -tjf;
+        }
+        const Field<Type>& jf = tjf();
+
+        forAll(*this, facei)
+        {
+            pnf[facei] = psiInternal[nbrFaceCells[facei]] - jf[facei];
+        }
+    }
+    else
+    {
+        forAll(*this, facei)
+        {
+            pnf[facei] = psiInternal[nbrFaceCells[facei]];
+        }
+    }
+
+    // Transform according to the transformation tensors
+    this->transformCoupleField(pnf);
+
+    // Multiply the field by coefficients and add into the result
+    const labelUList& faceCells = this->cyclicPatch().faceCells();
+    forAll(faceCells, elemI)
+    {
+        result[faceCells[elemI]] -= coeffs[elemI]*pnf[elemI];
+    }
+}
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/jumpCyclic/jumpCyclicFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/constraint/jumpCyclic/jumpCyclicFvPatchField.H
index 72113a5626..4c4f94bce6 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/jumpCyclic/jumpCyclicFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/jumpCyclic/jumpCyclicFvPatchField.H
@@ -109,7 +109,7 @@ public:
             }
 
             //- Return the "jump" across the patch as a "half" field
-            virtual tmp<Field<scalar> > jump() const = 0;
+            virtual tmp<Field<Type> > jump() const = 0;
 
 
         // Evaluation functions
@@ -126,6 +126,15 @@ public:
                 const direction cmpt,
                 const Pstream::commsTypes commsType
             ) const;
+
+            //- Update result field based on interface functionality
+            virtual void updateInterfaceMatrix
+            (
+                Field<Type>&,
+                const Field<Type>&,
+                const scalarField&,
+                const Pstream::commsTypes commsType
+            ) const;
 };
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchField.H
index 6447c9e067..e9bd3620e6 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchField.H
@@ -150,8 +150,6 @@ public:
             {
                 return procPatch_.forwardT();
             }
-
-
 };
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchFields.H b/src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchFields.H
index 93bfe8a2f5..608bf07324 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchFields.H
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchFields.H
@@ -26,7 +26,7 @@ License
 #ifndef processorCyclicFvPatchFields_H
 #define processorCyclicFvPatchFields_H
 
-#include "processorCyclicFvPatchScalarField.H"
+#include "processorCyclicFvPatchField.H"
 #include "fieldTypes.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchScalarField.C
deleted file mode 100644
index f70ca47a78..0000000000
--- a/src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchScalarField.C
+++ /dev/null
@@ -1,83 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "processorCyclicFvPatchScalarField.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-//template<>
-//void processorCyclicFvPatchField<scalar>::initInterfaceMatrixUpdate
-//(
-//    const scalarField& psiInternal,
-//    scalarField&,
-//    const lduMatrix&,
-//    const scalarField&,
-//    const direction,
-//    const Pstream::commsTypes commsType
-//) const
-//{
-//    procPatch_.compressedSend
-//    (
-//        commsType,
-//        patch().patchInternalField(psiInternal)()
-//    );
-//}
-//
-//
-//template<>
-//void processorCyclicFvPatchField<scalar>::updateInterfaceMatrix
-//(
-//    const scalarField&,
-//    scalarField& result,
-//    const lduMatrix&,
-//    const scalarField& coeffs,
-//    const direction,
-//    const Pstream::commsTypes commsType
-//) const
-//{
-//    scalarField pnf
-//    (
-//        procPatch_.compressedReceive<scalar>(commsType, this->size())()
-//    );
-//
-//    const labelUList& faceCells = patch().faceCells();
-//
-//    forAll(faceCells, facei)
-//    {
-//        result[faceCells[facei]] -= coeffs[facei]*pnf[facei];
-//    }
-//}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchScalarField.H b/src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchScalarField.H
deleted file mode 100644
index 5a17b10fef..0000000000
--- a/src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchScalarField.H
+++ /dev/null
@@ -1,69 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef processorCyclicFvPatchScalarField_H
-#define processorCyclicFvPatchScalarField_H
-
-#include "processorCyclicFvPatchField.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-//template<>
-//void processorCyclicFvPatchField<scalar>::initInterfaceMatrixUpdate
-//(
-//    scalarField&,
-//    const scalarField&,
-//    const scalarField&,
-//    const direction,
-//    const Pstream::commsTypes commsType
-//) const;
-//
-//
-//template<>
-//void processorCyclicFvPatchField<scalar>::updateInterfaceMatrix
-//(
-//    scalarField& result,
-//    const scalarField&,
-//    const scalarField& coeffs,
-//    const direction,
-//    const Pstream::commsTypes commsType
-//) const;
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/meshTools/AMIInterpolation/patches/cyclic/cyclicAMILduInterfaceField/cyclicAMILduInterfaceField.H b/src/meshTools/AMIInterpolation/patches/cyclic/cyclicAMILduInterfaceField/cyclicAMILduInterfaceField.H
index d34c04406b..fd72bb0785 100644
--- a/src/meshTools/AMIInterpolation/patches/cyclic/cyclicAMILduInterfaceField/cyclicAMILduInterfaceField.H
+++ b/src/meshTools/AMIInterpolation/patches/cyclic/cyclicAMILduInterfaceField/cyclicAMILduInterfaceField.H
@@ -83,6 +83,10 @@ public:
             virtual int rank() const = 0;
 
 
+        //- Transform given patch field
+        template<class Type>
+        void transformCoupleField(Field<Type>& f) const;
+
         //- Transform given patch internal field
         void transformCoupleField
         (
@@ -96,6 +100,30 @@ public:
 
 } // End namespace Foam
 
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#include "tensorField.H"
+
+template<class Type>
+void Foam::cyclicAMILduInterfaceField::transformCoupleField
+(
+    Field<Type>& f
+) const
+{
+    if (doTransform())
+    {
+        if (forwardT().size() == 1)
+        {
+            transform(f, forwardT()[0], f);
+        }
+        else
+        {
+            transform(f, forwardT(), f);
+        }
+    }
+}
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #endif

From 6da2bb9483363cec82a51a7b3d45f0a8ffb9a10d Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Thu, 26 Apr 2012 15:17:50 +0100
Subject: [PATCH 267/317] Updated headers

---
 .../constraint/processorCyclic/processorCyclicFvPatchField.H    | 2 +-
 .../constraint/processorCyclic/processorCyclicFvPatchFields.H   | 2 +-
 .../cyclicAMILduInterfaceField/cyclicAMILduInterfaceField.H     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchField.H
index e9bd3620e6..8de27ade32 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchFields.H b/src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchFields.H
index 608bf07324..b07ba14b61 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchFields.H
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchFields.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/meshTools/AMIInterpolation/patches/cyclic/cyclicAMILduInterfaceField/cyclicAMILduInterfaceField.H b/src/meshTools/AMIInterpolation/patches/cyclic/cyclicAMILduInterfaceField/cyclicAMILduInterfaceField.H
index fd72bb0785..533437df08 100644
--- a/src/meshTools/AMIInterpolation/patches/cyclic/cyclicAMILduInterfaceField/cyclicAMILduInterfaceField.H
+++ b/src/meshTools/AMIInterpolation/patches/cyclic/cyclicAMILduInterfaceField/cyclicAMILduInterfaceField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

From 756166462d93643840950c37288037d082bfd461 Mon Sep 17 00:00:00 2001
From: laurence <laurence>
Date: Thu, 26 Apr 2012 15:18:40 +0100
Subject: [PATCH 268/317] COMP: Enable compilation of cv2d

---
 applications/utilities/mesh/generation/cv2DMesh/Make/options    | 2 ++
 .../conformalVoronoiMesh/conformalVoronoiMesh.H                 | 2 --
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/applications/utilities/mesh/generation/cv2DMesh/Make/options b/applications/utilities/mesh/generation/cv2DMesh/Make/options
index cd2a9a5107..56af8bace3 100755
--- a/applications/utilities/mesh/generation/cv2DMesh/Make/options
+++ b/applications/utilities/mesh/generation/cv2DMesh/Make/options
@@ -22,6 +22,8 @@ EXE_INC = \
 
 EXE_LIBS = \
     $(CGAL_LIBS) \
+    -lboost_thread \
+    -lmpfr \
     -lextrude2DMesh \
     -lextrudeModel \
     -lcv2DMesh \
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.H b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.H
index f9648dc1e7..cc22f92088 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.H
+++ b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.H
@@ -45,8 +45,6 @@ SourceFiles
 #ifndef conformalVoronoiMesh_H
 #define conformalVoronoiMesh_H
 
-#define CGAL_INEXACT
-
 #include "CGALTriangulation3Ddefs.H"
 #include "uint.H"
 #include "ulong.H"

From 6061cf971c87ce9f207d471cfcf074be79cd71b1 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Thu, 26 Apr 2012 17:14:10 +0100
Subject: [PATCH 269/317] ENH: polyTopoChange: override readOpt flag in
 makeMesh; does not make sense to read when constructing new mesh

---
 .../polyTopoChange/polyTopoChange/polyTopoChange.C            | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.C
index 9000380aa1..b9b7bde14b 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.C
@@ -3394,11 +3394,13 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::polyTopoChange::makeMesh
     // Create the mesh
     // ~~~~~~~~~~~~~~~
 
+    IOobject noReadIO(io);
+    noReadIO.readOpt() = IOobject::NO_READ;
     newMeshPtr.reset
     (
         new fvMesh
         (
-            io,
+            noReadIO,
             xferMove(newPoints),
             faces_.xfer(),
             faceOwner_.xfer(),

From b1d84337c7080784019fcd7cbaecd464deef7145 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Fri, 27 Apr 2012 11:38:40 +0100
Subject: [PATCH 270/317] ENH: tetDecomposer: class to split cells into tets

---
 src/dynamicMesh/Make/files                    |   1 +
 .../polyTopoChange/tetDecomposer.C            | 713 ++++++++++++++++++
 .../polyTopoChange/tetDecomposer.H            | 198 +++++
 3 files changed, 912 insertions(+)
 create mode 100644 src/dynamicMesh/polyTopoChange/polyTopoChange/tetDecomposer.C
 create mode 100644 src/dynamicMesh/polyTopoChange/polyTopoChange/tetDecomposer.H

diff --git a/src/dynamicMesh/Make/files b/src/dynamicMesh/Make/files
index a7f72ef9fa..d7310029a7 100644
--- a/src/dynamicMesh/Make/files
+++ b/src/dynamicMesh/Make/files
@@ -37,6 +37,7 @@ polyTopoChange/polyTopoChange/removePoints.C
 polyTopoChange/polyTopoChange/combineFaces.C
 polyTopoChange/polyTopoChange/localPointRegion.C
 polyTopoChange/polyTopoChange/duplicatePoints.C
+polyTopoChange/polyTopoChange/tetDecomposer.C
 
 slidingInterface/slidingInterface.C
 slidingInterface/slidingInterfaceProjectPoints.C
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/tetDecomposer.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/tetDecomposer.C
new file mode 100644
index 0000000000..e8948c4fad
--- /dev/null
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/tetDecomposer.C
@@ -0,0 +1,713 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "tetDecomposer.H"
+#include "meshTools.H"
+#include "polyMesh.H"
+#include "polyTopoChange.H"
+#include "mapPolyMesh.H"
+#include "OFstream.H"
+#include "EdgeMap.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+defineTypeNameAndDebug(Foam::tetDecomposer, 0);
+
+namespace Foam
+{
+    template<>
+    const char* NamedEnum<tetDecomposer::decompositionType, 2>::names[] =
+    {
+        "faceCentre",
+        "faceDiagonal"
+    };
+
+    const NamedEnum<tetDecomposer::decompositionType, 2>
+        tetDecomposer::decompositionTypeNames;
+}
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+void Foam::tetDecomposer::modifyFace
+(
+    polyTopoChange& meshMod,
+    const face& f,
+    const label faceI,
+    const label own,
+    const label nei,
+    const label patchI,
+    const label zoneI,
+    const bool zoneFlip
+) const
+{
+    // First usage of face. Modify.
+    if (nei == -1 || own < nei)
+    {
+        meshMod.modifyFace
+        (
+            f,                          // modified face
+            faceI,                      // label of face
+            own,                        // owner
+            nei,                        // neighbour
+            false,                      // face flip
+            patchI,                     // patch for face
+            zoneI,                      // zone for face
+            zoneFlip                    // face flip in zone
+        );
+    }
+    else
+    {
+        meshMod.modifyFace
+        (
+            f.reverseFace(),            // modified face
+            faceI,                      // label of face
+            nei,                        // owner
+            own,                        // neighbour
+            true,                       // face flip
+            patchI,                     // patch for face
+            zoneI,                      // zone for face
+            !zoneFlip                   // face flip in zone
+        );
+    }
+}
+
+
+void Foam::tetDecomposer::addFace
+(
+    polyTopoChange& meshMod,
+    const face& f,
+    const label own,
+    const label nei,
+    const label masterPointID,
+    const label masterEdgeID,
+    const label masterFaceID,
+    const label patchI,
+    const label zoneI,
+    const bool zoneFlip
+) const
+{
+    // Second or more usage of face. Add.
+    if (nei == -1 || own < nei)
+    {
+        meshMod.addFace
+        (
+            f,                          // modified face
+            own,                        // owner
+            nei,                        // neighbour
+            masterPointID,              // master point
+            masterEdgeID,               // master edge
+            masterFaceID,               // master face
+            false,                      // face flip
+            patchI,                     // patch for face
+            zoneI,                      // zone for face
+            zoneFlip                    // face flip in zone
+        );
+    }
+    else
+    {
+        meshMod.addFace
+        (
+            f.reverseFace(),            // modified face
+            nei,                        // owner
+            own,                        // neighbour
+            masterPointID,              // master point
+            masterEdgeID,               // master edge
+            masterFaceID,               // master face
+            true,                       // face flip
+            patchI,                     // patch for face
+            zoneI,                      // zone for face
+            !zoneFlip                   // face flip in zone
+        );
+    }
+}
+
+
+// Work out triangle index given the starting vertex in the face
+Foam::label Foam::tetDecomposer::triIndex(const label faceI, const label fp)
+const
+{
+    const face& f = mesh_.faces()[faceI];
+    const label fp0 = mesh_.tetBasePtIs()[faceI];
+
+    // Work out triangle index on this face
+    label thisTriI;
+    if (fp == fp0)
+    {
+        thisTriI = 0;
+    }
+    else if (fp == f.rcIndex(fp0))
+    {
+        thisTriI = f.size()-3;
+    }
+    else
+    {
+        thisTriI = (fp-fp0-1) % (f.size()-2);
+    }
+    return thisTriI;
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::tetDecomposer::tetDecomposer(const polyMesh& mesh)
+:
+    mesh_(mesh)
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::tetDecomposer::setRefinement
+(
+    const decompositionType decomposeType,
+    polyTopoChange& meshMod
+)
+{
+    cellToPoint_.setSize(mesh_.nCells());
+    forAll(mesh_.cellCentres(), cellI)
+    {
+        // Any point on the cell
+        label masterPointI = mesh_.faces()[mesh_.cells()[cellI][0]][0];
+
+        cellToPoint_[cellI] = meshMod.addPoint
+        (
+            mesh_.cellCentres()[cellI],
+            masterPointI,
+            -1,
+            true
+        );
+    }
+
+
+    // Add face centre points
+    if (decomposeType == FACECENTRETETS)
+    {
+        faceToPoint_.setSize(mesh_.nFaces());
+        forAll(mesh_.faceCentres(), faceI)
+        {
+            // Any point on the face
+            const label masterPointI = mesh_.faces()[faceI][0];
+
+            faceToPoint_[faceI] = meshMod.addPoint
+            (
+                mesh_.faceCentres()[faceI],
+                masterPointI,
+                -1,
+                true
+            );
+        }
+    }
+
+
+    // Per face, per point (faceCentre) or triangle (faceDiag) the added cell
+    faceOwnerCells_.setSize(mesh_.nFaces());
+    faceNeighbourCells_.setSize(mesh_.nFaces());
+
+    if (decomposeType == FACECENTRETETS)
+    {
+        forAll(faceOwnerCells_, faceI)
+        {
+            const face& f = mesh_.faces()[faceI];
+            faceOwnerCells_[faceI].setSize(f.size(), -1);
+            faceNeighbourCells_[faceI].setSize(f.size(), -1);
+        }
+    }
+    else
+    {
+        // Force construction of diagonal decomposition
+        (void)mesh_.tetBasePtIs();
+
+        forAll(faceOwnerCells_, faceI)
+        {
+            const face& f = mesh_.faces()[faceI];
+            faceOwnerCells_[faceI].setSize(f.size()-2, -1);
+            faceNeighbourCells_[faceI].setSize(f.size()-2, -1);
+        }
+    }
+
+
+    forAll(mesh_.cells(), cellI)
+    {
+        const cell& cFaces = mesh_.cells()[cellI];
+
+        EdgeMap<label> edgeToFace(8*cFaces.size());
+
+        forAll(cFaces, cFaceI)
+        {
+            label faceI = cFaces[cFaceI];
+            const face& f = mesh_.faces()[faceI];
+
+            // Get reference to either owner or neighbour
+            labelList& added =
+            (
+                (mesh_.faceOwner()[faceI] == cellI)
+              ? faceOwnerCells_[faceI]
+              : faceNeighbourCells_[faceI]
+            );
+
+            if (decomposeType == FACECENTRETETS)
+            {
+                forAll(f, fp)
+                {
+                    if (cFaceI == 0 && fp == 0)
+                    {
+                        // Reuse cell itself
+                        added[fp] = cellI;
+                    }
+                    else
+                    {
+                        added[fp] = meshMod.addCell
+                        (
+                            -1,     // masterPoint
+                            -1,     // masterEdge
+                            -1,     // masterFace
+                            cellI,  // masterCell
+                            mesh_.cellZones().whichZone(cellI)
+                        );
+                    }
+                }
+            }
+            else
+            {
+                for (label triI = 0; triI < f.size()-2; triI++)
+                {
+                    if (cFaceI == 0 && triI == 0)
+                    {
+                        // Reuse cell itself
+                        added[triI] = cellI;
+                    }
+                    else
+                    {
+                        added[triI] = meshMod.addCell
+                        (
+                            -1,     // masterPoint
+                            -1,     // masterEdge
+                            -1,     // masterFace
+                            cellI,  // masterCell
+                            mesh_.cellZones().whichZone(cellI)
+                        );
+                    }
+                }
+            }
+        }
+    }
+
+
+
+    // Add triangle faces
+    face triangle(3);
+
+    forAll(mesh_.faces(), faceI)
+    {
+        label own = mesh_.faceOwner()[faceI];
+        const labelList& addedOwn = faceOwnerCells_[faceI];
+        const labelList& addedNei = faceNeighbourCells_[faceI];
+        const face& f = mesh_.faces()[faceI];
+
+        label patchI = -1;
+        if (faceI >= mesh_.nInternalFaces())
+        {
+            patchI = mesh_.boundaryMesh().whichPatch(faceI);
+        }
+
+        label zoneI = mesh_.faceZones().whichZone(faceI);
+        bool zoneFlip = false;
+        if (zoneI != -1)
+        {
+            const faceZone& fz = mesh_.faceZones()[zoneI];
+            zoneFlip = fz.flipMap()[fz.whichFace(faceI)];
+        }
+
+
+        if (decomposeType == FACECENTRETETS)
+        {
+            forAll(f, fp)
+            {
+                // 1. Front triangle (decomposition of face itself)
+                //    (between owner and neighbour cell)
+                {
+                    triangle[0] = f[fp];
+                    triangle[1] = f[f.fcIndex(fp)];
+                    triangle[2] = faceToPoint_[faceI];
+
+                    if (fp == 0)
+                    {
+                        modifyFace
+                        (
+                            meshMod,
+                            triangle,
+                            faceI,
+                            addedOwn[fp],
+                            addedNei[fp],
+                            patchI,
+                            zoneI,
+                            zoneFlip
+                        );
+                    }
+                    else
+                    {
+                        addFace
+                        (
+                            meshMod,
+                            triangle,
+                            addedOwn[fp],
+                            addedNei[fp],
+                            -1,                 //point
+                            -1,                 //edge
+                            faceI,              //face
+                            patchI,
+                            zoneI,
+                            zoneFlip
+                        );
+                    }
+                }
+
+
+                // 2. Within owner cell - to cell centre
+                {
+                    label newOwn = addedOwn[f.rcIndex(fp)];
+                    label newNei = addedOwn[fp];
+
+                    triangle[0] = f[fp];
+                    triangle[1] = cellToPoint_[own];
+                    triangle[2] = faceToPoint_[faceI];
+
+                    addFace
+                    (
+                        meshMod,
+                        triangle,
+                        newOwn,
+                        newNei,
+                        f[fp],      //point
+                        -1,         //edge
+                        -1,         //face
+                        -1,         //patchI
+                        zoneI,
+                        zoneFlip
+                    );
+                }
+                // 2b. Within neighbour cell - to cell centre
+                if (faceI < mesh_.nInternalFaces())
+                {
+                    label newOwn = addedNei[f.rcIndex(fp)];
+                    label newNei = addedNei[fp];
+
+                    triangle[0] = f[fp];
+                    triangle[1] = faceToPoint_[faceI];
+                    triangle[2] = cellToPoint_[mesh_.faceNeighbour()[faceI]];
+
+                    addFace
+                    (
+                        meshMod,
+                        triangle,
+                        newOwn,
+                        newNei,
+                        f[fp],      //point
+                        -1,         //edge
+                        -1,         //face
+                        -1,         //patchI
+                        zoneI,
+                        zoneFlip
+                    );
+                }
+            }
+        }
+        else
+        {
+            label fp0 = mesh_.tetBasePtIs()[faceI];
+            label fp = f.fcIndex(fp0);
+
+            for (label triI = 0; triI < f.size()-2; triI++)
+            {
+                label nextTri = triI+1;
+                if (nextTri >= f.size()-2)
+                {
+                    nextTri -= f.size()-2;
+                }
+                label nextFp = f.fcIndex(fp);
+
+
+                // Triangle triI consisiting of f[fp0], f[fp], f[nextFp]
+
+
+                // 1. Front triangle (decomposition of face itself)
+                //    (between owner and neighbour cell)
+                {
+                    triangle[0] = f[fp0];
+                    triangle[1] = f[fp];
+                    triangle[2] = f[nextFp];
+
+                    if (triI == 0)
+                    {
+                        modifyFace
+                        (
+                            meshMod,
+                            triangle,
+                            faceI,
+                            addedOwn[triI],
+                            addedNei[triI],
+                            patchI,
+                            zoneI,
+                            zoneFlip
+                        );
+                    }
+                    else
+                    {
+                        addFace
+                        (
+                            meshMod,
+                            triangle,
+                            addedOwn[triI],
+                            addedNei[triI],
+                            -1,                 //point
+                            -1,                 //edge
+                            faceI,              //face
+                            patchI,
+                            zoneI,
+                            zoneFlip
+                        );
+                    }
+                }
+
+
+                // 2. Within owner cell - diagonal to cell centre
+                if (triI < f.size()-3)
+                {
+                    label newOwn = addedOwn[triI];
+                    label newNei = addedOwn[nextTri];
+
+                    triangle[0] = f[fp0];
+                    triangle[1] = f[nextFp];
+                    triangle[2] = cellToPoint_[own];
+
+                    addFace
+                    (
+                        meshMod,
+                        triangle,
+                        newOwn,
+                        newNei,
+                        f[fp],      //point
+                        -1,         //edge
+                        -1,         //face
+                        -1,         //patchI
+                        zoneI,
+                        zoneFlip
+                    );
+
+                    // 2b. Within neighbour cell - to cell centre
+                    if (faceI < mesh_.nInternalFaces())
+                    {
+                        label newOwn = addedNei[triI];
+                        label newNei = addedNei[nextTri];
+
+                        triangle[0] = f[nextFp];
+                        triangle[1] = f[fp0];
+                        triangle[2] =
+                            cellToPoint_[mesh_.faceNeighbour()[faceI]];
+
+                        addFace
+                        (
+                            meshMod,
+                            triangle,
+                            newOwn,
+                            newNei,
+                            f[fp],      //point
+                            -1,         //edge
+                            -1,         //face
+                            -1,         //patchI
+                            zoneI,
+                            zoneFlip
+                        );
+                    }
+                }
+
+
+                fp = nextFp;
+            }
+        }
+    }
+
+
+
+    // Add triangles for all edges.
+    EdgeMap<label> edgeToFace;
+
+    forAll(mesh_.cells(), cellI)
+    {
+        const cell& cFaces = mesh_.cells()[cellI];
+
+        edgeToFace.clear();
+
+        forAll(cFaces, cFaceI)
+        {
+            label faceI = cFaces[cFaceI];
+
+            label zoneI = mesh_.faceZones().whichZone(faceI);
+            bool zoneFlip = false;
+            if (zoneI != -1)
+            {
+                const faceZone& fz = mesh_.faceZones()[zoneI];
+                zoneFlip = fz.flipMap()[fz.whichFace(faceI)];
+            }
+
+            const face& f = mesh_.faces()[faceI];
+            //const labelList& fEdges = mesh_.faceEdges()[faceI];
+            forAll(f, fp)
+            {
+                label p0 = f[fp];
+                label p1 = f[f.fcIndex(fp)];
+                const edge e(p0, p1);
+
+                EdgeMap<label>::const_iterator edgeFnd = edgeToFace.find(e);
+                if (edgeFnd == edgeToFace.end())
+                {
+                    edgeToFace.insert(e, faceI);
+                }
+                else
+                {
+                    // Found the other face on the edge.
+                    label otherFaceI = edgeFnd();
+                    const face& otherF = mesh_.faces()[otherFaceI];
+
+                    // Found the other face on the edge. Note that since
+                    // we are looping in the same order the tets added for
+                    // otherFaceI will be before those of faceI
+
+                    label otherFp = findIndex(otherF, p0);
+                    if (otherF.nextLabel(otherFp) == p1)
+                    {
+                        // ok. otherFp is first vertex of edge.
+                    }
+                    else if (otherF.prevLabel(otherFp) == p1)
+                    {
+                        otherFp = otherF.rcIndex(otherFp);
+                    }
+                    else
+                    {
+                        FatalErrorIn("tetDecomposer::setRefinement(..)")
+                            << "problem." << abort(FatalError);
+                    }
+
+
+                    // Triangle from edge to cell centre
+                    if (mesh_.faceOwner()[faceI] == cellI)
+                    {
+                        triangle[0] = p0;
+                        triangle[1] = p1;
+                        triangle[2] = cellToPoint_[cellI];
+                    }
+                    else
+                    {
+                        triangle[0] = p1;
+                        triangle[1] = p0;
+                        triangle[2] = cellToPoint_[cellI];
+                    }
+
+                    // Determine tets on either side
+                    label thisTet, otherTet;
+
+                    if (decomposeType == FACECENTRETETS)
+                    {
+                        if (mesh_.faceOwner()[faceI] == cellI)
+                        {
+                            thisTet = faceOwnerCells_[faceI][fp];
+                        }
+                        else
+                        {
+                            thisTet = faceNeighbourCells_[faceI][fp];
+                        }
+
+                        if (mesh_.faceOwner()[otherFaceI] == cellI)
+                        {
+                            otherTet = faceOwnerCells_[otherFaceI][otherFp];
+                        }
+                        else
+                        {
+                            otherTet =
+                                faceNeighbourCells_[otherFaceI][otherFp];
+                        }
+                    }
+                    else
+                    {
+                        label thisTriI = triIndex(faceI, fp);
+                        if (mesh_.faceOwner()[faceI] == cellI)
+                        {
+                            thisTet = faceOwnerCells_[faceI][thisTriI];
+                        }
+                        else
+                        {
+                            thisTet = faceNeighbourCells_[faceI][thisTriI];
+                        }
+
+                        label otherTriI = triIndex(otherFaceI, otherFp);
+                        if (mesh_.faceOwner()[otherFaceI] == cellI)
+                        {
+                            otherTet = faceOwnerCells_[otherFaceI][otherTriI];
+                        }
+                        else
+                        {
+                            otherTet =
+                                faceNeighbourCells_[otherFaceI][otherTriI];
+                        }
+                    }
+
+
+                    addFace
+                    (
+                        meshMod,
+                        triangle,
+                        otherTet,
+                        thisTet,
+                        -1,         //masterPoint
+                        -1,         //fEdges[fp], //masterEdge
+                        faceI,      //masterFace
+                        -1,         //patchI
+                        zoneI,
+                        zoneFlip
+                    );
+                }
+            }
+        }
+    }
+}
+
+
+void Foam::tetDecomposer::updateMesh(const mapPolyMesh& map)
+{
+    inplaceRenumber(map.pointMap(), cellToPoint_);
+    inplaceRenumber(map.pointMap(), faceToPoint_);
+
+    forAll(faceOwnerCells_, faceI)
+    {
+        inplaceRenumber(map.cellMap(), faceOwnerCells_[faceI]);
+    }
+    forAll(faceNeighbourCells_, faceI)
+    {
+        inplaceRenumber(map.cellMap(), faceNeighbourCells_[faceI]);
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/tetDecomposer.H b/src/dynamicMesh/polyTopoChange/polyTopoChange/tetDecomposer.H
new file mode 100644
index 0000000000..8485f3cd8d
--- /dev/null
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/tetDecomposer.H
@@ -0,0 +1,198 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    tetDecomposer
+
+Description
+    Decomposes polyMesh into tets.
+
+SourceFiles
+    tetDecomposer.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef tetDecomposer_H
+#define tetDecomposer_H
+
+#include "DynamicList.H"
+#include "PackedBoolList.H"
+#include "boolList.H"
+#include "typeInfo.H"
+#include "NamedEnum.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+class polyMesh;
+class polyTopoChange;
+class face;
+class mapPolyMesh;
+
+/*---------------------------------------------------------------------------*\
+                           Class tetDecomposer Declaration
+\*---------------------------------------------------------------------------*/
+
+class tetDecomposer
+{
+public:
+
+    // Public data types
+
+        enum decompositionType
+        {
+            FACECENTRETETS, // tet decomposition using facectr and cellctr
+            FACEDIAGTETS    // tet decomposition using face diag and cellctr
+        };
+        static const NamedEnum<decompositionType, 2> decompositionTypeNames;
+
+private:
+
+    // Private data
+
+        const polyMesh& mesh_;
+
+        //- From cell to tet point
+        labelList cellToPoint_;
+
+        //- From face to tet point
+        labelList faceToPoint_;
+
+
+        // Per face, per point (faceCentre) or triangle (faceDiag)
+        // the added tet on the owner side
+        labelListList faceOwnerCells_;
+
+        // Per face, per point (faceCentre) or triangle (faceDiag)
+        // the added tet on the neighbour side
+        labelListList faceNeighbourCells_;
+
+    // Private Member Functions
+
+        //- Modify a face
+        void modifyFace
+        (
+            polyTopoChange& meshMod,
+            const face& f,
+            const label faceI,
+            const label own,
+            const label nei,
+            const label patchI,
+            const label zoneI,
+            const bool zoneFlip
+        ) const;
+
+        //- Add a face
+        void addFace
+        (
+            polyTopoChange& meshMod,
+            const face& f,
+            const label own,
+            const label nei,
+            const label masterPointID,
+            const label masterEdgeID,
+            const label masterFaceID,
+            const label patchI,
+            const label zoneI,
+            const bool zoneFlip
+        ) const;
+
+        //- Work out triangle index given the starting vertex in the face
+        label triIndex(const label faceI, const label fp) const;
+
+        //- Disallow default bitwise copy construct
+        tetDecomposer(const tetDecomposer&);
+
+        //- Disallow default bitwise assignment
+        void operator=(const tetDecomposer&);
+
+
+public:
+
+    //- Runtime type information
+    ClassName("tetDecomposer");
+
+
+    // Constructors
+
+        //- Construct from mesh
+        tetDecomposer(const polyMesh&);
+
+
+    // Member Functions
+
+        // Access
+
+            //- From cell to tet point
+            const labelList& cellToPoint() const
+            {
+                return cellToPoint_;
+            }
+
+            //- From face to tet point
+            const labelList& faceToPoint() const
+            {
+                return faceToPoint_;
+            }
+
+
+            //- Per face, per point (faceCentre) or triangle (faceDiag)
+            //  the added tet on the owner side
+            const labelListList& faceOwnerCells() const
+            {
+                return faceOwnerCells_;
+            }
+
+            //- Per face, per point (faceCentre) or triangle (faceDiag)
+            //  the added tet on the neighbour side
+            const labelListList& faceNeighbourCells() const
+            {
+                return faceNeighbourCells_;
+            }
+
+
+        // Edit
+
+            //- Insert all changes into meshMod to convert the polyMesh into
+            //  tets.
+            void setRefinement
+            (
+                const decompositionType decomposeType,
+                polyTopoChange& meshMod
+            );
+
+            //- Force recalculation of locally stored data on topological change
+            void updateMesh(const mapPolyMesh&);
+};
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //

From 3ba9c53475d21c85503dd72c16c5772a08466faf Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Fri, 27 Apr 2012 11:39:24 +0100
Subject: [PATCH 271/317] ENH: motionSmoother: stabilise edge weight
 calculation

---
 src/dynamicMesh/motionSmoother/motionSmoother.C | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/dynamicMesh/motionSmoother/motionSmoother.C b/src/dynamicMesh/motionSmoother/motionSmoother.C
index cf686b7dd8..fa9c2f1baa 100644
--- a/src/dynamicMesh/motionSmoother/motionSmoother.C
+++ b/src/dynamicMesh/motionSmoother/motionSmoother.C
@@ -283,7 +283,7 @@ Foam::tmp<Foam::scalarField> Foam::motionSmoother::calcEdgeWeights
 
     forAll(edges, edgeI)
     {
-        wght[edgeI] = min(GREAT, 1.0/edges[edgeI].mag(points));
+        wght[edgeI] = 1.0/(edges[edgeI].mag(points)+SMALL);
     }
     return twght;
 }

From cba9a30d3d88ea10c24e507a1a28c323898f1fe5 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Fri, 27 Apr 2012 11:41:36 +0100
Subject: [PATCH 272/317] ENH: autoSnapDriverFeature: make bounding box 3D

---
 .../autoHexMeshDriver/autoSnapDriverFeature.C   | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriverFeature.C b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriverFeature.C
index 2ebf0b140d..6347d5dd16 100644
--- a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriverFeature.C
+++ b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriverFeature.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -1202,10 +1202,23 @@ void Foam::autoSnapDriver::featureAttractionUsingFeatureEdges
     // Reverse lookup : go through all edgeAttractors and find the
     // nearest point on pp
 
+    // Get search domain and extend it a bit
+    treeBoundBox bb(pp.localPoints());
+    {
+        // Random number generator. Bit dodgy since not exactly random ;-)
+        Random rndGen(65431);
+
+        // Slightly extended bb. Slightly off-centred just so on symmetric
+        // geometry there are less face/edge aligned items.
+        bb = bb.extend(rndGen, 1e-4);
+        bb.min() -= point(ROOTVSMALL, ROOTVSMALL, ROOTVSMALL);
+        bb.max() += point(ROOTVSMALL, ROOTVSMALL, ROOTVSMALL);
+    }
+
     indexedOctree<treeDataPoint> ppTree
     (
         treeDataPoint(pp.localPoints()),
-        treeBoundBox(pp.localPoints()), // overall search domain
+        bb,                             // overall search domain
         8,                              // maxLevel
         10,                             // leafsize
         3.0                             // duplicity

From 156839b16a85997f69f31066c9a16973bee98799 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Fri, 27 Apr 2012 12:18:54 +0100
Subject: [PATCH 273/317] BUG: tetDecomposer: updated tet numbering

---
 .../polyTopoChange/polyTopoChange/tetDecomposer.C         | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/tetDecomposer.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/tetDecomposer.C
index e8948c4fad..bdbd851527 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/tetDecomposer.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/tetDecomposer.C
@@ -696,16 +696,16 @@ void Foam::tetDecomposer::setRefinement
 
 void Foam::tetDecomposer::updateMesh(const mapPolyMesh& map)
 {
-    inplaceRenumber(map.pointMap(), cellToPoint_);
-    inplaceRenumber(map.pointMap(), faceToPoint_);
+    inplaceRenumber(map.reversePointMap(), cellToPoint_);
+    inplaceRenumber(map.reversePointMap(), faceToPoint_);
 
     forAll(faceOwnerCells_, faceI)
     {
-        inplaceRenumber(map.cellMap(), faceOwnerCells_[faceI]);
+        inplaceRenumber(map.reverseCellMap(), faceOwnerCells_[faceI]);
     }
     forAll(faceNeighbourCells_, faceI)
     {
-        inplaceRenumber(map.cellMap(), faceNeighbourCells_[faceI]);
+        inplaceRenumber(map.reverseCellMap(), faceNeighbourCells_[faceI]);
     }
 }
 

From ed293d3af1b757f30ac2b3fcf8684eb7c650f0c8 Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Fri, 27 Apr 2012 18:16:53 +0100
Subject: [PATCH 274/317] LduMatrix: coupled solvers are now run-time
 selectable for solving fvMatrices by conversion of the fvMatrix/lduMatrix to
 LduMatrix

---
 applications/test/PisoFoam/PisoFoam.C         |   2 +-
 .../matrices/LduMatrix/LduMatrix/LduMatrix.C  |   2 +-
 .../matrices/LduMatrix/LduMatrix/LduMatrix.H  | 187 +------------
 .../{LduMatrixTests.C => SolverPerformance.C} |  52 ++--
 .../LduMatrix/LduMatrix/SolverPerformance.H   | 258 ++++++++++++++++++
 .../Solvers/DiagonalSolver/DiagonalSolver.C   |   4 +-
 .../Solvers/DiagonalSolver/DiagonalSolver.H   |   5 +-
 .../LduMatrix/Solvers/PBiCCCG/PBiCCCG.C       |   4 +-
 .../LduMatrix/Solvers/PBiCCCG/PBiCCCG.H       |   5 +-
 .../LduMatrix/Solvers/PBiCICG/PBiCICG.C       |   4 +-
 .../LduMatrix/Solvers/PBiCICG/PBiCICG.H       |   5 +-
 .../matrices/LduMatrix/Solvers/PCICG/PCICG.C  |   4 +-
 .../matrices/LduMatrix/Solvers/PCICG/PCICG.H  |   5 +-
 .../Solvers/SmoothSolver/SmoothSolver.C       |   4 +-
 .../Solvers/SmoothSolver/SmoothSolver.H       |   5 +-
 .../fvMatrices/fvMatrix/fvMatrix.H            |  10 +-
 .../fvMatrices/fvMatrix/fvMatrixSolve.C       | 100 ++++++-
 .../fvScalarMatrix/fvScalarMatrix.C           |   5 +-
 .../fvScalarMatrix/fvScalarMatrix.H           |   2 +-
 19 files changed, 417 insertions(+), 246 deletions(-)
 rename src/OpenFOAM/matrices/LduMatrix/LduMatrix/{LduMatrixTests.C => SolverPerformance.C} (72%)
 create mode 100644 src/OpenFOAM/matrices/LduMatrix/LduMatrix/SolverPerformance.H

diff --git a/applications/test/PisoFoam/PisoFoam.C b/applications/test/PisoFoam/PisoFoam.C
index 67f0084e71..1713e9747c 100644
--- a/applications/test/PisoFoam/PisoFoam.C
+++ b/applications/test/PisoFoam/PisoFoam.C
@@ -102,7 +102,7 @@ int main(int argc, char *argv[])
                         "{"
                         "    /*solver          SmoothSolver;*/"
                         "    smoother        GaussSeidel;"
-                        "    solver           PBiCICG;"
+                        "    solver           PBiCCCG;"
                         "    preconditioner   none;"
                         "    tolerance        (1e-7 1e-7 1);"
                         "    relTol           (0 0 0);"
diff --git a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrix.C b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrix.C
index 97b2b2f40e..00782ac75b 100644
--- a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrix.C
+++ b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrix.C
@@ -382,7 +382,7 @@ Foam::Ostream& Foam::operator<<
 #include "LduMatrixOperations.C"
 #include "LduMatrixATmul.C"
 #include "LduMatrixUpdateMatrixInterfaces.C"
-#include "LduMatrixTests.C"
+#include "SolverPerformance.C"
 #include "LduMatrixPreconditioner.C"
 #include "LduMatrixSmoother.C"
 #include "LduMatrixSolver.C"
diff --git a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrix.H b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrix.H
index e0ce6d28ba..507fd40e94 100644
--- a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrix.H
+++ b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrix.H
@@ -54,6 +54,7 @@ SourceFiles
 #include "Field.H"
 #include "FieldField.H"
 #include "LduInterfaceFieldPtrsList.H"
+#include "SolverPerformance.H"
 #include "typeInfo.H"
 #include "autoPtr.H"
 #include "runTimeSelectionTables.H"
@@ -75,27 +76,6 @@ Ostream& operator<<
     const LduMatrix<Type, DType, LUType>&
 );
 
-template<class Type, class DType, class LUType>
-typename LduMatrix<Type, DType, LUType>::solverPerformance max
-(
-    const typename LduMatrix<Type, DType, LUType>::solverPerformance&,
-    const typename LduMatrix<Type, DType, LUType>::solverPerformance&
-);
-
-template<class Type, class DType, class LUType>
-Istream& operator>>
-(
-    Istream&,
-    typename LduMatrix<Type, DType, LUType>::solverPerformance&
-);
-
-template<class Type, class DType, class LUType>
-Ostream& operator<<
-(
-    Ostream&,
-    const typename LduMatrix<Type, DType, LUType>::solverPerformance&
-);
-
 
 /*---------------------------------------------------------------------------*\
                            Class LduMatrix Declaration
@@ -127,168 +107,7 @@ class LduMatrix
 
 public:
 
-    //- Class returned by the solver
-    //  containing performance statistics
-    class solverPerformance
-    {
-        word   solverName_;
-        word   fieldName_;
-        Type   initialResidual_;
-        Type   finalResidual_;
-        label  noIterations_;
-        bool   converged_;
-        FixedList<bool, pTraits<Type>::nComponents> singular_;
-
-
-    public:
-
-        // Constructors
-
-            solverPerformance()
-            :
-                initialResidual_(pTraits<Type>::zero),
-                finalResidual_(pTraits<Type>::zero),
-                noIterations_(0),
-                converged_(false),
-                singular_(false)
-            {}
-
-
-            solverPerformance
-            (
-                const word&  solverName,
-                const word&  fieldName,
-                const Type&  iRes = pTraits<Type>::zero,
-                const Type&  fRes = pTraits<Type>::zero,
-                const label  nIter = 0,
-                const bool   converged = false,
-                const bool   singular = false
-            )
-            :
-                solverName_(solverName),
-                fieldName_(fieldName),
-                initialResidual_(iRes),
-                finalResidual_(fRes),
-                noIterations_(nIter),
-                converged_(converged),
-                singular_(singular)
-            {}
-
-
-        // Member functions
-
-            //- Return solver name
-            const word& solverName() const
-            {
-                return solverName_;
-            }
-
-            //- Return solver name
-            word& solverName()
-            {
-                return solverName_;
-            }
-
-
-            //- Return field name
-            const word& fieldName() const
-            {
-                return fieldName_;
-            }
-
-
-            //- Return initial residual
-            const Type& initialResidual() const
-            {
-                return initialResidual_;
-            }
-
-            //- Return initial residual
-            Type& initialResidual()
-            {
-                return initialResidual_;
-            }
-
-
-            //- Return final residual
-            const Type& finalResidual() const
-            {
-                return finalResidual_;
-            }
-
-            //- Return final residual
-            Type& finalResidual()
-            {
-                return finalResidual_;
-            }
-
-
-            //- Return number of iterations
-            label nIterations() const
-            {
-                return noIterations_;
-            }
-
-            //- Return number of iterations
-            label& nIterations()
-            {
-                return noIterations_;
-            }
-
-
-            //- Has the solver converged?
-            bool converged() const
-            {
-                return converged_;
-            }
-
-            //- Is the matrix singular?
-            bool singular() const;
-
-            //- Check, store and return convergence
-            bool converged
-            (
-                const Type& tolerance,
-                const Type& relTolerance
-            );
-
-            //- Singularity test
-            bool checkSingularity(const Type& residual);
-
-            //- Print summary of solver performance to the given stream
-            void print(Ostream& os) const;
-
-
-        // Member Operators
-
-            bool operator!=(const solverPerformance&) const;
-
-
-        // Friend functions
-
-            //- Return the element-wise maximum of two solverPerformances
-            friend solverPerformance max <Type, DType, LUType>
-            (
-                const solverPerformance&,
-                const solverPerformance&
-            );
-
-
-        // Ostream Operator
-
-            friend Istream& operator>> <Type, DType, LUType>
-            (
-                Istream&,
-                solverPerformance&
-            );
-
-            friend Ostream& operator<< <Type, DType, LUType>
-            (
-                Ostream&,
-                const solverPerformance&
-            );
-    };
-
+    friend class SolverPerformance<Type>;
 
     //- Abstract base-class for LduMatrix solvers
     class solver
@@ -417,7 +236,7 @@ public:
             //- Read and reset the solver parameters from the given dictionary
             virtual void read(const dictionary& solverDict);
 
-            virtual solverPerformance solve
+            virtual SolverPerformance<Type> solve
             (
                 Field<Type>& psi
             ) const = 0;
diff --git a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixTests.C b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/SolverPerformance.C
similarity index 72%
rename from src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixTests.C
rename to src/OpenFOAM/matrices/LduMatrix/LduMatrix/SolverPerformance.C
index f5a675f044..a50a6e537f 100644
--- a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixTests.C
+++ b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/SolverPerformance.C
@@ -27,23 +27,24 @@ License
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-template<class Type, class DType, class LUType>
-bool Foam::LduMatrix<Type, DType, LUType>::solverPerformance::checkSingularity
+template<class Type>
+bool Foam::SolverPerformance<Type>::checkSingularity
 (
     const Type& wApA
 )
 {
     for(direction cmpt=0; cmpt<pTraits<Type>::nComponents; cmpt++)
     {
-        singular_[cmpt] = component(wApA, cmpt) < vsmall_;
+        singular_[cmpt] =
+            component(wApA, cmpt) < LduMatrix<scalar, scalar, scalar>::vsmall_;
     }
 
     return singular();
 }
 
 
-template<class Type, class DType, class LUType>
-bool Foam::LduMatrix<Type, DType, LUType>::solverPerformance::singular() const
+template<class Type>
+bool Foam::SolverPerformance<Type>::singular() const
 {
     for(direction cmpt=0; cmpt<pTraits<Type>::nComponents; cmpt++)
     {
@@ -54,14 +55,14 @@ bool Foam::LduMatrix<Type, DType, LUType>::solverPerformance::singular() const
 }
 
 
-template<class Type, class DType, class LUType>
-bool Foam::LduMatrix<Type, DType, LUType>::solverPerformance::converged
+template<class Type>
+bool Foam::SolverPerformance<Type>::converged
 (
     const Type& Tolerance,
     const Type& RelTolerance
 )
 {
-    if (debug >= 2)
+    if (LduMatrix<scalar, scalar, scalar>::debug >= 2)
     {
         Info<< solverName_
             << ":  Iteration " << noIterations_
@@ -73,7 +74,8 @@ bool Foam::LduMatrix<Type, DType, LUType>::solverPerformance::converged
     (
         finalResidual_ < Tolerance
      || (
-            RelTolerance > small_*pTraits<Type>::one
+            RelTolerance
+          > LduMatrix<scalar, scalar, scalar>::small_*pTraits<Type>::one
          && finalResidual_ < cmptMultiply(RelTolerance, initialResidual_)
         )
     )
@@ -89,8 +91,8 @@ bool Foam::LduMatrix<Type, DType, LUType>::solverPerformance::converged
 }
 
 
-template<class Type, class DType, class LUType>
-void Foam::LduMatrix<Type, DType, LUType>::solverPerformance::print
+template<class Type>
+void Foam::SolverPerformance<Type>::print
 (
     Ostream& os
 ) const
@@ -115,10 +117,10 @@ void Foam::LduMatrix<Type, DType, LUType>::solverPerformance::print
 }
 
 
-template<class Type, class DType, class LUType>
-bool Foam::LduMatrix<Type, DType, LUType>::solverPerformance::operator!=
+template<class Type>
+bool Foam::SolverPerformance<Type>::operator!=
 (
-    const LduMatrix<Type, DType, LUType>::solverPerformance& sp
+    const SolverPerformance<Type>& sp
 ) const
 {
     return
@@ -134,14 +136,14 @@ bool Foam::LduMatrix<Type, DType, LUType>::solverPerformance::operator!=
 }
 
 
-template<class Type, class DType, class LUType>
-typename Foam::LduMatrix<Type, DType, LUType>::solverPerformance Foam::max
+template<class Type>
+typename Foam::SolverPerformance<Type> Foam::max
 (
-    const typename Foam::LduMatrix<Type, DType, LUType>::solverPerformance& sp1,
-    const typename Foam::LduMatrix<Type, DType, LUType>::solverPerformance& sp2
+    const typename Foam::SolverPerformance<Type>& sp1,
+    const typename Foam::SolverPerformance<Type>& sp2
 )
 {
-    return lduMatrix::solverPerformance
+    return SolverPerformance<Type>
     (
         sp1.solverName(),
         sp1.fieldName_,
@@ -154,14 +156,14 @@ typename Foam::LduMatrix<Type, DType, LUType>::solverPerformance Foam::max
 }
 
 
-template<class Type, class DType, class LUType>
+template<class Type>
 Foam::Istream& Foam::operator>>
 (
     Istream& is,
-    typename Foam::LduMatrix<Type, DType, LUType>::solverPerformance& sp
+    typename Foam::SolverPerformance<Type>& sp
 )
 {
-    is.readBeginList("LduMatrix<Type, DType, LUType>::solverPerformance");
+    is.readBeginList("SolverPerformance<Type>");
     is  >> sp.solverName_
         >> sp.fieldName_
         >> sp.initialResidual_
@@ -169,17 +171,17 @@ Foam::Istream& Foam::operator>>
         >> sp.noIterations_
         >> sp.converged_
         >> sp.singular_;
-    is.readEndList("LduMatrix<Type, DType, LUType>::solverPerformance");
+    is.readEndList("SolverPerformance<Type>");
 
     return is;
 }
 
 
-template<class Type, class DType, class LUType>
+template<class Type>
 Foam::Ostream& Foam::operator<<
 (
     Ostream& os,
-    const typename Foam::LduMatrix<Type, DType, LUType>::solverPerformance& sp
+    const typename Foam::SolverPerformance<Type>& sp
 )
 {
     os  << token::BEGIN_LIST
diff --git a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/SolverPerformance.H b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/SolverPerformance.H
new file mode 100644
index 0000000000..fdfd269e17
--- /dev/null
+++ b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/SolverPerformance.H
@@ -0,0 +1,258 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::SolverPerformance
+
+Description
+    SolverPerformance is a general matrix class in which the coefficients are
+    stored as three arrays, one for the upper triangle, one for the
+    lower triangle and a third for the diagonal.
+
+SourceFiles
+    SolverPerformance.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef SolverPerformance_H
+#define SolverPerformance_H
+
+#include "word.H"
+#include "FixedList.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// Forward declaration of friend functions and operators
+
+template<class Type>
+class SolverPerformance;
+
+template<class Type>
+SolverPerformance<Type> max
+(
+    const SolverPerformance<Type>&,
+    const SolverPerformance<Type>&
+);
+
+template<class Type>
+Istream& operator>>
+(
+    Istream&,
+    SolverPerformance<Type>&
+);
+
+template<class Type>
+Ostream& operator<<
+(
+    Ostream&,
+    const SolverPerformance<Type>&
+);
+
+
+
+/*---------------------------------------------------------------------------*\
+                       Class SolverPerformance Declaration
+\*---------------------------------------------------------------------------*/
+
+//- Class returned by the solver
+//  containing performance statistics
+template<class Type>
+class SolverPerformance
+{
+    word   solverName_;
+    word   fieldName_;
+    Type   initialResidual_;
+    Type   finalResidual_;
+    label  noIterations_;
+    bool   converged_;
+    FixedList<bool, pTraits<Type>::nComponents> singular_;
+
+
+public:
+
+    // Constructors
+
+        SolverPerformance()
+        :
+            initialResidual_(pTraits<Type>::zero),
+            finalResidual_(pTraits<Type>::zero),
+            noIterations_(0),
+            converged_(false),
+            singular_(false)
+        {}
+
+
+        SolverPerformance
+        (
+            const word&  solverName,
+            const word&  fieldName,
+            const Type&  iRes = pTraits<Type>::zero,
+            const Type&  fRes = pTraits<Type>::zero,
+            const label  nIter = 0,
+            const bool   converged = false,
+            const bool   singular = false
+        )
+        :
+            solverName_(solverName),
+            fieldName_(fieldName),
+            initialResidual_(iRes),
+            finalResidual_(fRes),
+            noIterations_(nIter),
+            converged_(converged),
+            singular_(singular)
+        {}
+
+
+    // Member functions
+
+        //- Return solver name
+        const word& solverName() const
+        {
+            return solverName_;
+        }
+
+        //- Return solver name
+        word& solverName()
+        {
+            return solverName_;
+        }
+
+
+        //- Return field name
+        const word& fieldName() const
+        {
+            return fieldName_;
+        }
+
+
+        //- Return initial residual
+        const Type& initialResidual() const
+        {
+            return initialResidual_;
+        }
+
+        //- Return initial residual
+        Type& initialResidual()
+        {
+            return initialResidual_;
+        }
+
+
+        //- Return final residual
+        const Type& finalResidual() const
+        {
+            return finalResidual_;
+        }
+
+        //- Return final residual
+        Type& finalResidual()
+        {
+            return finalResidual_;
+        }
+
+
+        //- Return number of iterations
+        label nIterations() const
+        {
+            return noIterations_;
+        }
+
+        //- Return number of iterations
+        label& nIterations()
+        {
+            return noIterations_;
+        }
+
+
+        //- Has the solver converged?
+        bool converged() const
+        {
+            return converged_;
+        }
+
+        //- Is the matrix singular?
+        bool singular() const;
+
+        //- Check, store and return convergence
+        bool converged
+        (
+            const Type& tolerance,
+            const Type& relTolerance
+        );
+
+        //- Singularity test
+        bool checkSingularity(const Type& residual);
+
+        //- Print summary of solver performance to the given stream
+        void print(Ostream& os) const;
+
+
+    // Member Operators
+
+        bool operator!=(const SolverPerformance<Type>&) const;
+
+
+    // Friend functions
+
+        //- Return the element-wise maximum of two SolverPerformance<Type>s
+        friend SolverPerformance<Type> max <Type>
+        (
+            const SolverPerformance<Type>&,
+            const SolverPerformance<Type>&
+        );
+
+
+    // Ostream Operator
+
+        friend Istream& operator>> <Type>
+        (
+            Istream&,
+            SolverPerformance<Type>&
+        );
+
+        friend Ostream& operator<< <Type>
+        (
+            Ostream&,
+            const SolverPerformance<Type>&
+        );
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+//#   include "SolverPerformance.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/matrices/LduMatrix/Solvers/DiagonalSolver/DiagonalSolver.C b/src/OpenFOAM/matrices/LduMatrix/Solvers/DiagonalSolver/DiagonalSolver.C
index af128d249a..adbe9113a2 100644
--- a/src/OpenFOAM/matrices/LduMatrix/Solvers/DiagonalSolver/DiagonalSolver.C
+++ b/src/OpenFOAM/matrices/LduMatrix/Solvers/DiagonalSolver/DiagonalSolver.C
@@ -55,7 +55,7 @@ void Foam::DiagonalSolver<Type, DType, LUType>::read
 
 
 template<class Type, class DType, class LUType>
-typename Foam::LduMatrix<Type, DType, LUType>::solverPerformance
+Foam::SolverPerformance<Type>
 Foam::DiagonalSolver<Type, DType, LUType>::solve
 (
     Field<Type>& psi
@@ -63,7 +63,7 @@ Foam::DiagonalSolver<Type, DType, LUType>::solve
 {
     psi = this->matrix_.source()/this->matrix_.diag();
 
-    return typename LduMatrix<Type, DType, LUType>::solverPerformance
+    return SolverPerformance<Type>
     (
         typeName,
         this->fieldName_,
diff --git a/src/OpenFOAM/matrices/LduMatrix/Solvers/DiagonalSolver/DiagonalSolver.H b/src/OpenFOAM/matrices/LduMatrix/Solvers/DiagonalSolver/DiagonalSolver.H
index 400891b977..b9dc537c08 100644
--- a/src/OpenFOAM/matrices/LduMatrix/Solvers/DiagonalSolver/DiagonalSolver.H
+++ b/src/OpenFOAM/matrices/LduMatrix/Solvers/DiagonalSolver/DiagonalSolver.H
@@ -83,10 +83,7 @@ public:
         void read(const dictionary& solverDict);
 
         //- Solve the matrix with this solver
-        typename LduMatrix<Type, DType, LUType>::solverPerformance solve
-        (
-            Field<Type>& psi
-        ) const;
+        virtual SolverPerformance<Type> solve(Field<Type>& psi) const;
 };
 
 
diff --git a/src/OpenFOAM/matrices/LduMatrix/Solvers/PBiCCCG/PBiCCCG.C b/src/OpenFOAM/matrices/LduMatrix/Solvers/PBiCCCG/PBiCCCG.C
index 45453ff1d0..ab0c1f4fc9 100644
--- a/src/OpenFOAM/matrices/LduMatrix/Solvers/PBiCCCG/PBiCCCG.C
+++ b/src/OpenFOAM/matrices/LduMatrix/Solvers/PBiCCCG/PBiCCCG.C
@@ -47,7 +47,7 @@ Foam::PBiCCCG<Type, DType, LUType>::PBiCCCG
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type, class DType, class LUType>
-typename Foam::LduMatrix<Type, DType, LUType>::solverPerformance
+Foam::SolverPerformance<Type>
 Foam::PBiCCCG<Type, DType, LUType>::solve
 (
     Field<Type>& psi
@@ -56,7 +56,7 @@ Foam::PBiCCCG<Type, DType, LUType>::solve
     word preconditionerName(this->controlDict_.lookup("preconditioner"));
 
     // --- Setup class containing solver performance data
-    typename LduMatrix<Type, DType, LUType>::solverPerformance solverPerf
+    SolverPerformance<Type> solverPerf
     (
         preconditionerName + typeName,
         this->fieldName_
diff --git a/src/OpenFOAM/matrices/LduMatrix/Solvers/PBiCCCG/PBiCCCG.H b/src/OpenFOAM/matrices/LduMatrix/Solvers/PBiCCCG/PBiCCCG.H
index e5363dc651..39c0e56d44 100644
--- a/src/OpenFOAM/matrices/LduMatrix/Solvers/PBiCCCG/PBiCCCG.H
+++ b/src/OpenFOAM/matrices/LduMatrix/Solvers/PBiCCCG/PBiCCCG.H
@@ -87,10 +87,7 @@ public:
     // Member Functions
 
         //- Solve the matrix with this solver
-        virtual typename LduMatrix<Type, DType, LUType>::solverPerformance solve
-        (
-            Field<Type>& psi
-        ) const;
+        virtual SolverPerformance<Type> solve(Field<Type>& psi) const;
 };
 
 
diff --git a/src/OpenFOAM/matrices/LduMatrix/Solvers/PBiCICG/PBiCICG.C b/src/OpenFOAM/matrices/LduMatrix/Solvers/PBiCICG/PBiCICG.C
index b3665f0617..c92499c9fc 100644
--- a/src/OpenFOAM/matrices/LduMatrix/Solvers/PBiCICG/PBiCICG.C
+++ b/src/OpenFOAM/matrices/LduMatrix/Solvers/PBiCICG/PBiCICG.C
@@ -47,13 +47,13 @@ Foam::PBiCICG<Type, DType, LUType>::PBiCICG
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type, class DType, class LUType>
-typename Foam::LduMatrix<Type, DType, LUType>::solverPerformance
+Foam::SolverPerformance<Type>
 Foam::PBiCICG<Type, DType, LUType>::solve(Field<Type>& psi) const
 {
     word preconditionerName(this->controlDict_.lookup("preconditioner"));
 
     // --- Setup class containing solver performance data
-    typename LduMatrix<Type, DType, LUType>::solverPerformance solverPerf
+    SolverPerformance<Type> solverPerf
     (
         preconditionerName + typeName,
         this->fieldName_
diff --git a/src/OpenFOAM/matrices/LduMatrix/Solvers/PBiCICG/PBiCICG.H b/src/OpenFOAM/matrices/LduMatrix/Solvers/PBiCICG/PBiCICG.H
index 340ae48667..1265af2aac 100644
--- a/src/OpenFOAM/matrices/LduMatrix/Solvers/PBiCICG/PBiCICG.H
+++ b/src/OpenFOAM/matrices/LduMatrix/Solvers/PBiCICG/PBiCICG.H
@@ -87,10 +87,7 @@ public:
     // Member Functions
 
         //- Solve the matrix with this solver
-        virtual typename LduMatrix<Type, DType, LUType>::solverPerformance solve
-        (
-            Field<Type>& psi
-        ) const;
+        virtual SolverPerformance<Type> solve(Field<Type>& psi) const;
 };
 
 
diff --git a/src/OpenFOAM/matrices/LduMatrix/Solvers/PCICG/PCICG.C b/src/OpenFOAM/matrices/LduMatrix/Solvers/PCICG/PCICG.C
index e6206e6116..83abd1f249 100644
--- a/src/OpenFOAM/matrices/LduMatrix/Solvers/PCICG/PCICG.C
+++ b/src/OpenFOAM/matrices/LduMatrix/Solvers/PCICG/PCICG.C
@@ -47,13 +47,13 @@ Foam::PCICG<Type, DType, LUType>::PCICG
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type, class DType, class LUType>
-typename Foam::LduMatrix<Type, DType, LUType>::solverPerformance
+typename Foam::SolverPerformance<Type>
 Foam::PCICG<Type, DType, LUType>::solve(Field<Type>& psi) const
 {
     word preconditionerName(this->controlDict_.lookup("preconditioner"));
 
     // --- Setup class containing solver performance data
-    typename LduMatrix<Type, DType, LUType>::solverPerformance solverPerf
+    SolverPerformance<Type> solverPerf
     (
         preconditionerName + typeName,
         this->fieldName_
diff --git a/src/OpenFOAM/matrices/LduMatrix/Solvers/PCICG/PCICG.H b/src/OpenFOAM/matrices/LduMatrix/Solvers/PCICG/PCICG.H
index 250cc41b9a..cafeb7f61d 100644
--- a/src/OpenFOAM/matrices/LduMatrix/Solvers/PCICG/PCICG.H
+++ b/src/OpenFOAM/matrices/LduMatrix/Solvers/PCICG/PCICG.H
@@ -87,10 +87,7 @@ public:
     // Member Functions
 
         //- Solve the matrix with this solver
-        virtual typename LduMatrix<Type, DType, LUType>::solverPerformance solve
-        (
-            Field<Type>& psi
-        ) const;
+        virtual SolverPerformance<Type> solve(Field<Type>& psi) const;
 };
 
 
diff --git a/src/OpenFOAM/matrices/LduMatrix/Solvers/SmoothSolver/SmoothSolver.C b/src/OpenFOAM/matrices/LduMatrix/Solvers/SmoothSolver/SmoothSolver.C
index e6f0241308..56ff3675e5 100644
--- a/src/OpenFOAM/matrices/LduMatrix/Solvers/SmoothSolver/SmoothSolver.C
+++ b/src/OpenFOAM/matrices/LduMatrix/Solvers/SmoothSolver/SmoothSolver.C
@@ -58,11 +58,11 @@ void Foam::SmoothSolver<Type, DType, LUType>::readControls()
 
 
 template<class Type, class DType, class LUType>
-typename Foam::LduMatrix<Type, DType, LUType>::solverPerformance
+Foam::SolverPerformance<Type>
 Foam::SmoothSolver<Type, DType, LUType>::solve(Field<Type>& psi) const
 {
     // --- Setup class containing solver performance data
-    typename LduMatrix<Type, DType, LUType>::solverPerformance solverPerf
+    SolverPerformance<Type> solverPerf
     (
         typeName,
         this->fieldName_
diff --git a/src/OpenFOAM/matrices/LduMatrix/Solvers/SmoothSolver/SmoothSolver.H b/src/OpenFOAM/matrices/LduMatrix/Solvers/SmoothSolver/SmoothSolver.H
index 3d789420b3..54db11be8c 100644
--- a/src/OpenFOAM/matrices/LduMatrix/Solvers/SmoothSolver/SmoothSolver.H
+++ b/src/OpenFOAM/matrices/LduMatrix/Solvers/SmoothSolver/SmoothSolver.H
@@ -86,10 +86,7 @@ public:
     // Member Functions
 
         //- Solve the matrix with this solver
-        virtual typename LduMatrix<Type, DType, LUType>::solverPerformance solve
-        (
-            Field<Type>& psi
-        ) const;
+        virtual SolverPerformance<Type> solve(Field<Type>& psi) const;
 };
 
 
diff --git a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.H b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.H
index f567254f86..8b72617d04 100644
--- a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.H
+++ b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.H
@@ -387,10 +387,18 @@ public:
             //  Solver controls read from fvSolution
             autoPtr<fvSolver> solver();
 
-            //- Solve returning the solution statistics.
+            //- Solve segregated or coupled returning the solution statistics.
             //  Use the given solver controls
             lduMatrix::solverPerformance solve(const dictionary&);
 
+            //- Solve segregated returning the solution statistics.
+            //  Use the given solver controls
+            lduMatrix::solverPerformance solveSegregated(const dictionary&);
+
+            //- Solve coupled returning the solution statistics.
+            //  Use the given solver controls
+            lduMatrix::solverPerformance solveCoupled(const dictionary&);
+
             //- Solve returning the solution statistics.
             //  Solver controls read from fvSolution
             lduMatrix::solverPerformance solve();
diff --git a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrixSolve.C b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrixSolve.C
index bc3fc66d01..b37bfa2d5b 100644
--- a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrixSolve.C
+++ b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrixSolve.C
@@ -23,6 +23,9 @@ License
 
 \*---------------------------------------------------------------------------*/
 
+#include "LduMatrix.H"
+#include "diagTensorField.H"
+
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
@@ -62,12 +65,51 @@ Foam::lduMatrix::solverPerformance Foam::fvMatrix<Type>::solve
             << endl;
     }
 
+    word type(solverControls.lookupOrDefault<word>("type", "segregated"));
+
+    if (type == "segregated")
+    {
+        return solveSegregated(solverControls);
+    }
+    else if (type == "coupled")
+    {
+        return solveCoupled(solverControls);
+    }
+    else
+    {
+        FatalIOErrorIn
+        (
+            "fvMatrix<Type>::solve(const dictionary& solverControls)",
+            solverControls
+        )   << "Unknown type " << type
+            << "; currently supported solver types are segregated and coupled"
+            << exit(FatalIOError);
+
+        return lduMatrix::solverPerformance();
+    }
+}
+
+
+template<class Type>
+Foam::lduMatrix::solverPerformance Foam::fvMatrix<Type>::solveSegregated
+(
+    const dictionary& solverControls
+)
+{
+    if (debug)
+    {
+        Info<< "fvMatrix<Type>::solveSegregated"
+               "(const dictionary& solverControls) : "
+               "solving fvMatrix<Type>"
+            << endl;
+    }
+
     GeometricField<Type, fvPatchField, volMesh>& psi =
        const_cast<GeometricField<Type, fvPatchField, volMesh>&>(psi_);
 
     lduMatrix::solverPerformance solverPerfVec
     (
-        "fvMatrix<Type>::solve",
+        "fvMatrix<Type>::solveSegregated",
         psi.name()
     );
 
@@ -164,6 +206,62 @@ Foam::lduMatrix::solverPerformance Foam::fvMatrix<Type>::solve
 }
 
 
+template<class Type>
+Foam::lduMatrix::solverPerformance Foam::fvMatrix<Type>::solveCoupled
+(
+    const dictionary& solverControls
+)
+{
+    if (debug)
+    {
+        Info<< "fvMatrix<Type>::solveCoupled"
+               "(const dictionary& solverControls) : "
+               "solving fvMatrix<Type>"
+            << endl;
+    }
+
+    GeometricField<Type, fvPatchField, volMesh>& psi =
+       const_cast<GeometricField<Type, fvPatchField, volMesh>&>(psi_);
+
+    LduMatrix<Type, scalar, scalar> coupledMatrix(psi.mesh());
+    coupledMatrix.diag() = diag();
+    coupledMatrix.upper() = upper();
+    coupledMatrix.lower() = lower();
+    coupledMatrix.source() = source();
+
+    addBoundaryDiag(coupledMatrix.diag(), 0);
+    addBoundarySource(coupledMatrix.source(), false);
+
+    coupledMatrix.interfaces() = psi.boundaryField().interfaces();
+    coupledMatrix.interfacesUpper() = boundaryCoeffs().component(0);
+    coupledMatrix.interfacesLower() = internalCoeffs().component(0);
+
+    autoPtr<typename LduMatrix<Type, scalar, scalar>::solver>
+    coupledMatrixSolver
+    (
+        LduMatrix<Type, scalar, scalar>::solver::New
+        (
+            psi.name(),
+            coupledMatrix,
+            solverControls
+        )
+    );
+
+    SolverPerformance<Type> solverPerf
+    (
+        coupledMatrixSolver->solve(psi)
+    );
+
+    solverPerf.print(Info);
+
+    psi.correctBoundaryConditions();
+
+    // psi.mesh().setSolverPerformance(psi.name(), solverPerf);
+
+    return lduMatrix::solverPerformance();
+}
+
+
 template<class Type>
 Foam::autoPtr<typename Foam::fvMatrix<Type>::fvSolver>
 Foam::fvMatrix<Type>::solver()
diff --git a/src/finiteVolume/fvMatrices/fvScalarMatrix/fvScalarMatrix.C b/src/finiteVolume/fvMatrices/fvScalarMatrix/fvScalarMatrix.C
index 23a259d574..aed610cd4c 100644
--- a/src/finiteVolume/fvMatrices/fvScalarMatrix/fvScalarMatrix.C
+++ b/src/finiteVolume/fvMatrices/fvScalarMatrix/fvScalarMatrix.C
@@ -130,14 +130,15 @@ Foam::lduMatrix::solverPerformance Foam::fvMatrix<Foam::scalar>::fvSolver::solve
 
 
 template<>
-Foam::lduMatrix::solverPerformance Foam::fvMatrix<Foam::scalar>::solve
+Foam::lduMatrix::solverPerformance Foam::fvMatrix<Foam::scalar>::solveSegregated
 (
     const dictionary& solverControls
 )
 {
     if (debug)
     {
-        Info<< "fvMatrix<scalar>::solve(const dictionary& solverControls) : "
+        Info<< "fvMatrix<scalar>::solveSegregated"
+               "(const dictionary& solverControls) : "
                "solving fvMatrix<scalar>"
             << endl;
     }
diff --git a/src/finiteVolume/fvMatrices/fvScalarMatrix/fvScalarMatrix.H b/src/finiteVolume/fvMatrices/fvScalarMatrix/fvScalarMatrix.H
index 072c9f2cd0..29c51a155b 100644
--- a/src/finiteVolume/fvMatrices/fvScalarMatrix/fvScalarMatrix.H
+++ b/src/finiteVolume/fvMatrices/fvScalarMatrix/fvScalarMatrix.H
@@ -68,7 +68,7 @@ lduMatrix::solverPerformance fvMatrix<scalar>::fvSolver::solve
 );
 
 template<>
-lduMatrix::solverPerformance fvMatrix<scalar>::solve
+lduMatrix::solverPerformance fvMatrix<scalar>::solveSegregated
 (
     const dictionary&
 );

From 82a5e25140d373ccdbad4f834824283e93cb5334 Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Fri, 27 Apr 2012 18:17:06 +0100
Subject: [PATCH 275/317] Updated header

---
 src/finiteVolume/fvMatrices/fvScalarMatrix/fvScalarMatrix.H | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/finiteVolume/fvMatrices/fvScalarMatrix/fvScalarMatrix.H b/src/finiteVolume/fvMatrices/fvScalarMatrix/fvScalarMatrix.H
index 29c51a155b..3a464de13b 100644
--- a/src/finiteVolume/fvMatrices/fvScalarMatrix/fvScalarMatrix.H
+++ b/src/finiteVolume/fvMatrices/fvScalarMatrix/fvScalarMatrix.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

From 5d4480e706a07eb0d420c226376a93e8c0e51aa8 Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Sun, 29 Apr 2012 22:01:57 +0100
Subject: [PATCH 276/317] Added support for gcc-4.7.0

---
 etc/config/settings.sh                        |  8 ++++++-
 src/OSspecific/POSIX/fileMonitor.C            |  1 +
 .../Solvers/SmoothSolver/SmoothSolver.C       |  2 +-
 wmake/rules/linux64Gcc47/c                    | 16 ++++++++++++++
 wmake/rules/linux64Gcc47/c++                  | 21 +++++++++++++++++++
 wmake/rules/linux64Gcc47/c++Debug             |  2 ++
 wmake/rules/linux64Gcc47/c++Opt               |  4 ++++
 wmake/rules/linux64Gcc47/c++Prof              |  2 ++
 wmake/rules/linux64Gcc47/cDebug               |  2 ++
 wmake/rules/linux64Gcc47/cOpt                 |  2 ++
 wmake/rules/linux64Gcc47/cProf                |  2 ++
 wmake/rules/linux64Gcc47/general              |  8 +++++++
 wmake/rules/linux64Gcc47/mplibHPMPI           |  3 +++
 wmake/rules/linux64Gcc47/mplibINTELMPI        |  3 +++
 14 files changed, 74 insertions(+), 2 deletions(-)
 create mode 100644 wmake/rules/linux64Gcc47/c
 create mode 100644 wmake/rules/linux64Gcc47/c++
 create mode 100644 wmake/rules/linux64Gcc47/c++Debug
 create mode 100644 wmake/rules/linux64Gcc47/c++Opt
 create mode 100644 wmake/rules/linux64Gcc47/c++Prof
 create mode 100644 wmake/rules/linux64Gcc47/cDebug
 create mode 100644 wmake/rules/linux64Gcc47/cOpt
 create mode 100644 wmake/rules/linux64Gcc47/cProf
 create mode 100644 wmake/rules/linux64Gcc47/general
 create mode 100644 wmake/rules/linux64Gcc47/mplibHPMPI
 create mode 100644 wmake/rules/linux64Gcc47/mplibINTELMPI

diff --git a/etc/config/settings.sh b/etc/config/settings.sh
index dc39c480e1..0b12e4e453 100644
--- a/etc/config/settings.sh
+++ b/etc/config/settings.sh
@@ -233,7 +233,13 @@ case "${foamCompiler}" in
 OpenFOAM | ThirdParty)
     case "$WM_COMPILER" in
     Gcc | Gcc++0x | Gcc46 | Gcc46++0x)
-        gcc_version=gcc-4.6.2
+        gcc_version=gcc-4.6.1
+        gmp_version=gmp-5.0.4
+        mpfr_version=mpfr-3.1.0
+        mpc_version=mpc-0.9
+        ;;
+    Gcc47 | Gcc47++0x)
+        gcc_version=gcc-4.7.0
         gmp_version=gmp-5.0.4
         mpfr_version=mpfr-3.1.0
         mpc_version=mpc-0.9
diff --git a/src/OSspecific/POSIX/fileMonitor.C b/src/OSspecific/POSIX/fileMonitor.C
index 31a734740d..030e7639f4 100644
--- a/src/OSspecific/POSIX/fileMonitor.C
+++ b/src/OSspecific/POSIX/fileMonitor.C
@@ -32,6 +32,7 @@ License
 #include "regIOobject.H"     // for fileModificationSkew symbol
 
 #ifdef FOAM_USE_INOTIFY
+#   include <unistd.h>
 #   include <sys/inotify.h>
 #   include <sys/ioctl.h>
 #   include <errno.h>
diff --git a/src/OpenFOAM/matrices/LduMatrix/Solvers/SmoothSolver/SmoothSolver.C b/src/OpenFOAM/matrices/LduMatrix/Solvers/SmoothSolver/SmoothSolver.C
index 56ff3675e5..9cfff0d1a3 100644
--- a/src/OpenFOAM/matrices/LduMatrix/Solvers/SmoothSolver/SmoothSolver.C
+++ b/src/OpenFOAM/matrices/LduMatrix/Solvers/SmoothSolver/SmoothSolver.C
@@ -53,7 +53,7 @@ template<class Type, class DType, class LUType>
 void Foam::SmoothSolver<Type, DType, LUType>::readControls()
 {
     LduMatrix<Type, DType, LUType>::solver::readControls();
-    readControl(this->controlDict_, nSweeps_, "nSweeps");
+    this->readControl(this->controlDict_, nSweeps_, "nSweeps");
 }
 
 
diff --git a/wmake/rules/linux64Gcc47/c b/wmake/rules/linux64Gcc47/c
new file mode 100644
index 0000000000..f4114be314
--- /dev/null
+++ b/wmake/rules/linux64Gcc47/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 --add-needed -Xlinker -z -Xlinker nodefs
diff --git a/wmake/rules/linux64Gcc47/c++ b/wmake/rules/linux64Gcc47/c++
new file mode 100644
index 0000000000..98b25ed1fe
--- /dev/null
+++ b/wmake/rules/linux64Gcc47/c++
@@ -0,0 +1,21 @@
+.SUFFIXES: .C .cxx .cc .cpp
+
+c++WARN     = -Wall -Wextra -Wno-unused-parameter -Wold-style-cast
+
+CC          = g++ -m64
+
+include $(RULES)/c++$(WM_COMPILE_OPTION)
+
+ptFLAGS     = -DNoRepository -ftemplate-depth-100
+
+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 -Xlinker --add-needed -Xlinker --no-as-needed
+LINKEXE     = $(CC) $(c++FLAGS) -Xlinker --add-needed -Xlinker --no-as-needed
diff --git a/wmake/rules/linux64Gcc47/c++Debug b/wmake/rules/linux64Gcc47/c++Debug
new file mode 100644
index 0000000000..19bdb9c334
--- /dev/null
+++ b/wmake/rules/linux64Gcc47/c++Debug
@@ -0,0 +1,2 @@
+c++DBUG    = -ggdb3 -DFULLDEBUG
+c++OPT      = -O0 -fdefault-inline
diff --git a/wmake/rules/linux64Gcc47/c++Opt b/wmake/rules/linux64Gcc47/c++Opt
new file mode 100644
index 0000000000..3446f7f58c
--- /dev/null
+++ b/wmake/rules/linux64Gcc47/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/linux64Gcc47/c++Prof b/wmake/rules/linux64Gcc47/c++Prof
new file mode 100644
index 0000000000..3bda4dad55
--- /dev/null
+++ b/wmake/rules/linux64Gcc47/c++Prof
@@ -0,0 +1,2 @@
+c++DBUG    = -pg
+c++OPT     = -O2
diff --git a/wmake/rules/linux64Gcc47/cDebug b/wmake/rules/linux64Gcc47/cDebug
new file mode 100644
index 0000000000..72b638f458
--- /dev/null
+++ b/wmake/rules/linux64Gcc47/cDebug
@@ -0,0 +1,2 @@
+cDBUG       = -ggdb -DFULLDEBUG
+cOPT        = -O1 -fdefault-inline -finline-functions
diff --git a/wmake/rules/linux64Gcc47/cOpt b/wmake/rules/linux64Gcc47/cOpt
new file mode 100644
index 0000000000..17318709f1
--- /dev/null
+++ b/wmake/rules/linux64Gcc47/cOpt
@@ -0,0 +1,2 @@
+cDBUG       =
+cOPT        = -O3
diff --git a/wmake/rules/linux64Gcc47/cProf b/wmake/rules/linux64Gcc47/cProf
new file mode 100644
index 0000000000..ca3ac9bf5f
--- /dev/null
+++ b/wmake/rules/linux64Gcc47/cProf
@@ -0,0 +1,2 @@
+cDBUG       = -pg
+cOPT        = -O2
diff --git a/wmake/rules/linux64Gcc47/general b/wmake/rules/linux64Gcc47/general
new file mode 100644
index 0000000000..4a42b11b1e
--- /dev/null
+++ b/wmake/rules/linux64Gcc47/general
@@ -0,0 +1,8 @@
+CPP        = cpp -traditional-cpp
+
+PROJECT_LIBS = -l$(WM_PROJECT) -ldl
+
+include $(GENERAL_RULES)/standard
+
+include $(RULES)/c
+include $(RULES)/c++
diff --git a/wmake/rules/linux64Gcc47/mplibHPMPI b/wmake/rules/linux64Gcc47/mplibHPMPI
new file mode 100644
index 0000000000..574492a236
--- /dev/null
+++ b/wmake/rules/linux64Gcc47/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/linux64Gcc47/mplibINTELMPI b/wmake/rules/linux64Gcc47/mplibINTELMPI
new file mode 100644
index 0000000000..cf80ec2eaf
--- /dev/null
+++ b/wmake/rules/linux64Gcc47/mplibINTELMPI
@@ -0,0 +1,3 @@
+PFLAGS     = -DMPICH_SKIP_MPICXX
+PINC       = -I$(MPI_ARCH_PATH)/include64
+PLIBS      = -L$(MPI_ARCH_PATH)/lib64 -lmpi

From af17182b3268466b7e514d23df883da2b45c17f1 Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Sun, 29 Apr 2012 22:02:15 +0100
Subject: [PATCH 277/317] LaunderSharmaKE: Minor clean-up

---
 .../compressible/RAS/LaunderSharmaKE/LaunderSharmaKE.C          | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/turbulenceModels/compressible/RAS/LaunderSharmaKE/LaunderSharmaKE.C b/src/turbulenceModels/compressible/RAS/LaunderSharmaKE/LaunderSharmaKE.C
index c7c10d0ae9..0d27e37050 100644
--- a/src/turbulenceModels/compressible/RAS/LaunderSharmaKE/LaunderSharmaKE.C
+++ b/src/turbulenceModels/compressible/RAS/LaunderSharmaKE/LaunderSharmaKE.C
@@ -320,7 +320,6 @@ void LaunderSharmaKE::correct()
         C1_*G*epsilon_/k_
       - fvm::SuSp(((2.0/3.0)*C1_ + C3_)*rho_*divU, epsilon_)
       - fvm::Sp(C2_*f2()*rho_*epsilon_/k_, epsilon_)
-    //+ 0.75*1.5*flameKproduction*epsilon_/k_
       + E
     );
 
@@ -340,7 +339,6 @@ void LaunderSharmaKE::correct()
      ==
         G - fvm::SuSp(2.0/3.0*rho_*divU, k_)
       - fvm::Sp(rho_*(epsilon_ + D)/k_, k_)
-    //+ flameKproduction
     );
 
     kEqn().relax();

From 3685e803692107a3368ffae3ceb6cf4f6cf02166 Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Sun, 29 Apr 2012 22:02:38 +0100
Subject: [PATCH 278/317] nonNewtonianIcoFoam: Added stress transpose term

---
 .../incompressible/nonNewtonianIcoFoam/nonNewtonianIcoFoam.C     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/applications/solvers/incompressible/nonNewtonianIcoFoam/nonNewtonianIcoFoam.C b/applications/solvers/incompressible/nonNewtonianIcoFoam/nonNewtonianIcoFoam.C
index b620536abb..bf12294638 100644
--- a/applications/solvers/incompressible/nonNewtonianIcoFoam/nonNewtonianIcoFoam.C
+++ b/applications/solvers/incompressible/nonNewtonianIcoFoam/nonNewtonianIcoFoam.C
@@ -61,6 +61,7 @@ int main(int argc, char *argv[])
             fvm::ddt(U)
           + fvm::div(phi, U)
           - fvm::laplacian(fluid.nu(), U)
+          - (fvc::grad(U) & fvc::grad(fluid.nu()))
         );
 
         solve(UEqn == -fvc::grad(p));

From ad6b6626e202b51f7256d7854bba54fa580fab17 Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Mon, 30 Apr 2012 16:31:09 +0100
Subject: [PATCH 279/317] Further developed support for gcc-4.7.0

---
 etc/config/settings.csh         | 7 +++++++
 wmake/rules/linux64Gcc47/c++Opt | 4 +---
 wmake/rules/linux64Gcc47/cOpt   | 2 +-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/etc/config/settings.csh b/etc/config/settings.csh
index 94e5618bff..8c9ac17c7a 100644
--- a/etc/config/settings.csh
+++ b/etc/config/settings.csh
@@ -213,6 +213,13 @@ case ThirdParty:
         set mpfr_version=mpfr-3.1.0
         set mpc_version=mpc-0.9
         breaksw
+    case Gcc47:
+    case Gcc47++0x:
+        set gcc_version=gcc-4.7.0
+        set gmp_version=gmp-5.0.4
+        set mpfr_version=mpfr-3.1.0
+        set mpc_version=mpc-0.9
+        breaksw
     case Gcc45:
     case Gcc45++0x:
         set gcc_version=gcc-4.5.2
diff --git a/wmake/rules/linux64Gcc47/c++Opt b/wmake/rules/linux64Gcc47/c++Opt
index 3446f7f58c..1c64f5b4b7 100644
--- a/wmake/rules/linux64Gcc47/c++Opt
+++ b/wmake/rules/linux64Gcc47/c++Opt
@@ -1,4 +1,2 @@
 c++DBUG     =
-c++OPT      = -O3
-#c++OPT      = -march=nocona -O3
-# -ftree-vectorize -ftree-vectorizer-verbose=3
+c++OPT      = -O2
diff --git a/wmake/rules/linux64Gcc47/cOpt b/wmake/rules/linux64Gcc47/cOpt
index 17318709f1..6650ffa4a5 100644
--- a/wmake/rules/linux64Gcc47/cOpt
+++ b/wmake/rules/linux64Gcc47/cOpt
@@ -1,2 +1,2 @@
 cDBUG       =
-cOPT        = -O3
+cOPT        = -O2

From b08b29bd3c7ad7b907def7755e52ee591962f491 Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Mon, 30 Apr 2012 18:15:26 +0100
Subject: [PATCH 280/317] LduMatrix: Further integration with lduMatrix

Replaced lduMatrix::solverPerformance with SolverPerformance<scalar>
---
 src/OpenFOAM/Make/files                       |   2 +-
 .../matrices/LduMatrix/LduMatrix/LduMatrix.C  |   1 -
 .../matrices/LduMatrix/LduMatrix/LduMatrix.H  |  19 --
 .../LduMatrix/LduMatrix/LduMatrixSolver.C     |   2 +-
 .../LduMatrix/LduMatrix/SolverPerformance.C   |  10 +-
 .../LduMatrix/LduMatrix/SolverPerformance.H   |  40 +++-
 .../LduMatrix/LduMatrix/solverPerformance.C   |  39 ++++
 .../LduMatrix/LduMatrix/solverPerformance.H   |  51 +++++
 .../LduMatrix/Solvers/PBiCCCG/PBiCCCG.C       |   4 +-
 .../LduMatrix/Solvers/PBiCICG/PBiCICG.C       |  10 +-
 .../matrices/LduMatrix/Solvers/PCICG/PCICG.C  |  10 +-
 .../Solvers/SmoothSolver/SmoothSolver.C       |   4 +-
 .../matrices/lduMatrix/lduMatrix/lduMatrix.C  |   3 -
 .../matrices/lduMatrix/lduMatrix/lduMatrix.H  | 167 +--------------
 .../lduMatrix/lduMatrix/lduMatrixSolver.C     |   6 +-
 .../lduMatrix/lduMatrix/lduMatrixTests.C      | 190 ------------------
 .../lduMatrix/solvers/GAMG/GAMGSolver.H       |   2 +-
 .../lduMatrix/solvers/GAMG/GAMGSolverSolve.C  |  10 +-
 .../matrices/lduMatrix/solvers/PBiCG/PBiCG.C  |   6 +-
 .../matrices/lduMatrix/solvers/PBiCG/PBiCG.H  |   2 +-
 .../matrices/lduMatrix/solvers/PCG/PCG.C      |   6 +-
 .../matrices/lduMatrix/solvers/PCG/PCG.H      |   2 +-
 .../solvers/diagonalSolver/diagonalSolver.C   |   4 +-
 .../solvers/diagonalSolver/diagonalSolver.H   |   2 +-
 .../solvers/smoothSolver/smoothSolver.C       |   4 +-
 .../solvers/smoothSolver/smoothSolver.H       |   2 +-
 src/OpenFOAM/meshes/data/data.C               |   8 +-
 src/OpenFOAM/meshes/data/data.H               |   6 +-
 .../pimpleControl/pimpleControl.C             |   2 +-
 .../simpleControl/simpleControl.C             |   2 +-
 .../fvMatrices/fvMatrix/fvMatrix.C            |  12 +-
 .../fvMatrices/fvMatrix/fvMatrix.H            |  20 +-
 .../fvMatrices/fvMatrix/fvMatrixSolve.C       |  20 +-
 .../fvScalarMatrix/fvScalarMatrix.C           |  12 +-
 .../fvScalarMatrix/fvScalarMatrix.H           |   4 +-
 35 files changed, 216 insertions(+), 468 deletions(-)
 create mode 100644 src/OpenFOAM/matrices/LduMatrix/LduMatrix/solverPerformance.C
 create mode 100644 src/OpenFOAM/matrices/LduMatrix/LduMatrix/solverPerformance.H
 delete mode 100644 src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixTests.C

diff --git a/src/OpenFOAM/Make/files b/src/OpenFOAM/Make/files
index 3c054e2bfd..614a7cdae5 100644
--- a/src/OpenFOAM/Make/files
+++ b/src/OpenFOAM/Make/files
@@ -240,7 +240,6 @@ lduMatrix = matrices/lduMatrix
 $(lduMatrix)/lduMatrix/lduMatrix.C
 $(lduMatrix)/lduMatrix/lduMatrixOperations.C
 $(lduMatrix)/lduMatrix/lduMatrixATmul.C
-$(lduMatrix)/lduMatrix/lduMatrixTests.C
 $(lduMatrix)/lduMatrix/lduMatrixUpdateMatrixInterfaces.C
 $(lduMatrix)/lduMatrix/lduMatrixSolver.C
 $(lduMatrix)/lduMatrix/lduMatrixSmoother.C
@@ -316,6 +315,7 @@ meshes/lduMesh/lduMesh.C
 
 LduMatrix = matrices/LduMatrix
 $(LduMatrix)/LduMatrix/lduMatrices.C
+$(LduMatrix)/LduMatrix/solverPerformance.C
 $(LduMatrix)/LduMatrix/LduInterfaceField/LduInterfaceFields.C
 $(LduMatrix)/Smoothers/lduSmoothers.C
 $(LduMatrix)/Preconditioners/lduPreconditioners.C
diff --git a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrix.C b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrix.C
index 00782ac75b..fb131308b3 100644
--- a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrix.C
+++ b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrix.C
@@ -382,7 +382,6 @@ Foam::Ostream& Foam::operator<<
 #include "LduMatrixOperations.C"
 #include "LduMatrixATmul.C"
 #include "LduMatrixUpdateMatrixInterfaces.C"
-#include "SolverPerformance.C"
 #include "LduMatrixPreconditioner.C"
 #include "LduMatrixSmoother.C"
 #include "LduMatrixSolver.C"
diff --git a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrix.H b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrix.H
index 507fd40e94..c2414b0f8b 100644
--- a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrix.H
+++ b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrix.H
@@ -460,15 +460,6 @@ public:
         // Declare name of the class and its debug switch
         ClassName("LduMatrix");
 
-        //- Large Type for the use in solvers
-        static const scalar great_;
-
-        //- Small Type for the use in solvers
-        static const scalar small_;
-
-        //- Very small Type for the use in solvers
-        static const scalar vsmall_;
-
 
     // Constructors
 
@@ -682,16 +673,6 @@ typedef Foam::LduMatrix<Type, DType, LUType>                                  \
 defineNamedTemplateTypeNameAndDebug(ldu##Type##DType##LUType##Matrix, 0);     \
                                                                               \
                                                                               \
-template<>                                                                    \
-const scalar ldu##Type##DType##LUType##Matrix::great_(1e15);                  \
-                                                                              \
-template<>                                                                    \
-const scalar ldu##Type##DType##LUType##Matrix::small_(1e-15);                 \
-                                                                              \
-template<>                                                                    \
-const scalar ldu##Type##DType##LUType##Matrix::vsmall_(VSMALL);               \
-                                                                              \
-                                                                              \
 typedef LduMatrix<Type, DType, LUType>::smoother                              \
     ldu##Type##DType##LUType##Smoother;                                       \
                                                                               \
diff --git a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixSolver.C b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixSolver.C
index c31af469f1..50831a0ec9 100644
--- a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixSolver.C
+++ b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixSolver.C
@@ -179,7 +179,7 @@ Type Foam::LduMatrix<Type, DType, LUType>::solver::normFactor
     return stabilise
     (
         gSum(cmptMag(Apsi - tmpField) + cmptMag(matrix_.source() - tmpField)),
-        matrix_.small_
+        SolverPerformance<Type>::small_
     );
 
     // At convergence this simpler method is equivalent to the above
diff --git a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/SolverPerformance.C b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/SolverPerformance.C
index a50a6e537f..62ce85abb7 100644
--- a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/SolverPerformance.C
+++ b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/SolverPerformance.C
@@ -23,7 +23,7 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "LduMatrix.H"
+#include "SolverPerformance.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -36,7 +36,7 @@ bool Foam::SolverPerformance<Type>::checkSingularity
     for(direction cmpt=0; cmpt<pTraits<Type>::nComponents; cmpt++)
     {
         singular_[cmpt] =
-            component(wApA, cmpt) < LduMatrix<scalar, scalar, scalar>::vsmall_;
+            component(wApA, cmpt) < vsmall_;
     }
 
     return singular();
@@ -56,13 +56,13 @@ bool Foam::SolverPerformance<Type>::singular() const
 
 
 template<class Type>
-bool Foam::SolverPerformance<Type>::converged
+bool Foam::SolverPerformance<Type>::checkConvergence
 (
     const Type& Tolerance,
     const Type& RelTolerance
 )
 {
-    if (LduMatrix<scalar, scalar, scalar>::debug >= 2)
+    if (debug >= 2)
     {
         Info<< solverName_
             << ":  Iteration " << noIterations_
@@ -75,7 +75,7 @@ bool Foam::SolverPerformance<Type>::converged
         finalResidual_ < Tolerance
      || (
             RelTolerance
-          > LduMatrix<scalar, scalar, scalar>::small_*pTraits<Type>::one
+          > small_*pTraits<Type>::one
          && finalResidual_ < cmptMultiply(RelTolerance, initialResidual_)
         )
     )
diff --git a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/SolverPerformance.H b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/SolverPerformance.H
index fdfd269e17..d39ecb10a8 100644
--- a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/SolverPerformance.H
+++ b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/SolverPerformance.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -93,6 +93,21 @@ class SolverPerformance
 
 public:
 
+    // Static data
+
+        // Declare name of the class and its debug switch
+        ClassName("SolverPerformance");
+
+        //- Large Type for the use in solvers
+        static const scalar great_;
+
+        //- Small Type for the use in solvers
+        static const scalar small_;
+
+        //- Very small Type for the use in solvers
+        static const scalar vsmall_;
+
+
     // Constructors
 
         SolverPerformance()
@@ -197,7 +212,7 @@ public:
         bool singular() const;
 
         //- Check, store and return convergence
-        bool converged
+        bool checkConvergence
         (
             const Type& tolerance,
             const Type& relTolerance
@@ -245,10 +260,29 @@ public:
 
 } // End namespace Foam
 
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#define makeSolverPerformance(Type)                                           \
+                                                                              \
+typedef Foam::SolverPerformance<Type>                                         \
+    solverPerformance##Type;                                                  \
+                                                                              \
+defineNamedTemplateTypeNameAndDebug(solverPerformance##Type, 0);              \
+                                                                              \
+template<>                                                                    \
+const scalar solverPerformance##Type::great_(1e20);                           \
+                                                                              \
+template<>                                                                    \
+const scalar solverPerformance##Type::small_(1e-20);                          \
+                                                                              \
+template<>                                                                    \
+const scalar solverPerformance##Type::vsmall_(VSMALL);                        \
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-//#   include "SolverPerformance.C"
+#   include "SolverPerformance.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/solverPerformance.C b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/solverPerformance.C
new file mode 100644
index 0000000000..5bac12c784
--- /dev/null
+++ b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/solverPerformance.C
@@ -0,0 +1,39 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "solverPerformance.H"
+#include "fieldTypes.H"
+
+namespace Foam
+{
+    makeSolverPerformance(scalar);
+    makeSolverPerformance(vector);
+    makeSolverPerformance(sphericalTensor);
+    makeSolverPerformance(symmTensor);
+    makeSolverPerformance(tensor);
+};
+
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/solverPerformance.H b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/solverPerformance.H
new file mode 100644
index 0000000000..139ab128b1
--- /dev/null
+++ b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/solverPerformance.H
@@ -0,0 +1,51 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Typedef
+    Foam::solverPerformance
+
+Description
+    SolverPerformance instantiated for a scalar
+
+SourceFiles
+    solverPerformance.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef solverPerformance_H
+#define solverPerformance_H
+
+#include "SolverPerformance.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    typedef SolverPerformance<scalar> solverPerformance;
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/matrices/LduMatrix/Solvers/PBiCCCG/PBiCCCG.C b/src/OpenFOAM/matrices/LduMatrix/Solvers/PBiCCCG/PBiCCCG.C
index ab0c1f4fc9..7ee6da05dc 100644
--- a/src/OpenFOAM/matrices/LduMatrix/Solvers/PBiCCCG/PBiCCCG.C
+++ b/src/OpenFOAM/matrices/LduMatrix/Solvers/PBiCCCG/PBiCCCG.C
@@ -104,7 +104,7 @@ Foam::PBiCCCG<Type, DType, LUType>::solve
     solverPerf.finalResidual() = solverPerf.initialResidual();
 
     // --- Check convergence, solve if not converged
-    if (!solverPerf.converged(this->tolerance_, this->relTol_))
+    if (!solverPerf.checkConvergence(this->tolerance_, this->relTol_))
     {
         // --- Select and construct the preconditioner
         autoPtr<typename LduMatrix<Type, DType, LUType>::preconditioner>
@@ -183,7 +183,7 @@ Foam::PBiCCCG<Type, DType, LUType>::solve
         } while
         (
             solverPerf.nIterations()++ < this->maxIter_
-        && !(solverPerf.converged(this->tolerance_, this->relTol_))
+        && !(solverPerf.checkConvergence(this->tolerance_, this->relTol_))
         );
     }
 
diff --git a/src/OpenFOAM/matrices/LduMatrix/Solvers/PBiCICG/PBiCICG.C b/src/OpenFOAM/matrices/LduMatrix/Solvers/PBiCICG/PBiCICG.C
index c92499c9fc..260daedbf0 100644
--- a/src/OpenFOAM/matrices/LduMatrix/Solvers/PBiCICG/PBiCICG.C
+++ b/src/OpenFOAM/matrices/LduMatrix/Solvers/PBiCICG/PBiCICG.C
@@ -75,7 +75,7 @@ Foam::PBiCICG<Type, DType, LUType>::solve(Field<Type>& psi) const
     Field<Type> wT(nCells);
     Type* __restrict__ wTPtr = wT.begin();
 
-    Type wArT = this->matrix_.great_*pTraits<Type>::one;
+    Type wArT = solverPerf.great_*pTraits<Type>::one;
     Type wArTold = wArT;
 
     // --- Calculate A.psi and T.psi
@@ -101,7 +101,7 @@ Foam::PBiCICG<Type, DType, LUType>::solve(Field<Type>& psi) const
     solverPerf.finalResidual() = solverPerf.initialResidual();
 
     // --- Check convergence, solve if not converged
-    if (!solverPerf.converged(this->tolerance_, this->relTol_))
+    if (!solverPerf.checkConvergence(this->tolerance_, this->relTol_))
     {
         // --- Select and construct the preconditioner
         autoPtr<typename LduMatrix<Type, DType, LUType>::preconditioner>
@@ -137,7 +137,7 @@ Foam::PBiCICG<Type, DType, LUType>::solve(Field<Type>& psi) const
                 Type beta = cmptDivide
                 (
                     wArT,
-                    stabilise(wArTold, this->matrix_.vsmall_)
+                    stabilise(wArTold, solverPerf.vsmall_)
                 );
 
                 for (register label cell=0; cell<nCells; cell++)
@@ -172,7 +172,7 @@ Foam::PBiCICG<Type, DType, LUType>::solve(Field<Type>& psi) const
             Type alpha = cmptDivide
             (
                 wArT,
-                stabilise(wApT, this->matrix_.vsmall_)
+                stabilise(wApT, solverPerf.vsmall_)
             );
 
             for (register label cell=0; cell<nCells; cell++)
@@ -188,7 +188,7 @@ Foam::PBiCICG<Type, DType, LUType>::solve(Field<Type>& psi) const
         } while
         (
             solverPerf.nIterations()++ < this->maxIter_
-        && !(solverPerf.converged(this->tolerance_, this->relTol_))
+        && !(solverPerf.checkConvergence(this->tolerance_, this->relTol_))
         );
     }
 
diff --git a/src/OpenFOAM/matrices/LduMatrix/Solvers/PCICG/PCICG.C b/src/OpenFOAM/matrices/LduMatrix/Solvers/PCICG/PCICG.C
index 83abd1f249..cc8f1d1c72 100644
--- a/src/OpenFOAM/matrices/LduMatrix/Solvers/PCICG/PCICG.C
+++ b/src/OpenFOAM/matrices/LduMatrix/Solvers/PCICG/PCICG.C
@@ -69,7 +69,7 @@ Foam::PCICG<Type, DType, LUType>::solve(Field<Type>& psi) const
     Field<Type> wA(nCells);
     Type* __restrict__ wAPtr = wA.begin();
 
-    Type wArA = this->matrix_.great_*pTraits<Type>::one;
+    Type wArA = solverPerf.great_*pTraits<Type>::one;
     Type wArAold = wArA;
 
     // --- Calculate A.psi
@@ -92,7 +92,7 @@ Foam::PCICG<Type, DType, LUType>::solve(Field<Type>& psi) const
     solverPerf.finalResidual() = solverPerf.initialResidual();
 
     // --- Check convergence, solve if not converged
-    if (!solverPerf.converged(this->tolerance_, this->relTol_))
+    if (!solverPerf.checkConvergence(this->tolerance_, this->relTol_))
     {
         // --- Select and construct the preconditioner
         autoPtr<typename LduMatrix<Type, DType, LUType>::preconditioner>
@@ -126,7 +126,7 @@ Foam::PCICG<Type, DType, LUType>::solve(Field<Type>& psi) const
                 Type beta = cmptDivide
                 (
                     wArA,
-                    stabilise(wArAold, this->matrix_.vsmall_)
+                    stabilise(wArAold, solverPerf.vsmall_)
                 );
 
                 for (register label cell=0; cell<nCells; cell++)
@@ -160,7 +160,7 @@ Foam::PCICG<Type, DType, LUType>::solve(Field<Type>& psi) const
             Type alpha = cmptDivide
             (
                 wArA,
-                stabilise(wApA, this->matrix_.vsmall_)
+                stabilise(wApA, solverPerf.vsmall_)
             );
 
             for (register label cell=0; cell<nCells; cell++)
@@ -175,7 +175,7 @@ Foam::PCICG<Type, DType, LUType>::solve(Field<Type>& psi) const
         } while
         (
             solverPerf.nIterations()++ < this->maxIter_
-        && !(solverPerf.converged(this->tolerance_, this->relTol_))
+        && !(solverPerf.checkConvergence(this->tolerance_, this->relTol_))
         );
     }
 
diff --git a/src/OpenFOAM/matrices/LduMatrix/Solvers/SmoothSolver/SmoothSolver.C b/src/OpenFOAM/matrices/LduMatrix/Solvers/SmoothSolver/SmoothSolver.C
index 9cfff0d1a3..9cf5c81223 100644
--- a/src/OpenFOAM/matrices/LduMatrix/Solvers/SmoothSolver/SmoothSolver.C
+++ b/src/OpenFOAM/matrices/LduMatrix/Solvers/SmoothSolver/SmoothSolver.C
@@ -113,7 +113,7 @@ Foam::SmoothSolver<Type, DType, LUType>::solve(Field<Type>& psi) const
 
 
         // Check convergence, solve if not converged
-        if (!solverPerf.converged(this->tolerance_, this->relTol_))
+        if (!solverPerf.checkConvergence(this->tolerance_, this->relTol_))
         {
             autoPtr<typename LduMatrix<Type, DType, LUType>::smoother>
             smootherPtr = LduMatrix<Type, DType, LUType>::smoother::New
@@ -141,7 +141,7 @@ Foam::SmoothSolver<Type, DType, LUType>::solve(Field<Type>& psi) const
             } while
             (
                 (solverPerf.nIterations() += nSweeps_) < this->maxIter_
-             && !(solverPerf.converged(this->tolerance_, this->relTol_))
+             && !(solverPerf.checkConvergence(this->tolerance_, this->relTol_))
             );
         }
     }
diff --git a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrix.C b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrix.C
index 6fb1b68d0a..70c0c9c5d7 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrix.C
+++ b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrix.C
@@ -30,9 +30,6 @@ License
 
 defineTypeNameAndDebug(Foam::lduMatrix, 1);
 
-const Foam::scalar Foam::lduMatrix::great_ = 1.0e+20;
-const Foam::scalar Foam::lduMatrix::small_ = 1.0e-20;
-
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrix.H b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrix.H
index ae7438b937..ec5d7a89d5 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrix.H
+++ b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrix.H
@@ -57,6 +57,7 @@ SourceFiles
 #include "typeInfo.H"
 #include "autoPtr.H"
 #include "runTimeSelectionTables.H"
+#include "solverPerformance.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -86,166 +87,6 @@ class lduMatrix
 
 public:
 
-    //- Class returned by the solver, containing performance statistics
-    class solverPerformance
-    {
-        word   solverName_;
-        word   fieldName_;
-        scalar initialResidual_;
-        scalar finalResidual_;
-        label  noIterations_;
-        bool   converged_;
-        bool   singular_;
-
-
-    public:
-
-        // Constructors
-
-            //- Construct null
-            solverPerformance()
-            :
-                initialResidual_(0),
-                finalResidual_(0),
-                noIterations_(0),
-                converged_(false),
-                singular_(false)
-            {}
-
-            //- Construct from components
-            solverPerformance
-            (
-                const word&  solverName,
-                const word&  fieldName,
-                const scalar iRes = 0,
-                const scalar fRes = 0,
-                const label  nIter = 0,
-                const bool   converged = false,
-                const bool   singular = false
-            )
-            :
-                solverName_(solverName),
-                fieldName_(fieldName),
-                initialResidual_(iRes),
-                finalResidual_(fRes),
-                noIterations_(nIter),
-                converged_(converged),
-                singular_(singular)
-            {}
-
-            //- Construct from Istream
-            solverPerformance(Istream&);
-
-
-        // Member functions
-
-            //- Return solver name
-            const word& solverName() const
-            {
-                return solverName_;
-            }
-
-            //- Return solver name
-            word& solverName()
-            {
-                return solverName_;
-            }
-
-
-            //- Return field name
-            const word& fieldName() const
-            {
-                return fieldName_;
-            }
-
-
-            //- Return initial residual
-            scalar initialResidual() const
-            {
-                return initialResidual_;
-            }
-
-            //- Return initial residual
-            scalar& initialResidual()
-            {
-                return initialResidual_;
-            }
-
-
-            //- Return final residual
-            scalar finalResidual() const
-            {
-                return finalResidual_;
-            }
-
-            //- Return final residual
-            scalar& finalResidual()
-            {
-                return finalResidual_;
-            }
-
-
-            //- Return number of iterations
-            label nIterations() const
-            {
-                return noIterations_;
-            }
-
-            //- Return number of iterations
-            label& nIterations()
-            {
-                return noIterations_;
-            }
-
-
-            //- Has the solver converged?
-            bool converged() const
-            {
-                return converged_;
-            }
-
-            //- Is the matrix singular?
-            bool singular() const
-            {
-                return singular_;
-            }
-
-            //- Check, store and return convergence
-            bool checkConvergence
-            (
-                const scalar tolerance,
-                const scalar relTolerance
-            );
-
-            //- Singularity test
-            bool checkSingularity(const scalar residual);
-
-            //- Print summary of solver performance
-            void print() const;
-
-
-        // Member Operators
-
-            bool operator!=(const solverPerformance&) const;
-
-
-        // Friend functions
-
-            //- Return the element-wise maximum of two solverPerformances
-            friend solverPerformance max
-            (
-                const solverPerformance&,
-                const solverPerformance&
-            );
-
-
-        // Ostream Operator
-
-            friend Istream& operator>>(Istream&, solverPerformance&);
-            friend Ostream& operator<<(Ostream&, const solverPerformance&);
-    };
-
-
     //- Abstract base-class for lduMatrix solvers
     class solver
     {
@@ -670,12 +511,6 @@ public:
         // Declare name of the class and its debug switch
         ClassName("lduMatrix");
 
-        //- Large scalar for the use in solvers
-        static const scalar great_;
-
-        //- Small scalar for the use in solvers
-        static const scalar small_;
-
 
     // Constructors
 
diff --git a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixSolver.C b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixSolver.C
index 0381db1b89..b7b4b4e1bb 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixSolver.C
+++ b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixSolver.C
@@ -188,10 +188,12 @@ Foam::scalar Foam::lduMatrix::solver::normFactor
     matrix_.sumA(tmpField, interfaceBouCoeffs_, interfaces_);
     tmpField *= gAverage(psi);
 
-    return gSum(mag(Apsi - tmpField) + mag(source - tmpField)) + matrix_.small_;
+    return
+        gSum(mag(Apsi - tmpField) + mag(source - tmpField))
+      + solverPerformance::small_;
 
     // At convergence this simpler method is equivalent to the above
-    // return 2*gSumMag(source) + matrix_.small_;
+    // return 2*gSumMag(source) + solverPerformance::small_;
 }
 
 
diff --git a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixTests.C b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixTests.C
deleted file mode 100644
index e9294d6a22..0000000000
--- a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixTests.C
+++ /dev/null
@@ -1,190 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-Description
-    Convergence and singularity tests for solvers.
-
-\*---------------------------------------------------------------------------*/
-
-#include "lduMatrix.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-Foam::lduMatrix::solverPerformance::solverPerformance(Istream& is)
-{
-    is  >> *this;
-}
-
-
-bool Foam::lduMatrix::solverPerformance::checkConvergence
-(
-    const scalar Tolerance,
-    const scalar RelTolerance
-)
-{
-    if (debug >= 2)
-    {
-        Info<< solverName_
-            << ":  Iteration " << noIterations_
-            << " residual = " << finalResidual_
-            << endl;
-    }
-
-    if
-    (
-        finalResidual_ < Tolerance
-     || (
-            RelTolerance > SMALL
-         && finalResidual_ <= RelTolerance*initialResidual_
-        )
-  // || (solverName == "symSolve" && iter == 0)
-    )
-    {
-        converged_ = true;
-    }
-    else
-    {
-        converged_ = false;
-    }
-
-    return converged_;
-}
-
-
-bool Foam::lduMatrix::solverPerformance::checkSingularity
-(
-    const scalar residual
-)
-{
-    if (residual > VSMALL)
-    {
-        singular_ = false;
-    }
-    else
-    {
-        singular_ = true;
-    }
-
-    return singular_;
-}
-
-
-void Foam::lduMatrix::solverPerformance::print() const
-{
-    if (debug)
-    {
-        Info<< solverName_ << ":  Solving for " << fieldName_;
-
-        if (singular())
-        {
-            Info<< ":  solution singularity" << endl;
-        }
-        else
-        {
-            Info<< ", Initial residual = " << initialResidual_
-                << ", Final residual = " << finalResidual_
-                << ", No Iterations " << noIterations_
-                << endl;
-        }
-    }
-}
-
-
-bool Foam::lduMatrix::solverPerformance::operator!=
-(
-    const lduMatrix::solverPerformance& sp
-) const
-{
-    return
-    (
-        solverName()      != sp.solverName()
-     || fieldName()       != sp.fieldName()
-     || initialResidual() != sp.initialResidual()
-     || finalResidual()   != sp.finalResidual()
-     || nIterations()     != sp.nIterations()
-     || converged()       != sp.converged()
-     || singular()        != sp.singular()
-    );
-}
-
-
-Foam::lduMatrix::solverPerformance Foam::max
-(
-    const lduMatrix::solverPerformance& sp1,
-    const lduMatrix::solverPerformance& sp2
-)
-{
-    return lduMatrix::solverPerformance
-    (
-        sp1.solverName(),
-        sp1.fieldName_,
-        max(sp1.initialResidual(), sp2.initialResidual()),
-        max(sp1.finalResidual(), sp2.finalResidual()),
-        max(sp1.nIterations(), sp2.nIterations()),
-        sp1.converged() && sp2.converged(),
-        sp1.singular() || sp2.singular()
-    );
-}
-
-
-Foam::Istream& Foam::operator>>
-(
-    Istream& is,
-    Foam::lduMatrix::solverPerformance& sp
-)
-{
-    is.readBeginList("lduMatrix::solverPerformance");
-    is  >> sp.solverName_
-        >> sp.fieldName_
-        >> sp.initialResidual_
-        >> sp.finalResidual_
-        >> sp.noIterations_
-        >> sp.converged_
-        >> sp.singular_;
-    is.readEndList("lduMatrix::solverPerformance");
-
-    return is;
-}
-
-
-Foam::Ostream& Foam::operator<<
-(
-    Ostream& os,
-    const Foam::lduMatrix::solverPerformance& sp
-)
-{
-    os  << token::BEGIN_LIST
-        << sp.solverName_ << token::SPACE
-        << sp.fieldName_ << token::SPACE
-        << sp.initialResidual_ << token::SPACE
-        << sp.finalResidual_ << token::SPACE
-        << sp.noIterations_ << token::SPACE
-        << sp.converged_ << token::SPACE
-        << sp.singular_ << token::SPACE
-        << token::END_LIST;
-
-    return os;
-}
-
-
-// ************************************************************************* //
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolver.H b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolver.H
index 27094885e6..78278a6db2 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolver.H
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolver.H
@@ -229,7 +229,7 @@ public:
     // Member Functions
 
         //- Solve
-        virtual lduMatrix::solverPerformance solve
+        virtual solverPerformance solve
         (
             scalarField& psi,
             const scalarField& source,
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolverSolve.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolverSolve.C
index e0574e5895..a8dd83f3ca 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolverSolve.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolverSolve.C
@@ -30,7 +30,7 @@ License
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-Foam::lduMatrix::solverPerformance Foam::GAMGSolver::solve
+Foam::solverPerformance Foam::GAMGSolver::solve
 (
     scalarField& psi,
     const scalarField& source,
@@ -38,7 +38,7 @@ Foam::lduMatrix::solverPerformance Foam::GAMGSolver::solve
 ) const
 {
     // Setup class containing solver performance data
-    lduMatrix::solverPerformance solverPerf(typeName, fieldName_);
+    solverPerformance solverPerf(typeName, fieldName_);
 
     // Calculate A.psi used to calculate the initial residual
     scalarField Apsi(psi.size());
@@ -103,7 +103,7 @@ Foam::lduMatrix::solverPerformance Foam::GAMGSolver::solve
 
             if (debug >= 2)
             {
-                solverPerf.print();
+                solverPerf.print(Info);
             }
         } while
         (
@@ -429,7 +429,7 @@ void Foam::GAMGSolver::solveCoarsestLevel
     {
         const label coarsestLevel = matrixLevels_.size() - 1;
         coarsestCorrField = 0;
-        lduMatrix::solverPerformance coarseSolverPerf;
+        solverPerformance coarseSolverPerf;
 
         if (matrixLevels_[coarsestLevel].asymmetric())
         {
@@ -468,7 +468,7 @@ void Foam::GAMGSolver::solveCoarsestLevel
 
         if (debug >= 2)
         {
-            coarseSolverPerf.print();
+            coarseSolverPerf.print(Info);
         }
     }
 }
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/PBiCG/PBiCG.C b/src/OpenFOAM/matrices/lduMatrix/solvers/PBiCG/PBiCG.C
index d47b606c24..8f224f85e7 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/PBiCG/PBiCG.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/PBiCG/PBiCG.C
@@ -62,7 +62,7 @@ Foam::PBiCG::PBiCG
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-Foam::lduMatrix::solverPerformance Foam::PBiCG::solve
+Foam::solverPerformance Foam::PBiCG::solve
 (
     scalarField& psi,
     const scalarField& source,
@@ -70,7 +70,7 @@ Foam::lduMatrix::solverPerformance Foam::PBiCG::solve
 ) const
 {
     // --- Setup class containing solver performance data
-    lduMatrix::solverPerformance solverPerf
+    solverPerformance solverPerf
     (
         lduMatrix::preconditioner::getName(controlDict_) + typeName,
         fieldName_
@@ -92,7 +92,7 @@ Foam::lduMatrix::solverPerformance Foam::PBiCG::solve
     scalarField wT(nCells);
     scalar* __restrict__ wTPtr = wT.begin();
 
-    scalar wArT = matrix_.great_;
+    scalar wArT = solverPerf.great_;
     scalar wArTold = wArT;
 
     // --- Calculate A.psi and T.psi
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/PBiCG/PBiCG.H b/src/OpenFOAM/matrices/lduMatrix/solvers/PBiCG/PBiCG.H
index 7479f75cc5..ff6e56dd6e 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/PBiCG/PBiCG.H
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/PBiCG/PBiCG.H
@@ -88,7 +88,7 @@ public:
     // Member Functions
 
         //- Solve the matrix with this solver
-        virtual lduMatrix::solverPerformance solve
+        virtual solverPerformance solve
         (
             scalarField& psi,
             const scalarField& source,
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/PCG/PCG.C b/src/OpenFOAM/matrices/lduMatrix/solvers/PCG/PCG.C
index 37233afb71..9522848b5f 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/PCG/PCG.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/PCG/PCG.C
@@ -62,7 +62,7 @@ Foam::PCG::PCG
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-Foam::lduMatrix::solverPerformance Foam::PCG::solve
+Foam::solverPerformance Foam::PCG::solve
 (
     scalarField& psi,
     const scalarField& source,
@@ -70,7 +70,7 @@ Foam::lduMatrix::solverPerformance Foam::PCG::solve
 ) const
 {
     // --- Setup class containing solver performance data
-    lduMatrix::solverPerformance solverPerf
+    solverPerformance solverPerf
     (
         lduMatrix::preconditioner::getName(controlDict_) + typeName,
         fieldName_
@@ -86,7 +86,7 @@ Foam::lduMatrix::solverPerformance Foam::PCG::solve
     scalarField wA(nCells);
     scalar* __restrict__ wAPtr = wA.begin();
 
-    scalar wArA = matrix_.great_;
+    scalar wArA = solverPerf.great_;
     scalar wArAold = wArA;
 
     // --- Calculate A.psi
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/PCG/PCG.H b/src/OpenFOAM/matrices/lduMatrix/solvers/PCG/PCG.H
index 7aca613184..da0a432645 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/PCG/PCG.H
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/PCG/PCG.H
@@ -88,7 +88,7 @@ public:
     // Member Functions
 
         //- Solve the matrix with this solver
-        virtual lduMatrix::solverPerformance solve
+        virtual solverPerformance solve
         (
             scalarField& psi,
             const scalarField& source,
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/diagonalSolver/diagonalSolver.C b/src/OpenFOAM/matrices/lduMatrix/solvers/diagonalSolver/diagonalSolver.C
index fd03af39e7..6103697537 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/diagonalSolver/diagonalSolver.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/diagonalSolver/diagonalSolver.C
@@ -56,7 +56,7 @@ Foam::diagonalSolver::diagonalSolver
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-Foam::lduMatrix::solverPerformance Foam::diagonalSolver::solve
+Foam::solverPerformance Foam::diagonalSolver::solve
 (
     scalarField& psi,
     const scalarField& source,
@@ -65,7 +65,7 @@ Foam::lduMatrix::solverPerformance Foam::diagonalSolver::solve
 {
     psi = source/matrix_.diag();
 
-    return lduMatrix::solverPerformance
+    return solverPerformance
     (
         typeName,
         fieldName_,
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/diagonalSolver/diagonalSolver.H b/src/OpenFOAM/matrices/lduMatrix/solvers/diagonalSolver/diagonalSolver.H
index 1d67155e8c..e532eef010 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/diagonalSolver/diagonalSolver.H
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/diagonalSolver/diagonalSolver.H
@@ -86,7 +86,7 @@ public:
         {}
 
         //- Solve the matrix with this solver
-        lduMatrix::solverPerformance solve
+        solverPerformance solve
         (
             scalarField& psi,
             const scalarField& source,
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/smoothSolver/smoothSolver.C b/src/OpenFOAM/matrices/lduMatrix/solvers/smoothSolver/smoothSolver.C
index 05597a3b66..56d244c230 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/smoothSolver/smoothSolver.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/smoothSolver/smoothSolver.C
@@ -74,7 +74,7 @@ void Foam::smoothSolver::readControls()
 }
 
 
-Foam::lduMatrix::solverPerformance Foam::smoothSolver::solve
+Foam::solverPerformance Foam::smoothSolver::solve
 (
     scalarField& psi,
     const scalarField& source,
@@ -82,7 +82,7 @@ Foam::lduMatrix::solverPerformance Foam::smoothSolver::solve
 ) const
 {
     // Setup class containing solver performance data
-    lduMatrix::solverPerformance solverPerf(typeName, fieldName_);
+    solverPerformance solverPerf(typeName, fieldName_);
 
     // If the nSweeps_ is negative do a fixed number of sweeps
     if (nSweeps_ < 0)
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/smoothSolver/smoothSolver.H b/src/OpenFOAM/matrices/lduMatrix/solvers/smoothSolver/smoothSolver.H
index ec62305803..57e58f4d28 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/smoothSolver/smoothSolver.H
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/smoothSolver/smoothSolver.H
@@ -92,7 +92,7 @@ public:
     // Member Functions
 
         //- Solve the matrix with this solver
-        virtual lduMatrix::solverPerformance solve
+        virtual solverPerformance solve
         (
             scalarField& psi,
             const scalarField& source,
diff --git a/src/OpenFOAM/meshes/data/data.C b/src/OpenFOAM/meshes/data/data.C
index 7540482cfe..e92406bf71 100644
--- a/src/OpenFOAM/meshes/data/data.C
+++ b/src/OpenFOAM/meshes/data/data.C
@@ -25,7 +25,7 @@ License
 
 #include "data.H"
 #include "Time.H"
-#include "lduMatrix.H"
+#include "solverPerformance.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
@@ -63,12 +63,12 @@ const Foam::dictionary& Foam::data::solverPerformanceDict() const
 void Foam::data::setSolverPerformance
 (
     const word& name,
-    const lduMatrix::solverPerformance& sp
+    const solverPerformance& sp
 ) const
 {
     dictionary& dict = const_cast<dictionary&>(solverPerformanceDict());
 
-    List<lduMatrix::solverPerformance> perfs;
+    List<solverPerformance> perfs;
 
     if (prevTimeIndex_ != this->time().timeIndex())
     {
@@ -90,7 +90,7 @@ void Foam::data::setSolverPerformance
 
 void Foam::data::setSolverPerformance
 (
-    const lduMatrix::solverPerformance& sp
+    const solverPerformance& sp
 ) const
 {
     setSolverPerformance(sp.fieldName(), sp);
diff --git a/src/OpenFOAM/meshes/data/data.H b/src/OpenFOAM/meshes/data/data.H
index 31ce391acb..1b55206dd3 100644
--- a/src/OpenFOAM/meshes/data/data.H
+++ b/src/OpenFOAM/meshes/data/data.H
@@ -39,7 +39,7 @@ SourceFiles
 #define data_H
 
 #include "IOdictionary.H"
-#include "lduMatrix.H"
+#include "solverPerformance.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -94,13 +94,13 @@ public:
             void setSolverPerformance
             (
                 const word& name,
-                const lduMatrix::solverPerformance&
+                const solverPerformance&
             ) const;
 
             //- Add/set the solverPerformance entry, using its fieldName
             void setSolverPerformance
             (
-                const lduMatrix::solverPerformance&
+                const solverPerformance&
             ) const;
 };
 
diff --git a/src/finiteVolume/cfdTools/general/solutionControl/pimpleControl/pimpleControl.C b/src/finiteVolume/cfdTools/general/solutionControl/pimpleControl/pimpleControl.C
index 4cd984f0cc..2c89cc4cae 100644
--- a/src/finiteVolume/cfdTools/general/solutionControl/pimpleControl/pimpleControl.C
+++ b/src/finiteVolume/cfdTools/general/solutionControl/pimpleControl/pimpleControl.C
@@ -70,7 +70,7 @@ bool Foam::pimpleControl::criteriaSatisfied()
         const label fieldI = applyToField(variableName);
         if (fieldI != -1)
         {
-            const List<lduMatrix::solverPerformance> sp(iter().stream());
+            const List<solverPerformance> sp(iter().stream());
             const scalar residual = sp.last().initialResidual();
 
             checked = true;
diff --git a/src/finiteVolume/cfdTools/general/solutionControl/simpleControl/simpleControl.C b/src/finiteVolume/cfdTools/general/solutionControl/simpleControl/simpleControl.C
index b944f38b8f..50d8c86a85 100644
--- a/src/finiteVolume/cfdTools/general/solutionControl/simpleControl/simpleControl.C
+++ b/src/finiteVolume/cfdTools/general/solutionControl/simpleControl/simpleControl.C
@@ -59,7 +59,7 @@ bool Foam::simpleControl::criteriaSatisfied()
         const label fieldI = applyToField(variableName);
         if (fieldI != -1)
         {
-            const List<lduMatrix::solverPerformance> sp(iter().stream());
+            const List<solverPerformance> sp(iter().stream());
             const scalar residual = sp.first().initialResidual();
 
             checked = true;
diff --git a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C
index a69f7f5add..3e65f5d1c2 100644
--- a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C
+++ b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C
@@ -1377,7 +1377,7 @@ void Foam::checkMethod
 
 
 template<class Type>
-Foam::lduMatrix::solverPerformance Foam::solve
+Foam::solverPerformance Foam::solve
 (
     fvMatrix<Type>& fvm,
     const dictionary& solverControls
@@ -1387,13 +1387,13 @@ Foam::lduMatrix::solverPerformance Foam::solve
 }
 
 template<class Type>
-Foam::lduMatrix::solverPerformance Foam::solve
+Foam::solverPerformance Foam::solve
 (
     const tmp<fvMatrix<Type> >& tfvm,
     const dictionary& solverControls
 )
 {
-    lduMatrix::solverPerformance solverPerf =
+    solverPerformance solverPerf =
         const_cast<fvMatrix<Type>&>(tfvm()).solve(solverControls);
 
     tfvm.clear();
@@ -1403,15 +1403,15 @@ Foam::lduMatrix::solverPerformance Foam::solve
 
 
 template<class Type>
-Foam::lduMatrix::solverPerformance Foam::solve(fvMatrix<Type>& fvm)
+Foam::solverPerformance Foam::solve(fvMatrix<Type>& fvm)
 {
     return fvm.solve();
 }
 
 template<class Type>
-Foam::lduMatrix::solverPerformance Foam::solve(const tmp<fvMatrix<Type> >& tfvm)
+Foam::solverPerformance Foam::solve(const tmp<fvMatrix<Type> >& tfvm)
 {
-    lduMatrix::solverPerformance solverPerf =
+    solverPerformance solverPerf =
         const_cast<fvMatrix<Type>&>(tfvm()).solve();
 
     tfvm.clear();
diff --git a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.H b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.H
index 8b72617d04..ce214e60c8 100644
--- a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.H
+++ b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.H
@@ -239,11 +239,11 @@ public:
 
             //- Solve returning the solution statistics.
             //  Use the given solver controls
-            lduMatrix::solverPerformance solve(const dictionary&);
+            solverPerformance solve(const dictionary&);
 
             //- Solve returning the solution statistics.
             //  Solver controls read from fvSolution
-            lduMatrix::solverPerformance solve();
+            solverPerformance solve();
     };
 
 
@@ -389,19 +389,19 @@ public:
 
             //- Solve segregated or coupled returning the solution statistics.
             //  Use the given solver controls
-            lduMatrix::solverPerformance solve(const dictionary&);
+            solverPerformance solve(const dictionary&);
 
             //- Solve segregated returning the solution statistics.
             //  Use the given solver controls
-            lduMatrix::solverPerformance solveSegregated(const dictionary&);
+            solverPerformance solveSegregated(const dictionary&);
 
             //- Solve coupled returning the solution statistics.
             //  Use the given solver controls
-            lduMatrix::solverPerformance solveCoupled(const dictionary&);
+            solverPerformance solveCoupled(const dictionary&);
 
             //- Solve returning the solution statistics.
             //  Solver controls read from fvSolution
-            lduMatrix::solverPerformance solve();
+            solverPerformance solve();
 
             //- Return the matrix residual
             tmp<Field<Type> > residual() const;
@@ -550,14 +550,14 @@ void checkMethod
 //- Solve returning the solution statistics given convergence tolerance
 //  Use the given solver controls
 template<class Type>
-lduMatrix::solverPerformance solve(fvMatrix<Type>&, const dictionary&);
+solverPerformance solve(fvMatrix<Type>&, const dictionary&);
 
 
 //- Solve returning the solution statistics given convergence tolerance,
 //  deleting temporary matrix after solution.
 //  Use the given solver controls
 template<class Type>
-lduMatrix::solverPerformance solve
+solverPerformance solve
 (
     const tmp<fvMatrix<Type> >&,
     const dictionary&
@@ -567,14 +567,14 @@ lduMatrix::solverPerformance solve
 //- Solve returning the solution statistics given convergence tolerance
 //  Solver controls read fvSolution
 template<class Type>
-lduMatrix::solverPerformance solve(fvMatrix<Type>&);
+solverPerformance solve(fvMatrix<Type>&);
 
 
 //- Solve returning the solution statistics given convergence tolerance,
 //  deleting temporary matrix after solution.
 //  Solver controls read fvSolution
 template<class Type>
-lduMatrix::solverPerformance solve(const tmp<fvMatrix<Type> >&);
+solverPerformance solve(const tmp<fvMatrix<Type> >&);
 
 
 //- Return the correction form of the given matrix
diff --git a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrixSolve.C b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrixSolve.C
index b37bfa2d5b..0cd882fe54 100644
--- a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrixSolve.C
+++ b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrixSolve.C
@@ -53,7 +53,7 @@ void Foam::fvMatrix<Type>::setComponentReference
 
 
 template<class Type>
-Foam::lduMatrix::solverPerformance Foam::fvMatrix<Type>::solve
+Foam::solverPerformance Foam::fvMatrix<Type>::solve
 (
     const dictionary& solverControls
 )
@@ -85,13 +85,13 @@ Foam::lduMatrix::solverPerformance Foam::fvMatrix<Type>::solve
             << "; currently supported solver types are segregated and coupled"
             << exit(FatalIOError);
 
-        return lduMatrix::solverPerformance();
+        return solverPerformance();
     }
 }
 
 
 template<class Type>
-Foam::lduMatrix::solverPerformance Foam::fvMatrix<Type>::solveSegregated
+Foam::solverPerformance Foam::fvMatrix<Type>::solveSegregated
 (
     const dictionary& solverControls
 )
@@ -107,7 +107,7 @@ Foam::lduMatrix::solverPerformance Foam::fvMatrix<Type>::solveSegregated
     GeometricField<Type, fvPatchField, volMesh>& psi =
        const_cast<GeometricField<Type, fvPatchField, volMesh>&>(psi_);
 
-    lduMatrix::solverPerformance solverPerfVec
+    solverPerformance solverPerfVec
     (
         "fvMatrix<Type>::solveSegregated",
         psi.name()
@@ -176,7 +176,7 @@ Foam::lduMatrix::solverPerformance Foam::fvMatrix<Type>::solveSegregated
             cmpt
         );
 
-        lduMatrix::solverPerformance solverPerf;
+        solverPerformance solverPerf;
 
         // Solver call
         solverPerf = lduMatrix::solver::New
@@ -189,7 +189,7 @@ Foam::lduMatrix::solverPerformance Foam::fvMatrix<Type>::solveSegregated
             solverControls
         )->solve(psiCmpt, sourceCmpt, cmpt);
 
-        solverPerf.print();
+        solverPerf.print(Info);
 
         solverPerfVec = max(solverPerfVec, solverPerf);
         solverPerfVec.solverName() = solverPerf.solverName();
@@ -207,7 +207,7 @@ Foam::lduMatrix::solverPerformance Foam::fvMatrix<Type>::solveSegregated
 
 
 template<class Type>
-Foam::lduMatrix::solverPerformance Foam::fvMatrix<Type>::solveCoupled
+Foam::solverPerformance Foam::fvMatrix<Type>::solveCoupled
 (
     const dictionary& solverControls
 )
@@ -258,7 +258,7 @@ Foam::lduMatrix::solverPerformance Foam::fvMatrix<Type>::solveCoupled
 
     // psi.mesh().setSolverPerformance(psi.name(), solverPerf);
 
-    return lduMatrix::solverPerformance();
+    return solverPerformance();
 }
 
 
@@ -281,7 +281,7 @@ Foam::fvMatrix<Type>::solver()
 
 
 template<class Type>
-Foam::lduMatrix::solverPerformance Foam::fvMatrix<Type>::fvSolver::solve()
+Foam::solverPerformance Foam::fvMatrix<Type>::fvSolver::solve()
 {
     return solve
     (
@@ -298,7 +298,7 @@ Foam::lduMatrix::solverPerformance Foam::fvMatrix<Type>::fvSolver::solve()
 
 
 template<class Type>
-Foam::lduMatrix::solverPerformance Foam::fvMatrix<Type>::solve()
+Foam::solverPerformance Foam::fvMatrix<Type>::solve()
 {
     return solve
     (
diff --git a/src/finiteVolume/fvMatrices/fvScalarMatrix/fvScalarMatrix.C b/src/finiteVolume/fvMatrices/fvScalarMatrix/fvScalarMatrix.C
index aed610cd4c..bd75991ca9 100644
--- a/src/finiteVolume/fvMatrices/fvScalarMatrix/fvScalarMatrix.C
+++ b/src/finiteVolume/fvMatrices/fvScalarMatrix/fvScalarMatrix.C
@@ -93,7 +93,7 @@ Foam::fvMatrix<Foam::scalar>::solver
 
 
 template<>
-Foam::lduMatrix::solverPerformance Foam::fvMatrix<Foam::scalar>::fvSolver::solve
+Foam::solverPerformance Foam::fvMatrix<Foam::scalar>::fvSolver::solve
 (
     const dictionary& solverControls
 )
@@ -111,13 +111,13 @@ Foam::lduMatrix::solverPerformance Foam::fvMatrix<Foam::scalar>::fvSolver::solve
     // assign new solver controls
     solver_->read(solverControls);
 
-    lduMatrix::solverPerformance solverPerf = solver_->solve
+    solverPerformance solverPerf = solver_->solve
     (
         psi.internalField(),
         totalSource
     );
 
-    solverPerf.print();
+    solverPerf.print(Info);
 
     fvMat_.diag() = saveDiag;
 
@@ -130,7 +130,7 @@ Foam::lduMatrix::solverPerformance Foam::fvMatrix<Foam::scalar>::fvSolver::solve
 
 
 template<>
-Foam::lduMatrix::solverPerformance Foam::fvMatrix<Foam::scalar>::solveSegregated
+Foam::solverPerformance Foam::fvMatrix<Foam::scalar>::solveSegregated
 (
     const dictionary& solverControls
 )
@@ -153,7 +153,7 @@ Foam::lduMatrix::solverPerformance Foam::fvMatrix<Foam::scalar>::solveSegregated
     addBoundarySource(totalSource, false);
 
     // Solver call
-    lduMatrix::solverPerformance solverPerf = lduMatrix::solver::New
+    solverPerformance solverPerf = lduMatrix::solver::New
     (
         psi.name(),
         *this,
@@ -163,7 +163,7 @@ Foam::lduMatrix::solverPerformance Foam::fvMatrix<Foam::scalar>::solveSegregated
         solverControls
     )->solve(psi.internalField(), totalSource);
 
-    solverPerf.print();
+    solverPerf.print(Info);
 
     diag() = saveDiag;
 
diff --git a/src/finiteVolume/fvMatrices/fvScalarMatrix/fvScalarMatrix.H b/src/finiteVolume/fvMatrices/fvScalarMatrix/fvScalarMatrix.H
index 3a464de13b..dc0d89db4d 100644
--- a/src/finiteVolume/fvMatrices/fvScalarMatrix/fvScalarMatrix.H
+++ b/src/finiteVolume/fvMatrices/fvScalarMatrix/fvScalarMatrix.H
@@ -62,13 +62,13 @@ autoPtr<fvMatrix<scalar>::fvSolver> fvMatrix<scalar>::solver
 );
 
 template<>
-lduMatrix::solverPerformance fvMatrix<scalar>::fvSolver::solve
+solverPerformance fvMatrix<scalar>::fvSolver::solve
 (
     const dictionary&
 );
 
 template<>
-lduMatrix::solverPerformance fvMatrix<scalar>::solveSegregated
+solverPerformance fvMatrix<scalar>::solveSegregated
 (
     const dictionary&
 );

From 94955a4f0518fe022fedf564c739d28bbe4c717e Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Mon, 30 Apr 2012 18:15:44 +0100
Subject: [PATCH 281/317] Updated headers

---
 src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrix.C           | 2 +-
 src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixSolver.C     | 2 +-
 src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolver.H       | 2 +-
 src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolverSolve.C  | 2 +-
 src/OpenFOAM/matrices/lduMatrix/solvers/PBiCG/PBiCG.H           | 2 +-
 src/OpenFOAM/matrices/lduMatrix/solvers/PCG/PCG.C               | 2 +-
 src/OpenFOAM/matrices/lduMatrix/solvers/PCG/PCG.H               | 2 +-
 .../matrices/lduMatrix/solvers/diagonalSolver/diagonalSolver.C  | 2 +-
 .../matrices/lduMatrix/solvers/diagonalSolver/diagonalSolver.H  | 2 +-
 .../matrices/lduMatrix/solvers/smoothSolver/smoothSolver.C      | 2 +-
 .../matrices/lduMatrix/solvers/smoothSolver/smoothSolver.H      | 2 +-
 src/OpenFOAM/meshes/data/data.C                                 | 2 +-
 src/OpenFOAM/meshes/data/data.H                                 | 2 +-
 .../general/solutionControl/simpleControl/simpleControl.C       | 2 +-
 14 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrix.C b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrix.C
index 70c0c9c5d7..16dd1a4188 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrix.C
+++ b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrix.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixSolver.C b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixSolver.C
index b7b4b4e1bb..bedb55529e 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixSolver.C
+++ b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixSolver.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolver.H b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolver.H
index 78278a6db2..273d2c75b2 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolver.H
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolver.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolverSolve.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolverSolve.C
index a8dd83f3ca..248c421f2e 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolverSolve.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolverSolve.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/PBiCG/PBiCG.H b/src/OpenFOAM/matrices/lduMatrix/solvers/PBiCG/PBiCG.H
index ff6e56dd6e..fda7d7d314 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/PBiCG/PBiCG.H
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/PBiCG/PBiCG.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/PCG/PCG.C b/src/OpenFOAM/matrices/lduMatrix/solvers/PCG/PCG.C
index 9522848b5f..b4a06ec8a3 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/PCG/PCG.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/PCG/PCG.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/PCG/PCG.H b/src/OpenFOAM/matrices/lduMatrix/solvers/PCG/PCG.H
index da0a432645..74b3abd17c 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/PCG/PCG.H
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/PCG/PCG.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/diagonalSolver/diagonalSolver.C b/src/OpenFOAM/matrices/lduMatrix/solvers/diagonalSolver/diagonalSolver.C
index 6103697537..73e386f5ed 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/diagonalSolver/diagonalSolver.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/diagonalSolver/diagonalSolver.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/diagonalSolver/diagonalSolver.H b/src/OpenFOAM/matrices/lduMatrix/solvers/diagonalSolver/diagonalSolver.H
index e532eef010..85908b3349 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/diagonalSolver/diagonalSolver.H
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/diagonalSolver/diagonalSolver.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/smoothSolver/smoothSolver.C b/src/OpenFOAM/matrices/lduMatrix/solvers/smoothSolver/smoothSolver.C
index 56d244c230..4287eb5699 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/smoothSolver/smoothSolver.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/smoothSolver/smoothSolver.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/smoothSolver/smoothSolver.H b/src/OpenFOAM/matrices/lduMatrix/solvers/smoothSolver/smoothSolver.H
index 57e58f4d28..2009768401 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/smoothSolver/smoothSolver.H
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/smoothSolver/smoothSolver.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/OpenFOAM/meshes/data/data.C b/src/OpenFOAM/meshes/data/data.C
index e92406bf71..02366479aa 100644
--- a/src/OpenFOAM/meshes/data/data.C
+++ b/src/OpenFOAM/meshes/data/data.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/OpenFOAM/meshes/data/data.H b/src/OpenFOAM/meshes/data/data.H
index 1b55206dd3..e4fd40fb6a 100644
--- a/src/OpenFOAM/meshes/data/data.H
+++ b/src/OpenFOAM/meshes/data/data.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/finiteVolume/cfdTools/general/solutionControl/simpleControl/simpleControl.C b/src/finiteVolume/cfdTools/general/solutionControl/simpleControl/simpleControl.C
index 50d8c86a85..27557eac3c 100644
--- a/src/finiteVolume/cfdTools/general/solutionControl/simpleControl/simpleControl.C
+++ b/src/finiteVolume/cfdTools/general/solutionControl/simpleControl/simpleControl.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

From bd8863e711311297f2928d5357c781db208a50af Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Mon, 30 Apr 2012 20:19:23 +0100
Subject: [PATCH 282/317] wmake: updated rules for gcc-4.7.0

---
 wmake/rules/linux64Gcc47/c++Opt   |  2 +-
 wmake/rules/linux64Gcc47/cOpt     |  2 +-
 wmake/rules/linuxGcc47/c          | 16 ++++++++++++++++
 wmake/rules/linuxGcc47/c++        | 21 +++++++++++++++++++++
 wmake/rules/linuxGcc47/c++Debug   |  2 ++
 wmake/rules/linuxGcc47/c++Opt     |  2 ++
 wmake/rules/linuxGcc47/c++Prof    |  2 ++
 wmake/rules/linuxGcc47/cDebug     |  2 ++
 wmake/rules/linuxGcc47/cOpt       |  2 ++
 wmake/rules/linuxGcc47/cProf      |  2 ++
 wmake/rules/linuxGcc47/general    |  9 +++++++++
 wmake/rules/linuxGcc47/mplibHPMPI |  3 +++
 12 files changed, 63 insertions(+), 2 deletions(-)
 create mode 100644 wmake/rules/linuxGcc47/c
 create mode 100644 wmake/rules/linuxGcc47/c++
 create mode 100644 wmake/rules/linuxGcc47/c++Debug
 create mode 100644 wmake/rules/linuxGcc47/c++Opt
 create mode 100644 wmake/rules/linuxGcc47/c++Prof
 create mode 100644 wmake/rules/linuxGcc47/cDebug
 create mode 100644 wmake/rules/linuxGcc47/cOpt
 create mode 100644 wmake/rules/linuxGcc47/cProf
 create mode 100644 wmake/rules/linuxGcc47/general
 create mode 100644 wmake/rules/linuxGcc47/mplibHPMPI

diff --git a/wmake/rules/linux64Gcc47/c++Opt b/wmake/rules/linux64Gcc47/c++Opt
index 1c64f5b4b7..2aedabd628 100644
--- a/wmake/rules/linux64Gcc47/c++Opt
+++ b/wmake/rules/linux64Gcc47/c++Opt
@@ -1,2 +1,2 @@
 c++DBUG     =
-c++OPT      = -O2
+c++OPT      = -O3
diff --git a/wmake/rules/linux64Gcc47/cOpt b/wmake/rules/linux64Gcc47/cOpt
index 6650ffa4a5..17318709f1 100644
--- a/wmake/rules/linux64Gcc47/cOpt
+++ b/wmake/rules/linux64Gcc47/cOpt
@@ -1,2 +1,2 @@
 cDBUG       =
-cOPT        = -O2
+cOPT        = -O3
diff --git a/wmake/rules/linuxGcc47/c b/wmake/rules/linuxGcc47/c
new file mode 100644
index 0000000000..d914fcd37d
--- /dev/null
+++ b/wmake/rules/linuxGcc47/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 --add-needed -Xlinker -z -Xlinker nodefs
diff --git a/wmake/rules/linuxGcc47/c++ b/wmake/rules/linuxGcc47/c++
new file mode 100644
index 0000000000..357f4106e1
--- /dev/null
+++ b/wmake/rules/linuxGcc47/c++
@@ -0,0 +1,21 @@
+.SUFFIXES: .C .cxx .cc .cpp
+
+c++WARN     = -Wall -Wextra -Wno-unused-parameter -Wold-style-cast
+
+CC          = g++ -m32
+
+include $(RULES)/c++$(WM_COMPILE_OPTION)
+
+ptFLAGS     = -DNoRepository -ftemplate-depth-100
+
+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 -Xlinker --add-needed -Xlinker --no-as-needed
+LINKEXE     = $(CC) $(c++FLAGS) -Xlinker --add-needed -Xlinker --no-as-needed
diff --git a/wmake/rules/linuxGcc47/c++Debug b/wmake/rules/linuxGcc47/c++Debug
new file mode 100644
index 0000000000..19bdb9c334
--- /dev/null
+++ b/wmake/rules/linuxGcc47/c++Debug
@@ -0,0 +1,2 @@
+c++DBUG    = -ggdb3 -DFULLDEBUG
+c++OPT      = -O0 -fdefault-inline
diff --git a/wmake/rules/linuxGcc47/c++Opt b/wmake/rules/linuxGcc47/c++Opt
new file mode 100644
index 0000000000..2aedabd628
--- /dev/null
+++ b/wmake/rules/linuxGcc47/c++Opt
@@ -0,0 +1,2 @@
+c++DBUG     =
+c++OPT      = -O3
diff --git a/wmake/rules/linuxGcc47/c++Prof b/wmake/rules/linuxGcc47/c++Prof
new file mode 100644
index 0000000000..3bda4dad55
--- /dev/null
+++ b/wmake/rules/linuxGcc47/c++Prof
@@ -0,0 +1,2 @@
+c++DBUG    = -pg
+c++OPT     = -O2
diff --git a/wmake/rules/linuxGcc47/cDebug b/wmake/rules/linuxGcc47/cDebug
new file mode 100644
index 0000000000..72b638f458
--- /dev/null
+++ b/wmake/rules/linuxGcc47/cDebug
@@ -0,0 +1,2 @@
+cDBUG       = -ggdb -DFULLDEBUG
+cOPT        = -O1 -fdefault-inline -finline-functions
diff --git a/wmake/rules/linuxGcc47/cOpt b/wmake/rules/linuxGcc47/cOpt
new file mode 100644
index 0000000000..17318709f1
--- /dev/null
+++ b/wmake/rules/linuxGcc47/cOpt
@@ -0,0 +1,2 @@
+cDBUG       =
+cOPT        = -O3
diff --git a/wmake/rules/linuxGcc47/cProf b/wmake/rules/linuxGcc47/cProf
new file mode 100644
index 0000000000..ca3ac9bf5f
--- /dev/null
+++ b/wmake/rules/linuxGcc47/cProf
@@ -0,0 +1,2 @@
+cDBUG       = -pg
+cOPT        = -O2
diff --git a/wmake/rules/linuxGcc47/general b/wmake/rules/linuxGcc47/general
new file mode 100644
index 0000000000..4b051e6b98
--- /dev/null
+++ b/wmake/rules/linuxGcc47/general
@@ -0,0 +1,9 @@
+CPP        = cpp -traditional-cpp
+LD         = ld -melf_i386
+
+PROJECT_LIBS = -l$(WM_PROJECT) -ldl
+
+include $(GENERAL_RULES)/standard
+
+include $(RULES)/c
+include $(RULES)/c++
diff --git a/wmake/rules/linuxGcc47/mplibHPMPI b/wmake/rules/linuxGcc47/mplibHPMPI
new file mode 100644
index 0000000000..8aff40632b
--- /dev/null
+++ b/wmake/rules/linuxGcc47/mplibHPMPI
@@ -0,0 +1,3 @@
+PFLAGS     =
+PINC       = -I$(MPI_ARCH_PATH)/include -D_MPICC_H
+PLIBS      = -L$(MPI_ARCH_PATH)/lib/linux_ia32 -lmpi

From fbb477070a65674a0623c4e45f483b8296576cf7 Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Tue, 1 May 2012 10:25:50 +0100
Subject: [PATCH 283/317] ENH: Corrected ambiguous construction from tmp msgs
 (llvm/clang)

---
 .../surface/surfaceFeatureExtract/surfaceFeatureExtract.C     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtract.C b/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtract.C
index 5aae0ede0e..5dd7671b94 100644
--- a/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtract.C
+++ b/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtract.C
@@ -913,8 +913,8 @@ int main(int argc, char *argv[])
 
             // Info<< "span " << span << endl;
 
-            pointField start = searchSurf.faceCentres() - span*normals;
-            pointField end = searchSurf.faceCentres() + span*normals;
+            pointField start(searchSurf.faceCentres() - span*normals);
+            pointField end(searchSurf.faceCentres() + span*normals);
             const pointField& faceCentres = searchSurf.faceCentres();
 
             List<List<pointIndexHit> > allHitInfo;

From b65c84bb220eaf82f165de153fe85978f6bc7b48 Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Tue, 1 May 2012 10:26:23 +0100
Subject: [PATCH 284/317] BUG: Corrections identified after testing gcc 4.7

---
 .../clouds/Templates/KinematicCloud/KinematicCloud.C  |  3 +--
 .../CellZoneInjection/CellZoneInjection.H             |  4 ++--
 .../SurfaceFilmModel/NoSurfaceFilm/NoSurfaceFilm.C    |  5 ++---
 .../SurfaceFilmModel/NoSurfaceFilm/NoSurfaceFilm.H    |  4 ++--
 .../SurfaceFilmModel/SurfaceFilmModel.C               |  7 +++----
 .../SurfaceFilmModel/SurfaceFilmModel.H               | 11 ++++-------
 .../SurfaceFilmModel/SurfaceFilmModelNew.C            |  7 +++----
 .../ThermoSurfaceFilm/ThermoSurfaceFilm.C             |  7 +++----
 .../ThermoSurfaceFilm/ThermoSurfaceFilm.H             |  9 ++-------
 9 files changed, 22 insertions(+), 35 deletions(-)

diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C
index d7134f5cd3..e65329296b 100644
--- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C
+++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C
@@ -70,8 +70,7 @@ void Foam::KinematicCloud<CloudType>::setModels()
         SurfaceFilmModel<KinematicCloud<CloudType> >::New
         (
             subModelProperties_,
-            *this,
-            g_
+            *this
         ).ptr()
     );
 
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/CellZoneInjection/CellZoneInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/CellZoneInjection/CellZoneInjection.H
index 100e33e9e2..05efc427a4 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/CellZoneInjection/CellZoneInjection.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/CellZoneInjection/CellZoneInjection.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -62,7 +62,7 @@ class CellZoneInjection
     // Private data
 
         //- Name of cell zone
-        const word& cellZoneName_;
+        const word cellZoneName_;
 
         //- Number density
         const scalar numberDensity_;
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/NoSurfaceFilm/NoSurfaceFilm.C b/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/NoSurfaceFilm/NoSurfaceFilm.C
index 86c721efc1..399730c950 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/NoSurfaceFilm/NoSurfaceFilm.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/NoSurfaceFilm/NoSurfaceFilm.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -32,8 +32,7 @@ template<class CloudType>
 Foam::NoSurfaceFilm<CloudType>::NoSurfaceFilm
 (
     const dictionary&,
-    CloudType& owner,
-    const dimensionedVector&
+    CloudType& owner
 )
 :
     SurfaceFilmModel<CloudType>(owner)
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/NoSurfaceFilm/NoSurfaceFilm.H b/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/NoSurfaceFilm/NoSurfaceFilm.H
index 672feb967e..b67136aa6a 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/NoSurfaceFilm/NoSurfaceFilm.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/NoSurfaceFilm/NoSurfaceFilm.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -68,7 +68,7 @@ public:
     // Constructors
 
         //- Construct from dictionary
-        NoSurfaceFilm(const dictionary&, CloudType&, const dimensionedVector&);
+        NoSurfaceFilm(const dictionary&, CloudType&);
 
         //- Construct copy
         NoSurfaceFilm(const NoSurfaceFilm<CloudType>& dm);
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/SurfaceFilmModel/SurfaceFilmModel.C b/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/SurfaceFilmModel/SurfaceFilmModel.C
index 46fb9296dc..7eb6e8cfee 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/SurfaceFilmModel/SurfaceFilmModel.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/SurfaceFilmModel/SurfaceFilmModel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -36,7 +36,7 @@ template<class CloudType>
 Foam::SurfaceFilmModel<CloudType>::SurfaceFilmModel(CloudType& owner)
 :
     SubModelBase<CloudType>(owner),
-    g_(dimensionedVector("zero", dimAcceleration, vector::zero)),
+    g_(owner.g()),
     ejectedParcelType_(0),
     massParcelPatch_(0),
     diameterParcelPatch_(0),
@@ -53,12 +53,11 @@ Foam::SurfaceFilmModel<CloudType>::SurfaceFilmModel
 (
     const dictionary& dict,
     CloudType& owner,
-    const dimensionedVector& g,
     const word& type
 )
 :
     SubModelBase<CloudType>(owner, dict, typeName, type),
-    g_(g),
+    g_(owner.g()),
     ejectedParcelType_
     (
         this->coeffDict().lookupOrDefault("ejectedParcelType", -1)
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/SurfaceFilmModel/SurfaceFilmModel.H b/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/SurfaceFilmModel/SurfaceFilmModel.H
index 967e748f56..b822ee644a 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/SurfaceFilmModel/SurfaceFilmModel.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/SurfaceFilmModel/SurfaceFilmModel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -140,10 +140,9 @@ public:
         dictionary,
         (
             const dictionary& dict,
-            CloudType& owner,
-            const dimensionedVector& g
+            CloudType& owner
         ),
-        (dict, owner, g)
+        (dict, owner)
     );
 
 
@@ -157,7 +156,6 @@ public:
         (
             const dictionary& dict,
             CloudType& owner,
-            const dimensionedVector& g,
             const word& type
         );
 
@@ -182,8 +180,7 @@ public:
     static autoPtr<SurfaceFilmModel<CloudType> > New
     (
         const dictionary& dict,
-        CloudType& owner,
-        const dimensionedVector& g
+        CloudType& owner
     );
 
 
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/SurfaceFilmModel/SurfaceFilmModelNew.C b/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/SurfaceFilmModel/SurfaceFilmModelNew.C
index 49702268a1..b2e7d47966 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/SurfaceFilmModel/SurfaceFilmModelNew.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/SurfaceFilmModel/SurfaceFilmModelNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -32,8 +32,7 @@ Foam::autoPtr<Foam::SurfaceFilmModel<CloudType> >
 Foam::SurfaceFilmModel<CloudType>::New
 (
     const dictionary& dict,
-    CloudType& owner,
-    const dimensionedVector& g
+    CloudType& owner
 )
 {
     const word modelType(dict.lookup("surfaceFilmModel"));
@@ -59,7 +58,7 @@ Foam::SurfaceFilmModel<CloudType>::New
             << exit(FatalError);
     }
 
-    return autoPtr<SurfaceFilmModel<CloudType> >(cstrIter()(dict, owner, g));
+    return autoPtr<SurfaceFilmModel<CloudType> >(cstrIter()(dict, owner));
 }
 
 
diff --git a/src/lagrangian/intermediate/submodels/Thermodynamic/SurfaceFilmModel/ThermoSurfaceFilm/ThermoSurfaceFilm.C b/src/lagrangian/intermediate/submodels/Thermodynamic/SurfaceFilmModel/ThermoSurfaceFilm/ThermoSurfaceFilm.C
index 6a6c60db39..51ab413fee 100644
--- a/src/lagrangian/intermediate/submodels/Thermodynamic/SurfaceFilmModel/ThermoSurfaceFilm/ThermoSurfaceFilm.C
+++ b/src/lagrangian/intermediate/submodels/Thermodynamic/SurfaceFilmModel/ThermoSurfaceFilm/ThermoSurfaceFilm.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -487,11 +487,10 @@ template<class CloudType>
 Foam::ThermoSurfaceFilm<CloudType>::ThermoSurfaceFilm
 (
     const dictionary& dict,
-    CloudType& owner,
-    const dimensionedVector& g
+    CloudType& owner
 )
 :
-    SurfaceFilmModel<CloudType>(dict, owner, g, typeName),
+    SurfaceFilmModel<CloudType>(dict, owner, typeName),
     rndGen_(owner.rndGen()),
     thermo_
     (
diff --git a/src/lagrangian/intermediate/submodels/Thermodynamic/SurfaceFilmModel/ThermoSurfaceFilm/ThermoSurfaceFilm.H b/src/lagrangian/intermediate/submodels/Thermodynamic/SurfaceFilmModel/ThermoSurfaceFilm/ThermoSurfaceFilm.H
index bddbfcc66e..5868916c2a 100644
--- a/src/lagrangian/intermediate/submodels/Thermodynamic/SurfaceFilmModel/ThermoSurfaceFilm/ThermoSurfaceFilm.H
+++ b/src/lagrangian/intermediate/submodels/Thermodynamic/SurfaceFilmModel/ThermoSurfaceFilm/ThermoSurfaceFilm.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -248,12 +248,7 @@ public:
     // Constructors
 
         //- Construct from components
-        ThermoSurfaceFilm
-        (
-            const dictionary& dict,
-            CloudType& owner,
-            const dimensionedVector& g
-        );
+        ThermoSurfaceFilm(const dictionary& dict, CloudType& owner);
 
         //- Construct copy
         ThermoSurfaceFilm(const ThermoSurfaceFilm<CloudType>& sfm);

From 0993f29f70500f3fe5dafd8c0ee1c5e1f8635349 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Tue, 1 May 2012 17:11:21 +0100
Subject: [PATCH 285/317] STYLE: snappyHexMeshDict: updated comment

---
 .../utilities/mesh/generation/snappyHexMesh/snappyHexMeshDict   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMeshDict b/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMeshDict
index 0e760387eb..074d5b8ee3 100644
--- a/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMeshDict
+++ b/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMeshDict
@@ -160,7 +160,7 @@ castellatedMeshControls
             //                 freedom in mesh motion
             //      boundary : create free-standing boundary faces (baffles
             //                 but without the shared points)
-            //faceType internal;
+            //faceType baffle;
         }
     }
 

From d15415af0f9bfc98c9b4b190f9de0e2a07cb0a41 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Tue, 1 May 2012 17:12:33 +0100
Subject: [PATCH 286/317] ENH: foamClearPolyMesh: remove level0 length from
 hexRef8/snappyHexMesh

---
 bin/foamClearPolyMesh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/bin/foamClearPolyMesh b/bin/foamClearPolyMesh
index 7e5ee1fe16..a0c955a046 100755
--- a/bin/foamClearPolyMesh
+++ b/bin/foamClearPolyMesh
@@ -3,7 +3,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+#   \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
 #    \\/     M anipulation  |
 #-------------------------------------------------------------------------------
 # License
@@ -133,6 +133,7 @@ for i in \
     sets \
     cellLevel \
     pointLevel \
+    level0Edge \
     refinementHistory \
     surfaceIndex \
 ;

From b35ae36e7b5e6fb31bc86a03cd6bb70b7cff1bb6 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Tue, 1 May 2012 17:13:29 +0100
Subject: [PATCH 287/317] ENH: surfaceBooleanFeatures: write eMesh edgeMesh as
 well

---
 .../surfaceBooleanFeatures.C                  | 25 +++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/applications/utilities/surface/surfaceBooleanFeatures/surfaceBooleanFeatures.C b/applications/utilities/surface/surfaceBooleanFeatures/surfaceBooleanFeatures.C
index d1a9b8f028..3393edb00d 100644
--- a/applications/utilities/surface/surfaceBooleanFeatures/surfaceBooleanFeatures.C
+++ b/applications/utilities/surface/surfaceBooleanFeatures/surfaceBooleanFeatures.C
@@ -71,6 +71,7 @@ Description
 #include "triSurface.H"
 #include "argList.H"
 #include "Time.H"
+#include "featureEdgeMesh.H"
 #include "extendedFeatureEdgeMesh.H"
 #include "triSurfaceSearch.H"
 #include "OFstream.H"
@@ -452,6 +453,30 @@ int main(int argc, char *argv[])
 
     feMesh.writeObj(sFeatFileName);
 
+    {
+        // Write a featureEdgeMesh for backwards compatibility
+        featureEdgeMesh bfeMesh
+        (
+            IOobject
+            (
+                sFeatFileName + ".eMesh",   // name
+                runTime.constant(),                         // instance
+                "triSurface",
+                runTime,                                    // registry
+                IOobject::NO_READ,
+                IOobject::NO_WRITE,
+                false
+            ),
+            feMesh.points(),
+            feMesh.edges()
+        );
+
+        Info<< nl << "Writing featureEdgeMesh to "
+            << bfeMesh.objectPath() << endl;
+
+        bfeMesh.regIOobject::write();
+    }
+
     Info << "End\n" << endl;
 
     return 0;

From 8f50d156e6791d94f2d7bdec5df71e6d7ebcaee4 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Tue, 1 May 2012 17:14:53 +0100
Subject: [PATCH 288/317] ENH: hexRef8: have split-hex recognition

---
 .../polyTopoChange/polyTopoChange/hexRef8.C   | 248 ++++++++++++++++++
 .../polyTopoChange/polyTopoChange/hexRef8.H   |  36 +++
 2 files changed, 284 insertions(+)

diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8.C
index 827913a1c1..261945476d 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8.C
@@ -42,6 +42,7 @@ License
 #include "mapDistributePolyMesh.H"
 #include "refinementData.H"
 #include "refinementDistanceData.H"
+#include "degenerateMatcher.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
@@ -1750,6 +1751,184 @@ void Foam::hexRef8::setInstance(const fileName& inst)
 }
 
 
+void Foam::hexRef8::collectLevelPoints
+(
+    const labelList& f,
+    const label level,
+    DynamicList<label>& points
+) const
+{
+    forAll(f, fp)
+    {
+        if (pointLevel_[f[fp]] <= level)
+        {
+            points.append(f[fp]);
+        }
+    }
+}
+
+
+void Foam::hexRef8::collectLevelPoints
+(
+    const labelList& meshPoints,
+    const labelList& f,
+    const label level,
+    DynamicList<label>& points
+) const
+{
+    forAll(f, fp)
+    {
+        label pointI = meshPoints[f[fp]];
+        if (pointLevel_[pointI] <= level)
+        {
+            points.append(pointI);
+        }
+    }
+}
+
+
+// Return true if we've found 6 quads. faces guaranteed to be outwards pointing.
+bool Foam::hexRef8::matchHexShape
+(
+    const label cellI,
+    const label cellLevel,
+    DynamicList<face>& quads
+) const
+{
+    const cell& cFaces = mesh_.cells()[cellI];
+
+    // Work arrays
+    DynamicList<label> verts(4);
+    quads.clear();
+
+
+    // 1. pick up any faces with four cellLevel points
+
+    forAll(cFaces, i)
+    {
+        label faceI = cFaces[i];
+        const face& f = mesh_.faces()[faceI];
+
+        verts.clear();
+        collectLevelPoints(f, cellLevel, verts);
+        if (verts.size() == 4)
+        {
+            if (mesh_.faceOwner()[faceI] != cellI)
+            {
+                reverse(verts);
+            }
+            quads.append(face(0));
+            labelList& quadVerts = quads.last();
+            quadVerts.transfer(verts);
+        }
+    }
+
+
+    if (quads.size() < 6)
+    {
+        Map<labelList> pointFaces(2*cFaces.size());
+
+        forAll(cFaces, i)
+        {
+            label faceI = cFaces[i];
+            const face& f = mesh_.faces()[faceI];
+
+            // Pick up any faces with only one level point.
+            // See if there are four of these where the commont point
+            // is a level+1 point. This common point is then the mid of
+            // a split face.
+
+            verts.clear();
+            collectLevelPoints(f, cellLevel, verts);
+            if (verts.size() == 1)
+            {
+                // Add to pointFaces for any level+1 point (this might be
+                // a midpoint of a split face)
+                forAll(f, fp)
+                {
+                    label pointI = f[fp];
+                    if (pointLevel_[pointI] == cellLevel+1)
+                    {
+                        Map<labelList>::iterator iter =
+                            pointFaces.find(pointI);
+                        if (iter != pointFaces.end())
+                        {
+                            labelList& pFaces = iter();
+                            if (findIndex(pFaces, faceI) == -1)
+                            {
+                                pFaces.append(faceI);
+                            }
+                        }
+                        else
+                        {
+                            pointFaces.insert
+                            (
+                                pointI,
+                                labelList(1, faceI)
+                            );
+                        }
+                    }
+                }
+            }
+        }
+
+        // 2. Check if we've collected any midPoints.
+        forAllConstIter(Map<labelList>, pointFaces, iter)
+        {
+            const labelList& pFaces = iter();
+
+            if (pFaces.size() == 4)
+            {
+                // Collect and orient.
+                faceList fourFaces(pFaces.size());
+                forAll(pFaces, pFaceI)
+                {
+                    label faceI = pFaces[pFaceI];
+                    const face& f = mesh_.faces()[faceI];
+                    if (mesh_.faceOwner()[faceI] == cellI)
+                    {
+                        fourFaces[pFaceI] = f;
+                    }
+                    else
+                    {
+                        fourFaces[pFaceI] = f.reverseFace();
+                    }
+                }
+
+                primitivePatch bigFace
+                (
+                    SubList<face>(fourFaces, fourFaces.size()),
+                    mesh_.points()
+                );
+                const labelListList& edgeLoops = bigFace.edgeLoops();
+
+                if (edgeLoops.size() == 1)
+                {
+                    // Collect the 4 cellLevel points
+                    verts.clear();
+                    collectLevelPoints
+                    (
+                        bigFace.meshPoints(),
+                        bigFace.edgeLoops()[0],
+                        cellLevel,
+                        verts
+                    );
+
+                    if (verts.size() == 4)
+                    {
+                        quads.append(face(0));
+                        labelList& quadVerts = quads.last();
+                        quadVerts.transfer(verts);
+                    }
+                }
+            }
+        }
+    }
+
+    return (quads.size() == 6);
+}
+
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 // Construct from mesh, read refinement data
@@ -4337,6 +4516,9 @@ void Foam::hexRef8::updateMesh
 
     // Update face removal engine
     faceRemover_.updateMesh(map);
+
+    // Clear cell shapes
+    cellShapesPtr_.clear();
 }
 
 
@@ -4421,6 +4603,9 @@ void Foam::hexRef8::subset
 
     // Nothing needs doing to faceRemover.
     //faceRemover_.subset(pointMap, faceMap, cellMap);
+
+    // Clear cell shapes
+    cellShapesPtr_.clear();
 }
 
 
@@ -4447,6 +4632,9 @@ void Foam::hexRef8::distribute(const mapDistributePolyMesh& map)
 
     // Update face removal engine
     faceRemover_.distribute(map);
+
+    // Clear cell shapes
+    cellShapesPtr_.clear();
 }
 
 
@@ -4922,6 +5110,66 @@ void Foam::hexRef8::checkRefinementLevels
 }
 
 
+const Foam::cellShapeList& Foam::hexRef8::cellShapes() const
+{
+    if (cellShapesPtr_.empty())
+    {
+        if (debug)
+        {
+            Pout<< "hexRef8::cellShapes() : calculating splitHex cellShapes."
+                << " cellLevel:" << cellLevel_.size()
+                << " pointLevel:" << pointLevel_.size()
+                << endl;
+        }
+
+        const cellShapeList& meshShapes = mesh_.cellShapes();
+        cellShapesPtr_.reset(new cellShapeList(meshShapes));
+
+        label nSplitHex = 0;
+        label nUnrecognised = 0;
+
+        forAll(cellLevel_, cellI)
+        {
+            if (meshShapes[cellI].model().index() == 0)
+            {
+                label level = cellLevel_[cellI];
+
+                // Return true if we've found 6 quads
+                DynamicList<face> quads;
+                bool haveQuads = matchHexShape
+                (
+                    cellI,
+                    level,
+                    quads
+                );
+
+                if (haveQuads)
+                {
+                    faceList faces(quads.xfer());
+                    cellShapesPtr_()[cellI] = degenerateMatcher::match(faces);
+                    nSplitHex++;
+                }
+                else
+                {
+                    nUnrecognised++;
+                }
+            }
+        }
+        if (debug)
+        {
+            Pout<< "hexRef8::cellShapes() :"
+                << " nCells:" << mesh_.nCells() << " of which" << nl
+                << "    primitive:" << (mesh_.nCells()-nSplitHex-nUnrecognised)
+                << nl
+                << "    split-hex:" << nSplitHex << nl
+                << "    poly     :" << nUnrecognised << nl
+                << endl;
+        }
+    }
+    return cellShapesPtr_();
+}
+
+
 
 //
 // Unrefinement
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8.H b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8.H
index 503412dd38..31e2a5587d 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8.H
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8.H
@@ -44,6 +44,7 @@ SourceFiles
 #include "refinementHistory.H"
 #include "PackedBoolList.H"
 #include "uniformDimensionedFields.H"
+#include "cellShapeList.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -89,6 +90,9 @@ class hexRef8
         //- Level of saved cells
         Map<label> savedCellLevel_;
 
+        //- cell shapes when seen as split hexes
+        mutable autoPtr<cellShapeList> cellShapesPtr_;
+
 
     // Private Member Functions
 
@@ -303,6 +307,34 @@ class hexRef8
         void checkWantedRefinementLevels(const labelList&) const;
 
 
+        // Cellshape recognition
+
+            //- Collect all points on face of certain level
+            void collectLevelPoints
+            (
+                const labelList& f,
+                const label level,
+                DynamicList<label>& points
+            ) const;
+
+            //- Collect all points on face (in local numbering) of certain level
+            void collectLevelPoints
+            (
+                const labelList& meshPoints,
+                const labelList& f,
+                const label level,
+                DynamicList<label>& points
+            ) const;
+
+            //- Collect all faces with four corner points and return true if
+            //  hex was matched (6 faces of each four corner points)
+            bool matchHexShape
+            (
+                const label cellI,
+                const label cellLevel,
+                DynamicList<face>& quads
+            ) const;
+
 
         //- Disallow default bitwise copy construct
         hexRef8(const hexRef8&);
@@ -497,6 +529,10 @@ public:
                 const labelList& pointsToCheck
             ) const;
 
+            //- Utility: get hexes as cell shapes
+            const cellShapeList& cellShapes() const;
+
+
         // Unrefinement (undoing refinement, not arbitrary coarsening)
 
             //- Return the points at the centre of top-level split cells

From 1aa606184e9ea95d369b959b594658567865ea64 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Tue, 1 May 2012 17:17:56 +0100
Subject: [PATCH 289/317] COMP: chtMultiRegionFoam: built into FOAM_USER_APPBIN

---
 .../solvers/heatTransfer/chtMultiRegionFoam/Make/files         | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/Make/files b/applications/solvers/heatTransfer/chtMultiRegionFoam/Make/files
index 908d7b3a95..522f90e3ef 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/Make/files
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/Make/files
@@ -2,5 +2,4 @@ fluid/compressibleCourantNo.C
 solid/solidRegionDiffNo.C
 chtMultiRegionFoam.C
 
-EXE = $(FOAM_USER_APPBIN)/chtMultiRegionFoam
-
+EXE = $(FOAM_APPBIN)/chtMultiRegionFoam

From cc0649bed1fea44d9c31731065a6e9d7df6d4dc7 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Tue, 1 May 2012 17:20:30 +0100
Subject: [PATCH 290/317] BUG: fvFieldReconstructorReconstructFields.C:
 indexing outside of internal faces

---
 .../reconstruct/fvFieldReconstructorReconstructFields.C     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/parallel/reconstruct/reconstruct/fvFieldReconstructorReconstructFields.C b/src/parallel/reconstruct/reconstruct/fvFieldReconstructorReconstructFields.C
index 58c74f4c4b..5ff0f7bf2e 100644
--- a/src/parallel/reconstruct/reconstruct/fvFieldReconstructorReconstructFields.C
+++ b/src/parallel/reconstruct/reconstruct/fvFieldReconstructorReconstructFields.C
@@ -379,12 +379,12 @@ Foam::fvFieldReconstructor::reconstructFvSurfaceField
         {
             const labelList& faceMap = faceProcAddressing_[procI];
 
-            // Addressing into original field
-            labelList curAddr(faceMap.size());
             // Correctly oriented copy of internal field
             Field<Type> procInternalField(procField.internalField());
+            // Addressing into original field
+            labelList curAddr(procInternalField.size());
 
-            forAll(faceMap, addrI)
+            forAll(procInternalField, addrI)
             {
                 curAddr[addrI] = mag(faceMap[addrI])-1;
                 if (faceMap[addrI] < 0)

From 50d1d00faefef377da2cc1c662fb3bb810661ad3 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Tue, 1 May 2012 17:24:09 +0100
Subject: [PATCH 291/317] BUG: surfaceSplitByTopology: #485

---
 .../surface/surfaceSplitByTopology/surfaceSplitByTopology.C   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/applications/utilities/surface/surfaceSplitByTopology/surfaceSplitByTopology.C b/applications/utilities/surface/surfaceSplitByTopology/surfaceSplitByTopology.C
index 118e608033..93a7caa365 100644
--- a/applications/utilities/surface/surfaceSplitByTopology/surfaceSplitByTopology.C
+++ b/applications/utilities/surface/surfaceSplitByTopology/surfaceSplitByTopology.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -39,7 +39,7 @@ using namespace Foam;
 int main(int argc, char *argv[])
 {
     argList::noParallel();
-    argList::validArgs.clear();
+    argList::validOptions.clear();
     argList::validArgs.append("input surface file");
     argList::validArgs.append("output surface file");
     argList args(argc, argv);

From ac9203e1b8675c6600ee1f31ae5ab7246c8a08de Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Wed, 2 May 2012 10:53:29 +0100
Subject: [PATCH 292/317] rhoSimplecFoam: Added coupled-patch handling to H1 to
 support parallel running

---
 .../solvers/compressible/rhoSimpleFoam/pEqn.H | 12 +++--
 .../rhoSimpleFoam/rhoSimplecFoam/pEqn.H       | 20 +++++----
 .../LduMatrix/LduMatrix/SolverPerformance.C   | 12 ++++-
 .../lduMatrix/lduMatrix/lduMatrixATmul.C      | 32 +++++++++++++
 .../lduMatrix/lduMatrix/lduMatrixOperations.C | 32 -------------
 .../fvMatrices/fvMatrix/fvMatrix.C            | 32 +++++++------
 .../rhoSimplecFoam/squareBend/0/U             |  2 +-
 .../squareBend/system/decomposeParDict        | 45 +++++++++++++++++++
 8 files changed, 123 insertions(+), 64 deletions(-)
 create mode 100644 tutorials/compressible/rhoSimplecFoam/squareBend/system/decomposeParDict

diff --git a/applications/solvers/compressible/rhoSimpleFoam/pEqn.H b/applications/solvers/compressible/rhoSimpleFoam/pEqn.H
index cefee48969..6c64056be2 100644
--- a/applications/solvers/compressible/rhoSimpleFoam/pEqn.H
+++ b/applications/solvers/compressible/rhoSimpleFoam/pEqn.H
@@ -54,7 +54,8 @@ else
     {
         fvScalarMatrix pEqn
         (
-            fvm::laplacian(rho*rAU, p) == fvc::div(phiHbyA)
+            fvc::div(phiHbyA)
+          - fvm::laplacian(rho*rAU, p)
         );
 
         pEqn.setReference(pRefCell, pRefValue);
@@ -63,7 +64,7 @@ else
 
         if (simple.finalNonOrthogonalIter())
         {
-            phi = phiHbyA - pEqn.flux();
+            phi = phiHbyA + pEqn.flux();
         }
     }
 }
@@ -88,5 +89,10 @@ if (closedVolume)
 rho = thermo.rho();
 rho = max(rho, rhoMin);
 rho = min(rho, rhoMax);
-rho.relax();
+
+if (!simple.transonic())
+{
+    rho.relax();
+}
+
 Info<< "rho max/min : " << max(rho).value() << " " << min(rho).value() << endl;
diff --git a/applications/solvers/compressible/rhoSimpleFoam/rhoSimplecFoam/pEqn.H b/applications/solvers/compressible/rhoSimpleFoam/rhoSimplecFoam/pEqn.H
index 379e720c04..44babc3a6b 100644
--- a/applications/solvers/compressible/rhoSimpleFoam/rhoSimplecFoam/pEqn.H
+++ b/applications/solvers/compressible/rhoSimpleFoam/rhoSimplecFoam/pEqn.H
@@ -3,8 +3,6 @@ rho = max(rho, rhoMin);
 rho = min(rho, rhoMax);
 rho.relax();
 
-volScalarField p0(p);
-
 volScalarField AU(UEqn().A());
 volScalarField AtU(AU - UEqn().H1());
 
@@ -22,7 +20,7 @@ if (simple.transonic())
         surfaceScalarField phid
         (
             "phid",
-            fvc::interpolate(psi*HbyA) & mesh.Sf()
+            fvc::interpolate(psi)*(fvc::interpolate(HbyA) & mesh.Sf())
         );
 
         surfaceScalarField phic
@@ -31,6 +29,8 @@ if (simple.transonic())
             fvc::interpolate(rho/AtU - rho/AU)*fvc::snGrad(p)*mesh.magSf()
         );
 
+        HbyA -= fvc::grad(p)*(1.0/AU - 1.0/AtU);
+
         fvScalarMatrix pEqn
         (
             fvm::div(phid, p)
@@ -58,11 +58,15 @@ else
         surfaceScalarField phiHbyA
         (
             "phiHbyA",
-            fvc::interpolate(rho*HbyA) & mesh.Sf()
+            fvc::interpolate(rho)*fvc::interpolate(HbyA) & mesh.Sf()
         );
 
-        closedVolume = adjustPhi(phi, U, p);
-        phi += fvc::interpolate(rho/AtU - rho/AU)*fvc::snGrad(p)*mesh.magSf();
+        closedVolume = adjustPhi(phiHbyA, U, p);
+
+        phiHbyA +=
+            fvc::interpolate(rho/AtU - rho/AU)*fvc::snGrad(p)*mesh.magSf();
+
+        HbyA -= fvc::grad(p)*(1.0/AU - 1.0/AtU);
 
         fvScalarMatrix pEqn
         (
@@ -88,9 +92,7 @@ else
 // Explicitly relax pressure for momentum corrector
 p.relax();
 
-U = HbyA - (fvc::grad(p0)*(1.0/AU - 1.0/AtU) + fvc::grad(p)/AtU);
-//U = HbyA - fvc::grad(p)/AU;
-
+U = HbyA - fvc::grad(p)/AtU;
 U.correctBoundaryConditions();
 
 // For closed-volume cases adjust the pressure and density levels
diff --git a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/SolverPerformance.C b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/SolverPerformance.C
index 62ce85abb7..5f307718eb 100644
--- a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/SolverPerformance.C
+++ b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/SolverPerformance.C
@@ -99,8 +99,16 @@ void Foam::SolverPerformance<Type>::print
 {
     for(direction cmpt=0; cmpt<pTraits<Type>::nComponents; cmpt++)
     {
-        os  << solverName_ << ":  Solving for "
-            << word(fieldName_ + pTraits<Type>::componentNames[cmpt]);
+        if (pTraits<Type>::nComponents == 1)
+        {
+            os  << solverName_ << ":  Solving for " << fieldName_;
+
+        }
+        else
+        {
+            os  << solverName_ << ":  Solving for "
+                << word(fieldName_ + pTraits<Type>::componentNames[cmpt]);
+        }
 
         if (singular_[cmpt])
         {
diff --git a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixATmul.C b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixATmul.C
index db2b6d8bbb..61ba90d830 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixATmul.C
+++ b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixATmul.C
@@ -295,4 +295,36 @@ Foam::tmp<Foam::scalarField> Foam::lduMatrix::residual
 }
 
 
+Foam::tmp<Foam::scalarField > Foam::lduMatrix::H1() const
+{
+    tmp<scalarField > tH1
+    (
+        new scalarField(lduAddr().size(), 0.0)
+    );
+
+    if (lowerPtr_ || upperPtr_)
+    {
+        scalarField& H1_ = tH1();
+
+        scalar* __restrict__ H1Ptr = H1_.begin();
+
+        const label* __restrict__ uPtr = lduAddr().upperAddr().begin();
+        const label* __restrict__ lPtr = lduAddr().lowerAddr().begin();
+
+        const scalar* __restrict__ lowerPtr = lower().begin();
+        const scalar* __restrict__ upperPtr = upper().begin();
+
+        register const label nFaces = upper().size();
+
+        for (register label face=0; face<nFaces; face++)
+        {
+            H1Ptr[uPtr[face]] -= lowerPtr[face];
+            H1Ptr[lPtr[face]] -= upperPtr[face];
+        }
+    }
+
+    return tH1;
+}
+
+
 // ************************************************************************* //
diff --git a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixOperations.C b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixOperations.C
index 07260b4a91..df1ba0d945 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixOperations.C
+++ b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixOperations.C
@@ -351,36 +351,4 @@ void Foam::lduMatrix::operator*=(scalar s)
 }
 
 
-Foam::tmp<Foam::scalarField > Foam::lduMatrix::H1() const
-{
-    tmp<scalarField > tH1
-    (
-        new scalarField(lduAddr().size(), 0.0)
-    );
-
-    if (lowerPtr_ || upperPtr_)
-    {
-        scalarField& H1_ = tH1();
-
-        scalar* __restrict__ H1Ptr = H1_.begin();
-
-        const label* __restrict__ uPtr = lduAddr().upperAddr().begin();
-        const label* __restrict__ lPtr = lduAddr().lowerAddr().begin();
-
-        const scalar* __restrict__ lowerPtr = lower().begin();
-        const scalar* __restrict__ upperPtr = upper().begin();
-
-        register const label nFaces = upper().size();
-
-        for (register label face=0; face<nFaces; face++)
-        {
-            H1Ptr[uPtr[face]] -= lowerPtr[face];
-            H1Ptr[lPtr[face]] -= upperPtr[face];
-        }
-    }
-
-    return tH1;
-}
-
-
 // ************************************************************************* //
diff --git a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C
index 3e65f5d1c2..87a6647ca9 100644
--- a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C
+++ b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C
@@ -841,25 +841,23 @@ Foam::tmp<Foam::volScalarField> Foam::fvMatrix<Type>::H1() const
     );
     volScalarField& H1_ = tH1();
 
-    // Loop over field components
-    /*
-    for (direction cmpt=0; cmpt<Type::nComponents; cmpt++)
-    {
-        scalarField psiCmpt(psi_.internalField().component(cmpt));
-
-        scalarField boundaryDiagCmpt(psi_.size(), 0.0);
-        addBoundaryDiag(boundaryDiagCmpt, cmpt);
-        boundaryDiagCmpt.negate();
-        addCmptAvBoundaryDiag(boundaryDiagCmpt);
-
-        H1_.internalField().replace(cmpt, boundaryDiagCmpt);
-    }
-
-    H1_.internalField() += lduMatrix::H1();
-    */
-
     H1_.internalField() = lduMatrix::H1();
 
+    forAll(psi_.boundaryField(), patchI)
+    {
+        const fvPatchField<Type>& ptf = psi_.boundaryField()[patchI];
+
+        if (ptf.coupled() && ptf.size())
+        {
+            addToInternalField
+            (
+                lduAddr().patchAddr(patchI),
+                boundaryCoeffs_[patchI].component(0),
+                H1_
+            );
+        }
+    }
+
     H1_.internalField() /= psi_.mesh().V();
     H1_.correctBoundaryConditions();
 
diff --git a/tutorials/compressible/rhoSimplecFoam/squareBend/0/U b/tutorials/compressible/rhoSimplecFoam/squareBend/0/U
index 70988607c8..d5bd0a74cf 100644
--- a/tutorials/compressible/rhoSimplecFoam/squareBend/0/U
+++ b/tutorials/compressible/rhoSimplecFoam/squareBend/0/U
@@ -28,7 +28,7 @@ boundaryField
     inlet
     {
         type            flowRateInletVelocity;
-        flowRate        constant 0.5; //0.75;
+        flowRate        constant 0.5;
         value           uniform (0 0 0);
     }
     outlet
diff --git a/tutorials/compressible/rhoSimplecFoam/squareBend/system/decomposeParDict b/tutorials/compressible/rhoSimplecFoam/squareBend/system/decomposeParDict
new file mode 100644
index 0000000000..9e844a62ba
--- /dev/null
+++ b/tutorials/compressible/rhoSimplecFoam/squareBend/system/decomposeParDict
@@ -0,0 +1,45 @@
+/*--------------------------------*- 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    "system";
+    object      decomposeParDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+numberOfSubdomains 8;
+
+method          hierarchical;
+
+simpleCoeffs
+{
+    n               (8 1 1);
+    delta           0.001;
+}
+
+hierarchicalCoeffs
+{
+    n               (4 2 1);
+    delta           0.001;
+    order           xyz;
+}
+
+manualCoeffs
+{
+    dataFile        "";
+}
+
+distributed     no;
+
+roots           ( );
+
+
+// ************************************************************************* //

From cd7fd862cc930bb4909ba71503e2d03e50a68f02 Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Wed, 2 May 2012 10:53:42 +0100
Subject: [PATCH 293/317] Updated Header

---
 src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixATmul.C | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixATmul.C b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixATmul.C
index 61ba90d830..723a999806 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixATmul.C
+++ b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixATmul.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

From 664fb309125e5504f35eed87221bfe28284ee1ab Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Wed, 2 May 2012 10:54:19 +0100
Subject: [PATCH 294/317] interpolationWeights: Info messages now switched by
 debug

---
 .../interpolationWeights.C                    | 35 ++------
 .../functions/DataEntry/Table/TableBase.C     | 80 ++-----------------
 2 files changed, 11 insertions(+), 104 deletions(-)

diff --git a/src/OpenFOAM/interpolations/interpolationWeights/interpolationWeights/interpolationWeights.C b/src/OpenFOAM/interpolations/interpolationWeights/interpolationWeights/interpolationWeights.C
index 30fc2fc0f6..779f134de3 100644
--- a/src/OpenFOAM/interpolations/interpolationWeights/interpolationWeights/interpolationWeights.C
+++ b/src/OpenFOAM/interpolations/interpolationWeights/interpolationWeights/interpolationWeights.C
@@ -57,8 +57,12 @@ autoPtr<interpolationWeights> interpolationWeights::New
     const scalarField& samples
 )
 {
-    Info<< nl << "Selecting interpolationWeights "
-        << type << endl;
+    if (debug)
+    {
+        InfoIn("interpolationWeights::New")
+            << "Selecting interpolationWeights "
+            << type << endl;
+    }
 
     wordConstructorTable::iterator cstrIter =
         wordConstructorTablePtr_->find(type);
@@ -87,33 +91,6 @@ interpolationWeights::~interpolationWeights()
 {}
 
 
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-//objectRegistry& interpolationWeights::registry
-//(
-//    const objectRegistry& obr,
-//    const word& name
-//)
-//{
-//    if (!obr.foundObject<objectRegistry>(name))
-//    {
-//        objectRegistry* fieldsCachePtr = new objectRegistry
-//        (
-//            IOobject
-//            (
-//                name,
-//                obr.time().constant(),
-//                obr,
-//                IOobject::NO_READ,
-//                IOobject::NO_WRITE
-//            )
-//        );
-//        fieldsCachePtr->store();
-//    }
-//    return const_cast<objectRegistry&>(obr.subRegistry(name));
-//}
-
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
diff --git a/src/OpenFOAM/primitives/functions/DataEntry/Table/TableBase.C b/src/OpenFOAM/primitives/functions/DataEntry/Table/TableBase.C
index e59c5ec898..4b52d26699 100644
--- a/src/OpenFOAM/primitives/functions/DataEntry/Table/TableBase.C
+++ b/src/OpenFOAM/primitives/functions/DataEntry/Table/TableBase.C
@@ -45,6 +45,7 @@ const Foam::interpolationWeights& Foam::TableBase<Type>::interpolator() const
             tableSamples_
         );
     }
+
     return interpolatorPtr_();
 }
 
@@ -172,6 +173,7 @@ Foam::TableBase<Type>::outOfBounds
 {
     boundsHandling prev = boundsHandling_;
     boundsHandling_ = bound;
+
     return prev;
 }
 
@@ -366,22 +368,8 @@ Type Foam::TableBase<Type>::value(const scalar x) const
     {
         t += currentWeights_[i]*table_[currentIndices_[i]].second();
     }
-    return t;
 
-    //// Find i such that x(i) < xDash < x(i+1)
-    //label i = 0;
-    //while ((table_[i+1].first() < xDash) && (i+1 < table_.size()))
-    //{
-    //    i++;
-    //}
-    //
-    //// Linear interpolation to find value
-    //return Type
-    //(
-    //    (xDash - table_[i].first())/(table_[i+1].first() - table_[i].first())
-    //  * (table_[i+1].second() - table_[i].second())
-    //  + table_[i].second()
-    //);
+    return t;
 }
 
 
@@ -396,66 +384,8 @@ Type Foam::TableBase<Type>::integrate(const scalar x1, const scalar x2) const
     {
        sum += currentWeights_[i]*table_[currentIndices_[i]].second();
     }
+
     return sum;
-
-
-    //// Initialise return value
-    //Type sum = pTraits<Type>::zero;
-    //
-    //// Return zero if out of bounds
-    //if ((x1 > table_.last().first()) || (x2 < table_[0].first()))
-    //{
-    //    return sum;
-    //}
-    //
-    //// Find next index greater than x1
-    //label id1 = 0;
-    //while ((table_[id1].first() < x1) && (id1 < table_.size()))
-    //{
-    //    id1++;
-    //}
-    //
-    //// Find next index less than x2
-    //label id2 = table_.size() - 1;
-    //while ((table_[id2].first() > x2) && (id2 >= 1))
-    //{
-    //    id2--;
-    //}
-    //
-    //if ((id1 - id2) == 1)
-    //{
-    //    // x1 and x2 lie within 1 interval
-    //    sum = 0.5*(value(x1) + value(x2))*(x2 - x1);
-    //}
-    //else
-    //{
-    //    // x1 and x2 cross multiple intervals
-    //
-    //    // Integrate table body
-    //    for (label i=id1; i<id2; i++)
-    //    {
-    //        sum +=
-    //            (table_[i].second() + table_[i+1].second())
-    //          * (table_[i+1].first() - table_[i].first());
-    //    }
-    //    sum *= 0.5;
-    //
-    //    // Add table ends (partial segments)
-    //    if (id1 > 0)
-    //    {
-    //        sum += 0.5
-    //          * (value(x1) + table_[id1].second())
-    //          * (table_[id1].first() - x1);
-    //    }
-    //    if (id2 < table_.size() - 1)
-    //    {
-    //        sum += 0.5
-    //          * (table_[id2].second() + value(x2))
-    //          * (x2 - table_[id2].first());
-    //    }
-    //}
-    //
-    //return sum;
 }
 
 
@@ -481,9 +411,9 @@ Foam::dimensioned<Type> Foam::TableBase<Type>::dimIntegrate
     );
 }
 
+
 // * * * * * * * * * * * * * *  IOStream operators * * * * * * * * * * * * * //
 
 #include "TableBaseIO.C"
 
-
 // ************************************************************************* //

From 453a455c83c4da38246a0003ddbfabd675ce3c10 Mon Sep 17 00:00:00 2001
From: laurence <laurence>
Date: Wed, 2 May 2012 17:23:45 +0100
Subject: [PATCH 295/317] BUG: Correct line length

---
 .../collapseEdges/pointEdgeCollapse/pointEdgeCollapseI.H      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/applications/utilities/mesh/advanced/collapseEdges/pointEdgeCollapse/pointEdgeCollapseI.H b/applications/utilities/mesh/advanced/collapseEdges/pointEdgeCollapse/pointEdgeCollapseI.H
index 3fb1468a88..a064bcf781 100644
--- a/applications/utilities/mesh/advanced/collapseEdges/pointEdgeCollapse/pointEdgeCollapseI.H
+++ b/applications/utilities/mesh/advanced/collapseEdges/pointEdgeCollapse/pointEdgeCollapseI.H
@@ -91,8 +91,8 @@ inline bool Foam::pointEdgeCollapse::update
 //            // Same coordinate. Same string?
 //            if (w2.collapseIndex_ < collapseIndex_)
 //            {
-//                // Take over string index from w2 (and also coordinate but this
-//                // was same)
+//                // Take over string index from w2 (and also coordinate but
+//                // this was same)
 //                operator=(w2);
 //                return true;
 //            }

From 26c9d330e7e890cc54b6ab9ab298d782b8da783c Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Thu, 3 May 2012 14:14:40 +0100
Subject: [PATCH 296/317] rhoPimplecFoam: New compressible solver featuring
 PIMPLEC

---
 .../rhoPimpleFoam/rhoPimplecFoam/Make/files   |   3 +
 .../rhoPimpleFoam/rhoPimplecFoam/Make/options |  15 ++
 .../rhoPimpleFoam/rhoPimplecFoam/pEqn.H       | 117 +++++++++++++
 .../rhoPimplecFoam/rhoPimplecFoam.C           | 105 +++++++++++
 .../rhoPimplecFoam/angledDuct/0/T             |  54 ++++++
 .../rhoPimplecFoam/angledDuct/0/U             |  57 ++++++
 .../rhoPimplecFoam/angledDuct/0/alphat        |  57 ++++++
 .../rhoPimplecFoam/angledDuct/0/epsilon       |  59 +++++++
 .../rhoPimplecFoam/angledDuct/0/k             |  59 +++++++
 .../rhoPimplecFoam/angledDuct/0/mut           |  57 ++++++
 .../rhoPimplecFoam/angledDuct/0/p             |  51 ++++++
 .../rhoPimplecFoam/angledDuct/Allrun          |  10 ++
 .../angledDuct/constant/RASProperties         |  25 +++
 .../constant/polyMesh/blockMeshDict.m4        | 165 ++++++++++++++++++
 .../angledDuct/constant/polyMesh/boundary     |  58 ++++++
 .../angledDuct/constant/porousZones           |  36 ++++
 .../constant/thermophysicalProperties         |  40 +++++
 .../angledDuct/constant/turbulenceProperties  |  21 +++
 .../angledDuct/system/controlDict             |  55 ++++++
 .../angledDuct/system/fvSchemes               |  76 ++++++++
 .../angledDuct/system/fvSolution              |  91 ++++++++++
 21 files changed, 1211 insertions(+)
 create mode 100644 applications/solvers/compressible/rhoPimpleFoam/rhoPimplecFoam/Make/files
 create mode 100644 applications/solvers/compressible/rhoPimpleFoam/rhoPimplecFoam/Make/options
 create mode 100644 applications/solvers/compressible/rhoPimpleFoam/rhoPimplecFoam/pEqn.H
 create mode 100644 applications/solvers/compressible/rhoPimpleFoam/rhoPimplecFoam/rhoPimplecFoam.C
 create mode 100644 tutorials/compressible/rhoPimplecFoam/angledDuct/0/T
 create mode 100644 tutorials/compressible/rhoPimplecFoam/angledDuct/0/U
 create mode 100644 tutorials/compressible/rhoPimplecFoam/angledDuct/0/alphat
 create mode 100644 tutorials/compressible/rhoPimplecFoam/angledDuct/0/epsilon
 create mode 100644 tutorials/compressible/rhoPimplecFoam/angledDuct/0/k
 create mode 100644 tutorials/compressible/rhoPimplecFoam/angledDuct/0/mut
 create mode 100644 tutorials/compressible/rhoPimplecFoam/angledDuct/0/p
 create mode 100755 tutorials/compressible/rhoPimplecFoam/angledDuct/Allrun
 create mode 100644 tutorials/compressible/rhoPimplecFoam/angledDuct/constant/RASProperties
 create mode 100644 tutorials/compressible/rhoPimplecFoam/angledDuct/constant/polyMesh/blockMeshDict.m4
 create mode 100644 tutorials/compressible/rhoPimplecFoam/angledDuct/constant/polyMesh/boundary
 create mode 100644 tutorials/compressible/rhoPimplecFoam/angledDuct/constant/porousZones
 create mode 100644 tutorials/compressible/rhoPimplecFoam/angledDuct/constant/thermophysicalProperties
 create mode 100644 tutorials/compressible/rhoPimplecFoam/angledDuct/constant/turbulenceProperties
 create mode 100644 tutorials/compressible/rhoPimplecFoam/angledDuct/system/controlDict
 create mode 100644 tutorials/compressible/rhoPimplecFoam/angledDuct/system/fvSchemes
 create mode 100644 tutorials/compressible/rhoPimplecFoam/angledDuct/system/fvSolution

diff --git a/applications/solvers/compressible/rhoPimpleFoam/rhoPimplecFoam/Make/files b/applications/solvers/compressible/rhoPimpleFoam/rhoPimplecFoam/Make/files
new file mode 100644
index 0000000000..5bb1f8d023
--- /dev/null
+++ b/applications/solvers/compressible/rhoPimpleFoam/rhoPimplecFoam/Make/files
@@ -0,0 +1,3 @@
+rhoPimplecFoam.C
+
+EXE = $(FOAM_APPBIN)/rhoPimplecFoam
diff --git a/applications/solvers/compressible/rhoPimpleFoam/rhoPimplecFoam/Make/options b/applications/solvers/compressible/rhoPimpleFoam/rhoPimplecFoam/Make/options
new file mode 100644
index 0000000000..d16a0ee1d8
--- /dev/null
+++ b/applications/solvers/compressible/rhoPimpleFoam/rhoPimplecFoam/Make/options
@@ -0,0 +1,15 @@
+EXE_INC = \
+    -I.. \
+    -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
+    -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel \
+    -I$(LIB_SRC)/finiteVolume/cfdTools \
+    -I$(LIB_SRC)/finiteVolume/lnInclude
+
+EXE_LIBS = \
+    -lbasicThermophysicalModels \
+    -lspecie \
+    -lcompressibleTurbulenceModel \
+    -lcompressibleRASModels \
+    -lcompressibleLESModels \
+    -lfiniteVolume \
+    -lmeshTools
diff --git a/applications/solvers/compressible/rhoPimpleFoam/rhoPimplecFoam/pEqn.H b/applications/solvers/compressible/rhoPimpleFoam/rhoPimplecFoam/pEqn.H
new file mode 100644
index 0000000000..7ef1b62533
--- /dev/null
+++ b/applications/solvers/compressible/rhoPimpleFoam/rhoPimplecFoam/pEqn.H
@@ -0,0 +1,117 @@
+rho = thermo.rho();
+rho = max(rho, rhoMin);
+rho = min(rho, rhoMax);
+rho.relax();
+
+volScalarField rAU(1.0/UEqn().A());
+volScalarField rAtU(1.0/(1.0/rAU - UEqn().H1()));
+
+volVectorField HbyA("HbyA", U);
+HbyA = rAU*UEqn().H();
+
+if (pimple.nCorrPIMPLE() <= 1)
+{
+    UEqn.clear();
+}
+
+if (pimple.transonic())
+{
+    surfaceScalarField phid
+    (
+        "phid",
+        fvc::interpolate(psi)
+       *(
+            (fvc::interpolate(HbyA) & mesh.Sf())
+          + fvc::ddtPhiCorr(rAU, rho, U, phi)
+        )
+    );
+
+    surfaceScalarField phic
+    (
+        "phic",
+        fvc::interpolate(rho*(rAtU - rAU))*fvc::snGrad(p)*mesh.magSf()
+    );
+
+    HbyA -= (rAU - rAtU)*fvc::grad(p);
+
+    volScalarField Dp("Dp", rho*rAtU);
+
+    while (pimple.correctNonOrthogonal())
+    {
+        fvScalarMatrix pEqn
+        (
+            fvm::ddt(psi, p)
+          + fvm::div(phid, p)
+          + fvc::div(phic)
+          - fvm::laplacian(Dp, p)
+        );
+
+        // Relax the pressure equation to maintain diagonal dominance
+        pEqn.relax();
+
+        pEqn.solve();
+
+        if (pimple.finalNonOrthogonalIter())
+        {
+            phi == phic + pEqn.flux();
+        }
+    }
+}
+else
+{
+    surfaceScalarField phiHbyA
+    (
+        "phiHbyA",
+        fvc::interpolate(rho)
+       *(
+            (fvc::interpolate(HbyA) & mesh.Sf())
+          + fvc::ddtPhiCorr(rAU, rho, U, phi)
+        )
+    );
+
+    phiHbyA += fvc::interpolate(rho*(rAtU - rAU))*fvc::snGrad(p)*mesh.magSf();
+    HbyA -= (rAU - rAtU)*fvc::grad(p);
+
+    volScalarField Dp("Dp", rho*rAtU);
+
+    while (pimple.correctNonOrthogonal())
+    {
+        fvScalarMatrix pEqn
+        (
+            fvm::ddt(psi, p)
+          + fvc::div(phiHbyA)
+          - fvm::laplacian(Dp, p)
+        );
+
+        pEqn.solve();
+
+        if (pimple.finalNonOrthogonalIter())
+        {
+            phi = phiHbyA + pEqn.flux();
+        }
+    }
+}
+
+#include "rhoEqn.H"
+#include "compressibleContinuityErrs.H"
+
+// Explicitly relax pressure for momentum corrector
+p.relax();
+
+U = HbyA - rAtU*fvc::grad(p);
+U.correctBoundaryConditions();
+K = 0.5*magSqr(U);
+
+dpdt = fvc::ddt(p);
+
+// Recalculate density from the relaxed pressure
+rho = thermo.rho();
+rho = max(rho, rhoMin);
+rho = min(rho, rhoMax);
+
+if (!pimple.transonic())
+{
+    rho.relax();
+}
+
+Info<< "rho max/min : " << max(rho).value() << " " << min(rho).value() << endl;
diff --git a/applications/solvers/compressible/rhoPimpleFoam/rhoPimplecFoam/rhoPimplecFoam.C b/applications/solvers/compressible/rhoPimpleFoam/rhoPimplecFoam/rhoPimplecFoam.C
new file mode 100644
index 0000000000..0b01f51c82
--- /dev/null
+++ b/applications/solvers/compressible/rhoPimpleFoam/rhoPimplecFoam/rhoPimplecFoam.C
@@ -0,0 +1,105 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Application
+    rhoPimplecFoam
+
+Description
+    Transient solver for laminar or turbulent flow of compressible fluids
+    for HVAC and similar applications.
+
+    Uses the flexible PIMPLEC (PISOC-SIMPLEC) solution for time-resolved and
+    pseudo-transient simulations.
+
+\*---------------------------------------------------------------------------*/
+
+#include "fvCFD.H"
+#include "basicPsiThermo.H"
+#include "turbulenceModel.H"
+#include "bound.H"
+#include "pimpleControl.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+int main(int argc, char *argv[])
+{
+    #include "setRootCase.H"
+    #include "createTime.H"
+    #include "createMesh.H"
+
+    pimpleControl pimple(mesh);
+
+    #include "createFields.H"
+    #include "initContinuityErrs.H"
+
+    // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+    Info<< "\nStarting time loop\n" << endl;
+
+    while (runTime.run())
+    {
+        #include "readTimeControls.H"
+        #include "compressibleCourantNo.H"
+        #include "setDeltaT.H"
+
+        runTime++;
+
+        Info<< "Time = " << runTime.timeName() << nl << endl;
+
+        if (pimple.nCorrPIMPLE() <= 1)
+        {
+            #include "rhoEqn.H"
+        }
+
+        // --- Pressure-velocity PIMPLE corrector loop
+        while (pimple.loop())
+        {
+            #include "UEqn.H"
+            #include "hEqn.H"
+
+            // --- Pressure corrector loop
+            while (pimple.correct())
+            {
+                #include "pEqn.H"
+            }
+
+            if (pimple.turbCorr())
+            {
+                turbulence->correct();
+            }
+        }
+
+        runTime.write();
+
+        Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
+            << "  ClockTime = " << runTime.elapsedClockTime() << " s"
+            << nl << endl;
+    }
+
+    Info<< "End\n" << endl;
+
+    return 0;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/compressible/rhoPimplecFoam/angledDuct/0/T b/tutorials/compressible/rhoPimplecFoam/angledDuct/0/T
new file mode 100644
index 0000000000..561ca236be
--- /dev/null
+++ b/tutorials/compressible/rhoPimplecFoam/angledDuct/0/T
@@ -0,0 +1,54 @@
+/*--------------------------------*- 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;
+    object      T;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 0 0 1 0 0 0];
+
+internalField   uniform 293;
+
+boundaryField
+{
+
+    front
+    {
+        type            zeroGradient;
+    }
+    back
+    {
+        type            zeroGradient;
+    }
+    wall
+    {
+        type            zeroGradient;
+    }
+    porosityWall
+    {
+        type            zeroGradient;
+    }
+
+    inlet
+    {
+        type            fixedValue;
+        value           $internalField;
+    }
+    outlet
+    {
+        type            inletOutlet;
+        value           $internalField;
+        inletValue      $internalField;
+    }
+}
+
+// ************************************************************************* //
diff --git a/tutorials/compressible/rhoPimplecFoam/angledDuct/0/U b/tutorials/compressible/rhoPimplecFoam/angledDuct/0/U
new file mode 100644
index 0000000000..277f93a33b
--- /dev/null
+++ b/tutorials/compressible/rhoPimplecFoam/angledDuct/0/U
@@ -0,0 +1,57 @@
+/*--------------------------------*- 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       volVectorField;
+    object      U;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 1 -1 0 0 0 0];
+
+internalField   uniform (0 0 0);
+
+boundaryField
+{
+    front
+    {
+        type            fixedValue;
+        value           uniform (0 0 0);
+    }
+    back
+    {
+        type            fixedValue;
+        value           uniform (0 0 0);
+    }
+    wall
+    {
+        type            fixedValue;
+        value           uniform (0 0 0);
+    }
+    porosityWall
+    {
+        type            slip;
+        value           uniform (0 0 0);
+    }
+    inlet
+    {
+        type            flowRateInletVelocity;
+        flowRate        constant 0.65;
+        value           uniform (0 0 0);
+    }
+    outlet
+    {
+        type            pressureInletOutletVelocity;
+        value           uniform (0 0 0);
+        inletValue      uniform (0 0 0);
+    }
+}
+
+// ************************************************************************* //
diff --git a/tutorials/compressible/rhoPimplecFoam/angledDuct/0/alphat b/tutorials/compressible/rhoPimplecFoam/angledDuct/0/alphat
new file mode 100644
index 0000000000..f609fa6c14
--- /dev/null
+++ b/tutorials/compressible/rhoPimplecFoam/angledDuct/0/alphat
@@ -0,0 +1,57 @@
+/*--------------------------------*- 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
+{
+    front
+    {
+        type            alphatWallFunction;
+        value           uniform 0;
+    }
+    back
+    {
+        type            alphatWallFunction;
+        value           uniform 0;
+    }
+    wall
+    {
+        type            alphatWallFunction;
+        value           uniform 0;
+    }
+    porosityWall
+    {
+        type            alphatWallFunction;
+        value           uniform 0;
+    }
+    inlet
+    {
+        type            calculated;
+        value           uniform 0;
+    }
+    outlet
+    {
+        type            calculated;
+        value           uniform 0;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/compressible/rhoPimplecFoam/angledDuct/0/epsilon b/tutorials/compressible/rhoPimplecFoam/angledDuct/0/epsilon
new file mode 100644
index 0000000000..e4dccfe577
--- /dev/null
+++ b/tutorials/compressible/rhoPimplecFoam/angledDuct/0/epsilon
@@ -0,0 +1,59 @@
+/*--------------------------------*- 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      epsilon;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 2 -3 0 0 0 0];
+
+internalField   uniform 200;
+
+boundaryField
+{
+    front
+    {
+        type            compressible::epsilonWallFunction;
+        value           uniform 200;
+    }
+    back
+    {
+        type            compressible::epsilonWallFunction;
+        value           uniform 200;
+    }
+    wall
+    {
+        type            compressible::epsilonWallFunction;
+        value           uniform 200;
+    }
+    porosityWall
+    {
+        type            compressible::epsilonWallFunction;
+        value           uniform 200;
+    }
+    inlet
+    {
+        type            compressible::turbulentMixingLengthDissipationRateInlet;
+        mixingLength    0.005;
+        value           uniform 200;
+    }
+    outlet
+    {
+        type            inletOutlet;
+        inletValue      uniform 200;
+        value           uniform 200;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/compressible/rhoPimplecFoam/angledDuct/0/k b/tutorials/compressible/rhoPimplecFoam/angledDuct/0/k
new file mode 100644
index 0000000000..655a91bb45
--- /dev/null
+++ b/tutorials/compressible/rhoPimplecFoam/angledDuct/0/k
@@ -0,0 +1,59 @@
+/*--------------------------------*- 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      k;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 2 -2 0 0 0 0];
+
+internalField   uniform 1;
+
+boundaryField
+{
+    front
+    {
+        type            compressible::kqRWallFunction;
+        value           uniform 1;
+    }
+    back
+    {
+        type            compressible::kqRWallFunction;
+        value           uniform 1;
+    }
+    wall
+    {
+        type            compressible::kqRWallFunction;
+        value           uniform 1;
+    }
+    porosityWall
+    {
+        type            compressible::kqRWallFunction;
+        value           uniform 1;
+    }
+    inlet
+    {
+        type            turbulentIntensityKineticEnergyInlet;
+        intensity       0.05;
+        value           uniform 1;
+    }
+    outlet
+    {
+        type            inletOutlet;
+        inletValue      uniform 1;
+        value           uniform 1;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/compressible/rhoPimplecFoam/angledDuct/0/mut b/tutorials/compressible/rhoPimplecFoam/angledDuct/0/mut
new file mode 100644
index 0000000000..0cea2db2d2
--- /dev/null
+++ b/tutorials/compressible/rhoPimplecFoam/angledDuct/0/mut
@@ -0,0 +1,57 @@
+/*--------------------------------*- 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
+{
+    front
+    {
+        type            mutkWallFunction;
+        value           uniform 0;
+    }
+    back
+    {
+        type            mutkWallFunction;
+        value           uniform 0;
+    }
+    wall
+    {
+        type            mutkWallFunction;
+        value           uniform 0;
+    }
+    porosityWall
+    {
+        type            mutkWallFunction;
+        value           uniform 0;
+    }
+    inlet
+    {
+        type            calculated;
+        value           uniform 0;
+    }
+    outlet
+    {
+        type            calculated;
+        value           uniform 0;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/compressible/rhoPimplecFoam/angledDuct/0/p b/tutorials/compressible/rhoPimplecFoam/angledDuct/0/p
new file mode 100644
index 0000000000..21db04d610
--- /dev/null
+++ b/tutorials/compressible/rhoPimplecFoam/angledDuct/0/p
@@ -0,0 +1,51 @@
+/*--------------------------------*- 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;
+    object      p;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [1 -1 -2 0 0 0 0];
+
+internalField   uniform 1.0e5;
+
+boundaryField
+{
+    front
+    {
+        type            zeroGradient;
+    }
+    back
+    {
+        type            zeroGradient;
+    }
+    wall
+    {
+        type            zeroGradient;
+    }
+    porosityWall
+    {
+        type            zeroGradient;
+    }
+
+    inlet
+    {
+        type            zeroGradient;
+    }
+    outlet
+    {
+        type            fixedValue;
+        value           $internalField;
+    }
+}
+
+// ************************************************************************* //
diff --git a/tutorials/compressible/rhoPimplecFoam/angledDuct/Allrun b/tutorials/compressible/rhoPimplecFoam/angledDuct/Allrun
new file mode 100755
index 0000000000..c9fa982557
--- /dev/null
+++ b/tutorials/compressible/rhoPimplecFoam/angledDuct/Allrun
@@ -0,0 +1,10 @@
+#!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
+
+m4 constant/polyMesh/blockMeshDict.m4 > constant/polyMesh/blockMeshDict
+
+# Source tutorial run functions
+. $WM_PROJECT_DIR/bin/tools/RunFunctions
+
+runApplication blockMesh
+runApplication `getApplication`
diff --git a/tutorials/compressible/rhoPimplecFoam/angledDuct/constant/RASProperties b/tutorials/compressible/rhoPimplecFoam/angledDuct/constant/RASProperties
new file mode 100644
index 0000000000..a4937b503a
--- /dev/null
+++ b/tutorials/compressible/rhoPimplecFoam/angledDuct/constant/RASProperties
@@ -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      RASProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+RASModel        kEpsilon;
+
+turbulence      on;
+
+printCoeffs     on;
+
+
+// ************************************************************************* //
diff --git a/tutorials/compressible/rhoPimplecFoam/angledDuct/constant/polyMesh/blockMeshDict.m4 b/tutorials/compressible/rhoPimplecFoam/angledDuct/constant/polyMesh/blockMeshDict.m4
new file mode 100644
index 0000000000..79da11e10a
--- /dev/null
+++ b/tutorials/compressible/rhoPimplecFoam/angledDuct/constant/polyMesh/blockMeshDict.m4
@@ -0,0 +1,165 @@
+/*--------------------------------*- 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;
+    object      blockMeshDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// block definition for a porosity with an angled inlet/outlet
+// the porosity is not aligned with the main axes
+//
+dnl> -----------------------------------------------------------------
+dnl> <STANDARD DEFINTIONS>
+dnl>
+changecom(//)changequote([,]) dnl>
+define(calc, [esyscmd(perl -e 'print ($1)')]) dnl>
+define(VCOUNT, 0)  dnl>
+define(vlabel, [[// ]pt VCOUNT ($1) define($1, VCOUNT)define([VCOUNT], incr(VCOUNT))])  dnl>
+dnl>
+define(hex2D, hex ($1b $2b $3b $4b $1f $2f $3f $4f)) dnl>
+define(quad2D, ($1f $1b $2b $2f))  dnl>
+define(frontQuad, ($1f $2f $3f $4f)) dnl>
+define(backQuad, ($4b $3b $2b $1b)) dnl>
+dnl>
+dnl> </STANDARD DEFINTIONS>
+dnl> -----------------------------------------------------------------
+dnl>
+define(ncells, 20) dnl>
+define(ninlet, 15) dnl>
+define(nporo, 20) dnl>
+define(noutlet, 20) dnl>
+dnl>
+define(x0,0) dnl>
+define(y0,0) dnl>
+define(y0,0) dnl>
+define(Cos,0.7071067812) dnl>   == cos(45)
+define(Sin,0.7071067812) dnl>   == sin(45)
+dnl>
+define(width,50) dnl>
+define(zBack,calc(-width/2)) dnl>
+define(zFront,calc(width/2)) dnl>
+define(leninlet,150)dnl>
+define(lenporo,100)dnl>
+define(lenoutlet,100)dnl>
+dnl>
+define(xhyp,calc(Sin*width)) dnl>
+define(yhyp,calc(Cos*width)) dnl>
+define(xinlet,leninlet)dnl>
+define(xporo,calc(Cos*lenporo)) dnl>
+define(yporo,calc(Sin*lenporo)) dnl>
+define(xoutlet,calc(xporo + Cos*lenoutlet)) dnl>
+define(youtlet,calc(yporo + Sin*lenoutlet)) dnl>
+dnl>
+
+convertToMeters 0.001;
+
+vertices
+(
+    // inlet region
+    ( -xinlet  y0  zBack )  vlabel(in1b)
+    ( -xinlet yhyp  zBack ) vlabel(in2b)
+    ( -xinlet  y0  zFront )  vlabel(in1f)
+    ( -xinlet yhyp  zFront ) vlabel(in2f)
+
+    // join inlet->outlet
+    (  x0 y0  zBack )    vlabel(join1b)
+    ( -xhyp   yhyp  zBack ) vlabel(join2b)
+    (  x0 y0  zFront )    vlabel(join1f)
+    ( -xhyp   yhyp  zFront ) vlabel(join2f)
+
+    // porosity ends ->outlet
+    ( xporo yporo  zBack )  vlabel(poro1b)
+    ( calc(xporo - xhyp) calc(yporo + yhyp)  zBack )  vlabel(poro2b)
+    ( xporo yporo  zFront )  vlabel(poro1f)
+    ( calc(xporo - xhyp) calc(yporo + yhyp)  zFront )  vlabel(poro2f)
+
+    // outlet
+    ( xoutlet youtlet zBack ) vlabel(out1b)
+    ( calc(xoutlet - xhyp) calc(youtlet + yhyp) zBack ) vlabel(out2b)
+    ( xoutlet youtlet zFront ) vlabel(out1f)
+    ( calc(xoutlet - xhyp) calc(youtlet + yhyp) zFront ) vlabel(out2f)
+);
+
+blocks
+(
+    // inlet block
+    hex2D(in1, join1, join2, in2)
+    inlet ( ninlet ncells ncells ) simpleGrading (1 1 1)
+
+    // porosity block
+    hex2D(join1, poro1, poro2, join2)
+    porosity ( nporo ncells ncells ) simpleGrading (1 1 1)
+
+    // outlet block
+    hex2D(poro1, out1, out2, poro2)
+    outlet ( noutlet ncells ncells )  simpleGrading (1 1 1)
+);
+
+edges
+(
+);
+
+patches
+(
+    // is there no way of defining all my 'defaultFaces' to be 'wall'?
+    wall front
+    (
+    // inlet block
+    frontQuad(in1, join1, join2, in2)
+    // outlet block
+    frontQuad(poro1, out1, out2, poro2)
+    )
+
+    wall back
+    (
+    // inlet block
+    backQuad(in1, join1, join2, in2)
+    // outlet block
+    backQuad(poro1, out1, out2, poro2)
+    )
+
+    wall wall
+    (
+    // inlet block
+    quad2D(in1, join1)
+    quad2D(join2, in2)
+    // outlet block
+    quad2D(poro1, out1)
+    quad2D(out2, poro2)
+    )
+
+    wall porosityWall
+    (
+    // porosity block
+    frontQuad(join1, poro1, poro2, join2)
+    // porosity block
+    backQuad(join1, poro1, poro2, join2)
+    // porosity block
+    quad2D(join1, poro1)
+    quad2D(poro2, join2)
+    )
+
+    patch inlet
+    (
+    quad2D(in2, in1)
+    )
+
+    patch outlet
+    (
+    quad2D(out2, out1)
+    )
+);
+
+mergePatchPairs
+(
+);
+
+// ************************************************************************* //
diff --git a/tutorials/compressible/rhoPimplecFoam/angledDuct/constant/polyMesh/boundary b/tutorials/compressible/rhoPimplecFoam/angledDuct/constant/polyMesh/boundary
new file mode 100644
index 0000000000..0abd1608ab
--- /dev/null
+++ b/tutorials/compressible/rhoPimplecFoam/angledDuct/constant/polyMesh/boundary
@@ -0,0 +1,58 @@
+/*--------------------------------*- 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;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+6
+(
+    front
+    {
+        type            wall;
+        nFaces          700;
+        startFace       63400;
+    }
+    back
+    {
+        type            wall;
+        nFaces          700;
+        startFace       64100;
+    }
+    wall
+    {
+        type            wall;
+        nFaces          1400;
+        startFace       64800;
+    }
+    porosityWall
+    {
+        type            wall;
+        nFaces          1600;
+        startFace       66200;
+    }
+    inlet
+    {
+        type            patch;
+        nFaces          400;
+        startFace       67800;
+    }
+    outlet
+    {
+        type            patch;
+        nFaces          400;
+        startFace       68200;
+    }
+)
+
+// ************************************************************************* //
diff --git a/tutorials/compressible/rhoPimplecFoam/angledDuct/constant/porousZones b/tutorials/compressible/rhoPimplecFoam/angledDuct/constant/porousZones
new file mode 100644
index 0000000000..afeb6461e1
--- /dev/null
+++ b/tutorials/compressible/rhoPimplecFoam/angledDuct/constant/porousZones
@@ -0,0 +1,36 @@
+/*--------------------------------*- 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      porousZones;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+1
+(
+    porosity
+    {
+        coordinateSystem
+        {
+            e1  (0.70710678 0.70710678 0);
+            e2  (0 0 1);
+        }
+
+        Darcy
+        {
+            d   d [0 -2 0 0 0 0 0] (5e7 -1000 -1000);
+            f   f [0 -1 0 0 0 0 0] (0 0 0);
+        }
+    }
+)
+
+// ************************************************************************* //
diff --git a/tutorials/compressible/rhoPimplecFoam/angledDuct/constant/thermophysicalProperties b/tutorials/compressible/rhoPimplecFoam/angledDuct/constant/thermophysicalProperties
new file mode 100644
index 0000000000..d6d597d433
--- /dev/null
+++ b/tutorials/compressible/rhoPimplecFoam/angledDuct/constant/thermophysicalProperties
@@ -0,0 +1,40 @@
+/*--------------------------------*- 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      thermophysicalProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+thermoType      hPsiThermo<pureMixture<sutherlandTransport<specieThermo<hConstThermo<perfectGas>>>>>;
+
+mixture
+{
+    specie
+    {
+        nMoles      1;
+        molWeight   28.9;
+    }
+    thermodynamics
+    {
+        Cp          1007;
+        Hf          0;
+    }
+    transport
+    {
+        As          1.4792e-06;
+        Ts          116;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/compressible/rhoPimplecFoam/angledDuct/constant/turbulenceProperties b/tutorials/compressible/rhoPimplecFoam/angledDuct/constant/turbulenceProperties
new file mode 100644
index 0000000000..3721a46a2e
--- /dev/null
+++ b/tutorials/compressible/rhoPimplecFoam/angledDuct/constant/turbulenceProperties
@@ -0,0 +1,21 @@
+/*--------------------------------*- 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      turbulenceProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+simulationType  RASModel;
+
+
+// ************************************************************************* //
diff --git a/tutorials/compressible/rhoPimplecFoam/angledDuct/system/controlDict b/tutorials/compressible/rhoPimplecFoam/angledDuct/system/controlDict
new file mode 100644
index 0000000000..bbcbeb2543
--- /dev/null
+++ b/tutorials/compressible/rhoPimplecFoam/angledDuct/system/controlDict
@@ -0,0 +1,55 @@
+/*--------------------------------*- 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    "system";
+    object      controlDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+application     rhoPimplecFoam;
+
+startFrom       startTime;
+
+startTime       0;
+
+stopAt          endTime;
+
+endTime         10;
+
+deltaT          1;
+
+writeControl    adjustableRunTime;
+
+writeInterval   10;
+
+purgeWrite      0;
+
+writeFormat     ascii;
+
+writePrecision  6;
+
+writeCompression off;
+
+timeFormat      general;
+
+timePrecision   6;
+
+runTimeModifiable true;
+
+adjustTimeStep  no;
+
+maxCo           10;
+
+maxDeltaT       1;
+
+
+// ************************************************************************* //
diff --git a/tutorials/compressible/rhoPimplecFoam/angledDuct/system/fvSchemes b/tutorials/compressible/rhoPimplecFoam/angledDuct/system/fvSchemes
new file mode 100644
index 0000000000..391c95e6dc
--- /dev/null
+++ b/tutorials/compressible/rhoPimplecFoam/angledDuct/system/fvSchemes
@@ -0,0 +1,76 @@
+/*--------------------------------*- 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    "system";
+    object      fvSchemes;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+ddtSchemes
+{
+    default         Euler;
+}
+
+gradSchemes
+{
+    default         Gauss linear;
+    grad(p)         Gauss linear;
+}
+
+divSchemes
+{
+    default         none;
+    div(phi,U)      Gauss upwind;
+    div(phid,p)     Gauss upwind;
+    div(phi,K)      Gauss linear;
+    div(phi,h)      Gauss upwind;
+    div(phi,k)      Gauss upwind;
+    div(phi,epsilon) Gauss upwind;
+    div(phi,R)      Gauss upwind;
+    div(phi,omega)  Gauss upwind;
+    div((rho*R))    Gauss linear;
+    div(R)          Gauss linear;
+    div(U)          Gauss linear;
+    div((muEff*dev2(T(grad(U))))) Gauss linear;
+}
+
+laplacianSchemes
+{
+    default         none;
+    laplacian(muEff,U) Gauss linear corrected;
+    laplacian(mut,U) Gauss linear corrected;
+    laplacian(DkEff,k) Gauss linear corrected;
+    laplacian(DepsilonEff,epsilon) Gauss linear corrected;
+    laplacian(DREff,R) Gauss linear corrected;
+    laplacian(DomegaEff,omega) Gauss linear corrected;
+    laplacian(Dp,p) Gauss linear corrected;
+    laplacian(alphaEff,h) Gauss linear corrected;
+}
+
+interpolationSchemes
+{
+    default         linear;
+}
+
+snGradSchemes
+{
+    default         corrected;
+}
+
+fluxRequired
+{
+    default         no;
+    p               ;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/compressible/rhoPimplecFoam/angledDuct/system/fvSolution b/tutorials/compressible/rhoPimplecFoam/angledDuct/system/fvSolution
new file mode 100644
index 0000000000..593aacfcfe
--- /dev/null
+++ b/tutorials/compressible/rhoPimplecFoam/angledDuct/system/fvSolution
@@ -0,0 +1,91 @@
+/*--------------------------------*- 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    "system";
+    object      fvSolution;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+solvers
+{
+    p
+    {
+        //solver          PCG;
+        //preconditioner  DIC;
+        solver          PBiCG;
+        preconditioner  DILU;
+        tolerance       1e-06;
+        relTol          0.01;
+    }
+
+    pFinal
+    {
+        $p;
+        tolerance       1e-06;
+        relTol          0;
+    }
+
+    "(rho|U|h|k|epsilon|omega)"
+    {
+        solver          PBiCG;
+        preconditioner  DILU;
+        tolerance       1e-05;
+        relTol          0.1;
+    }
+
+    "(rho|U|h|k|epsilon|omega)Final"
+    {
+        $U;
+        tolerance       1e-05;
+        relTol          0;
+    }
+
+}
+
+PIMPLE
+{
+    momentumPredictor yes;
+    transonic       yes;
+    nOuterCorrectors 50;
+    nCorrectors     1;
+    nNonOrthogonalCorrectors 0;
+    rhoMin          rhoMin [ 1 -3 0 0 0 ] 0.1;
+    rhoMax          rhoMax [ 1 -3 0 0 0 ] 3.0;
+
+    residualControl
+    {
+        "(U|k|epsilon)"
+        {
+            relTol          0;
+            tolerance       0.0001;
+        }
+    }
+
+    turbOnFinalIterOnly off;
+}
+
+relaxationFactors
+{
+    fields
+    {
+        "p.*"           1;
+        "rho.*"         1;
+    }
+    equations
+    {
+        "(U|h|k|epsilon|omega).*" 0.85;
+        "p.*" 1;
+    }
+}
+
+
+// ************************************************************************* //

From b55941c07f0b6acd250b74822a6a42b284ebe2dc Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Thu, 3 May 2012 14:15:15 +0100
Subject: [PATCH 297/317] compressible solvers: Name pressure diffusivity Dp

---
 .../compressible/rhoPimpleFoam/Allwmake       |  1 +
 .../solvers/compressible/rhoPimpleFoam/UEqn.H |  3 +-
 .../solvers/compressible/rhoPimpleFoam/hEqn.H |  6 +-
 .../solvers/compressible/rhoPimpleFoam/pEqn.H |  9 ++-
 .../rhoPimpleFoam/rhoPimpleFoam.C             |  5 +-
 .../rhoPorousMRFLTSPimpleFoam.C               |  5 +-
 .../rhoPorousMRFPimpleFoam/UEqn.H             |  2 -
 .../rhoPorousMRFPimpleFoam/pEqn.H             |  8 +-
 .../rhoPorousMRFPimpleFoam.C                  |  5 +-
 .../solvers/compressible/rhoSimpleFoam/hEqn.H |  1 -
 .../rhoSimplecFoam/createFields.H             | 61 ----------------
 .../rhoSimpleFoam/rhoSimplecFoam/pEqn.H       | 73 ++++++++++---------
 .../solvers/compressible/sonicFoam/pEqn.H     |  5 +-
 .../sonicFoam/sonicDyMFoam/pEqn.H             |  4 +-
 .../les/pitzDaily/system/fvSchemes            |  2 +-
 .../rhoPimpleFoam/ras/angledDuct/0/U          |  2 +-
 .../ras/angledDuct/system/fvSchemes           |  2 +-
 .../ras/angledDuct/system/fvSolution          |  3 +
 .../rhoPimpleFoam/ras/cavity/system/fvSchemes |  2 +-
 .../angledDuct/system/fvSchemes               |  2 +-
 .../mixerVessel2D/system/fvSchemes            |  2 +-
 .../angledDuctExplicit/system/fvSchemes       |  1 -
 .../constant/polyMesh/boundary                |  2 +-
 .../laminar/forwardStep/system/fvSchemes      |  2 +-
 .../laminar/shockTube/system/fvSchemes        |  2 +-
 .../ras/nacaAirfoil/system/fvSchemes          |  2 +-
 .../sonicFoam/ras/prism/system/fvSchemes      |  2 +-
 .../decompressionTank/system/fvSchemes        |  2 +-
 28 files changed, 92 insertions(+), 124 deletions(-)
 delete mode 100644 applications/solvers/compressible/rhoSimpleFoam/rhoSimplecFoam/createFields.H

diff --git a/applications/solvers/compressible/rhoPimpleFoam/Allwmake b/applications/solvers/compressible/rhoPimpleFoam/Allwmake
index 241e22eb1b..f6f8ad3635 100755
--- a/applications/solvers/compressible/rhoPimpleFoam/Allwmake
+++ b/applications/solvers/compressible/rhoPimpleFoam/Allwmake
@@ -3,6 +3,7 @@ cd ${0%/*} || exit 1    # run from this directory
 set -x
 
 wmake
+wmake rhoPimplecFoam
 wmake rhoPorousMRFPimpleFoam
 wmake rhoPorousMRFLTSPimpleFoam
 
diff --git a/applications/solvers/compressible/rhoPimpleFoam/UEqn.H b/applications/solvers/compressible/rhoPimpleFoam/UEqn.H
index 1e39e983e4..b7b4b04db5 100644
--- a/applications/solvers/compressible/rhoPimpleFoam/UEqn.H
+++ b/applications/solvers/compressible/rhoPimpleFoam/UEqn.H
@@ -4,13 +4,12 @@ tmp<fvVectorMatrix> UEqn
 (
     fvm::ddt(rho, U)
   + fvm::div(phi, U)
+  - fvm::Sp(fvc::ddt(rho) + fvc::div(phi), U)
   + turbulence->divDevRhoReff(U)
 );
 
 UEqn().relax();
 
-volScalarField rAU(1.0/UEqn().A());
-
 if (pimple.momentumPredictor())
 {
     solve(UEqn() == -fvc::grad(p));
diff --git a/applications/solvers/compressible/rhoPimpleFoam/hEqn.H b/applications/solvers/compressible/rhoPimpleFoam/hEqn.H
index b1d9e4e8b0..57d72887e6 100644
--- a/applications/solvers/compressible/rhoPimpleFoam/hEqn.H
+++ b/applications/solvers/compressible/rhoPimpleFoam/hEqn.H
@@ -3,10 +3,14 @@
     (
         fvm::ddt(rho, h)
       + fvm::div(phi, h)
+      - fvm::Sp(fvc::ddt(rho) + fvc::div(phi), h)
       - fvm::laplacian(turbulence->alphaEff(), h)
      ==
         dpdt
-      - (fvc::ddt(rho, K) + fvc::div(phi, K))
+      - (
+            fvc::ddt(rho, K) + fvc::div(phi, K)
+          - (fvc::ddt(rho) + fvc::div(phi))*K
+        )
     );
 
     hEqn.relax();
diff --git a/applications/solvers/compressible/rhoPimpleFoam/pEqn.H b/applications/solvers/compressible/rhoPimpleFoam/pEqn.H
index cfe34f2873..3d324e085b 100644
--- a/applications/solvers/compressible/rhoPimpleFoam/pEqn.H
+++ b/applications/solvers/compressible/rhoPimpleFoam/pEqn.H
@@ -3,6 +3,7 @@ rho = max(rho, rhoMin);
 rho = min(rho, rhoMax);
 rho.relax();
 
+volScalarField rAU(1.0/UEqn().A());
 volVectorField HbyA("HbyA", U);
 HbyA = rAU*UEqn().H();
 
@@ -23,13 +24,15 @@ if (pimple.transonic())
         )
     );
 
+    volScalarField Dp("Dp", rho*rAU);
+
     while (pimple.correctNonOrthogonal())
     {
         fvScalarMatrix pEqn
         (
             fvm::ddt(psi, p)
           + fvm::div(phid, p)
-          - fvm::laplacian(rho*rAU, p)
+          - fvm::laplacian(Dp, p)
         );
 
         pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter())));
@@ -52,6 +55,8 @@ else
         )
     );
 
+    volScalarField Dp("Dp", rho*rAU);
+
     while (pimple.correctNonOrthogonal())
     {
         // Pressure corrector
@@ -59,7 +64,7 @@ else
         (
             fvm::ddt(psi, p)
           + fvc::div(phiHbyA)
-          - fvm::laplacian(rho*rAU, p)
+          - fvm::laplacian(Dp, p)
         );
 
         pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter())));
diff --git a/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C b/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C
index 26d11a14aa..28a0009db7 100644
--- a/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C
+++ b/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C
@@ -66,7 +66,10 @@ int main(int argc, char *argv[])
 
         Info<< "Time = " << runTime.timeName() << nl << endl;
 
-        #include "rhoEqn.H"
+        if (pimple.nCorrPIMPLE() <= 1)
+        {
+            #include "rhoEqn.H"
+        }
 
         // --- Pressure-velocity PIMPLE corrector loop
         while (pimple.loop())
diff --git a/applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFLTSPimpleFoam/rhoPorousMRFLTSPimpleFoam.C b/applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFLTSPimpleFoam/rhoPorousMRFLTSPimpleFoam.C
index de32f1f5c6..f480326e28 100644
--- a/applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFLTSPimpleFoam/rhoPorousMRFLTSPimpleFoam.C
+++ b/applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFLTSPimpleFoam/rhoPorousMRFLTSPimpleFoam.C
@@ -74,7 +74,10 @@ int main(int argc, char *argv[])
 
         #include "setrDeltaT.H"
 
-        #include "rhoEqn.H"
+        if (pimple.nCorrPIMPLE() <= 1)
+        {
+            #include "rhoEqn.H"
+        }
 
         // --- Pressure-velocity PIMPLE corrector loop
         while (pimple.loop())
diff --git a/applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFPimpleFoam/UEqn.H b/applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFPimpleFoam/UEqn.H
index c63f0f8e4b..c24b1f587a 100644
--- a/applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFPimpleFoam/UEqn.H
+++ b/applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFPimpleFoam/UEqn.H
@@ -13,8 +13,6 @@ UEqn().relax();
 mrfZones.addCoriolis(rho, UEqn());
 pZones.addResistance(UEqn());
 
-volScalarField rAU(1.0/UEqn().A());
-
 if (pimple.momentumPredictor())
 {
     solve(UEqn() == -fvc::grad(p));
diff --git a/applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFPimpleFoam/pEqn.H b/applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFPimpleFoam/pEqn.H
index c5c7602a43..3c75e87e64 100644
--- a/applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFPimpleFoam/pEqn.H
+++ b/applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFPimpleFoam/pEqn.H
@@ -25,13 +25,15 @@ if (pimple.transonic())
     );
     mrfZones.relativeFlux(fvc::interpolate(psi), phid);
 
+    volScalarField Dp("Dp", rho*rAU);
+
     while (pimple.correctNonOrthogonal())
     {
         fvScalarMatrix pEqn
         (
             fvm::ddt(psi, p)
           + fvm::div(phid, p)
-          - fvm::laplacian(rho*rAU, p)
+          - fvm::laplacian(Dp, p)
         );
 
         pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter())));
@@ -56,6 +58,8 @@ else
 
     mrfZones.relativeFlux(fvc::interpolate(rho), phiHbyA);
 
+    volScalarField Dp("Dp", rho*rAU);
+
     while (pimple.correctNonOrthogonal())
     {
         // Pressure corrector
@@ -63,7 +67,7 @@ else
         (
             fvm::ddt(psi, p)
           + fvc::div(phiHbyA)
-          - fvm::laplacian(rho*rAU, p)
+          - fvm::laplacian(Dp, p)
         );
 
         pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter())));
diff --git a/applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFPimpleFoam/rhoPorousMRFPimpleFoam.C b/applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFPimpleFoam/rhoPorousMRFPimpleFoam.C
index 068de89952..64f18ab889 100644
--- a/applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFPimpleFoam/rhoPorousMRFPimpleFoam.C
+++ b/applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFPimpleFoam/rhoPorousMRFPimpleFoam.C
@@ -69,7 +69,10 @@ int main(int argc, char *argv[])
 
         Info<< "Time = " << runTime.timeName() << nl << endl;
 
-        #include "rhoEqn.H"
+        if (pimple.nCorrPIMPLE() <= 1)
+        {
+            #include "rhoEqn.H"
+        }
 
         // --- Pressure-velocity PIMPLE corrector loop
         while (pimple.loop())
diff --git a/applications/solvers/compressible/rhoSimpleFoam/hEqn.H b/applications/solvers/compressible/rhoSimpleFoam/hEqn.H
index 879578cf49..92cea341ca 100644
--- a/applications/solvers/compressible/rhoSimpleFoam/hEqn.H
+++ b/applications/solvers/compressible/rhoSimpleFoam/hEqn.H
@@ -11,7 +11,6 @@
     );
 
     hEqn.relax();
-
     hEqn.solve();
 
     thermo.correct();
diff --git a/applications/solvers/compressible/rhoSimpleFoam/rhoSimplecFoam/createFields.H b/applications/solvers/compressible/rhoSimpleFoam/rhoSimplecFoam/createFields.H
deleted file mode 100644
index 46a382864e..0000000000
--- a/applications/solvers/compressible/rhoSimpleFoam/rhoSimplecFoam/createFields.H
+++ /dev/null
@@ -1,61 +0,0 @@
-    Info<< "Reading thermophysical properties\n" << endl;
-
-    autoPtr<basicPsiThermo> pThermo
-    (
-        basicPsiThermo::New(mesh)
-    );
-    basicPsiThermo& thermo = pThermo();
-
-    volScalarField rho
-    (
-        IOobject
-        (
-            "rho",
-            runTime.timeName(),
-            mesh,
-            IOobject::READ_IF_PRESENT,
-            IOobject::AUTO_WRITE
-        ),
-        thermo.rho()
-    );
-
-    volScalarField& p = thermo.p();
-    volScalarField& h = thermo.h();
-    const volScalarField& psi = thermo.psi();
-
-    Info<< "Reading field U\n" << endl;
-    volVectorField U
-    (
-        IOobject
-        (
-            "U",
-            runTime.timeName(),
-            mesh,
-            IOobject::MUST_READ,
-            IOobject::AUTO_WRITE
-        ),
-        mesh
-    );
-
-    #include "compressibleCreatePhi.H"
-
-    label pRefCell = 0;
-    scalar pRefValue = 0.0;
-    setRefCell(p, simple.dict(), pRefCell, pRefValue);
-
-    dimensionedScalar rhoMax(simple.dict().lookup("rhoMax"));
-    dimensionedScalar rhoMin(simple.dict().lookup("rhoMin"));
-
-    Info<< "Creating turbulence model\n" << endl;
-    autoPtr<compressible::RASModel> turbulence
-    (
-        compressible::RASModel::New
-        (
-            rho,
-            U,
-            phi,
-            thermo
-        )
-    );
-
-    dimensionedScalar initialMass = fvc::domainIntegrate(rho);
diff --git a/applications/solvers/compressible/rhoSimpleFoam/rhoSimplecFoam/pEqn.H b/applications/solvers/compressible/rhoSimpleFoam/rhoSimplecFoam/pEqn.H
index 44babc3a6b..8c7405c346 100644
--- a/applications/solvers/compressible/rhoSimpleFoam/rhoSimplecFoam/pEqn.H
+++ b/applications/solvers/compressible/rhoSimpleFoam/rhoSimplecFoam/pEqn.H
@@ -3,11 +3,11 @@ rho = max(rho, rhoMin);
 rho = min(rho, rhoMax);
 rho.relax();
 
-volScalarField AU(UEqn().A());
-volScalarField AtU(AU - UEqn().H1());
+volScalarField rAU(1.0/UEqn().A());
+volScalarField rAtU(1.0/(1.0/rAU - UEqn().H1()));
 
 volVectorField HbyA("HbyA", U);
-HbyA = UEqn().H()/AU;
+HbyA = rAU*UEqn().H();
 
 UEqn.clear();
 
@@ -15,30 +15,32 @@ bool closedVolume = false;
 
 if (simple.transonic())
 {
+    surfaceScalarField phid
+    (
+        "phid",
+        fvc::interpolate(psi)*(fvc::interpolate(HbyA) & mesh.Sf())
+    );
+
+    surfaceScalarField phic
+    (
+        "phic",
+        fvc::interpolate(rho*(rAtU - rAU))*fvc::snGrad(p)*mesh.magSf()
+    );
+
+    HbyA -= (rAU - rAtU)*fvc::grad(p);
+
+    volScalarField Dp("Dp", rho*rAtU);
+
     while (simple.correctNonOrthogonal())
     {
-        surfaceScalarField phid
-        (
-            "phid",
-            fvc::interpolate(psi)*(fvc::interpolate(HbyA) & mesh.Sf())
-        );
-
-        surfaceScalarField phic
-        (
-            "phic",
-            fvc::interpolate(rho/AtU - rho/AU)*fvc::snGrad(p)*mesh.magSf()
-        );
-
-        HbyA -= fvc::grad(p)*(1.0/AU - 1.0/AtU);
-
         fvScalarMatrix pEqn
         (
             fvm::div(phid, p)
           + fvc::div(phic)
-          - fvm::laplacian(rho/AtU, p)
+          - fvm::laplacian(Dp, p)
         );
 
-        // Relax the pressure equation to ensure diagonal-dominance
+        // Relax the pressure equation to maintain diagonal dominance
         pEqn.relax();
 
         pEqn.setReference(pRefCell, pRefValue);
@@ -53,25 +55,25 @@ if (simple.transonic())
 }
 else
 {
+    surfaceScalarField phiHbyA
+    (
+        "phiHbyA",
+        fvc::interpolate(rho)*(fvc::interpolate(HbyA) & mesh.Sf())
+    );
+
+    closedVolume = adjustPhi(phiHbyA, U, p);
+
+    phiHbyA += fvc::interpolate(rho*(rAtU - rAU))*fvc::snGrad(p)*mesh.magSf();
+    HbyA -= (rAU - rAtU)*fvc::grad(p);
+
+    volScalarField Dp("Dp", rho*rAtU);
+
     while (simple.correctNonOrthogonal())
     {
-        surfaceScalarField phiHbyA
-        (
-            "phiHbyA",
-            fvc::interpolate(rho)*fvc::interpolate(HbyA) & mesh.Sf()
-        );
-
-        closedVolume = adjustPhi(phiHbyA, U, p);
-
-        phiHbyA +=
-            fvc::interpolate(rho/AtU - rho/AU)*fvc::snGrad(p)*mesh.magSf();
-
-        HbyA -= fvc::grad(p)*(1.0/AU - 1.0/AtU);
-
         fvScalarMatrix pEqn
         (
             fvc::div(phiHbyA)
-          - fvm::laplacian(rho/AtU, p)
+          - fvm::laplacian(Dp, p)
         );
 
         pEqn.setReference(pRefCell, pRefValue);
@@ -85,14 +87,14 @@ else
     }
 }
 
-// The incompressibe for of the continuity error check is appropriate for
+// The incompressibe form of the continuity error check is appropriate for
 // steady-state compressible also.
 #include "incompressible/continuityErrs.H"
 
 // Explicitly relax pressure for momentum corrector
 p.relax();
 
-U = HbyA - fvc::grad(p)/AtU;
+U = HbyA - rAtU*fvc::grad(p);
 U.correctBoundaryConditions();
 
 // For closed-volume cases adjust the pressure and density levels
@@ -103,6 +105,7 @@ if (closedVolume)
         /fvc::domainIntegrate(psi);
 }
 
+// Recalculate density from the relaxed pressure
 rho = thermo.rho();
 rho = max(rho, rhoMin);
 rho = min(rho, rhoMax);
diff --git a/applications/solvers/compressible/sonicFoam/pEqn.H b/applications/solvers/compressible/sonicFoam/pEqn.H
index 46cc36216c..aeebee2df5 100644
--- a/applications/solvers/compressible/sonicFoam/pEqn.H
+++ b/applications/solvers/compressible/sonicFoam/pEqn.H
@@ -14,13 +14,16 @@ surfaceScalarField phid
     )
 );
 
+
+volScalarField Dp("Dp", rho*rAU);
+
 for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
 {
     fvScalarMatrix pEqn
     (
         fvm::ddt(psi, p)
       + fvm::div(phid, p)
-      - fvm::laplacian(rho*rAU, p)
+      - fvm::laplacian(Dp, p)
     );
 
     pEqn.solve();
diff --git a/applications/solvers/compressible/sonicFoam/sonicDyMFoam/pEqn.H b/applications/solvers/compressible/sonicFoam/sonicDyMFoam/pEqn.H
index cad5bb7217..21dc48614e 100644
--- a/applications/solvers/compressible/sonicFoam/sonicDyMFoam/pEqn.H
+++ b/applications/solvers/compressible/sonicFoam/sonicDyMFoam/pEqn.H
@@ -14,13 +14,15 @@ surfaceScalarField phid
     )
 );
 
+volScalarField Dp("Dp", rho*rAU);
+
 for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
 {
     fvScalarMatrix pEqn
     (
         fvm::ddt(psi, p)
       + fvm::div(phid, p)
-      - fvm::laplacian(rho*rAU, p)
+      - fvm::laplacian(Dp, p)
     );
 
     pEqn.solve();
diff --git a/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/system/fvSchemes b/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/system/fvSchemes
index 56aebd7a94..de66185079 100644
--- a/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/system/fvSchemes
+++ b/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/system/fvSchemes
@@ -42,7 +42,7 @@ laplacianSchemes
 {
     default         none;
     laplacian(muEff,U) Gauss linear corrected;
-    laplacian((rho*(1|A(U))),p) Gauss linear corrected;
+    laplacian(Dp,p) Gauss linear corrected;
     laplacian(alphaEff,h) Gauss linear corrected;
     laplacian(DkEff,k) Gauss linear corrected;
     laplacian(DBEff,B) Gauss linear corrected;
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/0/U b/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/0/U
index 0d8701320a..84b8f75f3c 100644
--- a/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/0/U
+++ b/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/0/U
@@ -48,7 +48,7 @@ boundaryField
     }
     outlet
     {
-        type            fluxCorrectedVelocity; //inletOutlet;
+        type            pressureInletOutletVelocity;
         value           uniform (0 0 0);
         inletValue      uniform (0 0 0);
     }
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/system/fvSchemes b/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/system/fvSchemes
index 1772c2a3fd..391c95e6dc 100644
--- a/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/system/fvSchemes
+++ b/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/system/fvSchemes
@@ -52,7 +52,7 @@ laplacianSchemes
     laplacian(DepsilonEff,epsilon) Gauss linear corrected;
     laplacian(DREff,R) Gauss linear corrected;
     laplacian(DomegaEff,omega) Gauss linear corrected;
-    laplacian((rho*(1|A(U))),p) Gauss linear corrected;
+    laplacian(Dp,p) Gauss linear corrected;
     laplacian(alphaEff,h) Gauss linear corrected;
 }
 
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/system/fvSolution b/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/system/fvSolution
index 859a3d0464..084c382e84 100644
--- a/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/system/fvSolution
+++ b/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/system/fvSolution
@@ -52,6 +52,7 @@ solvers
 PIMPLE
 {
     momentumPredictor yes;
+    transonic       no;
     nOuterCorrectors 50;
     nCorrectors     1;
     nNonOrthogonalCorrectors 0;
@@ -66,6 +67,8 @@ PIMPLE
             tolerance       0.0001;
         }
     }
+
+    turbOnFinalIterOnly off;
 }
 
 relaxationFactors
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/cavity/system/fvSchemes b/tutorials/compressible/rhoPimpleFoam/ras/cavity/system/fvSchemes
index da4ffa1eaa..0fa6ebaf33 100644
--- a/tutorials/compressible/rhoPimpleFoam/ras/cavity/system/fvSchemes
+++ b/tutorials/compressible/rhoPimpleFoam/ras/cavity/system/fvSchemes
@@ -52,7 +52,7 @@ laplacianSchemes
     laplacian(DepsilonEff,epsilon) Gauss linear orthogonal;
     laplacian(DREff,R) Gauss linear orthogonal;
     laplacian(DomegaEff,omega) Gauss linear orthogonal;
-    laplacian((rho*(1|A(U))),p) Gauss linear orthogonal;
+    laplacian(Dp,p) Gauss linear orthogonal;
     laplacian(alphaEff,h) Gauss linear orthogonal;
 }
 
diff --git a/tutorials/compressible/rhoPorousMRFLTSPimpleFoam/angledDuct/system/fvSchemes b/tutorials/compressible/rhoPorousMRFLTSPimpleFoam/angledDuct/system/fvSchemes
index 00981f61fc..62fadfb8ca 100644
--- a/tutorials/compressible/rhoPorousMRFLTSPimpleFoam/angledDuct/system/fvSchemes
+++ b/tutorials/compressible/rhoPorousMRFLTSPimpleFoam/angledDuct/system/fvSchemes
@@ -52,7 +52,7 @@ laplacianSchemes
     laplacian(DepsilonEff,epsilon) Gauss linear corrected;
     laplacian(DREff,R) Gauss linear corrected;
     laplacian(DomegaEff,omega) Gauss linear corrected;
-    laplacian((rho*(1|A(U))),p) Gauss linear corrected;
+    laplacian(Dp,p) Gauss linear corrected;
     laplacian(alphaEff,h) Gauss linear corrected;
 }
 
diff --git a/tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/system/fvSchemes b/tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/system/fvSchemes
index dbca5c1607..d49880685b 100644
--- a/tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/system/fvSchemes
+++ b/tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/system/fvSchemes
@@ -40,7 +40,7 @@ laplacianSchemes
 {
     default         none;
     laplacian(muEff,U) Gauss linear corrected;
-    laplacian((rho*(1|A(U))),p) Gauss linear corrected;
+    laplacian(Dp,p) Gauss linear corrected;
     laplacian(alphaEff,h) Gauss linear corrected;
     laplacian(DkEff,k) Gauss linear corrected;
     laplacian(DepsilonEff,epsilon) Gauss linear corrected;
diff --git a/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctExplicit/system/fvSchemes b/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctExplicit/system/fvSchemes
index d237bd7361..711e4e3233 100644
--- a/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctExplicit/system/fvSchemes
+++ b/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctExplicit/system/fvSchemes
@@ -39,7 +39,6 @@ laplacianSchemes
 {
     laplacian(muEff,U) Gauss linear corrected;
     laplacian(alphaEff,h) Gauss linear corrected;
-    laplacian((rho|A(U)),p) Gauss linear corrected;
     laplacian((rho*rAU),p) Gauss linear corrected;
     laplacian(DepsilonEff,epsilon) Gauss linear corrected;
     laplacian(DkEff,k) Gauss linear corrected;
diff --git a/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/constant/polyMesh/boundary b/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/constant/polyMesh/boundary
index 0abd1608ab..a664893343 100644
--- a/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/constant/polyMesh/boundary
+++ b/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/constant/polyMesh/boundary
@@ -8,7 +8,7 @@
 FoamFile
 {
     version     2.0;
-    format      ascii;
+    format      binary;
     class       polyBoundaryMesh;
     location    "constant/polyMesh";
     object      boundary;
diff --git a/tutorials/compressible/sonicFoam/laminar/forwardStep/system/fvSchemes b/tutorials/compressible/sonicFoam/laminar/forwardStep/system/fvSchemes
index b4cf8d2e38..51799627c8 100644
--- a/tutorials/compressible/sonicFoam/laminar/forwardStep/system/fvSchemes
+++ b/tutorials/compressible/sonicFoam/laminar/forwardStep/system/fvSchemes
@@ -40,7 +40,7 @@ divSchemes
 laplacianSchemes
 {
     default         none;
-    laplacian((rho*(1|A(U))),p) Gauss linear corrected;
+    laplacian(Dp,p) Gauss linear corrected;
     laplacian(muEff,U) Gauss linear corrected;
     laplacian(alphaEff,e) Gauss linear corrected;
 }
diff --git a/tutorials/compressible/sonicFoam/laminar/shockTube/system/fvSchemes b/tutorials/compressible/sonicFoam/laminar/shockTube/system/fvSchemes
index 616ee4aa1b..52cd939723 100644
--- a/tutorials/compressible/sonicFoam/laminar/shockTube/system/fvSchemes
+++ b/tutorials/compressible/sonicFoam/laminar/shockTube/system/fvSchemes
@@ -40,7 +40,7 @@ divSchemes
 laplacianSchemes
 {
     default         none;
-    laplacian((rho*(1|A(U))),p) Gauss linear orthogonal;
+    laplacian(Dp,p) Gauss linear orthogonal;
     laplacian(muEff,U) Gauss linear orthogonal;
     laplacian(alphaEff,e) Gauss linear orthogonal;
 }
diff --git a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/system/fvSchemes b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/system/fvSchemes
index b12dc45dcf..4f1434c479 100644
--- a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/system/fvSchemes
+++ b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/system/fvSchemes
@@ -46,7 +46,7 @@ laplacianSchemes
     laplacian(DkEff,k) Gauss linear limited 0.5;
     laplacian(DREff,R) Gauss linear limited 0.5;
     laplacian(DepsilonEff,epsilon) Gauss linear limited 0.5;
-    laplacian((rho*(1|A(U))),p) Gauss linear limited 0.5;
+    laplacian(Dp,p) Gauss linear limited 0.5;
     laplacian(alphaEff,e) Gauss linear limited 0.5;
 }
 
diff --git a/tutorials/compressible/sonicFoam/ras/prism/system/fvSchemes b/tutorials/compressible/sonicFoam/ras/prism/system/fvSchemes
index e7b5a41a60..6aa61d831a 100644
--- a/tutorials/compressible/sonicFoam/ras/prism/system/fvSchemes
+++ b/tutorials/compressible/sonicFoam/ras/prism/system/fvSchemes
@@ -46,7 +46,7 @@ laplacianSchemes
     laplacian(DkEff,k) Gauss linear corrected;
     laplacian(DREff,R) Gauss linear corrected;
     laplacian(DepsilonEff,epsilon) Gauss linear corrected;
-    laplacian((rho*(1|A(U))),p) Gauss linear corrected;
+    laplacian(Dp,p) Gauss linear corrected;
     laplacian(alphaEff,e) Gauss linear corrected;
 }
 
diff --git a/tutorials/compressible/sonicLiquidFoam/decompressionTank/system/fvSchemes b/tutorials/compressible/sonicLiquidFoam/decompressionTank/system/fvSchemes
index d7aad508a2..d1a9bb7aa1 100644
--- a/tutorials/compressible/sonicLiquidFoam/decompressionTank/system/fvSchemes
+++ b/tutorials/compressible/sonicLiquidFoam/decompressionTank/system/fvSchemes
@@ -37,7 +37,7 @@ laplacianSchemes
 {
     default         none;
     laplacian(mu,U) Gauss linear corrected;
-    laplacian((rho*(1|A(U))),p) Gauss linear corrected;
+    laplacian(Dp,p) Gauss linear corrected;
 }
 
 interpolationSchemes

From 0471d9cb27659def0d9efa553f44e6a57df54674 Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Thu, 3 May 2012 14:15:24 +0100
Subject: [PATCH 298/317] Updated headers

---
 applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C | 2 +-
 .../rhoPorousMRFLTSPimpleFoam/rhoPorousMRFLTSPimpleFoam.C       | 2 +-
 .../rhoPorousMRFPimpleFoam/rhoPorousMRFPimpleFoam.C             | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C b/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C
index 28a0009db7..28787716e0 100644
--- a/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C
+++ b/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFLTSPimpleFoam/rhoPorousMRFLTSPimpleFoam.C b/applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFLTSPimpleFoam/rhoPorousMRFLTSPimpleFoam.C
index f480326e28..e305916f29 100644
--- a/applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFLTSPimpleFoam/rhoPorousMRFLTSPimpleFoam.C
+++ b/applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFLTSPimpleFoam/rhoPorousMRFLTSPimpleFoam.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFPimpleFoam/rhoPorousMRFPimpleFoam.C b/applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFPimpleFoam/rhoPorousMRFPimpleFoam.C
index 64f18ab889..e02787c35d 100644
--- a/applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFPimpleFoam/rhoPorousMRFPimpleFoam.C
+++ b/applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFPimpleFoam/rhoPorousMRFPimpleFoam.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

From 2e09a6628ec87a3a32f369bc7149d89e384f08ad Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Thu, 3 May 2012 15:14:32 +0100
Subject: [PATCH 299/317] sonicLiquidFoam: Updated pressure equation to use Dp

---
 .../compressible/sonicFoam/sonicLiquidFoam/sonicLiquidFoam.C   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/applications/solvers/compressible/sonicFoam/sonicLiquidFoam/sonicLiquidFoam.C b/applications/solvers/compressible/sonicFoam/sonicLiquidFoam/sonicLiquidFoam.C
index 6388caea69..f37ac67ce1 100644
--- a/applications/solvers/compressible/sonicFoam/sonicLiquidFoam/sonicLiquidFoam.C
+++ b/applications/solvers/compressible/sonicFoam/sonicLiquidFoam/sonicLiquidFoam.C
@@ -85,13 +85,14 @@ int main(int argc, char *argv[])
             );
 
             phi = (rhoO/psi)*phid;
+            volScalarField Dp("Dp", rho*rAU);
 
             fvScalarMatrix pEqn
             (
                 fvm::ddt(psi, p)
               + fvc::div(phi)
               + fvm::div(phid, p)
-              - fvm::laplacian(rho*rAU, p)
+              - fvm::laplacian(Dp, p)
             );
 
             pEqn.solve();

From 476b39d5a161f31b4b7d770558b1587c976361ae Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Thu, 3 May 2012 15:14:41 +0100
Subject: [PATCH 300/317] Updated header

---
 .../compressible/sonicFoam/sonicLiquidFoam/sonicLiquidFoam.C    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/applications/solvers/compressible/sonicFoam/sonicLiquidFoam/sonicLiquidFoam.C b/applications/solvers/compressible/sonicFoam/sonicLiquidFoam/sonicLiquidFoam.C
index f37ac67ce1..19a530a6aa 100644
--- a/applications/solvers/compressible/sonicFoam/sonicLiquidFoam/sonicLiquidFoam.C
+++ b/applications/solvers/compressible/sonicFoam/sonicLiquidFoam/sonicLiquidFoam.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

From f36879826e86d2675a57fea1828ddf38bb766fc0 Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Thu, 3 May 2012 15:18:50 +0100
Subject: [PATCH 301/317] rhoPimplecFoam: setup tutorial consistent with
 rhoPimpleFoam

---
 tutorials/compressible/rhoPimplecFoam/angledDuct/0/U      | 2 +-
 .../rhoPimplecFoam/angledDuct/system/fvSolution           | 8 +++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/tutorials/compressible/rhoPimplecFoam/angledDuct/0/U b/tutorials/compressible/rhoPimplecFoam/angledDuct/0/U
index 277f93a33b..84b8f75f3c 100644
--- a/tutorials/compressible/rhoPimplecFoam/angledDuct/0/U
+++ b/tutorials/compressible/rhoPimplecFoam/angledDuct/0/U
@@ -43,7 +43,7 @@ boundaryField
     inlet
     {
         type            flowRateInletVelocity;
-        flowRate        constant 0.65;
+        flowRate        constant 0.1;
         value           uniform (0 0 0);
     }
     outlet
diff --git a/tutorials/compressible/rhoPimplecFoam/angledDuct/system/fvSolution b/tutorials/compressible/rhoPimplecFoam/angledDuct/system/fvSolution
index 593aacfcfe..4a126ed8e4 100644
--- a/tutorials/compressible/rhoPimplecFoam/angledDuct/system/fvSolution
+++ b/tutorials/compressible/rhoPimplecFoam/angledDuct/system/fvSolution
@@ -19,10 +19,8 @@ solvers
 {
     p
     {
-        //solver          PCG;
-        //preconditioner  DIC;
-        solver          PBiCG;
-        preconditioner  DILU;
+        solver          PCG;
+        preconditioner  DIC;
         tolerance       1e-06;
         relTol          0.01;
     }
@@ -54,7 +52,7 @@ solvers
 PIMPLE
 {
     momentumPredictor yes;
-    transonic       yes;
+    transonic       no;
     nOuterCorrectors 50;
     nCorrectors     1;
     nNonOrthogonalCorrectors 0;

From 41ffd118b263b91798edee21fbe6adfef4dc7b54 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Fri, 4 May 2012 10:58:58 +0100
Subject: [PATCH 302/317] STYLE: interRegionHeatTransfer: indenting

---
 .../interRegionHeatTransferModel.H                            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/fieldSources/basicSource/interRegionHeatTransferModel/interRegionHeatTransferModel/interRegionHeatTransferModel.H b/src/fieldSources/basicSource/interRegionHeatTransferModel/interRegionHeatTransferModel/interRegionHeatTransferModel.H
index 38c8141bed..9a521f459d 100644
--- a/src/fieldSources/basicSource/interRegionHeatTransferModel/interRegionHeatTransferModel/interRegionHeatTransferModel.H
+++ b/src/fieldSources/basicSource/interRegionHeatTransferModel/interRegionHeatTransferModel/interRegionHeatTransferModel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -49,7 +49,7 @@ namespace Foam
 
 class interRegionHeatTransferModel
 :
-    public  basicSource
+    public basicSource
 {
 
 private:

From 1450c5368842e0d9392faa11d820a1ce4e0f11e7 Mon Sep 17 00:00:00 2001
From: sergio <sergio>
Date: Fri, 4 May 2012 11:06:20 +0100
Subject: [PATCH 303/317] BUG: Using normalized vector for cylindrical
 coordinates

---
 .../cylindricalInletVelocityFvPatchVectorField.C                | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/finiteVolume/fields/fvPatchFields/derived/cylindricalInletVelocity/cylindricalInletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/cylindricalInletVelocity/cylindricalInletVelocityFvPatchVectorField.C
index 638323c47b..0348035314 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/cylindricalInletVelocity/cylindricalInletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/cylindricalInletVelocity/cylindricalInletVelocityFvPatchVectorField.C
@@ -139,7 +139,7 @@ void Foam::cylindricalInletVelocityFvPatchVectorField::updateCoeffs()
         (rpm*constant::mathematical::pi/30.0)*(hatAxis) ^ d
     );
 
-    operator==(tangVel + axis_*axialVelocity + radialVelocity*d);
+    operator==(tangVel + hatAxis*axialVelocity + radialVelocity*d/mag(d));
 
     fixedValueFvPatchField<vector>::updateCoeffs();
 }

From 2e760a3453265bd3951f2eedee7b3a2f4a00a9b9 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Fri, 4 May 2012 11:36:47 +0100
Subject: [PATCH 304/317] ENH: codedBasicSource: coded version of sources

---
 .../dynamicCode/codedBasicSourceTemplate.C    | 180 +++++++++++++++
 .../dynamicCode/codedBasicSourceTemplate.H    | 108 +++++++++
 src/fieldSources/Make/files                   |   2 +
 .../basicSource/codedSource/CodedSource.C     | 206 ++++++++++++++++++
 .../basicSource/codedSource/CodedSource.H     | 205 +++++++++++++++++
 .../basicSource/codedSource/CodedSourceIO.C   | 109 +++++++++
 .../basicSource/codedSource/codedSource.C     |  41 ++++
 7 files changed, 851 insertions(+)
 create mode 100644 etc/codeTemplates/dynamicCode/codedBasicSourceTemplate.C
 create mode 100644 etc/codeTemplates/dynamicCode/codedBasicSourceTemplate.H
 create mode 100644 src/fieldSources/basicSource/codedSource/CodedSource.C
 create mode 100644 src/fieldSources/basicSource/codedSource/CodedSource.H
 create mode 100644 src/fieldSources/basicSource/codedSource/CodedSourceIO.C
 create mode 100644 src/fieldSources/basicSource/codedSource/codedSource.C

diff --git a/etc/codeTemplates/dynamicCode/codedBasicSourceTemplate.C b/etc/codeTemplates/dynamicCode/codedBasicSourceTemplate.C
new file mode 100644
index 0000000000..d5fdb11a0b
--- /dev/null
+++ b/etc/codeTemplates/dynamicCode/codedBasicSourceTemplate.C
@@ -0,0 +1,180 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "codedBasicSourceTemplate.H"
+#include "addToRunTimeSelectionTable.H"
+#include "fvPatchFieldMapper.H"
+#include "volFields.H"
+#include "surfaceFields.H"
+#include "unitConversion.H"
+//{{{ begin codeInclude
+${codeInclude}
+//}}} end codeInclude
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// * * * * * * * * * * * * * * * Local Functions * * * * * * * * * * * * * * //
+
+//{{{ begin localCode
+${localCode}
+//}}} end localCode
+
+
+// * * * * * * * * * * * * * * * Global Functions  * * * * * * * * * * * * * //
+
+extern "C"
+{
+    // dynamicCode:
+    // SHA1 = ${SHA1sum}
+    //
+    // unique function name that can be checked if the correct library version
+    // has been loaded
+    void ${typeName}_${SHA1sum}(bool load)
+    {
+        if (load)
+        {
+            // code that can be explicitly executed after loading
+        }
+        else
+        {
+            // code that can be explicitly executed before unloading
+        }
+    }
+}
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+//makeRemovablePatchTypeField
+//(
+//    fvPatch${FieldType},
+//    ${typeName}CodedBasic${SourceType}
+//);
+defineTypeNameAndDebug(${typeName}CodedBasic${SourceType}, 0);
+addRemovableToRunTimeSelectionTable
+(
+    basicSource,
+    ${typeName}CodedBasic${SourceType},
+    dictionary
+);
+
+
+const char* const ${typeName}CodedBasic${SourceType}::SHA1sum =
+    "${SHA1sum}";
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+${typeName}CodedBasic${SourceType}::
+${typeName}CodedBasic${SourceType}
+(
+    const word& name,
+    const word& modelType,
+    const dictionary& dict,
+    const fvMesh& mesh
+)
+:
+    basicSource(name, modelType, dict, mesh)
+{
+    if (${verbose:-false})
+    {
+        Info<<"construct ${typeName} sha1: ${SHA1sum}"
+            " from components\n";
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+${typeName}CodedBasic${SourceType}::
+~${typeName}CodedBasic${SourceType}()
+{
+    if (${verbose:-false})
+    {
+        Info<<"destroy ${typeName} sha1: ${SHA1sum}\n";
+    }
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void ${typeName}CodedBasic${SourceType}::correct
+(
+    GeometricField<${TemplateType}, fvPatchField, volMesh>& fld
+)
+{
+    if (${verbose:-false})
+    {
+        Info<<"${typeName}CodedBasic${SourceType}::correct()\n";
+    }
+
+//{{{ begin code
+    ${codeCorrect}
+//}}} end code
+}
+
+
+void ${typeName}CodedBasic${SourceType}::addSup
+(
+    fvMatrix<${TemplateType}>& eqn,
+    const label fieldI
+)
+{
+    if (${verbose:-false})
+    {
+        Info<<"${typeName}CodedBasic${SourceType}::addSup()\n";
+    }
+
+//{{{ begin code
+    ${codeAddSup}
+//}}} end code
+}
+
+
+void ${typeName}CodedBasic${SourceType}::setValue
+(
+    fvMatrix<${TemplateType}>& eqn,
+    const label fieldI
+)
+{
+    if (${verbose:-false})
+    {
+        Info<<"${typeName}CodedBasic${SourceType}::setValue()\n";
+    }
+
+//{{{ begin code
+    ${codeSetValue}
+//}}} end code
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// ************************************************************************* //
diff --git a/etc/codeTemplates/dynamicCode/codedBasicSourceTemplate.H b/etc/codeTemplates/dynamicCode/codedBasicSourceTemplate.H
new file mode 100644
index 0000000000..7f80510507
--- /dev/null
+++ b/etc/codeTemplates/dynamicCode/codedBasicSourceTemplate.H
@@ -0,0 +1,108 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Description
+    Template for use with dynamic code generation of a basicSource
+
+    - without state
+
+SourceFiles
+    codedBasicSourceTemplate.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef codedBasicSourceTemplate_H
+#define codedBasicSourceTemplate_H
+
+#include "basicSource.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                         A templated CodedBasicSource
+\*---------------------------------------------------------------------------*/
+
+class ${typeName}CodedBasic${SourceType}
+:
+    public basicSource
+{
+public:
+
+    //- Information about the SHA1 of the code itself
+    static const char* const SHA1sum;
+
+    //- Runtime type information
+    TypeName("${typeName}");
+
+
+    // Constructors
+
+        //- Construct from patch and internal field
+        ${typeName}CodedBasic${SourceType}
+        (
+            const word& name,
+            const word& modelType,
+            const dictionary& dict,
+            const fvMesh& mesh
+        );
+
+    //- Destructor
+    virtual ~${typeName}CodedBasic${SourceType}();
+
+
+    // Member functions
+
+            //- Correct field
+            virtual void correct
+            (
+                GeometricField<${TemplateType}, fvPatchField, volMesh>&
+            );
+
+            //- Explicit and implicit matrix contributions
+            virtual void addSup
+            (
+                fvMatrix<${TemplateType}>& eqn,
+                const label fieldI
+            );
+
+            //- Set value
+            virtual void setValue
+            (
+                fvMatrix<${TemplateType}>& eqn,
+                const label fieldI
+            );
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/fieldSources/Make/files b/src/fieldSources/Make/files
index 1db2de4b5e..f642dd2b65 100644
--- a/src/fieldSources/Make/files
+++ b/src/fieldSources/Make/files
@@ -29,4 +29,6 @@ $(interRegion)/constantHeatTransfer/constantHeatTransfer.C
 $(interRegion)/tabulatedHeatTransfer/tabulatedHeatTransfer.C
 $(interRegion)/variableHeatTransfer/variableHeatTransfer.C
 
+basicSource/codedSource/codedSource.C
+
 LIB = $(FOAM_LIBBIN)/libfieldSources
diff --git a/src/fieldSources/basicSource/codedSource/CodedSource.C b/src/fieldSources/basicSource/codedSource/CodedSource.C
new file mode 100644
index 0000000000..b379123e87
--- /dev/null
+++ b/src/fieldSources/basicSource/codedSource/CodedSource.C
@@ -0,0 +1,206 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "CodedSource.H"
+#include "fvMesh.H"
+#include "fvMatrices.H"
+#include "dynamicCode.H"
+#include "dynamicCodeContext.H"
+
+// * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
+
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+template<class Type>
+void Foam::CodedSource<Type>::prepare
+(
+    dynamicCode& dynCode,
+    const dynamicCodeContext& context
+) const
+{
+    word sourceType(pTraits<Type>::typeName);
+
+    // Set additional rewrite rules
+    dynCode.setFilterVariable("typeName", redirectType_);
+    dynCode.setFilterVariable("TemplateType", sourceType);
+    dynCode.setFilterVariable("SourceType", sourceType + "Source");
+
+    //dynCode.removeFilterVariable("code");
+    dynCode.setFilterVariable("codeCorrect", codeCorrect_);
+    dynCode.setFilterVariable("codeAddSup", codeAddSup_);
+    dynCode.setFilterVariable("codeSetValue", codeSetValue_);
+
+    // compile filtered C template
+    dynCode.addCompileFile("codedBasicSourceTemplate.C");
+
+    // copy filtered H template
+    dynCode.addCopyFile("codedBasicSourceTemplate.H");
+
+    // debugging: make BC verbose
+    //         dynCode.setFilterVariable("verbose", "true");
+    //         Info<<"compile " << redirectType_ << " sha1: "
+    //             << context.sha1() << endl;
+
+    // define Make/options
+    dynCode.setMakeOptions
+        (
+            "EXE_INC = -g \\\n"
+            "-I$(LIB_SRC)/fieldSources/lnInclude \\\n"
+            "-I$(LIB_SRC)/finiteVolume/lnInclude \\\n"
+            "-I$(LIB_SRC)/meshTools/lnInclude \\\n"
+            "-I$(LIB_SRC)/sampling/lnInclude \\\n"
+            + context.options()
+            + "\n\nLIB_LIBS = \\\n"
+            + "    -lmeshTools \\\n"
+            + "    -lfieldSources \\\n"
+            + "    -lsampling \\\n"
+            + "    -lfiniteVolume \\\n"
+            + context.libs()
+        );
+}
+
+
+template<class Type>
+Foam::dlLibraryTable& Foam::CodedSource<Type>::libs() const
+{
+    return const_cast<Time&>(mesh_.time()).libs();
+}
+
+
+template<class Type>
+Foam::string Foam::CodedSource<Type>::description() const
+{
+    return "basicSource " + name_;
+}
+
+
+template<class Type>
+void Foam::CodedSource<Type>::clearRedirect() const
+{
+    redirectBasicSourcePtr_.clear();
+}
+
+
+template<class Type>
+const Foam::dictionary& Foam::CodedSource<Type>::codeDict() const
+{
+    return coeffs_;
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template<class Type>
+Foam::CodedSource<Type>::CodedSource
+(
+    const word& name,
+    const word& modelType,
+    const dictionary& dict,
+    const fvMesh& mesh
+)
+:
+    basicSource(name, modelType, dict, mesh)
+{
+    read(dict);
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class Type>
+Foam::basicSource& Foam::CodedSource<Type>::redirectBasicSource()
+const
+{
+    if (!redirectBasicSourcePtr_.valid())
+    {
+        dictionary constructDict(dict_);
+        constructDict.set("type", redirectType_);
+
+        redirectBasicSourcePtr_ = basicSource::New
+        (
+            redirectType_,
+            constructDict,
+            mesh_
+        );
+    }
+    return redirectBasicSourcePtr_();
+}
+
+
+template<class Type>
+void Foam::CodedSource<Type>::correct
+(
+    GeometricField<Type, fvPatchField, volMesh>& fld
+)
+{
+    if (debug)
+    {
+        Info<< "CodedSource<"<< pTraits<Type>::typeName
+            << ">::correct for source " << name_ << endl;
+    }
+
+    updateLibrary(redirectType_);
+    redirectBasicSource().correct(fld);
+}
+
+
+template<class Type>
+void Foam::CodedSource<Type>::addSup
+(
+    fvMatrix<Type>& eqn,
+    const label fieldI
+)
+{
+    if (debug)
+    {
+        Info<< "CodedSource<"<< pTraits<Type>::typeName
+            << ">::addSup for source " << name_ << endl;
+    }
+
+    updateLibrary(redirectType_);
+    redirectBasicSource().addSup(eqn, fieldI);
+}
+
+
+template<class Type>
+void Foam::CodedSource<Type>::setValue
+(
+    fvMatrix<Type>& eqn,
+    const label fieldI
+)
+{
+    if (debug)
+    {
+        Info<< "CodedSource<"<< pTraits<Type>::typeName
+            << ">::setValue for source " << name_ << endl;
+    }
+
+    updateLibrary(redirectType_);
+    redirectBasicSource().setValue(eqn, fieldI);
+}
+
+
+// ************************************************************************* //
diff --git a/src/fieldSources/basicSource/codedSource/CodedSource.H b/src/fieldSources/basicSource/codedSource/CodedSource.H
new file mode 100644
index 0000000000..66ad2cdb5c
--- /dev/null
+++ b/src/fieldSources/basicSource/codedSource/CodedSource.H
@@ -0,0 +1,205 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::codedSource
+
+Description
+    Constructs on-the-fly a new basicSource.
+
+    E.g. in constant/sourcesProperties
+
+    momentumSource
+    {
+        type            vectorCodedSource;
+        active          on;            //on/off switch
+        timeStart       0.0;           //start time
+        duration        1000000.0;     //duration
+        selectionMode   all;       //cellSet // points //cellZone
+
+        vectorCodedSourceCoeffs
+        {
+            fieldNames  (U);
+            redirectType    ramp;
+
+            codeCorrect
+            #{
+                Pout<< "**codeCorrect**" << endl;
+            #};
+
+            codeAddSup
+            #{
+                Pout<< "**codeAddSup**" << endl;
+            #};
+
+            codeSetValue
+            #{
+                Pout<< "**codeSetValue**" << endl;
+            #};
+
+            // Dummy entry. Make dependent on above to trigger recompilation
+            code
+            #{
+                $codeCorrect
+                $codeAddSup
+                $codeSetValue
+            #};
+        }
+
+        // Dummy entry
+        rampCoeffs
+        {}
+    }
+
+
+SourceFiles
+    codedSource.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef CodedSource_H
+#define CodedSource_H
+
+#include "basicSource.H"
+#include "codedBase.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                       Class codedSource Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class Type>
+class CodedSource
+:
+    public basicSource,
+    public codedBase
+{
+
+protected:
+
+    // Protected data
+
+        word redirectType_;
+
+        string codeCorrect_;
+        string codeAddSup_;
+        string codeSetValue_;
+
+        //- Underlying functionObject
+        mutable autoPtr<basicSource> redirectBasicSourcePtr_;
+
+
+    // Protected Member Functions
+
+        //- get the loaded dynamic libraries
+        virtual dlLibraryTable& libs() const;
+
+        //- adapt the context for the current object
+        virtual void prepare(dynamicCode &,const dynamicCodeContext&) const;
+
+        // Return a description (type + name) for the output
+        virtual string description() const;
+
+        // Clear any redirected objects
+        virtual void clearRedirect() const;
+
+        // Get the dictionary to initialize the codeContext
+        virtual const dictionary& codeDict() const;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("coded");
+
+
+    // Constructors
+
+        //- Construct from components
+        CodedSource
+        (
+            const word& name,
+            const word& modelType,
+            const dictionary& dict,
+            const fvMesh& mesh
+        );
+
+
+    // Member Functions
+
+        //- Dynamically compiled basicSource
+        basicSource& redirectBasicSource() const;
+
+        // Evaluation
+
+            //- Correct field
+            virtual void correct
+            (
+                GeometricField<Type, fvPatchField, volMesh>&
+            );
+
+            //- Explicit and implicit matrix contributions
+            virtual void addSup
+            (
+                fvMatrix<Type>& eqn,
+                const label fieldI
+            );
+
+            //- Set value
+            virtual void setValue
+            (
+                fvMatrix<Type>& eqn,
+                const label fieldI
+            );
+
+
+        // I-O
+
+            //- Write the source properties
+            virtual void writeData(Ostream&) const;
+
+            //- Read source dictionary
+            virtual bool read(const dictionary& dict);
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+#   include "CodedSource.C"
+#   include "CodedSourceIO.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/fieldSources/basicSource/codedSource/CodedSourceIO.C b/src/fieldSources/basicSource/codedSource/CodedSourceIO.C
new file mode 100644
index 0000000000..77075bba3e
--- /dev/null
+++ b/src/fieldSources/basicSource/codedSource/CodedSourceIO.C
@@ -0,0 +1,109 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "CodedSource.H"
+#include "stringOps.H"
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class Type>
+void Foam::CodedSource<Type>::writeData(Ostream& os) const
+{
+    os  << indent << name_ << endl;
+    dict_.write(os);
+}
+
+
+template<class Type>
+bool Foam::CodedSource<Type>::read(const dictionary& dict)
+{
+    if (basicSource::read(dict))
+    {
+        coeffs_.lookup("fieldNames") >> fieldNames_;
+        applied_.setSize(fieldNames_.size(), false);
+        coeffs_.lookup("redirectType") >> redirectType_;
+
+        // Code snippets
+        {
+            const entry& e = coeffs_.lookupEntry
+            (
+                "codeCorrect",
+                false,
+                false
+            );
+            codeCorrect_ = stringOps::trim(e.stream());
+            stringOps::inplaceExpand(codeCorrect_, coeffs_);
+            dynamicCodeContext::addLineDirective
+            (
+                codeCorrect_,
+                e.startLineNumber(),
+                coeffs_.name()
+            );
+        }
+
+        {
+            const entry& e = coeffs_.lookupEntry
+            (
+                "codeAddSup",
+                false,
+                false
+            );
+            codeAddSup_ = stringOps::trim(e.stream());
+            stringOps::inplaceExpand(codeAddSup_, coeffs_);
+            dynamicCodeContext::addLineDirective
+            (
+                codeAddSup_,
+                e.startLineNumber(),
+                coeffs_.name()
+            );
+        }
+
+        {
+            const entry& e = coeffs_.lookupEntry
+            (
+                "codeSetValue",
+                false,
+                false
+            );
+            codeSetValue_ = stringOps::trim(e.stream());
+            stringOps::inplaceExpand(codeSetValue_, coeffs_);
+            dynamicCodeContext::addLineDirective
+            (
+                codeSetValue_,
+                e.startLineNumber(),
+                coeffs_.name()
+            );
+        }
+
+        return true;
+    }
+    else
+    {
+        return false;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/src/fieldSources/basicSource/codedSource/codedSource.C b/src/fieldSources/basicSource/codedSource/codedSource.C
new file mode 100644
index 0000000000..5fd9d3cdb3
--- /dev/null
+++ b/src/fieldSources/basicSource/codedSource/codedSource.C
@@ -0,0 +1,41 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "makeBasicSource.H"
+#include "CodedSource.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    makeBasicSource(CodedSource, scalar);
+    makeBasicSource(CodedSource, vector);
+    makeBasicSource(CodedSource, sphericalTensor);
+    makeBasicSource(CodedSource, symmTensor);
+    makeBasicSource(CodedSource, tensor);
+}
+
+
+// ************************************************************************* //

From 5e60c99c4ac5a1c46e1f4d0433e943b5c9f5d38d Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Fri, 4 May 2012 14:47:07 +0100
Subject: [PATCH 305/317] Thermodynamics: split the thermal diffusivity alpha
 into alphah and alphae for enthalpy and internal energy respectively

Change the implementation of alphah and alphae to use the local heat capacity
rather than attempting to compensate for the variation in an ad hoc manner.  For
correctness a heat capacity gradient term should be added to the energy
equations.
---
 .../basic/psiThermo/ePsiThermo/ePsiThermo.C   |  6 +++---
 .../basic/psiThermo/hPsiThermo/hPsiThermo.C   |  6 +++---
 .../basic/psiThermo/hsPsiThermo/hsPsiThermo.C |  6 +++---
 .../basic/rhoThermo/hRhoThermo/hRhoThermo.C   |  6 +++---
 .../basic/rhoThermo/hsRhoThermo/hsRhoThermo.C |  6 +++---
 .../hPsiMixtureThermo/hPsiMixtureThermo.C     |  6 +++---
 .../hhuMixtureThermo/hhuMixtureThermo.C       |  6 +++---
 .../hsPsiMixtureThermo/hsPsiMixtureThermo.C   |  6 +++---
 .../basicMultiComponentMixture.H              |  9 +++++++--
 .../mixtures/dieselMixture/dieselMixture.C    | 15 +++++++++++++--
 .../mixtures/dieselMixture/dieselMixture.H    |  7 +++++--
 .../mixtures/egrMixture/egrMixture.C          | 15 +++++++++++++--
 .../mixtures/egrMixture/egrMixture.H          |  7 +++++--
 .../homogeneousMixture/homogeneousMixture.C   | 15 +++++++++++++--
 .../homogeneousMixture/homogeneousMixture.H   |  7 +++++--
 .../inhomogeneousMixture.C                    | 15 +++++++++++++--
 .../inhomogeneousMixture.H                    |  7 +++++--
 .../multiComponentMixture.C                   | 15 +++++++++++++--
 .../multiComponentMixture.H                   |  7 +++++--
 .../veryInhomogeneousMixture.C                | 15 +++++++++++++--
 .../veryInhomogeneousMixture.H                |  7 +++++--
 .../hRhoMixtureThermo/hRhoMixtureThermo.C     |  6 +++---
 .../hsRhoMixtureThermo/hsRhoMixtureThermo.C   |  6 +++---
 .../transport/const/constSolidTransport.H     |  3 ---
 .../transport/const/constSolidTransportI.H    | 14 --------------
 .../exponential/exponentialSolidTransport.H   |  3 ---
 .../exponential/exponentialSolidTransportI.H  | 13 -------------
 .../specie/transport/const/constTransport.H   |  5 ++++-
 .../specie/transport/const/constTransportI.H  | 13 +++++++------
 .../polynomial/polynomialTransport.H          |  5 ++++-
 .../polynomial/polynomialTransportI.H         | 17 +++++++++++------
 .../speciesTransport/speciesTransport.H       |  5 ++++-
 .../sutherland/sutherlandTransport.H          |  5 ++++-
 .../sutherland/sutherlandTransportI.H         | 19 +++++++++++--------
 34 files changed, 190 insertions(+), 113 deletions(-)

diff --git a/src/thermophysicalModels/basic/psiThermo/ePsiThermo/ePsiThermo.C b/src/thermophysicalModels/basic/psiThermo/ePsiThermo/ePsiThermo.C
index b883fb85bd..f5779997c1 100644
--- a/src/thermophysicalModels/basic/psiThermo/ePsiThermo/ePsiThermo.C
+++ b/src/thermophysicalModels/basic/psiThermo/ePsiThermo/ePsiThermo.C
@@ -49,7 +49,7 @@ void Foam::ePsiThermo<MixtureType>::calculate()
         psiCells[celli] = mixture_.psi(pCells[celli], TCells[celli]);
 
         muCells[celli] = mixture_.mu(TCells[celli]);
-        alphaCells[celli] = mixture_.alpha(TCells[celli]);
+        alphaCells[celli] = mixture_.alphae(TCells[celli]);
     }
 
     forAll(this->T_.boundaryField(), patchi)
@@ -74,7 +74,7 @@ void Foam::ePsiThermo<MixtureType>::calculate()
 
                 ppsi[facei] = mixture_.psi(pp[facei], pT[facei]);
                 pmu[facei] = mixture_.mu(pT[facei]);
-                palpha[facei] = mixture_.alpha(pT[facei]);
+                palpha[facei] = mixture_.alphae(pT[facei]);
             }
         }
         else
@@ -88,7 +88,7 @@ void Foam::ePsiThermo<MixtureType>::calculate()
 
                 ppsi[facei] = mixture_.psi(pp[facei], pT[facei]);
                 pmu[facei] = mixture_.mu(pT[facei]);
-                palpha[facei] = mixture_.alpha(pT[facei]);
+                palpha[facei] = mixture_.alphae(pT[facei]);
             }
         }
     }
diff --git a/src/thermophysicalModels/basic/psiThermo/hPsiThermo/hPsiThermo.C b/src/thermophysicalModels/basic/psiThermo/hPsiThermo/hPsiThermo.C
index 991e3d11a4..013d786e6c 100644
--- a/src/thermophysicalModels/basic/psiThermo/hPsiThermo/hPsiThermo.C
+++ b/src/thermophysicalModels/basic/psiThermo/hPsiThermo/hPsiThermo.C
@@ -47,7 +47,7 @@ void Foam::hPsiThermo<MixtureType>::calculate()
         psiCells[celli] = mixture_.psi(pCells[celli], TCells[celli]);
 
         muCells[celli] = mixture_.mu(TCells[celli]);
-        alphaCells[celli] = mixture_.alpha(TCells[celli]);
+        alphaCells[celli] = mixture_.alphah(TCells[celli]);
     }
 
     forAll(T_.boundaryField(), patchi)
@@ -72,7 +72,7 @@ void Foam::hPsiThermo<MixtureType>::calculate()
 
                 ppsi[facei] = mixture_.psi(pp[facei], pT[facei]);
                 pmu[facei] = mixture_.mu(pT[facei]);
-                palpha[facei] = mixture_.alpha(pT[facei]);
+                palpha[facei] = mixture_.alphah(pT[facei]);
             }
         }
         else
@@ -86,7 +86,7 @@ void Foam::hPsiThermo<MixtureType>::calculate()
 
                 ppsi[facei] = mixture_.psi(pp[facei], pT[facei]);
                 pmu[facei] = mixture_.mu(pT[facei]);
-                palpha[facei] = mixture_.alpha(pT[facei]);
+                palpha[facei] = mixture_.alphah(pT[facei]);
             }
         }
     }
diff --git a/src/thermophysicalModels/basic/psiThermo/hsPsiThermo/hsPsiThermo.C b/src/thermophysicalModels/basic/psiThermo/hsPsiThermo/hsPsiThermo.C
index 28ce2749d2..7d81f60680 100644
--- a/src/thermophysicalModels/basic/psiThermo/hsPsiThermo/hsPsiThermo.C
+++ b/src/thermophysicalModels/basic/psiThermo/hsPsiThermo/hsPsiThermo.C
@@ -47,7 +47,7 @@ void Foam::hsPsiThermo<MixtureType>::calculate()
         psiCells[celli] = mixture_.psi(pCells[celli], TCells[celli]);
 
         muCells[celli] = mixture_.mu(TCells[celli]);
-        alphaCells[celli] = mixture_.alpha(TCells[celli]);
+        alphaCells[celli] = mixture_.alphah(TCells[celli]);
     }
 
     forAll(T_.boundaryField(), patchi)
@@ -72,7 +72,7 @@ void Foam::hsPsiThermo<MixtureType>::calculate()
 
                 ppsi[facei] = mixture_.psi(pp[facei], pT[facei]);
                 pmu[facei] = mixture_.mu(pT[facei]);
-                palpha[facei] = mixture_.alpha(pT[facei]);
+                palpha[facei] = mixture_.alphah(pT[facei]);
             }
         }
         else
@@ -86,7 +86,7 @@ void Foam::hsPsiThermo<MixtureType>::calculate()
 
                 ppsi[facei] = mixture_.psi(pp[facei], pT[facei]);
                 pmu[facei] = mixture_.mu(pT[facei]);
-                palpha[facei] = mixture_.alpha(pT[facei]);
+                palpha[facei] = mixture_.alphah(pT[facei]);
             }
         }
     }
diff --git a/src/thermophysicalModels/basic/rhoThermo/hRhoThermo/hRhoThermo.C b/src/thermophysicalModels/basic/rhoThermo/hRhoThermo/hRhoThermo.C
index 9d3f3c2ba7..e2e7503cfc 100644
--- a/src/thermophysicalModels/basic/rhoThermo/hRhoThermo/hRhoThermo.C
+++ b/src/thermophysicalModels/basic/rhoThermo/hRhoThermo/hRhoThermo.C
@@ -49,7 +49,7 @@ void Foam::hRhoThermo<MixtureType>::calculate()
         rhoCells[celli] = mixture_.rho(pCells[celli], TCells[celli]);
 
         muCells[celli] = mixture_.mu(TCells[celli]);
-        alphaCells[celli] = mixture_.alpha(TCells[celli]);
+        alphaCells[celli] = mixture_.alphah(TCells[celli]);
     }
 
     forAll(this->T_.boundaryField(), patchi)
@@ -76,7 +76,7 @@ void Foam::hRhoThermo<MixtureType>::calculate()
                 ppsi[facei] = mixture_.psi(pp[facei], pT[facei]);
                 prho[facei] = mixture_.rho(pp[facei], pT[facei]);
                 pmu[facei] = mixture_.mu(pT[facei]);
-                palpha[facei] = mixture_.alpha(pT[facei]);
+                palpha[facei] = mixture_.alphah(pT[facei]);
             }
         }
         else
@@ -91,7 +91,7 @@ void Foam::hRhoThermo<MixtureType>::calculate()
                 ppsi[facei] = mixture_.psi(pp[facei], pT[facei]);
                 prho[facei] = mixture_.rho(pp[facei], pT[facei]);
                 pmu[facei] = mixture_.mu(pT[facei]);
-                palpha[facei] = mixture_.alpha(pT[facei]);
+                palpha[facei] = mixture_.alphah(pT[facei]);
             }
         }
     }
diff --git a/src/thermophysicalModels/basic/rhoThermo/hsRhoThermo/hsRhoThermo.C b/src/thermophysicalModels/basic/rhoThermo/hsRhoThermo/hsRhoThermo.C
index 8b395ad337..3febfaf30f 100644
--- a/src/thermophysicalModels/basic/rhoThermo/hsRhoThermo/hsRhoThermo.C
+++ b/src/thermophysicalModels/basic/rhoThermo/hsRhoThermo/hsRhoThermo.C
@@ -49,7 +49,7 @@ void Foam::hsRhoThermo<MixtureType>::calculate()
         rhoCells[celli] = mixture_.rho(pCells[celli], TCells[celli]);
 
         muCells[celli] = mixture_.mu(TCells[celli]);
-        alphaCells[celli] = mixture_.alpha(TCells[celli]);
+        alphaCells[celli] = mixture_.alphah(TCells[celli]);
     }
 
     forAll(this->T_.boundaryField(), patchi)
@@ -76,7 +76,7 @@ void Foam::hsRhoThermo<MixtureType>::calculate()
                 ppsi[facei] = mixture_.psi(pp[facei], pT[facei]);
                 prho[facei] = mixture_.rho(pp[facei], pT[facei]);
                 pmu[facei] = mixture_.mu(pT[facei]);
-                palpha[facei] = mixture_.alpha(pT[facei]);
+                palpha[facei] = mixture_.alphah(pT[facei]);
             }
         }
         else
@@ -91,7 +91,7 @@ void Foam::hsRhoThermo<MixtureType>::calculate()
                 ppsi[facei] = mixture_.psi(pp[facei], pT[facei]);
                 prho[facei] = mixture_.rho(pp[facei], pT[facei]);
                 pmu[facei] = mixture_.mu(pT[facei]);
-                palpha[facei] = mixture_.alpha(pT[facei]);
+                palpha[facei] = mixture_.alphah(pT[facei]);
             }
         }
     }
diff --git a/src/thermophysicalModels/reactionThermo/combustionThermo/mixtureThermos/hPsiMixtureThermo/hPsiMixtureThermo.C b/src/thermophysicalModels/reactionThermo/combustionThermo/mixtureThermos/hPsiMixtureThermo/hPsiMixtureThermo.C
index d604d13c17..36b51d598b 100644
--- a/src/thermophysicalModels/reactionThermo/combustionThermo/mixtureThermos/hPsiMixtureThermo/hPsiMixtureThermo.C
+++ b/src/thermophysicalModels/reactionThermo/combustionThermo/mixtureThermos/hPsiMixtureThermo/hPsiMixtureThermo.C
@@ -49,7 +49,7 @@ void Foam::hPsiMixtureThermo<MixtureType>::calculate()
         psiCells[celli] = mixture.psi(pCells[celli], TCells[celli]);
 
         muCells[celli] = mixture.mu(TCells[celli]);
-        alphaCells[celli] = mixture.alpha(TCells[celli]);
+        alphaCells[celli] = mixture.alphah(TCells[celli]);
     }
 
     forAll(T_.boundaryField(), patchi)
@@ -74,7 +74,7 @@ void Foam::hPsiMixtureThermo<MixtureType>::calculate()
 
                 ppsi[facei] = mixture.psi(pp[facei], pT[facei]);
                 pmu_[facei] = mixture.mu(pT[facei]);
-                palpha_[facei] = mixture.alpha(pT[facei]);
+                palpha_[facei] = mixture.alphah(pT[facei]);
             }
         }
         else
@@ -88,7 +88,7 @@ void Foam::hPsiMixtureThermo<MixtureType>::calculate()
 
                 ppsi[facei] = mixture.psi(pp[facei], pT[facei]);
                 pmu_[facei] = mixture.mu(pT[facei]);
-                palpha_[facei] = mixture.alpha(pT[facei]);
+                palpha_[facei] = mixture.alphah(pT[facei]);
             }
         }
     }
diff --git a/src/thermophysicalModels/reactionThermo/combustionThermo/mixtureThermos/hhuMixtureThermo/hhuMixtureThermo.C b/src/thermophysicalModels/reactionThermo/combustionThermo/mixtureThermos/hhuMixtureThermo/hhuMixtureThermo.C
index 79d153245c..ae87580cae 100644
--- a/src/thermophysicalModels/reactionThermo/combustionThermo/mixtureThermos/hhuMixtureThermo/hhuMixtureThermo.C
+++ b/src/thermophysicalModels/reactionThermo/combustionThermo/mixtureThermos/hhuMixtureThermo/hhuMixtureThermo.C
@@ -98,7 +98,7 @@ void Foam::hhuMixtureThermo<MixtureType>::calculate()
         psiCells[celli] = mixture_.psi(pCells[celli], TCells[celli]);
 
         muCells[celli] = mixture_.mu(TCells[celli]);
-        alphaCells[celli] = mixture_.alpha(TCells[celli]);
+        alphaCells[celli] = mixture_.alphah(TCells[celli]);
 
         TuCells[celli] =
             this->cellReactants(celli).TH(huCells[celli], TuCells[celli]);
@@ -128,7 +128,7 @@ void Foam::hhuMixtureThermo<MixtureType>::calculate()
 
                 ppsi[facei] = mixture_.psi(pp[facei], pT[facei]);
                 pmu_[facei] = mixture_.mu(pT[facei]);
-                palpha_[facei] = mixture_.alpha(pT[facei]);
+                palpha_[facei] = mixture_.alphah(pT[facei]);
             }
         }
         else
@@ -142,7 +142,7 @@ void Foam::hhuMixtureThermo<MixtureType>::calculate()
 
                 ppsi[facei] = mixture_.psi(pp[facei], pT[facei]);
                 pmu_[facei] = mixture_.mu(pT[facei]);
-                palpha_[facei] = mixture_.alpha(pT[facei]);
+                palpha_[facei] = mixture_.alphah(pT[facei]);
 
                 pTu[facei] =
                     this->patchFaceReactants(patchi, facei)
diff --git a/src/thermophysicalModels/reactionThermo/combustionThermo/mixtureThermos/hsPsiMixtureThermo/hsPsiMixtureThermo.C b/src/thermophysicalModels/reactionThermo/combustionThermo/mixtureThermos/hsPsiMixtureThermo/hsPsiMixtureThermo.C
index 08814a64fc..f46721186a 100644
--- a/src/thermophysicalModels/reactionThermo/combustionThermo/mixtureThermos/hsPsiMixtureThermo/hsPsiMixtureThermo.C
+++ b/src/thermophysicalModels/reactionThermo/combustionThermo/mixtureThermos/hsPsiMixtureThermo/hsPsiMixtureThermo.C
@@ -84,7 +84,7 @@ void Foam::hsPsiMixtureThermo<MixtureType>::calculate()
         psiCells[celli] = mixture_.psi(pCells[celli], TCells[celli]);
 
         muCells[celli] = mixture_.mu(TCells[celli]);
-        alphaCells[celli] = mixture_.alpha(TCells[celli]);
+        alphaCells[celli] = mixture_.alphah(TCells[celli]);
     }
 
     forAll(T_.boundaryField(), patchi)
@@ -109,7 +109,7 @@ void Foam::hsPsiMixtureThermo<MixtureType>::calculate()
 
                 ppsi[facei] = mixture_.psi(pp[facei], pT[facei]);
                 pmu_[facei] = mixture_.mu(pT[facei]);
-                palpha_[facei] = mixture_.alpha(pT[facei]);
+                palpha_[facei] = mixture_.alphah(pT[facei]);
             }
         }
         else
@@ -123,7 +123,7 @@ void Foam::hsPsiMixtureThermo<MixtureType>::calculate()
 
                 ppsi[facei] = mixture_.psi(pp[facei], pT[facei]);
                 pmu_[facei] = mixture_.mu(pT[facei]);
-                palpha_[facei] = mixture_.alpha(pT[facei]);
+                palpha_[facei] = mixture_.alphah(pT[facei]);
             }
         }
     }
diff --git a/src/thermophysicalModels/reactionThermo/mixtures/basicMultiComponentMixture/basicMultiComponentMixture.H b/src/thermophysicalModels/reactionThermo/mixtures/basicMultiComponentMixture/basicMultiComponentMixture.H
index 6d93e5cc0e..6c3534d39e 100644
--- a/src/thermophysicalModels/reactionThermo/mixtures/basicMultiComponentMixture/basicMultiComponentMixture.H
+++ b/src/thermophysicalModels/reactionThermo/mixtures/basicMultiComponentMixture/basicMultiComponentMixture.H
@@ -166,8 +166,13 @@ public:
             //- Thermal conductivity [W/m/K]
             virtual scalar kappa(const label specieI, const scalar T) const = 0;
 
-            //- Thermal diffusivity [kg/m/s]
-            virtual scalar alpha(const label specieI, const scalar T) const = 0;
+            //- Thermal diffusivity enthalpy [kg/m/s]
+            virtual scalar alphah(const label specieI, const scalar T) const
+                = 0;
+
+            //- Thermal diffusivity internal energy [kg/m/s]
+            virtual scalar alphae(const label specieI, const scalar T) const
+                = 0;
 };
 
 
diff --git a/src/thermophysicalModels/reactionThermo/mixtures/dieselMixture/dieselMixture.C b/src/thermophysicalModels/reactionThermo/mixtures/dieselMixture/dieselMixture.C
index c6b9126408..c526d8a43e 100644
--- a/src/thermophysicalModels/reactionThermo/mixtures/dieselMixture/dieselMixture.C
+++ b/src/thermophysicalModels/reactionThermo/mixtures/dieselMixture/dieselMixture.C
@@ -272,13 +272,24 @@ Foam::scalar Foam::dieselMixture<ThermoType>::kappa
 
 
 template<class ThermoType>
-Foam::scalar Foam::dieselMixture<ThermoType>::alpha
+Foam::scalar Foam::dieselMixture<ThermoType>::alphah
 (
     const label specieI,
     const scalar T
 ) const
 {
-    return getLocalThermo(specieI).alpha(T);
+    return getLocalThermo(specieI).alphah(T);
+}
+
+
+template<class ThermoType>
+Foam::scalar Foam::dieselMixture<ThermoType>::alphae
+(
+    const label specieI,
+    const scalar T
+) const
+{
+    return getLocalThermo(specieI).alphae(T);
 }
 
 
diff --git a/src/thermophysicalModels/reactionThermo/mixtures/dieselMixture/dieselMixture.H b/src/thermophysicalModels/reactionThermo/mixtures/dieselMixture/dieselMixture.H
index 67c43c626d..ddab8831dc 100644
--- a/src/thermophysicalModels/reactionThermo/mixtures/dieselMixture/dieselMixture.H
+++ b/src/thermophysicalModels/reactionThermo/mixtures/dieselMixture/dieselMixture.H
@@ -203,8 +203,11 @@ public:
             //- Thermal conductivity [W/m/K]
             virtual scalar kappa(const label specieI, const scalar T) const;
 
-            //- Thermal diffusivity [kg/m/s]
-            virtual scalar alpha(const label specieI, const scalar T) const;
+            //- Thermal diffusivity for enthalpy [kg/m/s]
+            virtual scalar alphah(const label specieI, const scalar T) const;
+
+            //- Thermal diffusivity for internal energy [kg/m/s]
+            virtual scalar alphae(const label specieI, const scalar T) const;
 };
 
 
diff --git a/src/thermophysicalModels/reactionThermo/mixtures/egrMixture/egrMixture.C b/src/thermophysicalModels/reactionThermo/mixtures/egrMixture/egrMixture.C
index 8bb9e5584b..4c90dc350b 100644
--- a/src/thermophysicalModels/reactionThermo/mixtures/egrMixture/egrMixture.C
+++ b/src/thermophysicalModels/reactionThermo/mixtures/egrMixture/egrMixture.C
@@ -282,13 +282,24 @@ Foam::scalar Foam::egrMixture<ThermoType>::kappa
 
 
 template<class ThermoType>
-Foam::scalar Foam::egrMixture<ThermoType>::alpha
+Foam::scalar Foam::egrMixture<ThermoType>::alphah
 (
     const label specieI,
     const scalar T
 ) const
 {
-    return getLocalThermo(specieI).alpha(T);
+    return getLocalThermo(specieI).alphah(T);
+}
+
+
+template<class ThermoType>
+Foam::scalar Foam::egrMixture<ThermoType>::alphae
+(
+    const label specieI,
+    const scalar T
+) const
+{
+    return getLocalThermo(specieI).alphae(T);
 }
 
 
diff --git a/src/thermophysicalModels/reactionThermo/mixtures/egrMixture/egrMixture.H b/src/thermophysicalModels/reactionThermo/mixtures/egrMixture/egrMixture.H
index cabe6057f6..62b5adfa08 100644
--- a/src/thermophysicalModels/reactionThermo/mixtures/egrMixture/egrMixture.H
+++ b/src/thermophysicalModels/reactionThermo/mixtures/egrMixture/egrMixture.H
@@ -219,8 +219,11 @@ public:
             //- Thermal conductivity [W/m/K]
             virtual scalar kappa(const label specieI, const scalar T) const;
 
-            //- Thermal diffusivity [kg/m/s]
-            virtual scalar alpha(const label specieI, const scalar T) const;
+            //- Thermal diffusivity enthalpy [kg/m/s]
+            virtual scalar alphah(const label specieI, const scalar T) const;
+
+            //- Thermal diffusivity internal energy [kg/m/s]
+            virtual scalar alphae(const label specieI, const scalar T) const;
 };
 
 
diff --git a/src/thermophysicalModels/reactionThermo/mixtures/homogeneousMixture/homogeneousMixture.C b/src/thermophysicalModels/reactionThermo/mixtures/homogeneousMixture/homogeneousMixture.C
index a44261324a..2a0190cabe 100644
--- a/src/thermophysicalModels/reactionThermo/mixtures/homogeneousMixture/homogeneousMixture.C
+++ b/src/thermophysicalModels/reactionThermo/mixtures/homogeneousMixture/homogeneousMixture.C
@@ -261,13 +261,24 @@ Foam::scalar Foam::homogeneousMixture<ThermoType>::kappa
 
 
 template<class ThermoType>
-Foam::scalar Foam::homogeneousMixture<ThermoType>::alpha
+Foam::scalar Foam::homogeneousMixture<ThermoType>::alphah
 (
     const label specieI,
     const scalar T
 ) const
 {
-    return getLocalThermo(specieI).alpha(T);
+    return getLocalThermo(specieI).alphah(T);
+}
+
+
+template<class ThermoType>
+Foam::scalar Foam::homogeneousMixture<ThermoType>::alphae
+(
+    const label specieI,
+    const scalar T
+) const
+{
+    return getLocalThermo(specieI).alphae(T);
 }
 
 
diff --git a/src/thermophysicalModels/reactionThermo/mixtures/homogeneousMixture/homogeneousMixture.H b/src/thermophysicalModels/reactionThermo/mixtures/homogeneousMixture/homogeneousMixture.H
index 9b5f9f0802..9eb1d6721e 100644
--- a/src/thermophysicalModels/reactionThermo/mixtures/homogeneousMixture/homogeneousMixture.H
+++ b/src/thermophysicalModels/reactionThermo/mixtures/homogeneousMixture/homogeneousMixture.H
@@ -177,8 +177,11 @@ public:
             //- Thermal conductivity [W/m/K]
             virtual scalar kappa(const label specieI, const scalar T) const;
 
-            //- Thermal diffusivity [kg/m/s]
-            virtual scalar alpha(const label specieI, const scalar T) const;
+            //- Thermal diffusivity enthalpy [kg/m/s]
+            virtual scalar alphah(const label specieI, const scalar T) const;
+
+            //- Thermal diffusivity internal energy [kg/m/s]
+            virtual scalar alphae(const label specieI, const scalar T) const;
 };
 
 
diff --git a/src/thermophysicalModels/reactionThermo/mixtures/inhomogeneousMixture/inhomogeneousMixture.C b/src/thermophysicalModels/reactionThermo/mixtures/inhomogeneousMixture/inhomogeneousMixture.C
index 2b6c5fc73f..a4b1ae6f0e 100644
--- a/src/thermophysicalModels/reactionThermo/mixtures/inhomogeneousMixture/inhomogeneousMixture.C
+++ b/src/thermophysicalModels/reactionThermo/mixtures/inhomogeneousMixture/inhomogeneousMixture.C
@@ -277,13 +277,24 @@ Foam::scalar Foam::inhomogeneousMixture<ThermoType>::kappa
 
 
 template<class ThermoType>
-Foam::scalar Foam::inhomogeneousMixture<ThermoType>::alpha
+Foam::scalar Foam::inhomogeneousMixture<ThermoType>::alphah
 (
     const label specieI,
     const scalar T
 ) const
 {
-    return getLocalThermo(specieI).alpha(T);
+    return getLocalThermo(specieI).alphah(T);
+}
+
+
+template<class ThermoType>
+Foam::scalar Foam::inhomogeneousMixture<ThermoType>::alphae
+(
+    const label specieI,
+    const scalar T
+) const
+{
+    return getLocalThermo(specieI).alphae(T);
 }
 
 
diff --git a/src/thermophysicalModels/reactionThermo/mixtures/inhomogeneousMixture/inhomogeneousMixture.H b/src/thermophysicalModels/reactionThermo/mixtures/inhomogeneousMixture/inhomogeneousMixture.H
index 9a4544b084..ff28aa5072 100644
--- a/src/thermophysicalModels/reactionThermo/mixtures/inhomogeneousMixture/inhomogeneousMixture.H
+++ b/src/thermophysicalModels/reactionThermo/mixtures/inhomogeneousMixture/inhomogeneousMixture.H
@@ -208,8 +208,11 @@ public:
             //- Thermal conductivity [W/m/K]
             virtual scalar kappa(const label specieI, const scalar T) const;
 
-            //- Thermal diffusivity [kg/m/s]
-            virtual scalar alpha(const label specieI, const scalar T) const;
+            //- Thermal diffusivity for enthalpy [kg/m/s]
+            virtual scalar alphah(const label specieI, const scalar T) const;
+
+            //- Thermal diffusivity for internal energy [kg/m/s]
+            virtual scalar alphae(const label specieI, const scalar T) const;
 };
 
 
diff --git a/src/thermophysicalModels/reactionThermo/mixtures/multiComponentMixture/multiComponentMixture.C b/src/thermophysicalModels/reactionThermo/mixtures/multiComponentMixture/multiComponentMixture.C
index 3d78443860..7575c84c52 100644
--- a/src/thermophysicalModels/reactionThermo/mixtures/multiComponentMixture/multiComponentMixture.C
+++ b/src/thermophysicalModels/reactionThermo/mixtures/multiComponentMixture/multiComponentMixture.C
@@ -302,13 +302,24 @@ Foam::scalar Foam::multiComponentMixture<ThermoType>::kappa
 
 
 template<class ThermoType>
-Foam::scalar Foam::multiComponentMixture<ThermoType>::alpha
+Foam::scalar Foam::multiComponentMixture<ThermoType>::alphah
 (
     const label specieI,
     const scalar T
 ) const
 {
-    return speciesData_[specieI].alpha(T);
+    return speciesData_[specieI].alphah(T);
+}
+
+
+template<class ThermoType>
+Foam::scalar Foam::multiComponentMixture<ThermoType>::alphae
+(
+    const label specieI,
+    const scalar T
+) const
+{
+    return speciesData_[specieI].alphae(T);
 }
 
 
diff --git a/src/thermophysicalModels/reactionThermo/mixtures/multiComponentMixture/multiComponentMixture.H b/src/thermophysicalModels/reactionThermo/mixtures/multiComponentMixture/multiComponentMixture.H
index f699b354bb..7442af516e 100644
--- a/src/thermophysicalModels/reactionThermo/mixtures/multiComponentMixture/multiComponentMixture.H
+++ b/src/thermophysicalModels/reactionThermo/mixtures/multiComponentMixture/multiComponentMixture.H
@@ -167,8 +167,11 @@ public:
             //- Thermal conductivity [W/m/K]
             virtual scalar kappa(const label specieI, const scalar T) const;
 
-            //- Thermal diffusivity [kg/m/s]
-            virtual scalar alpha(const label specieI, const scalar T) const;
+            //- Thermal diffusivity of enthalpy [kg/m/s]
+            virtual scalar alphah(const label specieI, const scalar T) const;
+
+            //- Thermal diffusivity of internal energy[kg/m/s]
+            virtual scalar alphae(const label specieI, const scalar T) const;
 };
 
 
diff --git a/src/thermophysicalModels/reactionThermo/mixtures/veryInhomogeneousMixture/veryInhomogeneousMixture.C b/src/thermophysicalModels/reactionThermo/mixtures/veryInhomogeneousMixture/veryInhomogeneousMixture.C
index d8ac45ca02..f85f5d55e3 100644
--- a/src/thermophysicalModels/reactionThermo/mixtures/veryInhomogeneousMixture/veryInhomogeneousMixture.C
+++ b/src/thermophysicalModels/reactionThermo/mixtures/veryInhomogeneousMixture/veryInhomogeneousMixture.C
@@ -278,13 +278,24 @@ Foam::scalar Foam::veryInhomogeneousMixture<ThermoType>::kappa
 
 
 template<class ThermoType>
-Foam::scalar Foam::veryInhomogeneousMixture<ThermoType>::alpha
+Foam::scalar Foam::veryInhomogeneousMixture<ThermoType>::alphah
 (
     const label specieI,
     const scalar T
 ) const
 {
-    return getLocalThermo(specieI).alpha(T);
+    return getLocalThermo(specieI).alphah(T);
+}
+
+
+template<class ThermoType>
+Foam::scalar Foam::veryInhomogeneousMixture<ThermoType>::alphae
+(
+    const label specieI,
+    const scalar T
+) const
+{
+    return getLocalThermo(specieI).alphae(T);
 }
 
 
diff --git a/src/thermophysicalModels/reactionThermo/mixtures/veryInhomogeneousMixture/veryInhomogeneousMixture.H b/src/thermophysicalModels/reactionThermo/mixtures/veryInhomogeneousMixture/veryInhomogeneousMixture.H
index 0e3bfde7b9..e0410c8651 100644
--- a/src/thermophysicalModels/reactionThermo/mixtures/veryInhomogeneousMixture/veryInhomogeneousMixture.H
+++ b/src/thermophysicalModels/reactionThermo/mixtures/veryInhomogeneousMixture/veryInhomogeneousMixture.H
@@ -209,8 +209,11 @@ public:
             //- Thermal conductivity [W/m/K]
             virtual scalar kappa(const label specieI, const scalar T) const;
 
-            //- Thermal diffusivity [kg/m/s]
-            virtual scalar alpha(const label specieI, const scalar T) const;
+            //- Thermal diffusivity for enthalpy [kg/m/s]
+            virtual scalar alphah(const label specieI, const scalar T) const;
+
+            //- Thermal diffusivity for internal energy [kg/m/s]
+            virtual scalar alphae(const label specieI, const scalar T) const;
 };
 
 
diff --git a/src/thermophysicalModels/reactionThermo/reactionThermo/mixtureThermos/hRhoMixtureThermo/hRhoMixtureThermo.C b/src/thermophysicalModels/reactionThermo/reactionThermo/mixtureThermos/hRhoMixtureThermo/hRhoMixtureThermo.C
index ddad4dba51..f9547ba212 100644
--- a/src/thermophysicalModels/reactionThermo/reactionThermo/mixtureThermos/hRhoMixtureThermo/hRhoMixtureThermo.C
+++ b/src/thermophysicalModels/reactionThermo/reactionThermo/mixtureThermos/hRhoMixtureThermo/hRhoMixtureThermo.C
@@ -51,7 +51,7 @@ void Foam::hRhoMixtureThermo<MixtureType>::calculate()
         rhoCells[celli] = mixture.rho(pCells[celli], TCells[celli]);
 
         muCells[celli] = mixture.mu(TCells[celli]);
-        alphaCells[celli] = mixture.alpha(TCells[celli]);
+        alphaCells[celli] = mixture.alphah(TCells[celli]);
     }
 
     forAll(T_.boundaryField(), patchi)
@@ -78,7 +78,7 @@ void Foam::hRhoMixtureThermo<MixtureType>::calculate()
                 ppsi[facei] = mixture.psi(pp[facei], pT[facei]);
                 prho[facei] = mixture.rho(pp[facei], pT[facei]);
                 pmu_[facei] = mixture.mu(pT[facei]);
-                palpha_[facei] = mixture.alpha(pT[facei]);
+                palpha_[facei] = mixture.alphah(pT[facei]);
             }
         }
         else
@@ -93,7 +93,7 @@ void Foam::hRhoMixtureThermo<MixtureType>::calculate()
                 ppsi[facei] = mixture.psi(pp[facei], pT[facei]);
                 prho[facei] = mixture.rho(pp[facei], pT[facei]);
                 pmu_[facei] = mixture.mu(pT[facei]);
-                palpha_[facei] = mixture.alpha(pT[facei]);
+                palpha_[facei] = mixture.alphah(pT[facei]);
             }
         }
     }
diff --git a/src/thermophysicalModels/reactionThermo/reactionThermo/mixtureThermos/hsRhoMixtureThermo/hsRhoMixtureThermo.C b/src/thermophysicalModels/reactionThermo/reactionThermo/mixtureThermos/hsRhoMixtureThermo/hsRhoMixtureThermo.C
index bd1095f46f..460067051a 100644
--- a/src/thermophysicalModels/reactionThermo/reactionThermo/mixtureThermos/hsRhoMixtureThermo/hsRhoMixtureThermo.C
+++ b/src/thermophysicalModels/reactionThermo/reactionThermo/mixtureThermos/hsRhoMixtureThermo/hsRhoMixtureThermo.C
@@ -51,7 +51,7 @@ void Foam::hsRhoMixtureThermo<MixtureType>::calculate()
         rhoCells[celli] = mixture.rho(pCells[celli], TCells[celli]);
 
         muCells[celli] = mixture.mu(TCells[celli]);
-        alphaCells[celli] = mixture.alpha(TCells[celli]);
+        alphaCells[celli] = mixture.alphah(TCells[celli]);
     }
 
     forAll(T_.boundaryField(), patchi)
@@ -78,7 +78,7 @@ void Foam::hsRhoMixtureThermo<MixtureType>::calculate()
                 ppsi[facei] = mixture.psi(pp[facei], pT[facei]);
                 prho[facei] = mixture.rho(pp[facei], pT[facei]);
                 pmu_[facei] = mixture.mu(pT[facei]);
-                palpha_[facei] = mixture.alpha(pT[facei]);
+                palpha_[facei] = mixture.alphah(pT[facei]);
             }
         }
         else
@@ -93,7 +93,7 @@ void Foam::hsRhoMixtureThermo<MixtureType>::calculate()
                 ppsi[facei] = mixture.psi(pp[facei], pT[facei]);
                 prho[facei] = mixture.rho(pp[facei], pT[facei]);
                 pmu_[facei] = mixture.mu(pT[facei]);
-                palpha_[facei] = mixture.alpha(pT[facei]);
+                palpha_[facei] = mixture.alphah(pT[facei]);
             }
         }
     }
diff --git a/src/thermophysicalModels/solid/transport/const/constSolidTransport.H b/src/thermophysicalModels/solid/transport/const/constSolidTransport.H
index be7b0241f8..dcf43353d8 100644
--- a/src/thermophysicalModels/solid/transport/const/constSolidTransport.H
+++ b/src/thermophysicalModels/solid/transport/const/constSolidTransport.H
@@ -95,9 +95,6 @@ public:
         //- Thermal conductivity [W/mK]
         inline scalar K(const scalar T) const;
 
-        //- Thermal diffusivity [kg/ms]
-        inline scalar alpha(const scalar T) const;
-
 
     // Ostream Operator
 
diff --git a/src/thermophysicalModels/solid/transport/const/constSolidTransportI.H b/src/thermophysicalModels/solid/transport/const/constSolidTransportI.H
index 52a031b8c9..1cab5b05d0 100644
--- a/src/thermophysicalModels/solid/transport/const/constSolidTransportI.H
+++ b/src/thermophysicalModels/solid/transport/const/constSolidTransportI.H
@@ -58,18 +58,4 @@ inline Foam::scalar Foam::constSolidTransport<thermo>::K(const scalar T) const
 }
 
 
-template<class thermo>
-inline Foam::scalar Foam::constSolidTransport<thermo>::alpha
-(
-    const scalar T
-) const
-{
-    scalar Cp = this->Cp(T);
-
-    scalar rho = this->rho(T);
-
-    return K_/(rho*Cp);
-}
-
-
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/solid/transport/exponential/exponentialSolidTransport.H b/src/thermophysicalModels/solid/transport/exponential/exponentialSolidTransport.H
index 397b2a3ee9..de48132bc2 100644
--- a/src/thermophysicalModels/solid/transport/exponential/exponentialSolidTransport.H
+++ b/src/thermophysicalModels/solid/transport/exponential/exponentialSolidTransport.H
@@ -106,9 +106,6 @@ public:
         //- Thermal conductivity [W/mK]
         inline scalar K(const scalar T) const;
 
-        //- Thermal diffusivity [kg/ms]
-        inline scalar alpha(const scalar T) const;
-
 
     // Ostream Operator
 
diff --git a/src/thermophysicalModels/solid/transport/exponential/exponentialSolidTransportI.H b/src/thermophysicalModels/solid/transport/exponential/exponentialSolidTransportI.H
index 3df0e70416..ad7ccf7ae7 100644
--- a/src/thermophysicalModels/solid/transport/exponential/exponentialSolidTransportI.H
+++ b/src/thermophysicalModels/solid/transport/exponential/exponentialSolidTransportI.H
@@ -67,18 +67,5 @@ inline Foam::scalar Foam::exponentialSolidTransport<thermo>::K
 }
 
 
-template<class thermo>
-inline Foam::scalar Foam::exponentialSolidTransport<thermo>::alpha
-(
-    const scalar T
-) const
-{
-    scalar Cp = this->Cp(T);
-
-    scalar rho = this->rho(T);
-
-    return (K(T)/(rho*Cp));
-}
-
 
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/specie/transport/const/constTransport.H b/src/thermophysicalModels/specie/transport/const/constTransport.H
index ca3fbef829..aa24ba4738 100644
--- a/src/thermophysicalModels/specie/transport/const/constTransport.H
+++ b/src/thermophysicalModels/specie/transport/const/constTransport.H
@@ -134,8 +134,11 @@ public:
         //- Thermal conductivity [W/mK]
         inline scalar kappa(const scalar T) const;
 
+        //- Thermal diffusivity for internal energy [kg/ms]
+        inline scalar alphae(const scalar T) const;
+
         //- Thermal diffusivity for enthalpy [kg/ms]
-        inline scalar alpha(const scalar T) const;
+        inline scalar alphah(const scalar T) const;
 
         // Species diffusivity
         //inline scalar D(const scalar T) const;
diff --git a/src/thermophysicalModels/specie/transport/const/constTransportI.H b/src/thermophysicalModels/specie/transport/const/constTransportI.H
index 77e4087e45..5d72594715 100644
--- a/src/thermophysicalModels/specie/transport/const/constTransportI.H
+++ b/src/thermophysicalModels/specie/transport/const/constTransportI.H
@@ -69,15 +69,16 @@ inline Foam::scalar Foam::constTransport<Thermo>::kappa(const scalar T) const
 
 
 template<class Thermo>
-inline Foam::scalar Foam::constTransport<Thermo>::alpha(const scalar T) const
+inline Foam::scalar Foam::constTransport<Thermo>::alphae(const scalar T) const
 {
-    scalar Cp_ = this->Cp(T);
+    return this->kappa(T)/this->Cv(T);
+}
 
-    scalar deltaT = T - specie::Tstd;
-    scalar CpBar =
-        (deltaT*(this->H(T) - this->H(specie::Tstd)) + Cp_)/(sqr(deltaT) + 1);
 
-    return Cp_*mu(T)*rPr_/CpBar;
+template<class Thermo>
+inline Foam::scalar Foam::constTransport<Thermo>::alphah(const scalar T) const
+{
+    return mu(T)*rPr_;
 }
 
 
diff --git a/src/thermophysicalModels/specie/transport/polynomial/polynomialTransport.H b/src/thermophysicalModels/specie/transport/polynomial/polynomialTransport.H
index 57f8557d87..6ac59be75f 100644
--- a/src/thermophysicalModels/specie/transport/polynomial/polynomialTransport.H
+++ b/src/thermophysicalModels/specie/transport/polynomial/polynomialTransport.H
@@ -148,8 +148,11 @@ public:
         //- Thermal conductivity [W/mK]
         inline scalar kappa(const scalar T) const;
 
+        //- Thermal diffusivity for internal energy [kg/ms]
+        inline scalar alphae(const scalar T) const;
+
         //- Thermal diffusivity for enthalpy [kg/ms]
-        inline scalar alpha(const scalar T) const;
+        inline scalar alphah(const scalar T) const;
 
         // Species diffusivity
         //inline scalar D(const scalar T) const;
diff --git a/src/thermophysicalModels/specie/transport/polynomial/polynomialTransportI.H b/src/thermophysicalModels/specie/transport/polynomial/polynomialTransportI.H
index 5482ef5648..faf6008989 100644
--- a/src/thermophysicalModels/specie/transport/polynomial/polynomialTransportI.H
+++ b/src/thermophysicalModels/specie/transport/polynomial/polynomialTransportI.H
@@ -122,17 +122,22 @@ inline Foam::scalar Foam::polynomialTransport<Thermo, PolySize>::kappa
 
 
 template<class Thermo, int PolySize>
-inline Foam::scalar Foam::polynomialTransport<Thermo, PolySize>::alpha
+inline Foam::scalar Foam::polynomialTransport<Thermo, PolySize>::alphae
 (
     const scalar T
 ) const
 {
-    scalar deltaT = T - specie::Tstd;
-    scalar CpBar =
-        (deltaT*(this->H(T) - this->H(specie::Tstd)) + this->Cp(T))
-       /(sqr(deltaT) + 1);
+    return kappa(T)/this->Cv(T);
+}
 
-    return kappa(T)/CpBar;
+
+template<class Thermo, int PolySize>
+inline Foam::scalar Foam::polynomialTransport<Thermo, PolySize>::alphah
+(
+    const scalar T
+) const
+{
+    return kappa(T)/this->Cp(T);
 }
 
 
diff --git a/src/thermophysicalModels/specie/transport/speciesTransport/speciesTransport.H b/src/thermophysicalModels/specie/transport/speciesTransport/speciesTransport.H
index def83e43bb..24b9bb7d67 100644
--- a/src/thermophysicalModels/specie/transport/speciesTransport/speciesTransport.H
+++ b/src/thermophysicalModels/specie/transport/speciesTransport/speciesTransport.H
@@ -81,8 +81,11 @@ public:
         // Thermal conductivity [W/mK]
         //inline scalar kappa(const scalar T) const;
 
+        // Thermal diffusivity for internal energy [kg/ms]
+        //inline scalar alphae(const scalar T) const;
+
         // Thermal diffusivity for enthalpy [kg/ms]
-        //inline scalar alpha(const scalar T) const;
+        //inline scalar alphah(const scalar T) const;
 
         // Species diffusivity
         //inline scalar D(const scalar T) const;
diff --git a/src/thermophysicalModels/specie/transport/sutherland/sutherlandTransport.H b/src/thermophysicalModels/specie/transport/sutherland/sutherlandTransport.H
index 9d0cddc493..da07227fdd 100644
--- a/src/thermophysicalModels/specie/transport/sutherland/sutherlandTransport.H
+++ b/src/thermophysicalModels/specie/transport/sutherland/sutherlandTransport.H
@@ -162,8 +162,11 @@ public:
         //- Thermal conductivity [W/mK]
         inline scalar kappa(const scalar T) const;
 
+        //- Thermal diffusivity for internal energy [kg/ms]
+        inline scalar alphae(const scalar T) const;
+
         //- Thermal diffusivity for enthalpy [kg/ms]
-        inline scalar alpha(const scalar T) const;
+        inline scalar alphah(const scalar T) const;
 
         // Species diffusivity
         //inline scalar D(const scalar T) const;
diff --git a/src/thermophysicalModels/specie/transport/sutherland/sutherlandTransportI.H b/src/thermophysicalModels/specie/transport/sutherland/sutherlandTransportI.H
index 2839cc5167..b3ec1efbd5 100644
--- a/src/thermophysicalModels/specie/transport/sutherland/sutherlandTransportI.H
+++ b/src/thermophysicalModels/specie/transport/sutherland/sutherlandTransportI.H
@@ -147,20 +147,23 @@ inline Foam::scalar Foam::sutherlandTransport<Thermo>::kappa
 
 
 template<class Thermo>
-inline Foam::scalar Foam::sutherlandTransport<Thermo>::alpha
+inline Foam::scalar Foam::sutherlandTransport<Thermo>::alphae
 (
     const scalar T
 ) const
 {
-    scalar Cv_ = this->Cv(T);
-    scalar R_ = this->R();
-    scalar Cp_ = Cv_ + R_;
+    return mu(T)*(1.32 + 1.77*this->R()/this->Cv(T));
+}
 
-    scalar deltaT = T - specie::Tstd;
-    scalar CpBar =
-        (deltaT*(this->H(T) - this->H(specie::Tstd)) + Cp_)/(sqr(deltaT) + 1);
 
-    return mu(T)*Cv_*(1.32 + 1.77*this->R()/Cv_)/CpBar;
+template<class Thermo>
+inline Foam::scalar Foam::sutherlandTransport<Thermo>::alphah
+(
+    const scalar T
+) const
+{
+
+    return kappa(T)/this->Cp(T);
 }
 
 

From f0bb8c2c2f5854a69ff2a7dba443dbd38caa9ad0 Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Fri, 4 May 2012 14:48:14 +0100
Subject: [PATCH 306/317] Updated headers

---
 .../basic/psiThermo/ePsiThermo/ePsiThermo.C                     | 2 +-
 .../basic/psiThermo/hPsiThermo/hPsiThermo.C                     | 2 +-
 .../basic/psiThermo/hsPsiThermo/hsPsiThermo.C                   | 2 +-
 .../basic/rhoThermo/hsRhoThermo/hsRhoThermo.C                   | 2 +-
 .../mixtureThermos/hPsiMixtureThermo/hPsiMixtureThermo.C        | 2 +-
 .../mixtureThermos/hhuMixtureThermo/hhuMixtureThermo.C          | 2 +-
 .../mixtureThermos/hsPsiMixtureThermo/hsPsiMixtureThermo.C      | 2 +-
 .../basicMultiComponentMixture/basicMultiComponentMixture.H     | 2 +-
 .../reactionThermo/mixtures/dieselMixture/dieselMixture.C       | 2 +-
 .../reactionThermo/mixtures/dieselMixture/dieselMixture.H       | 2 +-
 .../reactionThermo/mixtures/egrMixture/egrMixture.C             | 2 +-
 .../reactionThermo/mixtures/egrMixture/egrMixture.H             | 2 +-
 .../mixtures/homogeneousMixture/homogeneousMixture.C            | 2 +-
 .../mixtures/homogeneousMixture/homogeneousMixture.H            | 2 +-
 .../mixtures/inhomogeneousMixture/inhomogeneousMixture.C        | 2 +-
 .../mixtures/inhomogeneousMixture/inhomogeneousMixture.H        | 2 +-
 .../mixtures/multiComponentMixture/multiComponentMixture.C      | 2 +-
 .../mixtures/multiComponentMixture/multiComponentMixture.H      | 2 +-
 .../veryInhomogeneousMixture/veryInhomogeneousMixture.C         | 2 +-
 .../veryInhomogeneousMixture/veryInhomogeneousMixture.H         | 2 +-
 .../mixtureThermos/hRhoMixtureThermo/hRhoMixtureThermo.C        | 2 +-
 .../mixtureThermos/hsRhoMixtureThermo/hsRhoMixtureThermo.C      | 2 +-
 .../solid/transport/const/constSolidTransport.H                 | 2 +-
 .../solid/transport/const/constSolidTransportI.H                | 2 +-
 .../solid/transport/exponential/exponentialSolidTransport.H     | 2 +-
 .../solid/transport/exponential/exponentialSolidTransportI.H    | 2 +-
 .../specie/transport/const/constTransport.H                     | 2 +-
 .../specie/transport/const/constTransportI.H                    | 2 +-
 .../specie/transport/polynomial/polynomialTransport.H           | 2 +-
 .../specie/transport/polynomial/polynomialTransportI.H          | 2 +-
 .../specie/transport/speciesTransport/speciesTransport.H        | 2 +-
 .../specie/transport/sutherland/sutherlandTransport.H           | 2 +-
 .../specie/transport/sutherland/sutherlandTransportI.H          | 2 +-
 33 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/src/thermophysicalModels/basic/psiThermo/ePsiThermo/ePsiThermo.C b/src/thermophysicalModels/basic/psiThermo/ePsiThermo/ePsiThermo.C
index f5779997c1..3bc2351033 100644
--- a/src/thermophysicalModels/basic/psiThermo/ePsiThermo/ePsiThermo.C
+++ b/src/thermophysicalModels/basic/psiThermo/ePsiThermo/ePsiThermo.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/thermophysicalModels/basic/psiThermo/hPsiThermo/hPsiThermo.C b/src/thermophysicalModels/basic/psiThermo/hPsiThermo/hPsiThermo.C
index 013d786e6c..7f4d0fe188 100644
--- a/src/thermophysicalModels/basic/psiThermo/hPsiThermo/hPsiThermo.C
+++ b/src/thermophysicalModels/basic/psiThermo/hPsiThermo/hPsiThermo.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/thermophysicalModels/basic/psiThermo/hsPsiThermo/hsPsiThermo.C b/src/thermophysicalModels/basic/psiThermo/hsPsiThermo/hsPsiThermo.C
index 7d81f60680..a8010f8700 100644
--- a/src/thermophysicalModels/basic/psiThermo/hsPsiThermo/hsPsiThermo.C
+++ b/src/thermophysicalModels/basic/psiThermo/hsPsiThermo/hsPsiThermo.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/thermophysicalModels/basic/rhoThermo/hsRhoThermo/hsRhoThermo.C b/src/thermophysicalModels/basic/rhoThermo/hsRhoThermo/hsRhoThermo.C
index 3febfaf30f..f8697bf675 100644
--- a/src/thermophysicalModels/basic/rhoThermo/hsRhoThermo/hsRhoThermo.C
+++ b/src/thermophysicalModels/basic/rhoThermo/hsRhoThermo/hsRhoThermo.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/thermophysicalModels/reactionThermo/combustionThermo/mixtureThermos/hPsiMixtureThermo/hPsiMixtureThermo.C b/src/thermophysicalModels/reactionThermo/combustionThermo/mixtureThermos/hPsiMixtureThermo/hPsiMixtureThermo.C
index 36b51d598b..7328d32966 100644
--- a/src/thermophysicalModels/reactionThermo/combustionThermo/mixtureThermos/hPsiMixtureThermo/hPsiMixtureThermo.C
+++ b/src/thermophysicalModels/reactionThermo/combustionThermo/mixtureThermos/hPsiMixtureThermo/hPsiMixtureThermo.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/thermophysicalModels/reactionThermo/combustionThermo/mixtureThermos/hhuMixtureThermo/hhuMixtureThermo.C b/src/thermophysicalModels/reactionThermo/combustionThermo/mixtureThermos/hhuMixtureThermo/hhuMixtureThermo.C
index ae87580cae..b58ca99682 100644
--- a/src/thermophysicalModels/reactionThermo/combustionThermo/mixtureThermos/hhuMixtureThermo/hhuMixtureThermo.C
+++ b/src/thermophysicalModels/reactionThermo/combustionThermo/mixtureThermos/hhuMixtureThermo/hhuMixtureThermo.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/thermophysicalModels/reactionThermo/combustionThermo/mixtureThermos/hsPsiMixtureThermo/hsPsiMixtureThermo.C b/src/thermophysicalModels/reactionThermo/combustionThermo/mixtureThermos/hsPsiMixtureThermo/hsPsiMixtureThermo.C
index f46721186a..76f0a3a52f 100644
--- a/src/thermophysicalModels/reactionThermo/combustionThermo/mixtureThermos/hsPsiMixtureThermo/hsPsiMixtureThermo.C
+++ b/src/thermophysicalModels/reactionThermo/combustionThermo/mixtureThermos/hsPsiMixtureThermo/hsPsiMixtureThermo.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/thermophysicalModels/reactionThermo/mixtures/basicMultiComponentMixture/basicMultiComponentMixture.H b/src/thermophysicalModels/reactionThermo/mixtures/basicMultiComponentMixture/basicMultiComponentMixture.H
index 6c3534d39e..5fbeccdb96 100644
--- a/src/thermophysicalModels/reactionThermo/mixtures/basicMultiComponentMixture/basicMultiComponentMixture.H
+++ b/src/thermophysicalModels/reactionThermo/mixtures/basicMultiComponentMixture/basicMultiComponentMixture.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/thermophysicalModels/reactionThermo/mixtures/dieselMixture/dieselMixture.C b/src/thermophysicalModels/reactionThermo/mixtures/dieselMixture/dieselMixture.C
index c526d8a43e..50ffce15d1 100644
--- a/src/thermophysicalModels/reactionThermo/mixtures/dieselMixture/dieselMixture.C
+++ b/src/thermophysicalModels/reactionThermo/mixtures/dieselMixture/dieselMixture.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/thermophysicalModels/reactionThermo/mixtures/dieselMixture/dieselMixture.H b/src/thermophysicalModels/reactionThermo/mixtures/dieselMixture/dieselMixture.H
index ddab8831dc..e62670a5ae 100644
--- a/src/thermophysicalModels/reactionThermo/mixtures/dieselMixture/dieselMixture.H
+++ b/src/thermophysicalModels/reactionThermo/mixtures/dieselMixture/dieselMixture.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/thermophysicalModels/reactionThermo/mixtures/egrMixture/egrMixture.C b/src/thermophysicalModels/reactionThermo/mixtures/egrMixture/egrMixture.C
index 4c90dc350b..e1c992449b 100644
--- a/src/thermophysicalModels/reactionThermo/mixtures/egrMixture/egrMixture.C
+++ b/src/thermophysicalModels/reactionThermo/mixtures/egrMixture/egrMixture.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/thermophysicalModels/reactionThermo/mixtures/egrMixture/egrMixture.H b/src/thermophysicalModels/reactionThermo/mixtures/egrMixture/egrMixture.H
index 62b5adfa08..838162792d 100644
--- a/src/thermophysicalModels/reactionThermo/mixtures/egrMixture/egrMixture.H
+++ b/src/thermophysicalModels/reactionThermo/mixtures/egrMixture/egrMixture.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/thermophysicalModels/reactionThermo/mixtures/homogeneousMixture/homogeneousMixture.C b/src/thermophysicalModels/reactionThermo/mixtures/homogeneousMixture/homogeneousMixture.C
index 2a0190cabe..297adb9a00 100644
--- a/src/thermophysicalModels/reactionThermo/mixtures/homogeneousMixture/homogeneousMixture.C
+++ b/src/thermophysicalModels/reactionThermo/mixtures/homogeneousMixture/homogeneousMixture.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/thermophysicalModels/reactionThermo/mixtures/homogeneousMixture/homogeneousMixture.H b/src/thermophysicalModels/reactionThermo/mixtures/homogeneousMixture/homogeneousMixture.H
index 9eb1d6721e..bb4f19a17b 100644
--- a/src/thermophysicalModels/reactionThermo/mixtures/homogeneousMixture/homogeneousMixture.H
+++ b/src/thermophysicalModels/reactionThermo/mixtures/homogeneousMixture/homogeneousMixture.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/thermophysicalModels/reactionThermo/mixtures/inhomogeneousMixture/inhomogeneousMixture.C b/src/thermophysicalModels/reactionThermo/mixtures/inhomogeneousMixture/inhomogeneousMixture.C
index a4b1ae6f0e..38f9284c9a 100644
--- a/src/thermophysicalModels/reactionThermo/mixtures/inhomogeneousMixture/inhomogeneousMixture.C
+++ b/src/thermophysicalModels/reactionThermo/mixtures/inhomogeneousMixture/inhomogeneousMixture.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/thermophysicalModels/reactionThermo/mixtures/inhomogeneousMixture/inhomogeneousMixture.H b/src/thermophysicalModels/reactionThermo/mixtures/inhomogeneousMixture/inhomogeneousMixture.H
index ff28aa5072..2a779fd382 100644
--- a/src/thermophysicalModels/reactionThermo/mixtures/inhomogeneousMixture/inhomogeneousMixture.H
+++ b/src/thermophysicalModels/reactionThermo/mixtures/inhomogeneousMixture/inhomogeneousMixture.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/thermophysicalModels/reactionThermo/mixtures/multiComponentMixture/multiComponentMixture.C b/src/thermophysicalModels/reactionThermo/mixtures/multiComponentMixture/multiComponentMixture.C
index 7575c84c52..3718fc3edf 100644
--- a/src/thermophysicalModels/reactionThermo/mixtures/multiComponentMixture/multiComponentMixture.C
+++ b/src/thermophysicalModels/reactionThermo/mixtures/multiComponentMixture/multiComponentMixture.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/thermophysicalModels/reactionThermo/mixtures/multiComponentMixture/multiComponentMixture.H b/src/thermophysicalModels/reactionThermo/mixtures/multiComponentMixture/multiComponentMixture.H
index 7442af516e..5838f51702 100644
--- a/src/thermophysicalModels/reactionThermo/mixtures/multiComponentMixture/multiComponentMixture.H
+++ b/src/thermophysicalModels/reactionThermo/mixtures/multiComponentMixture/multiComponentMixture.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/thermophysicalModels/reactionThermo/mixtures/veryInhomogeneousMixture/veryInhomogeneousMixture.C b/src/thermophysicalModels/reactionThermo/mixtures/veryInhomogeneousMixture/veryInhomogeneousMixture.C
index f85f5d55e3..076693aab7 100644
--- a/src/thermophysicalModels/reactionThermo/mixtures/veryInhomogeneousMixture/veryInhomogeneousMixture.C
+++ b/src/thermophysicalModels/reactionThermo/mixtures/veryInhomogeneousMixture/veryInhomogeneousMixture.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/thermophysicalModels/reactionThermo/mixtures/veryInhomogeneousMixture/veryInhomogeneousMixture.H b/src/thermophysicalModels/reactionThermo/mixtures/veryInhomogeneousMixture/veryInhomogeneousMixture.H
index e0410c8651..578ace1e6c 100644
--- a/src/thermophysicalModels/reactionThermo/mixtures/veryInhomogeneousMixture/veryInhomogeneousMixture.H
+++ b/src/thermophysicalModels/reactionThermo/mixtures/veryInhomogeneousMixture/veryInhomogeneousMixture.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/thermophysicalModels/reactionThermo/reactionThermo/mixtureThermos/hRhoMixtureThermo/hRhoMixtureThermo.C b/src/thermophysicalModels/reactionThermo/reactionThermo/mixtureThermos/hRhoMixtureThermo/hRhoMixtureThermo.C
index f9547ba212..5229bea1e7 100644
--- a/src/thermophysicalModels/reactionThermo/reactionThermo/mixtureThermos/hRhoMixtureThermo/hRhoMixtureThermo.C
+++ b/src/thermophysicalModels/reactionThermo/reactionThermo/mixtureThermos/hRhoMixtureThermo/hRhoMixtureThermo.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/thermophysicalModels/reactionThermo/reactionThermo/mixtureThermos/hsRhoMixtureThermo/hsRhoMixtureThermo.C b/src/thermophysicalModels/reactionThermo/reactionThermo/mixtureThermos/hsRhoMixtureThermo/hsRhoMixtureThermo.C
index 460067051a..6277287cbc 100644
--- a/src/thermophysicalModels/reactionThermo/reactionThermo/mixtureThermos/hsRhoMixtureThermo/hsRhoMixtureThermo.C
+++ b/src/thermophysicalModels/reactionThermo/reactionThermo/mixtureThermos/hsRhoMixtureThermo/hsRhoMixtureThermo.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/thermophysicalModels/solid/transport/const/constSolidTransport.H b/src/thermophysicalModels/solid/transport/const/constSolidTransport.H
index dcf43353d8..c86e82be6f 100644
--- a/src/thermophysicalModels/solid/transport/const/constSolidTransport.H
+++ b/src/thermophysicalModels/solid/transport/const/constSolidTransport.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/thermophysicalModels/solid/transport/const/constSolidTransportI.H b/src/thermophysicalModels/solid/transport/const/constSolidTransportI.H
index 1cab5b05d0..a500b37567 100644
--- a/src/thermophysicalModels/solid/transport/const/constSolidTransportI.H
+++ b/src/thermophysicalModels/solid/transport/const/constSolidTransportI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/thermophysicalModels/solid/transport/exponential/exponentialSolidTransport.H b/src/thermophysicalModels/solid/transport/exponential/exponentialSolidTransport.H
index de48132bc2..d699bce99a 100644
--- a/src/thermophysicalModels/solid/transport/exponential/exponentialSolidTransport.H
+++ b/src/thermophysicalModels/solid/transport/exponential/exponentialSolidTransport.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/thermophysicalModels/solid/transport/exponential/exponentialSolidTransportI.H b/src/thermophysicalModels/solid/transport/exponential/exponentialSolidTransportI.H
index ad7ccf7ae7..b47a0faca0 100644
--- a/src/thermophysicalModels/solid/transport/exponential/exponentialSolidTransportI.H
+++ b/src/thermophysicalModels/solid/transport/exponential/exponentialSolidTransportI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/thermophysicalModels/specie/transport/const/constTransport.H b/src/thermophysicalModels/specie/transport/const/constTransport.H
index aa24ba4738..2259a83365 100644
--- a/src/thermophysicalModels/specie/transport/const/constTransport.H
+++ b/src/thermophysicalModels/specie/transport/const/constTransport.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/thermophysicalModels/specie/transport/const/constTransportI.H b/src/thermophysicalModels/specie/transport/const/constTransportI.H
index 5d72594715..e6ae9bce1f 100644
--- a/src/thermophysicalModels/specie/transport/const/constTransportI.H
+++ b/src/thermophysicalModels/specie/transport/const/constTransportI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/thermophysicalModels/specie/transport/polynomial/polynomialTransport.H b/src/thermophysicalModels/specie/transport/polynomial/polynomialTransport.H
index 6ac59be75f..67c71b1b93 100644
--- a/src/thermophysicalModels/specie/transport/polynomial/polynomialTransport.H
+++ b/src/thermophysicalModels/specie/transport/polynomial/polynomialTransport.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/thermophysicalModels/specie/transport/polynomial/polynomialTransportI.H b/src/thermophysicalModels/specie/transport/polynomial/polynomialTransportI.H
index faf6008989..8d0d4f4e61 100644
--- a/src/thermophysicalModels/specie/transport/polynomial/polynomialTransportI.H
+++ b/src/thermophysicalModels/specie/transport/polynomial/polynomialTransportI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/thermophysicalModels/specie/transport/speciesTransport/speciesTransport.H b/src/thermophysicalModels/specie/transport/speciesTransport/speciesTransport.H
index 24b9bb7d67..911ab820aa 100644
--- a/src/thermophysicalModels/specie/transport/speciesTransport/speciesTransport.H
+++ b/src/thermophysicalModels/specie/transport/speciesTransport/speciesTransport.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/thermophysicalModels/specie/transport/sutherland/sutherlandTransport.H b/src/thermophysicalModels/specie/transport/sutherland/sutherlandTransport.H
index da07227fdd..99b943b823 100644
--- a/src/thermophysicalModels/specie/transport/sutherland/sutherlandTransport.H
+++ b/src/thermophysicalModels/specie/transport/sutherland/sutherlandTransport.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/thermophysicalModels/specie/transport/sutherland/sutherlandTransportI.H b/src/thermophysicalModels/specie/transport/sutherland/sutherlandTransportI.H
index b3ec1efbd5..65e0a227bd 100644
--- a/src/thermophysicalModels/specie/transport/sutherland/sutherlandTransportI.H
+++ b/src/thermophysicalModels/specie/transport/sutherland/sutherlandTransportI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

From e156d196108d60e3148e34b091bb20774df03c95 Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Fri, 4 May 2012 14:48:46 +0100
Subject: [PATCH 307/317] rhoSimpleFoam family: updated to use e rather than h

---
 .../compressible/rhoSimpleFoam/createFields.H  |  2 +-
 .../solvers/compressible/rhoSimpleFoam/hEqn.H  | 17 -----------------
 .../rhoPorousMRFSimpleFoam/hEqn.H              | 18 ------------------
 .../rhoPorousMRFSimpleFoam.C                   |  2 +-
 .../compressible/rhoSimpleFoam/rhoSimpleFoam.C |  2 +-
 .../rhoSimplecFoam/rhoSimplecFoam.C            |  2 +-
 6 files changed, 4 insertions(+), 39 deletions(-)
 delete mode 100644 applications/solvers/compressible/rhoSimpleFoam/hEqn.H
 delete mode 100644 applications/solvers/compressible/rhoSimpleFoam/rhoPorousMRFSimpleFoam/hEqn.H

diff --git a/applications/solvers/compressible/rhoSimpleFoam/createFields.H b/applications/solvers/compressible/rhoSimpleFoam/createFields.H
index 27bfb83133..8a7d636f99 100644
--- a/applications/solvers/compressible/rhoSimpleFoam/createFields.H
+++ b/applications/solvers/compressible/rhoSimpleFoam/createFields.H
@@ -20,7 +20,7 @@
     );
 
     volScalarField& p = thermo.p();
-    volScalarField& h = thermo.h();
+    volScalarField& e = thermo.e();
     const volScalarField& psi = thermo.psi();
 
     Info<< "Reading field U\n" << endl;
diff --git a/applications/solvers/compressible/rhoSimpleFoam/hEqn.H b/applications/solvers/compressible/rhoSimpleFoam/hEqn.H
deleted file mode 100644
index 92cea341ca..0000000000
--- a/applications/solvers/compressible/rhoSimpleFoam/hEqn.H
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-    volScalarField K("K", 0.5*magSqr(U));
-
-    fvScalarMatrix hEqn
-    (
-        fvm::div(phi, h)
-      - fvm::Sp(fvc::div(phi), h)
-      - fvm::laplacian(turbulence->alphaEff(), h)
-     ==
-        fvc::div(phi)*K - fvc::div(phi, K)
-    );
-
-    hEqn.relax();
-    hEqn.solve();
-
-    thermo.correct();
-}
diff --git a/applications/solvers/compressible/rhoSimpleFoam/rhoPorousMRFSimpleFoam/hEqn.H b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousMRFSimpleFoam/hEqn.H
deleted file mode 100644
index cb989b804f..0000000000
--- a/applications/solvers/compressible/rhoSimpleFoam/rhoPorousMRFSimpleFoam/hEqn.H
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    fvScalarMatrix hEqn
-    (
-        fvm::div(phi, h)
-      - fvm::Sp(fvc::div(phi), h)
-      - fvm::laplacian(turbulence->alphaEff(), h)
-     ==
-      - fvc::div(phi, 0.5*magSqr(U), "div(phi,K)")
-    );
-
-    pZones.addEnthalpySource(thermo, rho, hEqn);
-
-    hEqn.relax();
-
-    hEqn.solve();
-
-    thermo.correct();
-}
diff --git a/applications/solvers/compressible/rhoSimpleFoam/rhoPorousMRFSimpleFoam/rhoPorousMRFSimpleFoam.C b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousMRFSimpleFoam/rhoPorousMRFSimpleFoam.C
index 1cb421e5f4..ff642413e0 100644
--- a/applications/solvers/compressible/rhoSimpleFoam/rhoPorousMRFSimpleFoam/rhoPorousMRFSimpleFoam.C
+++ b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousMRFSimpleFoam/rhoPorousMRFSimpleFoam.C
@@ -63,7 +63,7 @@ int main(int argc, char *argv[])
         // Pressure-velocity SIMPLE corrector
         {
             #include "UEqn.H"
-            #include "hEqn.H"
+            #include "eEqn.H"
             #include "pEqn.H"
         }
 
diff --git a/applications/solvers/compressible/rhoSimpleFoam/rhoSimpleFoam.C b/applications/solvers/compressible/rhoSimpleFoam/rhoSimpleFoam.C
index e87a35fab2..d16a2264f4 100644
--- a/applications/solvers/compressible/rhoSimpleFoam/rhoSimpleFoam.C
+++ b/applications/solvers/compressible/rhoSimpleFoam/rhoSimpleFoam.C
@@ -59,7 +59,7 @@ int main(int argc, char *argv[])
         // Pressure-velocity SIMPLE corrector
         {
             #include "UEqn.H"
-            #include "hEqn.H"
+            #include "eEqn.H"
             #include "pEqn.H"
         }
 
diff --git a/applications/solvers/compressible/rhoSimpleFoam/rhoSimplecFoam/rhoSimplecFoam.C b/applications/solvers/compressible/rhoSimpleFoam/rhoSimplecFoam/rhoSimplecFoam.C
index 37334e7955..198b5eea40 100644
--- a/applications/solvers/compressible/rhoSimpleFoam/rhoSimplecFoam/rhoSimplecFoam.C
+++ b/applications/solvers/compressible/rhoSimpleFoam/rhoSimplecFoam/rhoSimplecFoam.C
@@ -61,8 +61,8 @@ int main(int argc, char *argv[])
         // Velocity-pressure-enthalpy SIMPLEC corrector
         {
             #include "UEqn.H"
+            #include "eEqn.H"
             #include "pEqn.H"
-            #include "hEqn.H"
         }
 
         turbulence->correct();

From 50cccded84a2611284121629b3e1fb8391245d4d Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Fri, 4 May 2012 14:48:57 +0100
Subject: [PATCH 308/317] Updated headers

---
 .../rhoPorousMRFSimpleFoam/rhoPorousMRFSimpleFoam.C             | 2 +-
 applications/solvers/compressible/rhoSimpleFoam/rhoSimpleFoam.C | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/applications/solvers/compressible/rhoSimpleFoam/rhoPorousMRFSimpleFoam/rhoPorousMRFSimpleFoam.C b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousMRFSimpleFoam/rhoPorousMRFSimpleFoam.C
index ff642413e0..c866aea7df 100644
--- a/applications/solvers/compressible/rhoSimpleFoam/rhoPorousMRFSimpleFoam/rhoPorousMRFSimpleFoam.C
+++ b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousMRFSimpleFoam/rhoPorousMRFSimpleFoam.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/solvers/compressible/rhoSimpleFoam/rhoSimpleFoam.C b/applications/solvers/compressible/rhoSimpleFoam/rhoSimpleFoam.C
index d16a2264f4..bb249f5430 100644
--- a/applications/solvers/compressible/rhoSimpleFoam/rhoSimpleFoam.C
+++ b/applications/solvers/compressible/rhoSimpleFoam/rhoSimpleFoam.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

From 060a2b0f425c8e3fb9aa9748f8a4199a2de50d41 Mon Sep 17 00:00:00 2001
From: sergio <sergio>
Date: Fri, 4 May 2012 16:17:43 +0100
Subject: [PATCH 309/317] BUG: Making fixeTemperature general for variable Cp
 thermos

---
 .../thermalModel/fixedTemperature/fixedTemperature.C        | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/thermophysicalModels/thermalPorousZone/thermalModel/fixedTemperature/fixedTemperature.C b/src/thermophysicalModels/thermalPorousZone/thermalModel/fixedTemperature/fixedTemperature.C
index a6f6b3ca88..509c7d70cc 100644
--- a/src/thermophysicalModels/thermalPorousZone/thermalModel/fixedTemperature/fixedTemperature.C
+++ b/src/thermophysicalModels/thermalPorousZone/thermalModel/fixedTemperature/fixedTemperature.C
@@ -82,20 +82,20 @@ void Foam::porousMedia::fixedTemperature::addEnthalpySource
     scalarField& hDiag = hEqn.diag();
     scalarField& hSource = hEqn.source();
 
-    tmp<volScalarField> Cp = thermo.Cp();
+    const scalarField T(hDiag.size(), T_);
 
-    // TODO: generalize for non-fixedTemperature methods
     const scalar rate = 1e6;
 
     forAll(zones, zoneI)
     {
         const labelList& cells = mesh.cellZones()[zones[zoneI]];
+        tmp<scalarField> h = thermo.h(T, cells);
 
         forAll(cells, i)
         {
             hDiag[cells[i]] += rate*V[cells[i]]*rho[cells[i]];
             hSource[cells[i]] +=
-                rate*V[cells[i]]*rho[cells[i]]*Cp()[cells[i]]*T_;
+                rate*V[cells[i]]*rho[cells[i]]*h()[cells[i]];
         }
     }
 }

From e5cd8fff64705628ced1701380b0fff2819d7179 Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Fri, 4 May 2012 16:20:11 +0100
Subject: [PATCH 310/317] compressible solvers: renamed Kp -> Ekp (kinetic +
 pressure energy)

---
 .../solvers/compressible/rhoSimpleFoam/eEqn.H | 18 ++++++++++++++++++
 .../rhoPorousMRFSimpleFoam/eEqn.H             | 19 +++++++++++++++++++
 .../angledDuctExplicit/system/fvSchemes       |  6 +++---
 .../angledDuctExplicit/system/fvSolution      |  4 ++--
 .../constant/thermophysicalProperties         |  4 ++--
 .../angledDuctImplicit/system/fvSchemes       |  6 +++---
 .../angledDuctImplicit/system/fvSolution      |  4 ++--
 .../constant/thermophysicalProperties         |  4 ++--
 .../squareBend/system/fvSchemes               |  5 +++--
 .../squareBend/system/fvSolution              |  4 ++--
 10 files changed, 56 insertions(+), 18 deletions(-)
 create mode 100644 applications/solvers/compressible/rhoSimpleFoam/eEqn.H
 create mode 100644 applications/solvers/compressible/rhoSimpleFoam/rhoPorousMRFSimpleFoam/eEqn.H

diff --git a/applications/solvers/compressible/rhoSimpleFoam/eEqn.H b/applications/solvers/compressible/rhoSimpleFoam/eEqn.H
new file mode 100644
index 0000000000..a1ea771573
--- /dev/null
+++ b/applications/solvers/compressible/rhoSimpleFoam/eEqn.H
@@ -0,0 +1,18 @@
+{
+    // Kinetic + pressure energy
+    volScalarField Ekp("Ekp", 0.5*magSqr(U) + p/rho);
+
+    fvScalarMatrix eEqn
+    (
+        fvm::div(phi, e)
+      - fvm::Sp(fvc::div(phi), e)
+      - fvm::laplacian(turbulence->alphaEff(), e)
+     ==
+        fvc::div(phi)*Ekp - fvc::div(phi, Ekp)
+    );
+
+    eEqn.relax();
+    eEqn.solve();
+
+    thermo.correct();
+}
diff --git a/applications/solvers/compressible/rhoSimpleFoam/rhoPorousMRFSimpleFoam/eEqn.H b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousMRFSimpleFoam/eEqn.H
new file mode 100644
index 0000000000..4791062d35
--- /dev/null
+++ b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousMRFSimpleFoam/eEqn.H
@@ -0,0 +1,19 @@
+{
+    volScalarField Ekp("Ekp", 0.5*magSqr(U) + p/rho);
+
+    fvScalarMatrix eEqn
+    (
+        fvm::div(phi, e)
+      - fvm::Sp(fvc::div(phi), e)
+      - fvm::laplacian(turbulence->alphaEff(), e)
+     ==
+        fvc::div(phi)*Ekp - fvc::div(phi, Ekp)
+    );
+
+    //pZones.addEnergySource(thermo, rho, eEqn);
+
+    eEqn.relax();
+    eEqn.solve();
+
+    thermo.correct();
+}
diff --git a/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctExplicit/system/fvSchemes b/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctExplicit/system/fvSchemes
index 711e4e3233..0a14cc31a5 100644
--- a/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctExplicit/system/fvSchemes
+++ b/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctExplicit/system/fvSchemes
@@ -29,16 +29,16 @@ divSchemes
 {
     div(phi,U)      Gauss upwind;
     div((muEff*dev2(T(grad(U))))) Gauss linear;
-    div(phi,h)      Gauss upwind;
+    div(phi,e)      Gauss upwind;
     div(phi,epsilon) Gauss upwind;
     div(phi,k)      Gauss upwind;
-    div(phi,K)      Gauss upwind;
+    div(phi,Ekp)    Gauss upwind;
 }
 
 laplacianSchemes
 {
     laplacian(muEff,U) Gauss linear corrected;
-    laplacian(alphaEff,h) Gauss linear corrected;
+    laplacian(alphaEff,e) Gauss linear corrected;
     laplacian((rho*rAU),p) Gauss linear corrected;
     laplacian(DepsilonEff,epsilon) Gauss linear corrected;
     laplacian(DkEff,k) Gauss linear corrected;
diff --git a/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctExplicit/system/fvSolution b/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctExplicit/system/fvSolution
index 317c954ef6..a1e3109222 100644
--- a/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctExplicit/system/fvSolution
+++ b/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctExplicit/system/fvSolution
@@ -38,7 +38,7 @@ solvers
         relTol          0.1;
     }
 
-    h
+    e
     {
         solver          PBiCG;
         preconditioner  DILU;
@@ -82,7 +82,7 @@ relaxationFactors
     {
         U               0.7;
         "(k|epsilon)"   0.7;
-        h               0.5;
+        e               0.5;
     }
 }
 
diff --git a/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/constant/thermophysicalProperties b/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/constant/thermophysicalProperties
index d6d597d433..cbe2156297 100644
--- a/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/constant/thermophysicalProperties
+++ b/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/constant/thermophysicalProperties
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-thermoType      hPsiThermo<pureMixture<sutherlandTransport<specieThermo<hConstThermo<perfectGas>>>>>;
+thermoType ePsiThermo<pureMixture<sutherlandTransport<specieThermo<eConstThermo<perfectGas>>>>>;
 
 mixture
 {
@@ -26,7 +26,7 @@ mixture
     }
     thermodynamics
     {
-        Cp          1007;
+        Cv          719.3;
         Hf          0;
     }
     transport
diff --git a/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/system/fvSchemes b/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/system/fvSchemes
index 711e4e3233..0a14cc31a5 100644
--- a/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/system/fvSchemes
+++ b/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/system/fvSchemes
@@ -29,16 +29,16 @@ divSchemes
 {
     div(phi,U)      Gauss upwind;
     div((muEff*dev2(T(grad(U))))) Gauss linear;
-    div(phi,h)      Gauss upwind;
+    div(phi,e)      Gauss upwind;
     div(phi,epsilon) Gauss upwind;
     div(phi,k)      Gauss upwind;
-    div(phi,K)      Gauss upwind;
+    div(phi,Ekp)    Gauss upwind;
 }
 
 laplacianSchemes
 {
     laplacian(muEff,U) Gauss linear corrected;
-    laplacian(alphaEff,h) Gauss linear corrected;
+    laplacian(alphaEff,e) Gauss linear corrected;
     laplacian((rho*rAU),p) Gauss linear corrected;
     laplacian(DepsilonEff,epsilon) Gauss linear corrected;
     laplacian(DkEff,k) Gauss linear corrected;
diff --git a/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/system/fvSolution b/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/system/fvSolution
index 6f93606315..65a9606e7f 100644
--- a/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/system/fvSolution
+++ b/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/system/fvSolution
@@ -29,7 +29,7 @@ solvers
         mergeLevels     1;
     }
 
-    h
+    e
     {
         solver          PBiCG;
         preconditioner  DILU;
@@ -76,7 +76,7 @@ relaxationFactors
     {
         U               0.7;
         "(k|epsilon)"   0.9;
-        h               0.9;
+        e               0.9;
     }
 }
 
diff --git a/tutorials/compressible/rhoSimplecFoam/squareBend/constant/thermophysicalProperties b/tutorials/compressible/rhoSimplecFoam/squareBend/constant/thermophysicalProperties
index d6d597d433..cbe2156297 100644
--- a/tutorials/compressible/rhoSimplecFoam/squareBend/constant/thermophysicalProperties
+++ b/tutorials/compressible/rhoSimplecFoam/squareBend/constant/thermophysicalProperties
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-thermoType      hPsiThermo<pureMixture<sutherlandTransport<specieThermo<hConstThermo<perfectGas>>>>>;
+thermoType ePsiThermo<pureMixture<sutherlandTransport<specieThermo<eConstThermo<perfectGas>>>>>;
 
 mixture
 {
@@ -26,7 +26,7 @@ mixture
     }
     thermodynamics
     {
-        Cp          1007;
+        Cv          719.3;
         Hf          0;
     }
     transport
diff --git a/tutorials/compressible/rhoSimplecFoam/squareBend/system/fvSchemes b/tutorials/compressible/rhoSimplecFoam/squareBend/system/fvSchemes
index c9c95b180c..e1e47211d7 100644
--- a/tutorials/compressible/rhoSimplecFoam/squareBend/system/fvSchemes
+++ b/tutorials/compressible/rhoSimplecFoam/squareBend/system/fvSchemes
@@ -31,12 +31,13 @@ divSchemes
 
     div(phi,U)          Gauss upwind;
     div((muEff*dev2(T(grad(U)))))      Gauss linear;
-    div(phi,h)          Gauss upwind;
+    div(phi,e)          Gauss upwind;
     div(phi,epsilon)    Gauss upwind;
     div(phi,k)          Gauss upwind;
 
     div(phid,p)         Gauss upwind;
-    div(phi,K)          Gauss upwind;
+    div(phi,Ekp)        Gauss upwind;
+    div((phi|interpolate(rho)),p)  Gauss upwind;
 }
 
 laplacianSchemes
diff --git a/tutorials/compressible/rhoSimplecFoam/squareBend/system/fvSolution b/tutorials/compressible/rhoSimplecFoam/squareBend/system/fvSolution
index 09afca5761..812766041a 100644
--- a/tutorials/compressible/rhoSimplecFoam/squareBend/system/fvSolution
+++ b/tutorials/compressible/rhoSimplecFoam/squareBend/system/fvSolution
@@ -32,7 +32,7 @@ solvers
         mergeLevels     1;
     }
 
-    "(U|h|k|epsilon)"
+    "(U|e|k|epsilon)"
     {
         solver          GAMG;
         tolerance       1e-08;
@@ -67,7 +67,7 @@ relaxationFactors
     {
         p               1;
         U               0.9;
-        h               0.9;
+        e               0.9;
         k               0.9;
         epsilon         0.9;
     }

From fa4fd968a88f6b3ff7622ce6231b982418de24d6 Mon Sep 17 00:00:00 2001
From: sergio <sergio>
Date: Tue, 8 May 2012 11:02:39 +0100
Subject: [PATCH 311/317] ENH: Renaming K to kappa and kappa to kappaRad in
 solid thermo and updating tutorials

---
 .../porousSolid/setPorousRegionSolidFields.H  |  4 +-
 .../solid/setRegionSolidFields.H              |  2 +-
 .../porousSolid/setPorousRegionSolidFields.H  |  4 +-
 .../solid/setRegionSolidFields.H              |  4 +-
 .../solidWallHeatFlux/solidWallHeatFlux.C     |  2 +-
 .../pyrolysisModels/noPyrolysis/noPyrolysis.C |  8 +--
 .../pyrolysisModels/noPyrolysis/noPyrolysis.H |  4 +-
 .../pyrolysisModel/pyrolysisModel.H           |  4 +-
 .../reactingOneDim/reactingOneDim.C           | 18 ++---
 .../reactingOneDim/reactingOneDim.H           |  8 +--
 ...emperatureThermoBaffleFvPatchScalarField.H |  6 +-
 .../thermoBaffleModels/noThermo/noThermo.C    |  8 +--
 .../thermoBaffleModels/noThermo/noThermo.H    |  4 +-
 .../thermoBaffle2D/thermoBaffle2D.C           | 16 ++---
 .../thermoBaffle2D/thermoBaffle2D.H           |  4 +-
 .../thermoBaffleModel/thermoBaffleModel.H     |  4 +-
 .../basicSolidThermo/basicSolidThermo.C       | 12 ++--
 .../basicSolidThermo/basicSolidThermo.H       | 12 ++--
 .../constSolidThermo/constSolidThermo.C       | 70 +++++++++----------
 .../constSolidThermo/constSolidThermo.H       | 14 ++--
 .../directionalKSolidThermo.C                 | 40 ++++++-----
 .../directionalKSolidThermo.H                 | 16 ++---
 .../interpolateSolid/interpolateSolid.C       |  8 +--
 .../interpolateSolid/interpolateSolid.H       |  2 +-
 .../interpolatedSolidThermo.C                 | 12 ++--
 .../interpolatedSolidThermo.H                 |  2 +-
 .../isotropicKSolidThermo.C                   | 40 ++++++-----
 .../isotropicKSolidThermo.H                   | 16 ++---
 .../basicSolidMixture/basicSolidMixture.H     |  4 +-
 .../multiComponentSolidMixture.C              |  8 +--
 .../multiComponentSolidMixture.H              |  4 +-
 .../solidMixtureThermo/solidMixtureThermo.C   | 44 ++++++------
 .../solidMixtureThermo/solidMixtureThermo.H   | 16 ++---
 .../solid/radiation/const/constSolidRad.C     |  4 +-
 .../solid/radiation/const/constSolidRad.H     |  6 +-
 .../solid/radiation/const/constSolidRadI.H    | 10 +--
 .../transport/const/constSolidTransport.C     |  4 +-
 .../transport/const/constSolidTransport.H     |  6 +-
 .../transport/const/constSolidTransportI.H    | 10 +--
 .../exponential/exponentialSolidTransport.C   |  6 +-
 .../exponential/exponentialSolidTransport.H   |  6 +-
 .../exponential/exponentialSolidTransportI.H  | 10 +--
 ...allHeatFluxTemperatureFvPatchScalarField.C | 10 +--
 ...allHeatFluxTemperatureFvPatchScalarField.H |  4 +-
 .../temperatureCoupledBase.C                  | 42 +++++------
 .../temperatureCoupledBase.H                  | 19 ++---
 ...peratureThermoBaffle1DFvPatchScalarField.C |  2 +-
 ...peratureThermoBaffle1DFvPatchScalarField.H |  4 +-
 ...entHeatFluxTemperatureFvPatchScalarField.C | 10 +--
 ...entHeatFluxTemperatureFvPatchScalarField.H |  2 +-
 ...tureCoupledBaffleMixedFvPatchScalarField.C | 12 ++--
 ...tureCoupledBaffleMixedFvPatchScalarField.H | 14 ++--
 ...eratureRadCoupledMixedFvPatchScalarField.C |  8 +--
 ...eratureRadCoupledMixedFvPatchScalarField.H | 13 ++--
 .../fireFoam/les/oppositeBurningPanels/0/T    |  4 +-
 .../les/oppositeBurningPanels/0/panelRegion/T |  4 +-
 .../panelRegion/solidThermophysicalProperties |  8 +--
 .../system/baffleRegion/changeDictionaryDict  |  4 +-
 .../system/changeDictionaryDict               |  4 +-
 .../system/changeDictionaryDict.baffle        |  4 +-
 .../system/changeDictionaryDict.baffleRegion  |  6 +-
 .../multiRegionHeater/Allrun                  |  2 +-
 .../heater/solidThermophysicalProperties      | 21 +++---
 .../system/bottomAir/changeDictionaryDict     |  4 +-
 .../system/heater/changeDictionaryDict        |  4 +-
 .../system/leftSolid/changeDictionaryDict     |  4 +-
 .../system/rightSolid/changeDictionaryDict    |  4 +-
 .../system/topAir/changeDictionaryDict        |  4 +-
 .../system/bottomWater/changeDictionaryDict   |  4 +-
 .../bottomWater/changeDictionaryDict.save     |  4 +-
 .../system/heater/changeDictionaryDict        |  4 +-
 .../system/leftSolid/changeDictionaryDict     |  4 +-
 .../system/rightSolid/changeDictionaryDict    |  4 +-
 .../system/topAir/changeDictionaryDict        |  4 +-
 .../heater/solidThermophysicalProperties      | 20 +++---
 .../system/bottomAir/changeDictionaryDict     |  4 +-
 .../system/heater/changeDictionaryDict        |  4 +-
 .../system/leftSolid/changeDictionaryDict     |  4 +-
 .../system/rightSolid/changeDictionaryDict    |  4 +-
 .../system/topAir/changeDictionaryDict        |  4 +-
 .../heater/solidThermophysicalProperties      | 22 +++---
 .../heater/solidThermophysicalProperties      | 22 +++---
 .../system/bottomAir/changeDictionaryDict     |  4 +-
 .../system/heater/changeDictionaryDict        | 12 ++--
 .../system/leftSolid/changeDictionaryDict     | 12 ++--
 .../system/rightSolid/changeDictionaryDict    |  8 +--
 .../system/topAir/changeDictionaryDict        |  4 +-
 87 files changed, 430 insertions(+), 417 deletions(-)

diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/porousSolid/setPorousRegionSolidFields.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/porousSolid/setPorousRegionSolidFields.H
index 102ba89a09..bbbd079ef2 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/porousSolid/setPorousRegionSolidFields.H
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/porousSolid/setPorousRegionSolidFields.H
@@ -9,8 +9,8 @@
     tmp<volScalarField> tcp = thermo.Cp();
     const volScalarField& cp = tcp();
 
-    tmp<volScalarField> tkappa = thermo.K();
-    //tmp<volSymmTensorField> tkappa = thermo.directionalK()*betav;
+    tmp<volScalarField> tkappa = thermo.kappa();
+    //tmp<volSymmTensorField> tkappa = thermo.directionalKappa()*betav;
 
     const volScalarField& kappa = tkappa();
     //const volSymmTensorField& K = tK();
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/solid/setRegionSolidFields.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/solid/setRegionSolidFields.H
index 7ff98e6211..73269420c0 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/solid/setRegionSolidFields.H
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/solid/setRegionSolidFields.H
@@ -7,7 +7,7 @@
     tmp<volScalarField> tcp = thermo.Cp();
     const volScalarField& cp = tcp();
 
-    tmp<volScalarField> tkappa = thermo.K();
+    tmp<volScalarField> tkappa = thermo.kappa();
     //tmp<volSymmTensorField> tkappa = thermo.directionalkappa();
     const volScalarField& kappa = tkappa();
 
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/porousSolid/setPorousRegionSolidFields.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/porousSolid/setPorousRegionSolidFields.H
index f4c7081e9b..6f4834000d 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/porousSolid/setPorousRegionSolidFields.H
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/porousSolid/setPorousRegionSolidFields.H
@@ -9,8 +9,8 @@
     tmp<volScalarField> tcp = thermo.Cp();
     const volScalarField& cp = tcp();
 
-    tmp<volScalarField> tkappa = thermo.K();
-    //tmp<volSymmTensorField> tkappa = thermo.directionalK()*betav;
+    tmp<volScalarField> tkappa = thermo.kappa();
+    //tmp<volSymmTensorField> tkappa = thermo.directionalKappa()*betav;
 
     const volScalarField& kappa = tkappa();
     //const volSymmTensorField& K = tK();
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/setRegionSolidFields.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/setRegionSolidFields.H
index 8cf6f1c38c..47bd9dad9a 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/setRegionSolidFields.H
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/setRegionSolidFields.H
@@ -7,9 +7,9 @@
     tmp<volScalarField> tcp = thermo.Cp();
     const volScalarField& cp = tcp();
 
-    tmp<volScalarField> tkappa = thermo.K();
+    tmp<volScalarField> tkappa = thermo.kappa();
     const volScalarField& kappa = tkappa();
-    //tmp<volSymmTensorField> tkappa = thermo.directionalK();
+    //tmp<volSymmTensorField> tkappa = thermo.directionalKappa();
     //const volSymmTensorField& kappa = tkappa();
 
     volScalarField& T = thermo.T();
diff --git a/applications/utilities/postProcessing/wall/solidWallHeatFlux/solidWallHeatFlux.C b/applications/utilities/postProcessing/wall/solidWallHeatFlux/solidWallHeatFlux.C
index f728a626b1..281107856e 100644
--- a/applications/utilities/postProcessing/wall/solidWallHeatFlux/solidWallHeatFlux.C
+++ b/applications/utilities/postProcessing/wall/solidWallHeatFlux/solidWallHeatFlux.C
@@ -73,7 +73,7 @@ int main(int argc, char *argv[])
         forAll(wallHeatFlux.boundaryField(), patchi)
         {
             wallHeatFlux.boundaryField()[patchi] =
-                thermo().K(patchi)
+                thermo().kappa(patchi)
                *T.boundaryField()[patchi].snGrad();
 
             if (isA<wallFvPatch>(mesh.boundary()[patchi]))
diff --git a/src/regionModels/pyrolysisModels/noPyrolysis/noPyrolysis.C b/src/regionModels/pyrolysisModels/noPyrolysis/noPyrolysis.C
index dd779a7d4e..99b19f0ad8 100644
--- a/src/regionModels/pyrolysisModels/noPyrolysis/noPyrolysis.C
+++ b/src/regionModels/pyrolysisModels/noPyrolysis/noPyrolysis.C
@@ -151,15 +151,15 @@ const tmp<volScalarField> noPyrolysis::Cp() const
 }
 
 
-const volScalarField& noPyrolysis::kappa() const
+const volScalarField& noPyrolysis::kappaRad() const
 {
-    return (solidThermo_->kappa());
+    return (solidThermo_->kappaRad());
 }
 
 
-const volScalarField& noPyrolysis::K() const
+const volScalarField& noPyrolysis::kappa() const
 {
-     return (solidThermo_->K());
+     return (solidThermo_->kappa());
 }
 
 
diff --git a/src/regionModels/pyrolysisModels/noPyrolysis/noPyrolysis.H b/src/regionModels/pyrolysisModels/noPyrolysis/noPyrolysis.H
index 7a32de6a99..0be1645fa6 100644
--- a/src/regionModels/pyrolysisModels/noPyrolysis/noPyrolysis.H
+++ b/src/regionModels/pyrolysisModels/noPyrolysis/noPyrolysis.H
@@ -124,10 +124,10 @@ public:
             virtual const tmp<volScalarField> Cp() const;
 
             //- Return the region absorptivity [1/m]
-            virtual const volScalarField& kappa() const;
+            virtual const volScalarField& kappaRad() const;
 
             //- Return the region thermal conductivity [W/m/k]
-            virtual const volScalarField& K() const;
+            virtual const volScalarField& kappa() const;
 
             //- Return the total gas mass flux to primary region [kg/m2/s]
             virtual const surfaceScalarField& phiGas() const;
diff --git a/src/regionModels/pyrolysisModels/pyrolysisModel/pyrolysisModel.H b/src/regionModels/pyrolysisModels/pyrolysisModel/pyrolysisModel.H
index 90ca858763..42305f06bb 100644
--- a/src/regionModels/pyrolysisModels/pyrolysisModel/pyrolysisModel.H
+++ b/src/regionModels/pyrolysisModels/pyrolysisModel/pyrolysisModel.H
@@ -218,10 +218,10 @@ public:
                 virtual const tmp<volScalarField> Cp() const = 0;
 
                 //- Return the region absorptivity [1/m]
-                virtual const volScalarField& kappa() const = 0;
+                virtual const volScalarField& kappaRad() const = 0;
 
                 //- Return the region thermal conductivity [W/m/k]
-                virtual const volScalarField& K() const = 0;
+                virtual const volScalarField& kappa() const = 0;
 
                 //- Return the total gas mass flux to primary region [kg/m2/s]
                 virtual const surfaceScalarField& phiGas() const = 0;
diff --git a/src/regionModels/pyrolysisModels/reactingOneDim/reactingOneDim.C b/src/regionModels/pyrolysisModels/reactingOneDim/reactingOneDim.C
index 5086053344..eb99d40067 100644
--- a/src/regionModels/pyrolysisModels/reactingOneDim/reactingOneDim.C
+++ b/src/regionModels/pyrolysisModels/reactingOneDim/reactingOneDim.C
@@ -126,7 +126,7 @@ void reactingOneDim::updateQr()
                 const label cellI = cells[k];
                 const point& Cf1 = regionMesh().cellCentres()[cellI];
                 const scalar delta = mag(Cf1 - Cf0);
-                kappaInt += kappa_[cellI]*delta;
+                kappaInt += kappaRad_[cellI]*delta;
                 Qr_[cellI] = Qr0*exp(-kappaInt);
                 Cf0 = Cf1;
             }
@@ -294,7 +294,7 @@ void reactingOneDim::solveEnergy()
     fvScalarMatrix TEqn
     (
         fvm::ddt(rhoCp, T_)
-      - fvm::laplacian(K_, T_)
+      - fvm::laplacian(kappa_, T_)
      ==
         chemistrySh_
       + fvc::div(phiQr)
@@ -347,8 +347,8 @@ reactingOneDim::reactingOneDim(const word& modelType, const fvMesh& mesh)
     pyrolysisModel(modelType, mesh),
     solidChemistry_(solidChemistryModel::New(regionMesh())),
     solidThermo_(solidChemistry_->solidThermo()),
+    kappaRad_(solidThermo_.kappaRad()),
     kappa_(solidThermo_.kappa()),
-    K_(solidThermo_.K()),
     rho_(solidThermo_.rho()),
     Ys_(solidThermo_.composition().Y()),
     T_(solidThermo_.T()),
@@ -449,8 +449,8 @@ reactingOneDim::reactingOneDim
     pyrolysisModel(modelType, mesh, dict),
     solidChemistry_(solidChemistryModel::New(regionMesh())),
     solidThermo_(solidChemistry_->solidThermo()),
+    kappaRad_(solidThermo_.kappaRad()),
     kappa_(solidThermo_.kappa()),
-    K_(solidThermo_.K()),
     rho_(solidThermo_.rho()),
     Ys_(solidThermo_.composition().Y()),
     T_(solidThermo_.T()),
@@ -584,7 +584,7 @@ scalar reactingOneDim::solidRegionDiffNo() const
         surfaceScalarField KrhoCpbyDelta
         (
             regionMesh().surfaceInterpolation::deltaCoeffs()
-          * fvc::interpolate(K_)
+          * fvc::interpolate(kappa_)
           / fvc::interpolate(Cp()*rho_)
         );
 
@@ -619,15 +619,15 @@ const tmp<volScalarField> reactingOneDim::Cp() const
 }
 
 
-const volScalarField& reactingOneDim::kappa() const
+const volScalarField& reactingOneDim::kappaRad() const
 {
-    return kappa_;
+    return kappaRad_;
 }
 
 
-const volScalarField& reactingOneDim::K() const
+const volScalarField& reactingOneDim::kappa() const
 {
-    return K_;
+    return kappa_;
 }
 
 
diff --git a/src/regionModels/pyrolysisModels/reactingOneDim/reactingOneDim.H b/src/regionModels/pyrolysisModels/reactingOneDim/reactingOneDim.H
index ed1bd9fa0d..8cfcc7ce74 100644
--- a/src/regionModels/pyrolysisModels/reactingOneDim/reactingOneDim.H
+++ b/src/regionModels/pyrolysisModels/reactingOneDim/reactingOneDim.H
@@ -84,10 +84,10 @@ protected:
         // Reference to solid thermo properties
 
             //- Absorption coefficient [1/m]
-            const volScalarField& kappa_;
+            const volScalarField& kappaRad_;
 
             //- Thermal conductivity [W/m/K]
-            const volScalarField& K_;
+            const volScalarField& kappa_;
 
             //- Density [kg/m3]
             volScalarField& rho_;
@@ -230,10 +230,10 @@ public:
                 virtual const tmp<volScalarField> Cp() const;
 
                 //- Return the region absorptivity [1/m]
-                virtual const volScalarField& kappa() const;
+                virtual const volScalarField& kappaRad() const;
 
                 //- Return the region thermal conductivity [W/m/k]
-                virtual const volScalarField& K() const;
+                virtual const volScalarField& kappa() const;
 
                 //- Return the total gas mass flux to primary region [kg/m2/s]
                 virtual const surfaceScalarField& phiGas() const;
diff --git a/src/regionModels/thermoBaffleModels/derivedFvPatchFields/temperatureThermoBaffle/temperatureThermoBaffleFvPatchScalarField.H b/src/regionModels/thermoBaffleModels/derivedFvPatchFields/temperatureThermoBaffle/temperatureThermoBaffleFvPatchScalarField.H
index 83e3162c57..980fc85935 100644
--- a/src/regionModels/thermoBaffleModels/derivedFvPatchFields/temperatureThermoBaffle/temperatureThermoBaffleFvPatchScalarField.H
+++ b/src/regionModels/thermoBaffleModels/derivedFvPatchFields/temperatureThermoBaffle/temperatureThermoBaffleFvPatchScalarField.H
@@ -35,7 +35,7 @@ Description
 
     // Coupled BC.
     neighbourFieldName  T;
-    K                   basicThermo;
+    kappa               basicThermo;
     KName               none;
 
 
@@ -57,10 +57,10 @@ Description
         //- thermo properties
         rho rho [1 -3  0  0 0 0 0]              80;
         Cp  Cp  [0  2 -2 -1 0 0 0]              15;
-        K   K   [1  1 -3 -1 0 0 0]              0.01;
+        kappa   kappa   [1  1 -3 -1 0 0 0]      0.01;
 
         //- radiative properties
-        kappa kappa [0 -1 0 0 0 0 0]            0;
+        kappaRad  kappaRad [0 -1 0 0 0 0 0]     0;
         sigmaS sigmaS [0 -1 0 0 0 0 0]          0;
         emissivity  emissivity  [0 0 0 0 0 0 0] 1;
 
diff --git a/src/regionModels/thermoBaffleModels/noThermo/noThermo.C b/src/regionModels/thermoBaffleModels/noThermo/noThermo.C
index 0d78e27cbc..28214923b8 100644
--- a/src/regionModels/thermoBaffleModels/noThermo/noThermo.C
+++ b/src/regionModels/thermoBaffleModels/noThermo/noThermo.C
@@ -95,9 +95,9 @@ const tmp<volScalarField> noThermo::Cp() const
     );
 }
 
-const volScalarField& noThermo::kappa() const
+const volScalarField& noThermo::kappaRad() const
 {
-    FatalErrorIn("const volScalarField& noThermo::kappa() const")
+    FatalErrorIn("const volScalarField& noThermo::kappaRad() const")
         << "kappa field not available for " << type() << abort(FatalError);
     return volScalarField::null();
 }
@@ -111,9 +111,9 @@ const volScalarField& noThermo::rho() const
 }
 
 
-const volScalarField& noThermo::K() const
+const volScalarField& noThermo::kappa() const
 {
-   FatalErrorIn("const volScalarField& noThermo::K() const")
+   FatalErrorIn("const volScalarField& noThermo::kappa() const")
         << "K field not available for " << type() << abort(FatalError);
     return volScalarField::null();
 }
diff --git a/src/regionModels/thermoBaffleModels/noThermo/noThermo.H b/src/regionModels/thermoBaffleModels/noThermo/noThermo.H
index 053519162e..f816e0fac3 100644
--- a/src/regionModels/thermoBaffleModels/noThermo/noThermo.H
+++ b/src/regionModels/thermoBaffleModels/noThermo/noThermo.H
@@ -105,7 +105,7 @@ public:
             virtual const tmp<volScalarField> Cp() const;
 
             //- Return solid absortivity [1/m]
-            virtual const volScalarField& kappa() const;
+            virtual const volScalarField& kappaRad() const;
 
             //- Return the film mean temperature [K]
             virtual const volScalarField& T() const;
@@ -114,7 +114,7 @@ public:
             virtual const volScalarField& rho() const;
 
             //- Return thermal conductivity [W/m/K]
-            virtual const volScalarField& K() const;
+            virtual const volScalarField& kappa() const;
 
 
         // Evolution
diff --git a/src/regionModels/thermoBaffleModels/thermoBaffle2D/thermoBaffle2D.C b/src/regionModels/thermoBaffleModels/thermoBaffle2D/thermoBaffle2D.C
index d251bc64e0..9f5a19b3ae 100644
--- a/src/regionModels/thermoBaffleModels/thermoBaffle2D/thermoBaffle2D.C
+++ b/src/regionModels/thermoBaffleModels/thermoBaffle2D/thermoBaffle2D.C
@@ -96,7 +96,7 @@ void thermoBaffle2D::solveEnergy()
     volScalarField& Q = tQ();
 
     volScalarField rhoCp("rhoCp", thermo_->rho()*thermo_->Cp()());
-    volScalarField K("K", thermo_->K());
+    volScalarField kappa("kappa", thermo_->kappa());
 
 
     //If region is one-dimension variable thickness
@@ -119,7 +119,7 @@ void thermoBaffle2D::solveEnergy()
 
                 rhoCp[cellId] *= delta_.value()/thickness_[localFaceI];
 
-                K[cellId] *= delta_.value()/thickness_[localFaceI];
+                kappa[cellId] *= delta_.value()/thickness_[localFaceI];
             }
         }
     }
@@ -131,7 +131,7 @@ void thermoBaffle2D::solveEnergy()
     fvScalarMatrix TEqn
     (
         fvm::ddt(rhoCp, T_)
-      - fvm::laplacian(K, T_)
+      - fvm::laplacian(kappa, T_)
      ==
         Q
     );
@@ -316,9 +316,9 @@ const tmp<volScalarField> thermoBaffle2D::Cp() const
 }
 
 
-const volScalarField& thermoBaffle2D::kappa() const
+const volScalarField& thermoBaffle2D::kappaRad() const
 {
-    return thermo_->kappa();
+    return thermo_->kappaRad();
 }
 
 
@@ -328,9 +328,9 @@ const volScalarField& thermoBaffle2D::rho() const
 }
 
 
-const volScalarField& thermoBaffle2D::K() const
+const volScalarField& thermoBaffle2D::kappa() const
 {
-    return thermo_->K();
+    return thermo_->kappa();
 }
 
 
@@ -362,7 +362,7 @@ void thermoBaffle2D::info() const
             (
                 mag(regionMesh().Sf().boundaryField()[patchI])
               * pT.snGrad()
-              * thermo_->K(patchI)
+              * thermo_->kappa(patchI)
             ) << endl;
     }
 }
diff --git a/src/regionModels/thermoBaffleModels/thermoBaffle2D/thermoBaffle2D.H b/src/regionModels/thermoBaffleModels/thermoBaffle2D/thermoBaffle2D.H
index bf915ec1a2..ac7fdc1cc5 100644
--- a/src/regionModels/thermoBaffleModels/thermoBaffle2D/thermoBaffle2D.H
+++ b/src/regionModels/thermoBaffleModels/thermoBaffle2D/thermoBaffle2D.H
@@ -155,7 +155,7 @@ public:
                 virtual const tmp<volScalarField> Cp() const;
 
                 //- Return solid absortivity [1/m]
-                virtual const volScalarField& kappa() const;
+                virtual const volScalarField& kappaRad() const;
 
                 //- Return the film mean temperature [K]
                 virtual const volScalarField& T() const;
@@ -164,7 +164,7 @@ public:
                 virtual const volScalarField& rho() const;
 
                 //- Return thermal conductivity [W/m/K]
-                virtual const volScalarField& K() const;
+                virtual const volScalarField& kappa() const;
 
 
             // Helper functions
diff --git a/src/regionModels/thermoBaffleModels/thermoBaffleModel/thermoBaffleModel.H b/src/regionModels/thermoBaffleModels/thermoBaffleModel/thermoBaffleModel.H
index ee076ec523..a5a6cfef7c 100644
--- a/src/regionModels/thermoBaffleModels/thermoBaffleModel/thermoBaffleModel.H
+++ b/src/regionModels/thermoBaffleModels/thermoBaffleModel/thermoBaffleModel.H
@@ -211,10 +211,10 @@ public:
                 virtual const tmp<volScalarField> Cp() const = 0;
 
                 //- Return the region absorptivity [1/m]
-                virtual const volScalarField& kappa() const = 0;
+                virtual const volScalarField& kappaRad() const = 0;
 
                 //- Return the region thermal conductivity [W/m/k]
-                virtual const volScalarField& K() const = 0;
+                virtual const volScalarField& kappa() const = 0;
 
 
         // Evolution
diff --git a/src/thermophysicalModels/basicSolidThermo/basicSolidThermo/basicSolidThermo.C b/src/thermophysicalModels/basicSolidThermo/basicSolidThermo/basicSolidThermo.C
index 5e62a55eee..58108d1fbf 100644
--- a/src/thermophysicalModels/basicSolidThermo/basicSolidThermo/basicSolidThermo.C
+++ b/src/thermophysicalModels/basicSolidThermo/basicSolidThermo/basicSolidThermo.C
@@ -78,11 +78,11 @@ Foam::basicSolidThermo::basicSolidThermo(const fvMesh& mesh)
         mesh,
         dimMass/dimVolume
     ),
-    kappa_
+    kappaRad_
     (
         IOobject
         (
-            "kappa",
+            "kappaRad",
             mesh.time().timeName(),
             mesh,
             IOobject::NO_READ,
@@ -165,11 +165,11 @@ Foam::basicSolidThermo::basicSolidThermo
         mesh,
         dimMass/dimVolume
     ),
-    kappa_
+    kappaRad_
     (
         IOobject
         (
-            "kappa",
+            "kappaRad",
             mesh.time().timeName(),
             mesh,
             IOobject::NO_READ,
@@ -239,9 +239,9 @@ Foam::volScalarField& Foam::basicSolidThermo::rho()
 }
 
 
-const Foam::volScalarField& Foam::basicSolidThermo::kappa() const
+const Foam::volScalarField& Foam::basicSolidThermo::kappaRad() const
 {
-    return kappa_;
+    return kappaRad_;
 }
 
 
diff --git a/src/thermophysicalModels/basicSolidThermo/basicSolidThermo/basicSolidThermo.H b/src/thermophysicalModels/basicSolidThermo/basicSolidThermo/basicSolidThermo.H
index 3def4a0ee5..2f4d2a1f99 100644
--- a/src/thermophysicalModels/basicSolidThermo/basicSolidThermo/basicSolidThermo.H
+++ b/src/thermophysicalModels/basicSolidThermo/basicSolidThermo/basicSolidThermo.H
@@ -73,7 +73,7 @@ protected:
             volScalarField rho_;
 
             //- Absorption coefficient [1/m]
-            volScalarField kappa_;
+            volScalarField kappaRad_;
 
             //- Scatter coeffcient [1/m]
             volScalarField sigmaS_;
@@ -157,7 +157,7 @@ public:
             virtual volScalarField& rho();
 
             //- Absorption coefficient [1/m]
-            virtual const volScalarField& kappa() const;
+            virtual const volScalarField& kappaRad() const;
 
             //- Emissivity coefficient
             virtual const volScalarField& sigmaS() const;
@@ -169,10 +169,10 @@ public:
         // Derived thermal properties
 
             //- Thermal conductivity [W/m/K]
-            virtual tmp<volScalarField> K() const = 0;
+            virtual tmp<volScalarField> kappa() const = 0;
 
             //- Thermal conductivity [W/m/K]
-            virtual tmp<volSymmTensorField> directionalK() const = 0;
+            virtual tmp<volSymmTensorField> directionalKappa() const = 0;
 
             //- Specific heat capacity [J/kg/K]
             virtual tmp<volScalarField> Cp() const = 0;
@@ -187,10 +187,10 @@ public:
         // Per patch calculation
 
             //- Thermal conductivity [W//m/K]
-            virtual tmp<scalarField> K(const label patchI) const = 0;
+            virtual tmp<scalarField> kappa(const label patchI) const = 0;
 
             //- Thermal conductivity [W//m/K]
-            virtual tmp<symmTensorField> directionalK(const label) const = 0;
+            virtual tmp<symmTensorField> directionalKappa(const label) const = 0;
 
             //- Specific heat capacity [J/kg/K)]
             virtual tmp<scalarField> Cp(const label patchI) const = 0;
diff --git a/src/thermophysicalModels/basicSolidThermo/constSolidThermo/constSolidThermo.C b/src/thermophysicalModels/basicSolidThermo/constSolidThermo/constSolidThermo.C
index ee20901aac..65ce650bc7 100644
--- a/src/thermophysicalModels/basicSolidThermo/constSolidThermo/constSolidThermo.C
+++ b/src/thermophysicalModels/basicSolidThermo/constSolidThermo/constSolidThermo.C
@@ -46,36 +46,36 @@ Foam::constSolidThermo::constSolidThermo
 :
     basicSolidThermo(mesh, dict),
     dict_(dict.subDict(typeName + "Coeffs")),
-    constK_(dimensionedScalar(dict_.lookup("K"))),
-    K_
+    constKappa_(dimensionedScalar(dict_.lookup("kappa"))),
+    kappa_
     (
         IOobject
         (
-            "K",
+            "kappa",
             mesh.time().timeName(),
             mesh,
             IOobject::NO_READ,
             IOobject::NO_WRITE
         ),
         mesh,
-        constK_
+        constKappa_
     ),
     constRho_(dimensionedScalar(dict_.lookup("rho"))),
     constCp_(dimensionedScalar(dict_.lookup("Cp"))),
     constHf_(dimensionedScalar(dict_.lookup("Hf"))),
     constEmissivity_(dimensionedScalar(dict_.lookup("emissivity"))),
-    constKappa_(dimensionedScalar(dict_.lookup("kappa"))),
+    constKappaRad_(dimensionedScalar(dict_.lookup("kappaRad"))),
     constSigmaS_(dimensionedScalar(dict_.lookup("sigmaS")))
 {
     read();
 
-    K_ = constK_;
+    kappa_ = constKappa_;
 
     rho_ = constRho_;
 
     emissivity_ = constEmissivity_;
 
-    kappa_ = constKappa_;
+    kappaRad_ = constKappaRad_;
 
     sigmaS_ = constSigmaS_;
 }
@@ -85,36 +85,36 @@ Foam::constSolidThermo::constSolidThermo(const fvMesh& mesh)
 :
     basicSolidThermo(mesh),
     dict_(subDict(typeName + "Coeffs")),
-    constK_(dimensionedScalar(dict_.lookup("K"))),
-    K_
+    constKappa_(dimensionedScalar(dict_.lookup("kappa"))),
+    kappa_
     (
         IOobject
         (
-            "K",
+            "kappa",
             mesh.time().timeName(),
             mesh,
             IOobject::NO_READ,
             IOobject::NO_WRITE
         ),
         mesh,
-        constK_
+        constKappa_
     ),
     constRho_(dimensionedScalar(dict_.lookup("rho"))),
     constCp_(dimensionedScalar(dict_.lookup("Cp"))),
     constHf_(dimensionedScalar(dict_.lookup("Hf"))),
     constEmissivity_(dimensionedScalar(dict_.lookup("emissivity"))),
-    constKappa_(dimensionedScalar(dict_.lookup("kappa"))),
+    constKappaRad_(dimensionedScalar(dict_.lookup("kappaRad"))),
     constSigmaS_(dimensionedScalar(dict_.lookup("sigmaS")))
 {
     read();
 
-    K_ = constK_;
+    kappa_ = constKappa_;
 
     rho_ = constRho_;
 
     emissivity_ = constEmissivity_;
 
-    kappa_ = constKappa_;
+    kappaRad_ = constKappaRad_;
 
     sigmaS_ = constSigmaS_;
 }
@@ -132,26 +132,26 @@ void Foam::constSolidThermo::correct()
 {}
 
 
-Foam::tmp<Foam::volScalarField> Foam::constSolidThermo::K() const
+Foam::tmp<Foam::volScalarField> Foam::constSolidThermo::kappa() const
 {
-    return K_;
+    return kappa_;
 }
 
 
-Foam::tmp<Foam::volSymmTensorField> Foam::constSolidThermo::directionalK() const
+Foam::tmp<Foam::volSymmTensorField> Foam::constSolidThermo::directionalKappa() const
 {
     dimensionedSymmTensor t
     (
-        constK_.name(),
-        constK_.dimensions(),
+        constKappa_.name(),
+        constKappa_.dimensions(),
         symmTensor
         (
-            constK_.value(),
+            constKappa_.value(),
             0.0,
             0.0,
-            constK_.value(),
+            constKappa_.value(),
             0.0,
-            constK_.value()
+            constKappa_.value()
         )
     );
     return tmp<volSymmTensorField>
@@ -160,7 +160,7 @@ Foam::tmp<Foam::volSymmTensorField> Foam::constSolidThermo::directionalK() const
         (
             IOobject
             (
-                "K",
+                "kappa",
                 mesh_.time().timeName(),
                 mesh_,
                 IOobject::NO_READ,
@@ -215,28 +215,28 @@ Foam::tmp<Foam::volScalarField> Foam::constSolidThermo::Hf() const
 }
 
 
-Foam::tmp<Foam::scalarField> Foam::constSolidThermo::K
+Foam::tmp<Foam::scalarField> Foam::constSolidThermo::kappa
 (
     const label patchI
 ) const
 {
-    return (K_.boundaryField()[patchI]);
+    return (kappa_.boundaryField()[patchI]);
 }
 
 
-Foam::tmp<Foam::symmTensorField> Foam::constSolidThermo::directionalK
+Foam::tmp<Foam::symmTensorField> Foam::constSolidThermo::directionalKappa
 (
     const label patchI
 ) const
 {
     symmTensor t
     (
-        constK_.value(),
+        constKappa_.value(),
         0.0,
         0.0,
-        constK_.value(),
+        constKappa_.value(),
         0.0,
-        constK_.value()
+        constKappa_.value()
     );
     return tmp<symmTensorField>
     (
@@ -291,19 +291,19 @@ bool Foam::constSolidThermo::read(const dictionary& dict)
 {
     constRho_ = dimensionedScalar(dict.lookup("rho"));
     constCp_ = dimensionedScalar(dict.lookup("Cp"));
-    constK_ = dimensionedScalar(dict.lookup("K"));
+    constKappa_ = dimensionedScalar(dict.lookup("kappa"));
     constHf_ = dimensionedScalar(dict.lookup("Hf"));
     constEmissivity_ = dimensionedScalar(dict.lookup("emissivity"));
-    constKappa_ = dimensionedScalar(dict_.lookup("kappa"));
+    constKappaRad_ = dimensionedScalar(dict_.lookup("kappaRad"));
     constSigmaS_ = dimensionedScalar(dict_.lookup("sigmaS"));
 
     Info<< "Constructed constSolidThermo with" << nl
         << "    rho        : " << constRho_ << nl
         << "    Cp         : " << constCp_ << nl
-        << "    K          : " << constK_ << nl
+        << "    kappa      : " << constKappa_ << nl
         << "    Hf         : " << constHf_ << nl
         << "    emissivity : " << constEmissivity_ << nl
-        << "    kappa      : " << constKappa_ << nl
+        << "    kappaRad   : " << constKappaRad_ << nl
         << "    sigmaS     : " << constSigmaS_ << nl
         << endl;
 
@@ -316,9 +316,9 @@ bool Foam::constSolidThermo::writeData(Ostream& os) const
     bool ok = basicSolidThermo::writeData(os);
     os.writeKeyword("rho") << constRho_ << token::END_STATEMENT << nl;
     os.writeKeyword("Cp") << constCp_ << token::END_STATEMENT << nl;
-    os.writeKeyword("K") << constK_ << token::END_STATEMENT << nl;
-    os.writeKeyword("Hf") << constHf_ << token::END_STATEMENT << nl;
     os.writeKeyword("kappa") << constKappa_ << token::END_STATEMENT << nl;
+    os.writeKeyword("Hf") << constHf_ << token::END_STATEMENT << nl;
+    os.writeKeyword("kappaRad") << constKappaRad_ << token::END_STATEMENT << nl;
     os.writeKeyword("sigmaS") << constSigmaS_ << token::END_STATEMENT << nl;
     os.writeKeyword("emissivity") << constEmissivity_ << token::END_STATEMENT
         << nl;
diff --git a/src/thermophysicalModels/basicSolidThermo/constSolidThermo/constSolidThermo.H b/src/thermophysicalModels/basicSolidThermo/constSolidThermo/constSolidThermo.H
index 75a5068552..c5a7bd6a92 100644
--- a/src/thermophysicalModels/basicSolidThermo/constSolidThermo/constSolidThermo.H
+++ b/src/thermophysicalModels/basicSolidThermo/constSolidThermo/constSolidThermo.H
@@ -58,10 +58,10 @@ private:
         dictionary dict_;
 
         //- Constant thermal conductivity [W/(m.K)]
-        dimensionedScalar constK_;
+        dimensionedScalar constKappa_;
 
         //- Thermal conductivity field[W/(m.K)]
-        volScalarField K_;
+        volScalarField kappa_;
 
         //- Density [kg/m3]
         dimensionedScalar constRho_;
@@ -76,7 +76,7 @@ private:
         dimensionedScalar constEmissivity_;
 
         //- Absorptivity [1/m]
-        dimensionedScalar constKappa_;
+        dimensionedScalar constKappaRad_;
 
         //- Scatter [1/m]
         dimensionedScalar constSigmaS_;
@@ -110,10 +110,10 @@ public:
         // Derived thermal properties
 
             //- Thermal conductivity [W/m/K]
-            virtual tmp<volScalarField> K() const;
+            virtual tmp<volScalarField> kappa() const;
 
             //- Thermal conductivity [W/m/K]
-            virtual tmp<volSymmTensorField> directionalK() const;
+            virtual tmp<volSymmTensorField> directionalKappa() const;
 
             //- Specific heat capacity [J/(kg.K)]
             virtual tmp<volScalarField> Cp() const;
@@ -125,10 +125,10 @@ public:
         // Per patch calculation
 
             //- Thermal conductivity [W//m/K]
-            virtual tmp<scalarField> K(const label patchI) const;
+            virtual tmp<scalarField> kappa(const label patchI) const;
 
             //- Thermal conductivity [W//m/K]
-            virtual tmp<symmTensorField>directionalK(const label) const;
+            virtual tmp<symmTensorField>directionalKappa(const label) const;
 
             //- Specific heat capacity [J/kg/K)]
             virtual tmp<scalarField> Cp(const label patchI) const;
diff --git a/src/thermophysicalModels/basicSolidThermo/directionalKSolidThermo/directionalKSolidThermo.C b/src/thermophysicalModels/basicSolidThermo/directionalKSolidThermo/directionalKSolidThermo.C
index e2185e45f5..e4a9ea2fa7 100644
--- a/src/thermophysicalModels/basicSolidThermo/directionalKSolidThermo/directionalKSolidThermo.C
+++ b/src/thermophysicalModels/basicSolidThermo/directionalKSolidThermo/directionalKSolidThermo.C
@@ -59,11 +59,11 @@ Foam::directionalKSolidThermo::directionalKSolidThermo
 )
 :
     interpolatedSolidThermo(mesh, typeName + "Coeffs", dict),
-    directionalK_
+    directionalKappa_
     (
         IOobject
         (
-            "K",
+            "kappa",
             mesh_.time().timeName(),
             mesh_,
             IOobject::NO_READ,
@@ -93,11 +93,11 @@ Foam::directionalKSolidThermo::directionalKSolidThermo
 Foam::directionalKSolidThermo::directionalKSolidThermo(const fvMesh& mesh)
 :
     interpolatedSolidThermo(mesh, typeName + "Coeffs"),
-    directionalK_
+    directionalKappa_
     (
         IOobject
         (
-            "K",
+            "kappa",
             mesh_.time().timeName(),
             mesh_,
             IOobject::NO_READ,
@@ -134,7 +134,8 @@ Foam::directionalKSolidThermo::~directionalKSolidThermo()
 
 void Foam::directionalKSolidThermo::init()
 {
-    KValues_ = Field<vector>(subDict(typeName + "Coeffs").lookup("KValues"));
+    kappaValues_ =
+        Field<vector>(subDict(typeName + "Coeffs").lookup("kappaValues"));
 
     // Determine transforms for cell centres
     forAll(mesh_.C(), cellI)
@@ -362,51 +363,51 @@ void Foam::directionalKSolidThermo::correct()
 
 
 Foam::tmp<Foam::volSymmTensorField>
-Foam::directionalKSolidThermo::directionalK() const
+Foam::directionalKSolidThermo::directionalKappa() const
 {
-    return directionalK_;
+    return directionalKappa_;
 }
 
 
 void Foam::directionalKSolidThermo::calculate()
 {
     // Correct directionalK
-    Field<vector> localK
+    Field<vector> localKappa
     (
         interpolateXY
         (
             T_.internalField(),
             TValues_,
-            KValues_
+            kappaValues_
         )
     );
 
     // Transform into global coordinate system
     transformField
     (
-        directionalK_.internalField(),
+        directionalKappa_.internalField(),
         ccTransforms_.internalField(),
-        localK
+        localKappa
     );
 
-    forAll(directionalK_.boundaryField(), patchI)
+    forAll(directionalKappa_.boundaryField(), patchI)
     {
-        directionalK_.boundaryField()[patchI] == this->directionalK(patchI)();
+        directionalKappa_.boundaryField()[patchI] == this->directionalKappa(patchI)();
     }
 }
 
 
-Foam::tmp<Foam::symmTensorField> Foam::directionalKSolidThermo::directionalK
+Foam::tmp<Foam::symmTensorField> Foam::directionalKSolidThermo::directionalKappa
 (
     const label patchI
 ) const
 {
     const fvPatchScalarField& patchT = T_.boundaryField()[patchI];
 
-    Field<vector> localK(interpolateXY(patchT, TValues_, KValues_));
+    Field<vector> localKappa(interpolateXY(patchT, TValues_, kappaValues_));
 
-    tmp<symmTensorField> tglobalK(new symmTensorField(localK.size()));
-    transformField(tglobalK(), ccTransforms_.boundaryField()[patchI], localK);
+    tmp<symmTensorField> tglobalK(new symmTensorField(localKappa.size()));
+    transformField(tglobalK(), ccTransforms_.boundaryField()[patchI], localKappa);
 
     return tglobalK;
 }
@@ -421,7 +422,7 @@ bool Foam::directionalKSolidThermo::read()
 bool Foam::directionalKSolidThermo::read(const dictionary& dict)
 {
     coordSys_ = coordinateSystem(dict, mesh_);
-    KValues_  = Field<vector>(subDict(typeName + "Coeffs").lookup("KValues"));
+    kappaValues_  = Field<vector>(subDict(typeName + "Coeffs").lookup("kappaValues"));
     return true;
 }
 
@@ -429,7 +430,8 @@ bool Foam::directionalKSolidThermo::read(const dictionary& dict)
 bool Foam::directionalKSolidThermo::writeData(Ostream& os) const
 {
     bool ok = interpolatedSolidThermo::writeData(os);
-    os.writeKeyword("KValues") << KValues_ << token::END_STATEMENT << nl;
+    os.writeKeyword("kappaValues")
+        << kappaValues_ << token::END_STATEMENT << nl;
     return ok && os.good();
 }
 
diff --git a/src/thermophysicalModels/basicSolidThermo/directionalKSolidThermo/directionalKSolidThermo.H b/src/thermophysicalModels/basicSolidThermo/directionalKSolidThermo/directionalKSolidThermo.H
index c5c8ad9cc8..ae3a48adb3 100644
--- a/src/thermophysicalModels/basicSolidThermo/directionalKSolidThermo/directionalKSolidThermo.H
+++ b/src/thermophysicalModels/basicSolidThermo/directionalKSolidThermo/directionalKSolidThermo.H
@@ -54,10 +54,10 @@ class directionalKSolidThermo
     // Private data
 
         //- Thermal conductivity [W/(m.K)]
-        volSymmTensorField directionalK_;
+        volSymmTensorField directionalKappa_;
 
         //- Thermal conductivity vector
-        Field<vector> KValues_;
+        Field<vector> kappaValues_;
 
         //- Coordinate system used for the directional properties
         coordinateSystem coordSys_;
@@ -117,26 +117,26 @@ public:
         //- Access functions
 
             //- Thermal conductivity [W/m/K]
-            virtual tmp<volScalarField> K() const
+            virtual tmp<volScalarField> kappa() const
             {
-                notImplemented("directionalKSolidThermo::K() const");
+                notImplemented("directionalKSolidThermo::kappa() const");
                 return tmp<volScalarField>(NULL);
             }
 
             //- Thermal conductivity [W/m/K]
-            virtual tmp<volSymmTensorField> directionalK() const;
+            virtual tmp<volSymmTensorField> directionalKappa() const;
 
          // Per patch calculation
 
             //- Thermal conductivity [W//m/K]
-            virtual tmp<scalarField> K(const label patchI) const
+            virtual tmp<scalarField> kappa(const label patchI) const
             {
-                notImplemented("directionalKSolidThermo::K(const label) const");
+                notImplemented("directionalKSolidThermo::kappa(const label) const");
                 return tmp<scalarField>(NULL);
             }
 
             //- Thermal conductivity [W//m/K]
-            virtual tmp<symmTensorField> directionalK(const label) const;
+            virtual tmp<symmTensorField> directionalKappa(const label) const;
 
 
         // I-O
diff --git a/src/thermophysicalModels/basicSolidThermo/interpolatedSolidThermo/interpolateSolid/interpolateSolid.C b/src/thermophysicalModels/basicSolidThermo/interpolatedSolidThermo/interpolateSolid/interpolateSolid.C
index 65b95738dc..79224cbabf 100644
--- a/src/thermophysicalModels/basicSolidThermo/interpolatedSolidThermo/interpolateSolid/interpolateSolid.C
+++ b/src/thermophysicalModels/basicSolidThermo/interpolatedSolidThermo/interpolateSolid/interpolateSolid.C
@@ -39,8 +39,8 @@ Foam::interpolateSolid::interpolateSolid(const dictionary& dict)
         << "    cp         : " << cpValues_ << nl
         << "    Hf         : " << HfValues_ << nl
         << "    emissivity : " << emissivityValues_ << nl
-        << "    kappa : " << kappaValues_ << nl
-        << "    sigmaS : " << sigmaSValues_ << nl
+        << "    kappaRad   : " << kappaRadValues_ << nl
+        << "    sigmaS     : " << sigmaSValues_ << nl
         << endl;
 
 
@@ -88,7 +88,7 @@ bool Foam::interpolateSolid::writeData(Ostream& os) const
     os.writeKeyword("HfValues") << HfValues_ << token::END_STATEMENT << nl;
     os.writeKeyword("emissivityValues") << emissivityValues_ <<
          token::END_STATEMENT << nl;
-    os.writeKeyword("kappaValues") << kappaValues_
+    os.writeKeyword("kappaRadValues") << kappaRadValues_
         << token::END_STATEMENT << nl;
     os.writeKeyword("sigmaSValues") << sigmaSValues_
         << token::END_STATEMENT << nl;
@@ -103,7 +103,7 @@ bool Foam::interpolateSolid::read(const dictionary& dict)
     TValues_ = Field<scalar>(dict.lookup("TValues"));
     rhoValues_ = Field<scalar>(dict.lookup("rhoValues"));
     cpValues_ = Field<scalar>(dict.lookup("cpValues"));
-    kappaValues_ = Field<scalar>(dict.lookup("kappaValues"));
+    kappaRadValues_ = Field<scalar>(dict.lookup("kappaRadValues"));
     sigmaSValues_ = Field<scalar>(dict.lookup("sigmaSValues"));
     HfValues_ = Field<scalar>(dict.lookup("HfValues"));
     emissivityValues_ = Field<scalar>(dict.lookup("emissivityValues"));
diff --git a/src/thermophysicalModels/basicSolidThermo/interpolatedSolidThermo/interpolateSolid/interpolateSolid.H b/src/thermophysicalModels/basicSolidThermo/interpolatedSolidThermo/interpolateSolid/interpolateSolid.H
index 269f982a09..81c2644b31 100644
--- a/src/thermophysicalModels/basicSolidThermo/interpolatedSolidThermo/interpolateSolid/interpolateSolid.H
+++ b/src/thermophysicalModels/basicSolidThermo/interpolatedSolidThermo/interpolateSolid/interpolateSolid.H
@@ -63,7 +63,7 @@ protected:
 
         Field<scalar> emissivityValues_;
 
-        Field<scalar> kappaValues_;
+        Field<scalar> kappaRadValues_;
 
         Field<scalar> sigmaSValues_;
 
diff --git a/src/thermophysicalModels/basicSolidThermo/interpolatedSolidThermo/interpolatedSolidThermo.C b/src/thermophysicalModels/basicSolidThermo/interpolatedSolidThermo/interpolatedSolidThermo.C
index def8dc6160..2d3790c989 100644
--- a/src/thermophysicalModels/basicSolidThermo/interpolatedSolidThermo/interpolatedSolidThermo.C
+++ b/src/thermophysicalModels/basicSolidThermo/interpolatedSolidThermo/interpolatedSolidThermo.C
@@ -69,7 +69,7 @@ Foam::tmp<Foam::scalarField> Foam::interpolatedSolidThermo::emissivity
 }
 
 
-Foam::tmp<Foam::scalarField> Foam::interpolatedSolidThermo::kappa
+Foam::tmp<Foam::scalarField> Foam::interpolatedSolidThermo::kappaRad
 (
     const label patchI
 ) const
@@ -82,7 +82,7 @@ Foam::tmp<Foam::scalarField> Foam::interpolatedSolidThermo::kappa
             (
                 T_.boundaryField()[patchI],
                 TValues_,
-                kappaValues_
+                kappaRadValues_
             )
         )
     );
@@ -178,16 +178,16 @@ void Foam::interpolatedSolidThermo::calculate()
 
 
     // Correct absorptivity
-    kappa_.internalField() = interpolateXY
+    kappaRad_.internalField() = interpolateXY
     (
         T_.internalField(),
         TValues_,
-        kappaValues_
+        kappaRadValues_
     );
 
-    forAll(kappa_.boundaryField(), patchI)
+    forAll(kappaRad_.boundaryField(), patchI)
     {
-        kappa_.boundaryField()[patchI] == this->kappa(patchI)();
+        kappaRad_.boundaryField()[patchI] == this->kappaRad(patchI)();
     }
 
 
diff --git a/src/thermophysicalModels/basicSolidThermo/interpolatedSolidThermo/interpolatedSolidThermo.H b/src/thermophysicalModels/basicSolidThermo/interpolatedSolidThermo/interpolatedSolidThermo.H
index 23e112db5a..e35b124c3e 100644
--- a/src/thermophysicalModels/basicSolidThermo/interpolatedSolidThermo/interpolatedSolidThermo.H
+++ b/src/thermophysicalModels/basicSolidThermo/interpolatedSolidThermo/interpolatedSolidThermo.H
@@ -69,7 +69,7 @@ private:
             tmp<scalarField> sigmaS(const label) const;
 
             //- Absorption coefficient [1/m]
-            tmp<scalarField> kappa(const label) const;
+            tmp<scalarField> kappaRad(const label) const;
 
              //- Emissivity []
             tmp<scalarField> emissivity(const label) const;
diff --git a/src/thermophysicalModels/basicSolidThermo/isotropicKSolidThermo/isotropicKSolidThermo.C b/src/thermophysicalModels/basicSolidThermo/isotropicKSolidThermo/isotropicKSolidThermo.C
index 1b15c88946..8a673ccf4b 100644
--- a/src/thermophysicalModels/basicSolidThermo/isotropicKSolidThermo/isotropicKSolidThermo.C
+++ b/src/thermophysicalModels/basicSolidThermo/isotropicKSolidThermo/isotropicKSolidThermo.C
@@ -57,11 +57,11 @@ Foam::isotropicKSolidThermo::isotropicKSolidThermo
 )
 :
     interpolatedSolidThermo(mesh, typeName + "Coeffs", dict),
-    K_
+    kappa_
     (
         IOobject
         (
-            "K",
+            "kappa",
             mesh.time().timeName(),
             mesh,
             IOobject::NO_READ,
@@ -70,7 +70,10 @@ Foam::isotropicKSolidThermo::isotropicKSolidThermo
         mesh,
         dimEnergy/dimTime/(dimLength*dimTemperature)
     ),
-    KValues_ (Field<scalar>(subDict(typeName + "Coeffs").lookup("KValues")))
+    kappaValues_
+    (
+        Field<scalar>(subDict(typeName + "Coeffs").lookup("kappaValues"))
+    )
 {
     correct();
 }
@@ -79,11 +82,11 @@ Foam::isotropicKSolidThermo::isotropicKSolidThermo
 Foam::isotropicKSolidThermo::isotropicKSolidThermo(const fvMesh& mesh)
 :
     interpolatedSolidThermo(mesh, typeName + "Coeffs"),
-    K_
+    kappa_
     (
         IOobject
         (
-            "K",
+            "kappa",
             mesh.time().timeName(),
             mesh,
             IOobject::NO_READ,
@@ -92,7 +95,10 @@ Foam::isotropicKSolidThermo::isotropicKSolidThermo(const fvMesh& mesh)
         mesh,
         dimEnergy/dimTime/(dimLength*dimTemperature)
     ),
-    KValues_ (Field<scalar>(subDict(typeName + "Coeffs").lookup("KValues")))
+    kappaValues_
+    (
+        Field<scalar>(subDict(typeName + "Coeffs").lookup("kappaValues"))
+    )
 {
     correct();
 }
@@ -101,20 +107,20 @@ Foam::isotropicKSolidThermo::isotropicKSolidThermo(const fvMesh& mesh)
 void Foam::isotropicKSolidThermo::correct()
 {
     // Correct K
-    K_.internalField() = interpolateXY
+    kappa_.internalField() = interpolateXY
     (
         T_.internalField(),
         TValues_,
-        KValues_
+        kappaValues_
     );
 
-    forAll(K_.boundaryField(), patchI)
+    forAll(kappa_.boundaryField(), patchI)
     {
-        K_.boundaryField()[patchI] == interpolateXY
+        kappa_.boundaryField()[patchI] == interpolateXY
         (
             T_.boundaryField()[patchI],
             TValues_,
-            KValues_
+            kappaValues_
         );
     }
 
@@ -122,31 +128,31 @@ void Foam::isotropicKSolidThermo::correct()
 }
 
 
-Foam::tmp<Foam::volScalarField> Foam::isotropicKSolidThermo::K() const
+Foam::tmp<Foam::volScalarField> Foam::isotropicKSolidThermo::kappa() const
 {
-    return K_;
+    return kappa_;
 }
 
 
-Foam::tmp<Foam::scalarField> Foam::isotropicKSolidThermo::K
+Foam::tmp<Foam::scalarField> Foam::isotropicKSolidThermo::kappa
 (
     const label patchI
 ) const
 {
-    return K_.boundaryField()[patchI];
+    return kappa_.boundaryField()[patchI];
 }
 
 
 bool Foam::isotropicKSolidThermo::read()
 {
-    KValues_  = Field<scalar>(subDict(typeName + "Coeffs").lookup("KValues"));
+    kappaValues_  = Field<scalar>(subDict(typeName + "Coeffs").lookup("kappaValues"));
     return true;
 }
 
 
 bool Foam::isotropicKSolidThermo::writeData(Ostream& os) const
 {
-    os.writeKeyword("KValues") << KValues_ << token::END_STATEMENT << nl;
+    os.writeKeyword("kappaValues") << kappaValues_ << token::END_STATEMENT << nl;
     bool ok = interpolatedSolidThermo::writeData(os);
 
     return ok && os.good();
diff --git a/src/thermophysicalModels/basicSolidThermo/isotropicKSolidThermo/isotropicKSolidThermo.H b/src/thermophysicalModels/basicSolidThermo/isotropicKSolidThermo/isotropicKSolidThermo.H
index d6acac3e91..8daff60560 100644
--- a/src/thermophysicalModels/basicSolidThermo/isotropicKSolidThermo/isotropicKSolidThermo.H
+++ b/src/thermophysicalModels/basicSolidThermo/isotropicKSolidThermo/isotropicKSolidThermo.H
@@ -53,10 +53,10 @@ class isotropicKSolidThermo
     // Private data
 
         //- Thermal conductivity [W/(m.K)]
-        volScalarField K_;
+        volScalarField kappa_;
 
         //- Thermal conductivity vector
-        Field<scalar> KValues_;
+        Field<scalar> kappaValues_;
 
 
 public:
@@ -87,26 +87,26 @@ public:
         // Access functions
 
             //- Constant access to K
-            virtual tmp<volScalarField> K() const;
+            virtual tmp<volScalarField> kappa() const;
 
             //- Thermal conductivity [W/m/K]
-            virtual tmp<volSymmTensorField> directionalK() const
+            virtual tmp<volSymmTensorField> directionalKappa() const
             {
-                notImplemented("directionalKSolidThermo::directionalK() const");
+                notImplemented("directionalKSolidThermo::directionalKappa() const");
                 return tmp<volSymmTensorField>(NULL);
             }
 
         // Per patch calculation
 
             //- Thermal conductivity [W//m/K]
-            virtual tmp<scalarField> K(const label patchI) const;
+            virtual tmp<scalarField> kappa(const label patchI) const;
 
             //- Thermal conductivity [W//m/K]
-            virtual tmp<symmTensorField> directionalK(const label) const
+            virtual tmp<symmTensorField> directionalKappa(const label) const
             {
                 notImplemented
                 (
-                    "directionalKSolidThermo::directionalK(const label) const"
+                    "directionalKSolidThermo::directionalKappa(const label) const"
                 );
                 return tmp<symmTensorField>(NULL);
             }
diff --git a/src/thermophysicalModels/basicSolidThermo/solidMixtureThermo/mixtures/basicSolidMixture/basicSolidMixture.H b/src/thermophysicalModels/basicSolidThermo/solidMixtureThermo/mixtures/basicSolidMixture/basicSolidMixture.H
index 631f4da7de..14f8b7be12 100644
--- a/src/thermophysicalModels/basicSolidThermo/solidMixtureThermo/mixtures/basicSolidMixture/basicSolidMixture.H
+++ b/src/thermophysicalModels/basicSolidThermo/solidMixtureThermo/mixtures/basicSolidMixture/basicSolidMixture.H
@@ -114,13 +114,13 @@ public:
         virtual scalar rho(scalar T, label celli) const = 0;
 
         //- Absorption coefficient
-        virtual scalar kappa(scalar T, label celli) const = 0;
+        virtual scalar kappaRad(scalar T, label celli) const = 0;
 
         //- Scatter coefficient
         virtual scalar sigmaS(scalar T, label celli) const = 0;
 
         //- Thermal conductivity
-        virtual scalar K(scalar T, label celli) const = 0;
+        virtual scalar kappa(scalar T, label celli) const = 0;
 
         //- Emissivity coefficient
         virtual scalar emissivity(scalar T, label celli) const = 0;
diff --git a/src/thermophysicalModels/basicSolidThermo/solidMixtureThermo/mixtures/multiComponentSolidMixture/multiComponentSolidMixture.C b/src/thermophysicalModels/basicSolidThermo/solidMixtureThermo/mixtures/multiComponentSolidMixture/multiComponentSolidMixture.C
index 79304dbdbb..e76b7d83fd 100644
--- a/src/thermophysicalModels/basicSolidThermo/solidMixtureThermo/mixtures/multiComponentSolidMixture/multiComponentSolidMixture.C
+++ b/src/thermophysicalModels/basicSolidThermo/solidMixtureThermo/mixtures/multiComponentSolidMixture/multiComponentSolidMixture.C
@@ -159,7 +159,7 @@ Foam::scalar Foam::multiComponentSolidMixture<ThermoSolidType>::h
 
 
 template<class ThermoSolidType>
-Foam::scalar Foam::multiComponentSolidMixture<ThermoSolidType>::kappa
+Foam::scalar Foam::multiComponentSolidMixture<ThermoSolidType>::kappaRad
 (
     scalar T, label celli
 ) const
@@ -167,7 +167,7 @@ Foam::scalar Foam::multiComponentSolidMixture<ThermoSolidType>::kappa
     scalar tmp = 0.0;
     forAll(solidData_, i)
     {
-        tmp += solidData_[i].kappa(T)*X(i, celli, T);
+        tmp += solidData_[i].kappaRad(T)*X(i, celli, T);
     }
     return tmp;
 }
@@ -189,7 +189,7 @@ Foam::scalar Foam::multiComponentSolidMixture<ThermoSolidType>::sigmaS
 
 
 template<class ThermoSolidType>
-Foam::scalar Foam::multiComponentSolidMixture<ThermoSolidType>::K
+Foam::scalar Foam::multiComponentSolidMixture<ThermoSolidType>::kappa
 (
     scalar T, label celli
 ) const
@@ -197,7 +197,7 @@ Foam::scalar Foam::multiComponentSolidMixture<ThermoSolidType>::K
     scalar tmp = 0.0;
     forAll(solidData_, i)
     {
-        tmp += solidData_[i].K(T)*X(i, celli, T);
+        tmp += solidData_[i].kappa(T)*X(i, celli, T);
     }
     return tmp;
 }
diff --git a/src/thermophysicalModels/basicSolidThermo/solidMixtureThermo/mixtures/multiComponentSolidMixture/multiComponentSolidMixture.H b/src/thermophysicalModels/basicSolidThermo/solidMixtureThermo/mixtures/multiComponentSolidMixture/multiComponentSolidMixture.H
index 3a633da5cd..75b908bb9d 100644
--- a/src/thermophysicalModels/basicSolidThermo/solidMixtureThermo/mixtures/multiComponentSolidMixture/multiComponentSolidMixture.H
+++ b/src/thermophysicalModels/basicSolidThermo/solidMixtureThermo/mixtures/multiComponentSolidMixture/multiComponentSolidMixture.H
@@ -99,13 +99,13 @@ public:
             virtual scalar rho(scalar T, label celli) const;
 
             //- Absorption coefficient
-            virtual scalar kappa(scalar T, label celli) const;
+            virtual scalar kappaRad(scalar T, label celli) const;
 
             //- Scatter coefficient
             virtual scalar sigmaS(scalar T, label celli) const;
 
             //- Thermal conductivity
-            virtual scalar K(scalar T, label celli) const;
+            virtual scalar kappa(scalar T, label celli) const;
 
             //- Emissivity coefficient
             virtual scalar emissivity(scalar T, label celli) const;
diff --git a/src/thermophysicalModels/basicSolidThermo/solidMixtureThermo/solidMixtureThermo/solidMixtureThermo.C b/src/thermophysicalModels/basicSolidThermo/solidMixtureThermo/solidMixtureThermo/solidMixtureThermo.C
index 0f78d32337..1239bb16ee 100644
--- a/src/thermophysicalModels/basicSolidThermo/solidMixtureThermo/solidMixtureThermo/solidMixtureThermo.C
+++ b/src/thermophysicalModels/basicSolidThermo/solidMixtureThermo/solidMixtureThermo/solidMixtureThermo.C
@@ -34,8 +34,8 @@ void Foam::solidMixtureThermo<MixtureType>::calculate()
 {
 
     scalarField& rhoCells = rho_.internalField();
-    scalarField& KCells = K_.internalField();
     scalarField& kappaCells = kappa_.internalField();
+    scalarField& kappaRadCells = kappaRad_.internalField();
     scalarField& sigmaSCells = sigmaS_.internalField();
     scalarField& emissivityCells = emissivity_.internalField();
 
@@ -44,9 +44,9 @@ void Foam::solidMixtureThermo<MixtureType>::calculate()
     forAll(iT, celli)
     {
         rhoCells[celli] = MixtureType::rho(iT[celli], celli);
-        kappaCells[celli] = MixtureType::kappa(iT[celli], celli);
+        kappaRadCells[celli] = MixtureType::kappaRad(iT[celli], celli);
         sigmaSCells[celli] = MixtureType::sigmaS(iT[celli], celli);
-        KCells[celli] = MixtureType::K(iT[celli], celli);
+        kappaCells[celli] = MixtureType::kappa(iT[celli], celli);
         emissivityCells[celli] = MixtureType::emissivity(iT[celli], celli);
     }
 
@@ -55,8 +55,8 @@ void Foam::solidMixtureThermo<MixtureType>::calculate()
     forAll(bT, patchI)
     {
         rho_.boundaryField()[patchI] == this->rho(patchI)();
-        K_.boundaryField()[patchI] == this->K(patchI)();
         kappa_.boundaryField()[patchI] == this->kappa(patchI)();
+        kappaRad_.boundaryField()[patchI] == this->kappaRad(patchI)();
         sigmaS_.boundaryField()[patchI] == this->sigmaS(patchI)();
         emissivity_.boundaryField()[patchI] == this->emissivity(patchI)();
     }
@@ -109,25 +109,25 @@ Foam::tmp<Foam::scalarField> Foam::solidMixtureThermo<MixtureType>::sigmaS
 
 
 template<class MixtureType>
-Foam::tmp<Foam::scalarField> Foam::solidMixtureThermo<MixtureType>::kappa
+Foam::tmp<Foam::scalarField> Foam::solidMixtureThermo<MixtureType>::kappaRad
 (
     const label patchI
 ) const
 {
     const scalarField& patchT = T_.boundaryField()[patchI];
-   const polyPatch& pp = mesh_.boundaryMesh()[patchI];
+    const polyPatch& pp = mesh_.boundaryMesh()[patchI];
     const labelUList& cells = pp.faceCells();
 
-    tmp<scalarField> tKappa(new scalarField(patchT.size()));
-    scalarField& kappa = tKappa();
+    tmp<scalarField> tKappaRad(new scalarField(patchT.size()));
+    scalarField& kappaRad = tKappaRad();
 
     forAll(patchT, celli)
     {
-        kappa[celli] =
-            MixtureType::kappa(patchT[celli], cells[celli]);
+        kappaRad[celli] =
+            MixtureType::kappaRad(patchT[celli], cells[celli]);
     }
 
-    return tKappa;
+    return tKappaRad;
 }
 
 
@@ -163,11 +163,11 @@ Foam::solidMixtureThermo<MixtureType>::solidMixtureThermo
 :
     basicSolidThermo(mesh),
     MixtureType(*this, mesh),
-    K_
+    kappa_
     (
         IOobject
         (
-            "K",
+            "kappa",
             mesh.time().timeName(),
             mesh,
             IOobject::NO_READ,
@@ -190,11 +190,11 @@ Foam::solidMixtureThermo<MixtureType>::solidMixtureThermo
 :
     basicSolidThermo(mesh, dict),
     MixtureType(*this, mesh),
-    K_
+    kappa_
     (
         IOobject
         (
-            "K",
+            "kappa",
             mesh.time().timeName(),
             mesh,
             IOobject::NO_READ,
@@ -225,9 +225,9 @@ void Foam::solidMixtureThermo<MixtureType>::correct()
 
 
 template<class MixtureType>
-Foam::tmp<Foam::volScalarField> Foam::solidMixtureThermo<MixtureType>::K() const
+Foam::tmp<Foam::volScalarField> Foam::solidMixtureThermo<MixtureType>::kappa() const
 {
-    return K_;
+    return kappa_;
 }
 
 
@@ -352,7 +352,7 @@ Foam::solidMixtureThermo<MixtureType>::Hf() const
 
 
 template<class MixtureType>
-Foam::tmp<Foam::scalarField> Foam::solidMixtureThermo<MixtureType>::K
+Foam::tmp<Foam::scalarField> Foam::solidMixtureThermo<MixtureType>::kappa
 (
     const label patchI
 ) const
@@ -361,15 +361,15 @@ Foam::tmp<Foam::scalarField> Foam::solidMixtureThermo<MixtureType>::K
     const polyPatch& pp = mesh_.boundaryMesh()[patchI];
     const labelUList& cells = pp.faceCells();
 
-    tmp<scalarField> tK(new scalarField(patchT.size()));
-    scalarField& K = tK();
+    tmp<scalarField> tkappa(new scalarField(patchT.size()));
+    scalarField& kappa = tkappa();
 
     forAll(patchT, celli)
     {
-        K[celli] = MixtureType::K(patchT[celli], cells[celli]);
+        kappa[celli] = MixtureType::kappa(patchT[celli], cells[celli]);
     }
 
-    return tK;
+    return tkappa;
 }
 
 
diff --git a/src/thermophysicalModels/basicSolidThermo/solidMixtureThermo/solidMixtureThermo/solidMixtureThermo.H b/src/thermophysicalModels/basicSolidThermo/solidMixtureThermo/solidMixtureThermo/solidMixtureThermo.H
index 100d371b99..488563ff02 100644
--- a/src/thermophysicalModels/basicSolidThermo/solidMixtureThermo/solidMixtureThermo/solidMixtureThermo.H
+++ b/src/thermophysicalModels/basicSolidThermo/solidMixtureThermo/solidMixtureThermo/solidMixtureThermo.H
@@ -57,7 +57,7 @@ protected:
     // Protected data
 
         //- Thermal conductivity [W/m/K]
-        volScalarField K_;
+        volScalarField kappa_;
 
 
 private:
@@ -74,7 +74,7 @@ private:
 
             tmp<scalarField> sigmaS(const label patchI) const;
 
-            tmp<scalarField> kappa(const label patchI) const;
+            tmp<scalarField> kappaRad(const label patchI) const;
 
             tmp<scalarField> emissivity(const label patchI) const;
 
@@ -118,12 +118,12 @@ public:
         // Derived thermal properties
 
             //- Thermal conductivity [W/m/K]
-            virtual tmp<volScalarField> K() const;
+            virtual tmp<volScalarField> kappa() const;
 
             //- Thermal conductivity [W/m/K]
-            virtual tmp<volSymmTensorField> directionalK() const
+            virtual tmp<volSymmTensorField> directionalKappa() const
             {
-                notImplemented("solidMixtureThermo::directionalK() const");
+                notImplemented("solidMixtureThermo::directionalKappa() const");
                 return tmp<volSymmTensorField>(NULL);
             }
 
@@ -140,14 +140,14 @@ public:
         // Per patch calculation
 
             //- Thermal conductivity [W/(m.K)]
-            virtual tmp<scalarField> K(const label patchI) const;
+            virtual tmp<scalarField> kappa(const label patchI) const;
 
             //- Thermal conductivity [W/(m.K)]
-            virtual tmp<symmTensorField> directionalK(const label) const
+            virtual tmp<symmTensorField> directionalKappa(const label) const
             {
                 notImplemented
                 (
-                    "solidMixtureThermo::directionalK(const label) const"
+                    "solidMixtureThermo::directionalKappa(const label) const"
                 );
                 return tmp<symmTensorField>(NULL);
             }
diff --git a/src/thermophysicalModels/solid/radiation/const/constSolidRad.C b/src/thermophysicalModels/solid/radiation/const/constSolidRad.C
index 93fda8663e..9a1ecdc89f 100644
--- a/src/thermophysicalModels/solid/radiation/const/constSolidRad.C
+++ b/src/thermophysicalModels/solid/radiation/const/constSolidRad.C
@@ -37,7 +37,7 @@ template<class thermo>
 constSolidRad<thermo>::constSolidRad(const dictionary& dict)
 :
     thermo(dict),
-    kappa_(readScalar(dict.subDict("radiation").lookup("kappa"))),
+    kappaRad_(readScalar(dict.subDict("radiation").lookup("kappaRad"))),
     sigmaS_(readScalar(dict.subDict("radiation").lookup("sigmaS"))),
     emissivity_(readScalar(dict.subDict("radiation").lookup("emissivity")))
 {}
@@ -49,7 +49,7 @@ template<class thermo>
 Ostream& operator<<(Ostream& os, const constSolidRad<thermo>& pg)
 {
     os  << static_cast<const thermo&>(pg);
-    os << tab << pg.kappa_ << tab << pg.sigmaS_ << tab << pg.emissivity_;
+    os << tab << pg.kappaRad_ << tab << pg.sigmaS_ << tab << pg.emissivity_;
 
     os.check("Ostream& operator<<(Ostream& os, const constSolidRad& st)");
     return os;
diff --git a/src/thermophysicalModels/solid/radiation/const/constSolidRad.H b/src/thermophysicalModels/solid/radiation/const/constSolidRad.H
index 6919763077..0e65de99c9 100644
--- a/src/thermophysicalModels/solid/radiation/const/constSolidRad.H
+++ b/src/thermophysicalModels/solid/radiation/const/constSolidRad.H
@@ -62,7 +62,7 @@ class constSolidRad
     // Private data
 
         //- Absorption coefficient
-        scalar kappa_;
+        scalar kappaRad_;
 
         //- Scattering coefficient
         scalar sigmaS_;
@@ -75,7 +75,7 @@ class constSolidRad
         inline constSolidRad
         (
             const thermo& t,
-            const scalar kappa,
+            const scalar kappaRad,
             const scalar sigmaS,
             const scalar emissivity
         );
@@ -101,7 +101,7 @@ public:
     // Member functions
 
         //- Return absorption coefficient [1/m]
-        inline scalar kappa(scalar T) const;
+        inline scalar kappaRad(scalar T) const;
 
         //- Return scattering [1/m]
         inline scalar sigmaS(scalar T) const;
diff --git a/src/thermophysicalModels/solid/radiation/const/constSolidRadI.H b/src/thermophysicalModels/solid/radiation/const/constSolidRadI.H
index 667fae827a..d60dce0834 100644
--- a/src/thermophysicalModels/solid/radiation/const/constSolidRadI.H
+++ b/src/thermophysicalModels/solid/radiation/const/constSolidRadI.H
@@ -36,13 +36,13 @@ template<class thermo>
 inline constSolidRad<thermo>::constSolidRad
 (
     const thermo& t,
-    const scalar kappa,
+    const scalar kappaRad,
     const scalar sigmaS,
     const scalar emissivity
 )
 :
     thermo(t),
-    kappa_(kappa),
+    kappaRad_(kappaRad),
     sigmaS_(sigmaS),
     emissivity_(emissivity)
 {}
@@ -59,7 +59,7 @@ inline constSolidRad<thermo>::constSolidRad
 )
 :
     thermo(name, pg),
-    kappa_(pg.kappa_),
+    kappaRad_(pg.kappaRad_),
     sigmaS_(pg.sigmaS_),
     emissivity_(pg.emissivity_)
 {}
@@ -82,9 +82,9 @@ inline autoPtr<constSolidRad<thermo> > constSolidRad<thermo>::New(Istream& is)
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class thermo>
-inline scalar constSolidRad<thermo>::kappa(scalar) const
+inline scalar constSolidRad<thermo>::kappaRad(scalar) const
 {
-    return kappa_;
+    return kappaRad_;
 }
 
 
diff --git a/src/thermophysicalModels/solid/transport/const/constSolidTransport.C b/src/thermophysicalModels/solid/transport/const/constSolidTransport.C
index 1995333659..dd34e20522 100644
--- a/src/thermophysicalModels/solid/transport/const/constSolidTransport.C
+++ b/src/thermophysicalModels/solid/transport/const/constSolidTransport.C
@@ -32,7 +32,7 @@ template<class thermo>
 Foam::constSolidTransport<thermo>::constSolidTransport(const dictionary& dict)
 :
     thermo(dict),
-    K_(readScalar(dict.subDict("transport").lookup("K")))
+    kappa_(readScalar(dict.subDict("transport").lookup("kappa")))
 {}
 
 
@@ -46,7 +46,7 @@ Foam::Ostream& Foam::operator<<
 )
 {
     operator<<(os, static_cast<const thermo&>(ct));
-    os << tab << ct.K_;
+    os << tab << ct.kappa_;
 
     os.check("Ostream& operator<<(Ostream& os,const constSolidTransport& ct)");
 
diff --git a/src/thermophysicalModels/solid/transport/const/constSolidTransport.H b/src/thermophysicalModels/solid/transport/const/constSolidTransport.H
index c86e82be6f..fb8b40e5c3 100644
--- a/src/thermophysicalModels/solid/transport/const/constSolidTransport.H
+++ b/src/thermophysicalModels/solid/transport/const/constSolidTransport.H
@@ -65,7 +65,7 @@ class constSolidTransport
     // Private data
 
         //- Constant thermal conductivity.
-        scalar K_;
+        scalar kappa_;
 
 
     // Private Member Functions
@@ -74,7 +74,7 @@ class constSolidTransport
         inline constSolidTransport
         (
             const thermo& t,
-            const scalar k
+            const scalar kappa
         );
 
 
@@ -93,7 +93,7 @@ public:
     // Member functions
 
         //- Thermal conductivity [W/mK]
-        inline scalar K(const scalar T) const;
+        inline scalar kappa(const scalar T) const;
 
 
     // Ostream Operator
diff --git a/src/thermophysicalModels/solid/transport/const/constSolidTransportI.H b/src/thermophysicalModels/solid/transport/const/constSolidTransportI.H
index a500b37567..a2b538e505 100644
--- a/src/thermophysicalModels/solid/transport/const/constSolidTransportI.H
+++ b/src/thermophysicalModels/solid/transport/const/constSolidTransportI.H
@@ -29,11 +29,11 @@ template<class thermo>
 inline Foam::constSolidTransport<thermo>::constSolidTransport
 (
     const thermo& t,
-    const scalar k
+    const scalar kappa
 )
 :
     thermo(t),
-    K_(k)
+    kappa_(kappa)
 {}
 
 
@@ -45,16 +45,16 @@ inline Foam::constSolidTransport<thermo>::constSolidTransport
 )
 :
     thermo(name, ct),
-    K_(ct.K_)
+    kappa_(ct.kappa_)
 {}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class thermo>
-inline Foam::scalar Foam::constSolidTransport<thermo>::K(const scalar T) const
+inline Foam::scalar Foam::constSolidTransport<thermo>::kappa(const scalar T) const
 {
-    return K_;
+    return kappa_;
 }
 
 
diff --git a/src/thermophysicalModels/solid/transport/exponential/exponentialSolidTransport.C b/src/thermophysicalModels/solid/transport/exponential/exponentialSolidTransport.C
index 233f94e2ff..8aea92bf06 100644
--- a/src/thermophysicalModels/solid/transport/exponential/exponentialSolidTransport.C
+++ b/src/thermophysicalModels/solid/transport/exponential/exponentialSolidTransport.C
@@ -35,12 +35,12 @@ Foam::exponentialSolidTransport<thermo>::exponentialSolidTransport
 )
 :
     thermo(dict),
-    K0_(0.0),
+    kappa0_(0.0),
     n0_(0.0),
     Tref_(0.0)
 {
     const dictionary& subDict = dict.subDict("transport");
-    K0_ = readScalar(subDict.lookup("K0"));
+    kappa0_ = readScalar(subDict.lookup("kappa0"));
     n0_ = readScalar(subDict.lookup("n0"));
     Tref_ = readScalar(subDict.lookup("Tref"));
 }
@@ -55,7 +55,7 @@ Foam::Ostream& Foam::operator<<
 )
 {
     operator<<(os, static_cast<const thermo&>(et));
-    os << tab << et.K0_  << tab << et.n0_ << tab << et.Tref_;
+    os << tab << et.kappa0_  << tab << et.n0_ << tab << et.Tref_;
 
     os.check
     (
diff --git a/src/thermophysicalModels/solid/transport/exponential/exponentialSolidTransport.H b/src/thermophysicalModels/solid/transport/exponential/exponentialSolidTransport.H
index d699bce99a..5e29f4f729 100644
--- a/src/thermophysicalModels/solid/transport/exponential/exponentialSolidTransport.H
+++ b/src/thermophysicalModels/solid/transport/exponential/exponentialSolidTransport.H
@@ -64,7 +64,7 @@ class exponentialSolidTransport
     // Private data
 
         //- Constant thermal coefficient.
-        scalar K0_;
+        scalar kappa0_;
 
         //- Exponent coefficient
         scalar n0_;
@@ -79,7 +79,7 @@ class exponentialSolidTransport
         inline exponentialSolidTransport
         (
             const thermo& t,
-            const scalar K0,
+            const scalar kappa0,
             const scalar n0,
             const scalar Tref
         );
@@ -104,7 +104,7 @@ public:
     // Member functions
 
         //- Thermal conductivity [W/mK]
-        inline scalar K(const scalar T) const;
+        inline scalar kappa(const scalar T) const;
 
 
     // Ostream Operator
diff --git a/src/thermophysicalModels/solid/transport/exponential/exponentialSolidTransportI.H b/src/thermophysicalModels/solid/transport/exponential/exponentialSolidTransportI.H
index b47a0faca0..e46eec9165 100644
--- a/src/thermophysicalModels/solid/transport/exponential/exponentialSolidTransportI.H
+++ b/src/thermophysicalModels/solid/transport/exponential/exponentialSolidTransportI.H
@@ -29,13 +29,13 @@ template<class thermo>
 inline Foam::exponentialSolidTransport<thermo>::exponentialSolidTransport
 (
     const thermo& t,
-    const scalar K0,
+    const scalar kappa0,
     const scalar n0,
     const scalar Tref
 )
 :
     thermo(t),
-    K0_(K0),
+    kappa0_(kappa0),
     n0_(n0),
     Tref_(Tref)
 {}
@@ -49,7 +49,7 @@ inline Foam::exponentialSolidTransport<thermo>::exponentialSolidTransport
 )
 :
     thermo(name, ct),
-    K0_(ct.K0_),
+    kappa0_(ct.kappa0_),
     n0_(ct.n0_),
     Tref_(ct.Tref_)
 {}
@@ -58,12 +58,12 @@ inline Foam::exponentialSolidTransport<thermo>::exponentialSolidTransport
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class thermo>
-inline Foam::scalar Foam::exponentialSolidTransport<thermo>::K
+inline Foam::scalar Foam::exponentialSolidTransport<thermo>::kappa
 (
     const scalar T
 ) const
 {
-    return (K0_*pow(T/Tref_, n0_));
+    return (kappa0_*pow(T/Tref_, n0_));
 }
 
 
diff --git a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.C b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.C
index b52baebd36..0a82b2424a 100644
--- a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.C
+++ b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.C
@@ -86,7 +86,7 @@ externalWallHeatFluxTemperatureFvPatchScalarField
 )
 :
     mixedFvPatchScalarField(ptf, p, iF, mapper),
-    temperatureCoupledBase(patch(), ptf.KMethod(), ptf.KName()),
+    temperatureCoupledBase(patch(), ptf.KMethod(), ptf.kappaName()),
     oldMode_(unknown),
     q_(ptf.q_, mapper),
     h_(ptf.h_, mapper),
@@ -181,7 +181,7 @@ externalWallHeatFluxTemperatureFvPatchScalarField
 )
 :
     mixedFvPatchScalarField(tppsf, iF),
-    temperatureCoupledBase(patch(), tppsf.KMethod(), tppsf.KName()),
+    temperatureCoupledBase(patch(), tppsf.KMethod(), tppsf.kappaName()),
     oldMode_(tppsf.oldMode_),
     q_(tppsf.q_),
     h_(tppsf.h_),
@@ -199,7 +199,7 @@ void Foam::externalWallHeatFluxTemperatureFvPatchScalarField::updateCoeffs()
     }
 
     scalarField q(size(), 0.0);
-    scalarField KDelta(K(*this)*patch().deltaCoeffs());
+    scalarField KDelta(kappa(*this)*patch().deltaCoeffs());
 
     if (oldMode_ == fixedHeatFlux)
     {
@@ -223,7 +223,7 @@ void Foam::externalWallHeatFluxTemperatureFvPatchScalarField::updateCoeffs()
     {
         if (q[i] > 0) //in
         {
-            this->refGrad()[i] = q[i]/K(*this)()[i];
+            this->refGrad()[i] = q[i]/kappa(*this)()[i];
             this->refValue()[i] = 0.0;
             this->valueFraction()[i] = 0.0;
         }
@@ -239,7 +239,7 @@ void Foam::externalWallHeatFluxTemperatureFvPatchScalarField::updateCoeffs()
 
     if (debug)
     {
-        scalar Q = gSum(K(*this)*patch().magSf()*snGrad());
+        scalar Q = gSum(kappa(*this)*patch().magSf()*snGrad());
 
         Info<< patch().boundaryMesh().mesh().name() << ':'
             << patch().name() << ':'
diff --git a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.H b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.H
index 53a466ac0b..9b461334cb 100644
--- a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.H
+++ b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.H
@@ -34,12 +34,12 @@ Description
         myWallPatch
         {
             type            externalWallHeatFluxTemperature;
-            K               solidThermo;       // solidThermo or lookup
+            kappa           solidThermo;       // solidThermo or lookup
             q               uniform 1000;      // Heat flux / [W/m2]
             Ta              uniform 300.0;     // Tambient temperature /[K]
             h               uniform 10.0;      // Heat transfer coeff /[W/Km2]
             value           uniform 300.0;     // Initial temperature / [K]
-            KName           none;
+            kappaName       none;
         }
 
 Note:
diff --git a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.C b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.C
index c3562426e3..0258ff87f5 100644
--- a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.C
+++ b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.C
@@ -58,12 +58,12 @@ Foam::temperatureCoupledBase::temperatureCoupledBase
 (
     const fvPatch& patch,
     const word& calculationType,
-    const word& KName
+    const word& kappaName
 )
 :
     patch_(patch),
     method_(KMethodTypeNames_[calculationType]),
-    KName_(KName)
+    kappaName_(kappaName)
 {}
 
 
@@ -74,14 +74,14 @@ Foam::temperatureCoupledBase::temperatureCoupledBase
 )
 :
     patch_(patch),
-    method_(KMethodTypeNames_.read(dict.lookup("K"))),
-    KName_(dict.lookup("KName"))
+    method_(KMethodTypeNames_.read(dict.lookup("kappa"))),
+    kappaName_(dict.lookup("kappaName"))
 {}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-Foam::tmp<Foam::scalarField> Foam::temperatureCoupledBase::K
+Foam::tmp<Foam::scalarField> Foam::temperatureCoupledBase::kappa
 (
     const scalarField& Tp
 ) const
@@ -111,7 +111,7 @@ Foam::tmp<Foam::scalarField> Foam::temperatureCoupledBase::K
                 (
                     "solidThermophysicalProperties"
                 );
-            return thermo.K(patch_.index());
+            return thermo.kappa(patch_.index());
         }
         break;
 
@@ -124,23 +124,23 @@ Foam::tmp<Foam::scalarField> Foam::temperatureCoupledBase::K
                 (
                     "solidThermophysicalProperties"
                 );
-            return n & thermo.directionalK(patch_.index()) & n;
+            return n & thermo.directionalKappa(patch_.index()) & n;
         }
         break;
 
         case LOOKUP:
         {
-            if (mesh.objectRegistry::foundObject<volScalarField>(KName_))
+            if (mesh.objectRegistry::foundObject<volScalarField>(kappaName_))
             {
-                return patch_.lookupPatchField<volScalarField, scalar>(KName_);
+                return patch_.lookupPatchField<volScalarField, scalar>(kappaName_);
             }
             else if
             (
-                mesh.objectRegistry::foundObject<volSymmTensorField>(KName_)
+                mesh.objectRegistry::foundObject<volSymmTensorField>(kappaName_)
             )
             {
                 const symmTensorField& KWall =
-                    patch_.lookupPatchField<volSymmTensorField, scalar>(KName_);
+                    patch_.lookupPatchField<volSymmTensorField, scalar>(kappaName_);
 
                 const vectorField n(patch_.nf());
 
@@ -149,12 +149,12 @@ Foam::tmp<Foam::scalarField> Foam::temperatureCoupledBase::K
             else
             {
                 FatalErrorIn("temperatureCoupledBase::K() const")
-                    << "Did not find field " << KName_
+                    << "Did not find field " << kappaName_
                     << " on mesh " << mesh.name() << " patch " << patch_.name()
                     << endl
-                    << "Please set 'K' to one of " << KMethodTypeNames_.toc()
-                    << " and 'KName' to the name of the volScalar"
-                    << " or volSymmTensor field (if K=lookup)"
+                    << "Please set 'kappa' to one of " << KMethodTypeNames_.toc()
+                    << " and 'kappaName' to the name of the volScalar"
+                    << " or volSymmTensor field (if kappa=lookup)"
                     << exit(FatalError);
 
                 return scalarField(0);
@@ -163,11 +163,11 @@ Foam::tmp<Foam::scalarField> Foam::temperatureCoupledBase::K
 
         default:
         {
-            FatalErrorIn("temperatureCoupledBase::K() const")
+            FatalErrorIn("temperatureCoupledBase::kappa() const")
                 << "Unimplemented method " << method_ << endl
-                << "Please set 'K' to one of " << KMethodTypeNames_.toc()
-                << " and 'KName' to the name of the volScalar"
-                << " or volSymmTensor field (if K=lookup)"
+                << "Please set 'kappa' to one of " << KMethodTypeNames_.toc()
+                << " and 'kappaName' to the name of the volScalar"
+                << " or volSymmTensor field (if kappa=lookup)"
                 << exit(FatalError);
         }
         break;
@@ -178,9 +178,9 @@ Foam::tmp<Foam::scalarField> Foam::temperatureCoupledBase::K
 
 void Foam::temperatureCoupledBase::write(Ostream& os) const
 {
-    os.writeKeyword("K") << KMethodTypeNames_[method_]
+    os.writeKeyword("kappa") << KMethodTypeNames_[method_]
         << token::END_STATEMENT << nl;
-    os.writeKeyword("KName") << KName_ << token::END_STATEMENT << nl;
+    os.writeKeyword("kappaName") << kappaName_ << token::END_STATEMENT << nl;
 }
 
 
diff --git a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.H b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.H
index 2a78d6b2e5..8c3ec69615 100644
--- a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.H
+++ b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.H
@@ -27,13 +27,14 @@ Class
 Description
     Common functions for use in temperature coupled boundaries. For now only
 
-    K() : heat conduction at patch. Gets supplied how to lookup/calculate K:
+    kappa() : heat conduction at patch. Gets supplied how to lookup/calculate
+        kappa:
 
     - 'lookup' : lookup volScalarField (or volSymmTensorField) with name
     - 'basicThermo' : use basicThermo and default compressible::turbulenceModel
-       to calculate K
-    - 'solidThermo' : use basicSolidThermo K()
-    - 'directionalSolidThermo' directionalK()
+       to calculate kappa
+    - 'solidThermo' : use basicSolidThermo kappa()
+    - 'directionalSolidThermo' directionalKappa()
 
 SourceFiles
     temperatureCoupledBase.C
@@ -59,7 +60,7 @@ namespace Foam
 class temperatureCoupledBase
 {
 public:
-        //- Type of supplied K
+        //- Type of supplied Kappa
         enum KMethodType
         {
             BASICTHERMO,
@@ -81,7 +82,7 @@ private:
         const KMethodType method_;
 
         //- Name of thermal conductivity field (if looked up from database)
-        const word KName_;
+        const word kappaName_;
 
 
 public:
@@ -113,13 +114,13 @@ public:
         }
 
         //- Name of thermal conductivity field
-        const word& KName() const
+        const word& kappaName() const
         {
-            return KName_;
+            return kappaName_;
         }
 
         //- Given patch temperature calculate corresponding K field
-        tmp<scalarField> K(const scalarField& Tp) const;
+        tmp<scalarField> kappa(const scalarField& Tp) const;
 
         //- Write
         void write(Ostream&) const;
diff --git a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/temperatureThermoBaffle1D/temperatureThermoBaffle1DFvPatchScalarField.C b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/temperatureThermoBaffle1D/temperatureThermoBaffle1DFvPatchScalarField.C
index 9d1af41670..d9e3e6d40b 100644
--- a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/temperatureThermoBaffle1D/temperatureThermoBaffle1DFvPatchScalarField.C
+++ b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/temperatureThermoBaffle1D/temperatureThermoBaffle1DFvPatchScalarField.C
@@ -292,7 +292,7 @@ void temperatureThermoBaffle1DFvPatchScalarField<solidType>::updateCoeffs()
         // Create fields for solid properties
         forAll(KDeltaw, i)
         {
-            KDeltaw[i] = solid_().K((Tp[i] + nbrTp[i])/2.0)/thickness_[i];
+            KDeltaw[i] = solid_().kappa((Tp[i] + nbrTp[i])/2.0)/thickness_[i];
         }
 
         const scalarField q
diff --git a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/temperatureThermoBaffle1D/temperatureThermoBaffle1DFvPatchScalarField.H b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/temperatureThermoBaffle1D/temperatureThermoBaffle1DFvPatchScalarField.H
index 8ee1b01b9c..66bba6dded 100644
--- a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/temperatureThermoBaffle1D/temperatureThermoBaffle1DFvPatchScalarField.H
+++ b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/temperatureThermoBaffle1D/temperatureThermoBaffle1DFvPatchScalarField.H
@@ -114,9 +114,9 @@ class temperatureThermoBaffle1DFvPatchScalarField
             }
 
 
-            scalar K(const scalar T) const
+            scalar kappa(const scalar T) const
             {
-                return solidPtr_().K(T);
+                return solidPtr_().kappa(T);
             }
     };
 
diff --git a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentHeatFluxTemperature/turbulentHeatFluxTemperatureFvPatchScalarField.C b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentHeatFluxTemperature/turbulentHeatFluxTemperatureFvPatchScalarField.C
index d71cf18862..29757f1ea6 100644
--- a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentHeatFluxTemperature/turbulentHeatFluxTemperatureFvPatchScalarField.C
+++ b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentHeatFluxTemperature/turbulentHeatFluxTemperatureFvPatchScalarField.C
@@ -93,7 +93,7 @@ turbulentHeatFluxTemperatureFvPatchScalarField
 )
 :
     fixedGradientFvPatchScalarField(ptf, p, iF, mapper),
-    temperatureCoupledBase(patch(), ptf.KMethod(), ptf.KName()),
+    temperatureCoupledBase(patch(), ptf.KMethod(), ptf.kappaName()),
     heatSource_(ptf.heatSource_),
     q_(ptf.q_, mapper)
 {}
@@ -124,7 +124,7 @@ turbulentHeatFluxTemperatureFvPatchScalarField
 )
 :
     fixedGradientFvPatchScalarField(thftpsf),
-    temperatureCoupledBase(patch(), thftpsf.KMethod(), thftpsf.KName()),
+    temperatureCoupledBase(patch(), thftpsf.KMethod(), thftpsf.kappaName()),
     heatSource_(thftpsf.heatSource_),
     q_(thftpsf.q_)
 {}
@@ -138,7 +138,7 @@ turbulentHeatFluxTemperatureFvPatchScalarField
 )
 :
     fixedGradientFvPatchScalarField(thftpsf, iF),
-    temperatureCoupledBase(patch(), thftpsf.KMethod(), thftpsf.KName()),
+    temperatureCoupledBase(patch(), thftpsf.KMethod(), thftpsf.kappaName()),
     heatSource_(thftpsf.heatSource_),
     q_(thftpsf.q_)
 {}
@@ -188,12 +188,12 @@ void turbulentHeatFluxTemperatureFvPatchScalarField::updateCoeffs()
         case hsPower:
         {
             const scalar Ap = gSum(patch().magSf());
-            gradient() = q_/(Ap*K(Tp));
+            gradient() = q_/(Ap*kappa(Tp));
             break;
         }
         case hsFlux:
         {
-            gradient() = q_/K(Tp);
+            gradient() = q_/kappa(Tp);
             break;
         }
         default:
diff --git a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentHeatFluxTemperature/turbulentHeatFluxTemperatureFvPatchScalarField.H b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentHeatFluxTemperature/turbulentHeatFluxTemperatureFvPatchScalarField.H
index 7d63f14373..78f40e5a9d 100644
--- a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentHeatFluxTemperature/turbulentHeatFluxTemperatureFvPatchScalarField.H
+++ b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentHeatFluxTemperature/turbulentHeatFluxTemperatureFvPatchScalarField.H
@@ -36,7 +36,7 @@ Description
             type            compressible::turbulentHeatFluxTemperature;
             heatSource      flux;        // power [W]; flux [W/m2]
             q               uniform 10;  // heat power or flux
-            K               basicThermo; // calculate K by alphaEff*thermo.Cp
+            kappa           basicThermo; // calculate kappa=alphaEff*thermo.Cp
             value           uniform 300; // initial temperature value
         }
 
diff --git a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C
index a61959a976..850cc79f6e 100644
--- a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C
+++ b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C
@@ -68,7 +68,7 @@ turbulentTemperatureCoupledBaffleMixedFvPatchScalarField
 )
 :
     mixedFvPatchScalarField(ptf, p, iF, mapper),
-    temperatureCoupledBase(patch(), ptf.KMethod(), ptf.KName()),
+    temperatureCoupledBase(patch(), ptf.KMethod(), ptf.kappaName()),
     neighbourFieldName_(ptf.neighbourFieldName_)
 {}
 
@@ -131,7 +131,7 @@ turbulentTemperatureCoupledBaffleMixedFvPatchScalarField
 )
 :
     mixedFvPatchScalarField(wtcsf, iF),
-    temperatureCoupledBase(patch(), wtcsf.KMethod(), wtcsf.KName()),
+    temperatureCoupledBase(patch(), wtcsf.KMethod(), wtcsf.kappaName()),
     neighbourFieldName_(wtcsf.neighbourFieldName_)
 {}
 
@@ -186,11 +186,11 @@ void turbulentTemperatureCoupledBaffleMixedFvPatchScalarField::updateCoeffs()
     scalarField nbrIntFld(nbrField.patchInternalField());
     distMap.distribute(nbrIntFld);
 
-    // Swap to obtain full local values of neighbour K*delta
-    scalarField nbrKDelta(nbrField.K(nbrField)*nbrPatch.deltaCoeffs());
+    // Swap to obtain full local values of neighbour kappa*delta
+    scalarField nbrKDelta(nbrField.kappa(nbrField)*nbrPatch.deltaCoeffs());
     distMap.distribute(nbrKDelta);
 
-    tmp<scalarField> myKDelta = K(*this)*patch().deltaCoeffs();
+    tmp<scalarField> myKDelta = kappa(*this)*patch().deltaCoeffs();
 
 
     // Both sides agree on
@@ -219,7 +219,7 @@ void turbulentTemperatureCoupledBaffleMixedFvPatchScalarField::updateCoeffs()
 
     if (debug)
     {
-        scalar Q = gSum(K(*this)*patch().magSf()*snGrad());
+        scalar Q = gSum(kappa(*this)*patch().magSf()*snGrad());
 
         Info<< patch().boundaryMesh().mesh().name() << ':'
             << patch().name() << ':'
diff --git a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.H b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.H
index c36830577d..d4164998ec 100644
--- a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.H
+++ b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.H
@@ -41,18 +41,20 @@ Description
         {
             type        compressible::turbulentTemperatureCoupledBaffleMixed;
             neighbourFieldName  T;
-            K                   lookup;
-            KName               K;
+            kappa               lookup;
+            kappaName           kappa;
             value               uniform 300;
         }
 
     Needs to be on underlying mapped(Wall)FvPatch.
 
-    Note: K : heat conduction at patch. Gets supplied how to lookup/calculate K:
+    Note: kappa : heat conduction at patch. Gets supplied how to lookup/calculate
+        kappa:
     - 'lookup' : lookup volScalarField (or volSymmTensorField) with name
-    - 'basicThermo' : use basicThermo and compressible::RASmodel to calculate K
-    - 'solidThermo' : use basicSolidThermo K()
-    - 'directionalSolidThermo' directionalK()
+    - 'basicThermo' : use basicThermo and compressible::RASmodel to calculate
+        kappa
+    - 'solidThermo' : use basicSolidThermo kappa()
+    - 'directionalSolidThermo' directionalKappa()
 
     Note: runs in parallel with arbitrary decomposition. Uses mapped
     functionality to calculate exchange.
diff --git a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.C b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.C
index 16f81bbeec..beec3b069c 100644
--- a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.C
+++ b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.C
@@ -67,7 +67,7 @@ turbulentTemperatureRadCoupledMixedFvPatchScalarField
 )
 :
     mixedFvPatchScalarField(psf, p, iF, mapper),
-    temperatureCoupledBase(patch(), psf.KMethod(), psf.KName()),
+    temperatureCoupledBase(patch(), psf.KMethod(), psf.kappaName()),
     TnbrName_(psf.TnbrName_),
     QrNbrName_(psf.QrNbrName_),
     QrName_(psf.QrName_)
@@ -134,7 +134,7 @@ turbulentTemperatureRadCoupledMixedFvPatchScalarField
 )
 :
     mixedFvPatchScalarField(psf, iF),
-    temperatureCoupledBase(patch(), psf.KMethod(), psf.KName()),
+    temperatureCoupledBase(patch(), psf.KMethod(), psf.kappaName()),
     TnbrName_(psf.TnbrName_),
     QrNbrName_(psf.QrNbrName_),
     QrName_(psf.QrName_)
@@ -182,11 +182,11 @@ void turbulentTemperatureRadCoupledMixedFvPatchScalarField::updateCoeffs()
 
 
     // Swap to obtain full local values of neighbour K*delta
-    scalarField KDeltaNbr(nbrField.K(nbrField)*nbrPatch.deltaCoeffs());
+    scalarField KDeltaNbr(nbrField.kappa(nbrField)*nbrPatch.deltaCoeffs());
     distMap.distribute(KDeltaNbr);
 
 
-    scalarField KDelta(K(*this)*patch().deltaCoeffs());
+    scalarField KDelta(kappa(*this)*patch().deltaCoeffs());
 
     scalarField Qr(Tp.size(), 0.0);
     if (QrName_ != "none")
diff --git a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.H b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.H
index 8f8b47c946..99f93ee8dd 100644
--- a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.H
+++ b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.H
@@ -35,8 +35,8 @@ Description
         {
             type compressible::turbulentTemperatureRadCoupledMixed;
             TNbr        T;      // name of T field on neighbour region
-            K           lookup;
-            KName       K;
+            kappa       lookup;
+            KappaName   kappa;
             QrNbr       Qr; // or none. Name of Qr field on neighbour region
             Qr          Qr; // or none. Name of Qr field on local region
             value       uniform 300;
@@ -44,12 +44,13 @@ Description
 
     Needs to be on underlying mapped(Wall)FvPatch.
 
-     Note: K : heat conduction at patch. Gets supplied how to lookup/calculate
-     K:
+     Note: kappa : heat conduction at patch. Gets supplied how to
+            lookup/calculate
+     kappa:
     - 'lookup' : lookup volScalarField (or volSymmTensorField) with name
     - 'basicThermo' : use basicThermo and compressible::RASmodel to calculate K
-    - 'solidThermo' : use basicSolidThermo K()
-    - 'directionalSolidThermo' directionalK()
+    - 'solidThermo' : use basicSolidThermo kappa()
+    - 'directionalSolidThermo' directionalKappa()
 
     Note: runs in parallel with arbitrary decomposition. Uses mapped
     functionality to calculate exchange.
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/T b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/T
index 5899c6d9a2..5e07713cdc 100644
--- a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/T
+++ b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/T
@@ -50,10 +50,10 @@ boundaryField
     {
         type            compressible::turbulentTemperatureRadCoupledMixed;
         Tnbr            T;
-        K               basicThermo;
+        kappa           basicThermo;
         QrNbr           none;
         Qr              Qr;
-        KName           none;
+        kappaName       none;
         value           $internalField;
     }
 }
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/panelRegion/T b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/panelRegion/T
index a4187e29d7..900fa3ae76 100644
--- a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/panelRegion/T
+++ b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/panelRegion/T
@@ -41,8 +41,8 @@ boundaryField
     {
         type            compressible::turbulentTemperatureRadCoupledMixed;
         Tnbr            T;
-        K               solidThermo;
-        KName           none;
+        kappa           solidThermo;
+        kappaName       none;
         QrNbr           Qr;
         Qr              none;
         value           uniform 298.15;
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/panelRegion/solidThermophysicalProperties b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/panelRegion/solidThermophysicalProperties
index 1174ecfa25..7ed5edbfcb 100644
--- a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/panelRegion/solidThermophysicalProperties
+++ b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/panelRegion/solidThermophysicalProperties
@@ -26,12 +26,12 @@ vCoeffs
 {
     transport
     {
-        K           0.135;
+        kappa       0.135;
     }
     radiation
     {
         sigmaS      0.0;
-        kappa       0.0;  //opaque
+        kappaRad    0.0;  //opaque
         emissivity  0.17;
     }
     thermodynamics
@@ -49,12 +49,12 @@ charCoeffs
 {
     transport
     {
-        K           0.4;
+        kappa       0.4;
     }
     radiation
     {
         sigmaS      0.0;
-        kappa       0.0;
+        kappaRad    0.0;
         emissivity  0.85;
     }
     thermodynamics
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/baffleRegion/changeDictionaryDict b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/baffleRegion/changeDictionaryDict
index 6391270926..767b28e659 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/baffleRegion/changeDictionaryDict
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/baffleRegion/changeDictionaryDict
@@ -24,8 +24,8 @@ dictionaryReplacement
             {
                 type                compressible::temperatureThermoBaffle;
                 neighbourFieldName  T;
-                K                   solidThermo;
-                KName               none;
+                kappa               solidThermo;
+                kappaName           none;
 
                 value               uniform 300;
             }
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/changeDictionaryDict b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/changeDictionaryDict
index a535343ee2..2546875331 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/changeDictionaryDict
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/changeDictionaryDict
@@ -94,12 +94,12 @@ dictionaryReplacement
                 Qs              uniform 100;    // heat flux [W/m2]
                 transport
                 {
-                    K               1.0;
+                    kappa           1.0;
                 }
                 radiation
                 {
                     sigmaS          0;
-                    kappa           0;
+                    kappaRad        0;
                     emissivity      0;
                 }
                 thermodynamics
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/changeDictionaryDict.baffle b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/changeDictionaryDict.baffle
index 6b4a777a53..194fa15adb 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/changeDictionaryDict.baffle
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/changeDictionaryDict.baffle
@@ -94,12 +94,12 @@ dictionaryReplacement
                 Qs              uniform 300;    // heat flux [W/m2]
                 transport
                 {
-                    K               1.0;
+                    kappa           1.0;
                 }
                 radiation
                 {
                     sigmaS          0;
-                    kappa           0;
+                    kappaRad        0;
                     emissivity      0;
                 }
                 thermodynamics
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/changeDictionaryDict.baffleRegion b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/changeDictionaryDict.baffleRegion
index 8c6c66145c..cada1b31ba 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/changeDictionaryDict.baffleRegion
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/changeDictionaryDict.baffleRegion
@@ -95,7 +95,7 @@ dictionaryReplacement
 
                 // Coupled BC.
                 neighbourFieldName  T;
-                K                   basicThermo;
+                kappa               basicThermo;
                 KName               none;
 
 
@@ -117,10 +117,10 @@ dictionaryReplacement
                     //- thermo properties
                     rho rho [1 -3  0  0 0 0 0]              80;
                     Cp  Cp  [0  2 -2 -1 0 0 0]              15;
-                    K   K   [1  1 -3 -1 0 0 0]              0.01;
+                    kappa   kappa   [1  1 -3 -1 0 0 0]      0.01;
 
                     //- radiative properties
-                    kappa kappa [0 -1 0 0 0 0 0]            0;
+                    kappaRad kappaRad [0 -1 0 0 0 0 0]            0;
                     sigmaS sigmaS [0 -1 0 0 0 0 0]          0;
                     emissivity  emissivity  [0 0 0 0 0 0 0] 1;
 
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/Allrun b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/Allrun
index b9137a48fa..3df6482952 100755
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/Allrun
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/Allrun
@@ -37,7 +37,7 @@ do
 done
 
 # Run
-#runParallel `getApplication` 4
+runParallel `getApplication` 4
 
 # Reconstruct
 #for i in bottomAir topAir heater leftSolid rightSolid
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/heater/solidThermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/heater/solidThermophysicalProperties
index ec1061eb2d..36e744bd34 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/heater/solidThermophysicalProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/heater/solidThermophysicalProperties
@@ -23,10 +23,10 @@ constSolidThermoCoeffs
     //- thermo properties
     rho rho [1 -3  0  0 0 0 0] 8000;
     Cp  Cp  [0  2 -2 -1 0 0 0] 450;
-    K   K   [1  1 -3 -1 0 0 0] 80;
+    kappa   kappa   [1  1 -3 -1 0 0 0] 80;
 
     //- radiation properties
-    kappa kappa [0 -1 0 0 0 0 0]            0;
+    kappaRad kappaRad [0 -1 0 0 0 0 0]      0;
     sigmaS sigmaS [0 -1 0 0 0 0 0]          0;
     emissivity  emissivity  [0 0 0 0 0 0 0] 0;
 
@@ -41,11 +41,11 @@ isotropicKSolidThermoCoeffs
     TValues             (100 1000);
     rhoValues           (1000 1700);
     cpValues            (1700 1700);
-    KValues             (80 40);
+    kappaValues         (80 40);
 
     //- radiation properties
     emissivityValues    (1 1);
-    kappaValues         (0 0);
+    kappaRadValues      (0 0);
     sigmaSValues        (0 0);
 
     //- chemical properties
@@ -63,7 +63,7 @@ directionalKSolidThermoCoeffs
     TValues             (100 1000);
     rhoValues           (1000 1700);
     cpValues            (1700 1700);
-    KValues             ((10 10 10) (40 40 40));
+    kappaValues         ((10 10 10) (40 40 40));
 
     coordinateSystem
     {
@@ -81,7 +81,7 @@ directionalKSolidThermoCoeffs
 
     //- radiation properties
     emissivityValues    (1 1);
-    kappaValues         (1 1);
+    kappaRadValues      (1 1);
     sigmaSValues        (1 1);
 }
 
@@ -94,14 +94,15 @@ pmmaCoeffs
 {
     transport
     {
-        K0      0.152;
+
+        kappa0  0.152;
         n0      1.3;
         Tref    300; //K0*pow(T/Tref_, n0))
     }
     radiation
     {
         sigmaS      0.0;
-        kappa       0.0;
+        kappaRad    0.0;
         emissivity  0.1;
     }
     thermodynamics
@@ -121,7 +122,7 @@ charCoeffs
 {
     transport
     {
-        K0      0.4;
+        kappa0  0.4;
         n0      1.3;
         Tref    300; //K0*pow(T/Tref_, n0))
     }
@@ -129,7 +130,7 @@ charCoeffs
     radiation
     {
         sigmaS      0.0;
-        kappa       0.0;
+        kappaRad    0.0;
         emissivity  0.0;
     }
 
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomAir/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomAir/changeDictionaryDict
index af17b665a6..a736e341f6 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomAir/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomAir/changeDictionaryDict
@@ -57,8 +57,8 @@ dictionaryReplacement
             {
                 type            compressible::turbulentTemperatureCoupledBaffleMixed;
                 neighbourFieldName T;
-                K               basicThermo;
-                KName           none;
+                kappa           basicThermo;
+                kappaName       none;
                 value           uniform 300;
             }
         }
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/heater/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/heater/changeDictionaryDict
index ce32ac9f54..1222482e8f 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/heater/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/heater/changeDictionaryDict
@@ -47,8 +47,8 @@ dictionaryReplacement
             {
                 type            compressible::turbulentTemperatureCoupledBaffleMixed;
                 neighbourFieldName T;
-                K               solidThermo;
-                KName           none;
+                kappa           solidThermo;
+                kappaName       none;
                 value           uniform 300;
             }
             minY
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/leftSolid/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/leftSolid/changeDictionaryDict
index 5425a5ec5a..c70f5391f6 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/leftSolid/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/leftSolid/changeDictionaryDict
@@ -43,8 +43,8 @@ dictionaryReplacement
             {
                 type            compressible::turbulentTemperatureCoupledBaffleMixed;
                 neighbourFieldName T;
-                K               solidThermo;
-                KName           none;
+                kappa           solidThermo;
+                kappaName       none;
                 value           uniform 300;
             }
         }
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/rightSolid/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/rightSolid/changeDictionaryDict
index 2bc26681f0..913adcf784 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/rightSolid/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/rightSolid/changeDictionaryDict
@@ -43,8 +43,8 @@ dictionaryReplacement
             {
                 type            compressible::turbulentTemperatureCoupledBaffleMixed;
                 neighbourFieldName T;
-                K               solidThermo;
-                KName           none;
+                kappa           solidThermo;
+                kappaName       none;
                 value           uniform 300;
             }
         }
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/changeDictionaryDict
index a64cb4027e..787c1147d8 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/changeDictionaryDict
@@ -68,8 +68,8 @@ dictionaryReplacement
             {
                 type            compressible::turbulentTemperatureCoupledBaffleMixed;
                 neighbourFieldName T;
-                K               basicThermo;
-                KName           none;
+                kappa           basicThermo;
+                kappaName       none;
                 value           uniform 300;
             }
         }
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/bottomWater/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/bottomWater/changeDictionaryDict
index 77d4692740..4c53b4cb8a 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/bottomWater/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/bottomWater/changeDictionaryDict
@@ -70,8 +70,8 @@ dictionaryReplacement
             {
                 type            compressible::turbulentTemperatureCoupledBaffleMixed;
                 neighbourFieldName T;
-                K               basicThermo;
-                KName           none;
+                kappa           basicThermo;
+                kappaName       none;
                 value           uniform 300;
             }
         }
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/bottomWater/changeDictionaryDict.save b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/bottomWater/changeDictionaryDict.save
index 1336cf0324..35bf28b902 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/bottomWater/changeDictionaryDict.save
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/bottomWater/changeDictionaryDict.save
@@ -57,8 +57,8 @@ dictionaryReplacement
             {
                 type            compressible::turbulentTemperatureCoupledBaffleMixed;
                 neighbourFieldName T;
-                K               basicThermo;
-                KName           none;
+                kappa           basicThermo;
+                kappaName       none;
                 value           uniform 300;
             }
         }
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/heater/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/heater/changeDictionaryDict
index 654df1e3df..1a44394717 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/heater/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/heater/changeDictionaryDict
@@ -48,8 +48,8 @@ dictionaryReplacement
             {
                 type            compressible::turbulentTemperatureCoupledBaffleMixed;
                 neighbourFieldName T;
-                K               solidThermo;
-                KName           none;
+                kappa           solidThermo;
+                kappaName       none;
                 value           uniform 300;
             }
             minY
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/leftSolid/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/leftSolid/changeDictionaryDict
index e4af521f71..fa798f65a5 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/leftSolid/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/leftSolid/changeDictionaryDict
@@ -43,8 +43,8 @@ dictionaryReplacement
             {
                 type            compressible::turbulentTemperatureCoupledBaffleMixed;
                 neighbourFieldName T;
-                K               solidThermo;
-                KName           none;
+                kappa           solidThermo;
+                kappaName       none;
                 value           uniform 300;
             }
         }
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/rightSolid/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/rightSolid/changeDictionaryDict
index 16504fb92a..546b332138 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/rightSolid/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/rightSolid/changeDictionaryDict
@@ -43,8 +43,8 @@ dictionaryReplacement
             {
                 type       compressible::turbulentTemperatureCoupledBaffleMixed;
                 neighbourFieldName T;
-                K               solidThermo;
-                KName           none;
+                kappa           solidThermo;
+                kappaName       none;
                 value           uniform 300;
             }
         }
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/topAir/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/topAir/changeDictionaryDict
index 3e91079163..e4f2256b3c 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/topAir/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/topAir/changeDictionaryDict
@@ -69,8 +69,8 @@ dictionaryReplacement
             {
                 type            compressible::turbulentTemperatureCoupledBaffleMixed;
                 neighbourFieldName T;
-                K               basicThermo;
-                KName           none;
+                kappa           basicThermo;
+                kappaName       none;
                 value           uniform 300;
             }
         }
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/heater/solidThermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/heater/solidThermophysicalProperties
index 54ca602eee..7aab5490fa 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/heater/solidThermophysicalProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/heater/solidThermophysicalProperties
@@ -25,10 +25,10 @@ constSolidThermoCoeffs
     //- thermo properties
     rho rho [1 -3  0  0 0 0 0] 8000;
     Cp  Cp  [0  2 -2 -1 0 0 0] 450;
-    K   K   [1  1 -3 -1 0 0 0] 80;
+    kappa   kappa   [1  1 -3 -1 0 0 0] 80;
 
     //- radiation properties
-    kappa kappa [0 -1 0 0 0 0 0]            0;
+    kappaRad kappaRad [0 -1 0 0 0 0 0]      0;
     sigmaS sigmaS [0 -1 0 0 0 0 0]          0;
     emissivity  emissivity  [0 0 0 0 0 0 0] 1;
 
@@ -43,11 +43,11 @@ isotropicKSolidThermoCoeffs
     TValues             (100 1000);
     rhoValues           (1000 1700);
     cpValues            (1700 1700);
-    KValues             (80 40);
+    kappaValues         (80 40);
 
     //- radiation properties
     emissivityValues    (1 1);
-    kappaValues         (0 0);
+    kappaRadValues      (0 0);
     sigmaSValues        (0 0);
 
     //- chemical properties
@@ -65,7 +65,7 @@ directionalKSolidThermoCoeffs
     TValues             (100 1000);
     rhoValues           (1700 1700);
     cpValues            (1700 1700);
-    KValues             ((10 10 10) (40 40 40));
+    kappaValues         ((10 10 10) (40 40 40));
 
     coordinateSystem
     {
@@ -83,7 +83,7 @@ directionalKSolidThermoCoeffs
 
     //- radiation properties
     emissivityValues    (1 1);
-    kappaValues         (1 1);
+    kappaRadValues      (1 1);
     sigmaSValues        (1 1);
 }
 
@@ -96,14 +96,14 @@ pmmaCoeffs
 {
     transport
     {
-        K0      0.152;
+        kappa0      0.152;
         n0      1.3;
         Tref    300; //K0*pow(T/Tref_, n0))
     }
     radiation
     {
         sigmaS      0.0;
-        kappa       0.0;
+        kappaRad    0.0;
         emissivity  0.1;
     }
     thermodynamics
@@ -123,14 +123,14 @@ charCoeffs
 {
     transport
     {
-        K0      0.4;
+        kappa0  0.4;
         n0      1.3;
         Tref    300; //K0*pow(T/Tref_, n0))
     }
     radiation
     {
         sigmaS      0.0;
-        kappa       0.0;
+        kappaRad    0.0;
         emissivity  0.0;
     }
     thermodynamics
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/changeDictionaryDict
index 77d580fe51..a13bf04501 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/changeDictionaryDict
@@ -57,8 +57,8 @@ dictionaryReplacement
             {
                 type            compressible::turbulentTemperatureCoupledBaffleMixed;
                 neighbourFieldName T;
-                K               basicThermo;
-                KName           none;
+                kappa           basicThermo;
+                kappaName       none;
                 value           uniform 300;
             }
         }
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/heater/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/heater/changeDictionaryDict
index ce32ac9f54..1222482e8f 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/heater/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/heater/changeDictionaryDict
@@ -47,8 +47,8 @@ dictionaryReplacement
             {
                 type            compressible::turbulentTemperatureCoupledBaffleMixed;
                 neighbourFieldName T;
-                K               solidThermo;
-                KName           none;
+                kappa           solidThermo;
+                kappaName       none;
                 value           uniform 300;
             }
             minY
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/leftSolid/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/leftSolid/changeDictionaryDict
index 5425a5ec5a..c70f5391f6 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/leftSolid/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/leftSolid/changeDictionaryDict
@@ -43,8 +43,8 @@ dictionaryReplacement
             {
                 type            compressible::turbulentTemperatureCoupledBaffleMixed;
                 neighbourFieldName T;
-                K               solidThermo;
-                KName           none;
+                kappa           solidThermo;
+                kappaName       none;
                 value           uniform 300;
             }
         }
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/rightSolid/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/rightSolid/changeDictionaryDict
index 2bc26681f0..913adcf784 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/rightSolid/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/rightSolid/changeDictionaryDict
@@ -43,8 +43,8 @@ dictionaryReplacement
             {
                 type            compressible::turbulentTemperatureCoupledBaffleMixed;
                 neighbourFieldName T;
-                K               solidThermo;
-                KName           none;
+                kappa           solidThermo;
+                kappaName       none;
                 value           uniform 300;
             }
         }
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/topAir/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/topAir/changeDictionaryDict
index a64cb4027e..787c1147d8 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/topAir/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/topAir/changeDictionaryDict
@@ -68,8 +68,8 @@ dictionaryReplacement
             {
                 type            compressible::turbulentTemperatureCoupledBaffleMixed;
                 neighbourFieldName T;
-                K               basicThermo;
-                KName           none;
+                kappa           basicThermo;
+                kappaName       none;
                 value           uniform 300;
             }
         }
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/heater/solidThermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/heater/solidThermophysicalProperties
index b345dace24..b5e64d9029 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/heater/solidThermophysicalProperties
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/heater/solidThermophysicalProperties
@@ -25,10 +25,10 @@ constSolidThermoCoeffs
     //- thermo properties
     rho rho [1 -3  0  0 0 0 0] 8000;
     Cp  Cp  [0  2 -2 -1 0 0 0] 450;
-    K   K   [1  1 -3 -1 0 0 0] 80;
+    kappa   kappa   [1  1 -3 -1 0 0 0] 80;
 
     //- radiation properties
-    kappa kappa [0 -1 0 0 0 0 0]            0;
+    kappaRad kappaRad [0 -1 0 0 0 0 0]            0;
     sigmaS sigmaS [0 -1 0 0 0 0 0]          0;
     emissivity  emissivity  [0 0 0 0 0 0 0] 1;
 
@@ -43,11 +43,11 @@ isotropicKSolidThermoCoeffs
     TValues             (100 1000);
     rhoValues           (1000 1700);
     cpValues            (1700 1700);
-    KValues             (80 40);
+    kappaValues             (80 40);
 
     //- radiation properties
     emissivityValues    (1 1);
-    kappaValues         (0 0);
+    kappaRadValues         (0 0);
     sigmaSValues        (0 0);
 
     //- chemical properties
@@ -65,7 +65,7 @@ directionalKSolidThermoCoeffs
     TValues             (100 1000);
     rhoValues           (1700 1700);
     cpValues            (1700 1700);
-    KValues             ((10 10 10) (40 40 40));
+    kappaValues         ((10 10 10) (40 40 40));
 
     coordinateSystem
     {
@@ -83,8 +83,8 @@ directionalKSolidThermoCoeffs
 
     //- radiation properties
     emissivityValues    (1 1);
-    kappaValues         (1 1);
-    sigmaSValues         (1 1);
+    kappaRadValues      (1 1);
+    sigmaSValues        (1 1);
 }
 
 solidComponents
@@ -96,7 +96,7 @@ pmmaCoeffs
 {
     transport
     {
-        K0      0.152;
+        kappa0  0.152;
         n0      1.3;
         Tref    300; //K0*pow(T/Tref_, n0))
     }
@@ -104,7 +104,7 @@ pmmaCoeffs
     radiation
     {
         sigmaS      0.0;
-        kappa       0.0;
+        kappaRad    0.0;
         emissivity  0.1;
     }
 
@@ -126,7 +126,7 @@ charCoeffs
 {
     transport
     {
-        K0      0.4;
+        kappa0  0.4;
         n0      1.3;
         Tref    300; //K0*pow(T/Tref_, n0))
     }
@@ -134,7 +134,7 @@ charCoeffs
     radiation
     {
         sigmaS      0.0;
-        kappa       0.0;
+        kappaRad    0.0;
         emissivity  0.0;
     }
 
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/heater/solidThermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/heater/solidThermophysicalProperties
index 004cda2c14..642d9523b5 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/heater/solidThermophysicalProperties
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/heater/solidThermophysicalProperties
@@ -25,10 +25,10 @@ constSolidThermoCoeffs
     //- thermo properties
     rho rho [1 -3  0  0 0 0 0] 8000;
     Cp  Cp  [0  2 -2 -1 0 0 0] 450;
-    K   K   [1  1 -3 -1 0 0 0] 80;
+    kappa   kappa   [1  1 -3 -1 0 0 0] 80;
 
     //- radiation properties
-    kappa kappa [0 -1 0 0 0 0 0]            0;
+    kappaRad kappaRad [0 -1 0 0 0 0 0]      0;
     sigmaS sigmaS [0 -1 0 0 0 0 0]          0;
     emissivity  emissivity  [0 0 0 0 0 0 0] 0.5;
 
@@ -43,11 +43,11 @@ isotropicKSolidThermoCoeffs
     TValues             (100 1000);
     rhoValues           (1000 1700);
     cpValues            (1700 1700);
-    KValues             (80 40);
+    kappaValues         (80 40);
 
     //- radiation properties
     emissivityValues    (1 1);
-    kappaValues         (0 0);
+    kappaRadValues      (0 0);
     sigmaSValues        (0 0);
 
     //- chemical properties
@@ -65,7 +65,7 @@ directionalKSolidThermoCoeffs
     TValues             (100 1000);
     rhoValues           (1700 1700);
     cpValues            (1700 1700);
-    KValues             ((10 10 10) (40 40 40));
+    kappaValues         ((10 10 10) (40 40 40));
 
     coordinateSystem
     {
@@ -83,8 +83,8 @@ directionalKSolidThermoCoeffs
 
     //- radiation properties
     emissivityValues    (1 1);
-    kappaValues         (1 1);
-    sigmaSValues         (1 1);
+    kappaRadValues      (1 1);
+    sigmaSValues        (1 1);
 }
 
 solidComponents
@@ -96,7 +96,7 @@ pmmaCoeffs
 {
     transport
     {
-        K0      0.152;
+        kappa0  0.152;
         n0      1.3;
         Tref    300; //K0*pow(T/Tref_, n0))
     }
@@ -104,7 +104,7 @@ pmmaCoeffs
     radiation
     {
         sigmaS      0.0;
-        kappa       0.0;
+        kappaRad    0.0;
         emissivity  0.1;
     }
 
@@ -126,7 +126,7 @@ charCoeffs
 {
     transport
     {
-        K0      0.4;
+        kappa0  0.4;
         n0      1.3;
         Tref    300; //K0*pow(T/Tref_, n0))
     }
@@ -134,7 +134,7 @@ charCoeffs
     radiation
     {
         sigmaS      0.0;
-        kappa       0.0;
+        kappaRad    0.0;
         emissivity  0.0;
     }
 
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/bottomAir/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/bottomAir/changeDictionaryDict
index f08a1ebff8..fb0130ea25 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/bottomAir/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/bottomAir/changeDictionaryDict
@@ -55,10 +55,10 @@ dictionaryReplacement
             {
                 type            compressible::turbulentTemperatureRadCoupledMixed;
                 Tnbr            T;
-                K               basicThermo;
+                kappa           basicThermo;
                 QrNbr           none;
                 Qr              Qr;
-                KName           none;
+                kappaName       none;
                 value           uniform 300;
             }
         }
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/heater/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/heater/changeDictionaryDict
index 476c666667..1a680f09a2 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/heater/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/heater/changeDictionaryDict
@@ -48,10 +48,10 @@ dictionaryReplacement
             {
                 type            compressible::turbulentTemperatureRadCoupledMixed;
                 Tnbr            T;
-                K               solidThermo;
+                kappa           solidThermo;
                 QrNbr           Qr;
                 Qr              none;
-                KName           none;
+                kappaName       none;
                 value           uniform 300;
             }
 
@@ -59,10 +59,10 @@ dictionaryReplacement
             {
                 type            compressible::turbulentTemperatureRadCoupledMixed;
                 Tnbr            T;
-                K               solidThermo;
+                kappa           solidThermo;
                 QrNbr           Qr;
                 Qr              none;
-                KName           none;
+                kappaName       none;
                 value           uniform 300;
             }
 
@@ -70,8 +70,8 @@ dictionaryReplacement
             {
                 type            compressible::turbulentTemperatureCoupledBaffleMixed;
                 neighbourFieldName T;
-                K               solidThermo;
-                KName           none;
+                kappa           solidThermo;
+                kappaName       none;
                 value           uniform 300;
             }
             minY
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/leftSolid/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/leftSolid/changeDictionaryDict
index 078796b0d9..59116a041a 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/leftSolid/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/leftSolid/changeDictionaryDict
@@ -44,10 +44,10 @@ dictionaryReplacement
             {
                 type            compressible::turbulentTemperatureRadCoupledMixed;
                 Tnbr            T;
-                K               solidThermo;
+                kappa           solidThermo;
                 QrNbr           Qr;
                 Qr              none;
-                KName           none;
+                kappaName       none;
                 value           uniform 300;
             }
 
@@ -55,10 +55,10 @@ dictionaryReplacement
             {
                 type            compressible::turbulentTemperatureRadCoupledMixed;
                 Tnbr            T;
-                K               solidThermo;
+                kappa           solidThermo;
                 QrNbr           Qr;
                 Qr              none;
-                KName           none;
+                kappaName       none;
                 value           uniform 300;
             }
 
@@ -66,8 +66,8 @@ dictionaryReplacement
             {
                 type            compressible::turbulentTemperatureCoupledBaffleMixed;
                 neighbourFieldName T;
-                K               solidThermo;
-                KName           none;
+                kappa           solidThermo;
+                kappaName       none;
                 value           uniform 300;
             }
         }
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/rightSolid/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/rightSolid/changeDictionaryDict
index 605119e269..e10d24fbeb 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/rightSolid/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/rightSolid/changeDictionaryDict
@@ -44,10 +44,10 @@ dictionaryReplacement
             {
                 type            compressible::turbulentTemperatureRadCoupledMixed;
                 Tnbr            T;
-                K               solidThermo;
+                kappa           solidThermo;
                 QrNbr           Qr;
                 Qr              none;
-                KName           none;
+                kappaName       none;
                 value           uniform 300;
             }
 
@@ -55,10 +55,10 @@ dictionaryReplacement
             {
                 type            compressible::turbulentTemperatureRadCoupledMixed;
                 Tnbr            T;
-                K               solidThermo;
+                kappa           solidThermo;
                 QrNbr           Qr;
                 Qr              none;
-                KName           none;
+                kappaName       none;
                 value           uniform 300;
             }
 
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/topAir/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/topAir/changeDictionaryDict
index 4c78380972..369915887e 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/topAir/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/topAir/changeDictionaryDict
@@ -66,10 +66,10 @@ dictionaryReplacement
             {
                 type            compressible::turbulentTemperatureRadCoupledMixed;
                 Tnbr            T;
-                K               basicThermo;
+                kappa           basicThermo;
                 QrNbr           none;
                 Qr              Qr;
-                KName           none;
+                kappaName       none;
                 value           uniform 300;
             }
         }

From a3a567ea1cf02029e25ede1e2112468134361365 Mon Sep 17 00:00:00 2001
From: sergio <sergio>
Date: Tue, 8 May 2012 13:32:56 +0100
Subject: [PATCH 312/317] ENh: Further changes to tutorials and source
 regarding changes from K to kappa

---
 .../directionalKSolidThermo.C                 |  2 ++
 .../interpolateSolid/interpolateSolid.C       |  5 ++---
 .../isotropicKSolidThermo.C                   |  2 ++
 .../constant/polyMesh/boundary                |  4 ++--
 .../system/baffleRegion/changeDictionaryDict  |  1 -
 .../system/baffleRegion/fvSchemes             |  4 ++--
 .../system/changeDictionaryDict.baffleRegion  |  2 +-
 .../heater/solidThermophysicalProperties      |  5 ++---
 .../multiRegionHeater/system/heater/fvSchemes |  4 ++--
 .../system/leftSolid/fvSchemes                |  4 ++--
 .../system/rightSolid/fvSchemes               |  4 ++--
 .../heater/solidThermophysicalProperties      | 22 +++++++++----------
 .../system/heater/fvSchemes                   |  4 ++--
 .../system/leftSolid/fvSchemes                |  4 ++--
 .../system/rightSolid/fvSchemes               |  4 ++--
 .../system/heater/fvSchemes                   |  4 ++--
 .../system/leftSolid/fvSchemes                |  4 ++--
 .../system/rightSolid/fvSchemes               |  4 ++--
 .../system/bottomAir/changeDictionaryDict     |  4 ++--
 .../system/heater/changeDictionaryDict        |  4 ++--
 .../multiRegionHeater/system/heater/fvSchemes |  4 ++--
 .../system/leftSolid/changeDictionaryDict     |  4 ++--
 .../system/leftSolid/fvSchemes                |  4 ++--
 .../system/rightSolid/changeDictionaryDict    |  4 ++--
 .../system/rightSolid/fvSchemes               |  4 ++--
 .../system/topAir/changeDictionaryDict        |  4 ++--
 .../heater/solidThermophysicalProperties      |  4 ++--
 .../system/heater/fvSchemes                   |  4 ++--
 .../system/leftSolid/fvSchemes                |  4 ++--
 .../system/rightSolid/changeDictionaryDict    |  4 ++--
 .../system/rightSolid/fvSchemes               |  4 ++--
 31 files changed, 68 insertions(+), 67 deletions(-)

diff --git a/src/thermophysicalModels/basicSolidThermo/directionalKSolidThermo/directionalKSolidThermo.C b/src/thermophysicalModels/basicSolidThermo/directionalKSolidThermo/directionalKSolidThermo.C
index e4a9ea2fa7..9f41b82a91 100644
--- a/src/thermophysicalModels/basicSolidThermo/directionalKSolidThermo/directionalKSolidThermo.C
+++ b/src/thermophysicalModels/basicSolidThermo/directionalKSolidThermo/directionalKSolidThermo.C
@@ -137,6 +137,8 @@ void Foam::directionalKSolidThermo::init()
     kappaValues_ =
         Field<vector>(subDict(typeName + "Coeffs").lookup("kappaValues"));
 
+    Info<< "    kappa      : " << kappaValues_ << nl << endl;
+
     // Determine transforms for cell centres
     forAll(mesh_.C(), cellI)
     {
diff --git a/src/thermophysicalModels/basicSolidThermo/interpolatedSolidThermo/interpolateSolid/interpolateSolid.C b/src/thermophysicalModels/basicSolidThermo/interpolatedSolidThermo/interpolateSolid/interpolateSolid.C
index 79224cbabf..7b9027110a 100644
--- a/src/thermophysicalModels/basicSolidThermo/interpolatedSolidThermo/interpolateSolid/interpolateSolid.C
+++ b/src/thermophysicalModels/basicSolidThermo/interpolatedSolidThermo/interpolateSolid/interpolateSolid.C
@@ -33,15 +33,14 @@ Foam::interpolateSolid::interpolateSolid(const dictionary& dict)
 {
     read(dict);
 
-    Info<< "Constructed directionalKSolidThermo with samples" << nl
+    Info<< "Constructed solid thermo with samples" << nl
         << "    T          : " << TValues_ << nl
         << "    rho        : " << rhoValues_ << nl
         << "    cp         : " << cpValues_ << nl
         << "    Hf         : " << HfValues_ << nl
         << "    emissivity : " << emissivityValues_ << nl
         << "    kappaRad   : " << kappaRadValues_ << nl
-        << "    sigmaS     : " << sigmaSValues_ << nl
-        << endl;
+        << "    sigmaS     : " << sigmaSValues_ << nl;
 
 
     if
diff --git a/src/thermophysicalModels/basicSolidThermo/isotropicKSolidThermo/isotropicKSolidThermo.C b/src/thermophysicalModels/basicSolidThermo/isotropicKSolidThermo/isotropicKSolidThermo.C
index 8a673ccf4b..8a697a9d1a 100644
--- a/src/thermophysicalModels/basicSolidThermo/isotropicKSolidThermo/isotropicKSolidThermo.C
+++ b/src/thermophysicalModels/basicSolidThermo/isotropicKSolidThermo/isotropicKSolidThermo.C
@@ -75,6 +75,7 @@ Foam::isotropicKSolidThermo::isotropicKSolidThermo
         Field<scalar>(subDict(typeName + "Coeffs").lookup("kappaValues"))
     )
 {
+    Info<< "    kappa      : " << kappaValues_ << nl << endl;
     correct();
 }
 
@@ -100,6 +101,7 @@ Foam::isotropicKSolidThermo::isotropicKSolidThermo(const fvMesh& mesh)
         Field<scalar>(subDict(typeName + "Coeffs").lookup("kappaValues"))
     )
 {
+    Info<< "    kappa      : " << kappaValues_ << nl <<endl;
     correct();
 }
 
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/constant/polyMesh/boundary b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/constant/polyMesh/boundary
index ce35cbafd7..48ad5decf7 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/constant/polyMesh/boundary
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/constant/polyMesh/boundary
@@ -78,7 +78,7 @@ FoamFile
         sampleRegion    baffleRegion;
         samplePatch     region0_to_baffleRegion_baffleFaces2_top;
         offsetMode      nonuniform;
-        offsets         
+        offsets         nonuniform List<vector> 
 14
 (
 (0.02 8.67362e-19 -0)
@@ -107,7 +107,7 @@ FoamFile
         sampleRegion    baffleRegion;
         samplePatch     region0_to_baffleRegion_baffleFaces2_bottom;
         offsetMode      nonuniform;
-        offsets         
+        offsets         nonuniform List<vector> 
 14
 (
 (1.11022e-16 8.67362e-19 -0)
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/baffleRegion/changeDictionaryDict b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/baffleRegion/changeDictionaryDict
index 767b28e659..5a0ae0bb51 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/baffleRegion/changeDictionaryDict
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/baffleRegion/changeDictionaryDict
@@ -26,7 +26,6 @@ dictionaryReplacement
                 neighbourFieldName  T;
                 kappa               solidThermo;
                 kappaName           none;
-
                 value               uniform 300;
             }
             baffleFaces2_side
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/baffleRegion/fvSchemes b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/baffleRegion/fvSchemes
index 3cf3fd7ea9..82b8ff469d 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/baffleRegion/fvSchemes
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/baffleRegion/fvSchemes
@@ -32,8 +32,8 @@ gradSchemes
 
 laplacianSchemes
 {
-    default         none;
-    laplacian(K,T) Gauss linear uncorrected;
+    default             none;
+    laplacian(kappa,T)  Gauss linear uncorrected;
 }
 
 
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/changeDictionaryDict.baffleRegion b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/changeDictionaryDict.baffleRegion
index cada1b31ba..a8385331e3 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/changeDictionaryDict.baffleRegion
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/changeDictionaryDict.baffleRegion
@@ -96,7 +96,7 @@ dictionaryReplacement
                 // Coupled BC.
                 neighbourFieldName  T;
                 kappa               basicThermo;
-                KName               none;
+                kappaName           none;
 
 
                 // Thermo baffle model
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/heater/solidThermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/heater/solidThermophysicalProperties
index 36e744bd34..09f5e45bf1 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/heater/solidThermophysicalProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/heater/solidThermophysicalProperties
@@ -94,10 +94,9 @@ pmmaCoeffs
 {
     transport
     {
-
         kappa0  0.152;
         n0      1.3;
-        Tref    300; //K0*pow(T/Tref_, n0))
+        Tref    300; //kappa0*pow(T/Tref_, n0))
     }
     radiation
     {
@@ -124,7 +123,7 @@ charCoeffs
     {
         kappa0  0.4;
         n0      1.3;
-        Tref    300; //K0*pow(T/Tref_, n0))
+        Tref    300; //kappa0*pow(T/Tref_, n0))
     }
 
     radiation
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/heater/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/heater/fvSchemes
index a8f4d26129..665dada183 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/heater/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/heater/fvSchemes
@@ -31,8 +31,8 @@ divSchemes
 
 laplacianSchemes
 {
-    default         none;
-    laplacian(K,T) Gauss linear limited 0.333;
+    default             none;
+    laplacian(kappa,T)  Gauss linear limited 0.333;
 }
 
 interpolationSchemes
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/leftSolid/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/leftSolid/fvSchemes
index c1747b7f0e..8f4342605d 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/leftSolid/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/leftSolid/fvSchemes
@@ -31,8 +31,8 @@ divSchemes
 
 laplacianSchemes
 {
-    default         none;
-    laplacian(K,T)   Gauss linear limited 0.333;
+    default                 none;
+    laplacian(kappa,T)      Gauss linear limited 0.333;
 }
 
 interpolationSchemes
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/rightSolid/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/rightSolid/fvSchemes
index d8fcd9179f..081089f157 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/rightSolid/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/rightSolid/fvSchemes
@@ -31,8 +31,8 @@ divSchemes
 
 laplacianSchemes
 {
-    default         none;
-    laplacian(K,T)   Gauss linear limited 0.333;
+    default              none;
+    laplacian(kappa,T)   Gauss linear limited 0.333;
 }
 
 interpolationSchemes
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/heater/solidThermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/heater/solidThermophysicalProperties
index b345dace24..948d2be1f4 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/heater/solidThermophysicalProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/heater/solidThermophysicalProperties
@@ -25,10 +25,10 @@ constSolidThermoCoeffs
     //- thermo properties
     rho rho [1 -3  0  0 0 0 0] 8000;
     Cp  Cp  [0  2 -2 -1 0 0 0] 450;
-    K   K   [1  1 -3 -1 0 0 0] 80;
+    kappa   kapp   [1  1 -3 -1 0 0 0] 80;
 
     //- radiation properties
-    kappa kappa [0 -1 0 0 0 0 0]            0;
+    kappaRad kappaRad [0 -1 0 0 0 0 0]      0;
     sigmaS sigmaS [0 -1 0 0 0 0 0]          0;
     emissivity  emissivity  [0 0 0 0 0 0 0] 1;
 
@@ -43,11 +43,11 @@ isotropicKSolidThermoCoeffs
     TValues             (100 1000);
     rhoValues           (1000 1700);
     cpValues            (1700 1700);
-    KValues             (80 40);
+    kappaValues         (80 40);
 
     //- radiation properties
     emissivityValues    (1 1);
-    kappaValues         (0 0);
+    kappaRadValues      (0 0);
     sigmaSValues        (0 0);
 
     //- chemical properties
@@ -65,7 +65,7 @@ directionalKSolidThermoCoeffs
     TValues             (100 1000);
     rhoValues           (1700 1700);
     cpValues            (1700 1700);
-    KValues             ((10 10 10) (40 40 40));
+    kappaValues         ((10 10 10) (40 40 40));
 
     coordinateSystem
     {
@@ -83,8 +83,8 @@ directionalKSolidThermoCoeffs
 
     //- radiation properties
     emissivityValues    (1 1);
-    kappaValues         (1 1);
-    sigmaSValues         (1 1);
+    kappaRadValues      (1 1);
+    sigmaSValues        (1 1);
 }
 
 solidComponents
@@ -96,7 +96,7 @@ pmmaCoeffs
 {
     transport
     {
-        K0      0.152;
+        kappa0  0.152;
         n0      1.3;
         Tref    300; //K0*pow(T/Tref_, n0))
     }
@@ -104,7 +104,7 @@ pmmaCoeffs
     radiation
     {
         sigmaS      0.0;
-        kappa       0.0;
+        kappaRad    0.0;
         emissivity  0.1;
     }
 
@@ -126,7 +126,7 @@ charCoeffs
 {
     transport
     {
-        K0      0.4;
+        kappa0  0.4;
         n0      1.3;
         Tref    300; //K0*pow(T/Tref_, n0))
     }
@@ -134,7 +134,7 @@ charCoeffs
     radiation
     {
         sigmaS      0.0;
-        kappa       0.0;
+        kappaRad    0.0;
         emissivity  0.0;
     }
 
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/heater/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/heater/fvSchemes
index a8f4d26129..665dada183 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/heater/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/heater/fvSchemes
@@ -31,8 +31,8 @@ divSchemes
 
 laplacianSchemes
 {
-    default         none;
-    laplacian(K,T) Gauss linear limited 0.333;
+    default             none;
+    laplacian(kappa,T)  Gauss linear limited 0.333;
 }
 
 interpolationSchemes
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/leftSolid/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/leftSolid/fvSchemes
index a8f4d26129..665dada183 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/leftSolid/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/leftSolid/fvSchemes
@@ -31,8 +31,8 @@ divSchemes
 
 laplacianSchemes
 {
-    default         none;
-    laplacian(K,T) Gauss linear limited 0.333;
+    default             none;
+    laplacian(kappa,T)  Gauss linear limited 0.333;
 }
 
 interpolationSchemes
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/rightSolid/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/rightSolid/fvSchemes
index a8f4d26129..665dada183 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/rightSolid/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/rightSolid/fvSchemes
@@ -31,8 +31,8 @@ divSchemes
 
 laplacianSchemes
 {
-    default         none;
-    laplacian(K,T) Gauss linear limited 0.333;
+    default             none;
+    laplacian(kappa,T)  Gauss linear limited 0.333;
 }
 
 interpolationSchemes
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/heater/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/heater/fvSchemes
index a8f4d26129..665dada183 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/heater/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/heater/fvSchemes
@@ -31,8 +31,8 @@ divSchemes
 
 laplacianSchemes
 {
-    default         none;
-    laplacian(K,T) Gauss linear limited 0.333;
+    default             none;
+    laplacian(kappa,T)  Gauss linear limited 0.333;
 }
 
 interpolationSchemes
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/leftSolid/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/leftSolid/fvSchemes
index a8f4d26129..665dada183 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/leftSolid/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/leftSolid/fvSchemes
@@ -31,8 +31,8 @@ divSchemes
 
 laplacianSchemes
 {
-    default         none;
-    laplacian(K,T) Gauss linear limited 0.333;
+    default             none;
+    laplacian(kappa,T)  Gauss linear limited 0.333;
 }
 
 interpolationSchemes
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/rightSolid/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/rightSolid/fvSchemes
index a8f4d26129..665dada183 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/rightSolid/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/rightSolid/fvSchemes
@@ -31,8 +31,8 @@ divSchemes
 
 laplacianSchemes
 {
-    default         none;
-    laplacian(K,T) Gauss linear limited 0.333;
+    default             none;
+    laplacian(kappa,T)  Gauss linear limited 0.333;
 }
 
 interpolationSchemes
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/bottomAir/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/bottomAir/changeDictionaryDict
index af17b665a6..a736e341f6 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/bottomAir/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/bottomAir/changeDictionaryDict
@@ -57,8 +57,8 @@ dictionaryReplacement
             {
                 type            compressible::turbulentTemperatureCoupledBaffleMixed;
                 neighbourFieldName T;
-                K               basicThermo;
-                KName           none;
+                kappa           basicThermo;
+                kappaName       none;
                 value           uniform 300;
             }
         }
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/heater/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/heater/changeDictionaryDict
index ce32ac9f54..1222482e8f 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/heater/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/heater/changeDictionaryDict
@@ -47,8 +47,8 @@ dictionaryReplacement
             {
                 type            compressible::turbulentTemperatureCoupledBaffleMixed;
                 neighbourFieldName T;
-                K               solidThermo;
-                KName           none;
+                kappa           solidThermo;
+                kappaName       none;
                 value           uniform 300;
             }
             minY
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/heater/fvSchemes b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/heater/fvSchemes
index 28195d3d1c..f58979beae 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/heater/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/heater/fvSchemes
@@ -31,8 +31,8 @@ divSchemes
 
 laplacianSchemes
 {
-    default         none;
-    laplacian(K,T) Gauss linear uncorrected;
+    default             none;
+    laplacian(kappa,T)  Gauss linear uncorrected;
 }
 
 interpolationSchemes
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/leftSolid/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/leftSolid/changeDictionaryDict
index 5425a5ec5a..c70f5391f6 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/leftSolid/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/leftSolid/changeDictionaryDict
@@ -43,8 +43,8 @@ dictionaryReplacement
             {
                 type            compressible::turbulentTemperatureCoupledBaffleMixed;
                 neighbourFieldName T;
-                K               solidThermo;
-                KName           none;
+                kappa           solidThermo;
+                kappaName       none;
                 value           uniform 300;
             }
         }
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/leftSolid/fvSchemes b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/leftSolid/fvSchemes
index e2b4446a8f..dad61d4cea 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/leftSolid/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/leftSolid/fvSchemes
@@ -31,8 +31,8 @@ divSchemes
 
 laplacianSchemes
 {
-    default         none;
-    laplacian(K,T) Gauss linear uncorrected;
+    default             none;
+    laplacian(kappa,T)  Gauss linear uncorrected;
 }
 
 interpolationSchemes
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/rightSolid/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/rightSolid/changeDictionaryDict
index 2bc26681f0..913adcf784 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/rightSolid/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/rightSolid/changeDictionaryDict
@@ -43,8 +43,8 @@ dictionaryReplacement
             {
                 type            compressible::turbulentTemperatureCoupledBaffleMixed;
                 neighbourFieldName T;
-                K               solidThermo;
-                KName           none;
+                kappa           solidThermo;
+                kappaName       none;
                 value           uniform 300;
             }
         }
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/rightSolid/fvSchemes b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/rightSolid/fvSchemes
index e2b4446a8f..dad61d4cea 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/rightSolid/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/rightSolid/fvSchemes
@@ -31,8 +31,8 @@ divSchemes
 
 laplacianSchemes
 {
-    default         none;
-    laplacian(K,T) Gauss linear uncorrected;
+    default             none;
+    laplacian(kappa,T)  Gauss linear uncorrected;
 }
 
 interpolationSchemes
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/topAir/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/topAir/changeDictionaryDict
index a64cb4027e..787c1147d8 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/topAir/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/topAir/changeDictionaryDict
@@ -68,8 +68,8 @@ dictionaryReplacement
             {
                 type            compressible::turbulentTemperatureCoupledBaffleMixed;
                 neighbourFieldName T;
-                K               basicThermo;
-                KName           none;
+                kappa           basicThermo;
+                kappaName       none;
                 value           uniform 300;
             }
         }
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/heater/solidThermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/heater/solidThermophysicalProperties
index 642d9523b5..bc19681881 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/heater/solidThermophysicalProperties
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/heater/solidThermophysicalProperties
@@ -98,7 +98,7 @@ pmmaCoeffs
     {
         kappa0  0.152;
         n0      1.3;
-        Tref    300; //K0*pow(T/Tref_, n0))
+        Tref    300; //kappa0*pow(T/Tref_, n0))
     }
 
     radiation
@@ -128,7 +128,7 @@ charCoeffs
     {
         kappa0  0.4;
         n0      1.3;
-        Tref    300; //K0*pow(T/Tref_, n0))
+        Tref    300; //kappa0*pow(T/Tref_, n0))
     }
 
     radiation
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/heater/fvSchemes b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/heater/fvSchemes
index 5a1fe19dbf..dad61d4cea 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/heater/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/heater/fvSchemes
@@ -31,8 +31,8 @@ divSchemes
 
 laplacianSchemes
 {
-    default         none;
-    laplacian(K,T)  Gauss linear uncorrected;
+    default             none;
+    laplacian(kappa,T)  Gauss linear uncorrected;
 }
 
 interpolationSchemes
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/leftSolid/fvSchemes b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/leftSolid/fvSchemes
index a2f1f34c38..8bacef012f 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/leftSolid/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/leftSolid/fvSchemes
@@ -31,8 +31,8 @@ divSchemes
 
 laplacianSchemes
 {
-    default         none;
-    laplacian(K,T) Gauss linear limited 0.333;
+    default             none;
+    laplacian(kappa,T)  Gauss linear limited 0.333;
 }
 
 interpolationSchemes
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/rightSolid/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/rightSolid/changeDictionaryDict
index e10d24fbeb..4f01822608 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/rightSolid/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/rightSolid/changeDictionaryDict
@@ -66,8 +66,8 @@ dictionaryReplacement
             {
                 type            compressible::turbulentTemperatureCoupledBaffleMixed;
                 neighbourFieldName T;
-                K               solidThermo;
-                KName           none;
+                kappa           solidThermo;
+                kappaName       none;
                 value           uniform 300;
             }
         }
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/rightSolid/fvSchemes b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/rightSolid/fvSchemes
index 304c475fe8..89fb780470 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/rightSolid/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/rightSolid/fvSchemes
@@ -31,8 +31,8 @@ divSchemes
 
 laplacianSchemes
 {
-    default         none;
-    laplacian(K,T) Gauss linear uncorrected;
+    default             none;
+    laplacian(kappa,T)  Gauss linear uncorrected;
 }
 
 interpolationSchemes

From 7a9cc5e043c1aafd00ccbfa65594a81c10830b92 Mon Sep 17 00:00:00 2001
From: sergio <sergio>
Date: Tue, 8 May 2012 13:44:47 +0100
Subject: [PATCH 313/317] ENH: Changes to tutorials and sources regarding
 changes from K to kappa in solid Thermo

---
 .../basicSolidThermo/basicSolidThermo.H        |  5 ++++-
 .../constSolidThermo/constSolidThermo.C        |  3 ++-
 .../directionalKSolidThermo.C                  | 11 ++++++++---
 .../directionalKSolidThermo.H                  |  5 ++++-
 .../isotropicKSolidThermo.C                    |  6 ++++--
 .../isotropicKSolidThermo.H                    |  5 ++++-
 .../solidMixtureThermo/solidMixtureThermo.C    |  3 ++-
 .../transport/const/constSolidTransportI.H     |  3 ++-
 .../temperatureCoupledBase.C                   | 18 ++++++++++++++----
 ...atureCoupledBaffleMixedFvPatchScalarField.H |  4 ++--
 10 files changed, 46 insertions(+), 17 deletions(-)

diff --git a/src/thermophysicalModels/basicSolidThermo/basicSolidThermo/basicSolidThermo.H b/src/thermophysicalModels/basicSolidThermo/basicSolidThermo/basicSolidThermo.H
index 2f4d2a1f99..0f0fb67f27 100644
--- a/src/thermophysicalModels/basicSolidThermo/basicSolidThermo/basicSolidThermo.H
+++ b/src/thermophysicalModels/basicSolidThermo/basicSolidThermo/basicSolidThermo.H
@@ -190,7 +190,10 @@ public:
             virtual tmp<scalarField> kappa(const label patchI) const = 0;
 
             //- Thermal conductivity [W//m/K]
-            virtual tmp<symmTensorField> directionalKappa(const label) const = 0;
+            virtual tmp<symmTensorField> directionalKappa
+            (
+                const label
+            ) const = 0;
 
             //- Specific heat capacity [J/kg/K)]
             virtual tmp<scalarField> Cp(const label patchI) const = 0;
diff --git a/src/thermophysicalModels/basicSolidThermo/constSolidThermo/constSolidThermo.C b/src/thermophysicalModels/basicSolidThermo/constSolidThermo/constSolidThermo.C
index 65ce650bc7..4a4921cb90 100644
--- a/src/thermophysicalModels/basicSolidThermo/constSolidThermo/constSolidThermo.C
+++ b/src/thermophysicalModels/basicSolidThermo/constSolidThermo/constSolidThermo.C
@@ -138,7 +138,8 @@ Foam::tmp<Foam::volScalarField> Foam::constSolidThermo::kappa() const
 }
 
 
-Foam::tmp<Foam::volSymmTensorField> Foam::constSolidThermo::directionalKappa() const
+Foam::tmp<Foam::volSymmTensorField>
+Foam::constSolidThermo::directionalKappa() const
 {
     dimensionedSymmTensor t
     (
diff --git a/src/thermophysicalModels/basicSolidThermo/directionalKSolidThermo/directionalKSolidThermo.C b/src/thermophysicalModels/basicSolidThermo/directionalKSolidThermo/directionalKSolidThermo.C
index 9f41b82a91..57f6eb1727 100644
--- a/src/thermophysicalModels/basicSolidThermo/directionalKSolidThermo/directionalKSolidThermo.C
+++ b/src/thermophysicalModels/basicSolidThermo/directionalKSolidThermo/directionalKSolidThermo.C
@@ -394,7 +394,8 @@ void Foam::directionalKSolidThermo::calculate()
 
     forAll(directionalKappa_.boundaryField(), patchI)
     {
-        directionalKappa_.boundaryField()[patchI] == this->directionalKappa(patchI)();
+        directionalKappa_.boundaryField()[patchI] ==
+            this->directionalKappa(patchI)();
     }
 }
 
@@ -409,7 +410,10 @@ Foam::tmp<Foam::symmTensorField> Foam::directionalKSolidThermo::directionalKappa
     Field<vector> localKappa(interpolateXY(patchT, TValues_, kappaValues_));
 
     tmp<symmTensorField> tglobalK(new symmTensorField(localKappa.size()));
-    transformField(tglobalK(), ccTransforms_.boundaryField()[patchI], localKappa);
+    transformField
+    (
+        tglobalK(), ccTransforms_.boundaryField()[patchI], localKappa
+    );
 
     return tglobalK;
 }
@@ -424,7 +428,8 @@ bool Foam::directionalKSolidThermo::read()
 bool Foam::directionalKSolidThermo::read(const dictionary& dict)
 {
     coordSys_ = coordinateSystem(dict, mesh_);
-    kappaValues_  = Field<vector>(subDict(typeName + "Coeffs").lookup("kappaValues"));
+    kappaValues_  =
+        Field<vector>(subDict(typeName + "Coeffs").lookup("kappaValues"));
     return true;
 }
 
diff --git a/src/thermophysicalModels/basicSolidThermo/directionalKSolidThermo/directionalKSolidThermo.H b/src/thermophysicalModels/basicSolidThermo/directionalKSolidThermo/directionalKSolidThermo.H
index ae3a48adb3..68c176a7cc 100644
--- a/src/thermophysicalModels/basicSolidThermo/directionalKSolidThermo/directionalKSolidThermo.H
+++ b/src/thermophysicalModels/basicSolidThermo/directionalKSolidThermo/directionalKSolidThermo.H
@@ -131,7 +131,10 @@ public:
             //- Thermal conductivity [W//m/K]
             virtual tmp<scalarField> kappa(const label patchI) const
             {
-                notImplemented("directionalKSolidThermo::kappa(const label) const");
+                notImplemented
+                (
+                    "directionalKSolidThermo::kappa(const label) const"
+                );
                 return tmp<scalarField>(NULL);
             }
 
diff --git a/src/thermophysicalModels/basicSolidThermo/isotropicKSolidThermo/isotropicKSolidThermo.C b/src/thermophysicalModels/basicSolidThermo/isotropicKSolidThermo/isotropicKSolidThermo.C
index 8a697a9d1a..b1e25dfad6 100644
--- a/src/thermophysicalModels/basicSolidThermo/isotropicKSolidThermo/isotropicKSolidThermo.C
+++ b/src/thermophysicalModels/basicSolidThermo/isotropicKSolidThermo/isotropicKSolidThermo.C
@@ -147,14 +147,16 @@ Foam::tmp<Foam::scalarField> Foam::isotropicKSolidThermo::kappa
 
 bool Foam::isotropicKSolidThermo::read()
 {
-    kappaValues_  = Field<scalar>(subDict(typeName + "Coeffs").lookup("kappaValues"));
+    kappaValues_  =
+        Field<scalar>(subDict(typeName + "Coeffs").lookup("kappaValues"));
     return true;
 }
 
 
 bool Foam::isotropicKSolidThermo::writeData(Ostream& os) const
 {
-    os.writeKeyword("kappaValues") << kappaValues_ << token::END_STATEMENT << nl;
+    os.writeKeyword("kappaValues") << kappaValues_
+        << token::END_STATEMENT << nl;
     bool ok = interpolatedSolidThermo::writeData(os);
 
     return ok && os.good();
diff --git a/src/thermophysicalModels/basicSolidThermo/isotropicKSolidThermo/isotropicKSolidThermo.H b/src/thermophysicalModels/basicSolidThermo/isotropicKSolidThermo/isotropicKSolidThermo.H
index 8daff60560..c53e669e0c 100644
--- a/src/thermophysicalModels/basicSolidThermo/isotropicKSolidThermo/isotropicKSolidThermo.H
+++ b/src/thermophysicalModels/basicSolidThermo/isotropicKSolidThermo/isotropicKSolidThermo.H
@@ -92,7 +92,10 @@ public:
             //- Thermal conductivity [W/m/K]
             virtual tmp<volSymmTensorField> directionalKappa() const
             {
-                notImplemented("directionalKSolidThermo::directionalKappa() const");
+                notImplemented
+                (
+                    "directionalKSolidThermo::directionalKappa() const"
+                );
                 return tmp<volSymmTensorField>(NULL);
             }
 
diff --git a/src/thermophysicalModels/basicSolidThermo/solidMixtureThermo/solidMixtureThermo/solidMixtureThermo.C b/src/thermophysicalModels/basicSolidThermo/solidMixtureThermo/solidMixtureThermo/solidMixtureThermo.C
index 1239bb16ee..cea2e2288d 100644
--- a/src/thermophysicalModels/basicSolidThermo/solidMixtureThermo/solidMixtureThermo/solidMixtureThermo.C
+++ b/src/thermophysicalModels/basicSolidThermo/solidMixtureThermo/solidMixtureThermo/solidMixtureThermo.C
@@ -225,7 +225,8 @@ void Foam::solidMixtureThermo<MixtureType>::correct()
 
 
 template<class MixtureType>
-Foam::tmp<Foam::volScalarField> Foam::solidMixtureThermo<MixtureType>::kappa() const
+Foam::tmp<Foam::volScalarField> Foam::solidMixtureThermo<MixtureType>::
+kappa() const
 {
     return kappa_;
 }
diff --git a/src/thermophysicalModels/solid/transport/const/constSolidTransportI.H b/src/thermophysicalModels/solid/transport/const/constSolidTransportI.H
index a2b538e505..639f3179c7 100644
--- a/src/thermophysicalModels/solid/transport/const/constSolidTransportI.H
+++ b/src/thermophysicalModels/solid/transport/const/constSolidTransportI.H
@@ -52,7 +52,8 @@ inline Foam::constSolidTransport<thermo>::constSolidTransport
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class thermo>
-inline Foam::scalar Foam::constSolidTransport<thermo>::kappa(const scalar T) const
+inline Foam::scalar Foam::constSolidTransport<thermo>::
+kappa(const scalar T) const
 {
     return kappa_;
 }
diff --git a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.C b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.C
index 0258ff87f5..44e43d3c67 100644
--- a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.C
+++ b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.C
@@ -132,15 +132,24 @@ Foam::tmp<Foam::scalarField> Foam::temperatureCoupledBase::kappa
         {
             if (mesh.objectRegistry::foundObject<volScalarField>(kappaName_))
             {
-                return patch_.lookupPatchField<volScalarField, scalar>(kappaName_);
+                return patch_.lookupPatchField
+                <
+                    volScalarField, scalar
+                >(kappaName_);
             }
             else if
             (
-                mesh.objectRegistry::foundObject<volSymmTensorField>(kappaName_)
+                mesh.objectRegistry::foundObject
+                <
+                    volSymmTensorField
+                >(kappaName_)
             )
             {
                 const symmTensorField& KWall =
-                    patch_.lookupPatchField<volSymmTensorField, scalar>(kappaName_);
+                    patch_.lookupPatchField
+                    <
+                        volSymmTensorField, scalar
+                    >(kappaName_);
 
                 const vectorField n(patch_.nf());
 
@@ -152,7 +161,8 @@ Foam::tmp<Foam::scalarField> Foam::temperatureCoupledBase::kappa
                     << "Did not find field " << kappaName_
                     << " on mesh " << mesh.name() << " patch " << patch_.name()
                     << endl
-                    << "Please set 'kappa' to one of " << KMethodTypeNames_.toc()
+                    << "Please set 'kappa' to one of "
+                    << KMethodTypeNames_.toc()
                     << " and 'kappaName' to the name of the volScalar"
                     << " or volSymmTensor field (if kappa=lookup)"
                     << exit(FatalError);
diff --git a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.H b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.H
index d4164998ec..2703274ed3 100644
--- a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.H
+++ b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.H
@@ -48,8 +48,8 @@ Description
 
     Needs to be on underlying mapped(Wall)FvPatch.
 
-    Note: kappa : heat conduction at patch. Gets supplied how to lookup/calculate
-        kappa:
+    Note: kappa : heat conduction at patch. Gets supplied how to lookup
+        calculate kappa:
     - 'lookup' : lookup volScalarField (or volSymmTensorField) with name
     - 'basicThermo' : use basicThermo and compressible::RASmodel to calculate
         kappa

From 539a8cea8ad6ddf532e3aa828a9ddeed18e4a5df Mon Sep 17 00:00:00 2001
From: sergio <sergio>
Date: Tue, 8 May 2012 13:46:58 +0100
Subject: [PATCH 314/317] ENH: Changes to tutorials and sources regarding
 changes from K to kappa in solid Thermo

---
 .../isotropicKSolidThermo/isotropicKSolidThermo.H              | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/thermophysicalModels/basicSolidThermo/isotropicKSolidThermo/isotropicKSolidThermo.H b/src/thermophysicalModels/basicSolidThermo/isotropicKSolidThermo/isotropicKSolidThermo.H
index c53e669e0c..e40f4d06c9 100644
--- a/src/thermophysicalModels/basicSolidThermo/isotropicKSolidThermo/isotropicKSolidThermo.H
+++ b/src/thermophysicalModels/basicSolidThermo/isotropicKSolidThermo/isotropicKSolidThermo.H
@@ -109,7 +109,8 @@ public:
             {
                 notImplemented
                 (
-                    "directionalKSolidThermo::directionalKappa(const label) const"
+                    "directionalKSolidThermo::directionalKappa(const label)
+                    "const"
                 );
                 return tmp<symmTensorField>(NULL);
             }

From ed2060f104d974114f08ec36430f08ef54617ca8 Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Tue, 8 May 2012 17:00:15 +0100
Subject: [PATCH 315/317] BUG: Corrected missing " (thanks to Gijs)

---
 .../isotropicKSolidThermo/isotropicKSolidThermo.H          | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/thermophysicalModels/basicSolidThermo/isotropicKSolidThermo/isotropicKSolidThermo.H b/src/thermophysicalModels/basicSolidThermo/isotropicKSolidThermo/isotropicKSolidThermo.H
index e40f4d06c9..9eb1170a44 100644
--- a/src/thermophysicalModels/basicSolidThermo/isotropicKSolidThermo/isotropicKSolidThermo.H
+++ b/src/thermophysicalModels/basicSolidThermo/isotropicKSolidThermo/isotropicKSolidThermo.H
@@ -99,17 +99,18 @@ public:
                 return tmp<volSymmTensorField>(NULL);
             }
 
+
         // Per patch calculation
 
-            //- Thermal conductivity [W//m/K]
+            //- Thermal conductivity [W/m/K]
             virtual tmp<scalarField> kappa(const label patchI) const;
 
-            //- Thermal conductivity [W//m/K]
+            //- Thermal conductivity [W/m/K]
             virtual tmp<symmTensorField> directionalKappa(const label) const
             {
                 notImplemented
                 (
-                    "directionalKSolidThermo::directionalKappa(const label)
+                    "directionalKSolidThermo::directionalKappa(const label)"
                     "const"
                 );
                 return tmp<symmTensorField>(NULL);

From 097183efbe377019d5ce4e234dca9c07c0646aa9 Mon Sep 17 00:00:00 2001
From: sergio <sergio>
Date: Tue, 8 May 2012 17:35:17 +0100
Subject: [PATCH 316/317] STY: Missing ""

---
 .../isotropicKSolidThermo/isotropicKSolidThermo.H               | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/thermophysicalModels/basicSolidThermo/isotropicKSolidThermo/isotropicKSolidThermo.H b/src/thermophysicalModels/basicSolidThermo/isotropicKSolidThermo/isotropicKSolidThermo.H
index e40f4d06c9..728ccca0c3 100644
--- a/src/thermophysicalModels/basicSolidThermo/isotropicKSolidThermo/isotropicKSolidThermo.H
+++ b/src/thermophysicalModels/basicSolidThermo/isotropicKSolidThermo/isotropicKSolidThermo.H
@@ -109,7 +109,7 @@ public:
             {
                 notImplemented
                 (
-                    "directionalKSolidThermo::directionalKappa(const label)
+                    "directionalKSolidThermo::directionalKappa(const label)"
                     "const"
                 );
                 return tmp<symmTensorField>(NULL);

From 70ea2f82d2d25812702071b60bf173ca8700bf10 Mon Sep 17 00:00:00 2001
From: sergio <sergio>
Date: Tue, 8 May 2012 17:37:53 +0100
Subject: [PATCH 317/317] ENH: adding pressurePerfectGas equestion of state

---
 .../mixtures/basicMixture/basicMixtures.C     |  25 +++
 .../basic/rhoThermo/hRhoThermo/hRhoThermos.C  |  28 +++
 .../rhoThermo/hsRhoThermo/hsRhoThermos.C      |  27 +++
 src/thermophysicalModels/specie/Make/files    |   1 +
 .../pressurePerfectGas/pressurePerfectGas.C   |  71 ++++++++
 .../pressurePerfectGas/pressurePerfectGas.H   | 160 +++++++++++++++++
 .../pressurePerfectGas/pressurePerfectGasI.H  | 163 ++++++++++++++++++
 7 files changed, 475 insertions(+)
 create mode 100644 src/thermophysicalModels/specie/equationOfState/pressurePerfectGas/pressurePerfectGas.C
 create mode 100644 src/thermophysicalModels/specie/equationOfState/pressurePerfectGas/pressurePerfectGas.H
 create mode 100644 src/thermophysicalModels/specie/equationOfState/pressurePerfectGas/pressurePerfectGasI.H

diff --git a/src/thermophysicalModels/basic/mixtures/basicMixture/basicMixtures.C b/src/thermophysicalModels/basic/mixtures/basicMixture/basicMixtures.C
index d140d3dcf1..7239d8d332 100644
--- a/src/thermophysicalModels/basic/mixtures/basicMixture/basicMixtures.C
+++ b/src/thermophysicalModels/basic/mixtures/basicMixture/basicMixtures.C
@@ -32,6 +32,7 @@ Description
 #include "makeBasicMixture.H"
 
 #include "perfectGas.H"
+#include "pressurePerfectGas.H"
 #include "incompressible.H"
 
 #include "eConstThermo.H"
@@ -119,6 +120,30 @@ makeBasicPolyMixture
     8
 );
 
+makeBasicMixture
+(
+    pureMixture,
+    constTransport,
+    hConstThermo,
+    pressurePerfectGas
+);
+
+makeBasicMixture
+(
+    pureMixture,
+    sutherlandTransport,
+    hConstThermo,
+    pressurePerfectGas
+);
+
+makeBasicMixture
+(
+    pureMixture,
+    sutherlandTransport,
+    janafThermo,
+    pressurePerfectGas
+);
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
diff --git a/src/thermophysicalModels/basic/rhoThermo/hRhoThermo/hRhoThermos.C b/src/thermophysicalModels/basic/rhoThermo/hRhoThermo/hRhoThermos.C
index a1d44bb9b8..7da039e267 100644
--- a/src/thermophysicalModels/basic/rhoThermo/hRhoThermo/hRhoThermos.C
+++ b/src/thermophysicalModels/basic/rhoThermo/hRhoThermo/hRhoThermos.C
@@ -26,6 +26,7 @@ License
 #include "makeBasicRhoThermo.H"
 
 #include "perfectGas.H"
+#include "pressurePerfectGas.H"
 #include "incompressible.H"
 
 #include "hConstThermo.H"
@@ -99,6 +100,33 @@ makeBasicRhoPolyThermo
     8
 );
 
+makeBasicRhoThermo
+(
+    hRhoThermo,
+    pureMixture,
+    constTransport,
+    hConstThermo,
+    pressurePerfectGas
+);
+
+makeBasicRhoThermo
+(
+    hRhoThermo,
+    pureMixture,
+    sutherlandTransport,
+    hConstThermo,
+    pressurePerfectGas
+);
+
+makeBasicRhoThermo
+(
+    hRhoThermo,
+    pureMixture,
+    sutherlandTransport,
+    janafThermo,
+    pressurePerfectGas
+);
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
diff --git a/src/thermophysicalModels/basic/rhoThermo/hsRhoThermo/hsRhoThermos.C b/src/thermophysicalModels/basic/rhoThermo/hsRhoThermo/hsRhoThermos.C
index 8acf748c42..260eebe8ec 100644
--- a/src/thermophysicalModels/basic/rhoThermo/hsRhoThermo/hsRhoThermos.C
+++ b/src/thermophysicalModels/basic/rhoThermo/hsRhoThermo/hsRhoThermos.C
@@ -26,6 +26,7 @@ License
 #include "makeBasicRhoThermo.H"
 
 #include "perfectGas.H"
+#include "pressurePerfectGas.H"
 
 #include "hConstThermo.H"
 #include "janafThermo.H"
@@ -71,6 +72,32 @@ makeBasicRhoThermo
     perfectGas
 );
 
+makeBasicRhoThermo
+(
+    hsRhoThermo,
+    pureMixture,
+    constTransport,
+    hConstThermo,
+    pressurePerfectGas
+);
+
+makeBasicRhoThermo
+(
+    hsRhoThermo,
+    pureMixture,
+    sutherlandTransport,
+    hConstThermo,
+    pressurePerfectGas
+);
+
+makeBasicRhoThermo
+(
+    hsRhoThermo,
+    pureMixture,
+    sutherlandTransport,
+    janafThermo,
+    pressurePerfectGas
+);
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/thermophysicalModels/specie/Make/files b/src/thermophysicalModels/specie/Make/files
index 2be4ebfff1..29d3c029ef 100644
--- a/src/thermophysicalModels/specie/Make/files
+++ b/src/thermophysicalModels/specie/Make/files
@@ -7,6 +7,7 @@ $(atomicWeights)/atomicWeights.C
 $(specie)/specie.C
 $(equationOfState)/perfectGas/perfectGas.C
 $(equationOfState)/incompressible/incompressible.C
+$(equationOfState)/pressurePerfectGas/pressurePerfectGas.C
 $(reactions)/makeChemkinReactions.C
 $(reactions)/makeReactionThermoReactions.C
 $(reactions)/makeLangmuirHinshelwoodReactions.C
diff --git a/src/thermophysicalModels/specie/equationOfState/pressurePerfectGas/pressurePerfectGas.C b/src/thermophysicalModels/specie/equationOfState/pressurePerfectGas/pressurePerfectGas.C
new file mode 100644
index 0000000000..4a58751472
--- /dev/null
+++ b/src/thermophysicalModels/specie/equationOfState/pressurePerfectGas/pressurePerfectGas.C
@@ -0,0 +1,71 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "pressurePerfectGas.H"
+#include "IOstreams.H"
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::pressurePerfectGas::pressurePerfectGas(Istream& is)
+:
+    specie(is),
+    pRef_(readScalar(is))
+{
+    is.check("pressurePerfectGas::pressurePerfectGas(Istream& is)");
+}
+
+
+Foam::pressurePerfectGas::pressurePerfectGas(const dictionary& dict)
+:
+    specie(dict),
+    pRef_(readScalar(dict.subDict("equationOfState").lookup("pRef")))
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::pressurePerfectGas::write(Ostream& os) const
+{
+    specie::write(os);
+    dictionary dict("equationOfState");
+    dict.add("pRef", pRef_);
+
+    os  << indent << dict.dictName() << dict;
+}
+
+
+// * * * * * * * * * * * * * * * Ostream Operator  * * * * * * * * * * * * * //
+
+Foam::Ostream& Foam::operator<<(Ostream& os, const pressurePerfectGas& pg)
+{
+    os  << static_cast<const specie&>(pg)
+        << token::SPACE << pg.pRef_;
+
+    os.check("Ostream& operator<<(Ostream& os, const pressurePerfectGas& st)");
+    return os;
+}
+
+
+// ************************************************************************* //
diff --git a/src/thermophysicalModels/specie/equationOfState/pressurePerfectGas/pressurePerfectGas.H b/src/thermophysicalModels/specie/equationOfState/pressurePerfectGas/pressurePerfectGas.H
new file mode 100644
index 0000000000..40f4938568
--- /dev/null
+++ b/src/thermophysicalModels/specie/equationOfState/pressurePerfectGas/pressurePerfectGas.H
@@ -0,0 +1,160 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::pressurePerfectGas
+
+Description
+    Perfect gas equation of state usign a reference pressure
+
+SourceFiles
+    pressurePerfectGasI.H
+    pressurePerfectGas.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef pressurePerfectGas_H
+#define pressurePerfectGas_H
+
+#include "specie.H"
+#include "autoPtr.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                           Class pressurePerfectGas Declaration
+\*---------------------------------------------------------------------------*/
+
+class pressurePerfectGas
+:
+    public specie
+{
+    // Private data
+
+        //- Reference pressure
+        scalar pRef_;
+
+
+public:
+
+    // Constructors
+
+        //- Construct from components
+        inline pressurePerfectGas(const specie& sp);
+
+        //- Construct from Istream
+        pressurePerfectGas(Istream&);
+
+        //- Construct from dictionary
+        pressurePerfectGas(const dictionary& dict);
+
+        //- Construct as named copy
+        inline pressurePerfectGas(const word& name, const pressurePerfectGas&);
+
+        //- Construct and return a clone
+        inline autoPtr<pressurePerfectGas> clone() const;
+
+        // Selector from Istream
+        inline static autoPtr<pressurePerfectGas> New(Istream& is);
+
+        // Selector from dictionary
+        inline static autoPtr<pressurePerfectGas> New(const dictionary& dict);
+
+
+    // Member functions
+
+        // Fundamental properties
+
+            //- Return density [kg/m^3]
+            inline scalar rho(scalar p, scalar T) const;
+
+            //- Return compressibility rho/p [s^2/m^2]
+            inline scalar psi(scalar p, scalar T) const;
+
+            //- Return compression factor []
+            inline scalar Z(scalar p, scalar T) const;
+
+
+        // I-O
+
+            //- Write to Ostream
+            void write(Ostream& os) const;
+
+
+    // Member operators
+
+        inline void operator+=(const pressurePerfectGas&);
+        inline void operator-=(const pressurePerfectGas&);
+
+        inline void operator*=(const scalar);
+
+
+    // Friend operators
+
+        inline friend pressurePerfectGas operator+
+        (
+            const pressurePerfectGas&,
+            const pressurePerfectGas&
+        );
+
+        inline friend pressurePerfectGas operator-
+        (
+            const pressurePerfectGas&,
+            const pressurePerfectGas&
+        );
+
+        inline friend pressurePerfectGas operator*
+        (
+            const scalar s,
+            const pressurePerfectGas&
+        );
+
+        inline friend pressurePerfectGas operator==
+        (
+            const pressurePerfectGas&,
+            const pressurePerfectGas&
+        );
+
+
+    // Ostream Operator
+
+        friend Ostream& operator<<(Ostream&, const pressurePerfectGas&);
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#include "pressurePerfectGasI.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/thermophysicalModels/specie/equationOfState/pressurePerfectGas/pressurePerfectGasI.H b/src/thermophysicalModels/specie/equationOfState/pressurePerfectGas/pressurePerfectGasI.H
new file mode 100644
index 0000000000..99512ecaee
--- /dev/null
+++ b/src/thermophysicalModels/specie/equationOfState/pressurePerfectGas/pressurePerfectGasI.H
@@ -0,0 +1,163 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "pressurePerfectGas.H"
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+inline Foam::pressurePerfectGas::pressurePerfectGas(const specie& sp)
+:
+    specie(sp)
+{}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+inline Foam::pressurePerfectGas::pressurePerfectGas
+(
+    const word& name,
+    const pressurePerfectGas& pg
+)
+:
+    specie(name, pg)
+{}
+
+
+inline Foam::autoPtr<Foam::pressurePerfectGas> Foam::pressurePerfectGas::
+clone() const
+{
+    return autoPtr<pressurePerfectGas>(new pressurePerfectGas(*this));
+}
+
+
+inline Foam::autoPtr<Foam::pressurePerfectGas> Foam::pressurePerfectGas::New
+(
+    Istream& is
+)
+{
+    return autoPtr<pressurePerfectGas>(new pressurePerfectGas(is));
+}
+
+
+inline Foam::autoPtr<Foam::pressurePerfectGas> Foam::pressurePerfectGas::New
+(
+    const dictionary& dict
+)
+{
+    return autoPtr<pressurePerfectGas>(new pressurePerfectGas(dict));
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+inline Foam::scalar Foam::pressurePerfectGas::rho(scalar p, scalar T) const
+{
+    return pRef_/(R()*T);
+}
+
+
+inline Foam::scalar Foam::pressurePerfectGas::psi(scalar, scalar T) const
+{
+    return 0.0;
+}
+
+
+inline Foam::scalar Foam::pressurePerfectGas::Z(scalar, scalar) const
+{
+    return 0.0;
+}
+
+
+// * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
+
+inline void Foam::pressurePerfectGas::operator+=(const pressurePerfectGas& pg)
+{
+    specie::operator+=(pg);
+}
+
+
+inline void Foam::pressurePerfectGas::operator-=(const pressurePerfectGas& pg)
+{
+    specie::operator-=(pg);
+}
+
+
+inline void Foam::pressurePerfectGas::operator*=(const scalar s)
+{
+    specie::operator*=(s);
+}
+
+
+// * * * * * * * * * * * * * * * Friend Operators  * * * * * * * * * * * * * //
+
+inline Foam::pressurePerfectGas Foam::operator+
+(
+    const pressurePerfectGas& pg1,
+    const pressurePerfectGas& pg2
+)
+{
+    return pressurePerfectGas
+    (
+        static_cast<const specie&>(pg1)
+      + static_cast<const specie&>(pg2)
+    );
+}
+
+
+inline Foam::pressurePerfectGas Foam::operator-
+(
+    const pressurePerfectGas& pg1,
+    const pressurePerfectGas& pg2
+)
+{
+    return pressurePerfectGas
+    (
+        static_cast<const specie&>(pg1)
+      - static_cast<const specie&>(pg2)
+    );
+}
+
+
+inline Foam::pressurePerfectGas Foam::operator*
+(
+    const scalar s,
+    const pressurePerfectGas& pg
+)
+{
+    return pressurePerfectGas(s*static_cast<const specie&>(pg));
+}
+
+
+inline Foam::pressurePerfectGas Foam::operator==
+(
+    const pressurePerfectGas& pg1,
+    const pressurePerfectGas& pg2
+)
+{
+    return pg2 - pg1;
+}
+
+
+// ************************************************************************* //